浏览代码

Fix #1324: Error in IE11 Folder drag and drop

Kartik Visweswaran 6 年之前
父节点
当前提交
6b0ad21369
共有 4 个文件被更改,包括 12 次插入9 次删除
  1. 2 0
      CHANGE.md
  2. 7 7
      README.md
  3. 3 2
      js/fileinput.js
  4. 0 0
      js/fileinput.min.js

+ 2 - 0
CHANGE.md

@@ -5,7 +5,9 @@ Change Log: `bootstrap-fileinput`
 
 **Date:** _under development_
 
+- (enh #1332): Update Chinese Translations.
 - (enh #1325): Update README for NPM install.
+- (bug #1324): Error in IE11 Folder drag and drop.
 - (enh #1322): Add Uzbek Translations.
 - (enh #1320): New events for files dragged and dropped.
 - (enh #1319): Enhance mimeType parsing via `mimeTypeAliases`.

+ 7 - 7
README.md

@@ -43,18 +43,18 @@ The [master branch](https://github.com/kartik-v/bootstrap-fileinput/tree/master)
 
 ## Installation
 
-### Using NPM
-You can use the `npm` package manager to install. Run:
-
-    npm install bootstrap-fileinput
-
 ### Using Bower
-You can use the `bower` package manager to install. Run:
+To install using the `bower` package manager run:
 
     bower install bootstrap-fileinput
 
+### Using NPM
+To install using the `npm` package manager run:
+
+    npm install bootstrap-fileinput
+
 ### Using Composer
-You can use the `composer` package manager to install. Either run:
+To install using the `composer` package manager run: 
 
     $ php composer.phar require kartik-v/bootstrap-fileinput "@dev"
 

+ 3 - 2
js/fileinput.js

@@ -64,6 +64,7 @@
             return input !== undefined && (exact ? input === str : input.match(str));
         },
         isIE: function (ver) {
+            var div, status;
             // check for IE versions < 11
             if (navigator.appName !== 'Microsoft Internet Explorer') {
                 return false;
@@ -71,7 +72,7 @@
             if (ver === 10) {
                 return new RegExp('msie\\s' + ver, 'i').test(navigator.userAgent);
             }
-            var div = document.createElement("div"), status;
+            div = document.createElement("div");
             div.innerHTML = "<!--[if IE " + ver + "]> <i></i> <![endif]-->";
             status = div.getElementsByTagName("i").length;
             document.body.appendChild(div);
@@ -89,7 +90,7 @@
             }
         },
         getDragDropFolders: function (items) {
-            var i, item, len = items.length, folders = 0;
+            var i, item, len = items ? items.length : 0, folders = 0;
             if (len > 0 && items[0].webkitGetAsEntry()) {
                 for (i = 0; i < len; i++) {
                     item = items[i].webkitGetAsEntry();

文件差异内容过多而无法显示
+ 0 - 0
js/fileinput.min.js


部分文件因为文件数量过多而无法显示