[Jifty-commit] r4563 - jifty/trunk/share/web/static/js

[jifty-commit at lists.jifty.org]

Author: gugod
Date: Thu Nov 29 07:12:51 2007
New Revision: 4563

Modified:
   jifty/trunk/share/web/static/js/rico.js

Log:
A temporary fix for rico.js, which is defining the obsoleted (in
Prototype) Object.prototype.extend which and then breaks all calls
to jQuery.fn.extend.  That means all methods with jQuery.fn.extend
were simply not there. For instance, jQuery("div.secret").show()


Modified: jifty/trunk/share/web/static/js/rico.js
==============================================================================
--- jifty/trunk/share/web/static/js/rico.js	(original)
+++ jifty/trunk/share/web/static/js/rico.js	Thu Nov 29 07:12:51 2007
@@ -32,7 +32,7 @@
 
 //-------------------- rico.js
 var Rico = {
-  Version: '1.1.2.jifty.r963',
+  Version: '1.1.2.jifty.r4563',
   prototypeVersion: parseFloat(Prototype.Version.split(".")[0] + "." + Prototype.Version.split(".")[1])
 }
 
@@ -41,13 +41,10 @@
 
 Rico.ArrayExtensions = new Array();
 
-if (Object.prototype.extend) {
-   Rico.ArrayExtensions[ Rico.ArrayExtensions.length ] = Object.prototype.extend;
+if (Object.extend) {
+   Rico.ArrayExtensions[ Rico.ArrayExtensions.length ] = Object.extend;
 }else{
-  Object.prototype.extend = function(object) {
-    return Object.extend.apply(this, [this, object]);
-  }
-  Rico.ArrayExtensions[ Rico.ArrayExtensions.length ] = Object.prototype.extend;
+    throw("Rico requires Object.extend from Prototype");
 }
 
 if (Array.prototype.push) {