Changeset 767 for trunk

Timestamp:

03/09/07 17:42:03 (13 years ago)

Author:

ray

Message:

• Ticket #977 TableOperations? toolbar off-place in ext_example.html
• Ticket #978 defining a padding for <td>s in global css affects Xinha framework
• Ticket #979 improve checking for non-supported browsers
• Ticket #934 SuperClean? plugin returns just quotation when executed on localhost

Location:

trunk

Files:

• Xinha.css (modified) (2 diffs)
• XinhaCore.js (modified) (11 diffs)
• plugins/Equation/example.html (modified) (2 diffs)
• plugins/SuperClean/tidy.php (modified) (1 diff)

trunk/Xinha.css

@@ -1 +1 @@
 .htmlarea { background: #fff; }
+.htmlarea td { margin:0;padding:0; }
 
 .htmlarea .toolbar {
@@ -55 +56 @@
 .htmlarea .toolbar .separator {
   /*position: relative;*/
-  margin: 3px;
+  margin:0 3px;
   border-left: 1px solid ButtonShadow;
   border-right: 1px solid ButtonHighlight;

trunk/XinhaCore.js

@@ -111 +111 @@
 Xinha.ie_version= parseFloat(Xinha.agt.substring(Xinha.agt.indexOf("msie")+5));
 Xinha.is_opera  = (Xinha.agt.indexOf("opera") != -1);
+Xinha.is_khtml  = (Xinha.agt.indexOf("khtml") != -1);
+Xinha.is_safari  = (Xinha.agt.indexOf("safari") != -1);
 Xinha.opera_version = navigator.appVersion.substring(0, navigator.appVersion.indexOf(" "))*1;
 Xinha.is_mac       = (Xinha.agt.indexOf("mac") != -1);
 Xinha.is_mac_ie = (Xinha.is_ie && Xinha.is_mac);
 Xinha.is_win_ie = (Xinha.is_ie && !Xinha.is_mac);
-Xinha.is_gecko  = (navigator.product == "Gecko");
+Xinha.is_gecko  = (navigator.product == "Gecko" && !Xinha.is_safari); // Safari lies!
 Xinha.isRunLocally = document.URL.toLowerCase().search(/^file:/) != -1;
 Xinha.is_designMode = (typeof document.designMode != 'undefined' && !Xinha.is_ie); // IE has designMode, but we're not using it
-if ( Xinha.isRunLocally )
+Xinha.checkSupportedBrowser = function()
+{
+  if ( Xinha.is_gecko )
+  {
+    if ( navigator.productSub < 20021201 )
+    {
+      alert("You need at least Mozilla-1.3 Alpha.\nSorry, your Gecko is not supported.");
+      return false;
+    }
+    if ( navigator.productSub < 20030210 )
+    {
+      alert("Mozilla < 1.3 Beta is not supported!\nI'll try, though, but it might not work.");
+    }
+  }
+  if ( Xinha.is_opera )
+  {
+    alert("Sorry, Opera is not yet supported by Xinha.");
+  }
+  return Xinha.is_gecko || (Xinha.is_opera && Xinha.opera_version >= 9.1) || Xinha.ie_version >= 5.5;
+};
+
+Xinha.isSupportedBrowser = Xinha.checkSupportedBrowser();
+
+if ( Xinha.isRunLocally && Xinha.isSupportedBrowser)
 {
   alert('Xinha *must* be installed on a web server. Locally opened files (those that use the "file://" protocol) cannot properly function. Xinha will try to initialize but may not be correctly loaded.');
@@ -127 +152 @@
 function Xinha(textarea, config)
 {
+  if ( !Xinha.isSupportedBrowser ) return;
+  
   if ( !textarea )
   {
@@ -132 +159 @@
   }
 
-  if ( Xinha.checkSupportedBrowser() )
-  {
-    if ( typeof config == "undefined" )
-    {
-      this.config = new Xinha.Config();
-    }
-    else
-    {
-      this.config = config;
-    }
-    this._htmlArea = null;
-
-    if ( typeof textarea != 'object' )
-    {
-      textarea = Xinha.getElementById('textarea', textarea);
-    }
-    this._textArea = textarea;
-    this._textArea.spellcheck = false;
-       
-    // Before we modify anything, get the initial textarea size
-    this._initial_ta_size =
-    {
-      w: textarea.style.width  ? textarea.style.width  : ( textarea.offsetWidth  ? ( textarea.offsetWidth  + 'px' ) : ( textarea.cols + 'em') ),
-      h: textarea.style.height ? textarea.style.height : ( textarea.offsetHeight ? ( textarea.offsetHeight + 'px' ) : ( textarea.rows + 'em') )
-    };
-    // Create the loading message elements
-    if ( this.config.showLoading )
-    {
-      // Create and show the main loading message and the sub loading message for details of loading actions
-      // global element
-      var loading_message = document.createElement("div");
-      loading_message.id = "loading_" + textarea.name;
-      loading_message.className = "loading";
-      try
-      {
-        // how can i find the real width in pixels without % or em *and* with no visual errors ?
-        // for instance, a textarea with a style="width:100%" and the body padding > 0 result in a horizontal scrollingbar while loading
-        // A few lines above seems to indicate offsetWidth is not always set
-        loading_message.style.width = textarea.offsetWidth + 'px';
-      }
-      catch (ex)
-      {
-        // offsetWidth seems not set, so let's use this._initial_ta_size.w, but sometimes it may be too huge width
-        loading_message.style.width = this._initial_ta_size.w;
-      }
-      loading_message.style.left = Xinha.findPosX(textarea) +  'px';
-      loading_message.style.top = (Xinha.findPosY(textarea) + parseInt(this._initial_ta_size.h, 10) / 2) +  'px';
-      // main static message
-      var loading_main = document.createElement("div");
-      loading_main.className = "loading_main";
-      loading_main.id = "loading_main_" + textarea.name;
-      loading_main.appendChild(document.createTextNode(Xinha._lc("Loading in progress. Please wait !")));
-      // sub dynamic message
-      var loading_sub = document.createElement("div");
-      loading_sub.className = "loading_sub";
-      loading_sub.id = "loading_sub_" + textarea.name;
-      loading_sub.appendChild(document.createTextNode(Xinha._lc("Constructing main object")));
-      loading_message.appendChild(loading_main);
-      loading_message.appendChild(loading_sub);
-      document.body.appendChild(loading_message);
-      this.setLoadingMessage("Constructing object");
-    }
-
-    this._editMode = "wysiwyg";
-    this.plugins = {};
-    this._timerToolbar = null;
-    this._timerUndo = null;
-    this._undoQueue = [this.config.undoSteps];
-    this._undoPos = -1;
-    this._customUndo = true;
-    this._mdoc = document; // cache the document, we need it in plugins
-    this.doctype = '';
-    this.__htmlarea_id_num = __xinhas.length;
-    __xinhas[this.__htmlarea_id_num] = this;
-
-    this._notifyListeners = {};
-
-    // Panels
-    var panels = 
-    {
-      right:
-      {
-        on: true,
-        container: document.createElement('td'),
-        panels: []
-      },
-      left:
-      {
-        on: true,
-        container: document.createElement('td'),
-        panels: []
-      },
-      top:
-      {
-        on: true,
-        container: document.createElement('td'),
-        panels: []
-      },
-      bottom:
-      {
-        on: true,
-        container: document.createElement('td'),
-        panels: []
-      }
-    };
-
-    for ( var i in panels )
-    {
-      if(!panels[i].container) { continue; } // prevent iterating over wrong type
-      panels[i].div = panels[i].container; // legacy
-      panels[i].container.className = 'panels ' + i;
-      Xinha.freeLater(panels[i], 'container');
-      Xinha.freeLater(panels[i], 'div');
-    }
-    // finally store the variable
-    this._panels = panels;
-
-    Xinha.freeLater(this, '_textArea');
-  }
+  if ( typeof config == "undefined" )
+  {
+    this.config = new Xinha.Config();
+  }
+  else
+  {
+    this.config = config;
+  }
+  this._htmlArea = null;
+
+  if ( typeof textarea != 'object' )
+  {
+    textarea = Xinha.getElementById('textarea', textarea);
+  }
+  this._textArea = textarea;
+  this._textArea.spellcheck = false;
+     
+  // Before we modify anything, get the initial textarea size
+  this._initial_ta_size =
+  {
+    w: textarea.style.width  ? textarea.style.width  : ( textarea.offsetWidth  ? ( textarea.offsetWidth  + 'px' ) : ( textarea.cols + 'em') ),
+    h: textarea.style.height ? textarea.style.height : ( textarea.offsetHeight ? ( textarea.offsetHeight + 'px' ) : ( textarea.rows + 'em') )
+  };
+  // Create the loading message elements
+  if ( this.config.showLoading )
+  {
+    // Create and show the main loading message and the sub loading message for details of loading actions
+    // global element
+    var loading_message = document.createElement("div");
+    loading_message.id = "loading_" + textarea.name;
+    loading_message.className = "loading";
+    try
+    {
+      // how can i find the real width in pixels without % or em *and* with no visual errors ?
+      // for instance, a textarea with a style="width:100%" and the body padding > 0 result in a horizontal scrollingbar while loading
+      // A few lines above seems to indicate offsetWidth is not always set
+      loading_message.style.width = textarea.offsetWidth + 'px';
+    }
+    catch (ex)
+    {
+      // offsetWidth seems not set, so let's use this._initial_ta_size.w, but sometimes it may be too huge width
+      loading_message.style.width = this._initial_ta_size.w;
+    }
+    loading_message.style.left = Xinha.findPosX(textarea) +  'px';
+    loading_message.style.top = (Xinha.findPosY(textarea) + parseInt(this._initial_ta_size.h, 10) / 2) +  'px';
+    // main static message
+    var loading_main = document.createElement("div");
+    loading_main.className = "loading_main";
+    loading_main.id = "loading_main_" + textarea.name;
+    loading_main.appendChild(document.createTextNode(Xinha._lc("Loading in progress. Please wait !")));
+    // sub dynamic message
+    var loading_sub = document.createElement("div");
+    loading_sub.className = "loading_sub";
+    loading_sub.id = "loading_sub_" + textarea.name;
+    loading_sub.appendChild(document.createTextNode(Xinha._lc("Constructing main object")));
+    loading_message.appendChild(loading_main);
+    loading_message.appendChild(loading_sub);
+    document.body.appendChild(loading_message);
+    this.setLoadingMessage("Constructing object");
+  }
+
+  this._editMode = "wysiwyg";
+  this.plugins = {};
+  this._timerToolbar = null;
+  this._timerUndo = null;
+  this._undoQueue = [this.config.undoSteps];
+  this._undoPos = -1;
+  this._customUndo = true;
+  this._mdoc = document; // cache the document, we need it in plugins
+  this.doctype = '';
+  this.__htmlarea_id_num = __xinhas.length;
+  __xinhas[this.__htmlarea_id_num] = this;
+
+  this._notifyListeners = {};
+
+  // Panels
+  var panels = 
+  {
+    right:
+    {
+      on: true,
+      container: document.createElement('td'),
+      panels: []
+    },
+    left:
+    {
+      on: true,
+      container: document.createElement('td'),
+      panels: []
+    },
+    top:
+    {
+      on: true,
+      container: document.createElement('td'),
+      panels: []
+    },
+    bottom:
+    {
+      on: true,
+      container: document.createElement('td'),
+      panels: []
+    }
+  };
+
+  for ( var i in panels )
+  {
+    if(!panels[i].container) { continue; } // prevent iterating over wrong type
+    panels[i].div = panels[i].container; // legacy
+    panels[i].container.className = 'panels ' + i;
+    Xinha.freeLater(panels[i], 'container');
+    Xinha.freeLater(panels[i], 'div');
+  }
+  // finally store the variable
+  this._panels = panels;
+
+  Xinha.freeLater(this, '_textArea');
 }
 
@@ -1499 +1523 @@
 Xinha.prototype.generate = function ()
 {
+  if ( !Xinha.isSupportedBrowser ) return;
+  
   var i;
   var editor = this;  // we'll need "this" in some nested functions
@@ -2612 +2638 @@
 Xinha.prototype.registerPlugin = function()
 {
+  if ( !Xinha.isSupportedBrowser ) return; 
+  
   var plugin = arguments[0];
 
@@ -2675 +2703 @@
 Xinha.loadPlugin = function(pluginName, callback, plugin_file)
 {
+  if ( !Xinha.isSupportedBrowser ) return;
+  
   // @todo : try to avoid the use of eval()
   // Might already be loaded
@@ -2701 +2731 @@
 Xinha.loadPlugins = function(plugins, callbackIfNotReady)
 {
+  if ( !Xinha.isSupportedBrowser ) return;
+  
   // Rip the ones that are loaded and look for ones that have failed
   var retVal = true;
@@ -4376 +4408 @@
 };
 
-Xinha.checkSupportedBrowser = function()
-{
-  if ( Xinha.is_gecko )
-  {
-    if ( navigator.productSub < 20021201 )
-    {
-      alert("You need at least Mozilla-1.3 Alpha.\nSorry, your Gecko is not supported.");
-      return false;
-    }
-    if ( navigator.productSub < 20030210 )
-    {
-      alert("Mozilla < 1.3 Beta is not supported!\nI'll try, though, but it might not work.");
-    }
-  }
-  if ( Xinha.is_opera )
-  {
-    alert("Sorry, Opera is not yet supported by Xinha.");
-  }
-  return Xinha.is_gecko || (Xinha.is_opera && Xinha.opera_version >= 9.1) || Xinha.ie_version >= 5.5;
-};
-
 // selection & ranges
 
@@ -5379 +5390 @@
 Xinha.makeEditors = function(editor_names, default_config, plugin_names)
 {
+  if ( !Xinha.isSupportedBrowser ) return;
+  
   if ( typeof default_config == 'function' )
   {
@@ -5401 +5414 @@
 Xinha.startEditors = function(editors)
 {
+  if ( !Xinha.isSupportedBrowser ) return;
+  
   for ( var i in editors )
   {
@@ -5412 +5427 @@
 Xinha.prototype.registerPlugins = function(plugin_names)
 {
+  if ( !Xinha.isSupportedBrowser ) return;
+  
   if ( plugin_names )
   {

trunk/plugins/Equation/example.html

@@ -23 +23 @@
 <pre>
 
-  &lt;!-- This block is optional configuration --&lt;
+  &lt;!-- This block is optional configuration --&gt;
   &lt;script type="text/javascript"&gt;
     var mathcolor = "black"; // You may change the color of the formulae (default: red)
@@ -29 +29 @@
     var mathfontfamily = "Arial"; //and the font (default: serif, which is good I think)
   &lt;/script&gt;
-  &lt;!-- THIS LOADS THE ACTUAL SCRIPT --&lt;
-  &lt;script type="text/javascript" src="ASCIIMathML.js"&gt;&lt;/script&gt;
+  &lt;!-- THIS LOADS THE ACTUAL SCRIPT, PLEASE ADJUST THE URL --&lt;
+  &lt;script type="text/javascript" src="/xinha/plugins/Equation/ASCIIMathML.js"&gt;&lt;/script&gt;
 
 

trunk/plugins/SuperClean/tidy.php

@@ -116 +116 @@
     ob_end_clean();
 
-    if(!strlen($content))
+    if(strlen($content) < 4)
     {
       // Tidy on the local machine failed, try a post