Skip to content

Commit 2dc5417

Browse files
committed
Release v2.4.3
1 parent 9fe1982 commit 2dc5417

File tree

6 files changed

+14
-10
lines changed

6 files changed

+14
-10
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ng-flow",
3-
"version": "2.4.2",
3+
"version": "2.4.3",
44
"ignore": [
55
"**/.*",
66
"test",

dist/ng-flow-standalone.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,9 +1596,11 @@ angular.module('flow.provider', [])
15961596
angular.module('flow.init', ['flow.provider'])
15971597
.controller('flowCtrl', ['$scope', '$attrs', '$parse', 'flowFactory',
15981598
function ($scope, $attrs, $parse, flowFactory) {
1599-
// create the flow object
1599+
16001600
var options = angular.extend({}, $scope.$eval($attrs.flowInit));
1601-
var flow = flowFactory.create(options);
1601+
1602+
// use existing flow object or create a new one
1603+
var flow = $scope.$eval($attrs.flowObject) || flowFactory.create(options);
16021604

16031605
flow.on('catchAll', function (eventName) {
16041606
var args = Array.prototype.slice.call(arguments);

dist/ng-flow-standalone.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ng-flow.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,11 @@ angular.module('flow.provider', [])
6363
angular.module('flow.init', ['flow.provider'])
6464
.controller('flowCtrl', ['$scope', '$attrs', '$parse', 'flowFactory',
6565
function ($scope, $attrs, $parse, flowFactory) {
66-
// create the flow object
66+
6767
var options = angular.extend({}, $scope.$eval($attrs.flowInit));
68-
var flow = flowFactory.create(options);
68+
69+
// use existing flow object or create a new one
70+
var flow = $scope.$eval($attrs.flowObject) || flowFactory.create(options);
6971

7072
flow.on('catchAll', function (eventName) {
7173
var args = Array.prototype.slice.call(arguments);

dist/ng-flow.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ng-flow",
3-
"version": "2.4.2",
3+
"version": "2.4.3",
44
"description": "Flow.js html5 file upload extension on angular.js framework",
55
"scripts": {
66
"test": "grunt test"

0 commit comments

Comments
 (0)