- galaxy-commits - lists.galaxyproject.org

commit/galaxy-central: 2 new changesets
by commits-noreply＠bitbucket.org 24 Oct '13

24 Oct '13

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/7266b5e09cb2/ Changeset: 7266b5e09cb2 Branch: next-stable User: greg Date: 2013-10-24 16:48:48 Summary: Fix for handling set_environment when installing tool dependencies along with a tool shed repository. Affected #: 1 file diff -r 83bed9c7dbbc7fa5acfbced6491d63f8a50982b0 -r 7266b5e09cb20cac801cddef87b0466ddc32d41e lib/tool_shed/util/common_install_util.py --- a/lib/tool_shed/util/common_install_util.py +++ b/lib/tool_shed/util/common_install_util.py @@ -483,7 +483,7 @@ app.model.ToolDependency.installation_status.ERROR ]: installed_tool_dependencies.append( tool_dependency ) elif elem.tag == 'set_environment': - env_var_name = env_var_elem.get( 'name', None ) + env_var_name = elem.get( 'name', None ) if env_var_name: # Tool dependencies of type "set_environmnet" always have the version attribute set to None. attr_tup = ( env_var_name, None, 'set_environment' ) https://bitbucket.org/galaxy/galaxy-central/commits/99aa4cab1812/ Changeset: 99aa4cab1812 User: greg Date: 2013-10-24 16:49:15 Summary: Merged from next-stable Affected #: 1 file diff -r 30cedd7e894eea1f4ce9fc6fc36a697a13ea5dba -r 99aa4cab1812998a767e3a26ce727a1ca50e03f8 lib/tool_shed/util/common_install_util.py --- a/lib/tool_shed/util/common_install_util.py +++ b/lib/tool_shed/util/common_install_util.py @@ -483,7 +483,7 @@ app.model.ToolDependency.installation_status.ERROR ]: installed_tool_dependencies.append( tool_dependency ) elif elem.tag == 'set_environment': - env_var_name = env_var_elem.get( 'name', None ) + env_var_name = elem.get( 'name', None ) if env_var_name: # Tool dependencies of type "set_environmnet" always have the version attribute set to None. attr_tup = ( env_var_name, None, 'set_environment' ) 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.

1 0

commit/galaxy-central: jgoecks: Tool JS module: put template references into render() rather than model definition to allow for module loading when templates are not available.
by commits-noreply＠bitbucket.org 24 Oct '13

24 Oct '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/30cedd7e894e/ Changeset: 30cedd7e894e User: jgoecks Date: 2013-10-24 16:47:36 Summary: Tool JS module: put template references into render() rather than model definition to allow for module loading when templates are not available. Affected #: 1 file diff -r 7f048ac9d878c59734a7272364e7e580a44576a5 -r 30cedd7e894eea1f4ce9fc6fc36a697a13ea5dba static/scripts/mvc/tools.js --- a/static/scripts/mvc/tools.js +++ b/static/scripts/mvc/tools.js @@ -492,10 +492,9 @@ */ var ToolLinkView = BaseView.extend({ tagName: 'div', - template: Handlebars.templates.tool_link, - + render: function() { - this.$el.append( this.template(this.model.toJSON()) ); + this.$el.append( Handlebars.templates.tool_link(this.model.toJSON()) ); return this; } }); @@ -519,14 +518,15 @@ var ToolSectionView = BaseView.extend({ tagName: 'div', className: 'toolSectionWrapper', - template: Handlebars.templates.panel_section, + initialize: function() { BaseView.prototype.initialize.call(this); this.model.on("change:open", this.update_open, this); }, + render: function() { // Build using template. - this.$el.append( this.template(this.model.toJSON()) ); + this.$el.append( Handlebars.templates.panel_section(this.model.toJSON()) ); // Add tools to section. var section_body = this.$el.find(".toolSectionBody"); @@ -574,7 +574,6 @@ tagName: 'div', id: 'tool-search', className: 'bar', - template: Handlebars.templates.tool_search, events: { 'click': 'focus_and_select', @@ -583,7 +582,7 @@ }, render: function() { - this.$el.append( this.template(this.model.toJSON()) ); + this.$el.append( Handlebars.templates.tool_search(this.model.toJSON()) ); if (!this.model.is_visible()) { this.$el.hide(); } @@ -684,11 +683,10 @@ */ var ToolFormView = Backbone.View.extend({ className: 'toolForm', - template: Handlebars.templates.tool_form, render: function() { this.$el.children().remove(); - this.$el.append( this.template(this.model.toJSON()) ); + this.$el.append( Handlebars.templates.tool_form(this.model.toJSON()) ); } }); 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.

1 0

commit/galaxy-central: 2 new changesets
by commits-noreply＠bitbucket.org 24 Oct '13

24 Oct '13

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/83bed9c7dbbc/ Changeset: 83bed9c7dbbc Branch: next-stable User: greg Date: 2013-10-24 15:47:04 Summary: Eliminate restriction to repository owner (make it to anyone that has write permission on the repository) for resetting metadata on the repository in the tool shed. Affected #: 1 file diff -r 71c35dbde130994265d85c34a00d9f845eda28cc -r 83bed9c7dbbc7fa5acfbced6491d63f8a50982b0 templates/webapps/tool_shed/common/repository_actions_menu.mako --- a/templates/webapps/tool_shed/common/repository_actions_menu.mako +++ b/templates/webapps/tool_shed/common/repository_actions_menu.mako @@ -54,7 +54,7 @@ else: can_download = False - if ( is_admin or ( trans.user and trans.user == repository.user ) ) and not repository.deleted and not repository.deprecated and not is_new: + if ( is_admin or can_push ) and not repository.deleted and not repository.deprecated and not is_new: can_reset_all_metadata = True else: can_reset_all_metadata = False https://bitbucket.org/galaxy/galaxy-central/commits/7f048ac9d878/ Changeset: 7f048ac9d878 User: greg Date: 2013-10-24 15:47:35 Summary: Merged from next-stable Affected #: 1 file diff -r 319c21e395a32f66b783578e43a4da2daa0b375c -r 7f048ac9d878c59734a7272364e7e580a44576a5 templates/webapps/tool_shed/common/repository_actions_menu.mako --- a/templates/webapps/tool_shed/common/repository_actions_menu.mako +++ b/templates/webapps/tool_shed/common/repository_actions_menu.mako @@ -54,7 +54,7 @@ else: can_download = False - if ( is_admin or ( trans.user and trans.user == repository.user ) ) and not repository.deleted and not repository.deprecated and not is_new: + if ( is_admin or can_push ) and not repository.deleted and not repository.deprecated and not is_new: can_reset_all_metadata = True else: can_reset_all_metadata = False 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.

1 0

commit/galaxy-central: 3 new changesets
by commits-noreply＠bitbucket.org 24 Oct '13

24 Oct '13

