Changeset 2174

Timestamp:

09/09/10 17:29:42 (17 months ago)

Author:

johnnyoffline

Message:

getting closer and closer to removing aUI

Location:

plugins/apostrophePlugin/trunk/web/js

Files:

• aControls.js (modified) (1 diff)
• aUI.js (modified) (3 diffs)

plugins/apostrophePlugin/trunk/web/js/aControls.js

@@ -916 +916 @@
                         });
                 });
-        }
+        };
 }(jQuery);
+
+new function($)
+{
+        $.fn.isChildOf = function(b){
+                return (this.parents(b).length > 0);
+        };              
+}(jQuery);

plugins/apostrophePlugin/trunk/web/js/aUI.js

@@ -15 +15 @@
         }
 
-        if (!$.browser.msie) { // I know we're not supposed to use this.
+        var aBtns = $(target+' .a-btn, ' + target + ' .a-submit, ' + target + ' .a-cancel');
+        aBtns.each(function() {
+                var aBtn = $(this);
 
-                var aBtns = $(target+' .a-btn, ' + target + ' .a-submit, ' + target + ' .a-cancel');
-                aBtns.each(function() {
-                        var aBtn = $(this);
+                // Setup Icons
+                if (aBtn.is('a') && aBtn.hasClass('icon') && !aBtn.children('.icon').length) 
+                {
+                        aBtn.prepend('<span class="icon"></span>');                                             
+                };
+                
+                // Setup Flagging Buttons
+                if(aBtn.hasClass('flag'))
+                {
+                        if (!aBtn.children('.flag-label').length)
+                        {
+                                aBtn.attr('title','').wrapInner('<span class="flag-label"></span>');            
+                        }
 
-                        // Setup Icons
-                        if (aBtn.is('a') && aBtn.hasClass('icon') && !aBtn.children('.icon').length) 
-                        {
-                                aBtn.prepend('<span class="icon"></span>');                                             
-                        };
-                        
-                        // Setup Flagging Buttons
-                        if(aBtn.hasClass('flag'))
-                        {
-                                if (!aBtn.children('.flag-label').length)
-                                {
-                                        aBtn.attr('title','').wrapInner('<span class="flag-label"></span>');            
-                                }
-
-                                aBtn.hover(function () {
-                                        aBtn.addClass('expanded');
-                                },function () {
-                                        aBtn.removeClass('expanded');
-                                });     
-                        }
-                
-          });
-        }
+                        aBtn.hover(function () {
+                                aBtn.addClass('expanded');
+                        },function () {
+                                aBtn.removeClass('expanded');
+                        });     
+                }
+        
+  });
         
         // Variants
@@ -59 +56 @@
         $('.a-nav .a-archived-page').fadeTo(0,.5); // Archived Page Labels
 
-        $('.a-controls li:last-child').addClass('last'); // Add 'last' Class To Last Option
+        // Apply clearfix on controls and options
+        $('.a-controls, .a-options').addClass('clearfix');
+
+        // Add 'last' Class To Last Option
+        $('.a-controls li:last-child').addClass('last'); 
         
         // You can define this function in your site.js to execute code whenenever apostrophe calls aUI();
@@ -67 +68 @@
                 aOverrides();   
         }
-        
-        // apply clearfix on controls and options
-        $('.a-controls, .a-options').addClass('clearfix');
-        
 }
 
 $(document).ready(function(){
         aUI();  
-        jQuery.fn.isChildOf = function(b){
-          return (this.parents(b).length > 0);
-        };      
 });