flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 10:20:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor bugfix...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-01-08 04:25:54 +03:00
parent c0e678ace5
commit d5c63da7db
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui (gen4)/features/base.js
View File

@ -222,7 +222,7 @@ actions.Actions({
// XXX should this be here??? // XXX should this be here???
// XXX should this use .load(..) // XXX should this use .load(..)
// ...note if we use this it breaks, need to rethink... // ...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){ function(lst, base){
var imgs = images.Images.fromArray(lst, base) var imgs = images.Images.fromArray(lst, base)

4
ui (gen4)/features/external-editor.js
View File

@ -11,7 +11,6 @@ define(function(require){ var module = {}
var actions = require('lib/actions') var actions = require('lib/actions')
var core = require('features/core') var core = require('features/core')
var base = require('features/base')
// widgets... // widgets...
var browse = require('lib/widget/browse') var browse = require('lib/widget/browse')
@ -95,7 +94,7 @@ module.ExternalEditor = core.ImageGridFeatures.Feature({
tag: 'external-editor', tag: 'external-editor',
depends: [ depends: [
// XXX 'base',
], ],
isApplicable: function(){ isApplicable: function(){
@ -261,6 +260,7 @@ module.ExternalEditorUI = core.ImageGridFeatures.Feature({
tag: 'ui-external-editor', tag: 'ui-external-editor',
depends: [ depends: [
'ui',
'external-editor', 'external-editor',
], ],

4
ui (gen4)/features/ui-marks.js
View File

@ -159,7 +159,7 @@ var ImageMarkActions = actions.Actions({
// Invert marks on current ribbon // Invert marks on current ribbon
// .toggleMark('ribbon') // .toggleMark('ribbon')
// //
toggleMark: ['Mark/Toggle image mark', toggleMark: ['Mark|Image/Toggle image mark',
makeTagTogglerAction('selected')], makeTagTogglerAction('selected')],
// XXX // XXX
toggleMarkBlock: ['Mark/Toggle block marks', toggleMarkBlock: ['Mark/Toggle block marks',
@ -237,7 +237,7 @@ var ImageBookmarkActions = actions.Actions({
return this.data.tags['bookmark'].slice() return this.data.tags['bookmark'].slice()
}, },
toggleBookmark: ['Bookmark/Toggle image bookmark', toggleBookmark: ['Bookmark|Image/Toggle image bookmark',
makeTagTogglerAction('bookmark')], makeTagTogglerAction('bookmark')],
// action can be: // action can be:
// 'on' - toggle all on // 'on' - toggle all on

2
ui (gen4)/features/ui-widgets.js
View File

@ -278,7 +278,7 @@ var WidgetTestActions = actions.Actions({
//a.experimental = true //a.experimental = true
// setup actions... // setup actions...
ImageGridFeatures.setup(b, [ core.ImageGridFeatures.setup(b, [
'viewer-testing', 'viewer-testing',
]) ])

3
ui (gen4)/features/ui.js
View File

@ -748,7 +748,6 @@ module.Viewer = core.ImageGridFeatures.Feature({
var journalActions = { var journalActions = {
clear: null, clear: null,
load: null, load: null,
//loadURLs: null,
setBaseRibbon: null, setBaseRibbon: null,
@ -959,7 +958,6 @@ module.Journal = core.ImageGridFeatures.Feature({
].concat([ ].concat([
'clear', 'clear',
'load', 'load',
'loadURLs',
'setBaseRibbon', 'setBaseRibbon',
@ -1769,7 +1767,6 @@ module.SingleImageViewLocalStorage = core.ImageGridFeatures.Feature({
handlers:[ handlers:[
// set scale... // set scale...
//['load loadURLs',
['load', ['load',
function(){ function(){
// prevent this from doing anything while no viewer... // prevent this from doing anything while no viewer...