3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/200bd6479490/ Changeset: 200bd6479490 User: Dave Bouvier Date: 2013-10-24 14:51:16 Summary: Check for the existence of a display application before attempting to delete it from the registry. Affected #: 1 file diff -r e5b91a357c909cb63b5bbb7fc922226f34255d31 -r 200bd6479490cb7c85e18e95beb5a1cb072af307 lib/galaxy/datatypes/registry.py --- a/lib/galaxy/datatypes/registry.py +++ b/lib/galaxy/datatypes/registry.py @@ -547,8 +547,11 @@ display_app.id = tool_dict[ 'guid' ] break if deactivate: - del self.display_applications[ display_app.id ] - del self.datatypes_by_extension[ extension ].display_applications[ display_app.id ] + if display_app.id in self.display_applications: + del self.display_applications[ display_app.id ] + if extension in self.datatypes_by_extension: + if display_app.id in self.datatypes_by_extension[ extension ].display_applications: + del self.datatypes_by_extension[ extension ].display_applications[ display_app.id ] if inherit and ( self.datatypes_by_extension[ extension ], display_app ) in self.inherit_display_application_by_class: self.inherit_display_application_by_class.remove( ( self.datatypes_by_extension[ extension ], display_app ) ) self.log.debug( "Deactivated display application '%s' for datatype '%s'." % ( display_app.id, extension ) ) https://bitbucket.org/galaxy/galaxy-central/commits/71c35dbde130/ Changeset: 71c35dbde130 Branch: next-stable User: Dave Bouvier Date: 2013-10-24 14:51:16 Summary: Check for the existence of a display application before attempting to delete it from the registry. Affected #: 1 file diff -r 434254daaa091f4b9999e015ff090da518327a13 -r 71c35dbde130994265d85c34a00d9f845eda28cc lib/galaxy/datatypes/registry.py --- a/lib/galaxy/datatypes/registry.py +++ b/lib/galaxy/datatypes/registry.py @@ -547,8 +547,11 @@ display_app.id = tool_dict[ 'guid' ] break if deactivate: - del self.display_applications[ display_app.id ] - del self.datatypes_by_extension[ extension ].display_applications[ display_app.id ] + if display_app.id in self.display_applications: + del self.display_applications[ display_app.id ] + if extension in self.datatypes_by_extension: + if display_app.id in self.datatypes_by_extension[ extension ].display_applications: + del self.datatypes_by_extension[ extension ].display_applications[ display_app.id ] if inherit and ( self.datatypes_by_extension[ extension ], display_app ) in self.inherit_display_application_by_class: self.inherit_display_application_by_class.remove( ( self.datatypes_by_extension[ extension ], display_app ) ) self.log.debug( "Deactivated display application '%s' for datatype '%s'." % ( display_app.id, extension ) ) https://bitbucket.org/galaxy/galaxy-central/commits/319c21e395a3/ Changeset: 319c21e395a3 User: Dave Bouvier Date: 2013-10-24 14:55:55 Summary: Merge with next-stable. Affected #: 0 files 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.

1 0

commit/galaxy-central: 2 new changesets
by commits-noreply＠bitbucket.org 24 Oct '13

24 Oct '13

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/cbfae86c6def/ Changeset: cbfae86c6def User: jmchilton Date: 2013-04-23 16:57:14 Summary: Add exception handling for Binary sniffers. Image sniffers can fail for large files because signed integers are used internally, this catches that and other potential problems. Traceback (most recent call last): File "/opt/galaxy/web/tools/data_source/upload.py", line 432, in <module> __main__() File "/opt/galaxy/web/tools/data_source/upload.py", line 421, in __main__ add_file( dataset, registry, json_file, output_path ) File "/opt/galaxy/web/tools/data_source/upload.py", line 155, in add_file type_info = Binary.is_sniffable_binary( dataset.path ) File "/opt/galaxy/web/lib/galaxy/datatypes/binary.py", line 38, in is_sniffable_binary if format["class"]().sniff(filename): File "/opt/galaxy/web/lib/galaxy/datatypes/images.py", line 203, in sniff headers = get_headers(filename, None, 1) File "/opt/galaxy/web/lib/galaxy/datatypes/sniff.py", line 179, in get_headers for idx, line in enumerate(file(fname)): SystemError: Negative size passed to PyString_FromStringAndSize Affected #: 1 file diff -r 1e3d92ec22b2794bfa2294edb74695c580791406 -r cbfae86c6def520dff8d922066054ede3072ebfb lib/galaxy/datatypes/binary.py --- a/lib/galaxy/datatypes/binary.py +++ b/lib/galaxy/datatypes/binary.py @@ -33,11 +33,20 @@ Binary.unsniffable_binary_formats.append(ext) @staticmethod - def is_sniffable_binary(filename): + def is_sniffable_binary( filename ): + format_information = None for format in Binary.sniffable_binary_formats: - if format["class"]().sniff(filename): - return (format["type"], format["ext"]) - return None + format_instance = format[ "class" ]() + try: + if format_instance.sniff(filename): + format_information = ( format["type"], format[ "ext" ] ) + break + except Exception: + # Sniffer raised exception, could be any number of + # reasons for this so there is not much to do besides + # trying next sniffer. + pass + return format_information @staticmethod def is_ext_unsniffable(ext): https://bitbucket.org/galaxy/galaxy-central/commits/4f400cb23860/ Changeset: 4f400cb23860 User: jmchilton Date: 2013-04-23 19:24:16 Summary: Rework checking binary files. Why read in line by line if only going to check 100 characters? This approach to just read first 100 characters is cleaner, more efficient, and hopefully less error prone. Should avoid the following exception caused when checking large files: Traceback (most recent call last): File "/opt/galaxy/web/tools/data_source/upload.py", line 432, in <module> __main__() File "/opt/galaxy/web/tools/data_source/upload.py", line 421, in __main__ add_file( dataset, registry, json_file, output_path ) File "/opt/galaxy/web/tools/data_source/upload.py", line 283, in add_file if check_binary( dataset.path ): File "/opt/galaxy/web/lib/galaxy/datatypes/checkers.py", line 58, in check_binary for chars in temp: SystemError: Negative size passed to PyString_FromStringAndSize Affected #: 1 file diff -r cbfae86c6def520dff8d922066054ede3072ebfb -r 4f400cb238607d7563a001ab0cf0d3b24bb10f17 lib/galaxy/datatypes/checkers.py --- a/lib/galaxy/datatypes/checkers.py +++ b/lib/galaxy/datatypes/checkers.py @@ -1,5 +1,6 @@ import os, gzip, re, gzip, zipfile, binascii, bz2, imghdr from galaxy import util +from StringIO import StringIO try: import Image as PIL @@ -53,20 +54,15 @@ if file_path: temp = open( name, "U" ) else: - temp = name + temp = StringIO( name ) chars_read = 0 - for chars in temp: - for char in chars: - chars_read += 1 + try: + for char in temp.read( 100 ): if ord( char ) > 128: is_binary = True break - if chars_read > 100: - break - if chars_read > 100: - break - if file_path: - temp.close() + finally: + temp.close( ) return is_binary def check_gzip( file_path ): 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.

1 0

