Skip to content

Commit d940e00

Browse files
Mick2ndMick2nd
committed
work on mobile
- grant compatibility with desktop
1 parent 57ee4d1 commit d940e00

16 files changed

Lines changed: 591 additions & 348 deletions

‎src/assets/dialog-mobile.html‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
-->
2020
<meta name="viewport" content="height=device-height, width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
2121
</head>
22-
<body id="bodyPage">
22+
<body id="bodyPage" class="katex-mobile">
2323
<div id="WaitMsg" class="easyui-window" title="Katex Input Helper"
2424
data-options="modal:true,maximizable:false,minimizable:false,collapsible:false,closable:false,maximized:true">
2525
Editor is downloading... <br />
@@ -34,7 +34,7 @@
3434
<div id="formula" class="hidden"></div>
3535
</div>
3636

37-
<div class="easyui-panel">
37+
<div>
3838
<div id="myContainer" class="easyui-navpanel" data-options="fit:true,bodyCls:'mainNavPanelBody'">
3939
<header>
4040
<div id="introduction" class="m-toolbar">
@@ -43,7 +43,10 @@
4343
</div>
4444
<div class="m-title">Katex Input Helper</div>
4545
<div class="m-right">
46+
<!--
4647
<a href="javascript:void(0)" class="easyui-menubutton" data-options="iconCls:'icon-more',menu:'#mobile-menu',menuAlign:'right',hasDownArrow:false"></a>
48+
-->
49+
<a id="goMenu" href="javascript:void(0)" class="easyui-linkbutton" data-options="iconCls:'icon-more'"></a>
4750
<a id="goEast" href="javascript:void(0)" class="easyui-linkbutton" data-options="plain:true">>></a>
4851
</div>
4952
</div>
@@ -52,12 +55,12 @@
5255
<input value="" class="keyboardInput" id="tKEYBOARD" />
5356

5457
<div id="innerLayout" data-options="fit:true" class="easyui-layout">
55-
<div id="divMathTextInput" class="center easyui-panel" data-options="region:'center',split:false,noheader:true"></div>
56-
<div id="mathVisualOutput" class="inner-south-mobile easyui-panel" dir="ltr" data-options="region:'south',split:true,noheader:true" ></div>
58+
<div id="divMathTextInput" class="center" data-options="region:'center',split:false,noheader:true"></div>
59+
<div id="mathVisualOutput" class="inner-south-mobile" dir="ltr" data-options="region:'south',split:true,noheader:true" ></div>
5760
</div>
5861
</div>
5962
<footer>
60-
<div class="southRegion" class="m-toolbar">
63+
<div class="southRegion m-toolbar">
6164
<div class="divInformation">&nbsp;</div>
6265
<div>
6366
<span locate="AUTHOR"></span>
@@ -182,6 +185,32 @@
182185
</div>
183186
</div>
184187

188+
<div>
189+
<div id="wrapperPanelMenu" class="easyui-navpanel" >
190+
<header>
191+
<div class="m-toolbar">
192+
<div class="m-title">
193+
<span locate=WRAPPER class=rtl-title-withicon></span>&nbsp;
194+
</div>
195+
<div class="m-right">
196+
<a href="javascript:void(0)" class="easyui-linkbutton m-back" data-options="plain:true,outline:true,back:true"></a>
197+
</div>
198+
</div>
199+
</header>
200+
<div id="wrapperBodyMenu">
201+
<div id="sm" class="easyui-sidemenu" data-options="data:[{text:'TEST',state:'open'}]"></div>
202+
</div>
203+
<footer>
204+
<div class="southRegion" class="m-toolbar">
205+
<div class="divInformation">&nbsp;</div>
206+
<div>
207+
<span locate="AUTHOR"></span>
208+
</div>
209+
</div>
210+
</footer>
211+
</div>
212+
</div>
213+
185214
<!-- The Menu -->
186215
<div id="mobile-menu" class="easyui-menu" style="width:280px;">
187216
<div iconcls="icon-file">
@@ -202,9 +231,9 @@
202231
<div id="mbINSERT" iconcls="icon-insert">
203232
<span locate="INSERT"></span>
204233
<div id="mINSERT" class="menus">
205-
<div iconcls="icon-char" id="mCHARS" class="menus">
234+
<div iconcls="icon-char">
206235
<span class="rtl-menu-item" locate="CHAR"></span>
207-
<div>
236+
<div id="mCHARS" class="menus">
208237
<div iconcls="icon-FR_CHAR" id="f_FR_CHAR">
209238
<span class="rtl-menu-item" locate="FR_CHAR" information="FR_CHAR"></span>
210239
</div>

‎src/assets/dialog.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
Themes cannot be longer supported by including them in head and disabling / enabling them.
1515
<base />
1616
-->
17+
<meta name="viewport" content="height=device-height, width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
1718
</head>
18-
<body id="bodyPage">
19+
<body id="bodyPage" class="katex-desktop">
1920
<div id="myContainer" class="easyui-layout">
2021
<!--
2122
-->
@@ -200,13 +201,13 @@ <h3>Katex Input Helper</h3>
200201
</div>
201202
</div>
202203

