From d038cfd990f8df9a357a55f595f50ab9039e49e8 Mon Sep 17 00:00:00 2001
From: Rodrigo Ferreira de Souza <rodfersou@gmail.com>
Date: Wed, 15 Jun 2016 10:19:47 -0300
Subject: [PATCH] Wait to load responsive voice before show the button

---
 CHANGES.rst                                   |  3 ++-
 .../profiles/default/metadata.xml             |  2 +-
 src/collective/texttospeech/static/main.css   |  6 +++++
 src/collective/texttospeech/static/main.js    |  4 ++--
 .../texttospeech/tests/test_setup.py          |  2 +-
 .../texttospeech/tests/test_upgrades.py       | 14 +++++++++++
 .../texttospeech/upgrades/configure.zcml      |  1 +
 .../texttospeech/upgrades/v3/__init__.py      |  1 +
 .../texttospeech/upgrades/v3/configure.zcml   | 24 +++++++++++++++++++
 9 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 src/collective/texttospeech/upgrades/v3/__init__.py
 create mode 100644 src/collective/texttospeech/upgrades/v3/configure.zcml

diff --git a/CHANGES.rst b/CHANGES.rst
index 68b3206..6032fe2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,8 @@ Changelog
 1.0b2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- The '🔊 Listen' button is now shown only after ResponsiveVoice library has been loaded.
+  [rodfersou]
 
 
 1.0b1 (2016-06-14)
diff --git a/src/collective/texttospeech/profiles/default/metadata.xml b/src/collective/texttospeech/profiles/default/metadata.xml
index d02ea5c..a44cc34 100644
--- a/src/collective/texttospeech/profiles/default/metadata.xml
+++ b/src/collective/texttospeech/profiles/default/metadata.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>2</version>
+  <version>3</version>
 </metadata>
diff --git a/src/collective/texttospeech/static/main.css b/src/collective/texttospeech/static/main.css
index 80a67bc..7c736f5 100644
--- a/src/collective/texttospeech/static/main.css
+++ b/src/collective/texttospeech/static/main.css
@@ -1,7 +1,13 @@
 #viewlet-texttospeech
 {
+    min-height: 1.2em;
+
     text-align: right;
 }
+#viewlet-texttospeech > input
+{
+    display: none;
+}
 #texttospeech-button
 {
     cursor: pointer;
diff --git a/src/collective/texttospeech/static/main.js b/src/collective/texttospeech/static/main.js
index 4a8e850..7e2bd53 100644
--- a/src/collective/texttospeech/static/main.js
+++ b/src/collective/texttospeech/static/main.js
@@ -8,6 +8,7 @@ var MainView = (function() {
       return;
     }
     this.$button = $('#texttospeech-button', this.$el);
+    this.$button.fadeIn();
     this.voice = this.$el.attr('data-voice');
     this.label_stopped = this.$el.attr('data-label-stopped');
     this.label_playing = this.$el.attr('data-label-playing');
@@ -82,8 +83,7 @@ var ControlPanelView = (function() {
   return ControlPanelView;
 })();
 
-
-$(function() {
+responsiveVoice.addEventListener("OnReady", function() {
   if ($('#viewlet-texttospeech').length > 0) {
     new MainView();
   }
diff --git a/src/collective/texttospeech/tests/test_setup.py b/src/collective/texttospeech/tests/test_setup.py
index bab40ce..e05db58 100644
--- a/src/collective/texttospeech/tests/test_setup.py
+++ b/src/collective/texttospeech/tests/test_setup.py
@@ -55,7 +55,7 @@ def test_profile_version(self):
         profile = PROJECTNAME + ':default'
         setup_tool = self.portal['portal_setup']
         self.assertEqual(
-            setup_tool.getLastVersionForProfile(profile), (u'2',))
+            setup_tool.getLastVersionForProfile(profile), (u'3',))
 
 
 class UninstallTestCase(unittest.TestCase):
diff --git a/src/collective/texttospeech/tests/test_upgrades.py b/src/collective/texttospeech/tests/test_upgrades.py
index 9cd08f8..e25dddd 100644
--- a/src/collective/texttospeech/tests/test_upgrades.py
+++ b/src/collective/texttospeech/tests/test_upgrades.py
@@ -64,3 +64,17 @@ def test_pin_responsivevoice(self):
         self._do_upgrade(step)
         self.assertNotIn(OLD_JS, portal_js.getResourceIds())
         self.assertIn(NEW_JS, portal_js.getResourceIds())
+
+
+class To3TestCase(UpgradeBaseTestCase):
+
+    from_ = '2'
+    to_ = '3'
+
+    def test_profile_version(self):
+        version = self.setup.getLastVersionForProfile(self.profile_id)[0]
+        self.assertEqual(version, self.from_)
+
+    def test_registered_steps(self):
+        steps = len(self.setup.listUpgrades(self.profile_id)[0])
+        self.assertEqual(steps, 2)
diff --git a/src/collective/texttospeech/upgrades/configure.zcml b/src/collective/texttospeech/upgrades/configure.zcml
index ba5e7e5..115301e 100644
--- a/src/collective/texttospeech/upgrades/configure.zcml
+++ b/src/collective/texttospeech/upgrades/configure.zcml
@@ -1,3 +1,4 @@
 <configure xmlns="http://namespaces.zope.org/zope">
   <include package=".v2" />
+  <include package=".v3" />
 </configure>
diff --git a/src/collective/texttospeech/upgrades/v3/__init__.py b/src/collective/texttospeech/upgrades/v3/__init__.py
new file mode 100644
index 0000000..40a96af
--- /dev/null
+++ b/src/collective/texttospeech/upgrades/v3/__init__.py
@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-
diff --git a/src/collective/texttospeech/upgrades/v3/configure.zcml b/src/collective/texttospeech/upgrades/v3/configure.zcml
new file mode 100644
index 0000000..931921d
--- /dev/null
+++ b/src/collective/texttospeech/upgrades/v3/configure.zcml
@@ -0,0 +1,24 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:genericsetup="http://namespaces.zope.org/genericsetup">
+
+  <genericsetup:upgradeSteps
+      source="2"
+      destination="3"
+      profile="collective.texttospeech:default">
+
+    <genericsetup:upgradeStep
+        title="Cook CSS resources"
+        description="There were changes in the CSS files, so we need to cook the resources."
+        handler="..cook_css_resources"
+        />
+
+    <genericsetup:upgradeStep
+        title="Cook JavaScript resources"
+        description="There were changes in the JavaScript files, so we need to cook the resources."
+        handler="..cook_javascript_resources"
+        />
+
+  </genericsetup:upgradeSteps>
+
+</configure>