mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10637 from owncloud/fixing-js-issues 

Init vars with a value if none is provided
This commit is contained in:
Thomas Müller 2014-08-29 10:16:29 +02:00
parent 745ec12002 ba0e65753b
commit ed2424c382
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/js/js.js
View File

@ -234,6 +234,7 @@ var OC={
*/
generateUrl: function(url, params) {
var _build = function (text, vars) {
var vars = vars || [];
return text.replace(/{([^{}]*)}/g,
function (a, b) {
var r = vars[b];

3
core/js/tests/specs/coreSpec.js
View File

@ -376,6 +376,9 @@ describe('Core base tests', function() {
it('substitutes parameters', function() {
expect(OC.generateUrl('apps/files/download{file}', {file: '/Welcome.txt'})).toEqual(OC.webroot + '/index.php/apps/files/download/Welcome.txt');
});
it('doesnt error out with no params provided', function () {
expect(OC.generateUrl('apps/files/download{file}')).toEqual(OC.webroot + '/index.php/apps/files/download{file}');
});
});
describe('Main menu mobile toggle', function() {
var clock;