diff --git a/view/assets/js/dynamic-loading-engine.js b/view/assets/js/dynamic-loading-engine.js index b57cb51..b60ca9c 100644 --- a/view/assets/js/dynamic-loading-engine.js +++ b/view/assets/js/dynamic-loading-engine.js @@ -2,9 +2,9 @@ var setup = undefined; _preprocessHtml = function(data, url) { - var matchMainConfig = data.match(/main(?:C|c)onfig="(.*?)"/); var matchSubConfig = data.match(/sub(?:C|c)onfig="(.*?)"/); var goodData = data; + var isRightHand = function(hand) { return hand === 'right-hand'; }; @@ -13,19 +13,20 @@ // 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 mainConfig = matchMainConfig[1]; // right-hand or left-hand + 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(mainConfig)) { + if (isRightHand(hand)) { goodData = data.replace(/{{ configuracao }}/g, 'cmd'); } else { goodData = data.replace(/{{ configuracao }}/g, 'cme'); } break; case 'orientacao': - if (isRightHand(mainConfig)) { + if (isRightHand(hand)) { goodData = data.replace(/{{ orientacao }}/g, 'ord'); } else { goodData = data.replace(/{{ orientacao }}/g, 'ore'); @@ -34,6 +35,9 @@ default: console.log('No subConfig found'); } + + // change {{ hand }} + goodData = data.replace(/{{ hand }}/g, hand); } 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 5309bd9..a7fca38 100644 --- a/view/assets/js/dynamic-selection-workflow.js +++ b/view/assets/js/dynamic-selection-workflow.js @@ -268,6 +268,10 @@ return _getAttributes(jsonWF['hand']['movimento'][movementName]); }; + dynworkflow.getMainConfig = function() { + return mainConfig; + }; + dynworkflow.load = function() { baseUrl = $('#server-url').data('url'); $.get(baseUrl + '/conf/selection-workflow-json', function(result) { diff --git a/view/hand/articulacao/passo-1.html b/view/hand/articulacao/passo-1.html index 25e8460..edcb1a4 100644 --- a/view/hand/articulacao/passo-1.html +++ b/view/hand/articulacao/passo-1.html @@ -1,75 +1,75 @@ -
-
- Onde é feito o sinal? -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ Onde é feito o sinal? +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file + articulation.setupModuleXY("{{ server }}", "{{ hand }}"); + diff --git a/view/hand/articulacao/passo-2.html b/view/hand/articulacao/passo-2.html index 367fc9e..e60bd74 100644 --- a/view/hand/articulacao/passo-2.html +++ b/view/hand/articulacao/passo-2.html @@ -1,37 +1,37 @@ -
-
- Escolha a distância entre a mão e o corpo -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ Escolha a distância entre a mão e o corpo +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file + articulation.setupModuleZ("{{ server }}", "{{ hand }}"); + diff --git a/view/hand/configuracao/passo-1.html b/view/hand/configuracao/passo-1.html index 5927759..c1fb390 100644 --- a/view/hand/configuracao/passo-1.html +++ b/view/hand/configuracao/passo-1.html @@ -1,4 +1,4 @@ -
+
Escolha a posição mais parecida dos dedos
@@ -26,5 +26,5 @@
diff --git a/view/hand/configuracao/passo-2.html b/view/hand/configuracao/passo-2.html index 6be432b..5a72143 100644 --- a/view/hand/configuracao/passo-2.html +++ b/view/hand/configuracao/passo-2.html @@ -1,4 +1,4 @@ -
+
Escolha a posição dos dedos
@@ -210,5 +210,5 @@
diff --git a/view/hand/movimento/passo-1.html b/view/hand/movimento/passo-1.html index 086184e..7ac5034 100644 --- a/view/hand/movimento/passo-1.html +++ b/view/hand/movimento/passo-1.html @@ -1,34 +1,34 @@ -
-
- Escolha o movimento mais parecido -
-
-
    -
  • Pontual
    • - -
-
+
+
+ Escolha o movimento mais parecido +
+
+
    +
  • Pontual
    • + +
+
diff --git a/view/hand/orientacao/passo-1.html b/view/hand/orientacao/passo-1.html index 7cd8c08..ef57cdf 100644 --- a/view/hand/orientacao/passo-1.html +++ b/view/hand/orientacao/passo-1.html @@ -1,4 +1,4 @@ -
+
Palma da mão
@@ -32,5 +32,5 @@
diff --git a/view/hand/timeline.html b/view/hand/timeline.html index af23963..5dfb2c1 100644 --- a/view/hand/timeline.html +++ b/view/hand/timeline.html @@ -1,27 +1,27 @@ -
-
- -
+
+
+ +
-
-
- -
-
- -
-
- -
-
- -
-
+
+
+ +
+
+ +
+
+ +
+
+ +
+
-
- -
+
+ +
-- libgit2 0.21.2