Updates mass mailer and blog aggregation tab to use jquery instead of…

… yui
exponentcms · Sep 2, 2014 · 0ffb12f · 0ffb12f
1 parent 6a3c8c3
commit 0ffb12f
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 25 deletions.
diff --git a/framework/modules/administration/views/administration/mass_mail.tpl b/framework/modules/administration/views/administration/mass_mail.tpl
@@ -42,17 +42,23 @@
     {/form}
 </div>
 
-{script unique="mass-mailer" yui3mods=1}
+{script unique="mass-mailer" jquery=1}
 {literal}
-    YUI(EXPONENT.YUI3_CONFIG).use('node', function(Y) {
-        var mailall = Y.all('input.emailall');
-        var emailnodes = Y.all('div.email');
-        mailall.on('click',function(e){
-            if (e.currentTarget.get('checked')) {
-                emailnodes.setStyle('display','none');
-            } else {
-                emailnodes.setStyle('display','block');
-            }
+//    YUI(EXPONENT.YUI3_CONFIG).use('node', function(Y) {
+//        var mailall = Y.all('input.emailall');
+//        var emailnodes = Y.all('div.email');
+//        mailall.on('click',function(e){
+//            if (e.currentTarget.get('checked')) {
+//                emailnodes.setStyle('display','none');
+//            } else {
+//                emailnodes.setStyle('display','block');
+//            }
+//        });
+//    });
+
+    $(document).ready(function(){
+        $("input.emailall").click(function(){
+            $("div.email").toggle(!this.checked);
         });
     });
 {/literal}

diff --git a/framework/modules/blog/views/blog/configure/aggregation.tpl b/framework/modules/blog/views/blog/configure/aggregation.tpl
@@ -59,26 +59,35 @@
 </table>
 </div>
 
-{script unique="aggregation"}
+{script unique="aggregation" jquery=1}
+{literal}
     function selectAll(val) {
         var checks = document.getElementsByName("aggregate[]");
         for (var i = 0; i < checks.length; i++) {
           checks[i].checked = val;
         }
     }
 
-    YUI(EXPONENT.YUI3_CONFIG).use('node', function(Y) {
-        var aggnodes = Y.one('#aggregation-list');
-        EXPONENT.handleClick = function(e) {
-            if (e.currentTarget.get('checked')) {
-                aggnodes.setStyle('display','block');
-            } else {
-                aggnodes.setStyle('display','none');
-            }
-        };
-        Y.one('#add_sourceControl').delegate('click', EXPONENT.handleClick, "#add_source");
-        if (!Y.one('#add_source').get('checked')) {
-            aggnodes.setStyle('display','none');
-        }
+    $(document).ready(function(){
+        $("#add_source").click(function(){
+            $("#aggregation-list").toggle(this.checked);
+        });
+        if ($("#add_source").checked) $("#aggregation-list").toggle();
     });
+
+//    YUI(EXPONENT.YUI3_CONFIG).use('node', function(Y) {
+//        var aggnodes = Y.one('#aggregation-list');
+//        EXPONENT.handleClick = function(e) {
+//            if (e.currentTarget.get('checked')) {
+//                aggnodes.setStyle('display','block');
+//            } else {
+//                aggnodes.setStyle('display','none');
+//            }
+//        };
+//        Y.one('#add_sourceControl').delegate('click', EXPONENT.handleClick, "#add_source");
+//        if (!Y.one('#add_source').get('checked')) {
+//            aggnodes.setStyle('display','none');
+//        }
+//    });
+{/literal}
 {/script}
diff --git a/framework/modules/photoalbum/views/photo/configure/gallery.tpl b/framework/modules/photoalbum/views/photo/configure/gallery.tpl
@@ -70,7 +70,6 @@
             </div>
         </div>
     </div>
-
 {/group}
 {group label="Detail Page or Lightbox"|gettext}
     {control type=text name="pa_showall_enlarged" label="Box size for enlarged images"|gettext value=$config.pa_showall_enlarged|default:300 size="5"}