commit/galaxy-central: 2 new changesets
by commits-noreply＠bitbucket.org 23 Oct '13

23 Oct '13

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/434254daaa09/ Changeset: 434254daaa09 Branch: next-stable User: greg Date: 2013-10-23 22:30:35 Summary: Handle automatic population of the toolshed and changeset_revision attributes of <repository> tags defined as subelements of any actions tag type in tool dependency definitions. Affected #: 2 files diff -r 41b2bb55771864d5a70bcf1c10f82da22874a6f8 -r 434254daaa091f4b9999e015ff090da518327a13 lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py @@ -502,7 +502,6 @@ pre_cmd = './configure %s && make && make install' % configure_opts else: pre_cmd = './configure prefix=$INSTALL_DIR %s && make && make install' % configure_opts - cmd = install_environment.build_command( td_common_util.evaluate_template( pre_cmd, install_dir ) ) return_code = handle_command( app, tool_dependency, install_dir, cmd ) if return_code: diff -r 41b2bb55771864d5a70bcf1c10f82da22874a6f8 -r 434254daaa091f4b9999e015ff090da518327a13 lib/tool_shed/util/commit_util.py --- a/lib/tool_shed/util/commit_util.py +++ b/lib/tool_shed/util/commit_util.py @@ -318,22 +318,23 @@ error_message = 'Unable to locate repository with name %s and owner %s. ' % ( str( name ), str( owner ) ) return revised, elem, error_message -def handle_set_environment_for_install( trans, package_altered, altered, actions_elem, action_index, action_elem, unpopulate=False ): +def handle_repository_dependency_sub_elem( trans, package_altered, altered, actions_elem, action_index, action_elem, unpopulate=False ): + # This method populates the toolshed and changeset_revision attributes for each of the following. # <action type="set_environment_for_install"> - # <repository name="package_eigen_2_0" owner="test" changeset_revision="09eb05087cd0"> - # <package name="eigen" version="2.0.17" /> - # </repository> - # </action> + # <action type="setup_r_environment"> + # <action type="setup_ruby_environment"> for repo_index, repo_elem in enumerate( action_elem ): - revised, repository_elem, error_message = handle_repository_dependency_elem( trans, repo_elem, unpopulate=unpopulate ) - if error_message: - exception_message = 'The tool_dependencies.xml file contains an invalid <repository> tag. %s' % error_message - raise Exception( exception_message ) - if revised: - action_elem[ repo_index ] = repository_elem - package_altered = True - if not altered: - altered = True + # Make sure to skip comments and tags that are not <repository>. + if repo_elem.tag == 'repository': + revised, repository_elem, error_message = handle_repository_dependency_elem( trans, repo_elem, unpopulate=unpopulate ) + if error_message: + exception_message = 'The tool_dependencies.xml file contains an invalid <repository> tag. %s' % error_message + raise Exception( exception_message ) + if revised: + action_elem[ repo_index ] = repository_elem + package_altered = True + if not altered: + altered = True if package_altered: actions_elem[ action_index ] = action_elem return package_altered, altered, actions_elem @@ -402,29 +403,28 @@ last_actions_elem[ last_actions_elem_package_index ] = last_actions_elem_package_elem actions_group_elem[ last_actions_index ] = last_actions_elem else: - last_actions_elem_action_type = last_actions_elem.get( 'type' ) - if last_actions_elem_action_type == 'set_environment_for_install': - last_actions_package_altered, altered, last_actions_elem = \ - handle_set_environment_for_install( trans, - last_actions_package_altered, - altered, - actions_group_elem, - last_actions_index, - last_actions_elem, - unpopulate=unpopulate ) + # Inspect the sub elements of last_actions_elem to locate all <repository> tags and + # populate them with toolshed and changeset_revision attributes if necessary. + last_actions_package_altered, altered, last_actions_elem = \ + handle_repository_dependency_sub_elem( trans, + last_actions_package_altered, + altered, + actions_group_elem, + last_actions_index, + last_actions_elem, + unpopulate=unpopulate ) elif actions_elem.tag == 'actions': # We are not in an <actions_group> tag set, so we must be in an <actions> tag set. for action_index, action_elem in enumerate( actions_elem ): - - action_type = action_elem.get( 'type' ) - if action_type == 'set_environment_for_install': - package_altered, altered, actions_elem = handle_set_environment_for_install( trans, - package_altered, - altered, - actions_elem, - action_index, - action_elem, - unpopulate=unpopulate ) + # Inspect the sub elements of last_actions_elem to locate all <repository> tags and populate them with + # toolshed and changeset_revision attributes if necessary. + package_altered, altered, actions_elem = handle_repository_dependency_sub_elem( trans, + package_altered, + altered, + actions_elem, + action_index, + action_elem, + unpopulate=unpopulate ) if package_altered: package_elem[ actions_index ] = actions_elem if package_altered: https://bitbucket.org/galaxy/galaxy-central/commits/aed8d5d9562f/ Changeset: aed8d5d9562f User: greg Date: 2013-10-23 22:31:03 Summary: Merged from next-stable Affected #: 2 files diff -r 7fd53ab921bc562abb96761e20bdc101df7126af -r aed8d5d9562f42596150ab086800b43bf463f270 lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py @@ -502,7 +502,6 @@ pre_cmd = './configure %s && make && make install' % configure_opts else: pre_cmd = './configure prefix=$INSTALL_DIR %s && make && make install' % configure_opts - cmd = install_environment.build_command( td_common_util.evaluate_template( pre_cmd, install_dir ) ) return_code = handle_command( app, tool_dependency, install_dir, cmd ) if return_code: diff -r 7fd53ab921bc562abb96761e20bdc101df7126af -r aed8d5d9562f42596150ab086800b43bf463f270 lib/tool_shed/util/commit_util.py --- a/lib/tool_shed/util/commit_util.py +++ b/lib/tool_shed/util/commit_util.py @@ -318,22 +318,23 @@ error_message = 'Unable to locate repository with name %s and owner %s. ' % ( str( name ), str( owner ) ) return revised, elem, error_message -def handle_set_environment_for_install( trans, package_altered, altered, actions_elem, action_index, action_elem, unpopulate=False ): +def handle_repository_dependency_sub_elem( trans, package_altered, altered, actions_elem, action_index, action_elem, unpopulate=False ): + # This method populates the toolshed and changeset_revision attributes for each of the following. # <action type="set_environment_for_install"> - # <repository name="package_eigen_2_0" owner="test" changeset_revision="09eb05087cd0"> - # <package name="eigen" version="2.0.17" /> - # </repository> - # </action> + # <action type="setup_r_environment"> + # <action type="setup_ruby_environment"> for repo_index, repo_elem in enumerate( action_elem ): - revised, repository_elem, error_message = handle_repository_dependency_elem( trans, repo_elem, unpopulate=unpopulate ) - if error_message: - exception_message = 'The tool_dependencies.xml file contains an invalid <repository> tag. %s' % error_message - raise Exception( exception_message ) - if revised: - action_elem[ repo_index ] = repository_elem - package_altered = True - if not altered: - altered = True + # Make sure to skip comments and tags that are not <repository>. + if repo_elem.tag == 'repository': + revised, repository_elem, error_message = handle_repository_dependency_elem( trans, repo_elem, unpopulate=unpopulate ) + if error_message: + exception_message = 'The tool_dependencies.xml file contains an invalid <repository> tag. %s' % error_message + raise Exception( exception_message ) + if revised: + action_elem[ repo_index ] = repository_elem + package_altered = True + if not altered: + altered = True if package_altered: actions_elem[ action_index ] = action_elem return package_altered, altered, actions_elem @@ -402,29 +403,28 @@ last_actions_elem[ last_actions_elem_package_index ] = last_actions_elem_package_elem actions_group_elem[ last_actions_index ] = last_actions_elem else: - last_actions_elem_action_type = last_actions_elem.get( 'type' ) - if last_actions_elem_action_type == 'set_environment_for_install': - last_actions_package_altered, altered, last_actions_elem = \ - handle_set_environment_for_install( trans, - last_actions_package_altered, - altered, - actions_group_elem, - last_actions_index, - last_actions_elem, - unpopulate=unpopulate ) + # Inspect the sub elements of last_actions_elem to locate all <repository> tags and + # populate them with toolshed and changeset_revision attributes if necessary. + last_actions_package_altered, altered, last_actions_elem = \ + handle_repository_dependency_sub_elem( trans, + last_actions_package_altered, + altered, + actions_group_elem, + last_actions_index, + last_actions_elem, + unpopulate=unpopulate ) elif actions_elem.tag == 'actions': # We are not in an <actions_group> tag set, so we must be in an <actions> tag set. for action_index, action_elem in enumerate( actions_elem ): - - action_type = action_elem.get( 'type' ) - if action_type == 'set_environment_for_install': - package_altered, altered, actions_elem = handle_set_environment_for_install( trans, - package_altered, - altered, - actions_elem, - action_index, - action_elem, - unpopulate=unpopulate ) + # Inspect the sub elements of last_actions_elem to locate all <repository> tags and populate them with + # toolshed and changeset_revision attributes if necessary. + package_altered, altered, actions_elem = handle_repository_dependency_sub_elem( trans, + package_altered, + altered, + actions_elem, + action_index, + action_elem, + unpopulate=unpopulate ) if package_altered: package_elem[ actions_index ] = actions_elem if package_altered: 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.

