0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

parse document position

Browse source
This commit is contained in:
j 2018-03-13 18:40:37 +05:30
commit a7d70c15ea
3 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
static/js/utils.js
View file

@ -1994,9 +1994,11 @@ pandora.getSpan = function(state, val, callback) {
if (Ox.contains(['epub', 'pdf', 'txt'], extension)) {
state.span = Ox.limit(parseInt(val), 1, dimensions);
} else if (Ox.contains(['html'], extension)) {
//fixme: allow numbers or check names?
//state.span = Ox.limit(parseInt(val), 0, 100);
state.span = val
if (pandora.isNumericalSpan(val)) {
state.span = Ox.limit(parseInt(val), 0, 100);
} else {
state.span = val;
}
} else if (Ox.contains(['gif', 'jpg', 'png'], extension)) {
values = val.split(',');
if (values.length == 4) {
@ -2443,6 +2445,12 @@ pandora.isLicensed = function() {
return !pandora.site.license || pandora.site.license > +new Date();
};
pandora.isNumericalSpan = function(str) {
return str.split(',').every(function(str) {
return /^[0-9-\.:]+$/.test(str);
});
}
pandora.isPrintURL = function(url) {
url = url || document.location.href;
var hash = Ox.parseURL(url).hash;