wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix generateUrl for webpack

Browse source 
OC.generateUrl(OC.linkTo('contacts', 'js/')) will append index.php, we
should not have that!

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2018-10-01 07:58:12 +02:00 committed by Roeland Jago Douma
parent b7d82e9262
commit 834f3df19a
No known key found for this signature in database
GPG key ID: F941078878347C0C
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
settings/js/settings-vue.js
View file

@ -88,5 +88,5 @@ o.default.use(me);var Se={API_FAILURE:function(e,n){try{var r=n.error.response.d
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
Object(i.sync)(Oe,Wt),r.nc=btoa(OC.requestToken),r.p=OC.generateUrl(OC.linkTo("settings","js/")),o.default.prototype.t=t,o.default.prototype.OC=OC,o.default.prototype.OCA=OCA,o.default.prototype.oc_userconfig=oc_userconfig,o.default.prototype.oc_current_user=oc_current_user;var Ce=new o.default({router:Wt,store:Oe,render:function(t){return t(f)}}).$mount("#content")}]); Object(i.sync)(Oe,Wt),r.nc=btoa(OC.requestToken),r.p=OC.linkTo("settings","js/"),o.default.prototype.t=t,o.default.prototype.OC=OC,o.default.prototype.OCA=OCA,o.default.prototype.oc_userconfig=oc_userconfig,o.default.prototype.oc_current_user=oc_current_user;var Ce=new o.default({router:Wt,store:Oe,render:function(t){return t(f)}}).$mount("#content")}]);
//# sourceMappingURL=settings-vue.js.map //# sourceMappingURL=settings-vue.js.map

2
settings/js/settings-vue.js.map
View file

File diff suppressed because one or more lines are too long

13
settings/package-lock.json generated
View file

@ -3292,7 +3292,8 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
@ -3707,7 +3708,8 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.1", "version": "5.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
@ -3763,6 +3765,7 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
@ -3806,12 +3809,14 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.2", "version": "3.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
} }
} }
}, },

2
settings/src/main.js
View file

@ -37,7 +37,7 @@ __webpack_nonce__ = btoa(OC.requestToken)
// OC.linkTo matches the apps folders // OC.linkTo matches the apps folders
// OC.generateUrl ensure the index.php (or not) // OC.generateUrl ensure the index.php (or not)
// eslint-disable-next-line // eslint-disable-next-line
__webpack_public_path__ = OC.generateUrl(OC.linkTo('settings', 'js/')) __webpack_public_path__ = OC.linkTo('settings', 'js/')
// bind to window // bind to window
Vue.prototype.t = t; Vue.prototype.t = t;