Skip to content

fix bug : can't find widget path in window, #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liuxiucai wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix bug : can't find widget path in window, #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lite",
"version": "4.0.4",
"version": "4.0.41",
"description": "A cross platform template engine base on xml/html and javascript expression.",
"keywords": [ "javascript","xhtml","html","Java","PHP","template"],
"author": "jindw <jindw@xidea.org> (http://www.xidea.org)",
Expand Down
6 changes: 5 additions & 1 deletion src/main/js/parse/parse-context.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
var ResultContext=require('./result-context').ResultContext;
var URI=require('./resource').URI;
var defaultBase = new URI("lite:///");

var os = require('os');

var loadLiteXML=require('./xml').loadLiteXML;
var buildTopChain=require('./parse-chain').buildTopChain;
Expand Down Expand Up @@ -141,6 +141,10 @@ ParseContext.prototype = {
if(path.indexOf(base) ==0){
path = path.substring(base.length-1);
}
//resolve path when url scheme is file and win32
if(cu.scheme=='file' && os.platform()=='win32'){
path = this.config.root.resolve(path.replace(/^\//,'./'))+'';
}
var cu = this.currentURI;
if(cu){
//if(cu.scheme == 'data'){
Expand Down
4 changes: 3 additions & 1 deletion src/main/js/parse/xml.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
const os = require('os');
function loadLiteXML(uri,root,options){
try{
if(uri instanceof URI){
if(uri.source){
return parseXMLByText(uri.source.replace(/^[\s\ufeff]*/,uri,options))
}else if(uri.scheme == 'lite'){
//resolve path when url scheme is file and win32
}else if(uri.scheme == 'lite' || (uri.scheme=='file' && os.platform()=='win32')){
var path = uri.path+(uri.query||'')+(uri.fragment || '');
path = root.resolve(path.replace(/^\//,'./'))+'';
}else{
Expand Down