-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added dropUrl to ng-model-options updateOn
- Loading branch information
Danial Farid
authored and
Danial Farid
committed
Nov 27, 2015
1 parent
f132a67
commit 31010bf
Showing
17 changed files
with
33 additions
and
33 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 10.0.3 | ||
| * @version 10.0.4 | ||
| */ | ||
|
|
||
| (function () { | ||
|
|
@@ -421,7 +421,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 10.0.3 | ||
| * @version 10.0.4 | ||
| */ | ||
|
|
||
| if (window.XMLHttpRequest && !(window.FileAPI && FileAPI.shouldLoad)) { | ||
|
|
@@ -442,7 +442,7 @@ if (window.XMLHttpRequest && !(window.FileAPI && FileAPI.shouldLoad)) { | |
|
|
||
| var ngFileUpload = angular.module('ngFileUpload', []); | ||
|
|
||
| ngFileUpload.version = '10.0.3'; | ||
| ngFileUpload.version = '10.0.4'; | ||
|
|
||
| ngFileUpload.service('UploadBase', ['$http', '$q', '$timeout', function ($http, $q, $timeout) { | ||
| var upload = this; | ||
|
|
@@ -2063,7 +2063,7 @@ ngFileUpload.service('UploadResize', ['UploadValidate', '$q', function (UploadVa | |
| try { | ||
| html = (evt.dataTransfer && evt.dataTransfer.getData && evt.dataTransfer.getData('text/html')); | ||
| } catch (e) {/* Fix IE11 that throw error calling getData */} | ||
| if (html) { | ||
| if (upload.shouldUpdateOn('dropUrl', attr, scope) && html) { | ||
| var url; | ||
| html.replace(/<img .*src *=\"([^\"]*)\"/, function (m, src) { | ||
| url = src; | ||
|
|
||
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 10.0.3 | ||
| * @version 10.0.4 | ||
| */ | ||
|
|
||
| (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 10.0.3 | ||
| * @version 10.0.4 | ||
| */ | ||
|
|
||
| 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 = '10.0.3'; | ||
| ngFileUpload.version = '10.0.4'; | ||
|
|
||
| ngFileUpload.service('UploadBase', ['$http', '$q', '$timeout', function ($http, $q, $timeout) { | ||
| var upload = this; | ||
|
|
@@ -1644,7 +1644,7 @@ ngFileUpload.service('UploadResize', ['UploadValidate', '$q', function (UploadVa | |
| try { | ||
| html = (evt.dataTransfer && evt.dataTransfer.getData && evt.dataTransfer.getData('text/html')); | ||
| } catch (e) {/* Fix IE11 that throw error calling getData */} | ||
| if (html) { | ||
| if (upload.shouldUpdateOn('dropUrl', attr, scope) && html) { | ||
| var url; | ||
| html.replace(/<img .*src *=\"([^\"]*)\"/, function (m, src) { | ||
| url = src; | ||
|
|
||
Large diffs are not rendered by default.
Oops, something went wrong.
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 10.0.3 | ||
| * @version 10.0.4 | ||
| */ | ||
|
|
||
| (function () { | ||
|
|
@@ -421,7 +421,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 10.0.3 | ||
| * @version 10.0.4 | ||
| */ | ||
|
|
||
| if (window.XMLHttpRequest && !(window.FileAPI && FileAPI.shouldLoad)) { | ||
|
|
@@ -442,7 +442,7 @@ if (window.XMLHttpRequest && !(window.FileAPI && FileAPI.shouldLoad)) { | |
|
|
||
| var ngFileUpload = angular.module('ngFileUpload', []); | ||
|
|
||
| ngFileUpload.version = '10.0.3'; | ||
| ngFileUpload.version = '10.0.4'; | ||
|
|
||
| ngFileUpload.service('UploadBase', ['$http', '$q', '$timeout', function ($http, $q, $timeout) { | ||
| var upload = this; | ||
|
|
@@ -2063,7 +2063,7 @@ ngFileUpload.service('UploadResize', ['UploadValidate', '$q', function (UploadVa | |
| try { | ||
| html = (evt.dataTransfer && evt.dataTransfer.getData && evt.dataTransfer.getData('text/html')); | ||
| } catch (e) {/* Fix IE11 that throw error calling getData */} | ||
| if (html) { | ||
| if (upload.shouldUpdateOn('dropUrl', attr, scope) && html) { | ||
| var url; | ||
| html.replace(/<img .*src *=\"([^\"]*)\"/, function (m, src) { | ||
| url = src; | ||
|
|
||
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 10.0.3 | ||
| * @version 10.0.4 | ||
| */ | ||
|
|
||
| (function () { | ||
|
|
||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.