Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 69a7c9b

Browse files
committed
Fix parseUrl() to detect pydio:// instead of ajxp.xx://
1 parent fe3a52c commit 69a7c9b

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

core/src/plugins/gui.ajax/res/js/core/util/LangUtils.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ var LangUtils = (function () {
2727
LangUtils.parseUrl = function parseUrl(data) {
2828
var matches = $A();
2929
//var e=/((http|ftp):\/)?\/?([^:\/\s]+)((\/\w+)*\/)([\w\-\.]+\.[^#?\s]+)(#[\w\-]+)?/;
30-
var detect = /(((ajxp\.)(\w+)):\/)?\/?([^:\/\s]+)((\/\w+)*\/)(.*)(#[\w\-]+)?/g;
30+
var detect = /(pydio:\/)?\/?([^:\/\s]+)((\/\w+)*\/)(.*)(#[\w\-]+)?/g;
3131
var results = data.match(detect);
3232
if (results && results.length) {
33-
var e = /^((ajxp\.(\w+)):\/)?\/?([^:\/\s]+)((\/\w+)*\/)(.*)(#[\w\-]+)?$/;
33+
var e = /^((pydio):\/)?\/?([^:\/\s]+)((\/\w+)*\/)(.*)(#[\w\-]+)?$/;
3434
for (var i = 0; i < results.length; i++) {
3535
if (results[i].match(e)) {
3636
matches.push({ url: RegExp['$&'],
3737
protocol: RegExp.$2,
38-
host: RegExp.$4,
39-
path: RegExp.$5,
40-
file: RegExp.$7,
41-
hash: RegExp.$8 });
38+
host: RegExp.$3,
39+
path: RegExp.$4,
40+
file: RegExp.$6,
41+
hash: RegExp.$7 });
4242
}
4343
}
4444
}

core/src/plugins/gui.ajax/res/js/es6/util/LangUtils.es6

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ class LangUtils{
2222
static parseUrl(data) {
2323
var matches = $A();
2424
//var e=/((http|ftp):\/)?\/?([^:\/\s]+)((\/\w+)*\/)([\w\-\.]+\.[^#?\s]+)(#[\w\-]+)?/;
25-
var detect=/(((ajxp\.)(\w+)):\/)?\/?([^:\/\s]+)((\/\w+)*\/)(.*)(#[\w\-]+)?/g;
25+
var detect = /(pydio:\/)?\/?([^:\/\s]+)((\/\w+)*\/)(.*)(#[\w\-]+)?/g;
2626
var results = data.match(detect);
2727
if(results && results.length){
28-
var e=/^((ajxp\.(\w+)):\/)?\/?([^:\/\s]+)((\/\w+)*\/)(.*)(#[\w\-]+)?$/;
28+
var e = /^((pydio):\/)?\/?([^:\/\s]+)((\/\w+)*\/)(.*)(#[\w\-]+)?$/;
2929
for(var i=0;i<results.length;i++){
3030
if(results[i].match(e)){
3131
matches.push({url: RegExp['$&'],

0 commit comments

Comments
 (0)