Merge pull request #109 from lukechurch/fix-create-new-scheme

Fix table not updating when a new scheme is created.
AfricasVoices · Nov 3, 2017 · 612aa6d · 612aa6d
2 parents cab9165 + e10a3eb
commit 612aa6d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/coda-prototype/src/ui/editorUI.js b/coda-prototype/src/ui/editorUI.js
@@ -254,11 +254,7 @@ var codeEditorManager = {
                     .removeClass("has-error");
 
                 newDataset.schemes[newId] = tempScheme;
-                messageViewerManager.codeSchemeOrder = [newId + ""].concat(messageViewerManager.codeSchemeOrder);
-                activeSchemeId = newId + "";
-                messageViewerManager.activeScheme = newId + "";
-
-                messageViewerManager.addNewSchemeColumn(tempScheme, name);
+                messageViewerManager.addNewSchemeColumn(tempScheme);
 
                 undoManager.markUndoPoint(messageViewerManager.codeSchemeOrder);
 

diff --git a/coda-prototype/src/ui/initUI.js b/coda-prototype/src/ui/initUI.js
@@ -632,7 +632,6 @@ function initUI(dataset) {
                 });
 
                 newDataset.schemes[newScheme["id"]] = newScheme;
-                messageViewerManager.codeSchemeOrder.push(newScheme["id"] + "");
                 messageViewerManager.addNewSchemeColumn(newScheme);
 
                 UIUtils.displayAlertAsSuccess("<strong>Success!</strong> New coding scheme was imported.");
@@ -822,12 +821,12 @@ function initUI(dataset) {
     /*
     SCHEME DUPLICATION
      */
+    // TODO: I don't think there is a scheme-duplicate button
     $("#scheme-duplicate").on("click", () => {
 
         let newScheme = tempScheme.duplicate(Object.keys(newDataset.schemes));
         newDataset.schemes[newScheme.id] = newScheme;
-        messageViewerManager.codeSchemeOrder.push(newScheme.id);
-        messageViewerManager.addNewSchemeColumn(newScheme, newScheme.name);
+        messageViewerManager.addNewSchemeColumn(newScheme);
 
         let headerDecoColumn = $("#header-decoration-column");
         let header = headerDecoColumn.find("[scheme='" + newScheme["id"] + "']");

diff --git a/coda-prototype/src/ui/tableUI.js b/coda-prototype/src/ui/tableUI.js
@@ -967,6 +967,8 @@ var messageViewerManager = {
     },
 
     addNewSchemeColumn: function(newScheme) {
+        messageViewerManager.codeSchemeOrder.push(newScheme.id);
+
         regexMatcher.codeDataset(newScheme["id"]);
         if (messageViewerManager.codeSchemeOrder.length === 1) {
             // means the default scheme is being added