Changeset 782 for pro-violet-viettel/www/deploy/20150304/assets

Timestamp:

Mar 16, 2015 5:23:29 PM (10 years ago)

Author:

dungnv

Message:

 

Location:

pro-violet-viettel/www/deploy/20150304/assets

Files:

• css/style2.css (added)
• js/README.html (added)
• js/jquery.fileupload.js (modified) (3 diffs)
• js/jwplayer.flash.swf (added)
• js/jwplayer.html5.js (added)
• js/jwplayer.js (added)
• js/manager.js (modified) (2 diffs)

pro-violet-viettel/www/deploy/20150304/assets/js/jquery.fileupload.js

@@ +1 @@
+
 /*
  * jQuery File Upload Plugin 5.26
@@ -81 +82 @@
             // Set the following option to true to force iframe transport uploads:
             forceIframeTransport: false,
-            // Set the following option to the location of a redirect url on the
+            // Set the following option to the location of a redirect . on the
             // origin server, for cross-domain iframe transport uploads:
             redirect: undefined,
@@ -704 +705 @@
             }
             options.result = result;
+            options.result2 = result;
             options.textStatus = textStatus;
             options.jqXHR = jqXHR;

pro-violet-viettel/www/deploy/20150304/assets/js/manager.js

@@ -454 +454 @@
                     var content="";
                     $ext=node.fileurl.split('.').pop();
-                    if ($ext == 'jpg')
-                    {
+                    if($.inArray( $ext, [ "jpg", "jpeg","png","gif"])>=0)
+                   {
                         content="<img style='width:100%' src='"+node.fileurl+"' /><br />"+node.name;
                         bootbox.alert(content);
@@ -488 +488 @@
                         bootbox.alert(content); 
                     }
-                    if($.inArray( $ext, [ "xls","ppt","doc","docs","pdf"])>=0)
+                    if($.inArray( $ext, [ "xls","ppt","doc","docs","pdf","txt"])>=0)
                    {
                         content='<iframe src="http://docs.google.com/gview?url='+node.fileurl+'&embedded=true" style="width:100%; height:400px;" frameborder="0"></iframe>'+node.name;