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

Timestamp:

Apr 16, 2015 11:46:05 AM (10 years ago)

Author:

quyenla

Message:

download fix

Location:

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

Files:

• grid.js (modified) (1 diff)
• manager.js (modified) (7 diffs)

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

@@ -24 +24 @@
                                 var thumb = null;
                                 var filehosting = o.manager.getFileHosting();
-                if (node.item.thumbnail != "")
-                {  
-                    thumb = $('<img>', {src:node.item.thumbnail,align:'middle'});
-                }
-                else
-                {
-                                        if($.inArray( type.toLowerCase(), [ "jpg", "jpeg", "png", "bmp"])>=0)
-                                        {
-                                                 thumb = $('<img>', {src: ""+ node.item.fileurl,align:'middle'});
-                                        }
-                }
-
-                                var div = $('<div></div>',{'class':icon});
-                                if (thumb != null) $(div).append(thumb);
+                                var filedomain = o.manager.getFileDomain();
+                                    
+
+                                if (node.item.thumbnail != '')
+                                {  
+                                    thumb = $('<img>', {src:node.item.thumbnail,align:'middle'});
+                                   
+                                }
+                                var div = $('<div></div>',{'class':icon});
+                                 $(div).append(thumb);
+
+                                
+                                
+                                
 
                                 var typeid = type == 'directory' ? 'directory':'file';

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

@@ -1 @@
-if (jQuery)
+if (jQuery) 
     (function ($) {
         $
@@ -41 +41 @@
                                 if (o.filehosting == undefined)
                                     o.filehosting = 'http://sbgapi.violet.vn/uploads/space';
-
+                                if (o.filedomain == undefined)
+                                    o.filedomain = 'http://sbgapi.violet.vn';
                                 if (o.invisibledButtons == undefined)
                                     o.invisibledButtons = null;
@@ -415 +416 @@
                                 var btnDownloadClick = function () {
                                     var items = o.oGrid.getHighLightItem();
-                                     /*       
-                                    if ($(items).length == 0) {
-                                        var node = o.oTree.getSelectedNode();
-                                        var itemID = $(node).attr('id');
-
-                                        if (itemID == 0)
-                                            return false;
-
-                                        items[0] = o.data.DIRECTORIES[searchItemByID(
-                                                itemID, 'directory')];
-                                        items[0].type = 'directory';
-                                    }
-                                    */
+                                   
+
                                     for (var i = 0; i < items.length; i++) {
                                         if (items[i].type == 'directory') {
+                                            
                                             items[i] = self.getAllDirChilds(items[i]);
                                         }
@@ -623 +614 @@
                                     $ext = $ext.toLowerCase();
                                     if ($.inArray($ext, ["jpg", "jpeg", "png","gif","tiff","dvg","bmp"]) >= 0) {
-                                        alert (node.fileurl);
+                                       
                                         content = "<img style='width:100%' src='"
                                                 + node.fileurl
@@ -806 +797 @@
                                                                 for (var i = 0; i < $(newFileData.FILES).length; i++) {
                                                                     var file = newFileData.FILES[i];
+                                                                   
                                                                     var node = {
-                                                                        thumbnail: file.thumbnail,
+                                                                       
+                                                                        thumbnail: o.filedomain+"/"+file.thumbnail,
                                                                         id: file.id,
                                                                         name: file.name,
@@ -821 +814 @@
                                                                 for (var i = 0; i < $(newFileData.DIRECTORIES).length; i++) {
                                                                     var file = newFileData.DIRECTORIES[i];
+                                                        
                                                                     var node = {
                                                                         id: file.id,
@@ -1454 +1448 @@
                                         return o.filehosting;
                                 }
+                                this.getFileDomain = function () {
+                                        return o.filedomain;
+                                }
 
                                 this.initialize = function () {