Merge branch 'master' of github.com:sstephenson/prototype

Author: savetheclocktower

src/prototype/ajax.js

@@ -63,6 +63,13 @@
  *  * `requestHeaders` ([[Object]]): A set of key-value pairs, with properties
  *    representing header names.
  *  * `evalJS` ([[Boolean]] | [[String]]; default `true`): Automatically `eval`s
+ *    the content of [[Ajax.Response#responseText]] if the `Content-type` returned
+ *    by the server is set to one of `text/javascript`, `application/ecmascript`
+ *    (matches expression `(text|application)\/(x-)?(java|ecma)script`).
+ *    If the request doesn't obey same-origin policy, the content is not evaluated.
+ *    If you need to force evalutation, pass `'force'`. To prevent it altogether,
+ *    pass `false`.
+ *  * `evalJSON` ([[Boolean]] | [[String]]; default `true`): Automatically `eval`s
  *    the content of [[Ajax.Response#responseText]] and populates
  *    [[Ajax.Response#responseJSON]] with it if the `Content-type` returned by
  *    the server is set to `application/json`. If the request doesn't obey

src/prototype/dom/layout.js

@@ -1,4 +1,3 @@
-
 (function() {
 
   // Converts a CSS percentage value to a decimal.
@@ -1504,20 +1503,24 @@
     // Find page position of source.    
     source  = $(source);
     element = $(element);    
-    var p = Element.viewportOffset(source), delta = [0, 0];
-    
-    // A delta of 0/0 will work for `positioned: fixed` elements, but
-    // for `position: absolute` we need to get the parent's offset.
-    if (Element.getStyle(element, 'position') === 'absolute') {
-      var parent = Element.getOffsetParent(element);
-      if (parent !== document.body) delta = Element.viewportOffset(parent);
+    var p, delta, layout, styles = {};
+
+    if (options.setLeft || options.setTop) {
+      p = Element.viewportOffset(source);
+      delta = [0, 0];
+      // A delta of 0/0 will work for `positioned: fixed` elements, but
+      // for `position: absolute` we need to get the parent's offset.
+      if (Element.getStyle(element, 'position') === 'absolute') {
+        var parent = Element.getOffsetParent(element);
+        if (parent !== document.body) delta = Element.viewportOffset(parent);
+      }
     }
-    
-    var layout = Element.getLayout(source);
-    
+
+    if (options.setWidth || options.setHeight) {
+      layout = Element.getLayout(source);
+    }
+
     // Set position.
-    var styles = {};
-    
     if (options.setLeft)
       styles.left = (p[0] - delta[0] + options.offsetLeft) + 'px';
     if (options.setTop)

src/prototype/lang/object.js

@@ -190,7 +190,9 @@
       case 'object':
 
         for (var i = 0, length = stack.length; i < length; i++) {
-          if (stack[i] === value) { throw new TypeError(); }
+          if (stack[i] === value) {
+            throw new TypeError("Cyclic reference to '" + value + "' in object");
+          }
         }
         stack.push(value);
 

src/prototype/lang/string.js

@@ -177,7 +177,7 @@ Object.extend(String.prototype, (function() {
    *  ##### Examples
    *  
    *      'apple, pear & orange'.scan(/\w+/, alert);
-   *      // -> 'apple pear orange' (and displays 'apple', 'pear' and 'orange' in three successive alert dialogs)
+   *      // -> 'apple pear & orange' (and displays 'apple', 'pear' and 'orange' in three successive alert dialogs)
    *  
    *  Can be used to populate an array:
    *  
@@ -382,11 +382,9 @@ Object.extend(String.prototype, (function() {
    *      }
    *
    *  (You can leave off the `window.` part of that, but it's bad form.)   
-   *  Evaluates the content of any `script` block present in the string. Returns
-   *  an array containing the value returned by each script.
   **/
   function evalScripts() {
-    return this.extractScripts().map(function(script) { return eval(script) });
+    return this.extractScripts().map(function(script) { return eval(script); });
   }
 
   /** related to: String#unescapeHTML
@@ -451,7 +449,7 @@ Object.extend(String.prototype, (function() {
    *      'section=blog&id=45'.toQueryParams();
    *      // -> {section: 'blog', id: '45'}
    *      
-   *      'section=blog;id=45'.toQueryParams();
+   *      'section=blog;id=45'.toQueryParams(';');
    *      // -> {section: 'blog', id: '45'}
    *      
    *      'http://www.example.com?section=blog&id=45#comments'.toQueryParams();

test/unit/selector_test.js

@@ -285,9 +285,9 @@ new Test.Unit.Runner({
   },
 
   testSelectorWithEnabledDisabledChecked: function() {
-    this.assertEnumEqual([$('disabled_text_field')], $$('#troubleForm > *:disabled'));
-    this.assertEnumEqual($('troubleForm').getInputs().without($('disabled_text_field'), $('hidden')), $$('#troubleForm > *:enabled'));
-    this.assertEnumEqual($('checked_box', 'checked_radio'), $$('#troubleForm *:checked'));
+    this.assertEnumEqual([$('disabled_text_field')], $$('#troubleForm > *:disabled'), ':disabled');
+    this.assertEnumEqual($('troubleForm').getInputs().without($('disabled_text_field'), $('hidden')), $$('#troubleForm > *:enabled'), ':enabled');
+    this.assertEnumEqual($('checked_box', 'checked_radio'), $$('#troubleForm *:checked'), ':checked');
   },
 
   testSelectorWithEmpty: function() {