diff --git a/ui (gen4)/features/meta.js b/ui (gen4)/features/meta.js index a764ec62..f7b171f2 100755 --- a/ui (gen4)/features/meta.js +++ b/ui (gen4)/features/meta.js @@ -66,18 +66,13 @@ core.ImageGridFeatures.Feature('viewer-testing', [ 'ui', 'keyboard', - // XXX BUG?: should this be indicated as a missing dependency??? + // missing suggested feature test... 'missing-feature', - // XXX - //'ui-blank-render', - // XXX BUG: features: this pulls in all the suggestions that depend - // regardless of weather they depend on it or not: - // 'ui-partial-ribbons' 'ui-ribbons-render', - 'ui-partial-ribbons-render', 'ui-vdom-render', //'ui-react-render', + 'ui-blank-render', //*/ // features... diff --git a/ui (gen4)/features/ui-drag-n-drop.js b/ui (gen4)/features/ui-drag-n-drop.js index 1109af6c..24a7b345 100755 --- a/ui (gen4)/features/ui-drag-n-drop.js +++ b/ui (gen4)/features/ui-drag-n-drop.js @@ -27,6 +27,8 @@ module.DragAndDrop = core.ImageGridFeatures.Feature({ ], handlers: [ + // XXX add type/handler registry -- might be a good idea to add + // an action attribute/handler... // XXX would be nice to load a directory tree as ribbons... // XXX HACK-ish... ['start', function(){ @@ -78,7 +80,7 @@ module.DragAndDrop = core.ImageGridFeatures.Feature({ // images when they are loaded later... that.images.forEach(function(gid, img){ lst[img.path].gid = gid - img.name = img.path + img.name = img.path.split('.').slice(0, -1).join('.') }) } } diff --git a/ui (gen4)/package.json b/ui (gen4)/package.json index 7c94c9b5..7a056b7f 100755 --- a/ui (gen4)/package.json +++ b/ui (gen4)/package.json @@ -23,7 +23,7 @@ "glob": "^4.0.6", "guarantee-events": "^1.0.0", "ig-actions": "^3.0.0", - "ig-features": "^3.1.5", + "ig-features": "^3.1.7", "ig-object": "^1.0.1", "openseadragon": "^2.1.0", "preact": "^8.1.0", diff --git a/ui (gen4)/ui.js b/ui (gen4)/ui.js index 15270bee..d7da3772 100755 --- a/ui (gen4)/ui.js +++ b/ui (gen4)/ui.js @@ -103,7 +103,7 @@ $(function(){ // list all loaded modules... var m = requirejs.s.contexts._.defined m = Object.keys(m).filter(function(e){ return m[e] != null }) - console.log('Modules (%d):', m.length, m) + console.log('Modules:', m) /*/ self-test... var test = viewer.ImageGridFeatures.buildFeatureList() @@ -146,26 +146,25 @@ $(function(){ // report stuff... - console.log('Features loaded (%d):', - ig.features.features.length, + console.log('Loaded features:', ig.features.features) - console.log('Features disabled (%d):', - ig.features.disabled.length, + console.log('Disabled features:', ig.features.disabled) - console.log('Features not applicable (%d):', - ig.features.unapplicable.length, + console.log('Not applicable features:', ig.features.unapplicable) ig.features.excluded.length > 0 - && console.warn('Features excluded (%d):', - ig.features.excluded.length, + && console.log('Excluded features:', ig.features.excluded) // NOTE: fatal errors will get reported by setup... if(ig.features.error){ var err = ig.features.error + err.missing_suggested.length > 0 + && console.log('Missing suggested features:', + err.missing_suggested) err.missing.length > 0 - && console.warn('Features disabled (%d):', + && console.warn('Missing dependencies:', err.missing) }