Ticket #7907: insertions-includes-ticket-7903.diff

test/unit/dom.html

@@ -261 +261 @@
-<p id="test-full">content</p>
-<div id="ancestor"><div id="child"><div><div id="great-grand-child"></div></div></div></div>
-<div id="not-in-the-family"></div>
+
+<div id="insertions-container"><div id="insertions-main"><p>some content.</p></div></div>
+<div id="insertions-node-container"><div id="insertions-node-main"><p>some content.</p></div></div>
+<div id="element-insertions-container"><div id="element-insertions-main"><p>some content.</p></div></div>
+<div id="wrap-container"><p id="wrap"></p></div>
-<!-- Tests follow -->
-<script type="text/javascript" language="javascript" charset="utf-8">
-// <![CDATA[
-
-  var testVar = 'to be updated';
-
+
+
+
-  Element.addMethods("LI", {
-    pancakes: function(element) { return "pancakes"; }
-  });
@@ -303 +310 @@
-      assertElementsMatch(document.getElementsByClassName('B', 'class_names'), 'ul#class_names_ul.A.B', 'div.B.C.D');
-      assertElementsMatch(document.getElementsByClassName('B', 'class_names_ul'));
-    }},
+
+    testInsertionWithHTML: function() {with(this) {
+      new Insertion.Before('insertions-main', '<p><em>before</em> text</p><p>more testing</p>');
+      assert(getInnerHTML('insertions-container').startsWith('<p><em>before</em> text</p><p>more testing</p>'));
+      new Insertion.After('insertions-main', '<p><em>after</em> text</p><p>more testing</p>');
+      assert(getInnerHTML('insertions-container').endsWith('<p><em>after</em> text</p><p>more testing</p>'));
+      new Insertion.Top('insertions-main', '<p><em>top</em> text.</p><p>more testing</p>');
+      assert(getInnerHTML('insertions-main').startsWith('<p><em>top</em> text.</p><p>more testing</p>'));
+      new Insertion.Bottom('insertions-main', '<p><em>bottom</em> text.</p><p>more testing</p>');
+      assert(getInnerHTML('insertions-main').endsWith('<p><em>bottom</em> text.</p><p>more testing</p>'));
+    }},
+
+    testInsertionWithDOMNode: function() {with(this) {
+      var createParagraph = function(text) {
+        var p = document.createElement('p');
+        p.appendChild(document.createTextNode(text));
+        return p;
+      }
+      new Insertion.Before('insertions-node-main', createParagraph('node before'));
+      assert(getInnerHTML('insertions-node-container').startsWith('<p>node before</p>'));
+      new Insertion.After('insertions-node-main', createParagraph('node after'));
+      assert(getInnerHTML('insertions-node-container').endsWith('<p>node after</p>'));
+      new Insertion.Top('insertions-node-main', createParagraph('node top'));
+      assert(getInnerHTML('insertions-node-main').startsWith('<p>node top</p>'));
+      new Insertion.Bottom('insertions-node-main', createParagraph('node bottom'));
+      assert(getInnerHTML('insertions-node-main').endsWith('<p>node bottom</p>'));
+    }},
-    
-
+
+
+
+
+
+
-      new Insertion.After('second_row', '<tr id="third_row"><td>Third Row</td></tr>');
-      assert($('second_row').descendantOf('table'));
-    }},
-
+
-    testElementVisible: function(){with(this) {
-      assertNotEqual('none', $('test-visible').style.display);
-      assertEqual('none', $('test-hidden').style.display);
@@ -419 +458 @@
-        });
-      });
-    }},
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    testElementSelectorMethod: function() {with(this) {
-      var testSelector = $('container').getElementsBySelector('p.test');
-      assertEqual(testSelector.length, 4);

test/unit/base.html

@@ -120 +120 @@
-      assertEqual('I\'m a div with id test', Object.toJSON(element));
-    }},
-    
+    testObjectIs: function() { with(this) {
+      var types = [true, false, 0, 1, '', 'text', null, undefined, [], {}, $H({}), new Hash({}), document.createElement('div'), Prototype.K];
+      $H({isObject: [false, false, false, false, false, false, true, false, true, true, true, true, true, false],
+        isFunction: [false, false, false, false, false, false, false, false, false, false, false, false, false, true],
+        isArray: [ false, false, false, false, false, false, false, false, true, false, false, false, false, false],
+        isHash: [ false, false, false, false, false, false, false, false, false, false, true, true, false, false],
+        isString: [ false, false, false, false, true, true,  false, false, false, false, false, false, false, false],
+        isNumber: [ false, false, true, true, false, false, false, false, false, false, false, false, false, false],
+        isBoolean: [true, true,  false, false, false, false, false, false, false, false, false, false, false, false],
+        isUndefined: [false, false, false, false, false, false, false, true, false, false, false, false, false, false],
+        isNull: [ false, false, false, false, false, false, true, false, false, false, false, false, false, false],
+        isDefined: [true, true, true, true, true, true, true, false, true, true, true, true, true, true],
+        isNullOrUndefined: [false, false, false, false, false, false, true, true, false, false, false, false, false, false],
+        isElement: [false, false, false, false, false, false, false, false, false, false, false, false, true, false],
+        isEnumerable: [false, false, false, false, false, false, false, false, true, false, true, true, false, false]
+      }).each(function(item){
+        item.value.zip(types).each(function(args) {
+          assertIdentical(args[0], Object[item.key](args[1]));
+        });
+      });
+    }},    
+    
-    // sanity check
-    testDoesntExtendObjectPrototype: function() {with(this) {
-      // for-in is supported with objects

src/string.js

@@ -1 +1 @@
-Object.extend(String, {
-  interpret: function(value) {
-value == null
+Object.isNullOrUndefined(value)
-  },
-  specialChar: {
-    '\b': '\\b',
@@ -31 +31 @@
-  
-  sub: function(pattern, replacement, count) {
-    replacement = this.gsub.prepareReplacement(replacement);
-count === undefined
+Object.isUndefined(count)
-    
-    return this.gsub(pattern, function(match) {
-      if (--count < 0) return match[0];
@@ -46 +46 @@
-  
-  truncate: function(length, truncation) {
-    length = length || 30;
-truncation === undefined
+Object.isUndefined(truncation)
-    return this.length > length ? 
-      this.slice(0, length - truncation.length) + truncation : this;
-  },
@@ -98 +98 @@
-        var name = decodeURIComponent(pair[0]);
-        var value = pair[1] ? decodeURIComponent(pair[1]) : undefined;
-
-hash[name] !== undefined
-hash[name].constructor != Array
+Object.isDefined(hash[name])
+!Object.isArray(hash[name])
-            hash[name] = [hash[name]];
-          if (value) hash[name].push(value);
-        }
@@ -193 +193 @@
-});
-
-String.prototype.gsub.prepareReplacement = function(replacement) {
-typeof replacement == 'function'
+Object.isFunction(replacement)
-  var template = new Template(replacement);
-  return function(match) { return template.evaluate(match) };
-}

src/base.js

@@ -18 +18 @@
-Object.extend(Object, {
-  inspect: function(object) {
-    try {
-object === undefined
-object === null
+Object.isUndefined(object)
+Object.isNull(object)
-      return object.inspect ? object.inspect() : object.toString();
-    } catch (e) {
-      if (e instanceof RangeError) return '...';
@@ -35 +35 @@
-      case 'unknown': return;
-      case 'boolean': return object.toString();
-    }
-object === null
+Object.isNull(object)
-    if (object.toJSON) return object.toJSON();
-object.ownerDocument === document
+Object.isElement(object)
-    var results = [];
-    for (var property in object) {
-      var value = Object.toJSON(object[property]);
-value !== undefined
+Object.isDefined(value)
-        results.push(property.toJSON() + ':' + value);
-    }
-    return '{' + results.join(',') + '}';
@@ -63 +63 @@
-  
-  clone: function(object) {
-    return Object.extend({}, object);
+  },
+  
+  isArray: function(object) { 
+    return !!(object && object.constructor === Array);
+  },
+  
+  isHash: function(object) { 
+    return object instanceof Hash;
+  },
+  
+  isUndefined: function(object) {
+    return object === undefined;
+  },
+  
+  isNull: function(object) {
+    return object === null;
+  },
+  
+  isDefined: function(object) {
+    return object !== undefined;
+  },
+  
+  isNullOrUndefined: function(object) {
+    return object == undefined;
+  },
+  
+  isElement: function(object) {
+    return !!(object && object.ownerDocument === document);
+  },
+  
+  isEnumerable: function(object) {
+    return !!(object && object.each === Enumerable.each);
-  }
-});
-
+(function(type) {
+  for(var i = 0, length = type.length; i < length; i++)
+    Object['is' + type[i]] = function(t) {
+      return function(object) {
+        return typeof object === t;
+      };
+    }(type[i].toLowerCase());
+}(['Number', 'Boolean', 'String', 'Function', 'Object']));
+
-Function.prototype.bind = function() {
-  var __method = this, args = $A(arguments), object = args.shift();
-  return function() {

src/array.js

@@ -13 +13 @@
-if (Prototype.Browser.WebKit) {
-  $A = Array.from = function(iterable) {
-    if (!iterable) return [];
-typeof iterable == 'function'
+Object.isFunction(iterable)
-      iterable.toArray) {
-      return iterable.toArray();
-    } else {
@@ -57 +57 @@
-  
-  flatten: function() {
-    return this.inject([], function(array, value) {
-value && value.constructor == Array
+Object.isArray(value)
-        value.flatten() : [value]);
-    });
-  },
@@ -107 +107 @@
-    var results = [];
-    this.each(function(object) {
-      var value = Object.toJSON(object);
-value !== undefined
+Object.isDefined(value)
-    });
-    return '[' + results.join(',') + ']';
-  }
@@ -125 +125 @@
-    var array = [];
-    for (var i = 0, length = this.length; i < length; i++) array.push(this[i]);
-    for (var i = 0, length = arguments.length; i < length; i++) {
-arguments[i].constructor == Array
+Object.isArray(arguments[i])
-        for (var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++) 
-          array.push(arguments[i][j]);
-      } else { 

src/dom.js

@@ -4 +4 @@
-      elements.push($(arguments[i]));
-    return elements;
-  }
-typeof element == 'string'
+Object.isString(element)
-    element = document.getElementById(element);
-  return Element.extend(element);
-}
@@ -59 +59 @@
-
-  for (var property in methods) {
-    var value = methods[property];
-typeof value == 'function'
+Object.isFunction(value)
-      element[property] = cache.findOrStore(value);
-  }
-
@@ -103 +103 @@
-  },
-
-  update: function(element, html) {
-typeof html == 'undefined'
+Object.isUndefined(html)
-    $(element).innerHTML = html.stripScripts();
-    setTimeout(function() {html.evalScripts()}, 10);
-    return element;
@@ -111 +111 @@
-  
-  replace: function(element, html) {
-    element = $(element);
-typeof html == 'undefined'
+Object.isUndefined(html)
-    if (element.outerHTML) {
-      element.outerHTML = html.stripScripts();
-    } else {
@@ -124 +124 @@
-    return element;
-  },
-  
+  append: function(element, content) {
+    element = $(element);
+    new Insertion.Bottom(element, content);
+    return element;
+  },
+  
+  prepend: function(element, content) {
+    element = $(element);
+    new Insertion.Top(element, content);
+    return element;
+  },
+  
+  addBefore: function(element, content) {
+    element = $(element);
+    new Insertion.Before(element, content);
+    return element;
+  },
+  
+  addAfter: function(element, content) {
+    element = $(element);
+    new Insertion.After(element, content);
+    return element;
+  },
+  
+  wrap: function(element, wrapper) {
+    element = $(element);
+    if(Object.isString(wrapper))
+      wrapper = document.createElement(wrapper);
+    element.parentNode.replaceChild(wrapper, element);
+    wrapper.appendChild(element);
+    return element;
+  },
+    
-  inspect: function(element) {
-    element = $(element);
-    var result = '<' + element.tagName.toLowerCase();
@@ -173 +206 @@
-  },
-  
-  match: function(element, selector) {
-typeof selector == 'string'
+Object.isString(selector)
-      selector = new Selector(selector);
-    return selector.match($(element));
-  },
@@ -329 +362 @@
-      if (property == 'opacity') element.setOpacity(styles[property])
-      else 
-        elementStyle[(property == 'float' || property == 'cssFloat') ?
-elementStyle.styleFloat === undefined
+Object.isUndefined(elementStyle.styleFloat)
-          (camelized ? property : property.camelize())] = styles[property];
-
-    return element;
@@ -463 +496 @@
-  // IE is missing .innerHTML support for TABLE-related elements
-  Element.Methods.update = function(element, html) {
-    element = $(element);
-typeof html == 'undefined'
+Object.isUndefined(html)
-    var tagName = element.tagName.toUpperCase();  
-    if (['THEAD','TBODY','TR','TD'].include(tagName)) {
-      var div = document.createElement('div');
@@ -575 +608 @@
-  
-  if (!tagName) Object.extend(Element.Methods, methods || {});  
-  else {
-tagName.constructor == Array
+Object.isArray(tagName)
-    else extend(tagName);
-  }
-  
@@ -629 +662 @@
-  if (F.SpecificElementExtensions) {
-    for (var tag in Element.Methods.ByTag) {
-      var klass = findDOMClass(tag);
-typeof klass == "undefined"
+Object.isUndefined(klass)
-      copy(T[tag], klass.prototype);
-    }
-  }  
@@ -646 +679 @@
-Abstract.Insertion.prototype = {
-  initialize: function(element, content) {
-    this.element = $(element);
+    if(Object.isElement(content)) return this.insertNode(content);
+    content = content.toString();
-    this.content = content.stripScripts();
-    
-    if (this.adjacency && this.element.insertAdjacentHTML) {
@@ -672 +707 @@
-    var div = document.createElement('div');
-    div.innerHTML = '<table><tbody>' + this.content + '</tbody></table>';
-    return $A(div.childNodes[0].childNodes[0].childNodes);
+  },
+  
+  insertContent: function(fragments) {
+    fragments.each(this.insertNode.bind(this));
-  }
-}
-
@@ -683 +722 @@
-    this.range.setStartBefore(this.element);
-  },
-  
-
-
-
-
+
+
-  }
-});
-
@@ -697 +734 @@
-    this.range.collapse(true);
-  },
-  
+  insertNode: function(node) {
+    this.element.insertBefore(node, this.element.firstChild);
+  },
+  
-  insertContent: function(fragments) {
-
-
-
+
-  }
-});
-
@@ -711 +750 @@
-    this.range.collapse(this.element);
-  },
-  
-
-
-
-
+
+
-  }
-});
-
@@ -724 +761 @@
-    this.range.setStartAfter(this.element);
-  },
-  
-
-
-
-
-
+
+
-  }
-});
-

