fixed javascript related with categories #112

osclass · Jan 12, 2012 · 1c961af · 1c961af
1 parent 92ef325
commit 1c961af
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 32 deletions.
diff --git a/oc-admin/themes/modern/fields/iframe.php b/oc-admin/themes/modern/fields/iframe.php
@@ -60,7 +60,7 @@
                         <tr style="vertical-align: top;">
                             <td style="font-weight: bold;" colspan="<?php echo $numCols; ?>">
                                 <label for="categories"><?php _e("Preset categories");?></label><br />
-                                <a style="font-size: x-small; color: gray;" href="#" onclick="checkAll('field_form', true); return false;"><?php _e("Check all");?></a> - <a style="font-size: x-small; color: gray;" href="#" onclick="checkAll('field_form', false); return false;"><?php _e("Uncheck all");?></a>
+                                <a style="font-size: x-small; color: gray;" href="#" onclick="checkAll('cat_tree', true); return false;"><?php _e("Check all");?></a> - <a style="font-size: x-small; color: gray;" href="#" onclick="checkAll('cat_tree', false); return false;"><?php _e("Uncheck all");?></a>
                             </td>
                             <td>
                                 <ul id="cat_tree">
@@ -127,23 +127,21 @@
         }
     });
 
-    function checkAll (frm, check) {
-        var aa = document.getElementById(frm);
-        for (var i = 0 ; i < aa.elements.length ; i++) {
-            aa.elements[i].checked = check;
-        }
+    function checkAll (id, check) {
+        aa = $('#'+id+' input[type=checkbox]').each(
+            function(){
+                $(this).attr('checked', check);
+            }
+        );
     }
 
     function checkCat(id, check) {
-        var lay = document.getElementById("cat" + id);
-        if(lay) {
-        inp = lay.getElementsByTagName("input");
-        for (var i = 0, maxI = inp.length ; i < maxI; ++i) {
-            if(inp[i].type == "checkbox") {
-                inp[i].checked = check;
+        aa = $('#cat'+id+' input[type=checkbox]').each(
+            function(){
+                $(this).attr('checked', check);
             }
-        }}
-    }    
+        );
+    }
 
     $(document).ready(function() {
         $('#settings_form form').submit(function() {

diff --git a/oc-admin/themes/modern/fields/index.php b/oc-admin/themes/modern/fields/index.php
@@ -16,11 +16,11 @@
      * License along with this program. If not, see <http://www.gnu.org/licenses/>.
      */
 
-    $fields = __get("fields");
-    $last = end($fields); $last_id = $last['pk_i_id'];
+    $fields     = __get("fields");
+    $last       = end($fields); $last_id = $last['pk_i_id'];
     $categories = __get("categories");
-    $selected = __get("default_selected");
-    $numCols = 1;
+    $selected   = __get("default_selected");
+    $numCols    = 1;
 
 ?>
 
@@ -130,23 +130,21 @@ function delete_field(id){
 
             });
 
-            function checkAll (frm, check) {
-                var aa = document.getElementById(frm);
-                for (var i = 0 ; i < aa.elements.length ; i++) {
-                    aa.elements[i].checked = check;
-                }
+            function checkAll (id, check) {
+                aa = $('#'+id+' input[type=checkbox]').each(
+                    function(){
+                        $(this).attr('checked', check);
+                    }
+                );
             }
 
             function checkCat(id, check) {
-                var lay = document.getElementById("cat" + id);
-                if(lay) {
-                inp = lay.getElementsByTagName("input");
-                for (var i = 0, maxI = inp.length ; i < maxI; ++i) {
-                    if(inp[i].type == "checkbox") {
-                        inp[i].checked = check;
+                aa = $('#cat'+id+' input[type=checkbox]').each(
+                    function(){
+                        $(this).attr('checked', check);
                     }
-                }}
-            }    
+                );
+            } 
         </script>
         <div id="content">
             <div id="separator"></div>	
@@ -206,7 +204,7 @@ function checkCat(id, check) {
                                                 <tr style="vertical-align: top;">
                                                     <td style="font-weight: bold;" colspan="<?php echo $numCols; ?>">
                                                         <label for="categories"><?php _e("Preset categories");?></label><br />
-                                                        <a style="font-size: x-small; color: gray;" href="#" onclick="checkAll('new_field_form', true); return false;"><?php _e("Check all");?></a> - <a style="font-size: x-small; color: gray;" href="#" onclick="checkAll('new_field_form', false); return false;"><?php _e("Uncheck all");?></a>
+                                                        <a style="font-size: x-small; color: gray;" href="#" onclick="checkAll('cat_tree', true); return false;"><?php _e("Check all");?></a> - <a style="font-size: x-small; color: gray;" href="#" onclick="checkAll('cat_tree', false); return false;"><?php _e("Uncheck all");?></a>
                                                     </td>
                                                     <td>
                                                         <ul id="new_cat_tree">