Fixed smaller code issues for perparing next release.

MarkusBordihn · MarkusBordihn · commit cbbdefc0f4b2 · 2018-09-20T19:15:03.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -80,13 +80,13 @@
     "depswriter": "python third_party/closure-library/closure/bin/build/depswriter.py --root_with_prefix=\"src/ ../../../../src/\"",
     "documentation": "jsdoc src -r -c documentation.json -d docs",
     "launch": "echo Lauching app. Please wait ... && npm run launch:linux --silent || npm run launch:mac --silent || npm run launch:win-experimental --silent",
-    "launch:linux": "google-chrome --load-and-launch:app=$PWD/dist/chrome_os --enable-logging --v=1 --no-first-run",
+    "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:nw": "nw dist/nw_app",
     "launch:web": "http-server dist/web_app",
-    "launch:win": "echo && \"C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe\" --profile-directory=Default --app-id=becloognjehhioodmnimnehjcibkloed --enable-logging --v=1 --no-first-run",
-    "launch:win-beta": "echo && \"C:\\Program Files (x86)\\Google\\Chrome Beta\\Application\\chrome.exe\" --profile-directory=Default --app-id=becloognjehhioodmnimnehjcibkloed --enable-logging --v=1 --no-first-run --enable-experimental-web-platform-features",
-    "launch:win-experimental": "echo && \"C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe\" --profile-directory=Default --app-id=becloognjehhioodmnimnehjcibkloed --enable-logging --v=1 --no-first-run --enable-experimental-web-platform-features",
+    "launch:win": "echo && \"C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe\" --profile-directory=Default --load-and-launch-app=%CD%\\dist\\chrome_os --enable-logging --v=1 --no-first-run",
+    "launch:win-beta": "echo && \"C:\\Program Files (x86)\\Google\\Chrome Beta\\Application\\chrome.exe\" --profile-directory=Default --load-and-launch-app=%CD%\\dist\\chrome_os --enable-logging --v=1 --no-first-run --enable-experimental-web-platform-features",
+    "launch:win-experimental": "echo && \"C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe\" --profile-directory=Default --load-and-launch-app=%CD%\\dist\\chrome_os --enable-logging --v=1 --no-first-run --enable-experimental-web-platform-features",
     "lint": "npm run lint-javascript && npm run lint-markdown",
     "lint-javascript": "eslint .",
     "lint-markdown": "markdownlint doc/ training/ *.md src/**/*.md",
