Merge pull request #3026 from storytouch/develop

Fix #2918. Re-enable editor after user is reconnected to server
2016-07-21 15:42:38 -03:00 · 2016-07-21 15:42:38 -03:00 · 81b11be54a
parent 3fcc7aa190 c92e3e4b5e
commit 81b11be54a
2 changed files with 8 additions and 0 deletions
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@ -769,6 +769,7 @@ var pad = {
    var wasConnecting = (padconnectionstatus.getStatus().what == 'connecting');
    if (newState == "CONNECTED")
    {
+      padeditor.enable();
      padconnectionstatus.connected();
    }
    else if (newState == "RECONNECTING")
--- a/src/static/js/pad_editor.js
+++ b/src/static/js/pad_editor.js
@ -198,6 +198,13 @@ var padeditor = (function()
        self.ace = null;
      }
    },
+    enable: function()
+    {
+      if (self.ace)
+      {
+        self.ace.setEditable(true);
+      }
+    },
    disable: function()
    {
      if (self.ace)