Skip to content

Commit

Permalink
Fix choose file option and insert step functionality (#712)
Browse files Browse the repository at this point in the history
* Fix choose file option

* changes
  • Loading branch information
Mridul97 authored and jywarren committed Feb 5, 2019
1 parent 57e4849 commit 6b305a0
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
13 changes: 8 additions & 5 deletions dist/image-sequencer-ui.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
var defaultHtmlSequencerUi = require('./lib/defaultHtmlSequencerUi.js'),
setupCache = require('./lib/cache.js'),
intermediateHtmlStepUi = require('./lib/intermediateHtmlStepUi.js'),
DefaultHtmlStepUi = require('./lib/defaultHtmlStepUi.js'),
urlHash = require('./lib/urlHash.js'),
insertPreview = require('./lib/insertPreview.js');
Expand Down Expand Up @@ -187,7 +188,7 @@ window.onload = function() {
onLoad: function onFileReaderLoad(progress) {
var reader = progress.target;
var step = sequencer.images.image1.steps[0];
var util=IntermediateHtmlStepUi(sequencer);
var util= intermediateHtmlStepUi(sequencer);
step.output.src = reader.result;
sequencer.run({ index: 0 });
step.options.step.imgElement.src = reader.result;
Expand All @@ -210,7 +211,7 @@ window.onload = function() {
insertPreview.updatePreviews("images/tulips.png",'addStep');
}
};
},{"./lib/cache.js":2,"./lib/defaultHtmlSequencerUi.js":3,"./lib/defaultHtmlStepUi.js":4,"./lib/insertPreview.js":5,"./lib/urlHash.js":7}],2:[function(require,module,exports){
},{"./lib/cache.js":2,"./lib/defaultHtmlSequencerUi.js":3,"./lib/defaultHtmlStepUi.js":4,"./lib/insertPreview.js":5,"./lib/intermediateHtmlStepUi.js":6,"./lib/urlHash.js":7}],2:[function(require,module,exports){
var setupCache = function() {
if ('serviceWorker' in navigator) {
navigator.serviceWorker.register('sw.js', { scope: '/examples/' })
Expand Down Expand Up @@ -716,7 +717,9 @@ module.exports = {
updatePreviews : updatePreviews
}
},{}],6:[function(require,module,exports){
var urlHash = require('./urlHash.js');
var urlHash = require('./urlHash.js'),
insertPreview = require('./insertPreview.js');

function IntermediateHtmlStepUi(_sequencer, step, options) {
function stepUI() {
return '<div class="row insertDiv">\
Expand Down Expand Up @@ -786,7 +789,7 @@ function IntermediateHtmlStepUi(_sequencer, step, options) {
.insertAdjacentElement('afterend',
addStepUI
);
updatePreviews(step.output,'insertStep');
insertPreview.updatePreviews(step.output,'insertStep');
var insertStepSelect = $("#insertStep select");
insertStepSelect.html("");
// Add modules to the insertStep dropdown
Expand Down Expand Up @@ -842,7 +845,7 @@ function IntermediateHtmlStepUi(_sequencer, step, options) {
module.exports = IntermediateHtmlStepUi;


},{"./urlHash.js":7}],7:[function(require,module,exports){
},{"./insertPreview.js":5,"./urlHash.js":7}],7:[function(require,module,exports){
function getUrlHashParameter(param) {

var params = getUrlHashParameters();
Expand Down
6 changes: 1 addition & 5 deletions dist/image-sequencer-ui.min.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion examples/demo.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
var defaultHtmlSequencerUi = require('./lib/defaultHtmlSequencerUi.js'),
setupCache = require('./lib/cache.js'),
intermediateHtmlStepUi = require('./lib/intermediateHtmlStepUi.js'),
DefaultHtmlStepUi = require('./lib/defaultHtmlStepUi.js'),
urlHash = require('./lib/urlHash.js'),
insertPreview = require('./lib/insertPreview.js');
Expand Down Expand Up @@ -186,7 +187,7 @@ window.onload = function() {
onLoad: function onFileReaderLoad(progress) {
var reader = progress.target;
var step = sequencer.images.image1.steps[0];
var util=IntermediateHtmlStepUi(sequencer);
var util= intermediateHtmlStepUi(sequencer);
step.output.src = reader.result;
sequencer.run({ index: 0 });
step.options.step.imgElement.src = reader.result;
Expand Down
6 changes: 4 additions & 2 deletions examples/lib/intermediateHtmlStepUi.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var urlHash = require('./urlHash.js');
var urlHash = require('./urlHash.js'),
insertPreview = require('./insertPreview.js');

function IntermediateHtmlStepUi(_sequencer, step, options) {
function stepUI() {
return '<div class="row insertDiv">\
Expand Down Expand Up @@ -68,7 +70,7 @@ function IntermediateHtmlStepUi(_sequencer, step, options) {
.insertAdjacentElement('afterend',
addStepUI
);
updatePreviews(step.output,'insertStep');
insertPreview.updatePreviews(step.output,'insertStep');
var insertStepSelect = $("#insertStep select");
insertStepSelect.html("");
// Add modules to the insertStep dropdown
Expand Down

0 comments on commit 6b305a0

Please sign in to comment.