From 8be7c7cd00a03ddb36d6822abe5efe7ccdc5b784 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Thu, 22 Jun 2017 16:11:17 +0300 Subject: [PATCH] moving to ig-features v3... Signed-off-by: Alex A. Naanou --- ui (gen4)/features/filesystem.js | 1 + ui (gen4)/package.json | 2 +- ui (gen4)/ui.js | 25 +++++++++++++++++++++---- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/ui (gen4)/features/filesystem.js b/ui (gen4)/features/filesystem.js index 5e6c0172..5e65e072 100755 --- a/ui (gen4)/features/filesystem.js +++ b/ui (gen4)/features/filesystem.js @@ -2428,5 +2428,6 @@ core.ImageGridFeatures.Feature('fs', [ + /********************************************************************** * vim:set ts=4 sw=4 : */ return module }) diff --git a/ui (gen4)/package.json b/ui (gen4)/package.json index a2b066c4..2a377511 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": "^2.0.0", + "ig-features": "^3.0.0", "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 b6a74883..a708c194 100755 --- a/ui (gen4)/ui.js +++ b/ui (gen4)/ui.js @@ -135,7 +135,7 @@ $(function(){ // report stuff... - // XXX we also have .conflicts and .missing + /* XXX legacy features... ig.features.excluded.length > 0 && console.warn('Features excluded (%d):', ig.features.excluded.length, @@ -147,12 +147,29 @@ $(function(){ && console.log('Features disabled (%d):', ig.features.disabled.length, ig.features.disabled) - console.log('Features not applicable (%d):', - ig.features.unapplicable.length, - ig.features.unapplicable) + //*/ console.log('Features loaded (%d):', ig.features.features.length, ig.features.features) + console.log('Features disabled (%d):', + ig.features.disabled.length, + ig.features.disabled) + console.log('Features not applicable (%d):', + ig.features.unapplicable.length, + ig.features.unapplicable) + + ig.features.excluded.length > 0 + && console.warn('Features excluded (%d):', + ig.features.excluded.length, + ig.features.excluded) + + // NOTE: fatal errors will get reported by setup... + if(ig.features.error){ + var err = ig.features.error + err.missing.length > 0 + && console.warn('Features disabled (%d):', + err.missing) + } // setup logger...