verbessere PDF Rendering

1 files changed, 29 insertions, 25 deletions

diff --git a/js/index.js b/js/index.js
index cf02132..d3934af 100644
--- a/js/index.js
+++ b/js/index.js
@@ -22,7 +22,7 @@ $(document).bind('pageinit', function(){
     setTimeout(function(){
         load();
         $('#lnklogin').click();
-    }, 500);
+    }, 1000);
 
     setTimeout(function(){
         trylogin();
@@ -30,7 +30,7 @@ $(document).bind('pageinit', function(){
 });
 
 /* PDF Rendering */
-function renderPage(div, pdf, pageNumber, callback){
+function renderPage($div, pdf, pageNumber, callback){
     pdf.getPage(pageNumber).then(function(page){
         var scale = 2;
         var viewport = page.getViewport(scale);
@@ -49,7 +49,7 @@ function renderPage(div, pdf, pageNumber, callback){
         canvas.height = pageDisplayHeight;
 
         pageDivHolder.appendChild(canvas);
-        div.appendChild(pageDivHolder);
+        $div.append(pageDivHolder);
 
         var renderContext = {
             canvasContext: context,
@@ -63,14 +63,14 @@ function render_pdf(url, divstr){
     console.log('Rendere PDF: ' + url + ' (' + divstr + ')');
 
     PDFJS.getDocument(url).then(function(pdf){
-        var viewer = document.getElementById(divstr);
-        console.log(viewer.text);
+        var $viewer = $('#' + divstr);
+
         var pageNumber = 1;
-        renderPage(viewer, pdf, pageNumber++, function pageRenderingComplete(){
+        renderPage($viewer, pdf, pageNumber++, function pageRenderingComplete(){
             if(pageNumber > pdf.numPages){
                 return;
             }
-            renderPage(viewer, pdf, pageNumber++, pageRenderingComplete);
+            renderPage($viewer, pdf, pageNumber++, pageRenderingComplete);
         });
     });
 }
@@ -84,28 +84,32 @@ function fail(text){
 /* fügt die lokale URL des Plans ein und ruft die Seite zum Rendering auf */
 function addplanattr(fileEntry){
     var sPath = fileEntry.toURL();
-    var name = fileEntry.name.replace('.pdf', '');
-    name = name.replace(/[ ,]/g, '');
-
+    var name = fileEntry.name;
     console.log('Dateiname: ' + name);
 
-    $('#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');
-        }
-    });
+    var fname_re = new RegExp('.*?([^-]{4})-([^-]{2})-([^-]{2}).*?\.pdf'); // \d funktioniert nicht
+    var results = name.match(fname_re);
+    name = results[3] + "_" + results[2] + "_" + results[1];
 
-    $('#vplannavbar').navbar('destroy');
-    $('#vplannavbar ul').append('<li><a href="#' + name + '">' + name + '</a></li>');
-    $('#vplannavbar').navbar();
+    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');
+            }
+        });
 
-    $('#vplantabs').append('<div id="' + name + '" class="ui-content tablist-content">Bitte warten...</div>');
-    $('#vplantabs').tabs('refresh');
+        $('#vplannavbar').navbar('destroy');
+        $('#vplannavbar ul').append('<li><a href="#' + name + '">' + name.replace(/_/g, '.') + '</a></li>');
+        $('#vplannavbar').navbar();
 
+        $('#vplantabs').append('<div id="' + name + '" class="ui-content tablist-content"></div>');
+        $('#vplantabs').tabs('refresh');
+    }
+    
     render_pdf(sPath, name);
 }
 
@@ -294,7 +298,7 @@ function trylogin(){
 
 /* gibt aktuelle Pläne aus entries zurück */
 function getactual(entries){
-    var fname_re = new RegExp('([^-]{4})-([^-]{2})-([^-]{2})(.*?)\.pdf'); // \d funktioniert nicht
+    var fname_re = new RegExp('.*?([^-]{4})-([^-]{2})-([^-]{2}).*?\.pdf'); // \d funktioniert nicht
     var today = new Date();
     var actual = [];