mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-10 11:33:17 +00:00
Reenable geonames in edit users and register
This commit is contained in:
@@ -1101,7 +1101,7 @@
|
||||
});
|
||||
});
|
||||
|
||||
define([
|
||||
require([
|
||||
"jquery",
|
||||
"common/geonames"
|
||||
], function ($, geonames) {
|
||||
|
@@ -17,6 +17,7 @@ require.config({
|
||||
backbone: "../assets/backbone-amd/backbone",
|
||||
"jquery.ui.widget": "../assets/jquery-file-upload/jquery.ui.widget",
|
||||
"jquery.cookie": "../assets/jquery.cookie/jquery.cookie",
|
||||
"jquery.geonames": "../assets/geonames-server-jquery-plugin/jquery.geonames",
|
||||
"jquery.treeview": "../assets/jquery.treeview/jquery.treeview",
|
||||
"jquery.tooltip": "../include/jquery.tooltip",
|
||||
"blueimp.loadimage" : "../assets/blueimp-load-image/load-image",
|
||||
@@ -37,6 +38,10 @@ require.config({
|
||||
deps: ["jquery"],
|
||||
exports: '$.fn.cookie'
|
||||
},
|
||||
"jquery.geonames": {
|
||||
deps: ["jquery"],
|
||||
exports: '$.fn.geocompleter'
|
||||
},
|
||||
"jquery.tooltip": {
|
||||
deps: ["jquery"],
|
||||
exports: '$.fn.tooltip'
|
||||
|
@@ -17,7 +17,7 @@ require.config({
|
||||
backbone: "../assets/backbone-amd/backbone",
|
||||
i18n: "../assets/i18next/i18next.amd-1.6.3",
|
||||
bootstrap: "../assets/bootstrap/js/bootstrap.min",
|
||||
multiselect: "../assets/bootstrap-multiselect/dist/js/bootstrap-multiselect",
|
||||
multiselect: "../assets/bootstrap-multiselect/js/bootstrap-multiselect",
|
||||
"jquery.geonames": "../assets/geonames-server-jquery-plugin/jquery.geonames"
|
||||
},
|
||||
shim: {
|
||||
|
@@ -1,7 +1,7 @@
|
||||
;
|
||||
(function (root, factory) {
|
||||
if (typeof define === 'function' && define.amd) {
|
||||
define([''], factory);
|
||||
define(['jquery.geonames'], factory);
|
||||
} else {
|
||||
root.geonames = factory();
|
||||
}
|
||||
|
Reference in New Issue
Block a user