src/enumerable.js

@@ -89 +89 @@
-  },
-  
-  inGroupsOf: function(number, fillWith) {
-fillWith === undefined
+Object.isUndefined(fillWith)
-    return this.eachSlice(number, function(slice) {
-      while(slice.length < number) slice.push(fillWith);
-      return slice;

src/selector.js

@@ -109 +109 @@
-    pseudo: function(m) {
-      var h = Selector.xpath.pseudos[m[1]];
-      if (!h) return '';
-typeof h === 'function'
+Object.isFunction(h)
-      return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m);
-    },
-    operators: {
@@ -375 +375 @@
-      var handler = Selector.operators[operator], results = [];
-      for (var i = 0, node; node = nodes[i]; i++) {
-        var nodeValue = Element.readAttribute(node, attr);
-nodeValue === null
+Object.isNull(nodeValue)
-        if (handler(nodeValue, value)) results.push(node);
-      }
-      return results;
@@ -529 +529 @@
-  },
-  
-  findElement: function(elements, expression, index) {
-typeof expression == 'number'
+Object.isNumber(expression)
-      index = expression; expression = false;
-    }
-    return Selector.matchElements(elements, expression || '*')[index || 0];

src/form.js

@@ -10 +10 @@
-        var key = element.name, value = $(element).getValue();
-        if (value != null) { 
-                if (key in result) {
-result[key].constructor != Array
+!Object.isArray(result[key])
-            result[key].push(value);
-          }
-          else result[key] = value;
@@ -91 +91 @@
-    options.parameters = form.serialize(true);
-    
-    if (params) {
-typeof params == 'string'
+Object.isString(params)
-      Object.extend(options.parameters, params);
-    }
-    

src/hash.js

@@ -1 +1 @@
-var Hash = function(object) {
-object instanceof Hash
+Object.isHash(object)
-  else Object.extend(this, object || {});
-};
-
@@ -12 +12 @@
-      if (!pair.key) return;
-      var value = pair.value;
-      
-typeof value == 'object'
-value.constructor == Array
+Object.isObject(value)
+Object.isArray(value)
-          parts.add(pair.key, value);
-        });
-        return;
@@ -28 +28 @@
-    var results = [];
-    this.prototype._each.call(object, function(pair) {
-      var value = Object.toJSON(pair.value);
-value !== undefined
+Object.isDefined(value)
-    });
-    return '{' + results.join(',') + '}';
-  }
-});
-
-Hash.toQueryString.addPair = function(key, value, prefix) {
-value == null
+Object.isNullOrUndefined(value)
-  key = encodeURIComponent(key);
-value == null
+Object.isNullOrUndefined(value)
-}
-
-Object.extend(Hash.prototype, Enumerable);
@@ -73 +73 @@
-    var result;
-    for(var i = 0, length = arguments.length; i < length; i++) {
-      var value = this[arguments[i]];
-value !== undefined
-result === undefined
+Object.isDefined(value)
+Object.isUndefined(result)
-        else {
-result.constructor != Array
+!Object.isArray(result)
-          result.push(value)
-        }
-      }
@@ -101 +101 @@
-});
-
-function $H(object) {
-object instanceof Hash
+Object.isHash(object)
-  return new Hash(object);
-};
-