diff --git a/view/assets/css/main.css b/view/assets/css/main.css
index 43e178e..94acbfe 100644
--- a/view/assets/css/main.css
+++ b/view/assets/css/main.css
@@ -328,7 +328,7 @@ ul.rig.columns-4 li {
.box-panel-option {
max-width: 100%;
border-radius: 5px;
- border: 3px solid rgb(128, 168, 210);
+ border: 3px solid #80A8D2;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@@ -340,6 +340,10 @@ ul.rig.columns-4 li {
border-color: #9678b0;
}
+.box-panel-option[select=false] {
+ border-color: #80A8D2;
+}
+
/* Facial Expression Configuration */
#facial-expression {
display: none;
@@ -383,6 +387,14 @@ ul.rig.columns-4 li {
border-radius: 5px;
}
+.subconfiguration-options .icon_container[active=false] {
+ display: none;
+}
+
+.subconfiguration-options .icon_container[active=true] {
+ display: inline-block;
+}
+
.subconfiguration-options .icon_container {
display: inline-block;
padding-left: 8px;
diff --git a/view/assets/js/articulation.js b/view/assets/js/articulation.js
index a71f4fb..9f501a4 100644
--- a/view/assets/js/articulation.js
+++ b/view/assets/js/articulation.js
@@ -13,7 +13,7 @@
function _setupModuleZ(hand) {
if (typeof selectedY == 'undefined' || selectedY == '') return;
- var base_id = '.selection-panel-body[mainConfig=right-hand][subConfig=articulacao][step=2]';
+ var base_id = '.selection-panel-body[mainConfig=' + hand + '][subConfig=articulacao][step=2]';
var articulation_z = base_id + ' .module-z';
$(articulation_z + ' .ball-selector').hide();
$(articulation_z + ' .row-number-' + selectedY + ' .ball-selector').show();
@@ -26,7 +26,7 @@
}
function _setupBallSelectorXY(hand) {
- var base_id = '.selection-panel-body[mainConfig=right-hand][subConfig=articulacao][step=1]';
+ var base_id = '.selection-panel-body[mainConfig=' + hand + '][subConfig=articulacao][step=1]';
var articulation_x_y = base_id + ' .module-x-y';
$(articulation_x_y + ' .ball-selector').off('click').on('click', function(a) {
var b = $(a.target);
@@ -42,13 +42,13 @@
selectedY = g;
_setupModuleZ(hand);
- wikilibras.updateTempParameterJSON('right-hand', 'articulacao', '1', f + ';' + g);
+ wikilibras.updateTempParameterJSON(hand, 'articulacao', '1', f + ';' + g);
dynworkflow.userSelectedAnOption();
});
}
function _setupBallSelectorZ(hand) {
- var base_id = '.selection-panel-body[mainConfig=right-hand][subConfig=articulacao][step=2]';
+ var base_id = '.selection-panel-body[mainConfig=' + hand + '][subConfig=articulacao][step=2]';
var articulation_z = base_id + ' .module-z';
$(articulation_z + ' .ball-selector').off('click').on('click', function(a) {
var b = $(a.target);
@@ -61,7 +61,7 @@
h = b.attr('data-z');
b.attr('data-z') && e.attr('data-z', h), _updateASelector(articulation_z, b);
- wikilibras.updateTempParameterJSON('right-hand', 'articulacao', '2', h);
+ wikilibras.updateTempParameterJSON(hand, 'articulacao', '2', h);
dynworkflow.userSelectedAnOption();
});
}
@@ -91,18 +91,15 @@
return _calculateArticulationPointIndex(hand, xValue, yValue, zValue);
};
- articulation.setupModuleXY = function(serverhost) {
+ articulation.setupModuleXY = function(serverhost, hand) {
server_host = serverhost;
- _setupBallSelectorXY('right-hand');
- _setupBallSelectorXY('left-hand');
+ _setupBallSelectorXY(hand);
};
- articulation.setupModuleZ = function(serverhost) {
+ articulation.setupModuleZ = function(serverhost, hand) {
server_host = serverhost;
- _setupBallSelectorZ('right-hand');
- _setupBallSelectorZ('left-hand');
- _setupModuleZ('right-hand');
- _setupModuleZ('left-hand');
+ _setupBallSelectorZ(hand);
+ _setupModuleZ(hand);
};
}(window.articulation = window.articulation || {}, jQuery));
diff --git a/view/assets/js/configuration.js b/view/assets/js/configuration.js
index bb772af..70e257a 100644
--- a/view/assets/js/configuration.js
+++ b/view/assets/js/configuration.js
@@ -1,7 +1,7 @@
(function(configuration, $, undefined) {
- configuration.setupFingersGroup = function() {
- var baseId = '.selection-panel-body[mainConfig=right-hand][subConfig=configuracao][step=1]';
+ configuration.setupFingersGroup = function(hand) {
+ var baseId = '.selection-panel-body[mainConfig=' + hand + '][subConfig=configuracao][step=1]';
$(baseId + ' .selection-panel-option'
).off('click').on('click', function() {
wikilibras.selectAnOption(baseId, this);
@@ -9,15 +9,15 @@
});
};
- configuration.setupFingersPosition = function() {
- var stepTwoBaseId = '.selection-panel-body[mainConfig=right-hand][subConfig=configuracao][step=2]';
+ configuration.setupFingersPosition = function(hand) {
+ var stepTwoBaseId = '.selection-panel-body[mainConfig=' + hand + '][subConfig=configuracao][step=2]';
$(stepTwoBaseId + ' .selection-panel-option').off('click').on(
'click', function() {
wikilibras.selectAnOption(stepTwoBaseId, this);
dynworkflow.userSelectedAnOption();
});
- var stepOneBaseId = '.selection-panel-body[mainConfig=right-hand][subConfig=configuracao][step=1]';
+ var stepOneBaseId = '.selection-panel-body[mainConfig=' + hand + '][subConfig=configuracao][step=1]';
var finger_group = $(stepOneBaseId + ' .selection-panel-option[select=true]').attr('value');
finger_group = typeof finger_group == 'undefined' ? '0' : finger_group;
$(stepTwoBaseId + ' .finger-group').hide();
diff --git a/view/assets/js/dynamic-loading-engine.js b/view/assets/js/dynamic-loading-engine.js
index b60ca9c..9a4697c 100644
--- a/view/assets/js/dynamic-loading-engine.js
+++ b/view/assets/js/dynamic-loading-engine.js
@@ -3,30 +3,30 @@
_preprocessHtml = function(data, url) {
var matchSubConfig = data.match(/sub(?:C|c)onfig="(.*?)"/);
+ var currentMainConfig = dynworkflow.getMainConfig(); // right-hand or left-hand
var goodData = data;
var isRightHand = function(hand) {
return hand === 'right-hand';
};
-
- if (matchMainConfig && matchSubConfig) { // case defined
+
+ if (matchSubConfig) { // case defined
// There is no specific(right or left hand dependent) assets for: articulacao, duracao, expressao, movimento, transicao
// Specific configurations: configuracao, orientacao
// possible values on the side as comment
- var hand = dynworkflow.getMainConfig(); // right-hand or left-hand
var subConfig = matchSubConfig[1]; // articulacao | configuracao | duracao | expressao | movimento | orientacao | transicao
// possible subconfigs that need changing
switch (subConfig) {
case 'configuracao':
- if (isRightHand(hand)) {
+ if (isRightHand(currentMainConfig)) {
goodData = data.replace(/{{ configuracao }}/g, 'cmd');
} else {
goodData = data.replace(/{{ configuracao }}/g, 'cme');
}
break;
case 'orientacao':
- if (isRightHand(hand)) {
+ if (isRightHand(currentMainConfig)) {
goodData = data.replace(/{{ orientacao }}/g, 'ord');
} else {
goodData = data.replace(/{{ orientacao }}/g, 'ore');
@@ -35,10 +35,9 @@
default:
console.log('No subConfig found');
}
-
- // change {{ hand }}
- goodData = data.replace(/{{ hand }}/g, hand);
}
+ // change {{ hand }}
+ goodData = goodData.replace(/{{ hand }}/g, currentMainConfig);
return goodData.replace(/{{ server }}/g, url);
};
diff --git a/view/assets/js/dynamic-selection-workflow.js b/view/assets/js/dynamic-selection-workflow.js
index a7fca38..c47ae0a 100644
--- a/view/assets/js/dynamic-selection-workflow.js
+++ b/view/assets/js/dynamic-selection-workflow.js
@@ -198,13 +198,15 @@
}
function _setupTimelineIcons(timelineBaseId) {
- $(timelineBaseId + ' .icon_container[json_name]').hide();
+ $(timelineBaseId + ' .icon_container[json_name]').attr("active", "false");
for (var name in currentSubconfigParent) {
- $(timelineBaseId + ' .icon_container[json_name=' + name + ']').show();
+ //$(timelineBaseId + ' .icon_container[json_name=' + name + ']').show();
+ $(timelineBaseId + ' .icon_container[json_name]').attr("active", "true");
}
+
if (preprocessedMainConfig == 'hand') {
- $(timelineBaseId + ' .icon_container[json_name=movimento]').show();
+ $(timelineBaseId + ' .icon_container[json_name=movimento]').attr("active", "true");
_setupCheckIcon(mainConfig, 'movimento');
_selectTimelineIcon(mainConfig, currentSubConfigName);
}
@@ -267,7 +269,7 @@
dynworkflow.getMovementParameters = function(movementName) {
return _getAttributes(jsonWF['hand']['movimento'][movementName]);
};
-
+
dynworkflow.getMainConfig = function() {
return mainConfig;
};
diff --git a/view/assets/js/facial.js b/view/assets/js/facial.js
index deec391..8a2b15c 100644
--- a/view/assets/js/facial.js
+++ b/view/assets/js/facial.js
@@ -1,7 +1,7 @@
(function(facial, $, undefined) {
- facial.setup = function() {
- var baseId = '.selection-panel-body[mainConfig=facial]';
+ facial.setup = function(subConfig) {
+ var baseId = '.selection-panel-body[mainConfig=facial][subConfig=' + subConfig + ']';
$(baseId + ' .selection-panel-option').off('click').on(
'click', function() {
wikilibras.selectAnOption(baseId, this);
diff --git a/view/assets/js/movement.js b/view/assets/js/movement.js
index 1252f72..8dfffa5 100644
--- a/view/assets/js/movement.js
+++ b/view/assets/js/movement.js
@@ -5,8 +5,8 @@
'][subConfig=movimento][step=1] .selection-panel-option[select=true]').attr('value');
};
- movement.setup = function(serverhost) {
- var baseId = '.selection-panel-body[mainConfig=right-hand][subConfig=movimento][step=1]';
+ movement.setup = function(serverhost, hand) {
+ var baseId = '.selection-panel-body[mainConfig=' + hand + '][subConfig=movimento][step=1]';
$(baseId + ' .selection-panel-option').off('click').on(
'click', function() {
wikilibras.selectAnOption(baseId, this);
diff --git a/view/assets/js/orientation.js b/view/assets/js/orientation.js
index 17b919c..fc57365 100644
--- a/view/assets/js/orientation.js
+++ b/view/assets/js/orientation.js
@@ -1,7 +1,7 @@
(function(orientation, $, undefined) {
- orientation.setup = function() {
- var baseId = '.selection-panel-body[mainConfig=right-hand][subConfig=orientacao][step=1]';
+ orientation.setup = function(hand) {
+ var baseId = '.selection-panel-body[mainConfig=' + hand + '][subConfig=orientacao][step=1]';
$(baseId + ' .selection-panel-option').off('click').on(
'click', function() {
wikilibras.selectAnOption(baseId, this);
diff --git a/view/assets/js/tmpJSONParser.js b/view/assets/js/tmpJSONParser.js
index 60def4d..8c82aff 100644
--- a/view/assets/js/tmpJSONParser.js
+++ b/view/assets/js/tmpJSONParser.js
@@ -66,6 +66,7 @@
_setupBaseParameterJSON(tmpJSON);
_parseTempFacialParameterJSON(tmpJSON);
_parseTempMovementParameterJSON(tmpJSON, 'right-hand');
+ _parseTempMovementParameterJSON(tmpJSON, 'left-hand');
return base_parameter_json;
};
diff --git a/view/assets/js/wikilibras.js b/view/assets/js/wikilibras.js
index 11ec70f..d3259a9 100644
--- a/view/assets/js/wikilibras.js
+++ b/view/assets/js/wikilibras.js
@@ -80,9 +80,9 @@
function _isConfigurationComplete(config) {
var baseId = '.subconfiguration-panel[mainConfig=' + config + ']';
- var total_config = $(baseId + ' .icon_container[json_name]:visible').length;
+ var total_config = $(baseId + ' .icon_container[json_name][active=true]').length;
var completed_config = $(baseId + ' .icon_container[complete=true]').length;
- return total_config == completed_config;
+ return completed_config != 0 && total_config == completed_config;
}
function _canHover(el) {
@@ -256,8 +256,7 @@
}
function _selectAnOption(parentId, el) {
- $(parentId + ' .selection-panel-option[select=true]').removeAttr(
- 'select');
+ $(parentId + ' .selection-panel-option[select=true]').attr('select', false);
$(el).attr('select', true);
var mainConfig = $(parentId).attr('mainConfig');
diff --git a/view/facial/duracao/passo-1.html b/view/facial/duracao/passo-1.html
index 6d519f9..c9e1550 100644
--- a/view/facial/duracao/passo-1.html
+++ b/view/facial/duracao/passo-1.html
@@ -34,5 +34,5 @@
\ No newline at end of file
diff --git a/view/facial/expressao/passo-1.html b/view/facial/expressao/passo-1.html
index 60d7bc9..849b3d4 100644
--- a/view/facial/expressao/passo-1.html
+++ b/view/facial/expressao/passo-1.html
@@ -50,5 +50,5 @@
\ No newline at end of file
diff --git a/view/facial/transicao/passo-1.html b/view/facial/transicao/passo-1.html
index a073250..456e6b2 100644
--- a/view/facial/transicao/passo-1.html
+++ b/view/facial/transicao/passo-1.html
@@ -35,5 +35,5 @@
\ No newline at end of file
--
libgit2 0.21.2