From 5f6b7bdf9d13971b569711102aff6c37d8b797e1 Mon Sep 17 00:00:00 2001 From: "Quintero, Edmund" Date: Wed, 9 Mar 2016 14:34:47 -0500 Subject: [PATCH 1/2] Adds support for Packery v2 attributes. --- src/packery.js | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/packery.js b/src/packery.js index 21d9eb9..447306d 100644 --- a/src/packery.js +++ b/src/packery.js @@ -18,12 +18,18 @@ 'containerStyle', 'columnWidth', 'gutter', - 'isHorizontal', - 'isInitLayout', - 'isOriginLeft', - 'isOriginTop', - 'isResizeBound', + 'isHorizontal', //v1 + 'horizontal', + 'isInitLayout', //v1 + 'initLayout', + 'isOriginLeft', //v1 + 'originLeft', + 'isOriginTop', //v1 + 'originTop', + 'isResizeBound', //v1 + 'resize', 'itemSelector', + 'percentPosition', 'rowHeight', 'transitionDuration', 'isAppended' @@ -178,10 +184,15 @@ columnWidth: '@?', // Type: Number, Selector String gutter: '@?', // Type: Number, Selector String isHorizontal: '@?', // Type: Boolean + horizontal: '@?', // Type: Boolean isInitLayout: '@?', // Type: Boolean + initLayout: '@?', // Type: Boolean isOriginLeft: '@?', // Type: Boolean + originLeft: '@?', // Type: Boolean isOriginTop: '@?', // Type: Boolean + originTop: '@?', // Type: Boolean isResizeBound: '@?', // Type: Boolean + resize: '@?', // Type: Boolean itemSelector: '@?', // Type: Selector String rowHeight: '@?', // Type: Number, Selector String transitionDuration: '@?', // Type: String @@ -207,10 +218,15 @@ // @TODO: Check for attribute itself, not value of attribute if (scope.draggable === 'false') { scope.draggable = false; } if (scope.isHorizontal === 'false') { scope.isHorizontal = false; } + if (scope.horizontal === 'false') { scope.horizontal = false; } if (scope.isInitLayout === 'false') { scope.isInitLayout = false; } + if (scope.initLayout === 'false') { scope.initLayout = false; } if (scope.isOriginLeft === 'false') { scope.isOriginLeft = false; } + if (scope.originLeft === 'false') { scope.originLeft = false; } if (scope.isOriginTop === 'false') { scope.isOriginTop = false; } + if (scope.originTop === 'false') { scope.originTop = false; } if (scope.isResizeBound === 'false') { scope.isResizeBound = false; } + if (scope.resizeBound === 'false') { scope.resizeBound = false; } if (scope.isAppended === 'false') { scope.isAppended = false; } // Creates JS Object for passing CSS styles into Packery From a9c1f663d78eaaf48448f5030ead63abe8d11d57 Mon Sep 17 00:00:00 2001 From: "Quintero, Edmund" Date: Wed, 9 Mar 2016 14:51:33 -0500 Subject: [PATCH 2/2] Changes emit to broadcast for event propagation to child scopes. --- src/packery.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/packery.js b/src/packery.js index 447306d..6e6b10f 100644 --- a/src/packery.js +++ b/src/packery.js @@ -29,7 +29,6 @@ 'isResizeBound', //v1 'resize', 'itemSelector', - 'percentPosition', 'rowHeight', 'transitionDuration', 'isAppended' @@ -63,7 +62,7 @@ packery: packeryObj }); el.data('Packery', packeryObj); - $rootScope.$emit('packeryInstantiated', packeryObj); + $rootScope.$broadcast('packeryInstantiated', packeryObj); return packeryObj; } else { var interval = $interval(function(){ @@ -161,7 +160,7 @@ } el.css('visibility','visible'); - $rootScope.$emit('packeryObjectPacked', el[0]); + $rootScope.$broadcast('packeryObjectPacked', el[0]); }); };