Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mootools/mootools-core
base: 1.2.5
...
head fork: mootools/mootools-core
compare: 1.2.6
Checking mergeability… Don't worry, you can still create the pull request.
  • 7 commits
  • 4 files changed
  • 0 commit comments
  • 3 contributors
Commits on Sep 14, 2010
@cpojer cpojer * Back to dev 0ef3054
Commits on Sep 21, 2010
@subtleGradient subtleGradient FIXED Bug: Cannot set html of TR elements in Firefox; Cleanup/Speedup…
… -- Don't add extra logic for browsers that don't need it.
fc8f77b
Commits on Jan 15, 2013
@arian arian Fix failing spec where .set("html") should accept an array with values. eaf9d3f
@arian arian Fixes #2402 for 1.2. Overwrite String contains with the MooTools vers…
…ion.

Firefox 18 implements .contains, and ES6 might do that as well. That breaks
some stuff, so we have to make sure it's overwritten with the 'correct'
MooTools version.
7057039
@arian arian Update specs af297bb
@arian arian Merge pull request #2462 from arian/1.2x
Fixes for 1.2.6
a3be7a0
Commits on Feb 15, 2013
@arian arian 1.2.6 fa66fa2
View
4 Source/Core/Core.js
@@ -21,8 +21,8 @@ provides: [MooTools, Native, Hash.base, Array.each, $util]
*/
var MooTools = {
- 'version': '1.2.5',
- 'build': '008d8f0f2fcc2044e54fdd3635341aaab274e757'
+ 'version': '1.2.6',
+ 'build': 'a3be7a0ef5205eb655c4ee11e8cbedcb3f2ffa95'
};
var Native = function(options){
View
32 Source/Element/Element.js
@@ -156,16 +156,16 @@ Document.implement({
getWindow: function(){
return this.window;
},
-
+
id: (function(){
-
+
var types = {
string: function(id, nocash, doc){
id = doc.getElementById(id);
return (id) ? types.element(id, nocash) : null;
},
-
+
element: function(el, nocash){
$uid(el);
if (!nocash && !el.$family && !(/^object|embed$/i).test(el.tagName)){
@@ -174,16 +174,16 @@ Document.implement({
};
return el;
},
-
+
object: function(obj, nocash, doc){
if (obj.toElement) return types.element(obj.toElement(doc), nocash);
return null;
}
-
+
};
types.textnode = types.whitespace = types.window = types.document = $arguments(0);
-
+
return function(el, nocash, doc){
if (el && el.$family && el.uid) return el;
var type = $type(el);
@@ -274,7 +274,7 @@ var clean = function(item, retain){
}
Element.dispose(item);
}
- }
+ }
if (!uid) return;
collected[uid] = storage[uid] = null;
};
@@ -497,7 +497,7 @@ Element.implement({
getParents: function(match, nocash){
return walk(this, 'parentNode', null, match, true, nocash);
},
-
+
getSiblings: function(match, nocash){
return this.getParent().getChildren(match, nocash).erase(this);
},
@@ -681,6 +681,20 @@ Element.Properties.tag = {
};
Element.Properties.html = (function(){
+ var BUGGY_INNERHTML = true;
+ try {
+ var tester = document.createElement('tr');
+ tester.innerHTML = '<td>x';
+ tester = tester.firstChild;
+ BUGGY_INNERHTML = !(tester.nodeName == 'TD' && tester.innerHTML == 'x');
+ }
+ catch (e){}
+ if (!BUGGY_INNERHTML) return {
+ set: function(){
+ this.innerHTML = Array.flatten(arguments).join('');
+ }
+ };
+
var wrapper = document.createElement('div');
var translations = {
@@ -694,7 +708,7 @@ Element.Properties.html = (function(){
var html = {
set: function(){
var html = Array.flatten(arguments).join('');
- var wrap = Browser.Engine.trident && translations[this.get('tag')];
+ var wrap = translations[this.get('tag')];
if (wrap){
var first = wrapper;
first.innerHTML = wrap[1] + html + wrap[2];
View
4 Source/Native/String.js
@@ -14,6 +14,10 @@ provides: String
...
*/
+try {
+ delete String.prototype.contains;
+} catch(e){}
+
String.implement({
test: function(regex, params){
2  Specs
@@ -1 +1 @@
-Subproject commit 6348e8a5fc16a7786e7dce1f7919ba86c252bb9d
+Subproject commit 3bc3b1567e9a6b0850987733ad19467709f19116

No commit comments for this range

Something went wrong with that request. Please try again.