Changeset 1332

Timestamp:

02/03/18 06:47:19 (2 years ago)

Author:

gogo

Message:

Pushing some old updates up from my current production system...

• Add some iPhone/iPad fixes (no idea if these are still valid, I don't have one to test with).
• Add new plugin event onBeforeSubmitTextarea, fired after the textarea get's its value set by outwardHtml, so you can do any last minute modifications.
• Increase stylist delay to 500ms for reliability

Location:

trunk

Files:

• XinhaCore.js (modified) (7 diffs)
• plugins/Stylist/Stylist.js (modified) (1 diff)

trunk/XinhaCore.js

@@ -175 +175 @@
  */
 Xinha.is_mac       = (Xinha.agt.indexOf("mac") != -1);
+Xinha.is_ios       = (Xinha.agt.indexOf("iphone") != -1) || (Xinha.agt.indexOf("ipad") != -1) ;
+
 /** Browser is Microsoft Internet Explorer Mac
  * @type Boolean 
@@ -196 +198 @@
  * @type Boolean 
  */
-Xinha.is_ff2 = Xinha.is_real_gecko && parseInt(navigator.productSub.substr(0,10), 10) < 20071210;
+// http://trac.xinha.org/ticket/1620
+Xinha.is_ff2 = Xinha.is_real_gecko && navigator.productSub && parseInt(navigator.productSub.substr(0,10), 10) < 20071210;
 
 /** File is opened locally opened ("file://" protocol)
@@ -2201 +2204 @@
   var statusBarTree = document.createElement("span");
   statusBarTree.className = "statusBarTree";
-  statusBarTree.innerHTML = Xinha._lc("Path") + ": ";
+  if(Xinha.is_ios)
+  {
+    statusBarTree.innerHTML = Xinha._lc("Touch here first to activate editor.");
+  }
+  else
+  {
+    statusBarTree.innerHTML = Xinha._lc("Path") + ": ";
+  }
 
   this._statusBarTree = statusBarTree;
@@ -2712 +2722 @@
         editor.firePluginEvent('onBeforeSubmit');
         editor._textArea.value = editor.outwardHtml(editor.getHTML());
+        editor.firePluginEvent('onBeforeSubmitTextArea');
         return true;
       }
@@ -3299 +3310 @@
   this.disableToolbar();
 
+  if(Xinha.is_ios)
+  {
+    this._statusBarTree.innerHTML = Xinha._lc("Touch here first to activate editor.");
+  }
+  else
+  {
+    this._statusBarTree.innerHTML = Xinha._lc("Path") + ": ";
+  }
+
   if ( Xinha.is_designMode && this._doc.designMode != 'off' )
   {
@@ -3592 +3612 @@
       if(!resetting_events_for_opera) {
       // if we have multiple editors some bug in Mozilla makes some lose editing ability
+      if(!Xinha.is_ios)
+      {
       Xinha._addEvents(
         doc,
@@ -3601 +3623 @@
         }
       );
+      }
+      else
+      {         
+        Xinha._addEvents(
+          editor._statusBar,
+          ["click"],
+          function()
+          {           
+            editor.activateEditor();
+            editor.focusEditor();
+            return true;
+          }
+        );
+      }
+
       if (Xinha.is_ie)
       { // #1019 Cusor not jumping to editable part of window when clicked in IE, see also #1039

trunk/plugins/Stylist/Stylist.js

@@ -708 +708 @@
 
     var e = this.editor;
-    this._timeoutID = window.setTimeout(function() { e._fillStylist(); }, 250);
-  }
-};
+    this._timeoutID = window.setTimeout(function() { e._fillStylist(); }, 500);
+  }
+};