eessppeelllloo/image-sequencer
1
0
Fork 0
mirror of https://github.com/publiclab/image-sequencer.git synced 2025-12-13 03:40:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merging publiclab:master in

Browse Source
This commit is contained in:
Chinmay Pandhare
2017-03-15 08:16:04 +05:30
parent 8765f37b61 cd19a17595
commit 99e8f102c2
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dist/image-sequencer.js vendored
View File

@@ -184151,7 +184151,10 @@ ImageSequencer = function ImageSequencer(options) {
options = options || {};
options.inBrowser = options.inBrowser || typeof window !== 'undefined';
if (options.inBrowser) options.ui = options.ui || require('./UserInterface');
<<<<<<< HEAD
options.sequencer_counter = 0;
=======
>>>>>>> master
var image,
steps = [],

5
src/ImageSequencer.js
View File

@@ -5,7 +5,7 @@ ImageSequencer = function ImageSequencer(options) {
options = options || {};
options.inBrowser = options.inBrowser || typeof window !== 'undefined';
if (options.inBrowser) options.ui = options.ui || require('./UserInterface');
options.sequencer_counter = 0;
options.sequencerCounter = 0;
var image,
steps = [],
@@ -25,7 +25,7 @@ ImageSequencer = function ImageSequencer(options) {
options.instanceName = variable;
o = o || {};
o.id = options.sequencer_counter++; //Gives a Unique ID to each step
o.id = options.sequencerCounter++; //Gives a Unique ID to each step
o.name = o.name || name;
o.selector = o.selector || 'ismod-' + name;
o.container = o.container || options.selector;
@@ -106,7 +106,6 @@ ImageSequencer = function ImageSequencer(options) {
// load default starting image
// i.e. from parameter
// this could send the image to ImageSelect, or something?
// not currently working
function loadImage(src, callback) {
if (!(options.instanceName) && this != window)
for(var variable in window)