Fix splitter sizing, node insertion on descending sorting mode, remove unused variables

cdujeu · cdujeu · commit b0ab2f1e4bfc · 2015-10-02T09:27:37.000+02:00
Last booter compiler
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot_protolegacy.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot_protolegacy.js
diff --git a/core/src/plugins/gui.ajax/res/js/core/http/PydioApi.js b/core/src/plugins/gui.ajax/res/js/core/http/PydioApi.js
@@ -126,7 +126,7 @@ var PydioApi = (function () {
         if (window.pydio && pydio.Parameters.get('SERVER_PREFIX_URI')) {
             PydioApi._libUrl = pydio.Parameters.get('SERVER_PREFIX_URI');
         }
-        var path = PydioApi._libUrl ? PydioApi._libUrl + '/' + fileName : fileName;
+        //var path = (PydioApi._libUrl?PydioApi._libUrl+'/'+fileName:fileName);
 
         /*if(window.jQuery && window.jQuery.ajax){
             jQuery.ajax(path,
diff --git a/core/src/plugins/gui.ajax/res/js/core/http/ResourcesManager.js b/core/src/plugins/gui.ajax/res/js/core/http/ResourcesManager.js
@@ -45,8 +45,6 @@ var ResourcesManager = (function () {
      */
 
     ResourcesManager.prototype.addJSResource = function addJSResource(fileName, className) {
-        var autoload = arguments[2] === undefined ? false : arguments[2];
-
         if (!this.resources.js) {
             this.resources.js = [];
         }
diff --git a/core/src/plugins/gui.ajax/res/js/es6/http/PydioApi.es6 b/core/src/plugins/gui.ajax/res/js/es6/http/PydioApi.es6
@@ -110,7 +110,7 @@ class PydioApi{
         if(window.pydio && pydio.Parameters.get('SERVER_PREFIX_URI')){
             PydioApi._libUrl = pydio.Parameters.get('SERVER_PREFIX_URI');
         }
-        var path = (PydioApi._libUrl?PydioApi._libUrl+'/'+fileName:fileName);
+        //var path = (PydioApi._libUrl?PydioApi._libUrl+'/'+fileName:fileName);
 
         /*if(window.jQuery && window.jQuery.ajax){
             jQuery.ajax(path,
diff --git a/core/src/plugins/gui.ajax/res/js/es6/http/ResourcesManager.es6 b/core/src/plugins/gui.ajax/res/js/es6/http/ResourcesManager.es6
@@ -35,7 +35,7 @@ class ResourcesManager{
 	 * @param fileName String
 	 * @param className String
 	 */
-	addJSResource(fileName, className, autoload=false){
+	addJSResource(fileName, className){
 		if(!this.resources.js){
 			this.resources.js = [];
 		}
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AbstractEditor.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AbstractEditor.js
@@ -281,9 +281,6 @@ Class.create("AbstractEditor" , {
 	 * @param title String
 	 */
 	updateTitle : function(title){
-		if(title != ""){
-			//title = " - " + title;
-		}
 		if(this.filenameSpan) {
             this.filenameSpan.update(title);
         }
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpPane.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpPane.js
@@ -175,11 +175,11 @@ Class.create("AjxpPane", {
         "use strict";
         if(!$(this.options.bindSizeTo.width.id) || !this.htmlElement) return;
         var min = this.options.bindSizeTo.width.min;
-        if(Object.isString(min) && min.indexOf("%") != false) min = this.htmlElement.parentNode.getWidth() * min / 100;
+        if(Object.isString(min) && min.indexOf("%") !== false) min = this.htmlElement.parentNode.getWidth() * min / 100;
         var w = Math.max($(this.options.bindSizeTo.width.id).getWidth() + this.options.bindSizeTo.width.offset, min);
         if(this.options.bindSizeTo.width.max) {
             var max = this.options.bindSizeTo.width.max;
-            if(Object.isString(max) && max.indexOf("%") != false) max = this.htmlElement.parentNode.getWidth() * max / 100;
+            if(Object.isString(max) && max.indexOf("%") !== false) max = this.htmlElement.parentNode.getWidth() * max / 100;
             w = Math.min(max, w);
         }
         if(this.options.bindSizeTo.width.checkSiblings){
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpUsersCompleter.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpUsersCompleter.js
@@ -106,7 +106,6 @@ Class.create("AjxpUsersCompleter", Ajax.Autocompleter, {
             afterUpdateElement: function(element, selectedLi){
                 if(listElement){
 
-                    var id = Math.random();
                     var label = selectedLi.getAttribute("data-label");
                     var entryId = selectedLi.getAttribute("data-entry_id");
                     if(selectedLi.getAttribute("data-temporary") && pref && ! label.startsWith(pref)){
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js
@@ -1373,13 +1373,17 @@ Class.create("FilesList", SelectableElements, {
                 sortCache.sort(sortFunction);
                 for(var i=0;i<sortCache.length;i++){
                     if(sortCache[i].element == newItem){
-                        if(i == 0) $(newItem.parentNode).insert({top:newItem});
-                        else {
-                            if(sortCache[i-1].element.ajxpNode.getPath() == newItem.ajxpNode.getPath()){
+                        if(i == 0) {
+                            $(newItem.parentNode).insert({top: newItem});
+                        }else if (i == sortCache.length -1){
+                            $(newItem.parentNode).insert({bottom: newItem});
+                        } else {
+                            var otherIndex = (descending ? i+1 : i-1);
+                            if(sortCache[otherIndex].element.ajxpNode.getPath() == newItem.ajxpNode.getPath()){
                                 $(newItem.parentNode).remove(newItem);
                                 break;
                             }
-                            sortCache[i-1].element.insert({after:newItem});
+                            sortCache[otherIndex].element.insert({after:newItem});
                         }
                         break;
                     }
@@ -1589,7 +1593,6 @@ Class.create("FilesList", SelectableElements, {
             };
         }
 		var pos = posSpan.cumulativeOffset();
-		var text = span.innerHTML;
         if(!item.ajxpNode){
             item.ajxpNode = $(item.id).ajxpNode;
         }
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FoldersTree.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FoldersTree.js
@@ -313,7 +313,6 @@ Class.create("FoldersTree", AjxpPane, {
         scrollTop = this.treeContainer.scrollTop;
 
    		var pos = item.cumulativeOffset();
-   		var text = span.innerHTML;
    		var edit = new Element('input', {value:item.ajxpNode.getLabel('text'), id:'editbox'}).setStyle({
    			zIndex:5000,
    			position:'absolute',
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.HeaderResizer.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.HeaderResizer.js
@@ -535,13 +535,14 @@ Class.create("HeaderResizer", {
 	 * @param message String
 	 */
 	log : function(message){
-		return;
+		/*
 		if(window.console){
 			console.log(message);
 		}else if($('info_panel')){			
 			$('info_panel').insert('<div>'+message+'</div>');
 			$('info_panel').scrollTop = $('info_panel').scrollHeight;
 		}
+		*/
 	}	
 
 });
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.LocationBar.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.LocationBar.js
@@ -57,7 +57,7 @@ Class.create("LocationBar", {
 		this.initCurrentPath();
 		this.element.insert(locDiv);
 		locDiv.insert(this.currentPath);
-		var inputDims = this.currentPath.getDimensions();
+		this.currentPath.getDimensions();
 		this.currentPath.hide();
 		this.label = new Element('div', {className:'location_bar_label'}).update("/test");
 		this.label.setStyle({
diff --git a/core/src/plugins/gui.ajax/res/js/vendor/leightbox/lightbox.js b/core/src/plugins/gui.ajax/res/js/vendor/leightbox/lightbox.js
@@ -163,10 +163,6 @@ function displayLightBoxById(id, overlayStyle, overlayClass)
     if(overlayClass) valid.overlayClass = overlayClass;
 	valid.activate();
 	currentLightBox = valid;	
-	if(id != 'copymove_div')
-	{
-		
-	}
 }
 
 function hideLightBox(onFormSubmit)
diff --git a/core/src/plugins/gui.ajax/res/js/vendor/prototype/splitter.js b/core/src/plugins/gui.ajax/res/js/vendor/prototype/splitter.js
@@ -115,12 +115,10 @@ Class.create("Splitter", AjxpPane, {
         if(!this.initBorderB) this.initBorderB = 0;
 
 		this.splitbar = new Element('div', {unselectable:'on'});
-        var zIndex = (this.options.invisibleBar?parseInt(this.group.getStyle('zIndex'))+1:'inherit') || '10000';
 		this.splitbar.addClassName(this.options.splitbarClass).setStyle({
             position:'absolute',
             cursor:this.options.cursor,
-            fontSize:'1px'/*,
-            zIndex:zIndex*/
+            fontSize:'1px'
         });
 		this.paneA.insert({after:this.splitbar});
 
@@ -131,16 +129,17 @@ Class.create("Splitter", AjxpPane, {
 
 		this.initCaches();
 
-		this.paneA._init = (this.options.initA==true?parseInt(this.options.getAdjust(this.paneA)):this.options.initA) || 0;
-		this.paneB._init = (this.options.initB==true?parseInt(this.options.getAdjust(this.paneB)):this.options.initB) || 0;
+		this.paneA._init = (this.options.initA===true?parseInt(this.options.getAdjust(this.paneA)):this.options.initA) || 0;
+		this.paneB._init = (this.options.initB===true?parseInt(this.options.getAdjust(this.paneB)):this.options.initB) || 0;
+        var startB;
 		if(this.paneB._init){
 			this.paneB.setStyle(this.makeStyleObject(this.options.adjust, this.paneB._init));
+            startB = this.group[this.options.offsetAdjust] - this.group._borderAdjust-this.splitbar._adjust - this.paneB._init;
 		}
 		if(this.paneA._init){
 			this.paneA.setStyle(this.makeStyleObject(this.options.adjust, this.paneA._init));
 		}
-		//Event.observe(window,"resize", function(e){this.resizeGroup(e, null, true);}.bind(this));
-		this.resizeGroup(null, this.paneB._init || this.paneA._init || Math.round((this.group[this.options.offsetAdjust]-this.group._borderAdjust-this.splitbar._adjust)/2));
+		this.resizeGroup(null, startB || this.paneA._init || Math.round((this.group[this.options.offsetAdjust]-this.group._borderAdjust-this.splitbar._adjust)/2));
 
         this.userLoggedObs = function(){
             var sizePref = this.getUserPreference("size");
@@ -246,7 +245,7 @@ Class.create("Splitter", AjxpPane, {
             subMenu:false,
             subMenuUpdateImage:false,
             callback: function(){
-                var state = oThis.toggleFolding(foldingValue == "B" ? oThis.paneB : oThis.paneA);
+                oThis.toggleFolding(foldingValue == "B" ? oThis.paneB : oThis.paneA);
             },
             listeners : {
                 init:function(){
@@ -279,7 +278,7 @@ Class.create("Splitter", AjxpPane, {
                 subMenu:false,
                 subMenuUpdateImage:false,
                 callback: function(){
-                    var state = oThis.toggleFolding(foldingValue == "B" ? oThis.paneB : oThis.paneA);
+                    oThis.toggleFolding(foldingValue == "B" ? oThis.paneB : oThis.paneA);
                     oThis.getFoldingAction().enable();
                 },
                 listeners : {
@@ -585,8 +584,6 @@ Class.create("Splitter", AjxpPane, {
 		np = Math.max(minPaneA+this.paneA._padAdjust, this.group._adjust - (this.paneB._max||9999), minSize,
 				Math.min(np, this.paneA._max||9999, this.group._adjust - this.splitbar._adjust -
 				Math.max(minPaneB + this.paneB._padAdjust, minSize)));
-		var optNameSet = this.options.set;
-		var optNameAdjust = this.options.adjust;
         if(!np) np = this.paneA._init;
 		this.splitbar.setStyle(this.makeStyleObject(this.options.set, (np + this.splitbar._reAdjust) +'px'));
 		var borderAdjA = 0;
diff --git a/core/src/plugins/gui.ajax/res/js/vendor/scriptaculous/src/controls.js b/core/src/plugins/gui.ajax/res/js/vendor/scriptaculous/src/controls.js
@@ -440,7 +440,6 @@ Autocompleter.Local = Class.create(Autocompleter.Base, {
         var ret       = []; // Beginning matches
         var partial   = []; // Inside matches
         var entry     = instance.getToken();
-        var count     = 0;
 
         for (var i = 0; i < instance.options.array.length &&  
           ret.length < instance.options.choices ; i++) { 
@@ -874,9 +873,9 @@ Ajax.InPlaceEditor.prototype.initialize.dealWithDeprecatedOptions = function(opt
     options[name] = expr;
   };
   fallback('cancelControl', (options.cancelLink ? 'link' : (options.cancelButton ? 'button' :
-    options.cancelLink == options.cancelButton == false ? false : undefined)));
+    options.cancelLink == options.cancelButton === false ? false : undefined)));
   fallback('okControl', (options.okLink ? 'link' : (options.okButton ? 'button' :
-    options.okLink == options.okButton == false ? false : undefined)));
+    options.okLink == options.okButton === false ? false : undefined)));
   fallback('highlightColor', options.highlightcolor);
   fallback('highlightEndColor', options.highlightendcolor);
 };
diff --git a/core/src/plugins/gui.ajax/res/js/vendor/webfx/xtree.js b/core/src/plugins/gui.ajax/res/js/vendor/webfx/xtree.js
@@ -109,7 +109,7 @@ var webFXTreeHandler = {
 	blur      : function (oItem) { if(this.all[oItem.id.replace('-anchor','')]) this.all[oItem.id.replace('-anchor','')].blur();},
 	setFocus  : function (bFocus){ this.hasFocus = bFocus;},
 	keydown   : function (oItem, e) { return this.all[oItem.id].keydown(e.keyCode); },
-	linkKeyPress : function(oItem, e){if(!this.hasFocus || e.keyCode == 9) return false;return true;},
+	linkKeyPress : function(oItem, e){return !(!this.hasFocus || e.keyCode == 9)},
 	cookies   : new WebFXCookie(),
 	insertHTMLBeforeEnd	:	function (oElement, sHTML) {
 		if(!oElement) return;
@@ -182,7 +182,6 @@ function WebFXTreeBufferTreeChange(){
 
 WebFXTreeAbstractNode.prototype.add = function (node, bNoIdent) {
 	node.parentNode = this;	
-	var url = node.parentNode.url;
 	if(node.parentNode.inZip) node.inZip = true;
 	else{		
 		if(webFXTreeConfig.zipRegexp.test(node.text) !== false){
@@ -604,13 +603,10 @@ WebFXTreeItem.prototype.updateIcon = function(icon, openIcon){
 
 WebFXTreeItem.prototype.remove = function() {
 	if(!$(this.id+'-plus')) return;
-	var iconSrc = $(this.id + '-plus').src;
 	var parentNode = this.parentNode;
 	var prevSibling = this.getPreviousSibling(true);
 	var nextSibling = this.getNextSibling(true);
-	var folder = this.parentNode.folder;
 	var last = ((nextSibling) && (nextSibling.parentNode) && (nextSibling.parentNode.id == parentNode.id))?false:true;
-	//this.getPreviousSibling().focus();
 	this._remove();
 	Droppables.remove($(this.id));
 	if(webFXTreeHandler.contextMenu) webFXTreeHandler.contextMenu.removeElements('#'+this.id);

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ var PydioApi = (function () {`
`126`	`126`	`if (window.pydio && pydio.Parameters.get('SERVER_PREFIX_URI')) {`
`127`	`127`	`PydioApi._libUrl = pydio.Parameters.get('SERVER_PREFIX_URI');`
`128`	`128`	`}`
`129`		`- var path = PydioApi._libUrl ? PydioApi._libUrl + '/' + fileName : fileName;`
	`129`	`+ //var path = (PydioApi._libUrl?PydioApi._libUrl+'/'+fileName:fileName);`
`130`	`130`
`131`	`131`	`/*if(window.jQuery && window.jQuery.ajax){`
`132`	`132`	`jQuery.ajax(path,`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,6 @@ var ResourcesManager = (function () {`
`45`	`45`	`*/`
`46`	`46`
`47`	`47`	`ResourcesManager.prototype.addJSResource = function addJSResource(fileName, className) {`
`48`		`- var autoload = arguments[2] === undefined ? false : arguments[2];`
`49`		`-`
`50`	`48`	`if (!this.resources.js) {`
`51`	`49`	`this.resources.js = [];`
`52`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ class PydioApi{`
`110`	`110`	`if(window.pydio && pydio.Parameters.get('SERVER_PREFIX_URI')){`
`111`	`111`	`PydioApi._libUrl = pydio.Parameters.get('SERVER_PREFIX_URI');`
`112`	`112`	`}`
`113`		`- var path = (PydioApi._libUrl?PydioApi._libUrl+'/'+fileName:fileName);`
	`113`	`+ //var path = (PydioApi._libUrl?PydioApi._libUrl+'/'+fileName:fileName);`
`114`	`114`
`115`	`115`	`/*if(window.jQuery && window.jQuery.ajax){`
`116`	`116`	`jQuery.ajax(path,`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class ResourcesManager{`
`35`	`35`	`* @param fileName String`
`36`	`36`	`* @param className String`
`37`	`37`	`*/`
`38`		`- addJSResource(fileName, className, autoload=false){`
	`38`	`+ addJSResource(fileName, className){`
`39`	`39`	`if(!this.resources.js){`
`40`	`40`	`this.resources.js = [];`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1373,13 +1373,17 @@ Class.create("FilesList", SelectableElements, {`
`1373`	`1373`	`sortCache.sort(sortFunction);`
`1374`	`1374`	`for(var i=0;i<sortCache.length;i++){`
`1375`	`1375`	`if(sortCache[i].element == newItem){`
`1376`		`- if(i == 0) $(newItem.parentNode).insert({top:newItem});`
`1377`		`- else {`
`1378`		`- if(sortCache[i-1].element.ajxpNode.getPath() == newItem.ajxpNode.getPath()){`
	`1376`	`+ if(i == 0) {`
	`1377`	`+ $(newItem.parentNode).insert({top: newItem});`
	`1378`	`+ }else if (i == sortCache.length -1){`
	`1379`	`+ $(newItem.parentNode).insert({bottom: newItem});`
	`1380`	`+ } else {`
	`1381`	`+ var otherIndex = (descending ? i+1 : i-1);`
	`1382`	`+ if(sortCache[otherIndex].element.ajxpNode.getPath() == newItem.ajxpNode.getPath()){`
`1379`	`1383`	`$(newItem.parentNode).remove(newItem);`
`1380`	`1384`	`break;`
`1381`	`1385`	`}`
`1382`		`- sortCache[i-1].element.insert({after:newItem});`
	`1386`	`+ sortCache[otherIndex].element.insert({after:newItem});`
`1383`	`1387`	`}`
`1384`	`1388`	`break;`
`1385`	`1389`	`}`
`@@ -1589,7 +1593,6 @@ Class.create("FilesList", SelectableElements, {`
`1589`	`1593`	`};`
`1590`	`1594`	`}`
`1591`	`1595`	`var pos = posSpan.cumulativeOffset();`
`1592`		`- var text = span.innerHTML;`
`1593`	`1596`	`if(!item.ajxpNode){`
`1594`	`1597`	`item.ajxpNode = $(item.id).ajxpNode;`
`1595`	`1598`	`}`