Skip to content

Commit

Permalink
Fix some bugs that can only be found on IE11.
Browse files Browse the repository at this point in the history
  • Loading branch information
alan-wu committed Jun 5, 2019
1 parent 8c71697 commit 0ea062f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
5 changes: 5 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,7 @@
"webpack-jquery-ui": "^1.0.0",
"zincjs": "^0.29.11"
},
"dependencies": {}
"dependencies": {
"polyfill-array-includes": "^2.0.0"
}
}
1 change: 1 addition & 0 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//require("./styles/bootstrap.min.css");
require("./styles/w3.css");
require('./styles/bootstrap.min.css');
require("polyfill-array-includes");

exports.BaseModule = require("./modules/BaseModule").BaseModule;
exports.BodyViewer = require("./modules/bodyRenderer").BodyViewer;
Expand Down
7 changes: 3 additions & 4 deletions src/modules/bodyRenderer.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
var THREE = require('zincjs').THREE;
var ITEM_LOADED = require("../utility").ITEM_LOADED;

/**
* Provides rendering of the 3D-scaffold data in the dom of the provided id with models
* defined in the modelsLoader.
Expand Down Expand Up @@ -40,7 +39,7 @@ var BodyViewer = function(ModelsLoaderIn) {
var bodyClicked = false;
for (var i = 0; i < intersects.length; i++) {
if (intersects[i] !== undefined && (intersects[ i ].object.name !== undefined)) {
if (!intersects[ i ].object.name.includes("Body")) {
if (intersects[ i ].object.name.indexOf("Body") === -1) {
_this.setSelectedByObjects([intersects[ i ].object], true);
_this.displayMessage(intersects[ i ].object.name + " selected.");
return;
Expand All @@ -61,7 +60,7 @@ var BodyViewer = function(ModelsLoaderIn) {
var bodyHovered = false;
for (var i = 0; i < intersects.length; i++) {
if (intersects[i] !== undefined && (intersects[ i ].object.name !== undefined)) {
if (!intersects[ i ].object.name.includes("Body")) {
if (intersects[ i ].object.name.indexOf("Body") === -1) {
_this.displayArea.style.cursor = "pointer";
_this.toolTip.setText(intersects[ i ].object.name);
_this.toolTip.show(window_x, window_y);
Expand Down Expand Up @@ -204,7 +203,7 @@ var BodyViewer = function(ModelsLoaderIn) {
var readModel = function(systemName, partName, startup) {
if (_this.scene) {
var speciesMeta = systemMeta[currentSpecies];
item = speciesMeta[systemName][partName];
var item = speciesMeta[systemName][partName];
if (item["loaded"] == ITEM_LOADED.FALSE) {
var downloadPath = item["BodyURL"];
var scaling = false;
Expand Down

0 comments on commit 0ea062f

Please sign in to comment.