1 0

commit/galaxy-central: 2 new changesets
by commits-noreply＠bitbucket.org 23 Oct '13

23 Oct '13

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/41b2bb557718/ Changeset: 41b2bb557718 Branch: next-stable User: jgoecks Date: 2013-10-23 22:01:29 Summary: Fix type in b8482a0c41ae Affected #: 1 file diff -r 8d9ad9d07b83cf6f08ccfa5e44dfd01f875ca86d -r 41b2bb55771864d5a70bcf1c10f82da22874a6f8 static/scripts/viz/trackster/tracks.js --- a/static/scripts/viz/trackster/tracks.js +++ b/static/scripts/viz/trackster/tracks.js @@ -4304,7 +4304,7 @@ // Add summary/sample labels if needed and not already included. var sample_names = this.dataset.get_metadata('sample_names'); - if (line_track_tiles.length === 0 && this.prefs.show_labels && sample_names && samples_names.length > 1) { + if (line_track_tiles.length === 0 && this.prefs.show_labels && sample_names && sample_names.length > 1) { var font_size; // Add and/or style labels. https://bitbucket.org/galaxy/galaxy-central/commits/7fd53ab921bc/ Changeset: 7fd53ab921bc User: jgoecks Date: 2013-10-23 22:02:13 Summary: Automated merge of next-stable Affected #: 1 file diff -r b8482a0c41aef74a879b496231340b679abffb62 -r 7fd53ab921bc562abb96761e20bdc101df7126af static/scripts/viz/trackster/tracks.js --- a/static/scripts/viz/trackster/tracks.js +++ b/static/scripts/viz/trackster/tracks.js @@ -4304,7 +4304,7 @@ // Add summary/sample labels if needed and not already included. var sample_names = this.dataset.get_metadata('sample_names'); - if (line_track_tiles.length === 0 && this.prefs.show_labels && sample_names && samples_names.length > 1) { + if (line_track_tiles.length === 0 && this.prefs.show_labels && sample_names && sample_names.length > 1) { var font_size; // Add and/or style labels. 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.

1 0

commit/galaxy-central: 2 new changesets
by commits-noreply＠bitbucket.org 23 Oct '13

23 Oct '13

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/8d9ad9d07b83/ Changeset: 8d9ad9d07b83 Branch: next-stable User: jgoecks Date: 2013-10-23 21:50:39 Summary: Trackster: only show summary label if there are multiple samples. Affected #: 1 file diff -r 35328380ac82c471a942bd6f0b5a4e73413bf272 -r 8d9ad9d07b83cf6f08ccfa5e44dfd01f875ca86d static/scripts/viz/trackster/tracks.js --- a/static/scripts/viz/trackster/tracks.js +++ b/static/scripts/viz/trackster/tracks.js @@ -4304,7 +4304,7 @@ // Add summary/sample labels if needed and not already included. var sample_names = this.dataset.get_metadata('sample_names'); - if (line_track_tiles.length === 0 && this.prefs.show_labels && sample_names) { + if (line_track_tiles.length === 0 && this.prefs.show_labels && sample_names && samples_names.length > 1) { var font_size; // Add and/or style labels. https://bitbucket.org/galaxy/galaxy-central/commits/b8482a0c41ae/ Changeset: b8482a0c41ae User: jgoecks Date: 2013-10-23 21:51:00 Summary: Automated merge of next-stable Affected #: 1 file diff -r ff9603c007c78c5c256171592bbd0aed5e20cab1 -r b8482a0c41aef74a879b496231340b679abffb62 static/scripts/viz/trackster/tracks.js --- a/static/scripts/viz/trackster/tracks.js +++ b/static/scripts/viz/trackster/tracks.js @@ -4304,7 +4304,7 @@ // Add summary/sample labels if needed and not already included. var sample_names = this.dataset.get_metadata('sample_names'); - if (line_track_tiles.length === 0 && this.prefs.show_labels && sample_names) { + if (line_track_tiles.length === 0 && this.prefs.show_labels && sample_names && samples_names.length > 1) { var font_size; // Add and/or style labels. 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.

1 0

commit/galaxy-central: carlfeberhard: QuotaMeter: remove handlebars templates, render within view, update for bootstrap 3.0; pack scripts
by commits-noreply＠bitbucket.org 23 Oct '13

