summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2014-05-30 09:15:30 +0100
committerschneefux <schneefux+commit@schneefux.xyz>2016-08-15 20:02:08 +0200
commitb563b339a72a0be0b86f33d04c2d8d7d3485f3d8 (patch)
tree0dfe968097a21f99789e4de2035a3c584ce20a7b
parent07f3cbe9c41f9d57c5d89bbc1504b8eb41fc0741 (diff)
downloadwvs-vplan-b563b339a72a0be0b86f33d04c2d8d7d3485f3d8.tar.gz
wvs-vplan-b563b339a72a0be0b86f33d04c2d8d7d3485f3d8.zip
Crashfix bei fehlendem Datum im Dateinamen
-rw-r--r--js/index.js53
1 files changed, 27 insertions, 26 deletions
diff --git a/js/index.js b/js/index.js
index 4720ed2..fbf1afc 100644
--- a/js/index.js
+++ b/js/index.js
@@ -541,37 +541,40 @@ function addPlanAttr(fileEntry, wasdownloaded){
var fnameRe = new RegExp('.*?(\\d{4}-\\d{2}-\\d{2})(.*?)\\.pdf');
var results = name.match(fnameRe);
- var vdate = moment(results[1], 'YYYY-MM-DD').startOf('day');
+
+ if(results !== null){
+ var vdate = moment(results[1], 'YYYY-MM-DD').startOf('day');
- if(results[2] !== null){
- results[2] = results[2].replace(/[ ,]/g, '-').replace(/-{2}/g, '-');
- }
+ if(results[2] !== null){
+ results[2] = results[2].replace(/[ ,]/g, '-').replace(/-{2}/g, '-');
+ }
- name = vdate.format('DD_MM_YYYY') + replaceUmlauts(results[2]);
+ name = vdate.format('DD_MM_YYYY') + replaceUmlauts(results[2]);
- if(!$(name).length){
- $('#vplannavbar').find('*').andSelf().each(function(){
- $(this).removeClass(function(i, cn){
- var matches = cn.match(/ui-[\w\-]+/g) || [];
- return (matches.join(' '));
+ if(!$(name).length){
+ $('#vplannavbar').find('*').andSelf().each(function(){
+ $(this).removeClass(function(i, cn){
+ var matches = cn.match(/ui-[\w\-]+/g) || [];
+ return (matches.join(' '));
+ });
+ if($(this).attr('class') === ''){
+ $(this).removeAttr('class');
+ }
});
- if($(this).attr('class') === ''){
- $(this).removeAttr('class');
- }
- });
- $('#vplannavbar').navbar('destroy');
- $('#vplannavbar ul').append('<li><a href="#' + name + '">' + name.replace(/_/g, '.') + '</a></li>');
- $('#vplannavbar ul li:last').click(function(){
- trackPlan(vdate);
- });
+ $('#vplannavbar').navbar('destroy');
+ $('#vplannavbar ul').append('<li><a href="#' + name + '">' + name.replace(/_/g, '.') + '</a></li>');
+ $('#vplannavbar ul li:last').click(function(){
+ trackPlan(vdate);
+ });
- $('#vplannavbar').navbar();
+ $('#vplannavbar').navbar();
- $('#vplantabs').append('<div id="' + name + '" class="tablist-content"></div>');
- $('#vplantabs').tabs('refresh');
+ $('#vplantabs').append('<div id="' + name + '" class="tablist-content"></div>');
+ $('#vplantabs').tabs('refresh');
- $('#' + name).data('date', results[1]);
+ $('#' + name).data('date', results[1]);
+ }
}
renderPdf(sPath, name);
@@ -621,13 +624,11 @@ function getPlan(link){
var pdflink = $('.resourceworkaround a', resultHtml).attr('href');
if(pdflink === undefined){
- return 0;
+ return;
}
console.log('Plan gefunden: ' + pdflink);
downloadPdf(pdflink);
-
- return 1;
});
request.fail(fail);