flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-11-02 20:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed a bug with .newGID(..)...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2015-11-14 20:51:22 +03:00
parent d727691977
commit 73b52b347c
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui (gen4)/data.js
View File

@ -308,20 +308,28 @@ var DataPrototype = {
// //
// If no arguments are given then a unique gid will be generated. // If no arguments are given then a unique gid will be generated.
// //
// XXX revise...
newGid: function(str, nohash){ newGid: function(str, nohash){
var p = location.hostname + '-' // prevent same gids from ever being created...
// NOTE: this is here in case we are generating new gids fast
// enough that Date.now() produces identical results for 2+
// consecutive calls...
var t = module.__gid_ticker = (module.__gid_ticker || 0) + 1
var p = typeof(location) != 'undefined' ? location.hostname : ''
// if we are on node.js add process pid // if we are on node.js add process pid
if(typeof(process) != 'undefined'){ if(typeof(process) != 'undefined'){
p += process.pid + '-' p += process.pid
} }
// return string as-is... // return string as-is...
if(nohash){ if(nohash){
return str || p+Date.now() return str || p+'-'+t+'-'+Date.now()
} }
// make a hash... // make a hash...
var gid = hash(str || (p+Date.now())) var gid = hash(str || (p+'-'+t+'-'+Date.now()))
// for explicit string return the hash as-is... // for explicit string return the hash as-is...
if(str != null){ if(str != null){
@ -331,7 +339,7 @@ var DataPrototype = {
// check that the gid is unique... // check that the gid is unique...
while(this.ribbon_order.indexOf(gid) >= 0 while(this.ribbon_order.indexOf(gid) >= 0
|| this.order.indexOf(gid) >= 0){ || this.order.indexOf(gid) >= 0){
gid = hash(p+Date.now()) gid = hash(p+'-'+t+'-'+Date.now())
} }
return gid return gid

2
ui (gen4)/formats.js
View File

@ -44,7 +44,7 @@ function(data, cmp){
res.data.current = data.position res.data.current = data.position
// ribbons and images... // ribbons and images...
$.each(data.ribbons, function(i, input_images){ data.ribbons.forEach(function(input_images, i){
var ribbon = [] var ribbon = []
ribbons.push(ribbon) ribbons.push(ribbon)
for(var id in input_images){ for(var id in input_images){

6
ui (gen4)/viewer.js
View File

@ -2906,9 +2906,13 @@ var FileSystemLoaderActions = actions.Actions({
loadPath: ['File/', loadPath: ['File/',
function(path){ function(path){
var that = this var that = this
// XXX does not appear to load correctly...
// XXX this will not work for explicit path (path to a dir
// that contains the index)
file.loadIndex(path) file.loadIndex(path)
.done(function(res){ .done(function(res){
// XXX if res is empty load raw...
// XXX res may contain multiple indexes, need to // XXX res may contain multiple indexes, need to
// combine them... // combine them...
var k = Object.keys(res)[0] var k = Object.keys(res)[0]