Made some JS .init() for Contags and Tags

mailpile · Oct 24, 2014 · 10ab01f · 10ab01f
1 parent 14e8e23
commit 10ab01f
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 14 deletions.
diff --git a/static/default/html/contacts/index.html b/static/default/html/contacts/index.html
@@ -47,5 +47,10 @@
   <h5>{% if result.total > 1 %}{{result.start}} - {{result.end}} {{_("of")}} {{result.total}} {{_("Contacts")}} {% elif result.total == 1 %} {{_("1 Conversation")}} {% else %} {{_("No results found")}} {% endif %}</h5>
 </div>
 
+<script>
+$(document).ready(function() {
+  Mailpile.Contacts.init();
+});
+</script>
 {% endblock %}
 
diff --git a/static/default/html/jsapi/contacts/init.js b/static/default/html/jsapi/contacts/init.js
@@ -0,0 +1,14 @@
+/* Contacts */
+
+Mailpile.Contacts = {};
+Mailpile.Contacts.UI = {};
+
+
+Mailpile.Contacts.init = function() {
+
+
+  // Search Bar
+  $('#search-query').val('contacts: ');
+
+
+};
diff --git a/static/default/html/jsapi/index-app.js b/static/default/html/jsapi/index-app.js
@@ -20,6 +20,7 @@
 {% include("jsapi/compose/body.js") %}
 
 /* JS - Contacts */
+{% include("jsapi/contacts/init.js") %}
 {% include("jsapi/contacts/display_modes.js") %}
 {% include("jsapi/contacts/content.js") %}
 
@@ -36,6 +37,7 @@
 {% include("jsapi/settings/content.js") %}
 
 /* JS - Tags */
+{% include("jsapi/tags/init.js") %}
 {% include("jsapi/tags/content.js") %}
 
 /* JS - Message */
@@ -45,11 +47,10 @@
 {% include("jsapi/message/tooltips.js") %}
 {% include("jsapi/message/ui.js") %}
 
-/* JS UI Files */
+/* JS - UI */
 {% include("jsapi/ui/init.js") %}
 {% include("jsapi/ui/content.js") %}
 {% include("jsapi/ui/global.js") %}
 {% include("jsapi/ui/topbar.js") %}
 {% include("jsapi/ui/sidebar.js") %}
 {% include("jsapi/ui/tooltips.js") %}
-
diff --git a/static/default/html/jsapi/tags/init.js b/static/default/html/jsapi/tags/init.js
@@ -0,0 +1,14 @@
+/* Tags */
+
+Mailpile.Tags = {};
+Mailpile.Tags.UI = {};
+
+
+Mailpile.Tags.init = function() {
+
+
+  // Search Bar
+  $('#search-query').val('tags: ');
+
+
+};
diff --git a/static/default/html/jsapi/ui/topbar.js b/static/default/html/jsapi/ui/topbar.js
@@ -54,15 +54,3 @@ $(document).on('click', '#button-compose', function(e) {
   Mailpile.activities.compose();
 });
 
-
-/* Activities - DOM */
-$(document).ready(function() {
-  // Command Specific Mods
-  if (Mailpile.instance.state.command_url === '/contacts/') {
-    $('#search-query').val('contacts: ');
-  }
-  else if (Mailpile.instance.state.command_url === '/tags/') {
-    $('#search-query').val('tags: ');
-  }
-
-});
diff --git a/static/default/html/tags/index.html b/static/default/html/tags/index.html
@@ -77,4 +77,9 @@ <h4>{{_("Archived")}}</h4>
   </div>
   {% endif %}
 </div>
+<script>
+$(document).ready(function() {
+  Mailpile.Tags.init();
+});
+</script>
 {% endblock %}