Merge pull request #5194 from dimagi/knockout-cleanup

Knockout cleanup
dimagi · Jan 2, 2015 · be635f9 · be635f9
2 parents 596aa4b + c1c1ca1
commit be635f9
Show file tree

Hide file tree

Showing 30 changed files with 69 additions and 989 deletions.
diff --git a/corehq/apps/app_manager/templates/app_manager/app_view.html b/corehq/apps/app_manager/templates/app_manager/app_view.html
@@ -8,7 +8,7 @@
     {% if app.get_doc_type == "Application" %}
         <script src="{% static 'translations/js/translations.js' %}"></script>
     {% endif %}
-    <script src="{% static 'hqwebapp/js/knockout-bindings.js' %}"></script>
+    <script src="{% static 'style/ko/knockout_bindings.ko.js' %}"></script>
     <script src="{% static 'hqwebapp/ko/bulk_upload_file.js' %}"></script>
     <script src="{% static 'app_manager/js/supported-languages.js' %}"></script>
     <script type="text/javascript" src="{% static 'hqmedia/js/hqmedia.reference_controller.js' %}"></script>

diff --git a/corehq/apps/app_manager/templates/app_manager/form_view_base.html b/corehq/apps/app_manager/templates/app_manager/form_view_base.html
@@ -86,8 +86,8 @@
 
 {% block js %}{{ block.super }}
     <script src="{% static 'hqwebapp/js/lib/select2/select2.js' %}"></script>
-    <script src="{% static 'hqwebapp/js/lib/knockout.mapping.js' %}"></script>
-    <script src="{% static 'hqwebapp/js/knockout-bindings.js' %}"></script>
+    <script src="{% static 'style/lib/knockout_plugins/knockout_mapping.ko.min.js' %}"></script>
+    <script src="{% static 'style/ko/knockout_bindings.ko.js' %}"></script>
     <script src="{% static 'style/lib/jquery/plugins/jquery.caret-1.5.2.min.js' %}"></script>
 
     {% if app.application_version == '2.0' %}

diff --git a/corehq/apps/app_manager/templates/app_manager/module_view.html b/corehq/apps/app_manager/templates/app_manager/module_view.html
@@ -3,7 +3,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 {% block js %}{{ block.super }}
-    <script src="{% static 'hqwebapp/js/knockout-bindings.js' %}"></script>
+    <script src="{% static 'style/ko/knockout_bindings.ko.js' %}"></script>
     <script src="{% static 'hqwebapp/js/lib/underscore-1.4.4.js' %}"></script>
     <script src="{% static 'hqwebapp/js/guidGenerator.js' %}"></script>
     <script src="{% static 'hqwebapp/js/key-value-mapping.js' %}"></script>

diff --git a/corehq/apps/app_manager/templates/app_manager/releases.html b/corehq/apps/app_manager/templates/app_manager/releases.html
@@ -6,8 +6,8 @@
 {% load timezone_tags %}
 {% load i18n %}
 {% block js %}{{ block.super }}
-    <script src="{% static 'hqwebapp/js/lib/knockout.mapping.js' %}"></script>
-    <script src="{% static 'hqwebapp/js/knockout-bindings.js' %}"></script>
+    <script src="{% static 'style/lib/knockout_plugins/knockout_mapping.ko.min.js' %}"></script>
+    <script src="{% static 'style/ko/knockout_bindings.ko.js' %}"></script>
     <script src="{% static 'app_manager/js/app_manager_utils.js' %}"></script>
     <script src="{% static 'app_manager/js/releases.js' %}"></script>
 {% endblock %}

diff --git a/corehq/apps/app_manager/templates/app_manager/summary.html b/corehq/apps/app_manager/templates/app_manager/summary.html
@@ -9,7 +9,7 @@
 <script src="{% static 'app_manager/js/commcareProperties.js' %}"></script>
 <script src="{% static 'translations/js/translations.js' %}"></script>
 {% endif %}
-<script src="{% static 'hqwebapp/js/knockout-bindings.js' %}"></script>
+<script src="{% static 'style/ko/knockout_bindings.ko.js' %}"></script>
 <script src="{% static 'app_manager/js/supported-languages.js' %}"></script>
 {% endblock %}
 

diff --git a/corehq/apps/builds/templates/builds/edit_menu.html b/corehq/apps/builds/templates/builds/edit_menu.html
@@ -104,7 +104,7 @@ <h4>Import a new build from the build server</h4>
     <script type="text/javascript" src="{% static 'hqwebapp/js/lib/jquery-ui/jquery-ui-1.8.16.min.js' %}"></script>
     <script type="text/javascript" src="{% static 'hqwebapp/js/lib/knockout-2.3.0.js' %}"></script>
     <script type="text/javascript" src="{% static 'hqwebapp/js/lib/underscore-1.4.4.js' %}"></script>
-    <script type="text/javascript" src="{% static 'hqwebapp/js/knockout-bindings.js' %}"></script>
+    <script type="text/javascript" src="{% static 'style/ko/knockout_bindings.ko.js' %}"></script>
     <script>
         var doc = {{ doc|JSON }};
         var pretty_doc = JSON.stringify(doc, undefined, 2)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/config.html b/corehq/apps/cloudcare/templates/cloudcare/config.html
