Merge pull request #3 from lght/dev

Adding a scroll-name to be able to have multiple scroll panes

Author: geoffreybauduin

README.md

@@ -37,7 +37,7 @@ angular.module("app").controller("MyCtrl", function () {
 </html>
 ```
 
-**Don't forget to specify an id for your scroll pane, otherwise it won't be working**
+**Don't forget to specify an id (or an attribute 'scroll-name') for your scroll pane, otherwise it won't be working**
 
 ### Reinitialize the pane
 

dist/angular-jscrollpane.js

@@ -8,19 +8,23 @@
         transclude: true,
         template: '<div class="scroll-pane"><div ng-transclude></div></div>',
         link: function($scope, $elem, $attrs) {
-          var config, fn;
+          var config, fn, selector;
           config = {};
           if ($attrs.scrollConfig) {
             config = $scope.$eval($attrs.scrollConfig);
           }
+          selector = "#" + $attrs.id;
+          if ($attrs.scrollName) {
+            selector = "[scroll-name='" + $attrs.scrollName + "']";
+          }
           fn = function() {
-            jQuery("#" + $attrs.id).jScrollPane(config);
-            return $scope.pane = jQuery("#" + $attrs.id).data("jsp");
+            jQuery(selector).jScrollPane(config);
+            return $scope.pane = jQuery(selector).data("jsp");
           };
           if ($attrs.scrollTimeout) {
             $timeout(fn, $scope.$eval($attrs.scrollTimeout));
           } else {
-            fn();
+            $timeout(fn, 0);
           }
           return $scope.$on("reinit-pane", function(event, id) {
             if (id === $attrs.id && $scope.pane) {

dist/angular-jscrollpane.min.js

@@ -10,13 +10,16 @@ angular
 				config = {}
 				if $attrs.scrollConfig
 					config = $scope.$eval($attrs.scrollConfig)
+				selector = "##{$attrs.id}"
+				if $attrs.scrollName
+					selector = "[scroll-name='#{$attrs.scrollName}']"
 				fn = ->
-					jQuery("##{$attrs.id}").jScrollPane(config)
-					$scope.pane = jQuery("##{$attrs.id}").data("jsp")
+					jQuery(selector).jScrollPane(config)
+					$scope.pane = jQuery(selector).data("jsp")
 				if $attrs.scrollTimeout
 					$timeout(fn, $scope.$eval($attrs.scrollTimeout))
 				else
-					do fn
+					$timeout(fn, 0)
 				$scope.$on("reinit-pane", (event, id) ->
 					if id is $attrs.id and $scope.pane
 						console.log("Reinit pane #{id}")