From 48e964260319b0a675b86025c89d97437531a01a Mon Sep 17 00:00:00 2001 From: christophe-g Date: Wed, 12 Nov 2014 09:54:01 +0100 Subject: [PATCH 1/2] bugfix for eXide stall on state restore --- resources/css/eXide.css | 1 + src/eXide.js | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/css/eXide.css b/resources/css/eXide.css index 1550ee73..56d916b2 100755 --- a/resources/css/eXide.css +++ b/resources/css/eXide.css @@ -1477,6 +1477,7 @@ div#valueHighLight { .tree li { list-style-type:none; margin:0; + display:table; /*padding:13px 0px 0px 0px;*/ line-height: 0.9em; font-size:10px; diff --git a/src/eXide.js b/src/eXide.js index 984b4203..e600bb83 100755 --- a/src/eXide.js +++ b/src/eXide.js @@ -133,7 +133,7 @@ eXide.app = (function(util) { // var southStatus = localStorage.getItem("eXide.layout.south"); // $("#layout-container").layout().toggle("south"); - if (eXide.configuration.allowGuest) { + if (eXide.configuration && eXide.configuration.allowGuest) { $("#splash").fadeOut(400); } else { app.requireLogin(function() { @@ -993,8 +993,7 @@ eXide.app = (function(util) { return { branch: function(gitApp) { - console.info('git.branch'); - if(!app.login.isAdmin) {return} + if(!app.login || !app.login.isAdmin) {return} $.ajax({ type: "GET", url: gitUrl, From 7904a79bc68712132ead4c5ae4e4f2085e305521 Mon Sep 17 00:00:00 2001 From: christophe-g Date: Wed, 12 Nov 2014 10:03:56 +0100 Subject: [PATCH 2/2] style tree stuff --- resources/css/eXide.css | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/css/eXide.css b/resources/css/eXide.css index 56d916b2..1550ee73 100755 --- a/resources/css/eXide.css +++ b/resources/css/eXide.css @@ -1477,7 +1477,6 @@ div#valueHighLight { .tree li { list-style-type:none; margin:0; - display:table; /*padding:13px 0px 0px 0px;*/ line-height: 0.9em; font-size:10px;