From 2f13e5211a21dc79c9cc26a545cccd52a0de9e26 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 12 Feb 2014 12:26:06 +0000
Subject: [PATCH] stylistic tweaks to b7158bb3fab5ba8923dc4311e4b538e4e21316e9
 (camel case for js vars; using a dict rather than adding vars indefinitely to
 the window scope; avoiding potentially dynamic code inside compress blocks)

---
 .../js/hallo-plugins/hallo-wagtaillink.coffee   |  4 ++--
 .../static/wagtailadmin/js/page-chooser.js      |  2 +-
 .../wagtailadmin/pages/_editor_js.html          | 17 ++++++++++-------
 .../static/wagtaildocs/js/document-chooser.js   |  2 +-
 .../hallo-plugins/hallo-wagtaildoclink.coffee   |  2 +-
 .../js/hallo-plugins/hallo-wagtailembeds.coffee |  2 +-
 .../js/hallo-plugins/hallo-wagtailimage.coffee  |  2 +-
 .../static/wagtailimages/js/image-chooser.js    |  2 +-
 .../wagtailsnippets/js/snippet-chooser.js       |  2 +-
 9 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.coffee b/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.coffee
index 84c0123189..fbc405f8a2 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.coffee
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.coffee
@@ -41,9 +41,9 @@
 
                     if lastSelection.collapsed
                         # TODO: don't hard-code this, as it may be changed in urls.py
-                        url = window.page_chooser+'?allow_external_link=true&allow_email_link=true&prompt_for_link_text=true'
+                        url = window.chooserUrls.pageChooser + '?allow_external_link=true&allow_email_link=true&prompt_for_link_text=true'
                     else
