summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Schmertz <rschmertz@yahoo.com>2010-04-26 13:05:59 +0800
committerMichael Leibman <michael.leibman@gmail.com>2010-04-26 23:57:31 +0800
commit502f9f7b255e8813fc55afee777f53e739dc03cc (patch)
tree9361bd82b908891d985a53684967b60bda8a54fd
parentc964fcc5aaa6e442a4c1bde6c1433444d4f2b1fd (diff)
downloadSlickGrid-502f9f7b255e8813fc55afee777f53e739dc03cc.zip
SlickGrid-502f9f7b255e8813fc55afee777f53e739dc03cc.tar.gz
SlickGrid-502f9f7b255e8813fc55afee777f53e739dc03cc.tar.bz2
Parameterize closures to protect the $ alias for jQuery
-rw-r--r--slick.columnpicker.js4
-rw-r--r--slick.grid.js4
-rw-r--r--slick.model.js4
-rw-r--r--slick.pager.js5
-rw-r--r--slick.remotemodel.js4
5 files changed, 10 insertions, 11 deletions
diff --git a/slick.columnpicker.js b/slick.columnpicker.js
index 283ad42..9c90ae1 100644
--- a/slick.columnpicker.js
+++ b/slick.columnpicker.js
@@ -1,4 +1,4 @@
-(function() {
+(function($) {
function SlickColumnPicker(columns,grid)
{
var $menu;
@@ -97,4 +97,4 @@
// Slick.Controls.ColumnPicker
$.extend(true, window, { Slick: { Controls: { ColumnPicker: SlickColumnPicker }}});
-})();
+})(jQuery);
diff --git a/slick.grid.js b/slick.grid.js
index dfbf26e..d0ba77a 100644
--- a/slick.grid.js
+++ b/slick.grid.js
@@ -105,7 +105,7 @@ if (!jQuery.fn.drag) {
throw new Error("SlickGrid requires jquery.event.drag module to be loaded");
}
-(function() {
+(function($) {
var scrollbarDimensions; // shared across all grids on this page
@@ -1966,4 +1966,4 @@ if (!jQuery.fn.drag) {
GlobalEditorLock: new EditorLock()
}
});
-}()); \ No newline at end of file
+}(jQuery));
diff --git a/slick.model.js b/slick.model.js
index 4294677..681c24d 100644
--- a/slick.model.js
+++ b/slick.model.js
@@ -18,7 +18,7 @@ function EventHelper() {
}
-(function() {
+(function($) {
/***
* A sample Model implementation.
* Provides a filtered view of the underlying data.
@@ -272,4 +272,4 @@ function EventHelper() {
// Slick.Data.DataView
$.extend(true, window, { Slick: { Data: { DataView: DataView }}});
-})(); \ No newline at end of file
+})(jQuery);
diff --git a/slick.pager.js b/slick.pager.js
index eb0ec2d..ee1d9d6 100644
--- a/slick.pager.js
+++ b/slick.pager.js
@@ -1,4 +1,4 @@
-(function() {
+(function($) {
function SlickGridPager(dataView, grid, $container)
{
var $status, $contextMenu;
@@ -143,5 +143,4 @@
// Slick.Controls.Pager
$.extend(true, window, { Slick: { Controls: { Pager: SlickGridPager }}});
-})();
-
+})(jQuery);
diff --git a/slick.remotemodel.js b/slick.remotemodel.js
index 65b800b..75fb4ec 100644
--- a/slick.remotemodel.js
+++ b/slick.remotemodel.js
@@ -18,7 +18,7 @@ function EventHelper() {
}
-(function() {
+(function($) {
/***
* A sample AJAX data store implementation.
* Right now, it's hooked up to load all Apple-related Digg stories, but can
@@ -183,4 +183,4 @@ function EventHelper() {
// Slick.Data.RemoteModel
$.extend(true, window, { Slick: { Data: { RemoteModel: RemoteModel }}});
-})();
+})(jQuery);