diff --git a/.hgignore b/.hgignore index 2e8361e66a9..a2ae88fffde 100644 --- a/.hgignore +++ b/.hgignore @@ -114,8 +114,4 @@ doc/build *.orig .DS_Store *.rej -*~ - - -syntax: regexp -^static/AAA_scratch$ \ No newline at end of file +*~ \ No newline at end of file diff --git a/lib/galaxy/webapps/galaxy/api/folder_contents.py b/lib/galaxy/webapps/galaxy/api/folder_contents.py index 1e3899a7d33..aa215fb89a9 100644 --- a/lib/galaxy/webapps/galaxy/api/folder_contents.py +++ b/lib/galaxy/webapps/galaxy/api/folder_contents.py @@ -100,8 +100,6 @@ class FolderContentsController( BaseAPIController, UsesLibraryMixin, UsesLibrary encoded_id = trans.security.encode_id( content_item.id ) time_updated = content_item.update_time.strftime( "%Y-%m-%d %I:%M %p" ) time_created = content_item.create_time.strftime( "%Y-%m-%d %I:%M %p" ) -# log.debug('XXXXXXXXXXXXXXXXXXX api type: ' + str(content_item.api_type)) -# log.debug('XXXXXXXX ALL: ' + str(content_item.__dict__)) # For folder return also hierarchy values if content_item.api_type == 'folder': @@ -110,7 +108,6 @@ class FolderContentsController( BaseAPIController, UsesLibraryMixin, UsesLibrary return_item.update ( dict ( item_count = content_item.item_count ) ) if content_item.api_type == 'file': -# log.debug('XXXXX content item class: ' + str(content_item.__class__)) library_dataset_dict = content_item.to_dict() library_dataset_dict['data_type'] library_dataset_dict['file_size'] diff --git a/static/scripts/galaxy.library.router.js b/static/scripts/galaxy.library.router.js deleted file mode 100644 index 8980c2d67b8..00000000000 --- a/static/scripts/galaxy.library.router.js +++ /dev/null @@ -1,21 +0,0 @@ -define( [], function() { - -/** - * -- Routers -- - */ - -/** - * Router for library browser. - */ -var LibraryRouter = Backbone.Router.extend({ - routes: { - "" : "libraries", - "folders/:id" : "folder_content" - } -}); - -return { - LibraryRouter: LibraryRouter, -}; - -}) \ No newline at end of file diff --git a/static/scripts/galaxy.menu.js b/static/scripts/galaxy.menu.js index 9f1ec17a1f9..68dcb8d067b 100644 --- a/static/scripts/galaxy.menu.js +++ b/static/scripts/galaxy.menu.js @@ -57,7 +57,6 @@ var GalaxyMenu = Backbone.Model.extend( tab_shared.add({ title : "Data Libraries", - content : "library/index", content : "library/index" }); diff --git a/static/style/Gruntfile.js b/static/style/Gruntfile.js index d4612c4fb87..cf49af74613 100644 --- a/static/style/Gruntfile.js +++ b/static/style/Gruntfile.js @@ -6,7 +6,7 @@ module.exports = function(grunt) { var theme = grunt.option( 'theme', 'blue' ); var out = 'blue' - var lessFiles = [ 'base', 'autocomplete_tagging', 'embed_item', 'iphone', 'masthead', 'library', 'new_library', 'trackster' ]; + var lessFiles = [ 'base', 'autocomplete_tagging', 'embed_item', 'iphone', 'masthead', 'library', 'trackster' ]; var _ = grunt.util._; var fmt = _.sprintf;