From 148c4e8d88ed5ee303738c8bdac5fb44eb460e68 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 1 Apr 2013 12:44:12 -0700
Subject: [PATCH] Remove advmultiselectResize from global scope

---
 js/Common.js | 107 ++++++++++++++++++++++++---------------------------
 1 file changed, 51 insertions(+), 56 deletions(-)

diff --git a/js/Common.js b/js/Common.js
index 3b3cc915a0..bf4273c74e 100644
--- a/js/Common.js
+++ b/js/Common.js
@@ -464,61 +464,6 @@ function activityStatus( message ) {
     }
 }
 
-/**
- * Function to make multiselect boxes behave as fields in small screens
- */
-function advmultiselectResize() {
-  var amswidth = cj("#crm-container form:has(table.advmultiselect)").width();
-  if (amswidth < 700) {
-    cj("form table.advmultiselect td").each( function() {
-      cj(this).css('display', 'block');
-    });
-  } else {
-    cj("form table.advmultiselect td").each( function() {
-      cj(this).css('display', 'table-cell');
-    });
-  }
-  var contactwidth = cj('#crm-container #mainTabContainer').width();
-  if (contactwidth < 600) {
-    cj('#crm-container #mainTabContainer').addClass('narrowpage');
-    cj('#crm-container #mainTabContainer').addClass('narrowpage');
-    cj('#crm-container #mainTabContainer.narrowpage #contactTopBar td').each( function(index) {
-      if (index > 1) {
-        if (index%2 == 0) {
-          cj(this).parent().after('<tr class="narrowadded"></tr>');
-        }
-        var item = cj(this);
-        cj(this).parent().next().append(item);
-      }
-    });
-  } else {
-    cj('#crm-container #mainTabContainer.narrowpage').removeClass('narrowpage');
-    cj('#crm-container #mainTabContainer #contactTopBar tr.narrowadded td').each( function() {
-      var nitem = cj(this);
-      var parent = cj(this).parent();
-      cj(this).parent().prev().append(nitem);
-      if ( parent.children().size() == 0 ) {
-        parent.remove();
-      }
-    });
-    cj('#crm-container #mainTabContainer.narrowpage #contactTopBar tr.added').detach();
-  }
-  var cformwidth = cj('#crm-container #Contact .contact_basic_information-section').width();
-
-  if (cformwidth < 720) {
-    cj('#crm-container .contact_basic_information-section').addClass('narrowform');
-    cj('#crm-container .contact_basic_information-section table.form-layout-compressed td .helpicon').parent().addClass('hashelpicon');
-    if (cformwidth < 480) {
-      cj('#crm-container .contact_basic_information-section').addClass('xnarrowform');
-    } else {
-      cj('#crm-container .contact_basic_information-section.xnarrowform').removeClass('xnarrowform');
-    }
-  } else {
-    cj('#crm-container .contact_basic_information-section.narrowform').removeClass('narrowform');
-    cj('#crm-container .contact_basic_information-section.xnarrowform').removeClass('xnarrowform');
-  }
-}
-
 CRM.strings = CRM.strings || {};
 CRM.validate = CRM.validate || {
   params: {},
@@ -528,7 +473,6 @@ CRM.validate = CRM.validate || {
 (function($, undefined) {
   "use strict";
   $(document).ready(function() {
-    advmultiselectResize();
     $().crmtooltip();
     $('.crm-container table.row-highlight').on('change', 'input.select-row, input.select-rows', function() {
       var target, table = $(this).closest('table');
@@ -555,6 +499,57 @@ CRM.validate = CRM.validate || {
       }
     });
   });
+
+  /**
+   * Function to make multiselect boxes behave as fields in small screens
+   */
+  function advmultiselectResize() {
+    var amswidth = $("#crm-container form:has(table.advmultiselect)").width();
+    if (amswidth < 700) {
+      $("form table.advmultiselect td").css('display', 'block');
+    } else {
+      $("form table.advmultiselect td").css('display', 'table-cell');
+    }
+    var contactwidth = $('#crm-container #mainTabContainer').width();
+    if (contactwidth < 600) {
+      $('#crm-container #mainTabContainer').addClass('narrowpage');
+      $('#crm-container #mainTabContainer.narrowpage #contactTopBar td').each( function(index) {
+        if (index > 1) {
+          if (index%2 == 0) {
+            $(this).parent().after('<tr class="narrowadded"></tr>');
+          }
+          var item = $(this);
+          $(this).parent().next().append(item);
+        }
+      });
+    } else {
+      $('#crm-container #mainTabContainer.narrowpage').removeClass('narrowpage');
+      $('#crm-container #mainTabContainer #contactTopBar tr.narrowadded td').each( function() {
+        var nitem = $(this);
+        var parent = $(this).parent();
+        $(this).parent().prev().append(nitem);
+        if ( parent.children().size() == 0 ) {
+          parent.remove();
+        }
+      });
+      $('#crm-container #mainTabContainer.narrowpage #contactTopBar tr.added').detach();
+    }
+    var cformwidth = $('#crm-container #Contact .contact_basic_information-section').width();
+  
+    if (cformwidth < 720) {
+      $('#crm-container .contact_basic_information-section').addClass('narrowform');
+      $('#crm-container .contact_basic_information-section table.form-layout-compressed td .helpicon').parent().addClass('hashelpicon');
+      if (cformwidth < 480) {
+        $('#crm-container .contact_basic_information-section').addClass('xnarrowform');
+      } else {
+        $('#crm-container .contact_basic_information-section.xnarrowform').removeClass('xnarrowform');
+      }
+    } else {
+      $('#crm-container .contact_basic_information-section.narrowform').removeClass('narrowform');
+      $('#crm-container .contact_basic_information-section.xnarrowform').removeClass('xnarrowform');
+    }
+  }
+  advmultiselectResize();
   $(window).resize(function() {
     advmultiselectResize();
   });
-- 
2.25.1