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

added loadURLs action + some tweaks and fixes...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2014-11-14 21:57:55 +03:00
parent aab609e66b
commit 38ea605f00
6 changed files with 114 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui (gen4)/data.js
View File

@ -96,18 +96,32 @@ module.DATA_VERSION = '3.0'
//
/*********************************************************************/
// decide to use a hashing function...
if(typeof(sha1) != 'undefined'){
var hash = sha1.hash.bind(sha1)
} else {
var hash = function(g){ return g }
}
/*********************************************************************/
// Data class methods and API...
//
var DataClassPrototype =
module.DataClassPrototype = {
// NOTE: we consider the input list sorted...
fromList: function(list){
fromArray: function(list){
var res = new Data()
// XXX make a real ribbon gid...
var gid = res.newGid()
res.order = list
res.ribbon_order.push(gid)
res.ribbons[gid] = list.slice()
res.focusImage(list[0])
res.setBase(gid)
return res
},
// XXX is this the right way to construct data???
@ -251,12 +265,6 @@ module.DataPrototype = {
if(typeof(process) != 'undefined'){
p += process.pid + '-'
}
// decide to use a hashing function...
if(typeof(sha1) != 'undefined'){
var hash = sha1.hash.bind(sha1)
} else {
var hash = function(g){ return g }
}
// return string as-is...
if(nohash){

24
ui (gen4)/file.js
View File

@ -4,27 +4,29 @@
*
**********************************************************************/
var glob = require('glob')
var path = require('path')
define(function(require){ var module = {}
console.log('>>> file')
//var DEBUG = DEBUG != null ? DEBUG : true
/*********************************************************************/
function listDir(path){
}
function openFile(path){
}
function loadJSONFile(path){
}
var tasks = require('lib/tasks')
/*********************************************************************/
var INDEX_DIR = '.ImageGrid'
/*********************************************************************/
function listIndexes(base){
return glob(base +'/**/'+ INDEX_DIR)
}
/**********************************************************************

26
ui (gen4)/images.js
View File

@ -9,6 +9,17 @@ console.log('>>> images')
//var DEBUG = DEBUG != null ? DEBUG : true
var sha1 = require('./ext-lib/sha1')
/*********************************************************************/
// decide to use a hashing function...
if(typeof(sha1) != 'undefined'){
var hash = sha1.hash.bind(sha1)
} else {
var hash = function(g){ return g }
}
/*********************************************************************/
@ -224,6 +235,20 @@ module.makeImageSeqOrNameCmp = function(data, get, seq){
var ImagesClassPrototype =
module.ImagesClassPrototype = {
fromArray: function(data){
var images = new this()
// XXX stub...
var i = 0
data.forEach(function(path){
var gid = hash('I'+i)
images[gid] = {
id: gid,
path: path,
}
i += 1
})
return images
},
fromJSON: function(data){
return new this().loadJSON(data)
},
@ -324,6 +349,7 @@ module.ImagesPrototype = {
var url = img_data.path
var preview_size = 'Original'
var p = Infinity
var previews = img_data.preview || {}
for(var k in img_data.preview){
s = parseInt(k)

2
ui (gen4)/nw.js
View File

@ -20,7 +20,7 @@ var browser = require('browser')
//var data = require('data')
window.toggleFullscreenMode =
module.toggleFullscreenMode = makeCSSClassToggler(
module.toggleFullscreenMode = CSSClassToggler(
document.body,
'.full-screen-mode',
function(action){

9
ui (gen4)/package.json
View File

@ -2,7 +2,6 @@
"name": "ImageGrid.Viewer",
"main": "index.html",
"version": "0.0.1",
"window": {
"title": "ImageGrid.Viewer",
"position": "center",
@ -13,14 +12,12 @@
"frame": false,
"toolbar": false
},
"webkit": {
"page-cache": true
},
"dependencies": {
"requirejs": "*",
"fs.extra": "*"
"fs.extra": "*",
"glob": "^4.0.6",
"requirejs": "*"
}
}

36
ui (gen4)/viewer.js
View File

@ -197,8 +197,8 @@ actions.Actions({
//
load: [
function(d){
this.data = data.Data(d.data)
this.images = images.Images(d.images)
this.data = data.Data(d.data)
}],
clear: [
function(){
@ -206,6 +206,13 @@ actions.Actions({
delete this.Images
}],
// XXX should this be here???
loadURLs: ['Load a URL list',
function(lst){
this.images = images.Images.fromArray(lst)
this.data = data.Data.fromArray(Object.keys(this.images))
}],
// basic navigation...
//
@ -523,22 +530,17 @@ actions.Actions(Client, {
load: [
function(data){
return function(){
// recycle the viewer if one is not given specifically...
var viewer = data.viewer
viewer = viewer == null && this.ribbons != null
? this.ribbons.viewer
: viewer
// XXX do we need to recycle the images???
// XXX is keeping ribbons here correct???
if(this.ribbons == null){
this.ribbons = ribbons.Ribbons(viewer, data.images)
}
return function(){
// XXX do a partial load...
// XXX
this.reload()
}
}],
@ -567,12 +569,28 @@ actions.Actions(Client, {
}
}],
clear: [
// XXX do we need to delete the ribbons???
function(){ this.ribbons.clear() }],
loadURLs: [
function(){
return function(){
// recycle the viewer if one is not given specifically...
var viewer = this.ribbons != null
? this.ribbons.viewer
: viewer
if(this.ribbons == null){
this.ribbons = ribbons.Ribbons(viewer, data.images)
} else {
this.ribbons.clear()
delete this.ribbons
}
this.reload()
}
}],
// XXX move this to a viewer window action set
close: ['Cloase viewer',
function(){