more of last commit

mailpile · Oct 24, 2014 · 3da481a · 3da481a
1 parent 10ab01f
commit 3da481a
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 19 deletions.
diff --git a/static/default/html/contacts/add.html b/static/default/html/contacts/add.html
@@ -17,7 +17,11 @@
   </form>
 </div>
 {% else %}
-  {{ mailpile('http/redirect',
-              '/contacts/view/' + result.contacts.0.email.0.email + '/') }}
+  {{ mailpile('http/redirect', '/contacts/view/' + result.contacts.0.email.0.email + '/') }}
 {% endif %}
+<script>
+$(document).ready(function() {
+  Mailpile.Contacts.init();
+});
+</script>
 {% endblock %}
diff --git a/static/default/html/contacts/view.html b/static/default/html/contacts/view.html
@@ -141,11 +141,14 @@ <h4>{{_("Conversations")}}</h4>
   {% else %}
   <h4>{{_("No Conversations")}} :(</h4>
   {% endif %}
-
 {% else %}
     {% set error_title = "contact_missing" %}
     {% include("partials/errors_content.html") %}
 {% endif %}
 </div>
-
+<script>
+$(document).ready(function() {
+  Mailpile.Contacts.init();
+});
+</script>
 {% endblock %}
diff --git a/static/default/html/jsapi/contacts/content.js b/static/default/html/jsapi/contacts/content.js
@@ -71,10 +71,3 @@ $('.show-key-details').on('click', function(e) {
   $('#contact-key-details-' + keyid).fadeIn();
 });
 
-
-$(document).ready(function() {
-
-  // Hide Key Details
-  $('.contact-key-details').hide();
-
-});
diff --git a/static/default/html/jsapi/contacts/init.js b/static/default/html/jsapi/contacts/init.js
@@ -6,9 +6,10 @@ Mailpile.Contacts.UI = {};
 
 Mailpile.Contacts.init = function() {
 
-
   // Search Bar
   $('#search-query').val('contacts: ');
 
+  // Hide Key Details
+  $('.contact-key-details').hide();
 
 };
diff --git a/static/default/html/jsapi/tags/content.js b/static/default/html/jsapi/tags/content.js
@@ -186,9 +186,3 @@ $(document).on('change', '#data-tag-label', function(e) {
   });
 });
 
-$(document).ready(function() {
-
-  // Slugify
-  $('#data-tag-add-slug').slugify('#data-tag-add-tag');
-
-});
diff --git a/static/default/html/jsapi/tags/init.js b/static/default/html/jsapi/tags/init.js
@@ -6,9 +6,10 @@ Mailpile.Tags.UI = {};
 
 Mailpile.Tags.init = function() {
 
-
   // Search Bar
   $('#search-query').val('tags: ');
 
+  // Slugify
+  $('#data-tag-add-slug').slugify('#data-tag-add-tag');
 
 };
diff --git a/static/default/html/tags/add.html b/static/default/html/tags/add.html
@@ -11,4 +11,9 @@
     "display": "tag"
   } %}
   {% include("tags/form.html") %}
+<script>
+$(document).ready(function() {
+  Mailpile.Tags.init();
+});
+</script>
 {% endblock %}
diff --git a/static/default/html/tags/index-edit.html b/static/default/html/tags/index-edit.html
@@ -8,4 +8,9 @@
   {% set form_title = _("Edit Tag") %}
   {% set tag = result.tags.0 %}
   {% include("tags/form.html") %}
+<script>
+$(document).ready(function() {
+  Mailpile.Tags.init();
+});
+</script>
 {% endblock %}