23 Oct '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ff9603c007c7/ Changeset: ff9603c007c7 User: carlfeberhard Date: 2013-10-23 20:22:20 Summary: QuotaMeter: remove handlebars templates, render within view, update for bootstrap 3.0; pack scripts Affected #: 9 files diff -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad -r ff9603c007c78c5c256171592bbd0aed5e20cab1 static/scripts/mvc/user/user-quotameter.js --- a/static/scripts/mvc/user/user-quotameter.js +++ b/static/scripts/mvc/user/user-quotameter.js @@ -57,31 +57,33 @@ var modelJson = this.model.toJSON(), //prevPercent = this.model.previous( 'quota_percent' ), percent = modelJson.quota_percent, - meter = $( UserQuotaMeter.templates.quota( modelJson ) ); + //meter = $( UserQuotaMeter.templates.quota( modelJson ) ); + $meter = $( this._templateQuotaMeter( modelJson ) ), + $bar = $meter.find( '.progress-bar' ); //this.log( this + '.rendering quota, percent:', percent, 'meter:', meter ); // OVER QUOTA: color the quota bar and show the quota error message if( this.isOverQuota() ){ //this.log( '\t over quota' ); - meter.addClass( 'progress-danger' ); - meter.find( '#quota-meter-text' ).css( 'color', 'white' ); + $bar.attr( 'class', 'progress-bar progress-bar-danger' ); + $meter.find( '.quota-meter-text' ).css( 'color', 'white' ); //TODO: only trigger event if state has changed this.trigger( 'quota:over', modelJson ); // APPROACHING QUOTA: color the quota bar } else if( percent >= this.options.warnAtPercent ){ //this.log( '\t approaching quota' ); - meter.addClass( 'progress-warning' ); + $bar.attr( 'class', 'progress-bar progress-bar-warning' ); //TODO: only trigger event if state has changed this.trigger( 'quota:under quota:under:approaching', modelJson ); // otherwise, hide/don't use the msg box } else { - meter.addClass( 'progress-success' ); + $bar.attr( 'class', 'progress-bar progress-bar-success' ); //TODO: only trigger event if state has changed this.trigger( 'quota:under quota:under:ok', modelJson ); } - return meter; + return $meter; }, /** Render the meter when the user has NO applicable quota. Will render as text @@ -89,7 +91,8 @@ * @returns {jQuery} the rendered text */ _render_usage : function(){ - var usage = $( UserQuotaMeter.templates.usage( this.model.toJSON() ) ); + //var usage = $( UserQuotaMeter.templates.usage( this.model.toJSON() ) ); + var usage = $( this._templateUsage( this.model.toJSON() ) ); this.log( this + '.rendering usage:', usage ); return usage; }, @@ -120,14 +123,29 @@ return this; }, + _templateQuotaMeter : function( data ){ + return [ + '<div id="quota-meter" class="quota-meter progress">', + '<div class="progress-bar" style="width: ', data.quota_percent, '%"></div>', + '<div class="quota-meter-text" style="top: 6px"', + (( data.nice_total_disk_usage )?( ' title="Using ' + data.nice_total_disk_usage + '">' ):( '>' )), + _l( 'Using' ), ' ', data.quota_percent, '%', + '</div>', + '</div>' + ].join( '' ); + }, + + _templateUsage : function( data ){ + return [ + '<div id="quota-meter" class="quota-meter" style="background-color: transparent">', + '<div class="quota-meter-text" style="top: 6px; color: white">', + (( data.nice_total_disk_usage )?( _l( 'Using ' ) + data.nice_total_disk_usage ):( '' )), + '</div>', + '</div>' + ].join( '' ); + }, + toString : function(){ return 'UserQuotaMeter(' + this.model + ')'; } }); - - -//------------------------------------------------------------------------------ TEMPLATES -UserQuotaMeter.templates = { - quota : Handlebars.templates[ 'template-user-quotaMeter-quota' ], - usage : Handlebars.templates[ 'template-user-quotaMeter-usage' ] -}; diff -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad -r ff9603c007c78c5c256171592bbd0aed5e20cab1 static/scripts/packed/mvc/user/user-quotameter.js --- a/static/scripts/packed/mvc/user/user-quotameter.js +++ b/static/scripts/packed/mvc/user/user-quotameter.js @@ -1,1 +1,1 @@ -var UserQuotaMeter=Backbone.View.extend(LoggableMixin).extend({options:{warnAtPercent:85,errorAtPercent:100},initialize:function(a){this.log(this+".initialize:",a);_.extend(this.options,a);this.model.bind("change:quota_percent change:total_disk_usage",this.render,this)},update:function(a){this.log(this+" updating user data...",a);this.model.loadFromApi(this.model.get("id"),a);return this},isOverQuota:function(){return(this.model.get("quota_percent")!==null&&this.model.get("quota_percent")>=this.options.errorAtPercent)},_render_quota:function(){var a=this.model.toJSON(),b=a.quota_percent,c=$(UserQuotaMeter.templates.quota(a));if(this.isOverQuota()){c.addClass("progress-danger");c.find("#quota-meter-text").css("color","white");this.trigger("quota:over",a)}else{if(b>=this.options.warnAtPercent){c.addClass("progress-warning");this.trigger("quota:under quota:under:approaching",a)}else{c.addClass("progress-success");this.trigger("quota:under quota:under:ok",a)}}return c},_render_usage:function(){var a=$(UserQuotaMeter.templates.usage(this.model.toJSON()));this.log(this+".rendering usage:",a);return a},render:function(){var a=null;this.log(this+".model.quota_percent:",this.model.get("quota_percent"));if((this.model.get("quota_percent")===null)||(this.model.get("quota_percent")===undefined)){a=this._render_usage()}else{a=this._render_quota()}this.$el.html(a);this.$el.find(".quota-meter-text").tooltip();return this},toString:function(){return"UserQuotaMeter("+this.model+")"}});UserQuotaMeter.templates={quota:Handlebars.templates["template-user-quotaMeter-quota"],usage:Handlebars.templates["template-user-quotaMeter-usage"]}; \ No newline at end of file +var UserQuotaMeter=Backbone.View.extend(LoggableMixin).extend({options:{warnAtPercent:85,errorAtPercent:100},initialize:function(a){this.log(this+".initialize:",a);_.extend(this.options,a);this.model.bind("change:quota_percent change:total_disk_usage",this.render,this)},update:function(a){this.log(this+" updating user data...",a);this.model.loadFromApi(this.model.get("id"),a);return this},isOverQuota:function(){return(this.model.get("quota_percent")!==null&&this.model.get("quota_percent")>=this.options.errorAtPercent)},_render_quota:function(){var a=this.model.toJSON(),c=a.quota_percent,b=$(this._templateQuotaMeter(a)),d=b.find(".progress-bar");if(this.isOverQuota()){d.attr("class","progress-bar progress-bar-danger");b.find(".quota-meter-text").css("color","white");this.trigger("quota:over",a)}else{if(c>=this.options.warnAtPercent){d.attr("class","progress-bar progress-bar-warning");this.trigger("quota:under quota:under:approaching",a)}else{d.attr("class","progress-bar progress-bar-success");this.trigger("quota:under quota:under:ok",a)}}return b},_render_usage:function(){var a=$(this._templateUsage(this.model.toJSON()));this.log(this+".rendering usage:",a);return a},render:function(){var a=null;this.log(this+".model.quota_percent:",this.model.get("quota_percent"));if((this.model.get("quota_percent")===null)||(this.model.get("quota_percent")===undefined)){a=this._render_usage()}else{a=this._render_quota()}this.$el.html(a);this.$el.find(".quota-meter-text").tooltip();return this},_templateQuotaMeter:function(a){return['<div id="quota-meter" class="quota-meter progress">','<div class="progress-bar" style="width: ',a.quota_percent,'%"></div>','<div class="quota-meter-text" style="top: 6px"',((a.nice_total_disk_usage)?(' title="Using '+a.nice_total_disk_usage+'">'):(">")),_l("Using")," ",a.quota_percent,"%","</div>","</div>"].join("")},_templateUsage:function(a){return['<div id="quota-meter" class="quota-meter" style="background-color: transparent">','<div class="quota-meter-text" style="top: 6px; color: white">',((a.nice_total_disk_usage)?(_l("Using ")+a.nice_total_disk_usage):("")),"</div>","</div>"].join("")},toString:function(){return"UserQuotaMeter("+this.model+")"}}); \ No newline at end of file diff -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad -r ff9603c007c78c5c256171592bbd0aed5e20cab1 static/scripts/packed/templates/compiled/template-user-quotaMeter-quota.js --- a/static/scripts/packed/templates/compiled/template-user-quotaMeter-quota.js +++ /dev/null @@ -1,1 +0,0 @@ -(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a["template-user-quotaMeter-quota"]=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",d,p,h="function",j=this.escapeExpression,o=this,n=f.blockHelperMissing;function e(t,s){var q="",r;q+=' title="Using ';if(r=f.nice_total_disk_usage){r=r.call(t,{hash:{},data:s})}else{r=t.nice_total_disk_usage;r=typeof r===h?r.apply(t):r}q+=j(r)+'"';return q}function c(r,q){return"Using"}i+='<div id="quota-meter" class="quota-meter progress">\n <div id="quota-meter-bar" class="quota-meter-bar bar" style="width: ';if(d=f.quota_percent){d=d.call(m,{hash:{},data:k})}else{d=m.quota_percent;d=typeof d===h?d.apply(m):d}i+=j(d)+'%"></div>\n \n <div id="quota-meter-text" class="quota-meter-text"\n style="top: 6px"';d=f["if"].call(m,m.nice_total_disk_usage,{hash:{},inverse:o.noop,fn:o.program(1,e,k),data:k});if(d||d===0){i+=d}i+=">\n ";p={hash:{},inverse:o.noop,fn:o.program(3,c,k),data:k};if(d=f.local){d=d.call(m,p)}else{d=m.local;d=typeof d===h?d.apply(m):d}if(!f.local){d=n.call(m,d,p)}if(d||d===0){i+=d}i+=" ";if(d=f.quota_percent){d=d.call(m,{hash:{},data:k})}else{d=m.quota_percent;d=typeof d===h?d.apply(m):d}i+=j(d)+"%\n </div>\n</div>";return i})})(); \ No newline at end of file diff -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad -r ff9603c007c78c5c256171592bbd0aed5e20cab1 static/scripts/packed/templates/compiled/template-user-quotaMeter-usage.js --- a/static/scripts/packed/templates/compiled/template-user-quotaMeter-usage.js +++ /dev/null @@ -1,1 +0,0 @@ -(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a["template-user-quotaMeter-usage"]=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",c,o=this,h="function",n=f.blockHelperMissing,j=this.escapeExpression;function e(t,s){var p="",r,q;q={hash:{},inverse:o.noop,fn:o.program(2,d,s),data:s};if(r=f.local){r=r.call(t,q)}else{r=t.local;r=typeof r===h?r.apply(t):r}if(!f.local){r=n.call(t,r,q)}if(r||r===0){p+=r}p+=" ";if(r=f.nice_total_disk_usage){r=r.call(t,{hash:{},data:s})}else{r=t.nice_total_disk_usage;r=typeof r===h?r.apply(t):r}p+=j(r);return p}function d(q,p){return"Using"}i+='<div id="quota-meter" class="quota-meter" style="background-color: transparent">\n <div id="quota-meter-text" class="quota-meter-text" style="top: 6px; color: white">\n ';c=f["if"].call(m,m.nice_total_disk_usage,{hash:{},inverse:o.noop,fn:o.program(1,e,k),data:k});if(c||c===0){i+=c}i+="\n </div>\n</div>";return i})})(); \ No newline at end of file diff -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad -r ff9603c007c78c5c256171592bbd0aed5e20cab1 static/scripts/templates/compiled/template-user-quotaMeter-quota.js --- a/static/scripts/templates/compiled/template-user-quotaMeter-quota.js +++ /dev/null @@ -1,46 +0,0 @@ -(function() { - var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {}; -templates['template-user-quotaMeter-quota'] = template(function (Handlebars,depth0,helpers,partials,data) { - this.compilerInfo = [4,'>= 1.0.0']; -helpers = this.merge(helpers, Handlebars.helpers); data = data || {}; - var buffer = "", stack1, options, functionType="function", escapeExpression=this.escapeExpression, self=this, blockHelperMissing=helpers.blockHelperMissing; - -function program1(depth0,data) { - - var buffer = "", stack1; - buffer += " title=\"Using "; - if (stack1 = helpers.nice_total_disk_usage) { stack1 = stack1.call(depth0, {hash:{},data:data}); } - else { stack1 = depth0.nice_total_disk_usage; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } - buffer += escapeExpression(stack1) - + "\""; - return buffer; - } - -function program3(depth0,data) { - - - return "Using"; - } - - buffer += "<div id=\"quota-meter\" class=\"quota-meter progress\">\n <div id=\"quota-meter-bar\" class=\"quota-meter-bar bar\" style=\"width: "; - if (stack1 = helpers.quota_percent) { stack1 = stack1.call(depth0, {hash:{},data:data}); } - else { stack1 = depth0.quota_percent; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } - buffer += escapeExpression(stack1) - + "%\"></div>\n " - + "\n <div id=\"quota-meter-text\" class=\"quota-meter-text\"\n style=\"top: 6px\""; - stack1 = helpers['if'].call(depth0, depth0.nice_total_disk_usage, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data}); - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += ">\n "; - options = {hash:{},inverse:self.noop,fn:self.program(3, program3, data),data:data}; - if (stack1 = helpers.local) { stack1 = stack1.call(depth0, options); } - else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } - if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, options); } - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += " "; - if (stack1 = helpers.quota_percent) { stack1 = stack1.call(depth0, {hash:{},data:data}); } - else { stack1 = depth0.quota_percent; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } - buffer += escapeExpression(stack1) - + "%\n </div>\n</div>"; - return buffer; - }); -})(); \ No newline at end of file diff -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad -r ff9603c007c78c5c256171592bbd0aed5e20cab1 static/scripts/templates/compiled/template-user-quotaMeter-usage.js --- a/static/scripts/templates/compiled/template-user-quotaMeter-usage.js +++ /dev/null @@ -1,34 +0,0 @@ -(function() { - var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {}; -templates['template-user-quotaMeter-usage'] = template(function (Handlebars,depth0,helpers,partials,data) { - this.compilerInfo = [4,'>= 1.0.0']; -helpers = this.merge(helpers, Handlebars.helpers); data = data || {}; - var buffer = "", stack1, self=this, functionType="function", blockHelperMissing=helpers.blockHelperMissing, escapeExpression=this.escapeExpression; - -function program1(depth0,data) { - - var buffer = "", stack1, options; - options = {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data}; - if (stack1 = helpers.local) { stack1 = stack1.call(depth0, options); } - else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } - if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, options); } - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += " "; - if (stack1 = helpers.nice_total_disk_usage) { stack1 = stack1.call(depth0, {hash:{},data:data}); } - else { stack1 = depth0.nice_total_disk_usage; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } - buffer += escapeExpression(stack1); - return buffer; - } -function program2(depth0,data) { - - - return "Using"; - } - - buffer += "<div id=\"quota-meter\" class=\"quota-meter\" style=\"background-color: transparent\">\n <div id=\"quota-meter-text\" class=\"quota-meter-text\" style=\"top: 6px; color: white\">\n "; - stack1 = helpers['if'].call(depth0, depth0.nice_total_disk_usage, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data}); - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "\n </div>\n</div>"; - return buffer; - }); -})(); \ No newline at end of file diff -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad -r ff9603c007c78c5c256171592bbd0aed5e20cab1 static/scripts/templates/ui-templates.html --- a/static/scripts/templates/ui-templates.html +++ /dev/null @@ -1,19 +0,0 @@ -<script type="text/template" class="template-user" id="template-user-quotaMeter-quota"> -<div id="quota-meter" class="quota-meter progress"> - <div id="quota-meter-bar" class="quota-meter-bar bar" style="width: {{quota_percent}}%"></div> - {{! TODO: remove the hardcoded style }} - <div id="quota-meter-text" class="quota-meter-text" - style="top: 6px"{{#if nice_total_disk_usage}} title="Using {{nice_total_disk_usage}}"{{/if}}> - {{#local}}Using{{/local}} {{ quota_percent }}% - </div> -</div> -</script> - - -<script type="text/template" class="template-user" id="template-user-quotaMeter-usage"> -<div id="quota-meter" class="quota-meter" style="background-color: transparent"> - <div id="quota-meter-text" class="quota-meter-text" style="top: 6px; color: white"> - {{#if nice_total_disk_usage }}{{#local}}Using{{/local}} {{ nice_total_disk_usage }}{{/if}} - </div> -</div> -</script> diff -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad -r ff9603c007c78c5c256171592bbd0aed5e20cab1 templates/webapps/galaxy/base_panels.mako --- a/templates/webapps/galaxy/base_panels.mako +++ b/templates/webapps/galaxy/base_panels.mako @@ -7,7 +7,7 @@ ${parent.javascripts()}  -${h.templates( "helpers-common-templates", "template-user-quotaMeter-quota", "template-user-quotaMeter-usage" )} +${h.templates( "helpers-common-templates" )} ${h.js( "mvc/base-mvc", "utils/localization", "mvc/user/user-model", "mvc/user/user-quotameter" )} </%def> diff -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad -r ff9603c007c78c5c256171592bbd0aed5e20cab1 templates/webapps/galaxy/galaxy.masthead.mako --- a/templates/webapps/galaxy/galaxy.masthead.mako +++ b/templates/webapps/galaxy/galaxy.masthead.mako @@ -232,7 +232,7 @@ <div class="quota-meter-container"></div> - ${h.templates( "helpers-common-templates", "template-user-quotaMeter-quota", "template-user-quotaMeter-usage" )} + ${h.templates( "helpers-common-templates" )} ${h.js( "mvc/base-mvc", "utils/localization", "mvc/user/user-model", "mvc/user/user-quotameter" )} <script type="text/javascript"> 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.

