Merge pull request #39 from pedroabreu/fix_row

fix dynamic row size
pedroabreu · Feb 9, 2016 · c835dc6 · c835dc6
2 parents 3e550f3 + 8997fcf
commit c835dc6
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 33 deletions.
diff --git a/dist/ion-gallery.js b/dist/ion-gallery.js
@@ -22,8 +22,10 @@
     };
 
     function controller($scope) {
+      var _rowSize = parseInt($scope.ionGalleryRowSize)
+
       var _drawGallery = function () {
-        $scope.ionGalleryRowSize = ionGalleryHelper.getRowSize(parseInt($scope.ionGalleryRowSize), $scope.ionGalleryItems.length);
+        $scope.ionGalleryRowSize = ionGalleryHelper.getRowSize(_rowSize || ionGalleryConfig.row_size, $scope.ionGalleryItems.length);
         $scope.actionLabel = ionGalleryConfig.action_label;
         $scope.items = ionGalleryHelper.buildGallery($scope.ionGalleryItems, $scope.ionGalleryRowSize);
         $scope.responsiveGrid = parseInt((1 / $scope.ionGalleryRowSize) * 100);
@@ -97,7 +99,7 @@
       else{
         rowSize = size;
       }
-      
+
       return rowSize;
 
     };
@@ -163,17 +165,16 @@
       };
 
       element.bind("load" , function(e){
+        var _this = this;
         if(element.parent()[0].offsetHeight > 0){
           scaleImage(this,element.parent()[0].offsetHeight);
         }
-        else{
-          var _this = this;
-          scope.$watch(function(){
-            return element.parent()[0].offsetHeight;
-          },function(newValue){
-            scaleImage(_this,newValue);
-          });
-        }
+
+        scope.$watch(function(){
+          return element.parent()[0].offsetHeight;
+        },function(newValue){
+          scaleImage(_this,newValue);
+        });
       });
     }
   }
@@ -185,24 +186,23 @@
     .module('ion-gallery')
     .directive('ionRowHeight',ionRowHeight);
 
-  ionRowHeight.$inject = [];
+  ionRowHeight.$inject = ['ionGalleryConfig'];
 
-  function ionRowHeight(){
+  function ionRowHeight(ionGalleryConfig){
 
     return {
       restrict: 'A',
       link : link
     };
 
     function link(scope, element, attrs) {
-
       scope.$watch( 
         function(){
-          return element[0].offsetWidth;
+          return scope.ionGalleryRowSize;
         },
-        function(newValue){
+        function(newValue,oldValue){
           if(newValue > 0){
-            element.css('height',newValue * parseInt(scope.$parent.responsiveGrid)/100 + 'px');
+            element.css('height',element[0].offsetWidth * parseInt(scope.responsiveGrid)/100 + 'px');
           }
         });
     }

diff --git a/dist/ion-gallery.min.js b/dist/ion-gallery.min.js
diff --git a/src/js/gallery.js b/src/js/gallery.js
@@ -21,8 +21,10 @@
     };
 
     function controller($scope) {
+      var _rowSize = parseInt($scope.ionGalleryRowSize)
+
       var _drawGallery = function () {
-        $scope.ionGalleryRowSize = ionGalleryHelper.getRowSize(parseInt($scope.ionGalleryRowSize), $scope.ionGalleryItems.length);
+        $scope.ionGalleryRowSize = ionGalleryHelper.getRowSize(_rowSize || ionGalleryConfig.row_size, $scope.ionGalleryItems.length);
         $scope.actionLabel = ionGalleryConfig.action_label;
         $scope.items = ionGalleryHelper.buildGallery($scope.ionGalleryItems, $scope.ionGalleryRowSize);
         $scope.responsiveGrid = parseInt((1 / $scope.ionGalleryRowSize) * 100);

diff --git a/src/js/galleryHelper.js b/src/js/galleryHelper.js
@@ -21,7 +21,7 @@
       else{
         rowSize = size;
       }
-      
+
       return rowSize;
 
     };

diff --git a/src/js/imageScale.js b/src/js/imageScale.js
@@ -28,17 +28,16 @@
       };
 
       element.bind("load" , function(e){
+        var _this = this;
         if(element.parent()[0].offsetHeight > 0){
           scaleImage(this,element.parent()[0].offsetHeight);
         }
-        else{
-          var _this = this;
-          scope.$watch(function(){
-            return element.parent()[0].offsetHeight;
-          },function(newValue){
-            scaleImage(_this,newValue);
-          });
-        }
+
+        scope.$watch(function(){
+          return element.parent()[0].offsetHeight;
+        },function(newValue){
+          scaleImage(_this,newValue);
+        });
       });
     }
   }

diff --git a/src/js/rowHeight.js b/src/js/rowHeight.js
@@ -5,24 +5,23 @@
     .module('ion-gallery')
     .directive('ionRowHeight',ionRowHeight);
 
-  ionRowHeight.$inject = [];
+  ionRowHeight.$inject = ['ionGalleryConfig'];
 
-  function ionRowHeight(){
+  function ionRowHeight(ionGalleryConfig){
 
     return {
       restrict: 'A',
       link : link
     };
 
     function link(scope, element, attrs) {
-
       scope.$watch( 
         function(){
-          return element[0].offsetWidth;
+          return scope.ionGalleryRowSize;
         },
-        function(newValue){
+        function(newValue,oldValue){
           if(newValue > 0){
-            element.css('height',newValue * parseInt(scope.$parent.responsiveGrid)/100 + 'px');
+            element.css('height',element[0].offsetWidth * parseInt(scope.responsiveGrid)/100 + 'px');
           }
         });
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ @@
           else{
             rowSize = size;
           }
           return rowSize;
         };
@@ Expand Down @@