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

Temporary fix for insert-step btn not working (#1131)

Browse Source 
* Temporary fix for insert-step btn not working

* Bump to v3.5.1
This commit is contained in:
Slytherin
2019-06-26 05:58:10 +05:30
committed by Jeffrey Warren
parent 257113a948
commit 2c58edfe9a
2 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
examples/lib/intermediateHtmlStepUi.js
View File

@@ -66,20 +66,28 @@ function IntermediateHtmlStepUi(_sequencer, step, options) {
function selectNewStepUi() { function selectNewStepUi() {
var insertSelect = $step('.insert-step-select'); //var insertSelect = $step('.insert-step-select');
var insertSelect = $(step.ui.querySelector('.insert-step-select'));
var m = insertSelect.val(); var m = insertSelect.val();
$step('.insertDiv .info').html(_sequencer.modulesInfo(m).description); // $step('.insertDiv .info').html(_sequencer.modulesInfo(m).description);
$step('.insertDiv .add-step-btn').prop('disabled', false); // $step('.insertDiv .add-step-btn').prop('disabled', false);
$(step.ui.querySelector('.insertDiv .info').html(_sequencer.modulesInfo(m).description));
$(step.ui.querySelector('.insertDiv .add-step-btn').prop('disabled', false));
} }
var toggleDiv = function(callback = function(){}){ var toggleDiv = function(callback = function(){}){
$step('.insertDiv').collapse('toggle'); /*$step('.insertDiv').collapse('toggle');
if ($step('.insert-text').css('display') != 'none'){ if ($step('.insert-text').css('display') != 'none'){
$step('.insert-text').fadeToggle(200, function(){$step('.no-insert-text').fadeToggle(200, callback)}); $step('.insert-text').fadeToggle(200, function(){$step('.no-insert-text').fadeToggle(200, callback)});*/
$(step.ui.querySelector('.insertDiv')).collapse('toggle');
if ($(step.ui.querySelector('.insert-text')).css('display') != 'none'){
$(step.ui.querySelector('.insert-text')).fadeToggle(200, function(){$(step.ui.querySelector('.no-insert-text')).fadeToggle(200, callback);});
} }
else { else {
$step('.no-insert-text').fadeToggle(200, function(){$step('.insert-text').fadeToggle(200, callback)}); //$step('.no-insert-text').fadeToggle(200, function(){$step('.insert-text').fadeToggle(200, callback)});
$(step.ui.querySelector('.no-insert-text')).fadeToggle(200, function(){$(step.ui.querySelector('.insert-text')).fadeToggle(200, callback);});
} }
}; };
@@ -89,7 +97,8 @@ function IntermediateHtmlStepUi(_sequencer, step, options) {
var addStepUI = stepUI(); var addStepUI = stepUI();
addStepUI = parser.parseFromString(addStepUI, 'text/html').querySelector('div'); addStepUI = parser.parseFromString(addStepUI, 'text/html').querySelector('div');
if ($step('.insertDiv').length > 0){ //if ($step('.insertDiv').length > 0){
if ($(step.ui.querySelector('.insertDiv')).length > 0){
toggleDiv(); toggleDiv();
} }
else { else {
@@ -103,9 +112,14 @@ function IntermediateHtmlStepUi(_sequencer, step, options) {
}); });
} }
$step('.insertDiv .close-insert-box').off('click').on('click', function(){toggleDiv(function(){})}); /*$step('.insertDiv .close-insert-box').off('click').on('click', function(){toggleDiv(function(){})});
var insertStepSelect = $step('.insert-step-select'); var insertStepSelect = $step('.insert-step-select');*/
$(step.ui.querySelector('.insertDiv .close-insert-box')).off('click').on('click', function(){toggleDiv(function(){});});
//var insertStepSelect = $step('.insert-step-select');
var insertStepSelect = $(step.ui.querySelector('.insert-step-select'));
insertStepSelect.html(''); insertStepSelect.html('');
// Add modules to the insertStep dropdown // Add modules to the insertStep dropdown
for (var m in modulesInfo) { for (var m in modulesInfo) {
@@ -117,26 +131,31 @@ function IntermediateHtmlStepUi(_sequencer, step, options) {
insertStepSelect.selectize({ insertStepSelect.selectize({
sortField: 'text' sortField: 'text'
}); });
$step('.inserDiv .add-step-btn').prop('disabled', true); //$step('.inserDiv .add-step-btn').prop('disabled', true);
$(step.ui.querySelector('.inserDiv .add-step-btn')).prop('disabled', true);
insertStepSelect.append('<option value="" disabled selected>Select a Module</option>'); insertStepSelect.append('<option value="" disabled selected>Select a Module</option>');
$step('.insertDiv .radio-group .radio').on('click', function () { //$step('.insertDiv .radio-group .radio').on('click', function () {
$(step.ui.querySelector('.insertDiv .radio-group .radio')).on('click', function () {
$(this).parent().find('.radio').removeClass('selected'); $(this).parent().find('.radio').removeClass('selected');
$(this).addClass('selected'); $(this).addClass('selected');
newStep = $(this).attr('data-value'); newStep = $(this).attr('data-value');
$step('.insert-step-select').val(newStep); //$step('.insert-step-select').val(newStep);
$(step.ui.querySelector('.insert-step-select')).val(newStep);
selectNewStepUi(); selectNewStepUi();
insert(id); insert(id);
$(this).removeClass('selected'); $(this).removeClass('selected');
}); });
insertStepSelect.on('change', selectNewStepUi); insertStepSelect.on('change', selectNewStepUi);
$step('.insertDiv .add-step-btn').on('click', function () { insert(id) }); //$step('.insertDiv .add-step-btn').on('click', function () { insert(id) });
} $(step.ui.querySelector('.insertDiv .add-step-btn')).on('click', function () { insert(id); });
};
function insert(id) { function insert(id) {
options = options || {}; options = options || {};
var insertStepSelect = $step('.insert-step-select'); //var insertStepSelect = $step('.insert-step-select');
var insertStepSelect = $(step.ui.querySelector('.insert-step-select'));
if (insertStepSelect.val() == 'none') return; if (insertStepSelect.val() == 'none') return;
var newStepName = insertStepSelect.val(); var newStepName = insertStepSelect.val();

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "image-sequencer", "name": "image-sequencer",
"version": "3.5.0", "version": "3.5.1",
"description": "A modular JavaScript image manipulation library modeled on a storyboard.", "description": "A modular JavaScript image manipulation library modeled on a storyboard.",
"main": "src/ImageSequencer.js", "main": "src/ImageSequencer.js",
"scripts": { "scripts": {