Skip to content

Commit

Permalink
Merge pull request #102 from dennybiasiolli/master
Browse files Browse the repository at this point in the history
Updated dependencies and fixed deprecated getDocument call.
  • Loading branch information
dennybiasiolli authored Nov 24, 2016
2 parents be1ab8c + 2b50642 commit c67e0c5
Show file tree
Hide file tree
Showing 11 changed files with 47,870 additions and 43,980 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ language: node_js
node_js:
- '0.12'
- '4'
- '6'
- 'node'
before_script:
- npm install -g bower
Expand Down
6 changes: 3 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"license": "MIT",
"homepage": "http://github.com/sayanee/angularjs-pdf",
"dependencies": {
"angular": "1.4.8",
"pdfjs-dist": "1.3.100"
"angular": "1.5.8",
"pdfjs-dist": "1.5.188"
},
"devDependencies": {
"angular-mocks": "1.4.8"
"angular-mocks": "1.5.8"
},
"ignore": [
"**/.*",
Expand Down
2 changes: 1 addition & 1 deletion dist/angular-pdf.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Angular-PDF Version: 1.3.0 | Released under an MIT license */
/*! Angular-PDF Version: 1.3.1 | Released under an MIT license */
(function() {

'use strict';
Expand Down
4 changes: 2 additions & 2 deletions dist/angular-pdf.min.js

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

6 changes: 3 additions & 3 deletions example/js/controllers/docCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ app.controller('DocCtrl', function($scope) {
$scope.loading = '';
}

$scope.onProgress = function(progress) {
console.log(progress);
}
$scope.onProgress = function (progressData) {
console.log(progressData);
};

});
2 changes: 1 addition & 1 deletion example/js/directives/angular-pdf.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Angular-PDF Version: 1.3.0 | Released under an MIT license */
/*! Angular-PDF Version: 1.3.1 | Released under an MIT license */
(function() {

'use strict';
Expand Down
Loading

0 comments on commit c67e0c5

Please sign in to comment.