[Rt-commit] rt branch, 3.999-trunk, updated. 9338c4fc73018b7c609175eab7763913896f6220

[clkao at bestpractical.com]

The branch, 3.999-trunk has been updated
       via  9338c4fc73018b7c609175eab7763913896f6220 (commit)
      from  89f42aff429fcf2c025ae0cf10f9c8f2b3851529 (commit)

Summary of changes:
 etc/config.yml                      |    1 -
 share/html/Ticket/Elements/UpdateCc |    4 +-
 share/web/static/js/util.js         |   54 ++++++++++------------------------
 3 files changed, 18 insertions(+), 41 deletions(-)

- Log -----------------------------------------------------------------
commit 9338c4fc73018b7c609175eab7763913896f6220
Author: Chia-liang Kao <clkao at bestpractical.com>
Date:   Sat Sep 12 14:51:01 2009 +0900

    remove prototypism

diff --git a/etc/config.yml b/etc/config.yml
index edd5c7a..902d690 100644
--- a/etc/config.yml
+++ b/etc/config.yml
@@ -31,7 +31,6 @@ framework:
     - User: {}
     - Authentication::Password:
         login_by: username
-    - Prototypism: {}
     - I18N:
         js: 0
     - IEFixes:
diff --git a/share/html/Ticket/Elements/UpdateCc b/share/html/Ticket/Elements/UpdateCc
index 8161110..872ea86 100644
--- a/share/html/Ticket/Elements/UpdateCc
+++ b/share/html/Ticket/Elements/UpdateCc
@@ -55,7 +55,7 @@
 id="update_cc-<%$addr%>" 
 name="update_cc-<%$addr%>" 
     type="checkbox" 
-    onClick="checkboxToInput('update_cc', 'update_cc-<%$addr%>','<%$txn_addresses{$addr}->format%>' ); $(UpdateIgnoreAddressCheckboxes).value=1"  
+    onClick="checkboxToInput('update_cc', 'update_cc-<%$addr%>','<%$txn_addresses{$addr}->format%>' ); jQuery('#'+UpdateIgnoreAddressCheckboxes).get(0).value=1"  
     <% $ARGS{'update_cc-'.$addr} ? 'checked="checked"' : ''%> > <& /Elements/ShowUser, address => $txn_addresses{$addr}&>
 %}
 </td></tr>
@@ -66,7 +66,7 @@ name="update_cc-<%$addr%>"
     id="UpdateBcc-<%$addr%>"
     name="UpdateBcc-<%$addr%>"
     type="checkbox" 
-    onClick="checkboxToInput('UpdateBcc', 'UpdateBcc-<%$addr%>','<%$txn_addresses{$addr}->format%>' ); $(UpdateIgnoreAddressCheckboxes).value=1" 
+    onClick="checkboxToInput('UpdateBcc', 'UpdateBcc-<%$addr%>','<%$txn_addresses{$addr}->format%>' ); jQuery('#'+UpdateIgnoreAddressCheckboxes).get(0).value=1" 
         <% $ARGS{'UpdateBcc-'.$addr} ? 'checked="checked"' : ''%>> 
 <& /Elements/ShowUser, address => $txn_addresses{$addr}&>
 %}
diff --git a/share/web/static/js/util.js b/share/web/static/js/util.js
index a571fd3..027fdf4 100644
--- a/share/web/static/js/util.js
+++ b/share/web/static/js/util.js
@@ -47,27 +47,6 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 */
-/* $(...)
-    Returns DOM node or array of nodes (if more then one argument passed).
-    If argument is node object allready then do nothing.
-    // Stolen from Prototype
-*/
-function $() {
-    var elements = new Array();
-
-    for (var i = 0; i < arguments.length; i++) {
-        var element = arguments[i];
-        if (typeof element == 'string')
-            element = document.getElementById(element);
-
-        if (arguments.length == 1)
-            return element;
-
-        elements.push(element);
-    }
-
-    return elements;
-}
 
 /* Visibility */
 
@@ -76,7 +55,7 @@ function hide(id) { addClass( id, 'hidden' ) }
 
 function hideshow(id) { return toggleVisibility( id ) }
 function toggleVisibility(id) {
-    var e = $(id);
+    var e = jQuery('#'+id).get(0);
 
     if ( e.className.match( /\bhidden\b/ ) )
         show(e);
@@ -102,21 +81,21 @@ function switchVisibility(id1, id2) {
 /* Classes */
 
 function addClass(id, value) {
-    var e = $(id);
-    if ( e.className.match( new RegExp('\b'+ value +'\b') ) )
-        return;
-    e.className += e.className? ' '+value : value;
+    jQuery('#'+id).addClass(value);
 }
 
 function delClass(id, value) {
-    var e = $(id);
-    e.className = e.className.replace( new RegExp('\\s?\\b'+ value +'\\b', 'g'), '' );
+    jQuery('#'+id).removeClass(value);
 }
 
 /* Rollups */
 
 function rollup(id) {
-    var e   = $(id);
+    /* this is broken because it's called with title bar which has
+     * something like
+     * TitleBox--_index.html------5b\\+r6YCf5bu656uL55Sz6KuL5Zau---0
+     * and might require escaping for jquery*/
+    var e   = jQuery('#'+id).get(0);
     var e2  = e.parentNode;
     if (e.className.match(/\bhidden\b/)) {
         set_rollup_state(e,e2,'shown');
@@ -143,19 +122,18 @@ function set_rollup_state(e,e2,state) {
 }
 
 function doOnLoad(handler) {
-    Event.observe(window, 'load', handler);
+    jQuery(handler);
 }
 
 /* other utils */
 
 function focusElementById(id) {
-    var e = $(id);
-    if (e) e.focus();
+    jQuery('#'+id).trigger('focus');
 }
 
 function updateParentField(field, value) {
     if (window.opener) {
-        window.opener.$(field).value = value;
+        window.opener.jQuery('#'+field).value = value;
         window.close();
     }
 }
@@ -194,7 +172,7 @@ function walkChildElements(parent, callback)
 function showShredderPluginTab( plugin )
 {
 	var plugin_tab_id = 'shredder-plugin-'+ plugin +'-tab';
-	var root = $('shredder-plugin-tabs');
+	var root = jQuery('#shredder-plugin-tabs');
 	walkChildElements( root, function(node) {
 		if( node.id == plugin_tab_id ) {
 			show( node );
@@ -211,8 +189,8 @@ function showShredderPluginTab( plugin )
 
 function checkAllObjects()
 {
-	var check = $('shredder-select-all-objects-checkbox').checked;
-	var elements = $('shredder-search-form').elements;
+    var check = jQuery('#shredder-select-all-objects-checkbox').get(0).checked;
+    var elements = jQuery('#shredder-search-form').get(0).elements;
 	for( var i = 0; i < elements.length; i++ ) {
 		if( elements[i].name != 'wipeout_object' ) {
 			continue;
@@ -229,8 +207,8 @@ function checkAllObjects()
 }
 
 function checkboxToInput(target,checkbox,val){    
-    var tar=$(target);
-    var box = $(checkbox);
+    var tar = jQuery('#'+target).get(0);
+    var box = jQuery('#'+checkbox).get(0);
     if(box.checked){
         if (tar.value==''){
             tar.value=val;

-----------------------------------------------------------------------