dakedres/ronin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue with query

Browse Source
This commit is contained in:
Devine Lu Linvega 2017-11-08 17:52:23 +13:00
parent c2dd66204a
commit 041e9cf597
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources/scripts/core/commander.js
View File

@ -23,8 +23,8 @@ function Commander()
for(setting_id in q.settings){ for(setting_id in q.settings){
var setting_value = q.settings[setting_id]; var setting_value = q.settings[setting_id];
if(!ronin.modules[q.module].settings[setting_id]){ console.log("Missing setting",setting_id); return; } if(!ronin.modules[q.module].settings[setting_id]){ console.log("Missing setting",setting_id); return; }
ronin.modules[q.module].settings[setting_id] = setting_value; ronin.modules[q.module].settings[setting_id] = setting_value;
console.log(ronin.modules[q.module]);
} }
ronin.modules[q.module].routes = q.routes; ronin.modules[q.module].routes = q.routes;

2
sources/scripts/core/query.js
View File

@ -102,7 +102,7 @@ function Query(query_str = "")
return {x:parseInt(unit_str.split(",")[0]),y:parseInt(unit_str.split(",")[1])}; return {x:parseInt(unit_str.split(",")[0]),y:parseInt(unit_str.split(",")[1])};
} }
// Size // Size
if(unit_str.indexOf("x") > -1){ if(unit_str.indexOf("x") > -1 && !isNaN(unit_str.split("x")[0]) && !isNaN(unit_str.split("x")[1])){
return {width:parseInt(unit_str.split("x")[0]),height:parseInt(unit_str.split("x")[1])}; return {width:parseInt(unit_str.split("x")[0]),height:parseInt(unit_str.split("x")[1])};
} }
// Float // Float

8
sources/scripts/modules/type.js
View File

@ -2,7 +2,7 @@ function Type()
{ {
Module.call(this,"type"); Module.call(this,"type");
this.settings = {color:"#000000",font:"Arial",anchor:"center"} this.settings = {color:"#000000",font:"Gotham Light",anchor:"center"}
this.methods.write = new Method("write","text&x,y|WxH","Draw text",function(q){ this.methods.write = new Method("write","text&x,y|WxH","Draw text",function(q){
@ -10,8 +10,10 @@ function Type()
var size = rect.height * 2 var size = rect.height * 2
ronin.preview.clear(); ronin.preview.clear();
console.log(ronin.type.settings);
ronin.render.context().textAlign = ronin.type.settings.anchor; ronin.render.context().textAlign = ronin.type.settings.anchor;
ronin.render.context().font = size+"px "+ronin.type.settings.font; ronin.render.context().font = size+"px "+ronin.type.settings.font.replace("+"," ");
ronin.render.context().fillText(q[0].replace("+"," "),rect.x * 2,(rect.y * 2)+size); ronin.render.context().fillText(q[0].replace("+"," "),rect.x * 2,(rect.y * 2)+size);
}) })
@ -25,7 +27,7 @@ function Type()
ronin.preview.clear(); ronin.preview.clear();
ronin.preview.context().textAlign = this.settings.anchor; ronin.preview.context().textAlign = this.settings.anchor;
ronin.preview.context().font = size+"px "+this.settings.font; ronin.preview.context().font = size+"px "+this.settings.font.replace("+"," ");
ronin.preview.context().fillText(q.methods.write[0].replace("+"," "),rect.x * 2,(rect.y * 2)+size); ronin.preview.context().fillText(q.methods.write[0].replace("+"," "),rect.x * 2,(rect.y * 2)+size);
} }
} }