hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 20:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reenable geonames in edit users and register

Browse Source
This commit is contained in:
Benoît Burnichon
2015-11-19 17:56:51 +01:00
parent cf75b48665
commit f4b8556d70
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
www/scripts/apps/admin/require.config.js
View File

@@ -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'

2
www/scripts/apps/login/home/config.js
View File

@@ -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: {