Fix geonames amd loading

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' => [

templates/web/account/account.html.twig

@@ -11,17 +11,39 @@
 
 {% 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">
+            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"]
+                    }
+                }
+            });
+
+            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
                     });
-
-            $('legend').bind('click', function() {
-                $(".form-info").hide(200);
-                $($(this).data('target')).show();
                 });
             });
     </script>

templates/web/admin/editusers.html.twig

@@ -559,11 +559,16 @@
   </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">
+
+
+
+  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
@@ -572,8 +577,7 @@
       $('div.tabs').tabs();
 
       $('#users_rights_form button#reset_rights').bind('click', function () {
-        if(confirm("{{ 'Are you sure you want to reset rights?' | trans }}"))
-        {
+        if (confirm("{{ 'Are you sure you want to reset rights?' | trans }}")) {
           var users = $('#users_rights_form input[name="users"]').val();
 
           $.ajax({
@@ -611,4 +615,6 @@
         }
       });
     });
+  });
+
 </script>

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,10 +618,16 @@
                 dialog.Close();
             });
 
+            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')))

templates/web/prod/User/Add.html.twig

@@ -61,21 +61,26 @@
     </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">
+        define([
+            "jquery",
+            "common/geonames"
+        ], function (geonames) {
             $(document).ready(function() {
                 geonames.init($('#QuickAddUser input.geoname_field'), {
                     "server": "{{ app['geonames.server-uri'] }}",
                     "limit": 40
                 });
 
-        $("#QuickAddUser button").button();
+                $quickAddUser = $("#QuickAddUser");
 
-        $("#QuickAddUser form").bind('submit', function() {
+                $("button", $quickAddUser).button();
+
+                $("form", $quickAddUser).bind('submit', function() {
                     return false;
                 });
 
-        $("#QuickAddUser form button.cancel").bind('click', function() {
+                $("form button.cancel", $quickAddUser).bind('click', function() {
                     var dialog = $(this).closest('.ui-dialog-content');
                     if (dialog.data("ui-dialog")) {
                         dialog.dialog('destroy');
@@ -86,7 +91,7 @@
                     return false;
                 });
 
-        $("#QuickAddUser form button.valid").bind('click', function() {
+                $("form button.valid", $quickAddUser).bind('click', function() {
                     var $form = $(this).closest('form');
                     var $this = $(this);
 
@@ -102,4 +107,5 @@
                     return false;
                 });
             });
+        });
     </script>