-                        url = window.page_chooser+'?allow_external_link=true&allow_email_link=true'
+                        url = window.chooserUrls.pageChooser + '?allow_external_link=true&allow_email_link=true'
 
                     ModalWorkflow
                         url: url
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-chooser.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-chooser.js
index 5033a38669..b4f95c1332 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-chooser.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-chooser.js
@@ -4,7 +4,7 @@ function createPageChooser(id, pageType, openAtParentId) {
     var input = $('#' + id);
 
     $('.action-choose', chooserElement).click(function() {
-        var initialUrl = window.page_chooser;
+        var initialUrl = window.chooserUrls.pageChooser;
         if (openAtParentId) {
             initialUrl += openAtParentId + '/';
         }
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
index ce63d400f8..a88f6143d7 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
@@ -29,15 +29,18 @@
     <script src="{{ STATIC_URL }}wagtaildocs/js/document-chooser.js"></script>
     <script src="{{ STATIC_URL }}wagtailsnippets/js/snippet-chooser.js"></script>
     <script src="{{ STATIC_URL }}admin/js/urlify.js"></script>
-    <script type='text/javascript'>
-        window.document_chooser='{% url "wagtaildocs_chooser" %}';
-        window.image_chooser='{% url "wagtailimages_chooser" %}';
-        window.embeds_chooser='{% url "wagtailembeds_chooser" %}';
-        window.page_chooser='{% url "wagtailadmin_choose_page" %}';
-        window.snippet_chooser='{% url "wagtailsnippets_choose_generic" %}';
-    </script>
 {% endcompress %}
 
+<script type='text/javascript'>
+    window.chooserUrls = {
+        'documentChooser': '{% url "wagtaildocs_chooser" %}',
+        'imageChooser': '{% url "wagtailimages_chooser" %}',
+        'embedsChooser': '{% url "wagtailembeds_chooser" %}',
+        'pageChooser': '{% url "wagtailadmin_choose_page" %}',
+        'snippetChooser': '{% url "wagtailsnippets_choose_generic" %}'
+    };
+</script>
+
 <script>
     (function() {
         function fixPrefix(str) {return str;}
diff --git a/wagtail/wagtaildocs/static/wagtaildocs/js/document-chooser.js b/wagtail/wagtaildocs/static/wagtaildocs/js/document-chooser.js
index 7c690ea144..7549e965e0 100644
--- a/wagtail/wagtaildocs/static/wagtaildocs/js/document-chooser.js
+++ b/wagtail/wagtaildocs/static/wagtaildocs/js/document-chooser.js
@@ -5,7 +5,7 @@ function createDocumentChooser(id) {
 
     $('.action-choose', chooserElement).click(function() {
         ModalWorkflow({
-            'url': window.document_chooser,
+            'url': window.chooserUrls.documentChooser,
             'responses': {
                 'documentChosen': function(docData) {
                     input.val(docData.id);
diff --git a/wagtail/wagtaildocs/static/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.coffee b/wagtail/wagtaildocs/static/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.coffee
index d213eeb16a..7e961444d3 100644
--- a/wagtail/wagtaildocs/static/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.coffee
+++ b/wagtail/wagtaildocs/static/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.coffee
@@ -24,7 +24,7 @@
             button.on "click", (event) ->
                 lastSelection = widget.options.editable.getSelection()
                 ModalWorkflow
-                    url: window.document_chooser
+                    url: window.chooserUrls.documentChooser
                     responses:
                         documentChosen: (docData) ->
                             a = document.createElement('a')
diff --git a/wagtail/wagtailembeds/static/wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.coffee b/wagtail/wagtailembeds/static/wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.coffee
index 7c53ba6565..99e844f8d2 100644
--- a/wagtail/wagtailembeds/static/wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.coffee
+++ b/wagtail/wagtailembeds/static/wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.coffee
@@ -25,7 +25,7 @@
                 lastSelection = widget.options.editable.getSelection()
                 insertionPoint = $(lastSelection.endContainer).parentsUntil('.richtext').last()
                 ModalWorkflow
-                    url: window.embeds_chooser
+                    url: window.chooserUrls.embedsChooser
                     responses:
                         embedChosen: (embedData) ->
                             elem = $(embedData).get(0)
diff --git a/wagtail/wagtailimages/static/wagtailimages/js/hallo-plugins/hallo-wagtailimage.coffee b/wagtail/wagtailimages/static/wagtailimages/js/hallo-plugins/hallo-wagtailimage.coffee
index 2e71a03d84..4a4bcaf7ad 100644
--- a/wagtail/wagtailimages/static/wagtailimages/js/hallo-plugins/hallo-wagtailimage.coffee
+++ b/wagtail/wagtailimages/static/wagtailimages/js/hallo-plugins/hallo-wagtailimage.coffee
@@ -25,7 +25,7 @@
                 lastSelection = widget.options.editable.getSelection()
                 insertionPoint = $(lastSelection.endContainer).parentsUntil('.richtext').last()
                 ModalWorkflow
-                    url: window.image_chooser+'?select_format=true'
+                    url: window.chooserUrls.imageChooser + '?select_format=true'
                     responses:
                         imageChosen: (imageData) ->
                             elem = $(imageData.html).get(0)
diff --git a/wagtail/wagtailimages/static/wagtailimages/js/image-chooser.js b/wagtail/wagtailimages/static/wagtailimages/js/image-chooser.js
index 1e9904995d..c6ab2af3ed 100644
--- a/wagtail/wagtailimages/static/wagtailimages/js/image-chooser.js
+++ b/wagtail/wagtailimages/static/wagtailimages/js/image-chooser.js
@@ -5,7 +5,7 @@ function createImageChooser(id) {
 
     $('.action-choose', chooserElement).click(function() {
         ModalWorkflow({
-            'url': window.image_chooser,
+            'url': window.chooserUrls.imageChooser,
             'responses': {
                 'imageChosen': function(imageData) {
                     input.val(imageData.id);
diff --git a/wagtail/wagtailsnippets/static/wagtailsnippets/js/snippet-chooser.js b/wagtail/wagtailsnippets/static/wagtailsnippets/js/snippet-chooser.js
index 664c04608d..030ddb0a9b 100644
--- a/wagtail/wagtailsnippets/static/wagtailsnippets/js/snippet-chooser.js
+++ b/wagtail/wagtailsnippets/static/wagtailsnippets/js/snippet-chooser.js
@@ -5,7 +5,7 @@ function createSnippetChooser(id, contentType) {
 
     $('.action-choose', chooserElement).click(function() {
         ModalWorkflow({
-            'url': window.snippet_chooser + contentType + '/',  
+            'url': window.chooserUrls.snippetChooser + contentType + '/',
             'responses': {
                 'snippetChosen': function(snippetData) {
                     input.val(snippetData.id);