mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-10-29 02:10:08 +00:00
cleanup and refactroing of meta-features...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
ca9c39293d
commit
1c9b160e7a
@ -195,7 +195,7 @@ module.CLI = core.ImageGridFeatures.Feature({
|
||||
// extend the current instance to a minimal non-ui
|
||||
// state...
|
||||
core.ImageGridFeatures
|
||||
.setup(that, ['viewer-minimal'])
|
||||
.setup(that, ['imagegrid-minimal'])
|
||||
})
|
||||
|
||||
.option('repl, --repl', 'start an ImageGrid REPL', function(){
|
||||
|
||||
@ -687,9 +687,10 @@ var ExampleUIActions = actions.Actions({
|
||||
focusable: true,
|
||||
})
|
||||
.on('close', function(){
|
||||
that.nested.stop()
|
||||
|
||||
//delete that.nested
|
||||
if(that.nested){
|
||||
that.nested.stop()
|
||||
delete that.nested
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
@ -698,15 +699,15 @@ var ExampleUIActions = actions.Actions({
|
||||
// setup the viewer...
|
||||
this.nested = core.ImageGridFeatures
|
||||
// setup actions...
|
||||
// XXX prune the features a bit better...
|
||||
.setup([
|
||||
'viewer-testing',
|
||||
'imagegrid-ui-minimal',
|
||||
|
||||
// NOTE: this if not disabled will create a feedback loop...
|
||||
'-ui-url-hash',
|
||||
|
||||
'-ui-single-image',
|
||||
'-ui-chrome',
|
||||
// stuff we do not need...
|
||||
'-ui-drag-n-drop',
|
||||
'-edit',
|
||||
'-collections',
|
||||
'-metadata',
|
||||
'-peer',
|
||||
])
|
||||
.run(function(){
|
||||
this.close = function(){ widget.close() }
|
||||
|
||||
@ -19,69 +19,38 @@ var core = require('features/core')
|
||||
//
|
||||
// XXX need to make a set of basic configurations:
|
||||
// - commandline - everything but no UI
|
||||
// - viewer-minimal - basic browser compatible viewer
|
||||
// - imagegrid-minimal - basic browser compatible viewer
|
||||
// - viewer - full viewer
|
||||
// - editor - editing capability
|
||||
//
|
||||
|
||||
core.ImageGridFeatures.Feature('viewer-commandline', [
|
||||
core.ImageGridFeatures.Feature('imagegrid-commandline', [
|
||||
'lifecycle',
|
||||
'commandline',
|
||||
])
|
||||
|
||||
|
||||
core.ImageGridFeatures.Feature('viewer-minimal', [
|
||||
core.ImageGridFeatures.Feature('imagegrid-minimal', [
|
||||
'lifecycle',
|
||||
'base-full',
|
||||
|
||||
'alias',
|
||||
'peer',
|
||||
|
||||
'image-marks',
|
||||
'image-bookmarks',
|
||||
|
||||
'fs',
|
||||
'sharp',
|
||||
|
||||
'base-full',
|
||||
'marks',
|
||||
'collections',
|
||||
'metadata',
|
||||
])
|
||||
|
||||
|
||||
core.ImageGridFeatures.Feature('viewer-testing', [
|
||||
'viewer-commandline',
|
||||
'viewer-minimal',
|
||||
core.ImageGridFeatures.Feature('imagegrid-ui-minimal', [
|
||||
'imagegrid-minimal',
|
||||
|
||||
// NOTE: this is not strictly needed unless we need to save stuff,
|
||||
// added here mostly for testing purposes...
|
||||
// ...this is best included by direct feature dependency.
|
||||
'index-format',
|
||||
|
||||
// XXX
|
||||
'examples',
|
||||
|
||||
'collections',
|
||||
|
||||
// XXX remove when done testing...
|
||||
//'-fs-collections',
|
||||
|
||||
|
||||
'alias',
|
||||
|
||||
// read-only mode...
|
||||
// XXX at this point this needs some more tuneup, the following
|
||||
// features are completely disabled when 'edit' is not present
|
||||
// - sort
|
||||
// - ...
|
||||
// ...should be split into view/edit sub-features...
|
||||
// XXX might also be a good idea to make basic marking and bookmarking
|
||||
// editable (save to localStorage???)
|
||||
//'-edit',
|
||||
|
||||
'peer',
|
||||
|
||||
'workspace',
|
||||
'ui',
|
||||
'ui-introspection',
|
||||
'keyboard',
|
||||
'ui-cursor',
|
||||
'ui-control',
|
||||
'ui-drag-n-drop',
|
||||
|
||||
// XXX use one...
|
||||
//'ui-blank-render',
|
||||
@ -90,11 +59,6 @@ core.ImageGridFeatures.Feature('viewer-testing', [
|
||||
//'ui-vdom-render',
|
||||
//'ui-react-render',
|
||||
|
||||
// features...
|
||||
'ui-cursor',
|
||||
|
||||
'ui-single-image',
|
||||
|
||||
/*/ XXX has bugs -- non-current ribbons are not always aligned...
|
||||
'ui-partial-ribbons-2',
|
||||
'-ui-partial-ribbons',
|
||||
@ -107,65 +71,92 @@ core.ImageGridFeatures.Feature('viewer-testing', [
|
||||
'-ui-partial-ribbons-2',
|
||||
//*/
|
||||
|
||||
'marks',
|
||||
'ui-range',
|
||||
|
||||
// local storage + url...
|
||||
'config-local-storage',
|
||||
'ui-url-hash',
|
||||
'url-history',
|
||||
|
||||
'external-editor',
|
||||
'ui-drag-n-drop',
|
||||
|
||||
'ui-preview-filters',
|
||||
|
||||
// chrome...
|
||||
'ui-app-buttons',
|
||||
'ui-buttons',
|
||||
'ui-progress',
|
||||
'ui-status-log',
|
||||
'ui-scale',
|
||||
'ui-bounds-indicators',
|
||||
'ui-current-image-indicator',
|
||||
// NOTE: only one of these can be set...
|
||||
'ui-current-image-indicator-hide-on-fast-screen-nav',
|
||||
//'ui-current-image-indicator-hide-on-screen-nav',
|
||||
//*/
|
||||
//'ui-base-ribbon-indicator',
|
||||
'ui-passive-base-ribbon-indicator',
|
||||
'ui-status-bar',
|
||||
'ui-url-history',
|
||||
])
|
||||
|
||||
'ui-browse-actions',
|
||||
'ui-context-action-menu',
|
||||
|
||||
// slideshow...
|
||||
'ui-slideshow',
|
||||
|
||||
// ui control...
|
||||
//'ui-clickable',
|
||||
//'ui-direct-control-jquery',
|
||||
// XXX BUG: on touch down and first move this gets offset by a distance
|
||||
// not sure why...
|
||||
// ...seems to be related to scaling
|
||||
//'ui-direct-control-gsap',
|
||||
//'ui-direct-control-hammer',
|
||||
//'ui-indirect-control',
|
||||
'ui-control',
|
||||
|
||||
// experimental and optional features...
|
||||
//'auto-single-image',
|
||||
//'auto-ribbon',
|
||||
core.ImageGridFeatures.Feature('imagegrid-ui-chrome', [
|
||||
'imagegrid-ui-minimal',
|
||||
|
||||
'ui-app-control',
|
||||
|
||||
'ui-progress',
|
||||
|
||||
'ui-app-buttons',
|
||||
'ui-buttons',
|
||||
|
||||
'ui-status-bar',
|
||||
|
||||
'ui-url-history',
|
||||
'ui-browse-actions',
|
||||
'ui-context-action-menu',
|
||||
])
|
||||
|
||||
|
||||
core.ImageGridFeatures.Feature('imagegrid-testing', [
|
||||
'imagegrid-commandline',
|
||||
'imagegrid-ui-chrome',
|
||||
|
||||
|
||||
// read-only mode...
|
||||
// XXX at this point this needs some more tuneup, the following
|
||||
// ...should be split into view/edit sub-features...
|
||||
// XXX features are completely disabled when '-edit' is not present:
|
||||
// - sort
|
||||
// - ...
|
||||
// XXX the following features are broken:
|
||||
// - crop
|
||||
// - ...
|
||||
// XXX might also be a good idea to make basic marking and bookmarking
|
||||
// editable (save to localStorage???)
|
||||
//'-edit',
|
||||
|
||||
|
||||
//------------------------------------------------------ system ---
|
||||
// XXX not yet fully tested...
|
||||
'journal',
|
||||
|
||||
// NOTE: this is not strictly needed unless we need to save stuff,
|
||||
// added here mostly for testing purposes...
|
||||
// ...this is best included by direct feature dependency.
|
||||
'index-format',
|
||||
|
||||
'config-local-storage',
|
||||
'ui-url-hash',
|
||||
|
||||
'fail-safe-devtools',
|
||||
|
||||
|
||||
//------------------------------------------------------ chrome ---
|
||||
'ui-status-log',
|
||||
//'ui-scale',
|
||||
// NOTE: only one of these can be set...
|
||||
'ui-current-image-indicator-hide-on-fast-screen-nav',
|
||||
//'ui-current-image-indicator-hide-on-screen-nav',
|
||||
//'ui-base-ribbon-indicator',
|
||||
'ui-passive-base-ribbon-indicator',
|
||||
|
||||
|
||||
//---------------------------------------------------- features ---
|
||||
'ui-introspection',
|
||||
'ui-single-image',
|
||||
'ui-slideshow',
|
||||
'ui-preview-filters',
|
||||
'url-history',
|
||||
'external-editor',
|
||||
|
||||
// experimental features...
|
||||
//'ui-range',
|
||||
//'auto-single-image',
|
||||
//'auto-ribbon',
|
||||
|
||||
|
||||
//------------------------------------------------------- other ---
|
||||
'examples',
|
||||
|
||||
|
||||
//----------------------------------------------------- testing ---
|
||||
'-tests',
|
||||
'-experiments',
|
||||
|
||||
@ -173,19 +164,6 @@ core.ImageGridFeatures.Feature('viewer-testing', [
|
||||
'missing-feature',
|
||||
])
|
||||
|
||||
/*
|
||||
core.ImageGridFeatures.Feature('viewer-minimal', [
|
||||
'base',
|
||||
'ui',
|
||||
'ui-ribbon-align-to-order',
|
||||
'ui-animation',
|
||||
'ui-bounds-indicators',
|
||||
'ui-current-image-indicator',
|
||||
'ui-current-image-indicator-hide-on-fast-screen-nav',
|
||||
//'ui-current-image-indicator-hide-on-screen-nav',
|
||||
'ui-action-tree',
|
||||
])
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
@ -571,21 +571,6 @@ function makeConfigListEditorDialog(path, options){
|
||||
|
||||
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
|
||||
var Chrome =
|
||||
module.Chrome = core.ImageGridFeatures.Feature({
|
||||
title: '',
|
||||
doc: '',
|
||||
|
||||
tag: 'ui-chrome',
|
||||
depends: [
|
||||
'ui',
|
||||
],
|
||||
})
|
||||
|
||||
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
|
||||
var DialogsActions = actions.Actions({
|
||||
@ -869,7 +854,6 @@ module.Dialogs = core.ImageGridFeatures.Feature({
|
||||
tag: 'ui-dialogs',
|
||||
depends: [
|
||||
'ui',
|
||||
'ui-chrome',
|
||||
],
|
||||
|
||||
actions: DialogsActions,
|
||||
@ -2070,7 +2054,6 @@ module.Buttons = core.ImageGridFeatures.Feature({
|
||||
tag: 'ui-buttons',
|
||||
depends: [
|
||||
'ui',
|
||||
'ui-chrome'
|
||||
],
|
||||
suggested: [
|
||||
// needed for reporting info in .makeButtonControls(..)
|
||||
|
||||
@ -45,8 +45,8 @@ module.ImageGridFeatures =
|
||||
// setup actions and start...
|
||||
ImageGridFeatures
|
||||
.setup([
|
||||
'viewer-testing',
|
||||
'viewer-commandline',
|
||||
'imagegrid-testing',
|
||||
'imagegrid-commandline',
|
||||
])
|
||||
.start()
|
||||
|
||||
|
||||
@ -57,7 +57,7 @@ $(function(){
|
||||
window.ImageGrid =
|
||||
viewer.ImageGridFeatures
|
||||
.setup([
|
||||
'viewer-testing',
|
||||
'imagegrid-testing',
|
||||
|
||||
'demo',
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user