From 5a62787b85e4ad98ae945660ea194d659d116004 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Fri, 6 Feb 2015 16:04:18 +0100
Subject: [PATCH] Fix geonames amd loading

---
 lib/conf.d/minifyGroupsConfig.php            |  1 +
 templates/web/account/account.html.twig      | 40 +++++++---
 templates/web/admin/editusers.html.twig      | 38 +++++----
 templates/web/common/dialog_export.html.twig | 13 ++-
 templates/web/prod/User/Add.html.twig        | 84 +++++++++++---------
 5 files changed, 108 insertions(+), 68 deletions(-)

diff --git a/lib/conf.d/minifyGroupsConfig.php b/lib/conf.d/minifyGroupsConfig.php
index 2d22960856..ab02360b18 100644
--- a/lib/conf.d/minifyGroupsConfig.php
+++ b/lib/conf.d/minifyGroupsConfig.php
@@ -13,6 +13,7 @@ $groups = [
         '//include/jslibs/jquery.contextmenu_scroll.js',
         '//assets/jquery.cookie/jquery.cookie.js',
         '//include/jquery.common.js',
+        '//assets/requirejs/require.js',
         '//skins/account/account.js'
     ],
     'authentication_css' => [
diff --git a/templates/web/account/account.html.twig b/templates/web/account/account.html.twig
index 2bbd6e7b59..91c385d821 100644
--- a/templates/web/account/account.html.twig
+++ b/templates/web/account/account.html.twig
@@ -11,19 +11,41 @@
 
 {% block javascript %}
     {{ parent() }}
-    <script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : '/skins/account/account.js,assets/geonames-server-jquery-plugin/jquery.geonames.js,scripts/common/geonames.js' }) }}"></script>
     <script type="text/javascript">
-        $(document).ready(function() {
-            geonames.init($("#form_geonameid"), {
-                "server": "{{ app['geonames.server-uri'] }}",
-                "limit": 40
+            requirejs.config({
+                baseUrl: "/scripts",
+                paths: {
+                    "jquery": "../assets/jquery/jquery",
+                    "jquery.ui": "../assets/jquery.ui/jquery-ui",
+                    "jquery.geonames": "../assets/geonames-server-jquery-plugin/jquery.geonames"
+                },
+                shim: {
+                    "jquery.geonames": {
+                        deps: ["jquery", "jquery.ui"],
+                        exports: "$.fn.geocompleter"
+                    },
+                    "common/geonames": {
+                        deps: ["jquery.geonames"]
+                    }
+                }
             });
 
-            $('legend').bind('click', function() {
-                $(".form-info").hide(200);
-                $($(this).data('target')).show();
+            require([
+                "jquery",
+                "common/geonames"
+            ], function ($, geonames) {
+                $(document).ready(function() {
+                    $('legend').bind('click', function () {
+                        $(".form-info").hide(200);
+                        $($(this).data('target')).show();
+                    });
+
+                    geonames.init($("#form_geonameid"), {
+                        "server": "{{ app['geonames.server-uri'] }}",
+                        "limit": 40
+                    });
+                });
             });
-        });
     </script>
 {% endblock %}
 
diff --git a/templates/web/admin/editusers.html.twig b/templates/web/admin/editusers.html.twig
index 50e45fcb87..d4c7020745 100644
--- a/templates/web/admin/editusers.html.twig
+++ b/templates/web/admin/editusers.html.twig
@@ -559,33 +559,37 @@
   </div>
 </div>
 
-<script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : 'assets/geonames-server-jquery-plugin/jquery.geonames.js,scripts/common/geonames.js' }) }}"></script>
 <script type="text/javascript">
