Skip to content
Open

1.0.1 #170

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 2.0.0 Zyncro
- Broadcast message send by $scope.$parent instead $scope

# 2.0.0

## Features
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ they are also concatenated with core flow.js library.

**Using Bower**

bower install ng-flow#~2
bower install zyncro-ng-flow

**Git Clone**

git clone https://github.com/flowjs/ng-flow
git clone https://github.com/zyncro/ng-flow

**Using Yeoman**

bower install "ng-flow#~2" --save
bower install "zyncro-ng-flow#1.0.1" --save
grunt bower-install

2) Add the module to your app as a dependency:
Expand All @@ -45,7 +45,7 @@ First of all wrap places there you are going to use Flow.js

This directive is going to add $flow variable to current scope.
Also directive can be nested, because `$flow` variable is going to be overridden.
`$flow` is instance of [Flow](https://github.com/flowjs/flow.js#flow).
`$flow` is instance of [Flow](https://github.com/zyncro/flow.js#flow).


Secondly you need to assign some upload buttons:
Expand All @@ -69,7 +69,7 @@ Files array is attached to flow object named `$flow`.
</tr>
````

file is instance of [FlowFile](https://github.com/flowjs/flow.js#flowfile).
file is instance of [FlowFile](https://github.com/zyncro/flow.js#flowfile).


### Quick setup
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "ng-flow",
"name": "zyncro-ng-flow",
"version": "2.6.1",
"ignore": [
"**/.*",
Expand All @@ -13,7 +13,7 @@
"package.json",
"bower.json"
],
"main": "./dist/ng-flow.js",
"main": "./dist/ng-flow-standalone.js",
"dependencies": {
"angular": "~1",
"flow.js": "~2"
Expand Down
3 changes: 2 additions & 1 deletion dist/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
`ng-flow-standalone.js` - Flow.js + ng-flow, everything that you need is in this one file.
The following libraries are sending the broadcast message by parent scope:

`ng-flow-standalone.js` - Flow.js + ng-flow, everything that you need is in this one file.
`ng-flow.js` - ng-flow only, you have to include flow.js yourself.
4 changes: 2 additions & 2 deletions dist/ng-flow-standalone.js
Original file line number Diff line number Diff line change
Expand Up @@ -1634,11 +1634,11 @@ angular.module('flow.init', ['flow.provider'])
var catchAllHandler = function(eventName){
var args = Array.prototype.slice.call(arguments);
args.shift();
var event = $scope.$broadcast.apply($scope, ['flow::' + eventName, flow].concat(args));
var event = $scope.$parent.$broadcast.apply($scope.$parent, ['flow::' + eventName, flow].concat(args));
if ({
'progress':1, 'filesSubmitted':1, 'fileSuccess': 1, 'fileError': 1, 'complete': 1
}[eventName]) {
$scope.$apply();
$scope.$parent.$apply();
}
if (event.defaultPrevented) {
return false;
Expand Down
2 changes: 0 additions & 2 deletions dist/ng-flow-standalone.min.js

This file was deleted.

4 changes: 2 additions & 2 deletions dist/ng-flow.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ angular.module('flow.init', ['flow.provider'])
var catchAllHandler = function(eventName){
var args = Array.prototype.slice.call(arguments);
args.shift();
var event = $scope.$broadcast.apply($scope, ['flow::' + eventName, flow].concat(args));
var event = $scope.$parent.$broadcast.apply($scope.$parent, ['flow::' + eventName, flow].concat(args));
if ({
'progress':1, 'filesSubmitted':1, 'fileSuccess': 1, 'fileError': 1, 'complete': 1
}[eventName]) {
$scope.$apply();
$scope.$parent.$apply();
}
if (event.defaultPrevented) {
return false;
Expand Down
2 changes: 0 additions & 2 deletions dist/ng-flow.min.js

This file was deleted.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "ng-flow",
"version": "2.6.1",
"description": "Flow.js html5 file upload extension on angular.js framework",
"name": "zyncro-ng-flow",
"version": "z1.0.1",
"description": "Zyncro hack of ng-flow working on Angular 1.2.28",
"scripts": {
"test": "grunt test"
},
"repository": {
"type": "git",
"url": "git://github.com/flowjs/ng-flow.git"
"url": "git://github.com/zyncro/ng-flow.git"
},
"keywords": [
"flow.js",
Expand All @@ -20,7 +20,7 @@
"file upload",
"upload"
],
"author": "Aidas Klimas",
"author": "Aidas Klimas hacked by Jose Luis Campaña",
"license": "MIT",
"readmeFilename": "README.md",
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions src/directives/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ angular.module('flow.init', ['flow.provider'])
var catchAllHandler = function(eventName){
var args = Array.prototype.slice.call(arguments);
args.shift();
var event = $scope.$broadcast.apply($scope, ['flow::' + eventName, flow].concat(args));
var event = $scope.$parent.$broadcast.apply($scope.$parent, ['flow::' + eventName, flow].concat(args));
if ({
'progress':1, 'filesSubmitted':1, 'fileSuccess': 1, 'fileError': 1, 'complete': 1
}[eventName]) {
$scope.$apply();
$scope.$parent.$apply();
}
if (event.defaultPrevented) {
return false;
Expand Down