Changeset 2282

Timestamp:

09/21/05 08:11:51 (3 years ago)

Author:

madrobby

Message:

script.aculo.us: Fixed a bug with Safari and the InPlaceEditor with form submission. Add support for interpreting simple <br>s into linebreaks. [Jon Tirsen]

Files:

• spinoffs/scriptaculous/CHANGELOG (modified) (1 diff)
• spinoffs/scriptaculous/src/controls.js (modified) (5 diffs)
• spinoffs/scriptaculous/test/unit/ajax_inplaceeditor_test.html (modified) (3 diffs)

spinoffs/scriptaculous/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed a bug with Safari and the InPlaceEditor with form submission. Add support for interpreting simple <br>s into linebreaks. [Jon Tirsen]
-
-* New Control.Slider() for horizontal and vertical sliders [Marty Haught]

spinoffs/scriptaculous/src/controls.js

@@ -459 +459 @@
-        return Form.serialize(form);
-      },
+      handleLineBreaks: true,
-      loadingText: 'Loading...',
-      savingClassName: 'inplaceeditor-saving',
@@ -511 +512 @@
-    this.element.parentNode.insertBefore(this.form, this.element);
-    Field.focus(this.editField);
+    // stop the event to avoid a page refresh in Safari
+    if (arguments.length > 1) {
+      Event.stop(arguments[0]);
+    }
-  },
-  getForm: function() {
@@ -537 +542 @@
-    return form;
-  },
+  hasHTMLLineBreaks: function(string) {
+    if (!this.options.handleLineBreaks) return false;
+    return string.match(/<br/i) || string.match(/<p>/i);
+  },
+  convertHTMLLineBreaks: function(string) {
+    return string.replace(/<br>/gi, "\n").replace(/<br\/>/gi, "\n").replace(/<\/p>/gi, "\n").replace(/<p>/gi, "");
+  },
-  createEditField: function(form) {
-
+ && !this.hasHTMLLineBreaks(this.getText())
-      this.options.textarea = false;
-      var textField = document.createElement("input");
@@ -554 +566 @@
-      var textArea = document.createElement("textarea");
-      textArea.name = "value";
-getText(
+convertHTMLLineBreaks(this.getText()
-      textArea.rows = this.options.rows;
-      textArea.cols = this.options.cols || 40;
@@ -610 +622 @@
-    );
-    this.onLoading();
+    // stop the event to avoid a page refresh in Safari
+    if (arguments.length > 1) {
+      Event.stop(arguments[0]);
+    }
-    return false;
-  },

spinoffs/scriptaculous/test/unit/ajax_inplaceeditor_test.html

@@ -22 +22 @@
-<a id="tobeeditedEditControl" href="#">edit</a>
-
+<div id="tobeeditedMultiLine">First line<br/>Second line<br/>Third line</div>
-
-<!-- Tests follow -->
@@ -32 +33 @@
-      inPlaceEditor = new Ajax.InPlaceEditor($('tobeedited'), '_ajax_inplaceeditor_result.html', {
-        externalControl: $('tobeeditedEditControl'),
+        ajaxOptions: {method: 'get'} //override so we can use a static for the result
+      });
+      inPlaceEditorMultiLine = new Ajax.InPlaceEditor($('tobeeditedMultiLine'), '_ajax_inplaceeditor_result.html', {
-        ajaxOptions: {method: 'get'} //override so we can use a static for the result
-      });
@@ -167 +171 @@
-      Event.simulateMouse(document.forms[0].childNodes[2],'click');
-      assertVisible($('tobeeditedEditControl'));
+    }},
+    
+    testHasLineBreaksDetectsHTMLLineBreaks: function() { with(this) {
+      assert(inPlaceEditorMultiLine.hasHTMLLineBreaks("Line 1<br/>Line 2"));
+      assert(inPlaceEditorMultiLine.hasHTMLLineBreaks("Line 1<br>Line 2"));
+      assert(inPlaceEditorMultiLine.hasHTMLLineBreaks("<p>Line 1</p>Line 2"));
+      assert(inPlaceEditorMultiLine.hasHTMLLineBreaks("Line 1<BR/>Line 2"));
+      assert(inPlaceEditorMultiLine.hasHTMLLineBreaks("Line 1<BR>Line 2"));
+      assert(inPlaceEditorMultiLine.hasHTMLLineBreaks("<P>Line 1</P>Line 2"));
+      assert(inPlaceEditorMultiLine.hasHTMLLineBreaks("<P>Line 1<P>Line 2"));
+      assert(!inPlaceEditorMultiLine.hasHTMLLineBreaks("One line"));
+    }},
+    
+    testConvertsHTMLLineBreaksIntoNewLines: function() { with(this) {
+      assertEqual("Line 1\nLine 2", inPlaceEditorMultiLine.convertHTMLLineBreaks("Line 1<br/>Line 2"));
+      assertEqual("Line 1\nLine 2", inPlaceEditorMultiLine.convertHTMLLineBreaks("Line 1<br>Line 2"));
+      // <p> not supported (too hard)
+      //assertEqual("Line 1\nLine 2", inPlaceEditorMultiLine.convertHTMLLineBreaks("<p>Line 1</p>Line 2"));
+      assertEqual("Line 1\nLine 2", inPlaceEditorMultiLine.convertHTMLLineBreaks("Line 1<BR/>Line 2"));
+      assertEqual("Line 1\nLine 2", inPlaceEditorMultiLine.convertHTMLLineBreaks("Line 1<BR>Line 2"));
+      // <p> not supported (too hard)
+      //assertEqual("Line 1\nLine 2", inPlaceEditorMultiLine.convertHTMLLineBreaks("<P>Line 1</P>Line 2"));
+      // unclosed <P>s not supported yet
+      //assertEqual("Line 1\nLine 2", inPlaceEditorMultiLine.convertHTMLLineBreaks("<P>Line 1<P>Line 2"));
+      // <p> not supported (too hard)
+      //assertEqual("Line 1\nLine 2\nLine 3\nLine 4", inPlaceEditorMultiLine.convertHTMLLineBreaks("<P>Line 1</P>Line 2<br>Line 3<p>Line 4</P>"));
+      assertEqual("One line", inPlaceEditorMultiLine.convertHTMLLineBreaks("One line"));
+    }},
+    
+    testConvertsParagraphsAndBRsIntoLineBreaks: function() { with(this) {
+      inPlaceEditorMultiLine.enterEditMode();
+      assertEqual("TEXTAREA", document.forms[0].firstChild.tagName);
+      assertEqual("First line\nSecond line\nThird line", document.forms[0].firstChild.value)
+      // doesn't automatically determine size yet
+      //assertEqual(3, document.forms[0].firstChild.rows);
-    }}
-