Changeset 1412 for trunk

Timestamp:

02/22/18 08:45:18 (6 months ago)

Author:

gogo

Message:

FancySelects? and WebkitResize? had some problems with older browsers where the jQuery version fails to load. This fixes it (they won't do anything but they still allow Xinha to run).

Location:

trunk/plugins

Files:

• FancySelects/FancySelects.js (modified) (3 diffs)
• WebKitResize/WebKitResize.js (modified) (1 diff)

trunk/plugins/FancySelects/FancySelects.js

@@ -64 +64 @@
 {
     this.editor = editor;
+    this._isWorking = false; // Set true once everything is setup, or not if it fails (old browser)
 }
 
@@ -72 +73 @@
   
   // Be sure we wait until jQuery is loaded
-  if(!(jQuery && jQuery.fn && jQuery.fn.select2 && jQuery(editor._htmlArea).find('.toolbarElement select').length))
+  if(!(typeof jQuery != 'undefined' && jQuery && jQuery.fn && jQuery.fn.select2 && jQuery(editor._htmlArea).find('.toolbarElement select').length))
   {
     var self = this;
@@ -99 +100 @@
   }
   
-  jQuery(editor._htmlArea).find('.toolbarElement select').each(function(i,e){
-    var txt = e.name;
-    var el  = e;
-    
-    var width = 'resolve';
-    if(typeof editor.config.FancySelects.widths[txt] != 'undefined')
-    {
-      width = editor.config.FancySelects.widths[txt];
-    }
-    
-    switch(txt)
-    {
-      case 'fontname':
-        jQuery(e).select2({dropdownAutoWidth: true, theme: 'default', templateResult: formatFontName, width: width});
-        break;
-      case 'fontsize':
-        jQuery(e).select2({dropdownAutoWidth: true, theme: 'default', templateResult: formatFontSize, width: width});
-        break;
-      default:
-        jQuery(e).select2({dropdownAutoWidth: true, theme: 'default', width: width});
-    }
-    
-    jQuery(e).on('select2:opening', function(){
-      // IE11 needs this because opening the select2 de-selects the selected text
-      // so if we don't save and restore it nothing happens (except that the text is deselected)
-      // FF, Chrome and Edge are fine without this, but they also don't seem to care with it
-      // so I guess just do it across the board is safe enough
-      el._FancySelects_SavedSelection = editor.saveSelection();
+  try
+  {
+    jQuery(editor._htmlArea).find('.toolbarElement select').each(function(i,e){
+      var txt = e.name;
+      var el  = e;
+      
+      var width = 'resolve';
+      if(typeof editor.config.FancySelects.widths[txt] != 'undefined')
+      {
+        width = editor.config.FancySelects.widths[txt];
+      }
+      
+      switch(txt)
+      {
+        case 'fontname':
+          jQuery(e).select2({dropdownAutoWidth: true, theme: 'default', templateResult: formatFontName, width: width});
+          break;
+        case 'fontsize':
+          jQuery(e).select2({dropdownAutoWidth: true, theme: 'default', templateResult: formatFontSize, width: width});
+          break;
+        default:
+          jQuery(e).select2({dropdownAutoWidth: true, theme: 'default', width: width});
+      }
+      
+      jQuery(e).on('select2:opening', function(){
+        // IE11 needs this because opening the select2 de-selects the selected text
+        // so if we don't save and restore it nothing happens (except that the text is deselected)
+        // FF, Chrome and Edge are fine without this, but they also don't seem to care with it
+        // so I guess just do it across the board is safe enough
+        el._FancySelects_SavedSelection = editor.saveSelection();
+      });
+      
+      jQuery(e).on('select2:select', function(){
+        if(el._FancySelects_SavedSelection) 
+        {
+          editor.restoreSelection(el._FancySelects_SavedSelection);
+        }
+        el._FancySelects_SavedSelection = null;
+        editor._comboSelected(el, txt);
+      });
+      
     });
     
-    jQuery(e).on('select2:select', function(){
-      if(el._FancySelects_SavedSelection) 
-      {
-        editor.restoreSelection(el._FancySelects_SavedSelection);
-      }
-      el._FancySelects_SavedSelection = null;
-      editor._comboSelected(el, txt);
-    });
-    
-  });
+    this._isWorking = true;
+  }
+  catch(e)
+  {
+    // Old browsers may fail and leave a partially constructed select2, remove that
+    // so just the original selects are left
+    var failed = Xinha.getElementsByClassName(editor._htmlArea,'select2-container');
+    for(var i = 0; i < failed.length; i++)
+    {
+      failed[i].parentNode.removeChild(failed[i]);
+    }
+  }
 };
 
 FancySelects.prototype.onUpdateToolbar = function()
 {
-    var editor = this;
+    var editor = this.editor;
+    
+    if(!this._isWorking) return false;
     
     jQuery('.toolbarElement select').each(function(i,e){
       jQuery(e).trigger('change');
     });
-    
 };

trunk/plugins/WebKitResize/WebKitResize.js

@@ -76 +76 @@
   }
   
-  if(Xinha.is_webkit)
+  try
   {
-    jQuery(this.editor._iframe).webkitimageresize();
+    if(Xinha.is_webkit)
+    {
+      jQuery(this.editor._iframe).webkitimageresize();
+    }
+    
+    if(Xinha.is_webkit || Xinha.is_gecko && this.editor.config.WebKitResize.enableTABLEForGeckoAlso) 
+    {
+      jQuery(this.editor._iframe).webkittableresize();
+    }
+    
+    if(Xinha.is_webkit || Xinha.is_gecko && this.editor.config.WebKitResize.enableTDForGeckoAlso) 
+    {
+      jQuery(this.editor._iframe).webkittdresize();
+    }
   }
-  
-  if(Xinha.is_webkit || Xinha.is_gecko && this.editor.config.WebKitResize.enableTABLEForGeckoAlso) 
-  {
-    jQuery(this.editor._iframe).webkittableresize();
-  }
-  
-  if(Xinha.is_webkit || Xinha.is_gecko && this.editor.config.WebKitResize.enableTDForGeckoAlso) 
-  {
-    jQuery(this.editor._iframe).webkittdresize();
-  }
+  catch(e) { }
 }