reformatting, use local vars

1 files changed, 22 insertions, 17 deletions

diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index efa4b9d2f..fffb5b488 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -39,13 +39,14 @@ var dw_mediamanager = {
         dw_mediamanager.initpopup();
 
         // add the action to autofill the "upload as" field
-        $content.delegate('#upload__file', 'change', dw_mediamanager.suggest)
-                // Attach the image selector action to all links
-                .delegate('a.select', 'click', dw_mediamanager.select)
-                // Attach deletion confirmation dialog to the delete buttons
-                .delegate('#media__content a.btn_media_delete', 'click',
-                          dw_mediamanager.confirmattach)
-                .delegate('#mediamanager__done_form', 'submit', dw_mediamanager.list);
+        $content
+            .delegate('#upload__file', 'change', dw_mediamanager.suggest)
+            // Attach the image selector action to all links
+            .delegate('a.select', 'click', dw_mediamanager.select)
+            // Attach deletion confirmation dialog to the delete buttons
+            .delegate('#media__content a.btn_media_delete', 'click',
+                      dw_mediamanager.confirmattach)
+            .delegate('#mediamanager__done_form', 'submit', dw_mediamanager.list);
 
         $tree.dw_tree({toggle_selector: 'img',
                        load_data: function (show_sublist, $clicky) {
@@ -76,7 +77,9 @@ var dw_mediamanager = {
         dw_mediamanager.init_ajax_uploader();
 
         // changing opened tab in the file list panel
-        jQuery('#mediamanager__page div.filelist').delegate('ul.tabs a', 'click', dw_mediamanager.list)
+        var $page = jQuery('#mediamanager__page');
+        $page.find('div.filelist')
+            .delegate('ul.tabs a', 'click', dw_mediamanager.list)
             // loading file details
             .delegate('div.panelContent a', 'click', dw_mediamanager.details)
             // search form
@@ -87,7 +90,8 @@ var dw_mediamanager = {
             .delegate('.qq-upload-file a', 'click', dw_mediamanager.details);
 
         // changing opened tab in the file details panel
-        jQuery('#mediamanager__page div.file').delegate('ul.tabs a', 'click', dw_mediamanager.details)
+        $page.find('div.file')
+            .delegate('ul.tabs a', 'click', dw_mediamanager.details)
             // "update new version" button
             .delegate('#mediamanager__btn_update', 'submit', dw_mediamanager.list)
             // revisions form
@@ -103,7 +107,7 @@ var dw_mediamanager = {
             .delegate('.btn_newer, .btn_older', 'submit', dw_mediamanager.details);
 
         dw_mediamanager.update_resizable();
-        dw_mediamanager.layout_width = jQuery("#mediamanager__page").width();
+        dw_mediamanager.layout_width = $page.width();
         jQuery(window).resize(dw_mediamanager.window_resize);
     },
 
@@ -131,7 +135,7 @@ var dw_mediamanager = {
         $both.buttonset();
 
         // Change handlers
-        $listType.children('input').change(function (event) {
+        $listType.children('input').change(function () {
             dw_mediamanager.set_fileview_list();
         });
         $sortBy.children('input').change(function (event) {
@@ -435,7 +439,7 @@ var dw_mediamanager = {
                 dw_mediamanager.$resizables().resizable('destroy');
 
                 if (update_list) {
-                    dw_mediamanager.list.call(jQuery('#mediamanager__page form.options button[type="submit"]')[0]);
+                    dw_mediamanager.list.call(jQuery('#mediamanager__page').find('form.options button[type="submit"]')[0]);
                 }
 
                 $content.html(data);
@@ -526,7 +530,7 @@ var dw_mediamanager = {
     },
 
     resize: function () {
-        var $contents = jQuery('#mediamanager__page div.panelContent'),
+        var $contents = jQuery('#mediamanager__page').find('div.panelContent'),
             height = jQuery(window).height() - jQuery(document.body).height() +
                       Math.max.apply(null, jQuery.map($contents, function (v) {
             return jQuery(v).height();
@@ -617,7 +621,7 @@ var dw_mediamanager = {
         $slider.slider("option", "step", 0.001);
         $slider.slider("option", "value", 0.5);
         $slider.bind("slide", function(event, ui) {
-            jQuery('#mediamanager__diff div.imageDiff.opacity div.image2 img').css({ opacity: $slider.slider("option", "value")});
+            jQuery('#mediamanager__diff').find('div.imageDiff.opacity div.image2 img').css({ opacity: $slider.slider("option", "value")});
         });
     },
 
@@ -657,7 +661,7 @@ var dw_mediamanager = {
         $slider.slider("option", "step", 1);
         $slider.slider("option", "value", 50);
         $slider.bind("slide", function(event, ui) {
-            jQuery('#mediamanager__diff div.imageDiff.portions div.image2').css({ width: $slider.slider("option", "value")+'%'});
+            jQuery('#mediamanager__diff').find('div.imageDiff.portions div.image2').css({ width: $slider.slider("option", "value")+'%'});
         });
     },
 
@@ -731,7 +735,8 @@ var dw_mediamanager = {
         }
 
         // remove old callback from the insert button and set the new one.
-        jQuery('#media__sendbtn').unbind().click(bind(dw_mediamanager.insert, id));
+        var $sendbtn = jQuery('#media__sendbtn');
+        $sendbtn.unbind().click(bind(dw_mediamanager.insert, id));
 
         dw_mediamanager.unforbid('ext');
         if (ext === '.swf') {
@@ -753,7 +758,7 @@ var dw_mediamanager = {
 
         dw_mediamanager.$popup.dialog('open');
 
-        jQuery('#media__sendbtn').focus();
+        $sendbtn.focus();
     },
 
     /**