Fixed smaller UI issues and compiler issues.

MarkusBordihn · MarkusBordihn · commit 2322204815f7 · 2019-02-05T16:06:55.000+01:00
diff --git a/app/chrome_app/manifest.json b/app/chrome_app/manifest.json
@@ -9,7 +9,7 @@
   "short_name": "Coding with Chrome",
   "description": "Learn, improve, or teach coding skills within a Chrome browser.",
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgSWdCJSwkgFTY9d993Quot277oCS2PCM2H/F6U28NE8D3Z21GXS/7qW8XCGShB054Wboq62pP679f9tB9F+GRHzOh/an4zIu+Uhb3ZKVzZLJbHsP8N+E5wk3wgwOBgE+UXCy9I8i1RpfzutJ4aha+YEzvCsVpo6UwsuWiXORB9yRU5NuooYX+fhVpWZmrZJo4vqzQhuoJ/uWiQujABXXo4qdrclwSw8+JlpWLMqHHQ6HE8Sf7VWDdGvRdYP6LRZobWqovb659qEumJ0bxhwXtHkWgPHQWtW35T/r/oH8uuke35pH+YtBtaOqN5U3bYGPinP0bYrI33OSLUJx/DrC1wIDAQAB",
-  "version": "5.10.16",
+  "version": "6.01.05",
   "oauth2": {
     "client_id": "418162477970-2qmsb2sp3m522hf292154favsjgpsj9n.apps.googleusercontent.com",
     "scopes": [
diff --git a/app/nw_app/package.json b/app/nw_app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "binary",
-  "version": "5.10.16",
+  "version": "6.01.05",
   "main": "js/background.js",
   "window": {
     "title": "Coding with Chrome",
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "coding-with-chrome",
   "description": "Coding with Chrome",
-  "version": "5.10.16",
+  "version": "6.01.05",
   "author": "Markus Bordihn (mbordihn@google.com)",
   "license": "Apache-2.0",
   "private": true,
diff --git a/src/config/config.js b/src/config/config.js
@@ -119,4 +119,4 @@ cwc.config.Sample = {
 /**
  * @type {string}
  */
-cwc.config.Version = '5.10.16';
+cwc.config.Version = '6.01.05';
diff --git a/src/mode/games/config.js b/src/mode/games/config.js
@@ -38,6 +38,7 @@ cwc.mode.games.Config = {};
 cwc.mode.games.Config[cwc.mode.Type.PHASER] = new cwc.mode.Mod({
   authors: ['Markus Bordihn'],
   auto_preview: true,
+  enable_library: true,
   icon: 'mode_edit',
   mime_types: [cwc.utils.mime.Type.CWC.type],
   mod: cwc.mode.phaser.Mod,
@@ -54,6 +55,7 @@ cwc.mode.games.Config[cwc.mode.Type.PHASER] = new cwc.mode.Mod({
 cwc.mode.games.Config[cwc.mode.Type.PHASER_BLOCKLY] = new cwc.mode.Mod({
   authors: ['Markus Bordihn'],
   auto_preview: true,
+  enable_library: true,
   icon: 'mode_edit',
   mime_types: [cwc.utils.mime.Type.CWC.type],
   mod: cwc.mode.phaser.Mod,
diff --git a/src/mode/markup/config.js b/src/mode/markup/config.js
@@ -38,6 +38,7 @@ cwc.mode.markup.Config = {};
 cwc.mode.markup.Config[cwc.mode.Type.HTML5] = new cwc.mode.Mod({
   authors: ['Markus Bordihn'],
   auto_preview: true,
+  enable_library: true,
   icon: 'public',
   mime_types: [cwc.utils.mime.Type.HTML.type],
   mod: cwc.mode.html5.Mod,
diff --git a/src/mode/modder.js b/src/mode/modder.js
@@ -138,10 +138,11 @@ cwc.mode.Modder.prototype.setMode = function(mode) {
     settingScreenInstance.hide();
   }
 
-  // Remove custom sidebar button.
+  // Handle sidebar button.
   let sidebarInstance = this.helper.getInstance('sidebar');
   if (sidebarInstance) {
     sidebarInstance.clear();
+    sidebarInstance.enableLibrary(modeConfig.enableLibrary);
   }
 
   // Reset Render instance.
diff --git a/src/mode/mode.js b/src/mode/mode.js
@@ -33,6 +33,9 @@ cwc.mode.Mod = function(config_data) {
   /** @type {boolean} */
   this.autoPreview = config_data.auto_preview || false;
 
+  /** @type {boolean} */
+  this.enableLibrary = config_data.enable_library || false;
+
   /** @type {!Array} */
   this.services = config_data.services || [];
 
diff --git a/src/ui/builder.js b/src/ui/builder.js
@@ -213,7 +213,7 @@ cwc.ui.Builder.prototype.decorate = async function(node = 'cwc-editor') {
   }, false, this);
 
   this.setProgress('Load and prepare user config ...', 1);
-  let userConfig = await new cwc.UserConfig(this.helper).prepare();
+  let userConfig = await new cwc.UserConfig().prepare();
   this.helper.setInstance('userConfig', userConfig);
 
   this.setProgress('Load and prepare i18n translations ...', 2);
diff --git a/src/ui/editor/infobar/editor_infobar.js b/src/ui/editor/infobar/editor_infobar.js
@@ -31,6 +31,9 @@ goog.require('cwc.utils.Events');
  * @final
  */
 cwc.ui.EditorInfobar = function(helper) {
+  /** @type {string} */
+  this.name = 'EditorInfobar';
+
   /** @type {!cwc.utils.Helper} */
   this.helper = helper;
 
diff --git a/src/ui/gapi/account.js b/src/ui/gapi/account.js
@@ -65,6 +65,9 @@ cwc.ui.gapi.Account = function(helper) {
   /** @type {string} */
   this.userLink = '';
 
+  /** @type {string} */
+  this.userLocal = 'en';
+
   /** @private {!cwc.utils.Logger} */
   this.log_ = new cwc.utils.Logger(this.name);
 };
@@ -135,12 +138,12 @@ cwc.ui.gapi.Account.prototype.requestUserInfo = function() {
  * @param {Object} user_info
  */
 cwc.ui.gapi.Account.prototype.setUserInfo = function(user_info) {
-  this.userName = user_info['name'] || '';
   this.userFamilyName = user_info['family_name'] || '';
   this.userGivenName = user_info['given_name'] || '';
-  this.userPicture = user_info['picture'] || '';
   this.userLink = user_info['link'] || '';
   this.userLocal = user_info['local'] || 'en';
+  this.userName = user_info['name'] || '';
+  this.userPicture = user_info['picture'] || '';
 };
 
 
diff --git a/src/ui/gapi/gclassroom/gclassroom.js b/src/ui/gapi/gclassroom/gclassroom.js
@@ -277,7 +277,7 @@ cwc.ui.gapi.Classroom.prototype.getMyCourses_ = function(callback) {
 
 
 /**
- * @param {int} courseId
+ * @param {number} courseId
  * @param {function(?)} callback
  * @private
  */
diff --git a/src/ui/help/help.js b/src/ui/help/help.js
@@ -61,7 +61,15 @@ cwc.ui.Help.prototype.showAbout = function() {
   noticeLink.addEventListener('click', this.showOpenSource.bind(this));
 
   let versionLink = goog.dom.getElement(this.prefix + 'version-link');
-  versionLink.addEventListener('click', this.showChangelog.bind(this));
+  versionLink.addEventListener('click', this.showChangeLog.bind(this));
+};
+
+
+cwc.ui.Help.prototype.showChangeLog = function() {
+  let whatsNewInstance = this.helper.getInstance('whatsNew');
+  if (whatsNewInstance) {
+    whatsNewInstance.showChangeLog();
+  }
 };
 
 
diff --git a/src/ui/message/message.js b/src/ui/message/message.js
@@ -115,7 +115,7 @@ cwc.ui.Message.prototype.decorate = function(node) {
 cwc.ui.Message.prototype.decorateCalibration = function(decorator) {
   this.decorate();
   this.decorateContent_(
-    decorator, this.nodeCalibration, this.nodeCalibrationTab);
+    this.nodeCalibration, this.nodeCalibrationTab, decorator);
 };
 
 
@@ -124,7 +124,7 @@ cwc.ui.Message.prototype.decorateCalibration = function(decorator) {
  */
 cwc.ui.Message.prototype.decorateControl = function(decorator) {
   this.decorate();
-  this.decorateContent_(decorator, this.nodeControl, this.nodeControlTab);
+  this.decorateContent_(this.nodeControl, this.nodeControlTab, decorator);
 };
 
 
@@ -133,7 +133,7 @@ cwc.ui.Message.prototype.decorateControl = function(decorator) {
  */
 cwc.ui.Message.prototype.decorateMonitor = function(decorator) {
   this.decorate();
-  this.decorateContent_(decorator, this.nodeMonitor, this.nodeMonitorTab);
+  this.decorateContent_(this.nodeMonitor, this.nodeMonitorTab, decorator);
 };
 
 
@@ -206,13 +206,13 @@ cwc.ui.Message.prototype.refresh_ = function() {
 
 
 /**
- * @param {Function=} decorator
  * @param {!Element} nodeContent
  * @param {!Element} nodeTab
+ * @param {Function=} decorator
  * @private
  */
 cwc.ui.Message.prototype.decorateContent_ = function(
-    decorator, nodeContent, nodeTab) {
+    nodeContent, nodeTab, decorator) {
   if (decorator && typeof decorator.decorate === 'function') {
     decorator.decorate(nodeContent);
   }
diff --git a/src/ui/navigation/navigation.js b/src/ui/navigation/navigation.js
@@ -87,10 +87,10 @@ cwc.ui.Navigation = function(helper) {
   /** @type {boolean} */
   this.supportGoogleClassroom = false;
 
-  /** @type {boolen} */
+  /** @type {boolean} */
   this.supportGoogleCloud = false;
 
-  /** @type {boolen} */
+  /** @type {boolean} */
   this.supportGoogleDrive = false;
 
   /** @type {!goog.ui.KeyboardShortcutHandler} */
diff --git a/src/ui/preview/preview.js b/src/ui/preview/preview.js
@@ -141,7 +141,10 @@ cwc.ui.Preview.prototype.decorate = function(node) {
   this.statusBar.decorate();
 
   // Status Button and actions buttons
-  this.decorateStatusButton(goog.dom.getElement(this.prefix + 'statusbutton'));
+  let nodeStatusButton = goog.dom.getElement(this.prefix + 'statusbutton');
+  if (nodeStatusButton) {
+    this.decorateStatusButton(nodeStatusButton);
+  }
 
   // Adding cleanup handler event
   let layoutInstance = this.helper.getInstance('layout');
diff --git a/src/ui/preview/status.js b/src/ui/preview/status.js
@@ -209,7 +209,8 @@ cwc.ui.PreviewStatus.prototype.handleUnresponsive_ = function() {
   dialogInstance.showActionCancel('Unresponsive Warning',
     'The preview is unresponsive! Terminate?', 'Terminate').then((answer) => {
       if (answer) {
-        this.terminate();
+        let previewInstance = this.helper.getInstance('preview');
+        previewInstance.terminate();
       }
     });
   this.eventTarget_.dispatchEvent(cwc.ui.PreviewEvents.unresponsive());
diff --git a/src/ui/select_screen/advanced/aiy/aiy.soy b/src/ui/select_screen/advanced/aiy/aiy.soy
@@ -40,11 +40,10 @@
     {/param}
 
     {param content kind="html"}
-      {call cwc.soy.SelectScreenTemplate.titleGrid data="all"}
-        {param text: 'Tutorials...' /}
-        {param opt_icon: 'school' /}
-      {/call}
+
       {call cwc.soy.SelectScreenTemplate.fileCardList}
+        {param title: 'Tutorials...' /}
+        {param icon: 'school' /}
         {param content kind="html"}
           {call cwc.soy.SelectScreenTemplate.fileCard data="all"}
             {param title: 'AIY Tutorial' /}
@@ -57,11 +56,9 @@
         {/param}
       {/call}
 
-      {call cwc.soy.SelectScreenTemplate.titleGrid data="all"}
-        {param text: 'Voice Kit...' /}
-        {param opt_icon: 'record_voice_over' /}
-      {/call}
       {call cwc.soy.SelectScreenTemplate.fileCardList}
+        {param title: 'Voice Kit...' /}
+        {param icon: 'record_voice_over' /}
         {param content kind="html"}
           {call cwc.soy.SelectScreenTemplate.fileCard data="all"}
             {param title: 'Voice Kit' /}
@@ -90,11 +87,9 @@
         {/param}
       {/call}
 
-      {call cwc.soy.SelectScreenTemplate.titleGrid data="all"}
-        {param text: 'Vision Kit...' /}
-        {param opt_icon: 'videocam' /}
-      {/call}
       {call cwc.soy.SelectScreenTemplate.fileCardList}
+        {param title: 'Vision Kit...' /}
+        {param icon: 'videocam' /}
         {param content kind="html"}
           {call cwc.soy.SelectScreenTemplate.fileCard data="all"}
             {param title: 'Vision Kit' /}
@@ -124,11 +119,9 @@
         {/param}
       {/call}
 
-      {call cwc.soy.SelectScreenTemplate.titleGrid data="all"}
-        {param text: 'LED Button...' /}
-        {param opt_icon: 'brightness_5' /}
-      {/call}
       {call cwc.soy.SelectScreenTemplate.fileCardList}
+        {param title: 'LED Button...' /}
+        {param icon: 'brightness_5' /}
         {param content kind="html"}
           {call cwc.soy.SelectScreenTemplate.fileCard data="all"}
             {param title: 'Illuminate while pressed' /}
@@ -148,6 +141,8 @@
           {/call}
         {/param}
       {/call}
+
     {/param}
   {/call}
+
 {/template}
diff --git a/src/ui/select_screen/advanced/programming/javascript/javascript.soy b/src/ui/select_screen/advanced/programming/javascript/javascript.soy
@@ -87,28 +87,26 @@
         {/param}
       {/call}
 
-    {/param}
-  {/call}
-
-  <div id="tutorial-javascript-content">
-    {call cwc.soy.SelectScreenTemplate.titleGrid data="all"}
-      {param text: 'Select a Tutorial ...' /}
-      {param opt_icon: 'school' /}
-    {/call}
+      {call cwc.soy.SelectScreenTemplate.fileCardList}
+        {param title: 'Select a Tutorial ...' /}
+        {param icon: 'school' /}
+        {param id: 'cwc-tutorial-list' /}
+        {param content kind="html"}
 
-    <div class="mdl-grid">
+          {call cwc.soy.SelectScreenTemplate.fileCard data="all"}
+            {param title: 'Scalable Vector Graphics' /}
+            {param text: 'Drawing with JavaScript' /}
+            {param opt_link_text: 'Learn to draw with JavaScript' /}
+            {param tutorial: 'javascript/script/svg.cwct' /}
+            {param opt_color_class: 'bg-light-blue' /}
+            {param opt_icon: 'school' /}
+          {/call}
 
-      {call cwc.soy.SelectScreenTemplate.fileCard data="all"}
-        {param title: 'Scalable Vector Graphics' /}
-        {param text: 'Drawing with JavaScript' /}
-        {param opt_link_text: 'Learn to draw with JavaScript' /}
-        {param tutorial: 'javascript/script/svg.cwct' /}
-        {param opt_color_class: 'bg-light-blue' /}
-        {param opt_icon: 'school' /}
+        {/param}
       {/call}
 
-    </div>
-  </div>
+    {/param}
+  {/call}
 
 {/template}
 
diff --git a/src/ui/select_screen/normal/basic/basic.soy b/src/ui/select_screen/normal/basic/basic.soy
diff --git a/src/ui/select_screen/select_screen.gss b/src/ui/select_screen/select_screen.gss
diff --git a/src/ui/select_screen/select_screen_templates.soy b/src/ui/select_screen/select_screen_templates.soy
diff --git a/src/ui/tour/tour.js b/src/ui/tour/tour.js
diff --git a/src/utils/events.js b/src/utils/events.js
diff --git a/src/utils/helper.js b/src/utils/helper.js
diff --git a/src/utils/i18n/i18n.js b/src/utils/i18n/i18n.js
diff --git a/src/utils/mime/mime_sniffer.js b/src/utils/mime/mime_sniffer.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "binary",`
`3`		`- "version": "5.10.16",`
	`3`	`+ "version": "6.01.05",`
`4`	`4`	`"main": "js/background.js",`
`5`	`5`	`"window": {`
`6`	`6`	`"title": "Coding with Chrome",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "coding-with-chrome",`
`3`	`3`	`"description": "Coding with Chrome",`
`4`		`- "version": "5.10.16",`
	`4`	`+ "version": "6.01.05",`
`5`	`5`	`"author": "Markus Bordihn ([email protected])",`
`6`	`6`	`"license": "Apache-2.0",`
`7`	`7`	`"private": true,`
Original file line number	Diff line number	Diff line change
`@@ -138,10 +138,11 @@ cwc.mode.Modder.prototype.setMode = function(mode) {`
`138`	`138`	`settingScreenInstance.hide();`
`139`	`139`	`}`
`140`	`140`
`141`		`- // Remove custom sidebar button.`
	`141`	`+ // Handle sidebar button.`
`142`	`142`	`let sidebarInstance = this.helper.getInstance('sidebar');`
`143`	`143`	`if (sidebarInstance) {`
`144`	`144`	`sidebarInstance.clear();`
	`145`	`+ sidebarInstance.enableLibrary(modeConfig.enableLibrary);`
`145`	`146`	`}`
`146`	`147`
`147`	`148`	`// Reset Render instance.`