Fixed file library sync.

Fixed raw .txt mod.
Moved simple/ to basic/ folder and adjusted corresponding references.

Author: MarkusBordihn

package.json

@@ -12,6 +12,7 @@
     "jsdoc": "^3.5.5",
     "karma": "^1.7.1",
     "karma-chrome-launcher": "^2.2.0",
+    "karma-closure": "^0.1.3",
     "npm-check-updates": "^2.14.1",
     "nw": "^0.29.0",
     "nw-builder": "^3.5.1",
@@ -41,7 +42,6 @@
     "test-core": "echo Starting core tests ... && karma start test/core_tests.conf",
     "pretest-mode": "npm run build && npm run build-cwc-main-debug",
     "test-mode": "echo Starting mode tests ... && karma start test/mode_tests.conf",
-
     "prebuild-cwc-soy": "npm run clean-soy_files",
     "prebuild-cwc-gss": "npm run clean-gss_files",
     "build-cwc": "npm run build-cwc-deps && npm run build-cwc-main",
@@ -62,7 +62,6 @@
     "build-external-frameworks": "node build/external/frameworks.js",
     "build-external-static": "node build/external/static_files.js",
     "build-framework-files": "npm run build-external-frameworks && npm run build-cwc-frameworks",
-
     "prebuild-core": "npm run clean-core",
     "prebuild-chrome-app": "npm run clean-chrome_app",
     "prebuild-chrome-app-debug": "npm run clean-chrome_app",
@@ -78,27 +77,23 @@
     "build-nw_app_debug": "npm run clean-nw_app && node build/app/nw_app_debug.js",
     "build-third_party": "npm run clean-third_party && npm run build-external-frameworks && npm run build-external-extra && npm run build-external-static",
     "build-web_app": "npm run clean-web_app && node build/app/web_app.js",
-
     "publish-chrome_app": "npm run build-chrome_app",
     "publish-nw_app": "npm run publish-nw_app-win && npm run publish-nw_app-mac && npm run publish-nw_app-linux",
     "publish-nw_app-win": "nwbuild --platforms win --buildDir genfiles/ dist/nw_app/",
     "publish-nw_app-mac": "nwbuild --platforms osx64 --buildDir genfiles/ dist/nw_app/",
     "publish-nw_app-linux": "nwbuild --platforms linux --buildDir genfiles/ dist/nw_app/",
-
     "chrome-app": "npm run build-core && npm run build-cwc-main && npm run build-chrome_app && npm run launch",
     "chrome-app-debug": "npm run build-core && npm run build-cwc-main-debug && npm run build-chrome_app && npm run launch",
     "nw-app": "npm run build-core &&  npm run build-cwc-main && npm run build-nw_app && npm run launch-nw",
     "nw-app-debug": "npm run build-core &&  npm run build-cwc-main-debug && npm run build-nw_app && npm run launch-nw",
     "web-app": "npm run build-core && npm run build-cwc-main && npm run build-web_app && npm run launch-web",
     "web-app-debug": "npm run build-core && npm run build-cwc-main-debug && npm run build-web_app && npm run launch-web",
-
-    "launch": "echo Lauching app. Please wait ... && npm run launch-linux --silent || npm run launch-mac --silent || npm run launch-win --silent",
+    "launch": "echo Lauching app. Please wait ... && npm run launch-linux --silent || npm run launch-mac --silent || npm run launch-win --silent",
     "launch-nw": "nw dist/nw_app",
     "launch-linux": "google-chrome --load-and-launch-app=$PWD/dist/chrome_os --enable-logging --v=1 --no-first-run",
     "launch-mac": "\"/Applications/Google Chrome.app/Contents/MacOS/Google Chrome\" --load-and-launch-app=$PWD/dist/chrome_os --enable-logging --v=1 --no-first-run",
     "launch-web": "http-server dist/web_app",
     "launch-win": "echo && \"C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe\" --load-and-launch-app=%CD%\\dist\\chrome_os --enable-logging --v=1 --no-first-run --enable-experimental-web-platform-features",
-
     "clean": "npm run clean-npm && npm run clean-chrome_app && npm run clean-core && npm run clean-soy_files && npm run clean-test && npm run clean-third_party",
     "clean-chrome_app": "echo Cleaning up Chrome app dist files. Please wait ... && rimraf dist/chrome_os/*",
     "clean-core": "echo Cleaning up core genfiles. Please wait ... && rimraf genfiles/core/*",