@@ -4,8 +4,8 @@
 
 {% block js %}{{ block.super }}
     <script src="{% static 'hqwebapp/js/main.js' %}"></script>
-    <script src="{% static 'hqwebapp/js/lib/knockout.mapping.js' %}"></script>
-    <script src="{% static 'hqwebapp/js/knockout-bindings.js' %}"></script>
+    <script src="{% static 'style/lib/knockout_plugins/knockout_mapping.ko.min.js' %}"></script>
+    <script src="{% static 'style/ko/knockout_bindings.ko.js' %}"></script>
 {% endblock %}
 
 {% block js-inline %}{{ block.super }}

diff --git a/corehq/apps/custom_data_fields/templates/custom_data_fields/custom_data_fields.html b/corehq/apps/custom_data_fields/templates/custom_data_fields/custom_data_fields.html
@@ -7,7 +7,7 @@
 {% block js %}
 {{ block.super }}
     <script type="text/javascript" src="{% static 'hqwebapp/js/lib/jquery-ui/jquery-ui-1.8.16.min.js' %}"></script>
-    <script type="text/javascript" src="{% static 'hqwebapp/js/knockout-bindings.js' %}"></script>
+    <script type="text/javascript" src="{% static 'style/ko/knockout_bindings.ko.js' %}"></script>
     <script type="text/javascript" src="{% static 'custom_data_fields/js/custom_data_fields.js' %}"></script>
 {% endblock %}
 

diff --git a/corehq/apps/domain/templates/domain/admin/sms_settings.html b/corehq/apps/domain/templates/domain/admin/sms_settings.html
@@ -6,7 +6,7 @@
 {% block js %}{{ block.super }}
     <script src="{% static 'hqwebapp/js/lib/jquery-ui/jquery-ui-1.8.16.min.js' %}"></script>
     <script src="{% static 'hqwebapp/js/lib/jquery-ui-datepicker/jquery-ui-1.8.17.custom.datepicker.min.js' %}"></script>
-    <script src="{% static 'hqwebapp/js/knockout-bindings.js' %}"></script>
+    <script src="{% static 'style/ko/knockout_bindings.ko.js' %}"></script>
     <script src="{% static 'commtrack/ko/sms.js' %}"></script>
 {% endblock %}
 

diff --git a/corehq/apps/export/templates/export/customize_export.html b/corehq/apps/export/templates/export/customize_export.html
@@ -4,8 +4,8 @@
 
 {% block js %}
     {{ block.super }}
-    <script src="{% static 'hqwebapp/js/lib/knockout.mapping.js' %}"></script>
-    <script src="{% static 'hqwebapp/js/knockout-bindings.js' %}"></script>
+    <script src="{% static 'style/lib/knockout_plugins/knockout_mapping.ko.min.js' %}"></script>
+    <script src="{% static 'style/ko/knockout_bindings.ko.js' %}"></script>
     <script src="{% static 'hqwebapp/js/lib/jquery-ui/jquery-ui-1.8.16.min.js' %}"></script>
 {% endblock %}
 

diff --git a/corehq/apps/fixtures/templates/fixtures/fixtures_base.html b/corehq/apps/fixtures/templates/fixtures/fixtures_base.html
@@ -7,8 +7,8 @@
     <script src="{% static 'reports/javascripts/config.dataTables.bootstrap.js' %}"></script>
     <script src="{% static 'hqwebapp/js-custom/hq.legacy.js' %}"></script>
     <script src="{% static 'hqwebapp/js/lib/jquery.history.js' %}"></script>
-    <script src="{% static 'hqwebapp/js/lib/knockout.mapping.js' %}"></script>
-    <script src="{% static 'hqwebapp/js/knockout-bindings.js' %}"></script>
+    <script src="{% static 'style/lib/knockout_plugins/knockout_mapping.ko.min.js' %}"></script>
+    <script src="{% static 'style/ko/knockout_bindings.ko.js' %}"></script>
     {% endblock %}
 {% endblock %}
 

diff --git a/corehq/apps/fixtures/templates/fixtures/manage_tables.html b/corehq/apps/fixtures/templates/fixtures/manage_tables.html
@@ -4,8 +4,8 @@
 {% load report_tags %}
 {% load i18n %}
 {% block js %}{{ block.super }}
-<script src="{% static 'hqwebapp/js/lib/knockout.mapping.js' %}"></script>
-<script src="{% static 'hqwebapp/js/knockout-bindings.js' %}"></script>
+<script src="{% static 'style/lib/knockout_plugins/knockout_mapping.ko.min.js' %}"></script>
+<script src="{% static 'style/ko/knockout_bindings.ko.js' %}"></script>
 <script src="{% static 'fixtures/js/lookup-manage.js' %}"></script>
 {% endblock %}
 

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js-custom/hq.helpers.js b/corehq/apps/hqwebapp/static/hqwebapp/js-custom/hq.helpers.js