diff --git a/assets/plugins/codemirror/cm/addon-compressed.js b/assets/plugins/codemirror/cm/addon-compressed.js
index 924cfd5d7b..afb4ddf38d 100755
--- a/assets/plugins/codemirror/cm/addon-compressed.js
+++ b/assets/plugins/codemirror/cm/addon-compressed.js
@@ -1072,9 +1072,9 @@ ts.activeArgHints=null}}
 function docValue(ts,doc){var val=doc.doc.getValue();if(ts.options.fileFilter)val=ts.options.fileFilter(val,doc.name,doc.doc);return val;}
 function WorkerServer(ts){var worker=ts.worker=new Worker(ts.options.workerScript);worker.postMessage({type:"init",defs:ts.options.defs,plugins:ts.options.plugins,scripts:ts.options.workerDeps});var msgId=0,pending={};function send(data,c){if(c){data.id=++msgId;pending[msgId]=c;}
 worker.postMessage(data);}
-worker.onmessage=function(e){var data=e.data;if(data.type=="getFile"){getFile(ts,data.name,function(err,text){send({type:"getFile",err:String(err),text:text,id:data.id});});}else if(data.type=="debug"){window.console.log(data.message);}else if(data.id&&pending[data.id]){pending[data.id](data.err,data.body);delete pending[data.id];}};worker.onerror=function(e){for(var id in pending)pending[id](e);pending={};};this.addFile=function(name,text){send({type:"add",name:name,text:text});};this.delFile=function(name){send({type:"del",name:name});};this.request=function(body,c){send({type:"req",body:body},c);};}});var server;this.onmessage=function(e){var data=e.data;switch(data.type){case"init":return startServer(data.defs,data.plugins,data.scripts);case"add":return server.addFile(data.name,data.text);case"del":return server.delFile(data.name);case"req":return server.request(data.body,function(err,reqData){postMessage({id:data.id,body:reqData,err:err&&String(err)});});case"getFile":var c=pending[data.id];delete pending[data.id];return c(data.err,data.text);default:throw new Error("Unknown message type: "+data.type);}};var nextId=0,pending={};function getFile(file,c){postMessage({type:"getFile",name:file,id:++nextId});pending[nextId]=c;}
+worker.onmessage=function(e){var data=e.data;if(data.type=="getFile"){getFile(ts,data.name,function(err,text){send({type:"getFile",err:String(err),text:text,id:data.id});});}else if(data.type=="debug"){window.console.log(data.message);}else if(data.id&&pending[data.id]){pending[data.id](data.err,data.body);delete pending[data.id];}};worker.onerror=function(e){for(var id in pending)pending[id](e);pending={};};this.addFile=function(name,text){send({type:"add",name:name,text:text});};this.delFile=function(name){send({type:"del",name:name});};this.request=function(body,c){send({type:"req",body:body},c);};}});/* Tern worker code, must not run in the main thread: var server;this.onmessage=function(e){var data=e.data;switch(data.type){case"init":return startServer(data.defs,data.plugins,data.scripts);case"add":return server.addFile(data.name,data.text);case"del":return server.delFile(data.name);case"req":return server.request(data.body,function(err,reqData){postMessage({id:data.id,body:reqData,err:err&&String(err)});});case"getFile":var c=pending[data.id];delete pending[data.id];return c(data.err,data.text);default:throw new Error("Unknown message type: "+data.type);}};var nextId=0,pending={};function getFile(file,c){postMessage({type:"getFile",name:file,id:++nextId});pending[nextId]=c;}
 function startServer(defs,plugins,scripts){if(scripts)importScripts.apply(null,scripts);server=new tern.Server({getFile:getFile,async:true,defs:defs,plugins:plugins});}
-this.console={log:function(v){postMessage({type:"debug",message:v});}};(function(mod){if(typeof exports=="object"&&typeof module=="object")
+if(typeof importScripts==="function")this.console={log:function(v){postMessage({type:"debug",message:v});}}; */(function(mod){if(typeof exports=="object"&&typeof module=="object")
 mod(require("../../lib/codemirror"));else if(typeof define=="function"&&define.amd)
 define(["../../lib/codemirror"],mod);else
 mod(CodeMirror);})(function(CodeMirror){"use strict";var Pos=CodeMirror.Pos;function findParagraph(cm,pos,options){var startRE=options.paragraphStart||cm.getHelper(pos,"paragraphStart");for(var start=pos.line,first=cm.firstLine();start>first;--start){var line=cm.getLine(start);if(startRE&&startRE.test(line))break;if(!/\S/.test(line)){++start;break;}}
diff --git a/manager/media/script/main.js b/manager/media/script/main.js
index fc2c42e45f..c9c1d98fe5 100644
--- a/manager/media/script/main.js
+++ b/manager/media/script/main.js
@@ -359,7 +359,8 @@ function document_onload() {
     evo.tooltips('[data-tooltip], [data-toggle="tooltip"][title]');
     //evo.collapse('.panel-heading', 'panel-collapse');
 
-    if (document.forms.length && document.forms.mutate && window.frameElement.parentNode.parentNode.classList.contains('evo-popup')) {
+    var popupEl = window.frameElement && window.frameElement.parentNode ? window.frameElement.parentNode.parentNode : null;
+    if (document.forms.length && document.forms.mutate && popupEl && popupEl.classList && popupEl.classList.contains('evo-popup')) {
         window.focus();
         document.forms.mutate.addEventListener('submit', function (e) {
             if ((actionSelect && actionSelect.value === '') || (!actionSelect && actionSaveButton)) {
@@ -378,7 +379,7 @@ function document_onload() {
                         if (top.tree) {
                             top.tree.restoreTree();
                         }
-                        window.frameElement.parentNode.parentNode.close(e);
+                        popupEl.close(e);
                     }
                 };
                 xhr.open(document.forms.mutate.method, document.forms.mutate.action, true);
@@ -388,12 +389,12 @@ function document_onload() {
         }, false);
 
         actions.cancel = function () {
-            window.frameElement.parentNode.parentNode.close();
+            popupEl.close();
         };
 
         window.addEventListener('keydown', function (e) {
             if (e.keyCode === 27) {
-                window.frameElement.parentNode.parentNode.close();
+                popupEl.close();
             }
         });
     }