Changeset 672

Timestamp:

06/17/10 00:44:54 (2 years ago)

Author:

mr_lundis

Message:

Don't remove spans with inline styles - we allow that elsewhere, and we don't want to break the user's content. Fixes #207.

Location:

trunk/src/wymeditor

Files:

• jquery.wymeditor.mozilla.js (modified) (1 diff)
• jquery.wymeditor.safari.js (modified) (1 diff)

trunk/src/wymeditor/jquery.wymeditor.mozilla.js

@@ -252 +252 @@
 WYMeditor.WymClassMozilla.prototype.openBlockTag = function(tag, attributes)
 {
-  var attributes = this.validator.getValidTagAttributes(tag, attributes);
-
-  // Handle Mozilla styled spans
-  if(tag == 'span' && attributes.style){
-    var new_tag = this.getTagForStyle(attributes.style);
-    if(new_tag){
-      this._tag_stack.pop();
-      var tag = new_tag;
-      this._tag_stack.push(new_tag);
-      attributes.style = '';
-    }else{
-      return;
-    }
-  }
-  
-  this.output += this.helper.tag(tag, attributes, true);
+    var attributes = this.validator.getValidTagAttributes(tag, attributes);
+
+    // Handle Mozilla styled spans
+    if (tag == 'span' && attributes.style) {
+        var new_tag = this.getTagForStyle(attributes.style);
+        if (new_tag) {
+            tag = new_tag;
+            this._tag_stack.pop();
+            this._tag_stack.push(tag);
+            attributes.style = '';
+        }
+    }
+
+    this.output += this.helper.tag(tag, attributes, true);
 };
 

trunk/src/wymeditor/jquery.wymeditor.safari.js

@@ -219 +219 @@
 WYMeditor.WymClassSafari.prototype.openBlockTag = function(tag, attributes)
 {
-  var attributes = this.validator.getValidTagAttributes(tag, attributes);
-
-  // Handle Safari styled spans
-  if(tag == 'span' && attributes.style) {
-    var new_tag = this.getTagForStyle(attributes.style);
-    if(new_tag){
-      this._tag_stack.pop();
-      var tag = new_tag;
-      this._tag_stack.push(new_tag);
-      attributes.style = '';
-      
-      //should fix #125 - also removed the xhtml() override
-      if(typeof attributes['class'] == 'string')
-        attributes['class'] = attributes['class'].replace(/apple-style-span/gi, '');
-    
-    } else {
-      return;
-    }
-  }
-  
-  this.output += this.helper.tag(tag, attributes, true);
+    var attributes = this.validator.getValidTagAttributes(tag, attributes);
+
+    // Handle Safari styled spans
+    if (tag == 'span' && attributes.style) {
+        var new_tag = this.getTagForStyle(attributes.style);
+        if (new_tag) {
+            tag = new_tag;
+            this._tag_stack.pop();
+            this._tag_stack.push(tag);
+            attributes.style = '';
+
+            // Should fix #125 - also removed the xhtml() override
+            if(typeof attributes['class'] == 'string') {
+                attributes['class'] = attributes['class'].replace(/apple-style-span/gi, '');
+            }
+        }
+    }
+
+    this.output += this.helper.tag(tag, attributes, true);
 };