hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix geonames amd loading

Browse Source
This commit is contained in:
Nicolas Le Goff
2015-02-06 16:04:18 +01:00
parent dc59f71a6f
commit 5a62787b85
5 changed files with 108 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
templates/web/account/account.html.twig
View File

@@ -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 %}