Changeset 797

Timestamp:

03/27/07 23:14:46 (6 years ago)

Author:

ray

Message:

some work on the loading messages.

• added functions for adding loading messages for textareas (before Xinha has loaded)
  
• moved creating of loading message into separate function
  
• added translations (translators see wiki/TranslationChanges)
  

_getback() & _loadback(): added URL to error message

added function to calculate the page size

some changes in popups.js

Location:

trunk

Files:

• XinhaCore.js (modified) (20 diffs)
• popups/popup.js (modified) (2 diffs)

trunk/XinhaCore.js

@@ -182 +182 @@
     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");
+
+  if ( document.getElementById("loading_" + textarea.id) || this.config.showLoading )
+  {
+    if (!document.getElementById("loading_" + textarea.id))
+    {
+      Xinha.createLoadingMessage(textarea);
+    }
+    this.setLoadingMessage(Xinha._lc("Constructing object"));
   }
 
@@ -731 +703 @@
     side = 'right';
   }
-  this.setLoadingMessage('Register panel ' + side);
+  this.setLoadingMessage('Register ' + side + ' panel ');
   var panel = this.addPanel(side);
   if ( object )
@@ -981 +953 @@
 Xinha.prototype._createToolbar = function ()
 {
-  this.setLoadingMessage('Create Toolbar');
+  this.setLoadingMessage(Xinha._lc('Create Toolbar'));
   var editor = this;    // to access this in nested functions
 
@@ -1314 +1286 @@
         function(ev)
         {
+          ev = Xinha.is_ie ? window.event : ev;
+          editor.btnClickEvent = ev;
           if ( obj.enabled )
           {
@@ -1323 +1297 @@
             }
             obj.cmd(editor, obj.name, obj);
-            Xinha._stopEvent(Xinha.is_ie ? window.event : ev);
+            Xinha._stopEvent(ev);
           }
         }
