Styles.

[Plinn.git] / skins / ajax_scripts / folder_contents_script.js

diff --git a/skins/ajax_scripts/folder_contents_script.js b/skins/ajax_scripts/folder_contents_script.js
index 45ec76a..066bfc0 100644 (file)
--- a/skins/ajax_scripts/folder_contents_script.js
+++ b/skins/ajax_scripts/folder_contents_script.js
@@ -37,7 +37,7 @@ FolderDDropControler = function(listing, orderable, firstItemPos) {
        }
        addListener(this.listing, 'click', function(evt) {thisControler.selectCBRange(evt);});
        
        }
        addListener(this.listing, 'click', function(evt) {thisControler.selectCBRange(evt);});
        

-       if (browser.isIE) {
+       if (browser.isIE10max) {

                this.listing.ondragstart = function() { window.event.returnValue = false;};
        }
 };
                this.listing.ondragstart = function() { window.event.returnValue = false;};
        }
 };


@@ -70,7 +70,7 @@ FolderDDropControler.prototype.moveRow =  function(evt){
        var targetRow = this.targetRow;
        if (targetRow !== null) {
                this.noOver = false;
        var targetRow = this.targetRow;
        if (targetRow !== null) {
                this.noOver = false;

-               if (browser.isIE) {document.selection.clear();}
+               if (browser.isIE10max) {document.selection.clear();}

                var overRow = getTargetRow(evt);
 
                if (overRow.pos === targetRow.pos) {return;}
                var overRow = getTargetRow(evt);
 
                if (overRow.pos === targetRow.pos) {return;}


@@ -234,7 +234,7 @@ DropTarget.prototype.drop = function(evt) {
 };
 
 DropTarget.prototype.highlightTarget = function(evt){
 };
 
 DropTarget.prototype.highlightTarget = function(evt){

-       if (browser.isIE) {document.selection.clear();}
+       if (browser.isIE10max) {document.selection.clear();}

        var target = getTargetedObject(evt);
        if (this.folderDDControler.targetRow &&
                target.nodeName === "A" &&
        var target = getTargetedObject(evt);
        if (this.folderDDControler.targetRow &&
                target.nodeName === "A" &&


@@ -352,14 +352,25 @@ DDFolderUploader.prototype.beforeUpload = function(item) {
 DDFolderUploader.prototype.uploadCompleteHandlerCB = function(req) {
        var item = this.uploadedItem;
        var row = getCopyOfNode(req.responseXML.documentElement.firstChild);
 DDFolderUploader.prototype.uploadCompleteHandlerCB = function(req) {
        var item = this.uploadedItem;
        var row = getCopyOfNode(req.responseXML.documentElement.firstChild);

-       row.className = item.className;

 
        if (req.status === 200) {
                // update
 
        if (req.status === 200) {
                // update

-               console.log('todo');
+               this.listing.removeChild(item);
+               var itemUrl = row.getElementsByTagName('a')[0].href;
+               var links = this.listing.getElementsByTagName('a');
+               var i, existingRow;
+               for (i=0 ; i < links.length ; i++) {
+                       if (links[i].href === itemUrl) {
+                               existingRow = links[i].parentNode.parentNode;
+                               row.className = existingRow.className;
+                               this.listing.replaceChild(row, existingRow);
+                               break;
+                       }
+               }

        }
        else if(req.status === 201) {
                // creation
        }
        else if(req.status === 201) {
                // creation

+               row.className = item.className;

                this.listing.replaceChild(row, item);
                this.progressBarMaxSize = row.clientWidth;
        }
                this.listing.replaceChild(row, item);
                this.progressBarMaxSize = row.clientWidth;
        }