[Jifty-commit] r1494 - in jifty/trunk: share/web/static/js share/web/static/js/scriptaculous

[jifty-commit at lists.jifty.org]

Author: trs
Date: Thu Jul  6 22:58:15 2006
New Revision: 1494

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/share/web/static/js/jifty.js
   jifty/trunk/share/web/static/js/scriptaculous/controls.js

Log:
 r14007 at zot:  tom | 2006-07-06 22:57:54 -0400
 I don't know why I modified scriptaculous in the first place since we're already subclassing it.  Move my changes from scriptaculous to our subclass.


Modified: jifty/trunk/share/web/static/js/jifty.js
==============================================================================
--- jifty/trunk/share/web/static/js/jifty.js	(original)
+++ jifty/trunk/share/web/static/js/jifty.js	Thu Jul  6 22:58:15 2006
@@ -804,9 +804,20 @@
     this.action = Form.Element.getAction(this.field);
     this.url    = '/__jifty/autocomplete.xml';
 
+    Event.observe(this.field, "focus", this.onFocus.bindAsEventListener(this));
     this.baseInitialize(this.field, $(div), { minChars: "0" });
   },
 
+  onFocus: function(event) {
+    this.changed  = true;
+    this.hasFocus = true;
+
+    if (this.observer)
+        clearTimeout(this.observer);
+    
+    this.onObserverEvent();
+  },
+  
   getUpdatedChoices: function() {
       var request = { path: this.url, actions: {} };
 

Modified: jifty/trunk/share/web/static/js/scriptaculous/controls.js
==============================================================================
--- jifty/trunk/share/web/static/js/scriptaculous/controls.js	(original)
+++ jifty/trunk/share/web/static/js/scriptaculous/controls.js	Thu Jul  6 22:58:15 2006
@@ -74,7 +74,6 @@
 
     Element.hide(this.update);
 
-    Event.observe(this.element, "focus", this.onFocus.bindAsEventListener(this));
     Event.observe(this.element, "blur", this.onBlur.bindAsEventListener(this));
     Event.observe(this.element, "keypress", this.onKeyPress.bindAsEventListener(this));
   },
@@ -177,16 +176,6 @@
     this.active = false;     
   },
 
-  onFocus: function(event) {
-    this.changed = true;
-    this.hasFocus = true;
-
-    if (this.observer)
-        clearTimeout(this.observer);
-    
-    this.onObserverEvent();
-  },
-  
   render: function() {
     if(this.entryCount > 0) {
       for (var i = 0; i < this.entryCount; i++)