Enclosing sidebar and search js in immediately invoked function expressions to avoid conflicts

rhamilto · rhamilto · commit bf6b9f60c5dc · 2014-05-20T13:41:08.000-04:00
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "PatternFly",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "authors": "Red Hat",
   "license": "Apache-2.0",
   "homepage": "https://www.patternfly.org",
diff --git a/dist/js/patternfly.js b/dist/js/patternfly.js
@@ -1,34 +1,33 @@
 // PatternFly Namespace
 var PatternFly = PatternFly || {};
 
-$(document).ready(function() {
-  // Call sidebar() on ready if .sidebar-pf exists and .datatable does not exist
-  if ($('.sidebar-pf').length > 0 && $('.datatable').length == 0) {
-  //if ($('.sidebar-pf').length > 0) {
-    sidebar();
-  }
-});
-
-$(window).resize(function() {
-  // Call sidebar() on resize if .sidebar-pf exists
-  if ($('.sidebar-pf').length > 0) {
-    sidebar();
-  }
-});
-
-// PatternFly Sidebar 
+// Util: PatternFly Sidebar 
 // Set height of sidebar-pf to height of document minus height of navbar-pf if not mobile
-function sidebar() {
-  var documentHeight = 0;
-  var navbarpfHeight = 0;
-  var colHeight = 0;
-  if ( $('.navbar-pf .navbar-toggle').is(':hidden') ) {
-    documentHeight = $(document).height();
-    navbarpfHeight = $('.navbar-pf').outerHeight();
-    colHeight = documentHeight - navbarpfHeight;
+(function($) {
+  sidebar = function() {
+    var documentHeight = 0;
+    var navbarpfHeight = 0;
+    var colHeight = 0;
+    if ( $('.navbar-pf .navbar-toggle').is(':hidden') ) {
+      documentHeight = $(document).height();
+      navbarpfHeight = $('.navbar-pf').outerHeight();
+      colHeight = documentHeight - navbarpfHeight;
+    }
+    $('.sidebar-pf').parent('.row').children('[class*="col-"]').css({ "min-height":colHeight});
   }
-  $('.sidebar-pf').parent('.row').children('[class*="col-"]').css({ "min-height":colHeight});
-}
+  $(document).ready(function() {
+    // Call sidebar() on ready if .sidebar-pf exists and .datatable does not exist
+    if ($('.sidebar-pf').length > 0 && $('.datatable').length == 0) {
+      sidebar();
+    }
+  });
+  $(window).resize(function() {
+    // Call sidebar() on resize if .sidebar-pf exists
+    if ($('.sidebar-pf').length > 0) {
+      sidebar();
+    }
+  });
+})(jQuery);
 
 // Util: PatternFly Popovers
 // Add data-close="true" to insert close X icon
diff --git a/dist/js/patternfly.min.js b/dist/js/patternfly.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "PatternFly",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "author": "Red Hat",
   "license": "Apache-2.0",
   "devDependencies": {
diff --git a/tests/search.html b/tests/search.html
@@ -20,20 +20,22 @@
     <script src="../components/bootstrap/dist/js/bootstrap.min.js"></script>
     <script src="../dist/js/patternfly.min.js"></script>
     <script>
-      $(document).ready(function() {
-        // Hide the clear button
-        $(".search-pf .clear").hide($(this).prev('input').val());
-        // Show the clear button upon entering text in the search input
-        $(".search-pf .has-clear .form-control").keyup(function () {
-          var t = $(this);
-          t.next('button').toggle(Boolean(t.val()));
+      (function($) {
+        $(document).ready(function() {
+          // Hide the clear button
+          $(".search-pf .clear").hide($(this).prev('input').val());
+          // Show the clear button upon entering text in the search input
+          $(".search-pf .has-clear .form-control").keyup(function () {
+            var t = $(this);
+            t.next('button').toggle(Boolean(t.val()));
+          });
+          // Upon clicking the clear button, empty the entered text and hide the clear button
+          $(".search-pf .clear").click(function () {
+            $(this).prev('input').val('').focus();
+            $(this).hide();
+          });
         });
-        // Upon clicking the clear button, empty the entered text and hide the clear button
-        $(".search-pf .clear").click(function () {
-          $(this).prev('input').val('').focus();
-          $(this).hide();
-        });
-      });
+      })(jQuery);
     </script>
   </head>
   <body>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "PatternFly",`
`3`		`- "version": "1.0.1",`
	`3`	`+ "version": "1.0.2",`
`4`	`4`	`"authors": "Red Hat",`
`5`	`5`	`"license": "Apache-2.0",`
`6`	`6`	`"homepage": "https://www.patternfly.org",`