diff --git a/src/file_format/file_format.js b/src/file_format/file_format.js
@@ -297,13 +297,16 @@ cwc.fileFormat.File.prototype.getFrameworks = function() {
 /**
  * @param {string} name
  * @param {string=} namespace
+ * @param {boolean=} quiet
  * @return {!string|Array}
  */
 cwc.fileFormat.File.prototype.getMetadata = function(
-    name, namespace = this.metedataNamespace_) {
+    name, namespace = this.metedataNamespace_, quiet = false) {
   if (!(namespace in this.metadata_) ||
       (name && !(name in this.metadata_[namespace]))) {
-    this.log_.warn('Unknown meta data', namespace + (name ? '.' + name : ''));
+    if (!quiet) {
+      this.log_.warn('Unknown meta data', namespace + (name ? '.' + name : ''));
+    }
     return '';
   }
   if (name) {
@@ -409,18 +412,12 @@ cwc.fileFormat.File.prototype.getTitle = function() {
  * @return {Object}
  */
 cwc.fileFormat.File.prototype.getTour = function(language = 'eng') {
-  let tour = this.getMetadata('', '__tour__');
-  let userLanguage = language;
-  if (tour) {
-    if (!tour[userLanguage]) {
-      this.log_.warn('Tour is not available in user\'s language', language);
-      userLanguage = 'eng';
-    }
-    if (tour[userLanguage]) {
-      return tour[userLanguage];
-    }
+  let tour = this.getMetadata(language, '__tour__', true);
+  if (!tour && this.getMetadata(null, '__tour__', true)) {
+    this.log_.warn('Tour is not available in user\'s language', language);
+    return this.getMetadata('eng', '__tour__', true);
   }
-  return null;
+  return tour;
 };
 
 
@@ -429,18 +426,12 @@ cwc.fileFormat.File.prototype.getTour = function(language = 'eng') {
  * @return {Object}
  */
 cwc.fileFormat.File.prototype.getTutorial = function(language = 'eng') {
-  let tutorial = this.getMetadata('', '__tutorial__');
-  let userLanguage = language;
-  if (tutorial) {
-    if (!tutorial[userLanguage]) {
-      this.log_.warn('Tutorial is not available in user\'s language', language);
-      userLanguage = 'eng';
-    }
-    if (tutorial[userLanguage]) {
-      return tutorial[userLanguage];
-    }
+  let tutorial = this.getMetadata(language, '__tutorial__', true);
+  if (!tutorial && this.getMetadata(null, '__tutorial__', true)) {
+    this.log_.warn('Tutorial is not available in user\'s language', language);
+    return this.getMetadata('eng', '__tutorial__', true);
   }
-  return null;
+  return tutorial;
 };
 
 
diff --git a/src/file_handler/file_loader.js b/src/file_handler/file_loader.js
@@ -242,21 +242,24 @@ cwc.fileHandler.FileLoader.prototype.loadCWCFile = async function(data,
 
   // Handle tour data
   let tourInstance = this.helper.getInstance('tour');
-  if (tourInstance) {
-    tourInstance.setTour(file.getTour(userLanguage));
+  let tourAvailable = file.getTour(userLanguage);
+  if (tourInstance && tourAvailable) {
+    tourInstance.setTour(tourAvailable);
   }
 
   // Handle tutorial data
   let tutorialInstance = this.helper.getInstance('tutorial');
-  if (tutorialInstance) {
+  let tutorialAvailable = file.getTutorial(userLanguage);
+  if (tutorialInstance && tutorialAvailable) {
     tutorialInstance.setTutorial(file.getTutorial(userLanguage));
   }
 
   // Handle sidebar icons
   let sidebarInstance = this.helper.getInstance('sidebar');
   if (sidebarInstance) {
     sidebarInstance.enableDescription(file.getDescription());
-    sidebarInstance.enableTour(file.getTour(userLanguage));
+    sidebarInstance.enableTour(tourAvailable);
+    sidebarInstance.enableTutorial(tutorialAvailable);
     sidebarInstance.showLibrary(true);
     sidebarInstance.showMedia(false);
   }
diff --git a/src/frameworks/sphero/sphero2/sphero2.js b/src/frameworks/sphero/sphero2/sphero2.js
@@ -47,7 +47,7 @@ cwc.framework.sphero.Sphero2 = function() {
     },
   };
 
-  /** @private {} */
+  /** @private {Object} */
   this.events_ = {
     collision: function() {},
     position: function() {},
diff --git a/src/frameworks/sphero/sprk_plus/sprk_plus.js b/src/frameworks/sphero/sprk_plus/sprk_plus.js
@@ -47,7 +47,7 @@ cwc.framework.sphero.SprkPlus = function() {
     },
   };
 
-  /** @private {} */
+  /** @private {Object} */
   this.events_ = {
     collision: function() {},
     position: function() {},
diff --git a/src/mode/sphero/sprk_plus/simulation/command.js b/src/mode/sphero/sprk_plus/simulation/command.js
@@ -48,6 +48,8 @@ cwc.mode.sphero.sprkPlus.SimulationCommand = function(turtle) {
  */
 cwc.mode.sphero.sprkPlus.SimulationCommand.prototype['__handshake__'] =
     function() {
+  this.angle_ = 0;
+  this.heading_ = 0;
   this.turtle.action('scale', this.scale_);
   this.turtle.action('speed', this.speed_);
   this.turtle.reset();
@@ -72,7 +74,7 @@ cwc.mode.sphero.sprkPlus.SimulationCommand.prototype['roll'] = function(data) {
   }
   this.angle_ = heading;
   this.turtle.action('rt', angle);
-  this.turtle.action('fd', speed);
+  this.turtle.action('fd', speed * 0.75);
 };
 
 
diff --git a/src/ui/blockly/blockly.gss b/src/ui/blockly/blockly.gss
@@ -17,3 +17,11 @@
 #{$prefix}blockly-code {
   position: relative;
 }
+
+#{$prefix}blockly-toolbar .mdl-navigation {
+  height: auto;
+}
+
+#{$prefix}blockly-toolbar .mdl-navigation__link {
+  line-height: inherit;
+}
diff --git a/src/ui/editor/editor.gss b/src/ui/editor/editor.gss
@@ -73,3 +73,11 @@
 #{$prefix}editor-code-custom {
   box-shadow: 0 2px 4px rgba(0, 0, 0, .1);
 }
+
+#{$prefix}editor-toolbar .mdl-navigation {
+  height: auto;
+}
+
+#{$prefix}editor-toolbar .mdl-navigation__link {
+  line-height: inherit;
+}
diff --git a/src/ui/sidebar/sidebar.js b/src/ui/sidebar/sidebar.js
@@ -240,6 +240,7 @@ cwc.ui.Sidebar.prototype.enableTour = function(enabled) {
   this.enableButton('tour', enabled);
 };
 
+
 /**
  * @param {boolean} enabled
  */
diff --git a/src/ui/tutorial/validator.js b/src/ui/tutorial/validator.js
@@ -73,14 +73,17 @@ cwc.ui.TutorialValidator.prototype.start = function() {
     this.log_.info('No validation function, not running validation');
     return;
   }
-  if (!this.sandbox_) {
-    return;
-  }
+
   this.log_.info('Starting validation');
-  this.sandbox_ = this.webviewSupport_ ?
-    document.createElement('webview') : document.createElement('iframe');
 
   this.events_.clear();
+  if (!this.sandbox_) {
+    if (this.webviewSupport_) {
+      this.sandbox_ = document.createElement('webview');
+    } else {
+      this.sandbox_ = document.createElement('iframe');
+    }
+  }
   this.events_.listen(this.sandbox_,
     this.webviewSupport_ ? 'contentload' : 'onload',
     this.handleValidatorLoaded_);
@@ -102,7 +105,6 @@ cwc.ui.TutorialValidator.prototype.start = function() {
   this.sandbox_['src'] = contentUrl;
 };
 
-
 /**
  * Callback for validate.
  * @param {!object} result
diff --git a/test/unit_tests/file_format/file_format_test.js b/test/unit_tests/file_format/file_format_test.js
@@ -199,7 +199,7 @@ describe('File format', function() {
   });
 
   it('getTutorial (no tutorial)', function() {
-    expect((new cwc.fileFormat.File()).getTutorial()).toBe(null);
+    expect((new cwc.fileFormat.File()).getTutorial()).toBe('');
   });
 
   it('getTutorial (default language)', function() {
@@ -236,7 +236,7 @@ describe('File format', function() {
   });
 
   it('getTour (no tour)', function() {
-    expect((new cwc.fileFormat.File()).getTour()).toBe(null);
+    expect((new cwc.fileFormat.File()).getTour()).toBe('');
   });
 
   it('getTour (default language)', function() {
