Skip to content

Commit

Permalink
Fix previous merge and prepare for release
Browse files Browse the repository at this point in the history
Previous merge had code change on output file only. This change
properly changes the source.
Update version to 0.2.2
  • Loading branch information
dkarchmer committed Oct 11, 2016
1 parent e9cde51 commit c4f6b21
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 8 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ myApp.controller('mainController', ['$scope', '$log', '$sce', function($scope, $

### Version Changes

* 0.2.1 adds broadcast on player's setup-error
* 0.2.0 adds support for multiple players on same view. jwplayerService.myPlayer is now an object and requires the playerID as key

### Contribute
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng-jwplayer",
"version": "0.2.1",
"version": "0.2.2",
"main": "jwplayer.js",
"ignore": [
"src",
Expand Down
9 changes: 4 additions & 5 deletions jwplayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
(function () {
'use strict';

JWPlayerService.$inject = ["jwplayer"];
angular
.module('ng-jwplayer')
.service('jwplayerService', JWPlayerService);
Expand Down Expand Up @@ -47,13 +48,13 @@
}
};
}
JWPlayerService.$inject = ["jwplayer"];

})();

(function() {
'use strict';

JWPlayer.$inject = ["$compile", "$log", "$rootScope", "jwplayerService"];
angular
.module('ng-jwplayer')
.directive('jwplayer', JWPlayer);
Expand All @@ -79,13 +80,12 @@
playerId: playerId
});
});

player.on('setupError', function() {
$rootScope.$broadcast('ng-jwplayer-setup-error', {
playerId: playerId
});
});

});
};

return {
Expand Down Expand Up @@ -120,5 +120,4 @@
}
};
}
JWPlayer.$inject = ["$compile", "$log", "$rootScope", "jwplayerService"];
})();
2 changes: 1 addition & 1 deletion jwplayer.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng-jwplayer",
"version": "0.2.1",
"version": "0.2.2",
"author": "David Karchmer",
"license": "MIT",
"description": "Angular directive for JWPlayer",
Expand Down
5 changes: 5 additions & 0 deletions src/jwplayer.directive.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@
});
});

player.on('setupError', function() {
$rootScope.$broadcast('ng-jwplayer-setup-error', {
playerId: playerId
});
});
};

return {
Expand Down

0 comments on commit c4f6b21

Please sign in to comment.