Better Tern loading

public/js/editor-settings.js

@@ -22,7 +22,7 @@
     }
   };
 
-  var template = {
+  window.template = {
     html: null
   };
 
@@ -93,7 +93,7 @@
   }, currentSettings.editor));
   jsbin.panels.panels.javascript.editor = editor;
   jsbin.panels.panels.html.editor = editor;
-  template.html = editor.getValue();
+  window.template.html = editor.getValue();
 
   var $CodeMirror = $('.CodeMirror');
 
@@ -165,11 +165,17 @@
     }, newSettingsEditor));
     jsbin.panels.panels.javascript.editor = editor;
     jsbin.panels.panels.html.editor = editor;
-    template.html = editor.getValue();
+    window.template.html = editor.getValue();
     $CodeMirror = $('.CodeMirror');
     $CodeMirror.css('font-size', $fontsize.val()+'px');
     editor.refresh();
-    reloadAddons();
+    // Do not load Tern files
+    var tempAddonsKeys = addonsKeys.slice(0);
+    var tempAddonsKeysTern = tempAddonsKeys.indexOf('tern');
+    if (tempAddonsKeysTern !== -1) {
+      tempAddonsKeys.splice(tempAddonsKeysTern, 1);
+    }
+    reloadAddons(tempAddonsKeys);
 
     // Save on server
     $.ajax({

public/js/editors/addons.js

@@ -1,6 +1,6 @@
 (function () {
   'use strict';
-  /*globals $, jsbin, CodeMirror, startTern*/
+  /*globals $, jsbin, CodeMirror*/
 
   var defaults = {
     closebrackets: true,
@@ -149,10 +149,11 @@
       test: function () {
         return jsbin.panels.panels.javascript.editor.openDialog &&
                CodeMirror.showHint &&
-               CodeMirror.TernServer;
+               CodeMirror.TernServer &&
+               CodeMirror.startTern;
       },
       done: function () {
-        startTern();
+        CodeMirror.startTern();
       }
     }
   };
@@ -238,8 +239,13 @@
   options.forEach(loadAddon);
 
   // External method to realod all the addons
-  window.reloadAddons = function() {
-    options.forEach(loadAddon);
+  window.reloadAddons = function(arr) {
+    if (arr) {
+      arr.forEach(loadAddon);
+    }
+    else {
+      options.forEach(loadAddon);
+    }
   };
 
 })();

public/js/editors/tern.js

@@ -104,7 +104,7 @@
     }
   };
 
-  window.startTern = function() {
+  CodeMirror.startTern = function() {
     loadTern(jsbin.panels.panels.javascript.editor);
     searchTernDefinition(template.html);