203-
<div id="divEquationInputOutput" data-options="region:'center',title:'<span locate=EDITION></span>&nbsp;'" class="center" >
204+
<div id="divEquationInputOutput" data-options="region:'center',title:'<span locate=EDITION></span>&nbsp;'" >
204205
<input value="" class="keyboardInput" id="tKEYBOARD" />
205206

206207
<div id="innerLayout" data-options="fit:true" class="easyui-layout">
207-
<div id="divMathTextInput" class="center easyui-panel" data-options="region:'center',split:false,noheader:true">
208+
<div id="divMathTextInput" data-options="region:'center',split:false,noheader:true">
208209
</div>
209-
<div id="mathVisualOutput" class="south easyui-panel" dir="ltr" data-options="region:'south',split:true,noheader:true" ></div>
210+
<div id="mathVisualOutput" dir="ltr" data-options="region:'south',split:true,noheader:true" ></div>
210211
</div>
211212
</div>
212213

@@ -328,7 +329,7 @@ <h3>Katex Input Helper</h3>
328329
</div>
329330
</div>
330331

331-
<div id="wMATRIX" class="easyui-dialog" iconcls="icon-matrix" data-options="closed:true,modal:true,buttons:'#btMATRIX',resizable:true"
332+
<div id="wMATRIX" class="easyui-dialog" iconcls="icon-matrix" data-options="cls:'mat',closed:true,modal:true,buttons:'#btMATRIX',resizable:true"
332333
title="<span locate='MATRIX' class='rtl-title-withicon'></span>" >
333334
<form id="formMATRIX" name="formMATRIX" action="#" method="post">
334335
<table id="tableMATRIX" dir="ltr">

‎src/assets/js/bootLoader.ts‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11

2-
/* Could not bring asynchronous version of easyui to work.
2+
/* Could not bring asynchronous version of easyui to work. With little modification
3+
* it is possible to load EASYUI asynchronously.
34
* jquery node_module working with ProvidePlugin.
45
*/
5-
import './jquery-easyui/jquery.easyui.min';
6-
import './jquery-easyui/datagrid-dnd';
7-
import './jquery-easyui/datagrid-filter';
8-
import './jquery-easyui/datagrid-cellediting';
9-
106
import MobileDetect from 'mobile-detect';
117
const CodeMirror = (await import('codemirror')).default;
128

@@ -127,9 +123,8 @@ export class BootLoader implements IBootLoader {
127123
this.vme = this.factory();
128124
window.vme = this.vme; // prevents garbage collection?
129125
await this.vme.initialise();
130-
//$('#myContainer').layout({fit: true}); // TODO: move to initialise, can be better controlled
131-
//$('#divEquationInputOutput').layout({});
132-
//$('#innerLayout').layout({fit: true});
126+
$('#myContainer').layout({fit: true}); // TODO: move to initialise, can be better controlled
127+
$('#innerLayout').layout({fit: true});
133128
} finally {
134129
console.info('App initialization finished');
135130
}
@@ -217,10 +212,10 @@ export class BootLoader implements IBootLoader {
217212

218213
let allLoaded = (
219214
checkOther(typeof $, 'function', 'jquery') &&
220-
checkOther(typeof $.messager, 'object', 'easyui') &&
221-
checkOther(typeof $.fn.datagrid, 'function', 'datagrid') &&
222-
checkOther(typeof $.fn.datagrid.defaults, 'object', 'datagrid') &&
223-
checkOther(typeof $.fn.datagrid.defaults.defaultFilterOptions, 'object', 'datagrid-filter') &&
215+
//checkOther(typeof $.messager, 'object', 'easyui') &&
216+
//checkOther(typeof $.fn.datagrid, 'function', 'datagrid') &&
217+
//checkOther(typeof $.fn.datagrid.defaults, 'object', 'datagrid') &&
218+
//checkOther(typeof $.fn.datagrid.defaults.defaultFilterOptions, 'object', 'datagrid-filter') &&
224219
// Can we independantly check dnd and cellediting?
225220
checkOther(typeof this.katex, 'object', 'Katex') &&
226221
checkOther(typeof this.katex.renderToString, 'function', 'Katex') &&

‎src/assets/js/codeMirrorProxy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export function codeMirrorProxy() : ICodeMirror {
1414
autofocus: true,
1515
showCursorWhenSelecting: true,
1616
lineNumbers: true,
17-
lineWrapping: false, // was: true
17+
lineWrapping: true, // was: true
1818
tabSize: 4,
1919
indentUnit: 4,
2020
indentWithTabs: true,

‎src/assets/js/definitions.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ interface JQuery {
2626
tooltip(p1?: any, p2?: any): any;
2727
datagrid: any;
2828
tree: any;
29+
resizable: any;
30+
sidemenu: any;
2931

3032
ColorPicker(p1?: any, p2?: any): any;
3133
ColorPickerHide(p1?: any, p2?: any): any;

0 commit comments

Comments
 (0)