-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Danial Farid
authored and
Danial Farid
committed
Sep 20, 2015
1 parent
a9b5de6
commit 31f0878
Showing
7 changed files
with
30 additions
and
26 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| * progress, resize, thumbnail, preview, validation and CORS | ||
| * FileAPI Flash shim for old browsers not supporting FormData | ||
| * @author Danial <[email protected]> | ||
| * @version 7.3.5 | ||
| * @version 7.3.6 | ||
| */ | ||
|
|
||
| (function () { | ||
|
|
@@ -424,7 +424,7 @@ if (!window.FileReader) { | |
| * AngularJS file upload directives and services. Supoorts: file upload/drop/paste, resume, cancel/abort, | ||
| * progress, resize, thumbnail, preview, validation and CORS | ||
| * @author Danial <[email protected]> | ||
| * @version 7.3.5 | ||
| * @version 7.3.6 | ||
| */ | ||
|
|
||
| if (window.XMLHttpRequest && !(window.FileAPI && FileAPI.shouldLoad)) { | ||
|
|
@@ -445,7 +445,7 @@ if (window.XMLHttpRequest && !(window.FileAPI && FileAPI.shouldLoad)) { | |
|
|
||
| var ngFileUpload = angular.module('ngFileUpload', []); | ||
|
|
||
| ngFileUpload.version = '7.3.5'; | ||
| ngFileUpload.version = '7.3.6'; | ||
|
|
||
| ngFileUpload.service('UploadBase', ['$http', '$q', '$timeout', function ($http, $q, $timeout) { | ||
| var upload = this; | ||
|
|
@@ -1193,13 +1193,15 @@ ngFileUpload.directive('ngfSelect', ['$parse', '$timeout', '$compile', 'Upload', | |
| $timeout(function () { | ||
| var unwatch = scope.$watch(attr[directiveName], function (file) { | ||
| var size = resizeParams; | ||
| if (directiveName === 'ngfThumbnail' && !size) { | ||
| size = {width: elem[0].clientWidth, height: elem[0].clientHeight}; | ||
| } | ||
| if (size.width === 0 && window.getComputedStyle) { | ||
| var style = getComputedStyle(elem[0]); | ||
| size = {width: parseInt(style.width.slice(0, -2)), | ||
| height: parseInt(style.height.slice(0, -2))}; | ||
| if (directiveName === 'ngfThumbnail') { | ||
| if (!size) { | ||
| size = {width: elem[0].clientWidth, height: elem[0].clientHeight}; | ||
| } | ||
| if (size.width === 0 && window.getComputedStyle) { | ||
| var style = getComputedStyle(elem[0]); | ||
| size = {width: parseInt(style.width.slice(0, -2)), | ||
| height: parseInt(style.height.slice(0, -2))}; | ||
| } | ||
| } | ||
|
|
||
| if (angular.isString(file)) { | ||
|
|
||
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| * progress, resize, thumbnail, preview, validation and CORS | ||
| * FileAPI Flash shim for old browsers not supporting FormData | ||
| * @author Danial <[email protected]> | ||
| * @version 7.3.5 | ||
| * @version 7.3.6 | ||
| */ | ||
|
|
||
| (function () { | ||
|
|
||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
| * AngularJS file upload directives and services. Supoorts: file upload/drop/paste, resume, cancel/abort, | ||
| * progress, resize, thumbnail, preview, validation and CORS | ||
| * @author Danial <[email protected]> | ||
| * @version 7.3.5 | ||
| * @version 7.3.6 | ||
| */ | ||
|
|
||
| if (window.XMLHttpRequest && !(window.FileAPI && FileAPI.shouldLoad)) { | ||
|
|
@@ -23,7 +23,7 @@ if (window.XMLHttpRequest && !(window.FileAPI && FileAPI.shouldLoad)) { | |
|
|
||
| var ngFileUpload = angular.module('ngFileUpload', []); | ||
|
|
||
| ngFileUpload.version = '7.3.5'; | ||
| ngFileUpload.version = '7.3.6'; | ||
|
|
||
| ngFileUpload.service('UploadBase', ['$http', '$q', '$timeout', function ($http, $q, $timeout) { | ||
| var upload = this; | ||
|
|
@@ -771,13 +771,15 @@ ngFileUpload.directive('ngfSelect', ['$parse', '$timeout', '$compile', 'Upload', | |
| $timeout(function () { | ||
| var unwatch = scope.$watch(attr[directiveName], function (file) { | ||
| var size = resizeParams; | ||
| if (directiveName === 'ngfThumbnail' && !size) { | ||
| size = {width: elem[0].clientWidth, height: elem[0].clientHeight}; | ||
| } | ||
| if (size.width === 0 && window.getComputedStyle) { | ||
| var style = getComputedStyle(elem[0]); | ||
| size = {width: parseInt(style.width.slice(0, -2)), | ||
| height: parseInt(style.height.slice(0, -2))}; | ||
| if (directiveName === 'ngfThumbnail') { | ||
| if (!size) { | ||
| size = {width: elem[0].clientWidth, height: elem[0].clientHeight}; | ||
| } | ||
| if (size.width === 0 && window.getComputedStyle) { | ||
| var style = getComputedStyle(elem[0]); | ||
| size = {width: parseInt(style.width.slice(0, -2)), | ||
| height: parseInt(style.height.slice(0, -2))}; | ||
| } | ||
| } | ||
|
|
||
| if (angular.isString(file)) { | ||
|
|
||
Large diffs are not rendered by default.
Oops, something went wrong.