1 0

commit/galaxy-central: carlfeberhard: UI: remove template for popupmenu (inside view now)
by commits-noreply＠bitbucket.org 23 Oct '13

23 Oct '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/bd89b1ef5a95/ Changeset: bd89b1ef5a95 User: carlfeberhard Date: 2013-10-23 19:24:46 Summary: UI: remove template for popupmenu (inside view now) Affected #: 5 files diff -r c3179a238f97fdf7b1f159b32d276a4a596a7e9e -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad static/scripts/packed/templates/compiled/template-popupmenu-menu.js --- a/static/scripts/packed/templates/compiled/template-popupmenu-menu.js +++ /dev/null @@ -1,1 +0,0 @@ -(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a["template-popupmenu-menu"]=b(function(g,s,q,l,x){this.compilerInfo=[4,">= 1.0.0"];q=this.merge(q,g.helpers);x=x||{};var r="",i,f,d="function",c=this.escapeExpression,p=this;function o(B,A){var y="",z;y+="\n ";z=q.each.call(B,B.options,{hash:{},inverse:p.noop,fn:p.program(2,n,A),data:A});if(z||z===0){y+=z}y+="\n";return y}function n(B,A){var y="",z;y+="\n ";z=q["if"].call(B,B.divider,{hash:{},inverse:p.program(5,k,A),fn:p.program(3,m,A),data:A});if(z||z===0){y+=z}y+="\n ";return y}function m(z,y){return'\n <li class="divider"></li>\n '}function k(B,A){var y="",z;y+="\n ";z=q["if"].call(B,B.header,{hash:{},inverse:p.program(8,h,A),fn:p.program(6,j,A),data:A});if(z||z===0){y+=z}y+="\n ";return y}function j(B,A){var y="",z;y+='\n <li class="head"><a href=""javascript:void(0);">';if(z=q.html){z=z.call(B,{hash:{},data:A})}else{z=B.html;z=typeof z===d?z.apply(B):z}if(z||z===0){y+=z}y+="</a></li>\n ";return y}function h(B,A){var y="",z;y+='\n \n <li><a href="';z=q["if"].call(B,B.href,{hash:{},inverse:p.program(11,w,A),fn:p.program(9,e,A),data:A});if(z||z===0){y+=z}y+='"\n ';z=q["if"].call(B,B.href,{hash:{},inverse:p.noop,fn:p.program(13,v,A),data:A});if(z||z===0){y+=z}y+=' class="popupmenu-option">\n ';z=q["if"].call(B,B.checked,{hash:{},inverse:p.noop,fn:p.program(15,u,A),data:A});if(z||z===0){y+=z}y+="\n ";if(z=q.html){z=z.call(B,{hash:{},data:A})}else{z=B.html;z=typeof z===d?z.apply(B):z}if(z||z===0){y+=z}y+="\n </a></li>\n ";return y}function e(A,z){var y;if(y=q.href){y=y.call(A,{hash:{},data:z})}else{y=A.href;y=typeof y===d?y.apply(A):y}return c(y)}function w(z,y){return"javascript:void(0);"}function v(B,A){var y="",z;y+='target="';if(z=q.target){z=z.call(B,{hash:{},data:A})}else{z=B.target;z=typeof z===d?z.apply(B):z}y+=c(z)+'"';return y}function u(z,y){return'<span class="fa-icon-ok"></span>'}function t(z,y){return"\n <li>No Options.</li>\n"}r+='<ul id="';if(i=q.id){i=i.call(s,{hash:{},data:x})}else{i=s.id;i=typeof i===d?i.apply(s):i}r+=c(i)+'-menu" class="dropdown-menu">\n';f=q["if"].call(s,((i=s.options),i==null||i===false?i:i.length),{hash:{},inverse:p.program(17,t,x),fn:p.program(1,o,x),data:x});if(f||f===0){r+=f}r+="\n</ul>";return r})})(); \ No newline at end of file diff -r c3179a238f97fdf7b1f159b32d276a4a596a7e9e -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad static/scripts/templates/compiled/template-popupmenu-menu.js --- a/static/scripts/templates/compiled/template-popupmenu-menu.js +++ /dev/null @@ -1,119 +0,0 @@ -(function() { - var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {}; -templates['template-popupmenu-menu'] = template(function (Handlebars,depth0,helpers,partials,data) { - this.compilerInfo = [4,'>= 1.0.0']; -helpers = this.merge(helpers, Handlebars.helpers); data = data || {}; - var buffer = "", stack1, stack2, functionType="function", escapeExpression=this.escapeExpression, self=this; - -function program1(depth0,data) { - - var buffer = "", stack1; - buffer += "\n "; - stack1 = helpers.each.call(depth0, depth0.options, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data}); - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "\n"; - return buffer; - } -function program2(depth0,data) { - - var buffer = "", stack1; - buffer += "\n "; - stack1 = helpers['if'].call(depth0, depth0.divider, {hash:{},inverse:self.program(5, program5, data),fn:self.program(3, program3, data),data:data}); - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "\n "; - return buffer; - } -function program3(depth0,data) { - - - return "\n <li class=\"divider\"></li>\n "; - } - -function program5(depth0,data) { - - var buffer = "", stack1; - buffer += "\n "; - stack1 = helpers['if'].call(depth0, depth0.header, {hash:{},inverse:self.program(8, program8, data),fn:self.program(6, program6, data),data:data}); - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "\n "; - return buffer; - } -function program6(depth0,data) { - - var buffer = "", stack1; - buffer += "\n <li class=\"head\"><a href=\"\"javascript:void(0);\">"; - if (stack1 = helpers.html) { stack1 = stack1.call(depth0, {hash:{},data:data}); } - else { stack1 = depth0.html; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "</a></li>\n "; - return buffer; - } - -function program8(depth0,data) { - - var buffer = "", stack1; - buffer += "\n " - + "\n <li><a href=\""; - stack1 = helpers['if'].call(depth0, depth0.href, {hash:{},inverse:self.program(11, program11, data),fn:self.program(9, program9, data),data:data}); - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "\"\n "; - stack1 = helpers['if'].call(depth0, depth0.href, {hash:{},inverse:self.noop,fn:self.program(13, program13, data),data:data}); - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += " class=\"popupmenu-option\">\n "; - stack1 = helpers['if'].call(depth0, depth0.checked, {hash:{},inverse:self.noop,fn:self.program(15, program15, data),data:data}); - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "\n "; - if (stack1 = helpers.html) { stack1 = stack1.call(depth0, {hash:{},data:data}); } - else { stack1 = depth0.html; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "\n </a></li>\n "; - return buffer; - } -function program9(depth0,data) { - - var stack1; - if (stack1 = helpers.href) { stack1 = stack1.call(depth0, {hash:{},data:data}); } - else { stack1 = depth0.href; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } - return escapeExpression(stack1); - } - -function program11(depth0,data) { - - - return "javascript:void(0);"; - } - -function program13(depth0,data) { - - var buffer = "", stack1; - buffer += "target=\""; - if (stack1 = helpers.target) { stack1 = stack1.call(depth0, {hash:{},data:data}); } - else { stack1 = depth0.target; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } - buffer += escapeExpression(stack1) - + "\""; - return buffer; - } - -function program15(depth0,data) { - - - return "<span class=\"fa-icon-ok\"></span>"; - } - -function program17(depth0,data) { - - - return "\n <li>No Options.</li>\n"; - } - - buffer += "<ul id=\""; - if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); } - else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } - buffer += escapeExpression(stack1) - + "-menu\" class=\"dropdown-menu\">\n"; - stack2 = helpers['if'].call(depth0, ((stack1 = depth0.options),stack1 == null || stack1 === false ? stack1 : stack1.length), {hash:{},inverse:self.program(17, program17, data),fn:self.program(1, program1, data),data:data}); - if(stack2 || stack2 === 0) { buffer += stack2; } - buffer += "\n</ul>"; - return buffer; - }); -})(); \ No newline at end of file diff -r c3179a238f97fdf7b1f159b32d276a4a596a7e9e -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad static/scripts/templates/ui-templates.html --- a/static/scripts/templates/ui-templates.html +++ b/static/scripts/templates/ui-templates.html @@ -17,28 +17,3 @@ </div></div></script> - -<script type="text/template" class="template-ui" id="template-popupmenu-menu"> -<ul id="{{ id }}-menu" class="dropdown-menu"> -{{#if options.length }} - {{#each options }} - {{#if divider }} - <li class="divider"></li> - {{else}} - {{#if header }} - <li class="head"><a href=""javascript:void(0);">{{{ html }}}</a></li> - {{else}} - {{!NOTE: changed from # to void fn }} - <li><a href="{{#if href }}{{ href }}{{else}}javascript:void(0);{{/if}}" - {{#if href }}target="{{ target }}"{{/if}} class="popupmenu-option"> - {{#if checked }}<span class="fa-icon-ok"></span>{{/if}} - {{{ html }}} - </a></li> - {{/if}} - {{/if}} - {{/each}} -{{else}} - <li>No Options.</li> -{{/if}} -</ul> -</script> diff -r c3179a238f97fdf7b1f159b32d276a4a596a7e9e -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad templates/base.mako --- a/templates/base.mako +++ b/templates/base.mako @@ -45,14 +45,7 @@ "libs/backbone/backbone", "libs/backbone/backbone-relational", "libs/handlebars.runtime", - "galaxy.base" - )} - - ${h.templates( - "template-popupmenu-menu" - )} - - ${h.js( + "galaxy.base", "mvc/ui" )} diff -r c3179a238f97fdf7b1f159b32d276a4a596a7e9e -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad templates/base/base_panels.mako --- a/templates/base/base_panels.mako +++ b/templates/base/base_panels.mako @@ -56,14 +56,7 @@ 'libs/backbone/backbone-relational', 'libs/handlebars.runtime', 'galaxy.base', - 'libs/require' - )} - - ${h.templates( - "template-popupmenu-menu" - )} - - ${h.js( + 'libs/require', "mvc/ui" )} 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.

1 0