Commit bc9840bc authored by chauveau's avatar chauveau
Browse files

modification de la visibilité de certaines fonctions du module HTML

parent 39fc6f4c
......@@ -30,7 +30,7 @@ declare function max.html:wrapInHTML(
let $head:= max.html:generateHTMLHead($projectId)
let $jsImports := max.html:generateAllJSImports($projectId, $pageId)
let $jsImports := max.html:generateAllJSImports($projectId, $pageId, $fragmentId)
let $baseuri := max.config:getReversedProxyBaseURI()
let $aboutHref := $baseuri || "/about"
......@@ -85,7 +85,7 @@ declare function max.html:wrapInSimpleHTML(
as element(html) {
let $head:= max.html:generateHTMLHead($projectId)
let $jsImports := max.html:generateAllJSImports($projectId, "")
let $jsImports := max.html:generateAllJSImports($projectId, "","")
return <html>{$head}<body>{$wrapped}{$jsImports}</body></html>
......@@ -124,15 +124,16 @@ declare %private function max.html:generateHTMLHead($projectId){
(:
Generates global js script import tags
:)
declare %private function max.html:generateAllJSImports($projectId, $pageId){
declare %private function max.html:generateAllJSImports($projectId, $pageId, $fragmentId){
<div id="js_scripts">
<!-- variables contextuelles -->
<script type="text/javascript"><!-- Should be removed ???? -->
<script type="text/javascript">
var rootURI = "{substring-before(max.config:getReversedProxyBaseURI(),$max.cons:BASE_DIR)}";
var baseURI="{max.config:getReversedProxyBaseURI()}";
var pluginsBaseURI="{max.config:getPluginsBaseURI()}";
var projectId="{$projectId}";
var route ="{$pageId}";
var fragmentId ="{$fragmentId}";
</script>
<!-- JQuery frameworks -->
......@@ -143,6 +144,7 @@ declare %private function max.html:generateAllJSImports($projectId, $pageId){
<script src='{max.config:getReversedProxyBaseURI() || "/ui/js/lib/jquery-ui/jquery-ui.min.js"}'/>
<!-- JS global -->
<script type="text/javascript" src='{max.config:getReversedProxyBaseURI() || "/ui/js/dist/MaX.min.js"}'/>
<!-- JS plugins/uiAddons du projet -->
{max.html:generateJavascriptImports($projectId)}
</div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment