Merge branch 'gSchool-fix-paste-string-bug'

Rovak · Apr 10, 2016 · 4d6f53d · 4d6f53d
2 parents 3f2904c + b7b4b2f
commit 4d6f53d
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 7 deletions.
diff --git a/dist/angularjs.inline-attachment.js b/dist/angularjs.inline-attachment.js
@@ -287,6 +287,7 @@
    * @param {File} clipboard data file
    */
   inlineAttachment.prototype.isFileAllowed = function(file) {
+    if (file.kind === 'string') { return false; }
     if (this.settings.allowedTypes.indexOf('*') === 0){
       return true;
     } else {

diff --git a/dist/angularjs.inline-attachment.min.js b/dist/angularjs.inline-attachment.min.js
diff --git a/dist/codemirror-3.inline-attachment.js b/dist/codemirror-3.inline-attachment.js
@@ -287,6 +287,7 @@
    * @param {File} clipboard data file
    */
   inlineAttachment.prototype.isFileAllowed = function(file) {
+    if (file.kind === 'string') { return false; }
     if (this.settings.allowedTypes.indexOf('*') === 0){
       return true;
     } else {

diff --git a/dist/codemirror-3.inline-attachment.min.js b/dist/codemirror-3.inline-attachment.min.js
diff --git a/dist/codemirror-4.inline-attachment.js b/dist/codemirror-4.inline-attachment.js
@@ -287,6 +287,7 @@
    * @param {File} clipboard data file
    */
   inlineAttachment.prototype.isFileAllowed = function(file) {
+    if (file.kind === 'string') { return false; }
     if (this.settings.allowedTypes.indexOf('*') === 0){
       return true;
     } else {