Home Explore Help
Sign In
hugh
/
bootstrap-fileinput
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Upgrade to release v2.4.0

Kartik Visweswaran 10 years ago
parent
6c50413a75
commit
ed75b24b77
5 changed files with 9 additions and 7 deletions
Unified View Show Diff Stats
  1. 1 0
      CHANGE.md
  2. 1 1
      README.md
  3. 1 0
      examples/index.html
  4. 6 6
      js/fileinput.js
  5. 0 0
      js/fileinput.min.js

+ 1 - 0
CHANGE.md
View File 

@@ -5,6 +5,7 @@ version 2.4.0
 
 - (enh #30): Enhanced generic support for more preview formats (audio, video, html, flash, and other objects).
 
 - (enh #30): Enhanced generic support for more preview formats (audio, video, html, flash, and other objects).
 
 - (enh #31): Better control and configuration of preview templates.
 
 - (enh #31): Better control and configuration of preview templates.
 
 - (enh #32): Added checks for file api support
 
 - (enh #32): Added checks for file api support
 
+- (enh #33): Better text format validation and correct modal preview
 
 
 
 > **Note:** There are BC Breaking Changes with release v2.4.0.
 
 > **Note:** There are BC Breaking Changes with release v2.4.0.

+ 1 - 1
README.md
View File 

@@ -111,7 +111,7 @@ Step 1: Load the following assets in your header.
 
 <link href="http://netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css" rel="stylesheet">
 
 <link href="http://netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css" rel="stylesheet">
 
 <link href="path/to/css/fileinput.min.css" media="all" rel="stylesheet" type="text/css" />
 
 <link href="path/to/css/fileinput.min.css" media="all" rel="stylesheet" type="text/css" />
 
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
 
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
 
-<script src="path/to/js/fileinput.min.js" type="text/javascript"></script>
 
+<script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js" type="text/javascript"></script>
 
 ```
 
 ```
 
 
 
 If you noticed, you need to load the `jquery.min.js` and `bootstrap.min.css` in addition to the `fileinput.min.css` and `fileinput.min.js`.
 
 If you noticed, you need to load the `jquery.min.js` and `bootstrap.min.css` in addition to the `fileinput.min.css` and `fileinput.min.js`.

+ 1 - 0
examples/index.html
View File 

@@ -8,6 +8,7 @@
 
         <link href="../css/fileinput.css" media="all" rel="stylesheet" type="text/css" />

         <link href="../css/fileinput.css" media="all" rel="stylesheet" type="text/css" />

         <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>

         <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>

         <script src="../js/fileinput.js" type="text/javascript"></script>

         <script src="../js/fileinput.js" type="text/javascript"></script>

+        <script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js" rel="stylesheet">

     </head>

     </head>

     <body>

     <body>

         <div class="container">

         <div class="container">

+ 6 - 6
js/fileinput.js
View File 

@@ -124,16 +124,16 @@
 
             return (typeof vType !== "undefined") ? vType == 'text/html' : vName.match(/\.(htm|html)$/i);
 
             return (typeof vType !== "undefined") ? vType == 'text/html' : vName.match(/\.(htm|html)$/i);
 
         },
 
         },
 
         text: function(vType, vName) {
 
         text: function(vType, vName) {
 
-            return (typeof vType !== "undefined") ? vType.match('text.*') : vName.match(/\.(txt|md|csv|nfo|php|ini)$/i);
 
+            return typeof vType !== "undefined" && vType.match('text.*') || vName.match(/\.(txt|md|csv|nfo|php|ini)$/i);
 
         },
 
         },
 
         video: function (vType, vName) {
 
         video: function (vType, vName) {
 
-            return (typeof vType !== "undefined" && vType.match(/\.video\/(ogg|mp4|webm)$/i)) || vName.match(/\.(og?|mp4|webm)$/i);
 
+            return typeof vType !== "undefined" && vType.match(/\.video\/(ogg|mp4|webm)$/i) || vName.match(/\.(og?|mp4|webm)$/i);
 
         },
 
         },
 
         audio: function (vType, vName) {
 
         audio: function (vType, vName) {
 
-            return (typeof vType !== "undefined" && vType.match(/\.audio\/(ogg|mp3|wav)$/i)) || vName.match(/\.(ogg|mp3|wav)$/i);
 
+            return typeof vType !== "undefined" && vType.match(/\.audio\/(ogg|mp3|wav)$/i) || vName.match(/\.(ogg|mp3|wav)$/i);
 
         },
 
         },
 
         flash: function (vType, vName) {
 
         flash: function (vType, vName) {
 
-            return (typeof vType !== "undefined" && vType == 'application/x-shockwave-flash') || vName.match(/\.(swf)$/i);
 
+            return typeof vType !== "undefined" && vType == 'application/x-shockwave-flash' || vName.match(/\.(swf)$/i);
 
         },
 
         },
 
         object: function (vType, vName) {
 
         object: function (vType, vName) {
 
             return true;
 
             return true;
 
@@ -470,7 +470,7 @@
 
                     var strText = theFile.target.result;
 
                     var strText = theFile.target.result;
 
                     vUrl.revokeObjectURL(data);
 
                     vUrl.revokeObjectURL(data);
 
                     if (strText.length > wrapLen) {
 
                     if (strText.length > wrapLen) {
 
-                        var id = uniqId(), height = window.innerHeight * .75,
 
+                        var id = 'text-' + uniqId(), height = window.innerHeight * .75,
 
                             modal = self.getLayoutTemplate('modal').replace(/\{id\}/g, id).replace(/\{title\}/g,
 
                             modal = self.getLayoutTemplate('modal').replace(/\{id\}/g, id).replace(/\{title\}/g,
 
                                 caption).replace(/\{body\}/g, strText).replace(/\{height\}/g, height);
 
                                 caption).replace(/\{body\}/g, strText).replace(/\{height\}/g, height);
 
                         wrapInd = wrapInd.replace(/\{title\}/g, caption).replace(/\{dialog\}/g,
 
                         wrapInd = wrapInd.replace(/\{title\}/g, caption).replace(/\{dialog\}/g,
 
@@ -480,7 +480,7 @@
 
                     content = template
 
                     content = template
 
                         .replace(/\{previewId\}/g, previewId).replace(/\{caption\}/g, caption)
 
                         .replace(/\{previewId\}/g, previewId).replace(/\{caption\}/g, caption)
 
                         .replace(/\{type\}/g, file.type).replace(/\{data\}/g, strText)
 
                         .replace(/\{type\}/g, file.type).replace(/\{data\}/g, strText)
 
-                        .replace(/\{width\}/g, config.width).replace(/\{height\}/g, config.height);
 
+                        .replace(/\{width\}/g, config.width).replace(/\{height\}/g, config.height) + modal;
 
                 } else {
 
                 } else {
 
                     content = template
 
                     content = template
 
                         .replace(/\{previewId\}/g, previewId).replace(/\{caption\}/g, caption)
 
                         .replace(/\{previewId\}/g, previewId).replace(/\{caption\}/g, caption)

File diff suppressed because it is too large
+ 0 - 0
js/fileinput.min.js


Some files were not shown because too many files changed in this diff