Fix some bugs

David Guilherme
1 parent ea70d84a
Showing 5 changed files with 54 additions and 39 deletions Show diff stats
.gitignore
VLibrasWeb/vlibras-player.js
VLibrasWeb/vlibras-web.css
VLibrasWeb/vlibras-web.js
sample.html
@@ -6,6 +6,7 @@ VLibrasWeb/Player/WebPlayer/*
 *.zip
 **/*.DS_Store
+.idea
 bower_components
 node_modules
@@ -13,8 +13,6 @@
     var self = this;
     text = encodeURI(text);
-    this.stop();
-
     (self.onTranslateStart || noop)();
     get(ENDPOINT, { texto: text },
       function (status, response) {
@@ -67,25 +67,23 @@
 }
 .vlibras-widget .vw-player {
-  visibility: hidden;
-  width: 0;
+  display: none;
+  width: 320px;
   height: 100%;
   float: right;
   background-color: #ebebeb;
-  display: -webkit-flex;
-  display: flex;
-  flex-direction: column;
-
   -webkit-box-shadow: 0px 0px 9px 0px rgba(0,0,0,0.75);
   -moz-box-shadow: 0px 0px 9px 0px rgba(0,0,0,0.75);
   box-shadow: 0px 0px 9px 0px rgba(0,0,0,0.75);
 }
 .vlibras-widget .vw-player.active {
-  width: 320px;
-  visibility: visible;
+  display: -webkit-flex;
+  display: flex;
+  flex-direction: column;
+  -webkit-flex-direction: column;
 }
 .vw-player .vw-canvas-wrapper {
@@ -103,7 +101,7 @@
   display: none;
 }
-.vw-player.loaded .vw-subtitle {
+.vw-player.loaded:not(.error) .vw-subtitle {
   display: block;
 }
@@ -187,7 +185,7 @@
   -webkit-align-items: center;
 }
-.vw-player.loaded .vw-controls {
+.vw-player.loaded:not(.error) .vw-controls {
   visibility: visible;
 }
@@ -226,6 +224,8 @@
 .vw-window {
   cursor: pointer;
+  flex-shrink: 0;
+  -webkit-flex-shrink: 0;
 }
 .vw-window .vw-maximize, .vw-window.active .vw-minimize {
@@ -275,6 +275,7 @@
   height: 50px;
 }
-.vw-loading.active, .vw-error.active {
+.vw-player:not(.error) .vw-loading.active,
+.vw-player.error .vw-error {
   display: block;
 }
@@ -40,9 +40,8 @@
     var vwPlay     = vwControls.querySelector('.vw-play');
     VLibrasPlayer.addProgressListener(function (progress) {
-      var vwText = document.querySelector('.vw-text.active');
-      if (progress >= 1 && vwText) {
-        vwText.classList.remove('active');
+      if (progress >= 1) {
+        deactivateAll()
         progress = 0;
       }
@@ -71,7 +70,7 @@
     VLibrasPlayer.addErrorListener(function (err) {
       var vwError = vwCanvas.querySelector('.vw-error');
-      vwError.classList.add('active');
+      vwPlayer.classList.add('error');
       switch(err) {
         case 'unsupported':
           vwError.innerHTML = 'O seu navegador não é compatível com este widget.';
@@ -83,8 +82,7 @@
           vwError.innerHTML = 'Por favor, instale o <a href="http://unity3d.com/webplayer/" target="_blank">Unity WebPlayer</a>.';
         break;
         default:
-          vwError.innerHTML = 'Ocorreu um erro. Por favor, recarregue a página.'
-        break;
+          vwError.innerHTML = 'Ocorreu um erro. Por favor, entre em contato com o administrador da página.'
       }
     });
@@ -92,9 +90,10 @@
       e.preventDefault();
       if (VLibrasWeb.lastTextElement) {
-        VLibrasWeb.lastTextElement.dispatchEvent(
-          new MouseEvent('click')
-        );
+        var span = VLibrasWeb.lastTextElement.querySelector('span');
+        span.classList.add('vw-text-active');
+
+        vwProgress.style.width = 0;
       }
       VLibrasPlayer.play();
@@ -117,11 +116,11 @@
     vwSpeed.addEventListener('click', function (e) {
       e.preventDefault();
-      var actualSpeed = vwSpeed.innerText;
+      var actualSpeed = vwSpeed.textContent;
       var newSpeed = (actualSpeed % 4) + 1;
       VLibrasPlayer.setSpeed(newSpeed * 0.5);
-      this.innerText = newSpeed;
+      this.textContent = newSpeed;
     });
     vwAccess.addEventListener('click', function () {
@@ -141,10 +140,7 @@
       vw.classList.remove('left');
       minimize();
-
-      removeTagsTexts();
-      VLibrasPlayer.stop();
-      vwProgress.style.width = 0;
+      close();
     });
     vwSide.addEventListener('click', function () {
@@ -166,14 +162,12 @@
           e.preventDefault();
           vwProgress.style.width = 0;
+          VLibrasWeb.lastTextElement = this.parentNode;
-          VLibrasWeb.lastTextElement = this;
+          window.VLibrasPlayer.stop();
           window.VLibrasPlayer.translate(this.textContent);
-          var actives = document.querySelector('.vw-text.vw-text-active');
-          if (actives) {
-            actives.classList.remove('vw-text-active');
-          }
+          deactivateAll();
           this.classList.add('vw-text-active');
         });
@@ -182,21 +176,25 @@
     function removeTagsTexts() {
       var tagsTexts = document.querySelectorAll('.vw-text');
-      for (var i = 0; i < tagsTexts; i++) {
-        var span      = tagsTexts[i].querySelector('span');
-        tagsTexts[i].innerHTML = span.innerHTML;
-        tagsTexts[i].classList.remove('.vw-text');
-        tagsTexts[i].classList.remove('.vw-text-active');
+      for (var i = 0; i < tagsTexts.length; i++) {
+        var parent  = tagsTexts[i].parentNode;
+        parent.innerHTML = tagsTexts[i].innerHTML;
       }
     }
     function getAllNodeTexts(root, callback) {
       var noop = function () {};
+      var headElements = ['SCRIPT', 'TITLE', 'META', 'STYLE', 'LINK', 'BASE'];
       for(var i = 0; i < root.childNodes.length; i++) {
         var node    = root.childNodes[i];
         var anyText = false;
-        for(var j = 0; j < node.childNodes.length && node.tagName != 'SCRIPT'; j++) {
+
+        if (headElements.indexOf(node.tagName) != -1) {
+          continue;
+        }
+
+        for(var j = 0; j < node.childNodes.length; j++) {
           var child = node.childNodes[j];
           if (child.nodeType == Node.TEXT_NODE && child.nodeValue.trim() != '') {
             anyText = true;
@@ -216,5 +214,18 @@
       vw.classList.remove('maximize');
       vwWindow.classList.remove('active');
     }
+
+    function close() {
+      removeTagsTexts();
+      VLibrasPlayer.stop();
+      vwProgress.style.width = 0;
+    }
+
+    function deactivateAll() {
+      var active = document.querySelector('.vw-text.vw-text-active');
+      if (active) {
+        active.classList.remove('vw-text-active');
+      }
+    }
   };
 })(window, document);
@@ -47,6 +47,10 @@
             <img class="vw-minimize" src="VLibrasWeb/Images/minimize.png" />
           </span>
         </div>
+
+        <div class="vw-links">
+          <ul></ul>
+        </div>
       </div>
     </div>
	@@ -6,6 +6,7 @@ VLibrasWeb/Player/WebPlayer/*		@@ -6,6 +6,7 @@ VLibrasWeb/Player/WebPlayer/*
6		6
7	*.zip	7	*.zip
8	*/.DS_Store	8	*/.DS_Store
		9	+.idea
9		10
10	bower_components	11	bower_components
11	node_modules	12	node_modules