Remove dependence on MooTools 1.2 legacy code.

joomla · Feb 10, 2012 · ed55ff3 · ed55ff3
1 parent 9c68148
commit ed55ff3
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/libraries/joomla/html/html/behavior.php b/libraries/joomla/html/html/behavior.php
@@ -577,7 +577,7 @@ public static function tree($id, $params = array(), $root = array())
 		$opt['onExpand']	= (array_key_exists('onExpand', $params)) ? '\\' . $params['onExpand'] : null;
 		$opt['onSelect']	= (array_key_exists('onSelect', $params)) ? '\\' . $params['onSelect'] : null;
 		$opt['onClick']		= (array_key_exists('onClick', $params)) ? '\\' . $params['onClick']
-		: '\\function(node){  window.open(node.data.url, $chk(node.data.target) ? node.data.target : \'_self\'); }';
+		: '\\function(node){  window.open(node.data.url, node.data.target != null ? node.data.target : \'_self\'); }';
 
 		$options = JHtmlBehavior::_getJSObject($opt);
 

diff --git a/media/system/js/mootree-uncompressed.js b/media/system/js/mootree-uncompressed.js
@@ -248,7 +248,7 @@ var MooTreeControl = new Class({
 							if (pcs.length == 2) con[pcs[0].trim()] = pcs[1].trim();
 						}
 					}
-					if ($chk(c[i].id)) {
+					if (c[i].id != null) {
 						con.id = 'node_'+c[i].id;
 					}
 					node = parentNode.insert(con);

diff --git a/media/system/js/mootree.js b/media/system/js/mootree.js
diff --git a/media/system/js/swf-uncompressed.js b/media/system/js/swf-uncompressed.js
@@ -115,7 +115,7 @@ Swiff.Uploader = new Class({
 		};
 
 		var path = this.options.path;
-		if (!path.contains('?')) path += '?noCache=' + $time(); // cache in IE
+		if (!path.contains('?')) path += '?noCache=' + Date.now; // cache in IE
 
 		// container options for Swiff class
 		this.options.container = this.box = new Element('span', {'class': 'swiff-uploader-box'}).inject(document.id(this.options.container) || document.body);
@@ -204,7 +204,7 @@ Swiff.Uploader = new Class({
 
 	update: function(data) {
 		// the data is saved right to the instance
-		$extend(this, data);
+		Object.append(this, data);
 		this.fireEvent('queue', [this], 10);
 		return this;
 	},
@@ -316,7 +316,7 @@ Swiff.Uploader = new Class({
 
 		var data = this.options.data || {};
 		if ($type(append) == 'string') data[append] = hash;
-		else $extend(data, hash);
+		else Object.append(data, hash);
 
 		this.setOptions({data: data});
 	},
@@ -360,7 +360,7 @@ Swiff.Uploader = new Class({
 
 });
 
-$extend(Swiff.Uploader, {
+Object.append(Swiff.Uploader, {
 
 	STATUS_QUEUED: 0,
 	STATUS_RUNNING: 1,
@@ -430,7 +430,7 @@ Swiff.Uploader.File = new Class({
 	},
 
 	update: function(data) {
-		return $extend(this, data);
+		return Object.append(this, data);
 	},
 
 	validate: function() {

diff --git a/media/system/js/swf.js b/media/system/js/swf.js
diff --git a/media/system/js/uploader-uncompressed.js b/media/system/js/uploader-uncompressed.js
@@ -20,7 +20,7 @@ var FancyUpload2 = new Class({
 		// compat
 		limitSize: 0,
 		limitFiles: 0,
-		validateFile: $lambda(true)
+		validateFile: Function.from(true)
 	},
 
 	initialize: function(status, list, options) {