Merge branch 'InPlaceEditor.originalValue' into official

Author: mcast

src/controls.js

@@ -726,6 +726,11 @@ Ajax.InPlaceEditor = Class.create({
     this.element.style.backgroundColor = this._originalBackground;
     this.element.show();
   },
+  originalValue: function() {
+    // return deHTMLified value-before-edit, available
+    // during "callback" and before.
+    return (this._oldInnerHTML || this.element.innerHTML).unescapeHTML();
+  },
   triggerCallback: function(cbName, arg) {
     if ('function' == typeof this.options[cbName]) {
       this.options[cbName](this, arg);

test/functional/ajax_inplaceeditor_test.html

@@ -19,10 +19,15 @@ <h1>script.aculo.us Demo</h1>
 
 <h1 id="tobeedited">To be edited</h1>
 <script>
+$('tobeedited').widg =
 new Ajax.InPlaceEditor($('tobeedited'), '_ajax_inplaceeditor_result.html', {
         ajaxOptions: {method: 'get'} //override so we can use a static for the result
         });
 </script>
+<p>
+  originalValue: <b id="tbe_orig">(displayed here by button)</b>
+  <button onClick="$('tbe_orig').innerHTML = $('tobeedited').widg.originalValue().escapeHTML()"> Update </button>
+</p>
 
 <h1 id="tobeeditedblur">To be edited w/ blur</h1>
 <script>

test/unit/ajax_inplaceeditor_test.html

@@ -374,6 +374,30 @@ <h1 id="tobeedited">To be edited</h1>
       });
     }},
 
+    testOriginalValueAvailable: function() { with(this) {
+      var seen = {}; // results go here
+      $('newtbe').update('Old text &amp; before edit'); // start with known text (htmlified here)
+      var ipe = new Ajax.InPlaceEditor('newtbe', '_ajax_inplaceeditor_result2.html', {
+        callback: function(form, newval, thirdarg) {
+	  seen['new'] = newval;
+	  seen['old'] = ipe.originalValue();
+	  seen['thirdarg'] = thirdarg;
+          return 'foo=bar';
+        }
+      });
+      assertEqual("Old text & before edit", ipe.originalValue(), 'Original text before click');
+      Event.simulateMouse('newtbe', 'click');
+      ipe._controls.editor.value = "Text & typed in" // set <input type=text> contents
+      Event.simulateKey('newtbe', 'keydown', { keyCode: Event.KEY_RETURN });
+      wait(200, function() {
+        assertEqual("Text & typed in", seen['new'], 'New text for server');
+        assertEqual("Old text & before edit", seen['old'], 'Original text');
+        assertEqual("New to be edited - edited\n", $('newtbe').innerHTML, 'Text from server');
+        assertNull(seen['thirdarg'], 'There is no third arg, yet'); // maybe pass original value or ipe?
+        ipe.dispose();
+      });
+    }},
+
     testCallbackFunctionReturnTypes: function() { with(this) {
       var params = [];
       var responder = {