@@ -110,7 +105,6 @@
     "clean-nw_app": "echo Cleaning up NW.js app dist files. Please wait ... && rimraf dist/nw_app/*",
     "clean-web_app": "echo Cleaning up Web app dist files. Please wait ... && rimraf dist/web_app/*",
     "clean-build": "npm run clean && npm run build",
-
     "documentation": "jsdoc src -r -c documentation.json -d docs",
     "deploy": "npm test && git push",
     "lint": "eslint .",

src/file_handler/file_handler.js

@@ -93,7 +93,6 @@ cwc.fileHandler.File.prototype.setFile = function(file) {
  * @param {string=} filename
  */
 cwc.fileHandler.File.prototype.setRawFile = function(content, filename) {
-  console.log('Set raw content to:', content);
   this.clear(true);
   this.rawFile_ = content;
   this.filename_ = filename || '';

src/file_handler/file_loader.js

@@ -139,7 +139,7 @@ cwc.fileHandler.FileLoader.prototype.loadGDriveFileData = function(id,
 cwc.fileHandler.FileLoader.prototype.handleFileData = function(data,
     filename = '', fileHandler = null, gDriveId = undefined) {
   return new Promise((resolve) => {
-    this.log_.info('Handle file data:', data);
+    this.log_.info('Handle file data ... (', data.length, ')');
     let fileInstance = this.helper.getInstance('file', true);
     let modeInstance = this.helper.getInstance('mode', true);
     let mimeType = cwc.file.getMimeTypeByNameAndContent(filename || '', data);

src/mode/default/mod.js

@@ -158,6 +158,17 @@ cwc.mode.default.Mod.prototype.decorate = function() {
 };
 
 
+/**
+ * Decorates standard Editor.
+ */
+cwc.mode.default.Mod.prototype.decorateRaw = function() {
+  let layoutInstance = this.helper.getInstance('layout', true);
+  layoutInstance.decorateBlank();
+  layoutInstance.renderContent(cwc.soy.mode.default.Layout.editor);
+  this.decorateEditor();
+};
+
+
 /**
  * Decorates Blockly
  */

src/mode/modder.js

@@ -57,7 +57,7 @@ cwc.mode.Modder = function(helper) {
   /** @private {!goog.events.EventTarget} */
   this.eventHandler_ = new goog.events.EventTarget();
 
-  /** @type {string} */
+  /** @private {string} */
   this.templatePath_ = '../resources/templates/';
 };
 
@@ -134,6 +134,7 @@ cwc.mode.Modder.prototype.setFilename = function(filename) {
  * @param {cwc.mode.Type} mode
  */
 cwc.mode.Modder.prototype.postMode = function(mode) {
+  this.log_.info('Post handling for', mode);
   let modeConfig = cwc.mode.Config.get(mode);
 
   // Preview Handling
@@ -144,7 +145,7 @@ cwc.mode.Modder.prototype.postMode = function(mode) {
   }
 
   // File handling
-  let fileHandlerInstance = this.helper.getInstance('fileHandler');
+  let fileHandlerInstance = this.helper.getInstance('file');
   if (fileHandlerInstance) {
     if (fileHandlerInstance.hasLibraryFiles()) {
       this.syncLibrary();
@@ -221,9 +222,8 @@ cwc.mode.Modder.prototype.showBlockly = function() {
  * Syncs the library with the existing files.
  */
 cwc.mode.Modder.prototype.syncLibrary = function() {
-  let fileInstance = this.helper.getInstance('file');
   let libraryInstance = this.helper.getInstance('library');
-  if (fileInstance && libraryInstance) {
+  if (libraryInstance) {
     libraryInstance.syncFiles();
   }
 };

src/mode/text/mod.js

@@ -37,7 +37,7 @@ cwc.mode.text.Mod = function(helper) {
  */
 cwc.mode.text.Mod.prototype.decorate = function() {
   this.mod.setRenderer(null);
-  this.mod.decorate();
+  this.mod.decorateRaw();
   this.mod.editor.enableModeSelect(true);
   this.mod.editor.showEditorViews(false);
   this.mod.editor.showExpandButton(false);

src/protocol/low-level/default/device.js

@@ -58,7 +58,7 @@ cwc.protocol.default.Device = function() {
   /** @type {!cwc.utils.Logger} */
   this.log = new cwc.utils.Logger();
 
-  /** @private {!goog.events.EventTarget} */
+  /** @type {!goog.events.EventTarget} */
   this.eventHandler = new goog.events.EventTarget();
 };
 

src/ui/layout/layout.js

@@ -439,6 +439,15 @@ cwc.ui.Layout.prototype.handleResizeEvent = function() {
 };
 
 
+/**
+ * @param {!function ({prefix: string}, null=): soydata.SanitizedHtml} template
+ * @param {string=} prefix
+ */
+cwc.ui.Layout.prototype.renderContent = function(template, prefix = '') {
+  this.renderContent_(template, this.getNode('content'), prefix);
+};
+
+
 /**
  * @param {!function ({prefix: string}, null=): soydata.SanitizedHtml} template
  * @param {string=} prefix

src/ui/library/library.js

@@ -179,19 +179,18 @@ cwc.ui.Library.prototype.updateLibraryFileList = function(files = null,
  * Syncs the files with the library.
  */
 cwc.ui.Library.prototype.syncFiles = function() {
-  let blocklyInstance = this.helper.getInstance('blockly');
-  let editorInstance = this.helper.getInstance('editor');
   let fileInstance = this.helper.getInstance('file');
-  this.numOfFiles_ = 0;
-
   if (fileInstance) {
+    this.numOfFiles_ = 0;
     let files = this.getFiles();
     if (files && fileInstance.getFiles().getSize() > 0) {
       this.log_.info('Syncing library ', fileInstance.getFiles().getSize(),
         ' files...');
+      let blocklyInstance = this.helper.getInstance('blockly');
       if (blocklyInstance) {
         blocklyInstance.setToolboxFiles(files);
       }
+      let editorInstance = this.helper.getInstance('editor');
       if (editorInstance) {
         editorInstance.updateLibraryButton(fileInstance.getFiles().hasFiles());
       }

src/ui/select_screen/advanced/basic/basic.soy

@@ -55,39 +55,39 @@
           {call cwc.soy.SelectScreenTemplate.fileCard data="all"}
             {param title: 'Hello World' /}
             {param text: 'Hello World example' /}
-            {param file: 'simple/script/Hello-World.cwc' /}
+            {param file: 'basic/script/Hello-World.cwc' /}
             {param opt_color_class: 'bg-blue' /}
             {param opt_icon: 'speaker_notes' /}
           {/call}
 
           {call cwc.soy.SelectScreenTemplate.fileCard data="all"}
             {param title: 'Text loop' /}
             {param text: 'Text loop example' /}
-            {param file: 'simple/script/Text-Loop.cwc' /}
+            {param file: 'basic/script/Text-Loop.cwc' /}
             {param opt_color_class: 'bg-blue' /}
             {param opt_icon: 'repeat' /}
           {/call}
 
           {call cwc.soy.SelectScreenTemplate.fileCard data="all"}
             {param title: 'Line loop' /}
             {param text: 'Draw lines with loops' /}
-            {param file: 'simple/script/Line-Loop.cwc' /}
+            {param file: 'basic/script/Line-Loop.cwc' /}
             {param opt_color_class: 'bg-blue' /}
             {param opt_icon: 'repeat' /}
           {/call}
 
           {call cwc.soy.SelectScreenTemplate.fileCard data="all"}
             {param title: 'Point loop' /}
             {param text: 'Draw points with random colors and loops' /}
-            {param file: 'simple/script/Point-Loop.cwc' /}
+            {param file: 'basic/script/Point-Loop.cwc' /}
             {param opt_color_class: 'bg-blue' /}
             {param opt_icon: 'repeat' /}
           {/call}
 
           {call cwc.soy.SelectScreenTemplate.fileCard data="all"}
             {param title: 'Draw Portal Turret' /}
             {param text: 'Draw a Portal Turret' /}
-            {param file: 'simple/script/Draw-Portal-Turret.cwc' /}
+            {param file: 'basic/script/Draw-Portal-Turret.cwc' /}
             {param opt_color_class: 'bg-blue' /}
             {param opt_icon: 'palette' /}
           {/call}