1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/4f8bee770d0b/ Changeset: 4f8bee770d0b User: guerler Date: 2014-11-06 14:02:29+00:00 Summary: ToolForm: Use classic ordering for repeat blocks Affected #: 3 files diff -r f9e8de1c84b2d60cc727ec5b64da6fe67616b7ed -r 4f8bee770d0be3f13cb7d2283a288c588b54ad63 client/galaxy/scripts/mvc/tools/tools-repeat.js --- a/client/galaxy/scripts/mvc/tools/tools-repeat.js +++ b/client/galaxy/scripts/mvc/tools/tools-repeat.js @@ -40,12 +40,12 @@ content : '' }); + // append button + this.$el.append(this.table.$el); + // add button this.$el.append(Utils.wrap(this.button_new.$el)); - // append button - this.$el.append(this.table.$el); - // clear list this.list = {}; }, @@ -97,7 +97,7 @@ // append to dom this.table.add(portlet.$el); - this.table.prepend('row_' + options.id, true); + this.table.append('row_' + options.id, true); // validate maximum if (this.options.max > 0 && this.size() >= this.options.max) { diff -r f9e8de1c84b2d60cc727ec5b64da6fe67616b7ed -r 4f8bee770d0be3f13cb7d2283a288c588b54ad63 static/scripts/mvc/tools/tools-repeat.js --- a/static/scripts/mvc/tools/tools-repeat.js +++ b/static/scripts/mvc/tools/tools-repeat.js @@ -40,12 +40,12 @@ content : '' }); + // append button + this.$el.append(this.table.$el); + // add button this.$el.append(Utils.wrap(this.button_new.$el)); - // append button - this.$el.append(this.table.$el); - // clear list this.list = {}; }, @@ -97,7 +97,7 @@ // append to dom this.table.add(portlet.$el); - this.table.prepend('row_' + options.id, true); + this.table.append('row_' + options.id, true); // validate maximum if (this.options.max > 0 && this.size() >= this.options.max) { diff -r f9e8de1c84b2d60cc727ec5b64da6fe67616b7ed -r 4f8bee770d0be3f13cb7d2283a288c588b54ad63 static/scripts/packed/mvc/tools/tools-repeat.js --- a/static/scripts/packed/mvc/tools/tools-repeat.js +++ b/static/scripts/packed/mvc/tools/tools-repeat.js @@ -1,1 +1,1 @@ -define(["utils/utils","mvc/ui/ui-table","mvc/ui/ui-portlet","mvc/ui/ui-misc"],function(c,a,b,e){var d=Backbone.View.extend({optionsDefault:{max:null},initialize:function(g){this.options=c.merge(g,this.optionsDefault);this.setElement("<div/>");var f=this;this.button_new=new e.ButtonIcon({icon:"fa-plus",title:"Insert "+g.title_new,tooltip:"Add new "+g.title_new+" block",floating:"clear",onclick:function(){if(g.onnew){g.onnew()}}});this.table=new a.View({cls:"ui-table-plain",content:""});this.$el.append(c.wrap(this.button_new.$el));this.$el.append(this.table.$el);this.list={}},size:function(){return _.size(this.list)},add:function(g){var f=new e.ButtonIcon({icon:"fa-trash-o",tooltip:"Delete this repeat block",cls:"ui-button-icon-plain",onclick:function(){if(g.ondel){g.ondel()}}});var h=new b.View({id:g.id,title:"<b>"+g.title+"</b>",cls:"ui-portlet-repeat",operations:{button_delete:f}});if(!g.ondel){f.remove()}h.append(g.$el);h.$el.addClass("section-row");this.list[g.id]=h;this.table.add(h.$el);this.table.prepend("row_"+g.id,true);if(this.options.max>0&&this.size()>=this.options.max){this.button_new.disable()}},del:function(g){if(this.list[g]){var f=this.table.get("row_"+g);f.remove();delete this.list[g];this.button_new.enable()}},retitle:function(g){var f=0;for(var h in this.list){this.list[h].title(++f+": "+g)}}});return{View:d}}); \ No newline at end of file +define(["utils/utils","mvc/ui/ui-table","mvc/ui/ui-portlet","mvc/ui/ui-misc"],function(c,a,b,e){var d=Backbone.View.extend({optionsDefault:{max:null},initialize:function(g){this.options=c.merge(g,this.optionsDefault);this.setElement("<div/>");var f=this;this.button_new=new e.ButtonIcon({icon:"fa-plus",title:"Insert "+g.title_new,tooltip:"Add new "+g.title_new+" block",floating:"clear",onclick:function(){if(g.onnew){g.onnew()}}});this.table=new a.View({cls:"ui-table-plain",content:""});this.$el.append(this.table.$el);this.$el.append(c.wrap(this.button_new.$el));this.list={}},size:function(){return _.size(this.list)},add:function(g){var f=new e.ButtonIcon({icon:"fa-trash-o",tooltip:"Delete this repeat block",cls:"ui-button-icon-plain",onclick:function(){if(g.ondel){g.ondel()}}});var h=new b.View({id:g.id,title:"<b>"+g.title+"</b>",cls:"ui-portlet-repeat",operations:{button_delete:f}});if(!g.ondel){f.remove()}h.append(g.$el);h.$el.addClass("section-row");this.list[g.id]=h;this.table.add(h.$el);this.table.append("row_"+g.id,true);if(this.options.max>0&&this.size()>=this.options.max){this.button_new.disable()}},del:function(g){if(this.list[g]){var f=this.table.get("row_"+g);f.remove();delete this.list[g];this.button_new.enable()}},retitle:function(g){var f=0;for(var h in this.list){this.list[h].title(++f+": "+g)}}});return{View:d}}); \ No newline at end of file Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.