rename methods

fntz · Oct 2, 2012 · bf83b37 · bf83b37
1 parent b8d7206
commit bf83b37
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/src/prototype/dom/dom.js b/src/prototype/dom/dom.js
@@ -685,7 +685,8 @@
         for (var i = 0, node; node = nodes[i]; i++)
           element.appendChild(node);
       } else {
-        element.innerHTML = content.stripScripts();
+        element.innerHTML = '';
+        element.appendChild(document.createTextNode(content.stripScripts()));
       }
     } else {
       element.innerHTML = content.stripScripts();

diff --git a/src/prototype/lang/hash.js b/src/prototype/lang/hash.js
@@ -105,61 +105,61 @@ var Hash = Class.create(Enumerable, (function() {
   }
 
   /**
-   *  Hash#each_key(iterator[, context]) -> Hash 
+   *  Hash#eachKey(iterator[, context]) -> Hash 
    * 
    *  Iterates over the keys in the hash.
    * 
    *  ##### Example
    *
    *      var hash = $H({England: 'London', Poland: 'Warsaw'});
    *
-   *      h.each_key(function(country) {
+   *      h.eachKey(function(country) {
    *        alert(country);
    *      });
    *      // Alerts: England
    *      // Alerts: Poland
    * 
   **/
-  function each_key(iterator, context) {
+  function eachKey(iterator, context) {
     this.keys().each(iterator, context);
   }  
 
   /**
-   *  Hash#each_value(iterator[, context]) -> Hash 
+   *  Hash#eachValue(iterator[, context]) -> Hash 
    * 
    *  Iterates over the values in the hash.
    * 
    *  ##### Example
    *
    *      var hash = $H({England: 'London', Poland: 'Warsaw'});
    *
-   *      h.each_value(function(capital) {
+   *      h.eachValue(function(capital) {
    *        alert(capital);
    *      });
    *      // Alerts: London
    *      // Alerts: Warsaw
   **/ 
-  function each_value(iterator, context) {
+  function eachValue(iterator, context) {
     this.values().each(iterator, context);
   }
 
   /**
-   *  Hash#each_pair(iterator[, context]) -> Hash 
+   *  Hash#eachPair(iterator[, context]) -> Hash 
    * 
    *  Iterates over the key/value pairs in the hash.
    *
    *  ##### Example
    *
    *      var hash = $H({England: 'London', Poland: 'Warsaw'});
    *
-   *      h.each_pair(function(country, capital) {
+   *      h.eachPair(function(country, capital) {
    *        alert(capital + "is the capital of " + country);
    *      });
    *      //Alerts: London is the capital of England 
    *      //Alerts: Warsaw is the capital of Poland
    * 
   **/
-  function each_pair(iterator, context) {
+  function eachPair(iterator, context) {
     this.each(function(pair) {
       iterator.call(context, pair.key, pair.value)
     });

diff --git a/test/unit/hash_test.js b/test/unit/hash_test.js
@@ -196,7 +196,7 @@ new Test.Unit.Runner({
   testIterationWithEachKey: function() {
     var hash = $H({a:1, b:2, c:3});
     var keys = [];
-    hash.each_key(function(key) {
+    hash.eachKey(function(key) {
       keys.push(key);
     });
     this.assertEnumEqual(['a', 'b', 'c'], keys);
@@ -205,7 +205,7 @@ new Test.Unit.Runner({
   testIterationWithEachValue: function() {
     var hash = $H({a:1, b:2, c:3});
     var values = [];
-    hash.each_value(function(value) {
+    hash.eachValue(function(value) {
       values.push(value);
     });
     this.assertEnumEqual([1, 2, 3], values);
@@ -215,7 +215,7 @@ new Test.Unit.Runner({
     var hash = $H({a:1, b:2, c:3});
     var keys = [];
     var values = [];
-    hash.each_pair(function(key, value) {
+    hash.eachPair(function(key, value) {
       keys.push(key);
       values.push(value);
     });