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

reduce redundance of add and insert fixes #261 (#295)

Browse Source 
Signed-off-by: tech4GT <varun.gupta1798@gmail.com>
This commit is contained in:
Varun Gupta
2018-06-22 00:45:09 +05:30
committed by Jeffrey Warren
parent 8d6b82d988
commit 510cf3421a
4 changed files with 28 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
dist/image-sequencer.js vendored
View File

@@ -47261,49 +47261,12 @@ arguments[4][38][0].apply(exports,arguments)
arguments[4][39][0].apply(exports,arguments)
},{"./support/isBuffer":133,"_process":97,"dup":39,"inherits":56}],135:[function(require,module,exports){
// add steps to the sequencer
// TODO: reduce redundancy with InsertStep; this should be a specific usage of InsertStep at the final position
function AddStep(_sequencer, image, name, o) {
function addStep(image, name, o_) {
if (_sequencer.modules[name]) var moduleInfo = _sequencer.modules[name][1];
else console.log('Module ' + name + ' not found.');
var o = _sequencer.copy(o_);
o.number = _sequencer.options.sequencerCounter++; // gives a unique ID to each step
o.name = o_.name || name || moduleInfo.name;
o.description = o_.description || moduleInfo.description;
o.selector = o_.selector || 'ismod-' + name;
o.container = o_.container || _sequencer.options.selector;
o.image = image;
o.inBrowser = _sequencer.options.inBrowser;
o.step = {
name: o.name,
description: o.description,
ID: o.number,
imageName: o.image,
inBrowser: _sequencer.options.inBrowser,
ui: _sequencer.options.ui,
options: o
};
var UI = _sequencer.events;
// Tell UI that a step has been set up.
o = o || {};
UI.onSetup(o.step);
var module = _sequencer.modules[name][0](o, UI);
_sequencer.images[image].steps.push(module);
return true;
}
addStep(image, name, o);
_sequencer.steps = _sequencer.images[image].steps;
return require('./InsertStep')(_sequencer,image,-1,name,o);
}
module.exports = AddStep;
},{}],136:[function(require,module,exports){
},{"./InsertStep":139}],136:[function(require,module,exports){
var fs = require('fs');
var getDirectories = function(rootDir, cb) {
fs.readdir(rootDir, function(err, files) {
@@ -47872,19 +47835,23 @@ const getStepUtils = require('./util/getStep.js');
function InsertStep(ref, image, index, name, o) {
function insertStep(image, index, name, o_) {
if (ref.modules[name]) var moduleInfo = ref.modules[name][1];
else console.log('Module ' + name + ' not found.');
var o = ref.copy(o_);
o.number = ref.options.sequencerCounter++; //Gives a Unique ID to each step
o.name = o_.name || name;
o.name = o_.name || name || moduleInfo.name;
o.description = o_.description || moduleInfo.description;
o.selector = o_.selector || 'ismod-' + name;
o.container = o_.container || ref.options.selector;
o.image = image;
o.inBrowser = ref.options.inBrowser;
if (index == -1) index = ref.images[image].steps.length;
o.step = {
name: o.name,
description: o.description,
url: o.url,
ID: o.number,
imageName: o.image,
inBrowser: ref.options.inBrowser,
@@ -47892,6 +47859,10 @@ function InsertStep(ref, image, index, name, o) {
options: o
};
var UI = ref.events;
// Tell UI that a step has been set up.
o = o || {};
UI.onSetup(o.step);
var module = ref.modules[name][0](o, UI);
ref.images[image].steps.splice(index, 0, module);
@@ -47899,6 +47870,8 @@ function InsertStep(ref, image, index, name, o) {
}
insertStep(image, index, name, o);
ref.steps = ref.images[image].steps;
}
module.exports = InsertStep;

2
dist/image-sequencer.min.js vendored
View File

File diff suppressed because one or more lines are too long

39
src/AddStep.js
View File

@@ -1,42 +1,5 @@
// add steps to the sequencer
// TODO: reduce redundancy with InsertStep; this should be a specific usage of InsertStep at the final position
function AddStep(_sequencer, image, name, o) {
function addStep(image, name, o_) {
if (_sequencer.modules[name]) var moduleInfo = _sequencer.modules[name][1];
else console.log('Module ' + name + ' not found.');
var o = _sequencer.copy(o_);
o.number = _sequencer.options.sequencerCounter++; // gives a unique ID to each step
o.name = o_.name || name || moduleInfo.name;
o.description = o_.description || moduleInfo.description;
o.selector = o_.selector || 'ismod-' + name;
o.container = o_.container || _sequencer.options.selector;
o.image = image;
o.inBrowser = _sequencer.options.inBrowser;
o.step = {
name: o.name,
description: o.description,
ID: o.number,
imageName: o.image,
inBrowser: _sequencer.options.inBrowser,
ui: _sequencer.options.ui,
options: o
};
var UI = _sequencer.events;
// Tell UI that a step has been set up.
o = o || {};
UI.onSetup(o.step);
var module = _sequencer.modules[name][0](o, UI);
_sequencer.images[image].steps.push(module);
return true;
}
addStep(image, name, o);
_sequencer.steps = _sequencer.images[image].steps;
return require('./InsertStep')(_sequencer,image,-1,name,o);
}
module.exports = AddStep;

14
src/InsertStep.js
View File

@@ -4,19 +4,23 @@ const getStepUtils = require('./util/getStep.js');
function InsertStep(ref, image, index, name, o) {
function insertStep(image, index, name, o_) {
if (ref.modules[name]) var moduleInfo = ref.modules[name][1];
else console.log('Module ' + name + ' not found.');
var o = ref.copy(o_);
o.number = ref.options.sequencerCounter++; //Gives a Unique ID to each step
o.name = o_.name || name;
o.name = o_.name || name || moduleInfo.name;
o.description = o_.description || moduleInfo.description;
o.selector = o_.selector || 'ismod-' + name;
o.container = o_.container || ref.options.selector;
o.image = image;
o.inBrowser = ref.options.inBrowser;
if (index == -1) index = ref.images[image].steps.length;
o.step = {
name: o.name,
description: o.description,
url: o.url,
ID: o.number,
imageName: o.image,
inBrowser: ref.options.inBrowser,
@@ -24,6 +28,10 @@ function InsertStep(ref, image, index, name, o) {
options: o
};
var UI = ref.events;
// Tell UI that a step has been set up.
o = o || {};
UI.onSetup(o.step);
var module = ref.modules[name][0](o, UI);
ref.images[image].steps.splice(index, 0, module);
@@ -31,5 +39,7 @@ function InsertStep(ref, image, index, name, o) {
}
insertStep(image, index, name, o);
ref.steps = ref.images[image].steps;
}
module.exports = InsertStep;