Changeset 1332
- Timestamp:
- 02/03/18 06:47:19 (13 months ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/XinhaCore.js
r1326 r1332 175 175 */ 176 176 Xinha.is_mac = (Xinha.agt.indexOf("mac") != -1); 177 Xinha.is_ios = (Xinha.agt.indexOf("iphone") != -1) || (Xinha.agt.indexOf("ipad") != -1) ; 178 177 179 /** Browser is Microsoft Internet Explorer Mac 178 180 * @type Boolean … … 196 198 * @type Boolean 197 199 */ 198 Xinha.is_ff2 = Xinha.is_real_gecko && parseInt(navigator.productSub.substr(0,10), 10) < 20071210; 200 // http://trac.xinha.org/ticket/1620 201 Xinha.is_ff2 = Xinha.is_real_gecko && navigator.productSub && parseInt(navigator.productSub.substr(0,10), 10) < 20071210; 199 202 200 203 /** File is opened locally opened ("file://" protocol) … … 2201 2204 var statusBarTree = document.createElement("span"); 2202 2205 statusBarTree.className = "statusBarTree"; 2203 statusBarTree.innerHTML = Xinha._lc("Path") + ": "; 2206 if(Xinha.is_ios) 2207 { 2208 statusBarTree.innerHTML = Xinha._lc("Touch here first to activate editor."); 2209 } 2210 else 2211 { 2212 statusBarTree.innerHTML = Xinha._lc("Path") + ": "; 2213 } 2204 2214 2205 2215 this._statusBarTree = statusBarTree; … … 2712 2722 editor.firePluginEvent('onBeforeSubmit'); 2713 2723 editor._textArea.value = editor.outwardHtml(editor.getHTML()); 2724 editor.firePluginEvent('onBeforeSubmitTextArea'); 2714 2725 return true; 2715 2726 } … … 3299 3310 this.disableToolbar(); 3300 3311 3312 if(Xinha.is_ios) 3313 { 3314 this._statusBarTree.innerHTML = Xinha._lc("Touch here first to activate editor."); 3315 } 3316 else 3317 { 3318 this._statusBarTree.innerHTML = Xinha._lc("Path") + ": "; 3319 } 3320 3301 3321 if ( Xinha.is_designMode && this._doc.designMode != 'off' ) 3302 3322 { … … 3592 3612 if(!resetting_events_for_opera) { 3593 3613 // if we have multiple editors some bug in Mozilla makes some lose editing ability 3614 if(!Xinha.is_ios) 3615 { 3594 3616 Xinha._addEvents( 3595 3617 doc, … … 3601 3623 } 3602 3624 ); 3625 } 3626 else 3627 { 3628 Xinha._addEvents( 3629 editor._statusBar, 3630 ["click"], 3631 function() 3632 { 3633 editor.activateEditor(); 3634 editor.focusEditor(); 3635 return true; 3636 } 3637 ); 3638 } 3639 3603 3640 if (Xinha.is_ie) 3604 3641 { // #1019 Cusor not jumping to editable part of window when clicked in IE, see also #1039 -
trunk/plugins/Stylist/Stylist.js
r1313 r1332 708 708 709 709 var e = this.editor; 710 this._timeoutID = window.setTimeout(function() { e._fillStylist(); }, 250);711 } 712 }; 710 this._timeoutID = window.setTimeout(function() { e._fillStylist(); }, 500); 711 } 712 };
Note: See TracChangeset
for help on using the changeset viewer.