Merge pull request #13 from benjamincharity/fallback-to-element-id-12

Fallback to element id 12
benjamincharity · Feb 20, 2016 · 7e78aeb · 7e78aeb
2 parents 303bcfb + c8ceb43
commit 7e78aeb
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 13 deletions.
diff --git a/dist/angular-flickity.js b/dist/angular-flickity.js
diff --git a/dist/angular-flickity.js.map b/dist/angular-flickity.js.map
diff --git a/dist/angular-flickity.min.js b/dist/angular-flickity.min.js
diff --git a/dist/angular-flickity.min.js.map b/dist/angular-flickity.min.js.map
diff --git a/src/flickity.directive.js b/src/flickity.directive.js
@@ -24,6 +24,7 @@ export function FlickityDirective(
         scope: {},
         bindToController: {
             bcFlickity: '@?',
+            bcFlickityId: '@?',
         },
         link: linkFunction,
         controller: FlickityController,
@@ -39,21 +40,29 @@ export function FlickityDirective(
     function linkFunction($scope, $element, $attrs, $controller) {
         'ngInject';
 
+        // If no ID was passed in
+        if (!$controller.bcFlickityId) {
+            // Use the element's ID if one exists
+            if ($attrs.id) {
+                $controller.bcFlickityId = $attrs.id;
+            }
+        }
+
         // Using a timeout ensures that any ng-repeats can finish running before we initialize
         $timeout(() => {
             // Initialize Flickity
             const flickityInstance =
-                FlickityService.create($element[0], $controller.flickityId, $controller.options);
+                FlickityService.create($element[0], $controller.bcFlickityId, $controller.options);
 
             // Expose the Flickity instance and ID
             $controller.Flickity = flickityInstance.instance;
-            $controller.flickityId = flickityInstance.id;
+            $controller.bcFlickityId = flickityInstance.id;
         });
 
 
         // Clean up when being destroyed
         const onDestroy = $scope.$on('$destroy', (event) => {
-            FlickityService.destroy($controller.flickityId);
+            FlickityService.destroy($controller.bcFlickityId);
         });
 
     }