Fixing scroll issue with global nanoscroller object

ciims · Dec 23, 2014 · 32a52e1 · 32a52e1
1 parent e67804b
commit 32a52e1
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/assets/dist/dashboard.js b/assets/dist/dashboard.js
@@ -12383,7 +12383,7 @@ Array.prototype.remove = function(from, to) {
 
 		// Bind behaviors
 		self.clickBehavior();
-		CiiMSDashboard.nanoscroller();
+		CiiMSDashboard.nanoscroller('Categories');
 	},
 
 	/**
@@ -12692,9 +12692,13 @@ Array.prototype.remove = function(from, to) {
 	 * Triggers the nanoscroller
 	 * @return nanoScroller
 	 */
-	nanoscroller : function() {
+	nanoscroller : function(element) {
 		// Froce nanoscroller to rebuild itself
 		var self = this;
+		if (typeof element == "undefined")
+			selfi = self;
+		else
+			selfi = window[element];
 
 		$(".paginated_results .nano").nanoScroller({ destroy: true });
 		$(".paginated_results .nano").nanoScroller({ iOSNativeScrolling: true }); 
@@ -12703,7 +12707,7 @@ Array.prototype.remove = function(from, to) {
 		$(".paginated_results .nano .nano-content").unbind("scroll");
 		$(".paginated_results .nano .nano-content").bind("scroll", function(e) {
 			if($(this).scrollTop() + $(this).innerHeight() >= this.scrollHeight - 1)
-		    	self.list(false, self.query, ++self.page);
+		    	selfi.list(false, selfi.query, ++selfi.page);
 		});
 	}
 };;var Content = {
@@ -12785,7 +12789,7 @@ Array.prototype.remove = function(from, to) {
 
 		// Bind behaviors
 		self.clickBehavior();
-		CiiMSDashboard.nanoscroller();
+		CiiMSDashboard.nanoscroller('Content');
 	},
 
 	/**
@@ -15597,7 +15601,7 @@ if (!String.prototype.ordinalize)
 
 		// Bind behaviors
 		self.clickBehavior();
-		CiiMSDashboard.nanoscroller();
+		CiiMSDashboard.nanoscroller('Users');
 	},
 
 	/**

diff --git a/assets/dist/fonts/font-awesome.css b/assets/dist/fonts/font-awesome.css
@@ -6,8 +6,8 @@
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../fonts/fontawesome-webfont.eot?v=4.1.0');
-  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.1.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.1.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.1.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular') format('svg');
+  src: url('./fonts/fontawesome-webfont.eot?v=4.1.0');
+  src: url('./fonts/fontawesome-webfont.eot?#iefix&v=4.1.0') format('embedded-opentype'), url('./fonts/fontawesome-webfont.woff?v=4.1.0') format('woff'), url('./fonts/fontawesome-webfont.ttf?v=4.1.0') format('truetype'), url('./fonts/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }

diff --git a/assets/js/categories.js b/assets/js/categories.js
@@ -128,7 +128,7 @@ var Categories = {
 
 		// Bind behaviors
 		self.clickBehavior();
-		CiiMSDashboard.nanoscroller();
+		CiiMSDashboard.nanoscroller('Categories');
 	},
 
 	/**

diff --git a/assets/js/ciimsdashboard.js b/assets/js/ciimsdashboard.js
@@ -89,9 +89,13 @@ var CiiMSDashboard = {
 	 * Triggers the nanoscroller
 	 * @return nanoScroller
 	 */
-	nanoscroller : function() {
+	nanoscroller : function(element) {
 		// Froce nanoscroller to rebuild itself
 		var self = this;
+		if (typeof element == "undefined")
+			selfi = self;
+		else
+			selfi = window[element];
 
 		$(".paginated_results .nano").nanoScroller({ destroy: true });
 		$(".paginated_results .nano").nanoScroller({ iOSNativeScrolling: true }); 
@@ -100,7 +104,7 @@ var CiiMSDashboard = {
 		$(".paginated_results .nano .nano-content").unbind("scroll");
 		$(".paginated_results .nano .nano-content").bind("scroll", function(e) {
 			if($(this).scrollTop() + $(this).innerHeight() >= this.scrollHeight - 1)
-		    	self.list(false, self.query, ++self.page);
+		    	selfi.list(false, selfi.query, ++selfi.page);
 		});
 	}
 };
diff --git a/assets/js/content.js b/assets/js/content.js
@@ -77,7 +77,7 @@ var Content = {
 
 		// Bind behaviors
 		self.clickBehavior();
-		CiiMSDashboard.nanoscroller();
+		CiiMSDashboard.nanoscroller('Content');
 	},
 
 	/**

diff --git a/assets/js/users.js b/assets/js/users.js
@@ -133,7 +133,7 @@ var Users = {
 
 		// Bind behaviors
 		self.clickBehavior();
-		CiiMSDashboard.nanoscroller();
+		CiiMSDashboard.nanoscroller('Users');
 	},
 
 	/**