From 180dd6b1c5d941df1b40e15b58e75a3a67e8d860 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Thu, 25 Feb 2016 02:38:01 +0300 Subject: [PATCH] moved feature loading to features/all.js, getting ready for autoloading... Signed-off-by: Alex A. Naanou --- ui (gen4)/css/layout.css | 6 +++++ ui (gen4)/css/layout.less | 6 +++++ ui (gen4)/features/all.js | 49 +++++++++++++++++++++++++++++++++++++++ ui (gen4)/viewer.js | 23 ++---------------- 4 files changed, 63 insertions(+), 21 deletions(-) create mode 100755 ui (gen4)/features/all.js diff --git a/ui (gen4)/css/layout.css b/ui (gen4)/css/layout.css index 014995a1..8dc8f319 100644 --- a/ui (gen4)/css/layout.css +++ b/ui (gen4)/css/layout.css @@ -1267,6 +1267,12 @@ stretching in width... */ background: gray; } /* image index status element */ +.overlay-info .index { + cursor: pointer; +} +.overlay-info .index .position { + cursor: text; +} .overlay-info .index.global:after { content: "G"; opacity: 0.7; diff --git a/ui (gen4)/css/layout.less b/ui (gen4)/css/layout.less index 13388f7c..a7d6319c 100755 --- a/ui (gen4)/css/layout.less +++ b/ui (gen4)/css/layout.less @@ -1138,6 +1138,12 @@ stretching in width... */ } /* image index status element */ +.overlay-info .index { + cursor: pointer; +} +.overlay-info .index .position { + cursor: text; +} .overlay-info .index.global:after { content: "G"; opacity: 0.7; diff --git a/ui (gen4)/features/all.js b/ui (gen4)/features/all.js new file mode 100755 index 00000000..69510fc1 --- /dev/null +++ b/ui (gen4)/features/all.js @@ -0,0 +1,49 @@ +/********************************************************************** +* +* +* +**********************************************************************/ + +define(function(require){ var module = {} + +//var DEBUG = DEBUG != null ? DEBUG : true + + +/*********************************************************************/ + +//var DEBUG = DEBUG != null ? DEBUG : true + +// import features... +// XXX should this be auto-loaded??? +var core = require('features/core') +var base = require('features/base') +var location = require('features/location') +var history = require('features/history') +var app = require('features/app') +var ui = require('features/ui') +var status = require('features/ui-status') +var marks = require('features/ui-marks') +var widgets = require('features/ui-widgets') +var exteditor = require('features/external-editor') +var metadata = require('features/metadata') +var meta = require('features/meta') +var experimental = require('features/experimental') + +if(window.nodejs != null){ + var filesystem = require('features/filesystem') + var cli = require('features/cli') +} + + +//--------------------------------------------------------------------- + +// NOTE: this is here to simplify importing... +var ImageGridFeatures = +module.ImageGridFeatures = + core.ImageGridFeatures + + + +/********************************************************************** +* vim:set ts=4 sw=4 : */ +return module }) diff --git a/ui (gen4)/viewer.js b/ui (gen4)/viewer.js index 939abd48..e3ab7ce6 100755 --- a/ui (gen4)/viewer.js +++ b/ui (gen4)/viewer.js @@ -24,26 +24,7 @@ define(function(require){ var module = {} //var DEBUG = DEBUG != null ? DEBUG : true -// import features... -// XXX should this be auto-loaded??? -var core = require('features/core') -var base = require('features/base') -var location = require('features/location') -var history = require('features/history') -var app = require('features/app') -var ui = require('features/ui') -var status = require('features/ui-status') -var marks = require('features/ui-marks') -var widgets = require('features/ui-widgets') -var exteditor = require('features/external-editor') -var metadata = require('features/metadata') -var meta = require('features/meta') -var experimental = require('features/experimental') - -if(window.nodejs != null){ - var filesystem = require('features/filesystem') - var cli = require('features/cli') -} +var features = require('features/all') //--------------------------------------------------------------------- @@ -51,7 +32,7 @@ if(window.nodejs != null){ // NOTE: this is here to simplify importing... var ImageGridFeatures = module.ImageGridFeatures = - core.ImageGridFeatures + features.ImageGridFeatures