diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-07-28 14:20:55 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-07-28 14:20:55 +0200 |
| commit | 5a0d41048868eddd709c6e9bb71a8c5243d239c0 (patch) | |
| tree | ae7ae122e408a9994e846150a45a65c9308ac667 | |
| parent | ebfbb97e66ef5d4c3dbe6b2eb23d19cba9ab74bd (diff) | |
| download | nextcloud-server-5a0d41048868eddd709c6e9bb71a8c5243d239c0.tar.gz nextcloud-server-5a0d41048868eddd709c6e9bb71a8c5243d239c0.zip | |
tests for _parseTime with hex and empty strings
| -rw-r--r-- | core/js/share.js | 4 | ||||
| -rw-r--r-- | core/js/tests/specs/shareSpec.js | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/js/share.js b/core/js/share.js index f767da18da0..99fd08c6411 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -827,6 +827,10 @@ OC.Share={ */ _parseTime: function(time) { if (_.isString(time)) { + // skip empty strings and hex values + if (time === '' || (time.length > 1 && time[0] === '0' && time[1] === 'x')) { + return null; + } time = parseInt(time, 10); if(isNaN(time)) { time = null; diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js index a8beb807ccc..3dc25134f59 100644 --- a/core/js/tests/specs/shareSpec.js +++ b/core/js/tests/specs/shareSpec.js @@ -1324,6 +1324,8 @@ describe('OC.Share tests', function() { [ 123456 , 123456], ['0123456', 123456], ['abcdefg', null], + ['0x12345', null], + [ '', null], ], function(value) { expect(OC.Share._parseTime(value[0])).toEqual(value[1]); }); |