Commit b6453ceb authored by Rurik Bugdanov's avatar Rurik Bugdanov

ui_init.js

- remove backquotes incompatible with minification
- load x3dom-full from html instead (to allow minification)
parent 3cafecd0
...@@ -122,23 +122,23 @@ function light_init(){ ...@@ -122,23 +122,23 @@ function light_init(){
var model_url = SETTINGS.basepath+"/"+SETTINGS.path+"/"+SETTINGS.version+"/"+SETTINGS.path+".x3d"; var model_url = SETTINGS.basepath+"/"+SETTINGS.path+"/"+SETTINGS.version+"/"+SETTINGS.path+".x3d";
var model_back_url = SETTINGS.basepath+"/"+SETTINGS.path+"/"+SETTINGS.version+"/"+SETTINGS.path+"-texture-bgnd-ext.jpeg"; var model_back_url = SETTINGS.basepath+"/"+SETTINGS.path+"/"+SETTINGS.version+"/"+SETTINGS.path+"-texture-bgnd-ext.jpeg";
var model = $(` var model = $([
<group> '<group>',
<inline name='mymodel' namespacename='mymodel' url='`+model_url+`'></inline> ' <inline name="mymodel" namespacename="mymodel" url="'+model_url+'"></inline>',
</group> '</group>',
<group> '<group>',
<Background ' <Background ',
id="Background" ' id="Background"',
class="Background" ' class="Background"',
backUrl= "js/images/background_side.jpeg" ' backUrl= "js/images/background_side.jpeg"',
bottomUrl="js/images/background_floor.jpeg" ' bottomUrl="js/images/background_floor.jpeg"',
frontUrl= "`+model_back_url+`" ' frontUrl= "'+model_back_url+'"',
leftUrl= "js/images/background_side.jpeg" ' leftUrl= "js/images/background_side.jpeg"',
rightUrl= "js/images/background_side.jpeg" ' rightUrl= "js/images/background_side.jpeg"',
topUrl= "js/images/background_sky.jpeg"> ' topUrl= "js/images/background_sky.jpeg">',
</Background> ' </Background>',
</group> '</group>'
`); ].join('\n'));
x3delement.append(model); x3delement.append(model);
...@@ -174,7 +174,7 @@ function light_init(){ ...@@ -174,7 +174,7 @@ function light_init(){
Scene = new X3DOMObject(element,Data,{}); Scene = new X3DOMObject(element,Data,{});
Scene.initResize(); Scene.initResize();
$.getScript("js/x3dom/x3dom-full.debug.js",function(){ // $.getScript("js/x3dom/x3dom-full.debug.js",function(){
Map = new LeafletObject('leaflet_map',Data,{}); Map = new LeafletObject('leaflet_map',Data,{});
//wait until it DOM is extended //wait until it DOM is extended
...@@ -188,7 +188,7 @@ function light_init(){ ...@@ -188,7 +188,7 @@ function light_init(){
leaf_events(); leaf_events();
}; };
}); // });
}, },
}); });
......
Markdown is supported
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