From 5e2e34bf0d12afdc74f1b2b0918e747c9628155b Mon Sep 17 00:00:00 2001 From: JenCabral Date: Wed, 14 Jan 2015 07:30:39 -0600 Subject: [PATCH 01/19] Adding select-all to ftpupload --- static/scripts/mvc/upload/upload-ftp.js | 91 ++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 3 deletions(-) diff --git a/static/scripts/mvc/upload/upload-ftp.js b/static/scripts/mvc/upload/upload-ftp.js index 62bf8584238..f98530b5040 100644 --- a/static/scripts/mvc/upload/upload-ftp.js +++ b/static/scripts/mvc/upload/upload-ftp.js @@ -49,6 +49,48 @@ return Backbone.View.extend({ // update stats this.$el.find('#upload-ftp-number').html(ftp_files.length + ' files'); this.$el.find('#upload-ftp-disk').html(Utils.bytesToString (size, true)); + // ADD THINGS HERE + // + $($('.upload-ftp')[0]).find('#selectAll').on('click', function(){ + var checkboxes=$(this).parent().parent().parent().parent().find('tr.upload-ftp-row>td>div'); + var len = checkboxes.length; + var allChecked; + $this = $(this); + // + if($this.hasClass("fa-square-o")){ + $this.removeClass("fa-square-o"); + $this.removeClass("fa-minus-square-o"); + $this.addClass("fa-check-square-o"); + allChecked=true; + } + else{ + $this.removeClass("fa-check-square-o"); + $this.removeClass("fa-minus-square-o"); + $this.addClass("fa-square-o"); + allChecked=false; + } + // + for(i = 0; i < len; i++){ + if(allChecked) + { + + checkboxes.eq(i).removeClass("fa-square-o"); + checkboxes.eq(i).addClass("fa-check-square-o"); + } + else{ + checkboxes.eq(i).removeClass("fa-check-square-o"); + checkboxes.eq(i).addClass("fa-square-o"); + } + } + console.log(checkboxes, allChecked); + return; + } ); + + + + // END JC ADD + + } else { // add info this.$el.find('#upload-ftp-content').html($(this._templateInfo())); @@ -56,6 +98,10 @@ return Backbone.View.extend({ // hide spinner this.$el.find('#upload-ftp-wait').hide(); + + + + }, // add @@ -110,7 +156,40 @@ return Backbone.View.extend({ // add new icon class $icon.addClass(self.options.class_add); } + + var selectBox=$icon.parent().parent().parent().parent().find('#selectAll'); + var checkboxes=$icon.parent().parent().parent().parent().find('tr.upload-ftp-row>td>div'); + var checkedCheckboxes=$icon.parent().parent().parent().parent().find('tr.upload-ftp-row>td>div.fa-check-square-o'); + var lenAll = checkboxes.length; + var lenChecked = checkedCheckboxes.length; +// var checked = 0; + // console.log("BeforeLoop " + checked); + // for (i = 0; i < len; i++) { + // console.log("In loop "+checked, checkboxes.eq(i)); + // if (checkboxes.eq(i).hasClass("fa-check-square-o")) { + // checked++; + // console.log("In if "+checked); + // } + // } + if(lenChecked > 0 && lenChecked !== lenAll){ + selectBox.removeClass("fa-square-o"); + selectBox.removeClass("fa-check-square-o"); + selectBox.addClass("fa-minus-square-o"); + } + else if(lenChecked === lenAll){ + selectBox.removeClass("fa-square-o"); + selectBox.addClass("fa-check-square-o"); + selectBox.removeClass("fa-minus-square-o"); + } + else if(lenChecked === 0){ + selectBox.addClass("fa-square-o"); + selectBox.removeClass("fa-check-square-o"); + selectBox.removeClass("fa-minus-square-o"); + } + console.log(checkboxes,lenChecked); + }); + }, // get model index @@ -130,7 +209,7 @@ return Backbone.View.extend({ // template row _templateRow: function(options) { return '' + - '
' + + '
' + '

' + options.path + '

' + '' + Utils.bytesToString(options.size) + '' + '' + options.ctime + '' + @@ -149,7 +228,9 @@ return Backbone.View.extend({ '' + '' + '' + - '' + +//jc added + '' + +//end jc added '' + '' + '' + @@ -171,7 +252,11 @@ return Backbone.View.extend({ return '
' + '
NameSizeCreated
' + '' + '' + -//jc added '' + -//end jc added '' + '' + '' + @@ -257,9 +261,7 @@ return Backbone.View.extend({ '' + - '' + + '' + '' + '' + '' + @@ -253,9 +257,7 @@ return Backbone.View.extend({ return '
' + '
' + - '' + + '' + '' + '' + '' + From bc2daef9fc76c4d37f5cc98e82144ea6495b45e0 Mon Sep 17 00:00:00 2001 From: JenCabral Date: Thu, 15 Jan 2015 07:41:26 -0600 Subject: [PATCH 10/19] remove non changes and use _updateSelectAll3 --- static/scripts/mvc/upload/upload-ftp.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/static/scripts/mvc/upload/upload-ftp.js b/static/scripts/mvc/upload/upload-ftp.js index b4ff688281d..8fb03e19683 100644 --- a/static/scripts/mvc/upload/upload-ftp.js +++ b/static/scripts/mvc/upload/upload-ftp.js @@ -102,6 +102,7 @@ return Backbone.View.extend({ // add info this.$el.find('#upload-ftp-content').html($(this._templateInfo())); } + // hide spinner this.$el.find('#upload-ftp-wait').hide(); }, @@ -127,14 +128,17 @@ return Backbone.View.extend({ } else { icon_class = this.options.class_add; } + // add icon class $icon.addClass(icon_class); $it.on('addToUpBox', function() { // find model var model_index = self._find(ftp_file); + // update icon $icon.removeClass(); + // add model if (!model_index) { // add to uploadbox @@ -144,11 +148,13 @@ return Backbone.View.extend({ size : ftp_file.size, path : ftp_file.path }]); + // add new icon class $icon.addClass(self.options.class_remove); } else { // remove self.app.collection.remove(model_index); + // add new icon class $icon.addClass(self.options.class_add); } From c86fbcae3679b30dfc693d9d53bc9ffc069437eb Mon Sep 17 00:00:00 2001 From: JenCabral Date: Thu, 15 Jan 2015 07:44:15 -0600 Subject: [PATCH 11/19] remove non changes and use _updateSelectAll4 --- static/scripts/mvc/upload/upload-ftp.js | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/static/scripts/mvc/upload/upload-ftp.js b/static/scripts/mvc/upload/upload-ftp.js index 8fb03e19683..1aaa26a38df 100644 --- a/static/scripts/mvc/upload/upload-ftp.js +++ b/static/scripts/mvc/upload/upload-ftp.js @@ -62,21 +62,6 @@ return Backbone.View.extend({ var len = checkboxes.length; $this = $(this); var allChecked = !($this.hasClass('fa-check-square-o')); - - - - // change state of the selectAll checkbox - // if($this.hasClass('fa-check-square-o')) { - // // if checked change to unchecked - // $this.removeClass('fa-check-square-o'); - // $this.addClass('fa-square-o'); - // allChecked=false; - // } else { - // // if checked or partially checked, change to checked - // $this.removeClass('fa-square-o fa-minus-square-o'); - // $this.addClass('fa-check-square-o'); - // allChecked=true; - // } // change state of the sub-checkboxes for(i = 0; i < len; i++) { @@ -94,8 +79,8 @@ return Backbone.View.extend({ } } } + self._updateSelectAll(selectAll); - return; }); } else { From 88584e17d69e51f4cf92a0f5f4516666715e24c7 Mon Sep 17 00:00:00 2001 From: JenCabral Date: Thu, 15 Jan 2015 09:44:03 -0600 Subject: [PATCH 12/19] adding packed file --- static/scripts/packed/mvc/upload/upload-ftp.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/static/scripts/packed/mvc/upload/upload-ftp.js b/static/scripts/packed/mvc/upload/upload-ftp.js index 0d5d1c4e195..30c528e2bea 100644 --- a/static/scripts/packed/mvc/upload/upload-ftp.js +++ b/static/scripts/packed/mvc/upload/upload-ftp.js @@ -1 +1,2 @@ -define(["utils/utils"],function(a){return Backbone.View.extend({options:{class_add:"upload-icon-button fa fa-square-o",class_remove:"upload-icon-button fa fa-check-square-o"},initialize:function(c){this.app=c;var b=this;this.setElement(this._template());a.get({url:galaxy_config.root+"api/ftp_files",success:function(d){b._fill(d)},error:function(){b._fill()}})},events:{mousedown:function(b){b.preventDefault()}},_fill:function(c){if(c&&c.length>0){this.$el.find("#upload-ftp-content").html($(this._templateTable()));var b=0;for(key in c){this.add(c[key]);b+=c[key].size}this.$el.find("#upload-ftp-number").html(c.length+" files");this.$el.find("#upload-ftp-disk").html(a.bytesToString(b,true))}else{this.$el.find("#upload-ftp-content").html($(this._templateInfo()))}this.$el.find("#upload-ftp-wait").hide()},add:function(f){var d=this;var e=$(this._templateRow(f));var b=e.find(".icon");$(this.el).find("tbody").append(e);var c="";if(this._find(f)){c=this.options.class_remove}else{c=this.options.class_add}b.addClass(c);e.on("click",function(){var g=d._find(f);b.removeClass();if(!g){d.app.uploadbox.add([{mode:"ftp",name:f.path,size:f.size,path:f.path}]);b.addClass(d.options.class_remove)}else{d.app.collection.remove(g);b.addClass(d.options.class_add)}})},_find:function(f){var c=this.app.collection.where({file_path:f.path});var b=null;for(var d in c){var e=c[d];if(e.get("status")=="init"&&e.get("file_mode")=="ftp"){b=e.get("id")}}return b},_templateRow:function(b){return'"},_templateTable:function(){return'Available files:   
NameSizeCreated

' + options.path + '

' + Utils.bytesToString(options.size) + '' + options.ctime + '

' + options.path + '

' + Utils.bytesToString(options.size) + '' + options.ctime + '

'+b.path+'

'+a.bytesToString(b.size)+''+b.ctime+"
NameSizeCreated
'},_templateInfo:function(){return'
Your FTP directory does not contain any files.
'},_template:function(){return'