mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-10-28 18:00:09 +00:00
some tweaking and notes...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
38e725a0fb
commit
f4e5189b35
@ -364,6 +364,14 @@ module.AppControl = core.ImageGridFeatures.Feature({
|
|||||||
|
|
||||||
actions: AppControlActions,
|
actions: AppControlActions,
|
||||||
|
|
||||||
|
// XXX BUG: when running in electron:
|
||||||
|
// - loading this breaks the other buttons (menu, collections, ...)
|
||||||
|
// - .toggleFullScreen(..) works in an odd manner -- ok when
|
||||||
|
// explicitly called or button pushed but in opposite manner
|
||||||
|
// when F11 (FIXED?)
|
||||||
|
// - ready protocol breaks -- need to call .ready() to unstall
|
||||||
|
// the viewer
|
||||||
|
// ...does this all have anything to do with double init???
|
||||||
//isApplicable: function(){ return this.runtime.desktop },
|
//isApplicable: function(){ return this.runtime.desktop },
|
||||||
isApplicable: function(){ return this.runtime.desktop && !this.runtime.electron },
|
isApplicable: function(){ return this.runtime.desktop && !this.runtime.electron },
|
||||||
|
|
||||||
|
|||||||
@ -227,7 +227,7 @@ module.FileSystemInfo = core.ImageGridFeatures.Feature({
|
|||||||
// NOTE: this will also manage .location.from
|
// NOTE: this will also manage .location.from
|
||||||
var FileSystemLoaderActions = actions.Actions({
|
var FileSystemLoaderActions = actions.Actions({
|
||||||
config: {
|
config: {
|
||||||
'image-file-pattern': '*+(jpg|jpeg|png|JPG|JPEG|PNG)',
|
'image-file-pattern': '*+(jpg|jpeg|png|svg|JPG|JPEG|PNG|svg)',
|
||||||
|
|
||||||
'image-file-read-stat': true,
|
'image-file-read-stat': true,
|
||||||
'image-file-skip-previews': false,
|
'image-file-skip-previews': false,
|
||||||
|
|||||||
@ -244,7 +244,7 @@ module.GLOBAL_KEYBOARD = {
|
|||||||
|
|
||||||
// NOTE: this is handled by the wrapper at this point, so we do
|
// NOTE: this is handled by the wrapper at this point, so we do
|
||||||
// not have to do anything here...
|
// not have to do anything here...
|
||||||
F11: 'toggleFullScreen',
|
F11: 'toggleFullScreen!',
|
||||||
ctrl_F: 'F11',
|
ctrl_F: 'F11',
|
||||||
meta_F: 'F11',
|
meta_F: 'F11',
|
||||||
|
|
||||||
|
|||||||
@ -6,34 +6,43 @@
|
|||||||
<meta name="msapplication-tap-highlight" content="no" />
|
<meta name="msapplication-tap-highlight" content="no" />
|
||||||
<meta name="viewport" content="width=device-width, user-scalable=no" />
|
<meta name="viewport" content="width=device-width, user-scalable=no" />
|
||||||
|
|
||||||
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-Bold.ttf">
|
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-Bold.ttf" />
|
||||||
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-BoldItalic.ttf">
|
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-BoldItalic.ttf" />
|
||||||
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-ExtraBold.ttf">
|
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-ExtraBold.ttf" />
|
||||||
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf">
|
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf" />
|
||||||
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-Italic.ttf">
|
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-Italic.ttf" />
|
||||||
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-Light.ttf">
|
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-Light.ttf" />
|
||||||
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-LightItalic.ttf">
|
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-LightItalic.ttf" />
|
||||||
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-Regular.ttf">
|
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-Regular.ttf" />
|
||||||
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-Semibold.ttf">
|
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-Semibold.ttf" />
|
||||||
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-SemiboldItalic.ttf">
|
<link rel="prefetch" href="css/fonts/Open_Sans/OpenSans-SemiboldItalic.ttf" />
|
||||||
|
|
||||||
|
|
||||||
<link rel="stylesheet" href="css/fonts.css">
|
<link rel="stylesheet" href="css/fonts.css" />
|
||||||
<link rel="stylesheet" href="css/layout.css">
|
<link rel="stylesheet" href="css/layout.css" />
|
||||||
<link rel="stylesheet" href="css/editor.css">
|
<link rel="stylesheet" href="css/editor.css" />
|
||||||
<link rel="stylesheet" href="css/widget/browse.css">
|
<link rel="stylesheet" href="css/widget/browse.css" />
|
||||||
<link rel="stylesheet" href="css/widget/overlay.css">
|
<link rel="stylesheet" href="css/widget/overlay.css" />
|
||||||
<link rel="stylesheet" href="css/widget/drawer.css">
|
<link rel="stylesheet" href="css/widget/drawer.css" />
|
||||||
|
|
||||||
<link rel="stylesheet" href="css/loader.css">
|
<link rel="stylesheet" href="css/loader.css" />
|
||||||
|
|
||||||
<link rel="stylesheet" href="css/experimenting.css">
|
<link rel="stylesheet" href="css/experimenting.css" />
|
||||||
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
if(window.require && window.nw){
|
if(window.require && window.nw){
|
||||||
window.__devtools_failsafe = setTimeout(function(){
|
window.__devtools_failsafe = setTimeout(function(){
|
||||||
nw.Window.get().showDevTools()
|
// nw...
|
||||||
|
if(window.nw){
|
||||||
|
nw.Window.get().showDevTools()
|
||||||
|
|
||||||
|
// electron...
|
||||||
|
} else {
|
||||||
|
try{
|
||||||
|
require('electron').remote.getCurrentWindow().openDevTools()
|
||||||
|
} catch(err){ }
|
||||||
|
}
|
||||||
}, 5000)
|
}, 5000)
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
"glob": "^4.0.6",
|
"glob": "^4.0.6",
|
||||||
"guarantee-events": "^1.0.0",
|
"guarantee-events": "^1.0.0",
|
||||||
"ig-actions": "^3.8.0",
|
"ig-actions": "^3.8.0",
|
||||||
"ig-features": "^3.3.1",
|
"ig-features": "^3.3.2",
|
||||||
"ig-object": "^1.0.2",
|
"ig-object": "^1.0.2",
|
||||||
"openseadragon": "^2.3.1",
|
"openseadragon": "^2.3.1",
|
||||||
"pica": "^3.0.6",
|
"pica": "^3.0.6",
|
||||||
|
|||||||
@ -102,23 +102,6 @@ var viewer = require('imagegrid/viewer')
|
|||||||
|
|
||||||
$(function(){
|
$(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:', m)
|
|
||||||
//*/
|
|
||||||
|
|
||||||
/*/ self-test...
|
|
||||||
var test = viewer.ImageGridFeatures.buildFeatureList()
|
|
||||||
if(test.error){
|
|
||||||
// report loops...
|
|
||||||
var err = test.error
|
|
||||||
err.loops.forEach(function(loop){
|
|
||||||
console.warn('Self-test: Feature dependency loops detected:\n\t'
|
|
||||||
+ loop.join('\n\t\t-> ')) })
|
|
||||||
}
|
|
||||||
//*/
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// setup actions...
|
// setup actions...
|
||||||
window.ig =
|
window.ig =
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user