Merge pull request #645 from parallaxinc/project_cleanup_01

Project cleanup 01

src/modules/blocklyc.js

@@ -30,7 +30,6 @@ import {loadToolbox} from './editor';
 import {CodeEditor, getSourceEditor} from './code_editor';
 import {getProjectInitialState, Project} from './project';
 import {cloudCompile} from './compiler';
-import {showCannotCompileEmptyProject, showCompilerStatusWindow} from './modals';
 import {
   delay, logConsoleMessage, getURLParameter, sanitizeFilename, utils, prettyCode} from './utility';
 
@@ -174,6 +173,29 @@ const graph_data = {
   ],
 };
 
+
+/**
+ * Display a dialog window that warns of an attempt to compile
+ * an empty project.
+ *
+ * @param {string} title is the text to include in the dialog title bar
+ * @param {string} body is the text that is displayed in the body of the dialog
+ */
+const showCannotCompileEmptyProject = (title, body) => {
+  utils.showMessage(title, body);
+};
+
+
+/**
+ *  Display the compiler status modal window
+ * @param {string} titleBar is the text that will appear in the modal title bar
+ */
+const showCompilerStatusWindow = (titleBar) => {
+  $('#compile-dialog-title').text(titleBar);
+  $('#compile-console').val('Compile... ');
+  $('#compile-dialog').modal('show');
+};
+
 /**
  * This is the onClick event handler for the compile toolbar button
  */

src/modules/client_connection.js

@@ -313,7 +313,7 @@ function wsProcessUiCommand(message) {
       break;
 
     case WS_ACTION_CLOSE_COMPILE:
-      $('#compile-dialog').modal('hide');
+      hideCompilerStatusWindow();
       $('#compile-console').val('');
       break;
 
@@ -560,3 +560,13 @@ export const getComPort = function() {
     return commPortSelection;
   }
 };
+
+/**
+ * Close the compile progress window
+ */
+const hideCompilerStatusWindow = () => {
+  console.log('Hide Compiler dialog window.');
+  const dialog = document.getElementById('compile-dialog');
+  dialog.modal('hide');
+};
+

src/modules/client_service.js

@@ -265,12 +265,7 @@ export const clientService = {
    */
   setSelectedPort: function(portName) {
     // Do not select the 'Searching...' as a port
-    if (portName.startsWith('Search')) {
-      console.log(`Selecting a port while searching.`);
-      return;
-    }
-
-    if (this.activeConnection) {
+    if (!portName.startsWith('Search') && this.activeConnection) {
       if (portName !== this.getSelectedPort()) {
         this.selectedPort_ = portName;
         // Notify Launcher of the selected port

src/modules/constants.js

@@ -44,14 +44,14 @@ export const EnableSentry = true;
  *     {b#} is the beta release number.
  *     {rc#} is the release candidate number.
  */
-export const APP_VERSION = '1.5.13';
+export const APP_VERSION = '1.6.0';
 
 /**
  * Incremental build number. This gets updated before any release
  * to QA or production.
  * @type {string}
  */
-export const APP_BUILD = '220';
+export const APP_BUILD = '221';
 
 /**
  * Development build stage designator