-  $(document).ready(function(){
-    ini_edit_usrs();
 
-    geonames.init($('#user_infos_tab input.geoname_field'), {
+
+
+  define([
+    "jquery",
+    "common/geonames"
+  ], function ($, geonames) {
+    $(document).ready(function() {
+      ini_edit_usrs();
+      geonames.init($('#user_infos_tab input.geoname_field'), {
         "server": "{{ app['geonames.server-uri'] }}",
         "limit": 40
-    });
+      });
 
-    $('div.tabs').tabs();
+      $('div.tabs').tabs();
 
-    $('#users_rights_form button#reset_rights').bind('click', function(){
-        if(confirm("{{ 'Are you sure you want to reset rights?' | trans }}"))
-        {
+      $('#users_rights_form button#reset_rights').bind('click', function () {
+        if (confirm("{{ 'Are you sure you want to reset rights?' | trans }}")) {
           var users = $('#users_rights_form input[name="users"]').val();
 
           $.ajax({
             type: 'POST',
             url: '/admin/users/rights/reset/',
-            dataType:'json',
+            dataType: 'json',
             data: {
-              users : users
+              users: users
             },
-            success: function(data){
-              if(!data.error) {
-                if(users === '') {
+            success: function (data) {
+              if (!data.error) {
+                if (users === '') {
                   return false;
                 }
 
@@ -595,9 +599,9 @@
                   type: 'GET',
                   url: '/admin/users/rights/',
                   data: {
-                    users : users
+                    users: users
                   },
-                  success: function(data){
+                  success: function (data) {
                     $('#right-ajax').removeClass('loading').html(data);
                   }
                 });
@@ -611,4 +615,6 @@
         }
       });
     });
+  });
+
 </script>
diff --git a/templates/web/common/dialog_export.html.twig b/templates/web/common/dialog_export.html.twig
index e976b9728c..1e1740dca5 100644
--- a/templates/web/common/dialog_export.html.twig
+++ b/templates/web/common/dialog_export.html.twig
@@ -506,7 +506,6 @@
         {% endif %}
     </div>
 
-    <script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : 'assets/geonames-server-jquery-plugin/jquery.geonames.js,scripts/common/geonames.js' }) }}"></script>
     <script type="text/javascript">
 
         function check_TOU(container)
@@ -619,11 +618,17 @@
                 dialog.Close();
             });
 
-            geonames.init($('#command_geoname_field'), {
-                "server": "{{ app['geonames.server-uri'] }}",
-                "limit": 40
+            define([
+                "common/geonames"
+            ], function (geonames) {
+                geonames.init($('#command_geoname_field'), {
+                    "server": "{{ app['geonames.server-uri'] }}",
+                    "limit": 40
+                });
             });
 
+
+
             $('#download .download_button').bind('click',function(){
                 if(!check_subdefs($('#download')))
                     return false;
diff --git a/templates/web/prod/User/Add.html.twig b/templates/web/prod/User/Add.html.twig
index b5dca389fc..8255a883a7 100644
--- a/templates/web/prod/User/Add.html.twig
+++ b/templates/web/prod/User/Add.html.twig
@@ -61,45 +61,51 @@
     </form>
 </div>
 
-<script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : 'assets/geonames-server-jquery-plugin/jquery.geonames.js,scripts/common/geonames.js' }) }}"></script>
 <script type="text/javascript">
-    $(document).ready(function() {
-        geonames.init($('#QuickAddUser input.geoname_field'), {
-            "server": "{{ app['geonames.server-uri'] }}",
-            "limit": 40
+        define([
+            "jquery",
+            "common/geonames"
+        ], function (geonames) {
+            $(document).ready(function() {
+                geonames.init($('#QuickAddUser input.geoname_field'), {
+                    "server": "{{ app['geonames.server-uri'] }}",
+                    "limit": 40
+                });
+
+                $quickAddUser = $("#QuickAddUser");
+
+                $("button", $quickAddUser).button();
+
+                $("form", $quickAddUser).bind('submit', function() {
+                    return false;
+                });
+
+                $("form button.cancel", $quickAddUser).bind('click', function() {
+                    var dialog = $(this).closest('.ui-dialog-content');
+                    if (dialog.data("ui-dialog")) {
+                        dialog.dialog('destroy');
+                    }
+
+                    dialog.remove();
+
+                    return false;
+                });
+
+                $("form button.valid", $quickAddUser).bind('click', function() {
+                    var $form = $(this).closest('form');
+                    var $this = $(this);
+
+                    var callback = function() {
+                        var dialog = $this.closest('.ui-dialog-content');
+                        if (dialog.data("ui-dialog")) {
+                            dialog.dialog('destroy').remove();
+                        }
+                    };
+
+                    p4.Feedback.addUser($form, callback);
+
+                    return false;
+                });
+            });
         });
-
-        $("#QuickAddUser button").button();
-
-        $("#QuickAddUser form").bind('submit', function() {
-            return false;
-        });
-
-        $("#QuickAddUser form button.cancel").bind('click', function() {
-            var dialog = $(this).closest('.ui-dialog-content');
-            if (dialog.data("ui-dialog")) {
-                dialog.dialog('destroy');
-            }
-
-            dialog.remove();
-
-            return false;
-        });
-
-        $("#QuickAddUser form button.valid").bind('click', function() {
-            var $form = $(this).closest('form');
-            var $this = $(this);
-
-            var callback = function() {
-                var dialog = $this.closest('.ui-dialog-content');
-                if (dialog.data("ui-dialog")) {
-                    dialog.dialog('destroy').remove();
-                }
-            };
-
-            p4.Feedback.addUser($form, callback);
-
-            return false;
-        });
-    });
     </script>