From 775ee33d4dbf7cb763e9f25430aae645d2df4c65 Mon Sep 17 00:00:00 2001 From: Martin Cech Date: Wed, 7 Oct 2015 16:24:16 -0400 Subject: [PATCH] fix options default order to fix bug with improper page being rendered also add missing comma for previous commit --- client/galaxy/scripts/mvc/library/library-librarylist-view.js | 2 +- .../galaxy/scripts/mvc/library/library-librarytoolbar-view.js | 4 ++-- static/maps/mvc/library/library-librarylist-view.js.map | 2 +- static/maps/mvc/library/library-librarytoolbar-view.js.map | 2 +- static/scripts/mvc/library/library-librarylist-view.js | 2 +- static/scripts/mvc/library/library-librarytoolbar-view.js | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/galaxy/scripts/mvc/library/library-librarylist-view.js b/client/galaxy/scripts/mvc/library/library-librarylist-view.js index d16aff4f694..ba86cc6018f 100644 --- a/client/galaxy/scripts/mvc/library/library-librarylist-view.js +++ b/client/galaxy/scripts/mvc/library/library-librarylist-view.js @@ -32,7 +32,7 @@ var LibraryListView = Backbone.View.extend({ * @param {object} options an object with options */ initialize : function( options ){ - this.options = _.defaults( this.options || {}, this.defaults, options ); + this.options = _.defaults( this.options || {}, options, this.defaults ); var that = this; this.modal = null; // map of library model ids to library views = cache diff --git a/client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js b/client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js index 99df9c1e8fa..61303db1f14 100644 --- a/client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js +++ b/client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js @@ -12,7 +12,7 @@ var LibraryToolbarView = Backbone.View.extend({ defaults: { search_term: '' - } + }, events: { 'click #create_new_library_btn' : 'showLibraryModal', @@ -22,7 +22,7 @@ var LibraryToolbarView = Backbone.View.extend({ }, initialize: function( options ){ - this.options = _.defaults( this.options || {}, this.defaults, options ); + this.options = _.defaults( this.options || {}, options, this.defaults ); this.render(); }, diff --git a/static/maps/mvc/library/library-librarylist-view.js.map b/static/maps/mvc/library/library-librarylist-view.js.map index 747d18812e3..32390ce392c 100644 --- a/static/maps/mvc/library/library-librarylist-view.js.map +++ b/static/maps/mvc/library/library-librarylist-view.js.map @@ -1 +1 @@ -{"version":3,"file":"library-librarylist-view.js","sources":["../../../src/mvc/library/library-librarylist-view.js"],"names":["define","mod_masthead","mod_baseMVC","mod_utils","mod_toastr","mod_library_model","mod_library_libraryrow_view","LibraryListView","Backbone","View","extend","el","events","click .sort-libraries-link","defaults","page_count","show_page","initialize","options","this","_","that","modal","rowViews","collection","Libraries","fetch","success","render","error","model","response","responseJSON","err_msg","template","templateLibraryList","libraries_to_render","models","$","hide","sortLibraries","Galaxy","libraries","preferences","get","where","deleted","total_libraries_count","length","page_start","Math","ceil","slice","libraries_shown","$el","html","order","search_term","libraryToolbarView","renderPaginator","renderRows","tooltip","css","i","library","cachedView","findWhere","id","undefined","delegateEvents","find","append","renderOne","rowView","LibraryRowView","sort_clicked","set","sort_order","sortByNameAsc","sortByNameDesc","redirectToHome","window","location","redirectToLogin","searchLibraries","results","search","searching","tmpl_array","push","join"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"library-librarylist-view.js","sources":["../../../src/mvc/library/library-librarylist-view.js"],"names":["define","mod_masthead","mod_baseMVC","mod_utils","mod_toastr","mod_library_model","mod_library_libraryrow_view","LibraryListView","Backbone","View","extend","el","events","click .sort-libraries-link","defaults","page_count","show_page","initialize","options","this","_","that","modal","rowViews","collection","Libraries","fetch","success","render","error","model","response","responseJSON","err_msg","template","templateLibraryList","libraries_to_render","models","$","hide","sortLibraries","Galaxy","libraries","preferences","get","where","deleted","total_libraries_count","length","page_start","Math","ceil","slice","libraries_shown","$el","html","order","search_term","libraryToolbarView","renderPaginator","renderRows","tooltip","css","i","library","cachedView","findWhere","id","undefined","delegateEvents","find","append","renderOne","rowView","LibraryRowView","sort_clicked","set","sort_order","sortByNameAsc","sortByNameDesc","redirectToHome","window","location","redirectToLogin","searchLibraries","results","search","searching","tmpl_array","push","join"],"mappings":"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"} \ No newline at end of file diff --git a/static/maps/mvc/library/library-librarytoolbar-view.js.map b/static/maps/mvc/library/library-librarytoolbar-view.js.map index 95e3f9fe51c..65972de8bfe 100644 --- a/static/maps/mvc/library/library-librarytoolbar-view.js.map +++ b/static/maps/mvc/library/library-librarytoolbar-view.js.map @@ -1 +1 @@ -{"version":3,"file":"library-librarytoolbar-view.js","sources":["../../../src/mvc/library/library-librarytoolbar-view.js"],"names":["define","mod_toastr","mod_library_model","LibraryToolbarView","Backbone","View","extend","el","events","click #create_new_library_btn","click #include_deleted_chk","click #page_size_prompt","keyup .library-search-input","initialize","options","this","_","defaults","render","toolbar_template","templateToolBar","is_admin","is_anonym","Galaxy","currUser","isAdmin","isAnonymous","$el","html","admin_user","anon_user","find","checked","libraries","preferences","get","renderPaginator","paginator_template","templatePaginator","show_page","parseInt","page_count","total_libraries_count","libraries_shown","showLibraryModal","event","preventDefault","stopPropagation","self","modal","show","closing_events","title","body","templateNewLibraryInModal","buttons","Create","createNewLibrary","Close","hide","libraryDetails","serializeNewLibrary","validateNewLibrary","library","Library","save","success","libraryListView","collection","add","clearLibraryModal","error","model","response","responseJSON","err_msg","showPageSizePrompt","library_page_size","prompt","set","$","val","name","description","synopsis","includeDeletedChecked","target","with_deleted","searchLibraries","search_term","template","join"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"library-librarytoolbar-view.js","sources":["../../../src/mvc/library/library-librarytoolbar-view.js"],"names":["define","mod_toastr","mod_library_model","LibraryToolbarView","Backbone","View","extend","el","defaults","search_term","events","click #create_new_library_btn","click #include_deleted_chk","click #page_size_prompt","keyup .library-search-input","initialize","options","this","_","render","toolbar_template","templateToolBar","is_admin","is_anonym","Galaxy","currUser","isAdmin","isAnonymous","$el","html","admin_user","anon_user","find","checked","libraries","preferences","get","renderPaginator","paginator_template","templatePaginator","show_page","parseInt","page_count","total_libraries_count","libraries_shown","showLibraryModal","event","preventDefault","stopPropagation","self","modal","show","closing_events","title","body","templateNewLibraryInModal","buttons","Create","createNewLibrary","Close","hide","libraryDetails","serializeNewLibrary","validateNewLibrary","library","Library","save","success","libraryListView","collection","add","clearLibraryModal","error","model","response","responseJSON","err_msg","showPageSizePrompt","library_page_size","prompt","set","$","val","name","description","synopsis","includeDeletedChecked","target","with_deleted","searchLibraries","template","join"],"mappings":"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"} \ No newline at end of file diff --git a/static/scripts/mvc/library/library-librarylist-view.js b/static/scripts/mvc/library/library-librarylist-view.js index 7687aa083ef..b8f92df1957 100644 --- a/static/scripts/mvc/library/library-librarylist-view.js +++ b/static/scripts/mvc/library/library-librarylist-view.js @@ -1,2 +1,2 @@ -define(["galaxy.masthead","mvc/base-mvc","utils/utils","libs/toastr","mvc/library/library-model","mvc/library/library-libraryrow-view"],function(a,b,c,d,e,f){var g=Backbone.View.extend({el:"#libraries_element",events:{"click .sort-libraries-link":"sort_clicked"},defaults:{page_count:null,show_page:null},initialize:function(a){this.options=_.defaults(this.options||{},this.defaults,a);var b=this;this.modal=null,this.rowViews={},this.collection=new e.Libraries,this.collection.fetch({success:function(){b.render()},error:function(a,b){d.error("undefined"!=typeof b.responseJSON?b.responseJSON.err_msg:"An error ocurred.")}})},render:function(a){this.options=_.extend(this.options,a);var b=this.templateLibraryList(),c=null,d=null;$(".tooltip").hide(),"undefined"!=typeof a&&(d="undefined"!=typeof a.models?a.models:null),null!==this.collection&&null===d?(this.sortLibraries(),c=Galaxy.libraries.preferences.get("with_deleted")?this.collection.models:this.collection.where({deleted:!1})):c=null!==d?d:[],(null===this.options.show_page||this.options.show_page<1)&&(this.options.show_page=1),this.options.total_libraries_count=c.length;var e=Galaxy.libraries.preferences.get("library_page_size")*(this.options.show_page-1);this.options.page_count=Math.ceil(this.options.total_libraries_count/Galaxy.libraries.preferences.get("library_page_size")),this.options.total_libraries_count>0&&ethis.options.total_libraries_count+Galaxy.libraries.preferences.get("library_page_size")&&(c=[]),this.$el.html(b({length:1,order:Galaxy.libraries.preferences.get("sort_order"),search_term:Galaxy.libraries.libraryToolbarView.options.search_term})),Galaxy.libraries.libraryToolbarView.renderPaginator(this.options),this.renderRows(c)):(this.$el.html(b({length:0,order:Galaxy.libraries.preferences.get("sort_order"),search_term:Galaxy.libraries.libraryToolbarView.options.search_term})),Galaxy.libraries.libraryToolbarView.renderPaginator(this.options)),$("#center [data-toggle]").tooltip(),$("#center").css("overflow","auto")},renderRows:function(a){for(var b=0;b'),tmpl_array.push("<% if(length === 0) { %>"),tmpl_array.push("<% if(search_term.length > 0) { %>"),tmpl_array.push("
There are no libraries matching your search. Try different keyword.
"),tmpl_array.push("<% } else{ %>"),tmpl_array.push('
There are no libraries visible to you here. If you expected some to show up please consult the library security wikipage or visit the Galaxy support site.
'),tmpl_array.push("<% }%>"),tmpl_array.push("<% } else{ %>"),tmpl_array.push(''),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(' '),tmpl_array.push(' '),tmpl_array.push(' '),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(" "),tmpl_array.push("
name descriptionsynopsis
"),tmpl_array.push("<% }%>"),tmpl_array.push(""),_.template(tmpl_array.join(""))}});return{LibraryListView:g}}); +define(["galaxy.masthead","mvc/base-mvc","utils/utils","libs/toastr","mvc/library/library-model","mvc/library/library-libraryrow-view"],function(a,b,c,d,e,f){var g=Backbone.View.extend({el:"#libraries_element",events:{"click .sort-libraries-link":"sort_clicked"},defaults:{page_count:null,show_page:null},initialize:function(a){this.options=_.defaults(this.options||{},a,this.defaults);var b=this;this.modal=null,this.rowViews={},this.collection=new e.Libraries,this.collection.fetch({success:function(){b.render()},error:function(a,b){d.error("undefined"!=typeof b.responseJSON?b.responseJSON.err_msg:"An error ocurred.")}})},render:function(a){this.options=_.extend(this.options,a);var b=this.templateLibraryList(),c=null,d=null;$(".tooltip").hide(),"undefined"!=typeof a&&(d="undefined"!=typeof a.models?a.models:null),null!==this.collection&&null===d?(this.sortLibraries(),c=Galaxy.libraries.preferences.get("with_deleted")?this.collection.models:this.collection.where({deleted:!1})):c=null!==d?d:[],(null===this.options.show_page||this.options.show_page<1)&&(this.options.show_page=1),this.options.total_libraries_count=c.length;var e=Galaxy.libraries.preferences.get("library_page_size")*(this.options.show_page-1);this.options.page_count=Math.ceil(this.options.total_libraries_count/Galaxy.libraries.preferences.get("library_page_size")),this.options.total_libraries_count>0&&ethis.options.total_libraries_count+Galaxy.libraries.preferences.get("library_page_size")&&(c=[]),this.$el.html(b({length:1,order:Galaxy.libraries.preferences.get("sort_order"),search_term:Galaxy.libraries.libraryToolbarView.options.search_term})),Galaxy.libraries.libraryToolbarView.renderPaginator(this.options),this.renderRows(c)):(this.$el.html(b({length:0,order:Galaxy.libraries.preferences.get("sort_order"),search_term:Galaxy.libraries.libraryToolbarView.options.search_term})),Galaxy.libraries.libraryToolbarView.renderPaginator(this.options)),$("#center [data-toggle]").tooltip(),$("#center").css("overflow","auto")},renderRows:function(a){for(var b=0;b'),tmpl_array.push("<% if(length === 0) { %>"),tmpl_array.push("<% if(search_term.length > 0) { %>"),tmpl_array.push("
There are no libraries matching your search. Try different keyword.
"),tmpl_array.push("<% } else{ %>"),tmpl_array.push('
There are no libraries visible to you here. If you expected some to show up please consult the library security wikipage or visit the Galaxy support site.
'),tmpl_array.push("<% }%>"),tmpl_array.push("<% } else{ %>"),tmpl_array.push(''),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(' '),tmpl_array.push(' '),tmpl_array.push(' '),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(" "),tmpl_array.push("
name descriptionsynopsis
"),tmpl_array.push("<% }%>"),tmpl_array.push(""),_.template(tmpl_array.join(""))}});return{LibraryListView:g}}); //# sourceMappingURL=../../../maps/mvc/library/library-librarylist-view.js.map \ No newline at end of file diff --git a/static/scripts/mvc/library/library-librarytoolbar-view.js b/static/scripts/mvc/library/library-librarytoolbar-view.js index f58c3bf4bd9..cf38292d8d4 100644 --- a/static/scripts/mvc/library/library-librarytoolbar-view.js +++ b/static/scripts/mvc/library/library-librarytoolbar-view.js @@ -1,2 +1,2 @@ -define(["libs/toastr","mvc/library/library-model"],function(a,b){var c=Backbone.View.extend({el:"#center",events:{"click #create_new_library_btn":"showLibraryModal","click #include_deleted_chk":"includeDeletedChecked","click #page_size_prompt":"showPageSizePrompt","keyup .library-search-input":"searchLibraries"},initialize:function(a){this.options=_.defaults(this.options||{},this.defaults,a),this.render()},render:function(){var a=this.templateToolBar(),b=!1,c=!0;Galaxy.currUser&&(b=Galaxy.currUser.isAdmin(),c=Galaxy.currUser.isAnonymous()),this.$el.html(a({admin_user:b,anon_user:c})),b&&(this.$el.find("#include_deleted_chk")[0].checked=Galaxy.libraries.preferences.get("with_deleted"))},renderPaginator:function(a){this.options=_.extend(this.options,a);var b=this.templatePaginator();this.$el.find("#library_paginator").html(b({show_page:parseInt(this.options.show_page),page_count:parseInt(this.options.page_count),total_libraries_count:this.options.total_libraries_count,libraries_shown:this.options.libraries_shown}))},showLibraryModal:function(a){a.preventDefault(),a.stopPropagation();var b=this;this.modal=Galaxy.modal,this.modal.show({closing_events:!0,title:"Create New Library",body:this.templateNewLibraryInModal(),buttons:{Create:function(){b.createNewLibrary()},Close:function(){b.modal.hide()}}})},createNewLibrary:function(){var c=this.serializeNewLibrary();if(this.validateNewLibrary(c)){var d=new b.Library,e=this;d.save(c,{success:function(b){Galaxy.libraries.libraryListView.collection.add(b),e.modal.hide(),e.clearLibraryModal(),Galaxy.libraries.libraryListView.render(),a.success("Library created.")},error:function(b,c){a.error("undefined"!=typeof c.responseJSON?c.responseJSON.err_msg:"An error occured.")}})}else a.error("Library's name is missing.");return!1},showPageSizePrompt:function(){var a=prompt("How many libraries per page do you want to see?",Galaxy.libraries.preferences.get("library_page_size"));null!=a&&a==parseInt(a)&&(Galaxy.libraries.preferences.set({library_page_size:parseInt(a)}),Galaxy.libraries.libraryListView.render({show_page:1}))},clearLibraryModal:function(){$("input[name='Name']").val(""),$("input[name='Description']").val(""),$("input[name='Synopsis']").val("")},serializeNewLibrary:function(){return{name:$("input[name='Name']").val(),description:$("input[name='Description']").val(),synopsis:$("input[name='Synopsis']").val()}},validateNewLibrary:function(a){return""!==a.name},includeDeletedChecked:function(a){a.target.checked?(Galaxy.libraries.preferences.set({with_deleted:!0}),Galaxy.libraries.libraryListView.render()):(Galaxy.libraries.preferences.set({with_deleted:!1}),Galaxy.libraries.libraryListView.render())},searchLibraries:function(){var a=$(".library-search-input").val();this.options.search_term=a,Galaxy.libraries.libraryListView.searchLibraries(a)},templateToolBar:function(){return _.template(['
','
','
','
','DATA LIBRARIES','',"",'
','',"
","<% if(admin_user === true) { %>",'
',"","
",'','',"","<% } %>",'','','',"","","
","
","
",'
',"
","
"].join(""))},templatePaginator:function(){return _.template(['","",' showing <%- libraries_shown %> of <%- total_libraries_count %> libraries',""].join(""))},templateNewLibraryInModal:function(){return _.template(['
',"
",'','','',"
","
"].join(""))}});return{LibraryToolbarView:c}}); +define(["libs/toastr","mvc/library/library-model"],function(a,b){var c=Backbone.View.extend({el:"#center",defaults:{search_term:""},events:{"click #create_new_library_btn":"showLibraryModal","click #include_deleted_chk":"includeDeletedChecked","click #page_size_prompt":"showPageSizePrompt","keyup .library-search-input":"searchLibraries"},initialize:function(a){this.options=_.defaults(this.options||{},a,this.defaults),this.render()},render:function(){var a=this.templateToolBar(),b=!1,c=!0;Galaxy.currUser&&(b=Galaxy.currUser.isAdmin(),c=Galaxy.currUser.isAnonymous()),this.$el.html(a({admin_user:b,anon_user:c})),b&&(this.$el.find("#include_deleted_chk")[0].checked=Galaxy.libraries.preferences.get("with_deleted"))},renderPaginator:function(a){this.options=_.extend(this.options,a);var b=this.templatePaginator();this.$el.find("#library_paginator").html(b({show_page:parseInt(this.options.show_page),page_count:parseInt(this.options.page_count),total_libraries_count:this.options.total_libraries_count,libraries_shown:this.options.libraries_shown}))},showLibraryModal:function(a){a.preventDefault(),a.stopPropagation();var b=this;this.modal=Galaxy.modal,this.modal.show({closing_events:!0,title:"Create New Library",body:this.templateNewLibraryInModal(),buttons:{Create:function(){b.createNewLibrary()},Close:function(){b.modal.hide()}}})},createNewLibrary:function(){var c=this.serializeNewLibrary();if(this.validateNewLibrary(c)){var d=new b.Library,e=this;d.save(c,{success:function(b){Galaxy.libraries.libraryListView.collection.add(b),e.modal.hide(),e.clearLibraryModal(),Galaxy.libraries.libraryListView.render(),a.success("Library created.")},error:function(b,c){a.error("undefined"!=typeof c.responseJSON?c.responseJSON.err_msg:"An error occured.")}})}else a.error("Library's name is missing.");return!1},showPageSizePrompt:function(){var a=prompt("How many libraries per page do you want to see?",Galaxy.libraries.preferences.get("library_page_size"));null!=a&&a==parseInt(a)&&(Galaxy.libraries.preferences.set({library_page_size:parseInt(a)}),Galaxy.libraries.libraryListView.render({show_page:1}))},clearLibraryModal:function(){$("input[name='Name']").val(""),$("input[name='Description']").val(""),$("input[name='Synopsis']").val("")},serializeNewLibrary:function(){return{name:$("input[name='Name']").val(),description:$("input[name='Description']").val(),synopsis:$("input[name='Synopsis']").val()}},validateNewLibrary:function(a){return""!==a.name},includeDeletedChecked:function(a){a.target.checked?(Galaxy.libraries.preferences.set({with_deleted:!0}),Galaxy.libraries.libraryListView.render()):(Galaxy.libraries.preferences.set({with_deleted:!1}),Galaxy.libraries.libraryListView.render())},searchLibraries:function(){var a=$(".library-search-input").val();this.options.search_term=a,Galaxy.libraries.libraryListView.searchLibraries(a)},templateToolBar:function(){return _.template(['
','
','
','
','DATA LIBRARIES','',"",'
','',"
","<% if(admin_user === true) { %>",'
',"","
",'','',"","<% } %>",'','','',"","","
","
","
",'
',"
","
"].join(""))},templatePaginator:function(){return _.template(['","",' showing <%- libraries_shown %> of <%- total_libraries_count %> libraries',""].join(""))},templateNewLibraryInModal:function(){return _.template(['
',"
",'','','',"
","
"].join(""))}});return{LibraryToolbarView:c}}); //# sourceMappingURL=../../../maps/mvc/library/library-librarytoolbar-view.js.map \ No newline at end of file