Merge remote-tracking branch 'ninja-internal/master' into test-merge

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js

1 files changed, 32 insertions, 1 deletions

diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
index dabce6e0..13c9a705 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
@@ -52,6 +52,11 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
         }
     },
 
+    autoCompleteLabel: {
+        value: null,
+        serializable: true
+    },
+
     _autocomplete: {
         value: false
     },
@@ -73,7 +78,33 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
     },
 
     codeCompleteCheck: {
-        value: null
+        value: null,
+        serializable: true
+    },
+
+    zoomHottext: {
+        value: null,
+        serializable: true
+    },
+
+    comment: {
+        value: null,
+        serializable: true
+    },
+
+    uncomment: {
+        value: null,
+        serializable: true
+    },
+
+    themeSelect: {
+        value: null,
+        serializable: true
+    },
+
+    shortKeys: {
+        value: null,
+        serializable: true
     },
 
     prepareForDraw: {