@@ -1502 +1476 @@
 Xinha.prototype._createStatusBar = function()
 {
-  this.setLoadingMessage('Create StatusBar');
+  this.setLoadingMessage(Xinha._lc('Create Statusbar'));
   var statusbar = document.createElement("div");
   statusbar.className = "statusBar";
@@ -1542 +1516 @@
   var i;
   var editor = this;  // we'll need "this" in some nested functions
-  
-  this.setLoadingMessage("Generate Xinha object");
-  
   var url;
+  
+  if (!document.getElementById("XinhaCoreDesign"))
+  {
+    Xinha.loadStyle(typeof _editor_css == "string" ? _editor_css : "Xinha.css",null,"XinhaCoreDesign");
+  }
   
   // Now load a specific browser plugin which will implement the above for us.
@@ -1697 +1673 @@
   // create the editor framework, yah, table layout I know, but much easier
   // to get it working correctly this way, sorry about that, patches welcome.
-
+  
+  this.setLoadingMessage(Xinha._lc('Generate Xinha framework'));
+  
   this._framework =
   {
@@ -1875 +1853 @@
   // Initalize size
   editor.initSize();
-
+  this.setLoadingMessage(Xinha._lc('Finishing'));
   // Add an event to initialize the iframe once loaded.
   editor._iframeLoadDone = false;
@@ -1931 +1909 @@
 Xinha.prototype.initSize = function()
 {
-  this.setLoadingMessage('Init editor size');
+  this.setLoadingMessage(Xinha._lc('Init editor size'));
   var editor = this;
   var width = null;
@@ -2374 +2352 @@
 Xinha.prototype.initIframe = function()
 {
-  this.setLoadingMessage('Init IFrame');
   this.disableToolbar();
   var doc = null;
@@ -2734 +2711 @@
 {
   if ( !Xinha.isSupportedBrowser ) return;
-
+  
+  Xinha.setLoadingMessage (Xinha._lc("Loading plugin $plugin="+pluginName+"$"));
   // @todo : try to avoid the use of eval()
   // Might already be loaded
@@ -2897 +2875 @@
 }
 
-Xinha.loadStyle = function(style, plugin)
+Xinha.loadStyle = function(style, plugin, id)
 {
   var url = _editor_url || '';
-  if ( typeof plugin != "undefined" )
+  if ( plugin )
   {
     url += "plugins/" + plugin + "/";
@@ -2918 +2896 @@
   link.rel = "stylesheet";
   link.href = url;
+  if (id) link.id = id;
   head.appendChild(link);
-  //document.write("<style type='text/css'>@import url(" + url + ");</style>");
-};
-Xinha.loadStyle(typeof _editor_css == "string" ? _editor_css : "Xinha.css");
+};
+
 
 /***************************************************
@@ -5090 +5068 @@
       else
       {
-        alert('An error has occurred: ' + req.statusText);
+        alert('An error has occurred: ' + req.statusText + '\nURL: ' + url);
       }
     }
@@ -5118 +5096 @@
       else
       {
-        alert('An error has occurred: ' + req.statusText);
+        alert('An error has occurred: ' + req.statusText + '\nURL: ' + url);
       }
     }
@@ -5233 +5211 @@
     else
     {
+      Xinha.setLoadingMessage("Loading language");
       url = _editor_url+"lang/"+_editor_lang+".js";
     }
@@ -5494 +5473 @@
     for ( var i = 0; i < plugin_names.length; i++ )
     {
-      this.setLoadingMessage('Register plugin $plugin', 'Xinha', {'plugin': plugin_names[i]});
+      this.setLoadingMessage(Xinha._lc('Register plugin $plugin', 'Xinha', {'plugin': plugin_names[i]}));
       this.registerPlugin(plugin_names[i]);
     }
@@ -5626 +5605 @@
     y = scope.document.body.clientHeight;
   }
+  return {'x':x,'y':y};
+};
+
+Xinha.pageSize = function(scope)
+{
+  scope = (scope) ? scope : window;
+  var x,y;
+ 
+  var test1 = scope.document.body.scrollHeight; //IE Quirks
+  var test2 = scope.document.documentElement.scrollHeight; // IE Standard + Moz Here quirksmode.org errs! 
+
+  if (test1 > test2) 
+  {
+    x = scope.document.body.scrollWidth;
+    y = scope.document.body.scrollHeight;
+  }
+  else
+  {
+    x = scope.document.documentElement.scrollWidth;
+    y = scope.document.documentElement.scrollHeight;
+  }  
   return {'x':x,'y':y};
 };
@@ -5705 +5705 @@
 };
 
-Xinha.prototype.setLoadingMessage = function(string, context, replace)
-{
-  if ( !this.config.showLoading || !document.getElementById("loading_sub_" + this._textArea.name) )
+Xinha.createLoadingMessages = function(xinha_editors)
+{
+  if ( Xinha.loadingMessages || !Xinha.isSupportedBrowser ) 
   {
     return;
   }
-  var elt = document.getElementById("loading_sub_" + this._textArea.name);
-  elt.innerHTML = Xinha._lc(string, context, replace);
+  Xinha.loadingMessages = [];
+  
+  for (var i=0;i<xinha_editors.length;i++)
+  {
+     Xinha.loadingMessages.push(Xinha.createLoadingMessage(Xinha.getElementById('textarea', xinha_editors[i])));
+  }
+};
+
+Xinha.createLoadingMessage = function(textarea,text)
+{ 
+  if ( document.getElementById("loading_" + textarea.id) || !Xinha.isSupportedBrowser)
+  {
+    return;
+  }
+  // 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.id;
+  loading_message.className = "loading";
+  
+  loading_message.style.left = Xinha.findPosX(textarea) +  'px';
+  loading_message.style.top = (Xinha.findPosY(textarea) + textarea.offsetHeight / 2) - 50 +  'px';
+  loading_message.style.width =  textarea.offsetWidth +  'px';
+  
+  // main static message
+  var loading_main = document.createElement("div");
+  loading_main.className = "loading_main";
+  loading_main.id = "loading_main_" + textarea.id;
+  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.id;
+  text = text ? text : Xinha._lc("Constructing object");
+  loading_sub.appendChild(document.createTextNode(text));
+  loading_message.appendChild(loading_main);
+  loading_message.appendChild(loading_sub);
+  document.body.appendChild(loading_message);
+  
+  Xinha.freeLater(loading_message);
+  Xinha.freeLater(loading_main);
+  Xinha.freeLater(loading_sub);
+  
+  return loading_sub;
+};
+
+Xinha.prototype.setLoadingMessage = function(subMessage, mainMessage)
+{
+  if ( !document.getElementById("loading_sub_" + this._textArea.id) )
+  {
+    return;
+  }
+  document.getElementById("loading_main_" + this._textArea.id).innerHTML = mainMessage ? mainMessage : Xinha._lc("Loading in progress. Please wait!");
+  document.getElementById("loading_sub_" + this._textArea.id).innerHTML = subMessage;
+};
+
+Xinha.setLoadingMessage = function(string)
+{
+  if (!Xinha.loadingMessages) return;  
+  for ( var i = 0; i < Xinha.loadingMessages.length; i++ )
+  {
+    Xinha.loadingMessages[i].innerHTML = string;
+  }
 };
 
 Xinha.prototype.removeLoadingMessage = function()
 {
-  if ( !this.config.showLoading || !document.getElementById("loading_" + this._textArea.name) )
-  {
-    return ;
-  }
-  document.body.removeChild(document.getElementById("loading_" + this._textArea.name));
+  if (document.getElementById("loading_" + this._textArea.id) )
+  {
+   document.body.removeChild(document.getElementById("loading_" + this._textArea.id));
+  }
+};
+
+Xinha.removeLoadingMessages = function(xinha_editors)
+{
+  for (var i=0;i< xinha_editors.length;i++)
+  {
+     var main = document.getElementById("loading_" + document.getElementById(xinha_editors[i]).id);
+     main.parentNode.removeChild(main);
+  }
+  Xinha.loadingMessages = null;
 };
 

trunk/popups/popup.js

@@ -45 +45 @@
   if(window.__dlg_init_done) return true;
   
-  if(window.opener._editor_skin != "") {
+  if(window.opener._editor_skin) {
     var head = document.getElementsByTagName("head")[0];
     var link = document.createElement("link");
@@ -55 +55 @@
         window.dialogArguments = opener.Dialog._arguments;
 
-  var body = document.body;
+  var page = Xinha.pageSize(window);
   if ( !win_dim )
   {
-   var dim = Xinha.viewportSize(window);
-    win_dim = {width:dim.x, height: body.scrollHeight};
+    win_dim = {width:page.x, height: page.y};
   }
   window.resizeTo(win_dim.width, win_dim.height);
 
   var dim = Xinha.viewportSize(window);
-  window.resizeBy(0, body.scrollHeight - dim.y);
+
+  window.resizeBy(0, page.y - dim.y);
 
   if(win_dim.top && win_dim.left)