1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/e999f345474f/ Changeset: e999f345474f User: dannon Date: 2013-09-25 18:58:37 Summary: Fix persistant/persistent spelling. Affected #: 6 files diff -r 34eda4f7eed7e7487ce350e0042e1c1cdf65d6a9 -r e999f345474f20fbf4be1a202824e0d7f41ed76c lib/galaxy/web/framework/helpers/grids.py --- a/lib/galaxy/web/framework/helpers/grids.py +++ b/lib/galaxy/web/framework/helpers/grids.py @@ -198,7 +198,7 @@ if page_num == 0: # Show all rows in page. total_num_rows = query.count() - # persistant page='all' + # persistent page='all' page_num = 1 #page_num = 'all' #extra_url_args['page'] = page_num diff -r 34eda4f7eed7e7487ce350e0042e1c1cdf65d6a9 -r e999f345474f20fbf4be1a202824e0d7f41ed76c static/scripts/mvc/base-mvc.js --- a/static/scripts/mvc/base-mvc.js +++ b/static/scripts/mvc/base-mvc.js @@ -91,7 +91,7 @@ //============================================================================== /** - * @class persistant storage adapter. + * @class persistent storage adapter. * Provides an easy interface to object based storage using method chaining. * Allows easy change of the storage engine used (h5's local storage?). * @augments StorageRecursionHelper @@ -111,9 +111,9 @@ * }); * @constructor */ -var PersistantStorage = function( storageKey, storageDefaults ){ +var PersistentStorage = function( storageKey, storageDefaults ){ if( !storageKey ){ - throw( "PersistantStorage needs storageKey argument" ); + throw( "PersistentStorage needs storageKey argument" ); } storageDefaults = storageDefaults || {}; @@ -194,7 +194,7 @@ // the object returned by this constructor will be a modified StorageRecursionHelper returnedStorage = new StorageRecursionHelper( data ); - jQuery.extend( returnedStorage, /** @lends PersistantStorage.prototype */{ + jQuery.extend( returnedStorage, /** @lends PersistentStorage.prototype */{ /** The base case for save()'s upward recursion - save everything to storage. * @private * @param {Any} newData data object to save to storage @@ -211,7 +211,7 @@ }, /** String representation. */ - toString : function(){ return 'PersistantStorage(' + storageKey + ')'; } + toString : function(){ return 'PersistentStorage(' + storageKey + ')'; } }); return returnedStorage; diff -r 34eda4f7eed7e7487ce350e0042e1c1cdf65d6a9 -r e999f345474f20fbf4be1a202824e0d7f41ed76c static/scripts/mvc/history/history-panel.js --- a/static/scripts/mvc/history/history-panel.js +++ b/static/scripts/mvc/history/history-panel.js @@ -85,7 +85,7 @@ * @config {Object} urlTemplates.history nested object containing url templates for this view * @config {Object} urlTemplates.hda nested object containing url templates for HDAViews * @throws 'needs urlTemplates' if urlTemplates.history or urlTemplates.hda aren't present - * @see PersistantStorage + * @see PersistentStorage * @see Backbone.View#initialize */ initialize : function( attributes ){ @@ -172,15 +172,15 @@ * @param {Object} initiallyExpanded * @param {Boolean} show_deleted whether to show deleted HDAs (overrides stored) * @param {Boolean} show_hidden - * @see PersistantStorage + * @see PersistentStorage */ _setUpWebStorage : function( initiallyExpanded, show_deleted, show_hidden ){ //this.log( '_setUpWebStorage, initiallyExpanded:', initiallyExpanded, // 'show_deleted:', show_deleted, 'show_hidden', show_hidden ); - // data that needs to be persistant over page refreshes + // data that needs to be persistent over page refreshes // (note the key function which uses the history id as well) - this.storage = new PersistantStorage( 'HistoryView.' + this.model.get( 'id' ), { + this.storage = new PersistentStorage( 'HistoryView.' + this.model.get( 'id' ), { //TODOL initiallyExpanded only works on first load right now expandedHdas : {}, show_deleted : false, @@ -430,7 +430,7 @@ }, /** Handle the user toggling the deleted visibility by: - * (1) storing the new value in the persistant storage + * (1) storing the new value in the persistent storage * (2) re-rendering the history * @returns {Boolean} new show_deleted setting */ @@ -441,7 +441,7 @@ }, /** Handle the user toggling the deleted visibility by: - * (1) storing the new value in the persistant storage + * (1) storing the new value in the persistent storage * (2) re-rendering the history * @returns {Boolean} new show_hidden setting */ diff -r 34eda4f7eed7e7487ce350e0042e1c1cdf65d6a9 -r e999f345474f20fbf4be1a202824e0d7f41ed76c templates/grid_base.mako --- a/templates/grid_base.mako +++ b/templates/grid_base.mako @@ -94,7 +94,7 @@ sort_key: '${sort_key}', show_item_checkboxes: is_true('${context.get('show_item_checkboxes', False)}'), cur_page: ${cur_page_num}, - // persistant page="all" + // persistent page="all" //cur_page: ('${cur_page_num}' === 'all')?('all'):(Number('${cur_page_num}')), num_pages: ${num_pages} }); diff -r 34eda4f7eed7e7487ce350e0042e1c1cdf65d6a9 -r e999f345474f20fbf4be1a202824e0d7f41ed76c templates/webapps/galaxy/root/history.mako --- a/templates/webapps/galaxy/root/history.mako +++ b/templates/webapps/galaxy/root/history.mako @@ -195,11 +195,11 @@ //NOTE: for debugging on non-local instances (main/test) // 1. load history panel in own tab - // 2. from console: new PersistantStorage( '__history_panel' ).set( 'debugging', true ) + // 2. from console: new PersistentStorage( '__history_panel' ).set( 'debugging', true ) // -> history panel and hdas will display console logs in console var debugging = false; if( jQuery.jStorage.get( '__history_panel' ) ){ - debugging = new PersistantStorage( '__history_panel' ).get( 'debugging' ); + debugging = new PersistentStorage( '__history_panel' ).get( 'debugging' ); } // get the current user (either from the top frame's Galaxy or if in tab via the bootstrap) diff -r 34eda4f7eed7e7487ce350e0042e1c1cdf65d6a9 -r e999f345474f20fbf4be1a202824e0d7f41ed76c test/casperjs/casperjs_runner.py --- a/test/casperjs/casperjs_runner.py +++ b/test/casperjs/casperjs_runner.py @@ -323,7 +323,7 @@ self.run_js_script( 'registration-tests.js' ) #TODO:?? could theoretically do db cleanup, checks here with SQLALX - #TODO: have run_js_script return other persistant fixture data (uploaded files, etc.) + #TODO: have run_js_script return other persistent fixture data (uploaded files, etc.) def test_20_login( self ): """User log in tests. 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.