Commit 2ba8aa0d authored by Ronan Abhamon's avatar Ronan Abhamon

feat(ui/scripts/Utils/utils): `basename`/`dirname` supports windows paths

parent b84b29bd
...@@ -179,7 +179,7 @@ function getUriFromSystemPath (path) { ...@@ -179,7 +179,7 @@ function getUriFromSystemPath (path) {
var os = Qt.platform.os var os = Qt.platform.os
if (os === 'windows' || os === 'winrt') { if (os === 'windows' || os === 'winrt') {
return 'file://' + (/^[^:]+:/.exec(path) ? '' : '/') return 'file://' + (/^\w:/.exec(path) ? '/' : '') + path
} }
return 'file://' + path return 'file://' + path
...@@ -284,6 +284,11 @@ function assert (condition, message) { ...@@ -284,6 +284,11 @@ function assert (condition, message) {
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
function basename (str) { function basename (str) {
var os = Qt.platform.os
if (os === 'windows' || os === 'winrt') {
str = str.replace(/\\/g, '/')
}
var str2 = str var str2 = str
var length = str2.length - 1 var length = str2.length - 1
...@@ -303,6 +308,11 @@ function capitalizeFirstLetter (str) { ...@@ -303,6 +308,11 @@ function capitalizeFirstLetter (str) {
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
function dirname (str) { function dirname (str) {
var os = Qt.platform.os
if (os === 'windows' || os === 'winrt') {
str = str.replace(/\\/g, '/')
}
var str2 = str var str2 = str
var length = str2.length - 1 var length = str2.length - 1
......
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