diff --git a/view/assets/js/dynamic-loading-engine.js b/view/assets/js/dynamic-loading-engine.js index 0a9aaaf..b57cb51 100644 --- a/view/assets/js/dynamic-loading-engine.js +++ b/view/assets/js/dynamic-loading-engine.js @@ -2,7 +2,40 @@ var setup = undefined; _preprocessHtml = function(data, url) { - return data.replace(/{{ server }}/g, 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'; + }; + + if (matchMainConfig && 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 mainConfig = matchMainConfig[1]; // right-hand or left-hand + var subConfig = matchSubConfig[1]; // articulacao | configuracao | duracao | expressao | movimento | orientacao | transicao + + switch (subConfig) { + case 'configuracao': + if (isRightHand(mainConfig)) { + goodData = data.replace(/{{ configuracao }}/g, 'cmd'); + } else { + goodData = data.replace(/{{ configuracao }}/g, 'cme'); + } + break; + case 'orientacao': + if (isRightHand(mainConfig)) { + goodData = data.replace(/{{ orientacao }}/g, 'ord'); + } else { + goodData = data.replace(/{{ orientacao }}/g, 'ore'); + } + break; + default: + console.log('No subConfig found'); + } + } + return goodData.replace(/{{ server }}/g, url); }; dynengine.render = function(serverUrl, templatePath, target, prepend, callback) { @@ -29,25 +62,6 @@ dynengine.load = function() { var url = $('#server-url').data('url'); - $('.config-panel-option[name=right-hand]').bind('click', function() { - console.log('click right hand on panel'); - }); - - /*$('#avatar-body-right-hand').bind('click', function() { - console.log('click avatar hand'); - dynengine.render(url, '/right-hand/movements.html', '#selection-panel', function() { - $('.movimento-pontual').bind('click', function() { - console.log('movimento pontual'); - dynengine.clean('#selection-panel'); - dynengine.render(url, '/right-hand/pontual/passo-1.html', '#selection-panel'); - dynengine.render(url, '/right-hand/pontual/passo-2.html', '#selection-panel'); - dynengine.render(url, '/right-hand/pontual/passo-3.html', '#selection-panel'); - dynengine.render(url, '/right-hand/pontual/timeline.html', '#selection-panel'); - }); - }); - - });*/ - }; }(window.dynengine = window.dynengine || {}, jQuery)); diff --git a/view/hand/configuracao/passo-1.html b/view/hand/configuracao/passo-1.html index b8c5f9b..5927759 100644 --- a/view/hand/configuracao/passo-1.html +++ b/view/hand/configuracao/passo-1.html @@ -1,30 +1,30 @@
-
- Escolha a posição mais parecida dos dedos -
-
- -
+
+ Escolha a posição mais parecida dos dedos +
+
+ +
\ No newline at end of file + configuration.setupFingersGroup(); + diff --git a/view/hand/configuracao/passo-2.html b/view/hand/configuracao/passo-2.html index 78e7737..6be432b 100644 --- a/view/hand/configuracao/passo-2.html +++ b/view/hand/configuracao/passo-2.html @@ -1,214 +1,214 @@
-
- Escolha a posição dos dedos -
-
-
-
    -
  • 1.
    • -
  • 2.
    • -
  • 3.
    • -
  • 4.
    • -
  • 5.
    • -
  • 6.
    • -
  • 7.
    • -
  • 8.
    • -
  • 9.
    • -
  • 10.
    • -
  • 11.
    • -
  • 12.
    • -
  • 13.
    • -
  • 14.
    • -
  • 15.
    • -
  • 16.
    • -
  • 17.
    • -
  • 18.
    • -
  • 19.
    • -
-
-
-
    -
  • 1.
    • -
  • 2.
    • -
  • 3.
    • -
  • 4.
    • -
  • 5.
    • -
  • 6.
    • -
  • 7.
    • -
  • 8.
    • -
-
-
-
    -
  • 1.
    • -
  • 2.
    • -
  • 3.
    • -
  • 4.
    • -
  • 5.
    • -
  • 6.
    • -
  • 7.
    • -
  • 8.
    • -
  • 9.
    • -
-
-
-
    -
  • 1.
    • -
  • 2.
    • -
  • 3.
    • -
  • 4.
    • -
  • 5.
    • -
  • 6.
    • -
  • 7.
    • -
  • 8.
    • -
  • 9.
    • -
  • 10.
    • -
  • 11.
    • -
-
-
-
    -
  • 1.
    • -
  • 2.
    • -
  • 3.
    • -
  • 4.
    • -
-
-
-
    -
  • 1.
    • -
  • 2.
    • -
  • 3.
    • -
  • 4.
    • -
  • 5.
    • -
  • 6.
    • -
  • 7.
    • -
  • 8.
    • -
  • 9.
    • -
-
-
+
+ Escolha a posição dos dedos +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
  • 5.
    • +
  • 6.
    • +
  • 7.
    • +
  • 8.
    • +
  • 9.
    • +
  • 10.
    • +
  • 11.
    • +
  • 12.
    • +
  • 13.
    • +
  • 14.
    • +
  • 15.
    • +
  • 16.
    • +
  • 17.
    • +
  • 18.
    • +
  • 19.
    • +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
  • 5.
    • +
  • 6.
    • +
  • 7.
    • +
  • 8.
    • +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
  • 5.
    • +
  • 6.
    • +
  • 7.
    • +
  • 8.
    • +
  • 9.
    • +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
  • 5.
    • +
  • 6.
    • +
  • 7.
    • +
  • 8.
    • +
  • 9.
    • +
  • 10.
    • +
  • 11.
    • +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
  • 5.
    • +
  • 6.
    • +
  • 7.
    • +
  • 8.
    • +
  • 9.
    • +
+
+
\ No newline at end of file + configuration.setupFingersPosition(); + diff --git a/view/hand/orientacao/passo-1.html b/view/hand/orientacao/passo-1.html index 69a07c1..7cd8c08 100644 --- a/view/hand/orientacao/passo-1.html +++ b/view/hand/orientacao/passo-1.html @@ -1,36 +1,36 @@
-
- Palma da mão -
-
- -
+
+ Palma da mão +
+
+ +
\ No newline at end of file + orientation.setup(); + diff --git a/view/template-backup.html b/view/template-backup.html index 7aa531f..500f9db 100644 --- a/view/template-backup.html +++ b/view/template-backup.html @@ -4,193 +4,193 @@ import 'facial-configuration.html' as facialConfig with context %}
-
-
-
- -
-
- Ajude a criar o sinal . -
-
-
OK
-
-
-
-
-
-
- Vídeo de referência "" -
-
- -
-
- -
-
- -
-
-
-
- Expressão -
-
- Mão direita -
-
- Mão esquerda -
-
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
- -
-
- -
- -
- -
-
-
-
+
+
+
+ +
+
+ Ajude a criar o sinal . +
+
+
OK
+
+
+
+
+
+
+ Vídeo de referência "" +
+
+ +
+
+ +
+
+ +
+
+
+
+ Expressão +
+
+ Mão direita +
+
+ Mão esquerda +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+ +
+
+ +
+ +
+ +
+
+
+
- {{ facialConfig.selectionPanel() }} {{ - handConfig.selectionPanel('right-hand') }} {{ - handConfig.selectionPanel('left-hand') }} + {{ facialConfig.selectionPanel() }} {{ + handConfig.selectionPanel('right-hand') }} {{ + handConfig.selectionPanel('left-hand') }} -
-
- -
+
+
+ +
- {{ facialConfig.subconfigPanel() }} {{ - handConfig.subconfigPanel('right-hand') }} {{ - handConfig.subconfigPanel('left-hand') }} + {{ facialConfig.subconfigPanel() }} {{ + handConfig.subconfigPanel('right-hand') }} {{ + handConfig.subconfigPanel('left-hand') }} -
- -
-
-
-
-
-
-
GERAR - SINAL
-
-
-
-
-
-
Vídeo de referência
-
- -
-
-
-
-
- Sinal "" construído -
- -
- -
-
-
-
- Gerando o sinal "" -
-
- -
-
-
-
-
-
ENVIAR - SINAL
-
-
-
-
-
-

Obrigado,

-
você configurou o sinal com sucesso!
-
-
-

Parabéns,

-
você configurou todos os sinais - disponíveis!
-
-
- -
-
-
+
+ +
+
+
+
+
+
+
GERAR + SINAL
+
+
+
+
+
+
Vídeo de referência
+
+ +
+
+
+
+
+ Sinal "" construído +
+ +
+ +
+
+
+
+ Gerando o sinal "" +
+
+ +
+
+
+
+
+
ENVIAR + SINAL
+
+
+
+
+
+

Obrigado,

+
você configurou o sinal com sucesso!
+
+
+

Parabéns,

+
você configurou todos os sinais + disponíveis!
+
+
+ +
+
+
@@ -198,5 +198,5 @@ import 'facial-configuration.html' as facialConfig with context %} -- libgit2 0.21.2