Changeset 505

Timestamp:

05/01/06 03:38:53 (7 years ago)

Author:

gogo

Message:

Probable fix for #630

Location:

trunk

Files:

• htmlarea.js (modified) (3 diffs)
• plugins/FormOperations/form-operations.js (modified) (2 diffs)

trunk/htmlarea.js

@@ -1973 +1973 @@
 HTMLArea.prototype.hidePanel = function(panel)
 {
-  if ( panel )
+  if ( panel && panel.style.display != 'none' )
   {
     panel.style.display = 'none';
@@ -1982 +1982 @@
 HTMLArea.prototype.showPanel = function(panel)
 {
-  if ( panel )
+  if ( panel && panel.style.display == 'none' )
   {
     panel.style.display = '';
@@ -5159 +5159 @@
   if ( typeof this.config.stripSelfNamedAnchors != 'undefined' && this.config.stripSelfNamedAnchors )
   {
-    var stripRe = new RegExp(document.location.href.replace(/&/g,'&').replace(HTMLArea.RE_Specials, '\\$1') + '(#[^\'" ]*)', 'g');
+    var stripRe = new RegExp(document.location.href.replace(HTMLArea.RE_Specials, '\\$1') + '(#[^\'" ]*)', 'g');
     html = html.replace(stripRe, '$1');
   }

trunk/plugins/FormOperations/form-operations.js

@@ -228 +228 @@
 
     var tag = activeElement.tagName.toLowerCase();
-    this.panel.show();
-
+    
     this.hideAll();
     if(tag === 'form')
@@ -311 +310 @@
       }
     }
+    
+    this.panel.show();
+    
     //this.editor.scrollToElement(activeElement);
     this.activeElement = activeElement;