Fix bugs for importing modules

simulator/js/Scene.js

@@ -215,6 +215,25 @@ class Scene {
     return JSON.stringify(jsonData, null, 2);
   }
 
+  /**
+   * Add a module definition.
+   * @param {string} moduleName
+   * @param {ModuleDef} moduleDef
+   * @returns {boolean} Whether the module is successfully added.
+   */
+  addModule(moduleName, moduleDef) {
+    this.modules[moduleName] = moduleDef;
+
+    // Update all module objects.
+    for (let i in this.objs) {
+      if (this.objs[i].constructor.type === "ModuleObj") {
+        this.objs[i] = new objTypes.ModuleObj(this, this.objs[i].serialize());
+      }
+    }
+
+    return true;
+  }
+
   /**
    * Remove a given module and demodulize all corresponding module objects.
    * @param {string} moduleName 

simulator/js/index.js

@@ -729,13 +729,13 @@ function importModule(name) {
       for (let moduleName in moduleJSON.modules) {
         if (moduleJSON.modules.hasOwnProperty(moduleName)) {
           let newModuleName = moduleName;
-          if (scene.modules[moduleName]) {
+          if (scene.modules[moduleName] && JSON.stringify(scene.modules[moduleName]) != JSON.stringify(moduleJSON.modules[moduleName])){
             newModuleName = prompt(getMsg('module_conflict'), moduleName);
             if (!newModuleName) {
               continue;
             }
           }
-          scene.modules[newModuleName] = moduleJSON.modules[moduleName];
+          scene.addModule(newModuleName, moduleJSON.modules[moduleName]);
         }
       }
     } catch (e) {

simulator/js/objs/special/ModuleObj.js

@@ -57,6 +57,8 @@ objTypes['ModuleObj'] = class extends BaseSceneObj {
   populateObjBar(objBar) {
     objBar.createNote('<span style="font-family: monospace; padding-right:2px">' + this.module + '</span>');
 
+    if (this.notDone) return;
+
     try {
       for (let param of this.moduleDef.params) {
         const parsed = this.parseVariableRange(param, {});
@@ -142,7 +144,9 @@ objTypes['ModuleObj'] = class extends BaseSceneObj {
     if (this.moduleDef.numPoints > 0) {
       this.points.push({ x: mousePos.x, y: mousePos.y });
     }
+  }
 
+  onConstructMouseUp(mouse, ctrl, shift) {
     if (this.points.length === this.moduleDef.numPoints) {
       // All control points have been added.
       this.notDone = false;
@@ -151,7 +155,8 @@ objTypes['ModuleObj'] = class extends BaseSceneObj {
       this.expandObjs();
 
       return {
-        isDone: true
+        isDone: true,
+        requiresObjBarUpdate: true
       };
     }
   }

simulator/locales/de.js

@@ -923,6 +923,6 @@ locales["de"] = {
   },
   "module_conflict": {
     "incomplete": true,
-    "message": "A module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
+    "message": "A different module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
   }
 }

simulator/locales/en.js

@@ -808,6 +808,6 @@ locales["en"] = {
     "message": "Remove module"
   },
   "module_conflict": {
-    "message": "A module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
+    "message": "A different module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
   }
 }

simulator/locales/es.js

@@ -842,6 +842,6 @@ locales["es"] = {
   },
   "module_conflict": {
     "incomplete": true,
-    "message": "A module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
+    "message": "A different module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
   }
 }

simulator/locales/fr.js

@@ -972,6 +972,6 @@ locales["fr"] = {
   },
   "module_conflict": {
     "incomplete": true,
-    "message": "A module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
+    "message": "A different module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
   }
 }

simulator/locales/ja.js

@@ -1076,6 +1076,6 @@ locales["ja"] = {
   },
   "module_conflict": {
     "incomplete": true,
-    "message": "A module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
+    "message": "A different module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
   }
 }

simulator/locales/ko.js

@@ -1076,6 +1076,6 @@ locales["ko"] = {
   },
   "module_conflict": {
     "incomplete": true,
-    "message": "A module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
+    "message": "A different module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
   }
 }

simulator/locales/nl.js

@@ -988,6 +988,6 @@ locales["nl"] = {
   },
   "module_conflict": {
     "incomplete": true,
-    "message": "A module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
+    "message": "A different module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
   }
 }

simulator/locales/pl.js

@@ -867,6 +867,6 @@ locales["pl"] = {
   },
   "module_conflict": {
     "incomplete": true,
-    "message": "A module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
+    "message": "A different module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
   }
 }

simulator/locales/pt_BR.js

@@ -870,6 +870,6 @@ locales["pt-BR"] = {
   },
   "module_conflict": {
     "incomplete": true,
-    "message": "A module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
+    "message": "A different module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
   }
 }

simulator/locales/ru.js

@@ -976,6 +976,6 @@ locales["ru"] = {
   },
   "module_conflict": {
     "incomplete": true,
-    "message": "A module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
+    "message": "A different module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
   }
 }

simulator/locales/si.js

@@ -987,6 +987,6 @@ locales["si"] = {
   },
   "module_conflict": {
     "incomplete": true,
-    "message": "A module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
+    "message": "A different module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
   }
 }

simulator/locales/template.js

@@ -1077,6 +1077,6 @@ locales["LOCALE_ID"] = {
   },
   "module_conflict": {
     "incomplete": true,
-    "message": "A module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
+    "message": "A different module with the same name already exists in the current scene. You may enter a new name, or leave it the same to overwrite the existing module."
   }
 }

simulator/locales/zh_CN.js

@@ -809,6 +809,6 @@ locales["zh-CN"] = {
     "message": "移除模块"
   },
   "module_conflict": {
-    "message": "场景中已有一个同名的模块。您可以指定新的名称，或保留相同名称以取代原模块。"
+    "message": "场景中已有一个同名但不相同的模块。您可以指定新的名称，或保留相同名称以取代原模块。"
   }
 }

simulator/locales/zh_TW.js

@@ -809,6 +809,6 @@ locales["zh-TW"] = {
     "message": "移除模組"
   },
   "module_conflict": {
-    "message": "場景中已有一個同名的模組。您可以指定新的名稱，或保留相同名稱以取代原模組。"
+    "message": "場景中已有一個同名但不相同的模組。您可以指定新的名稱，或保留相同名稱以取代原模組。"
   }
 }