diff --git a/ui (gen4)/features/base.js b/ui (gen4)/features/base.js index 9433d351..c73a858e 100755 --- a/ui (gen4)/features/base.js +++ b/ui (gen4)/features/base.js @@ -222,7 +222,7 @@ actions.Actions({ // XXX should this be here??? // XXX should this use .load(..) // ...note if we use this it breaks, need to rethink... - loadURLs: ['File/Load a URL list', + loadURLs: ['- File/Load a URL list', function(lst, base){ var imgs = images.Images.fromArray(lst, base) diff --git a/ui (gen4)/features/external-editor.js b/ui (gen4)/features/external-editor.js index 083acd99..941d2cb5 100755 --- a/ui (gen4)/features/external-editor.js +++ b/ui (gen4)/features/external-editor.js @@ -11,7 +11,6 @@ define(function(require){ var module = {} var actions = require('lib/actions') var core = require('features/core') -var base = require('features/base') // widgets... var browse = require('lib/widget/browse') @@ -95,7 +94,7 @@ module.ExternalEditor = core.ImageGridFeatures.Feature({ tag: 'external-editor', depends: [ - // XXX + 'base', ], isApplicable: function(){ @@ -261,6 +260,7 @@ module.ExternalEditorUI = core.ImageGridFeatures.Feature({ tag: 'ui-external-editor', depends: [ + 'ui', 'external-editor', ], diff --git a/ui (gen4)/features/ui-marks.js b/ui (gen4)/features/ui-marks.js index b3dc7aad..706b0eb8 100755 --- a/ui (gen4)/features/ui-marks.js +++ b/ui (gen4)/features/ui-marks.js @@ -159,7 +159,7 @@ var ImageMarkActions = actions.Actions({ // Invert marks on current ribbon // .toggleMark('ribbon') // - toggleMark: ['Mark/Toggle image mark', + toggleMark: ['Mark|Image/Toggle image mark', makeTagTogglerAction('selected')], // XXX toggleMarkBlock: ['Mark/Toggle block marks', @@ -237,7 +237,7 @@ var ImageBookmarkActions = actions.Actions({ return this.data.tags['bookmark'].slice() }, - toggleBookmark: ['Bookmark/Toggle image bookmark', + toggleBookmark: ['Bookmark|Image/Toggle image bookmark', makeTagTogglerAction('bookmark')], // action can be: // 'on' - toggle all on diff --git a/ui (gen4)/features/ui-widgets.js b/ui (gen4)/features/ui-widgets.js index 3922587b..23103581 100755 --- a/ui (gen4)/features/ui-widgets.js +++ b/ui (gen4)/features/ui-widgets.js @@ -278,7 +278,7 @@ var WidgetTestActions = actions.Actions({ //a.experimental = true // setup actions... - ImageGridFeatures.setup(b, [ + core.ImageGridFeatures.setup(b, [ 'viewer-testing', ]) diff --git a/ui (gen4)/features/ui.js b/ui (gen4)/features/ui.js index fa6da3ad..dd821d87 100755 --- a/ui (gen4)/features/ui.js +++ b/ui (gen4)/features/ui.js @@ -748,7 +748,6 @@ module.Viewer = core.ImageGridFeatures.Feature({ var journalActions = { clear: null, load: null, - //loadURLs: null, setBaseRibbon: null, @@ -959,7 +958,6 @@ module.Journal = core.ImageGridFeatures.Feature({ ].concat([ 'clear', 'load', - 'loadURLs', 'setBaseRibbon', @@ -1769,7 +1767,6 @@ module.SingleImageViewLocalStorage = core.ImageGridFeatures.Feature({ handlers:[ // set scale... - //['load loadURLs', ['load', function(){ // prevent this from doing anything while no viewer...