improved handling of webview element

lookitscook · May 20, 2015 · 16555f6 · 16555f6
1 parent 4e1c8e5
commit 16555f6
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/src/js/browser.js b/src/js/browser.js
@@ -1,23 +1,38 @@
 $(function(){
 
   var RESTART_DELAY = 1000;
-  var display;
 
   chrome.storage.local.get('url',function(data){
      var restarting = false;
 
-     $('#browser').on('exit',function(e){ restart(); });
-     $('#browser').on('unresponsive',function(e){ if(e.originalEvent.isTopLevel) restart(); });
-     $('#browser')
-      .on('loadabort',function(e){ if(e.originalEvent.isTopLevel) restart(); })
-      .attr('src',data["url"]).get(0).reload();
+     loadContent(data["url"]);
 
-     function restart(){
-       if(!restarting){ 
+     function loadContent(url){
+       $('<webview id="browser"/>')
+        .css({
+          width:'100%',
+          height:'100%',
+          position:'absolute',
+          top:0,
+          left:0,
+          right:0,
+          bottom:0
+        })
+        .attr('partition','persistant:kiosk')
+        .on('exit',onEnded)
+        .on('unresponsive',onEnded)
+        .on('loadabort',onEnded)
+        .attr('src',url)
+        .prependTo('body');
+     }
+
+     function onEnded(event){
+       if(!restarting){
          restarting = true;
+         $("#browser").remove();
          setTimeout(function(){
+           loadContent(data["url"]);
            restarting = false;
-           $('#browser').attr('src',data["url"]).get(0).reload();
          },RESTART_DELAY);
       }
      }

diff --git a/src/manifest.json b/src/manifest.json
@@ -2,7 +2,7 @@
   "name": "Kiosk",
   "description": "Launch any URL as a full-screen kiosk.",
   "manifest_version": 2,
-  "version": "5.2.1",
+  "version": "5.2.2",
   "author": {
     "name": "ZEBRADOG",
     "email": "support@zebradog.com"

diff --git a/src/windows/browser.html b/src/windows/browser.html
@@ -5,7 +5,5 @@
     <script language="javascript" type="text/javascript" src="../www/js/jquery.min.js"></script>
     <script language="javascript" type="text/javascript" src="../js/browser.js"></script>
   </head>
-  <body style="margin:0;padding:0;background:black">
-      <webview id="browser" src="" style="width:100%; height:100%; position:absolute; top:0; left:0; right:0; bottom:0;"></webview>
-  </body>
+  <body style="margin:0;padding:0;background:black"></body>
 </html>