[update] Update Babel packages

nus-mtp · Feb 11, 2016 · 714d6d2 · 714d6d2
1 parent 07707a1
commit 714d6d2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/package.json b/package.json
@@ -37,15 +37,15 @@
     "url": "https://github.com/nus-mtp/cubist/issues"
   },
   "dependencies": {
-    "babel-cli": "6.4.5",
-    "babel-core": "6.4.5",
+    "babel-cli": "6.5.1",
+    "babel-core": "6.5.1",
     "babel-plugin-add-module-exports": "0.1.2",
-    "babel-polyfill": "6.3.14",
-    "babel-preset-es2015": "6.3.13",
-    "babel-preset-react": "6.3.13",
-    "babel-preset-stage-0": "6.3.13",
-    "babel-register": "6.4.3",
-    "babel-runtime": "6.3.19",
+    "babel-polyfill": "6.5.0",
+    "babel-preset-es2015": "6.5.0",
+    "babel-preset-react": "6.5.0",
+    "babel-preset-stage-0": "6.5.0",
+    "babel-register": "6.5.1",
+    "babel-runtime": "6.5.0",
     "bcrypt": "0.8.5",
     "bluebird": "3.1.1",
     "body-parser": "1.14.2",
@@ -101,13 +101,13 @@
   "devDependencies": {
     "autoprefixer-loader": "3.1.0",
     "babel-eslint": "5.0.0-beta9",
-    "babel-loader": "6.2.1",
+    "babel-loader": "6.2.2",
     "chai": "3.4.1",
     "chai-immutable": "1.5.3",
     "coveralls": "2.11.6",
     "css-loader": "0.23.1",
     "eslint": "1.10.3",
-    "eslint-config-airbnb": "4.0.0",
+    "eslint-config-airbnb": "5.0.0",
     "eslint-plugin-mocha": "1.1.0",
     "eslint-plugin-react": "3.16.1",
     "extract-text-webpack-plugin": "1.0.1",

diff --git a/src/webapp/components/render/ModelCanvas.js b/src/webapp/components/render/ModelCanvas.js
@@ -81,14 +81,17 @@ class ModelCanvas extends React.Component {
     }
 
     // Walkthrough Trigger
-    if (nextProps.walkthroughToggle !== this.props.walkthroughToggle && nextProps.walkthroughToggle === true && this.modelScene) {
-      console.log('test');
+    if (nextProps.walkthroughToggle !== this.props.walkthroughToggle
+      && nextProps.walkthroughToggle === true && this.modelScene) {
       this.modelScene.updateWalkthroughState({ walkthroughToggle: nextProps.walkthroughToggle,
       playbackPoints: nextProps.playbackPoints, walkthroughPoints: nextProps.walkthroughPoints });
     }
     if (nextProps.viewIndex !== this.props.viewIndex && this.modelScene) {
       const { dispatch } = this.props;
-      this.modelScene.updateWalkthroughViewIndex({ walkthroughPoints: nextProps.walkthroughPoints, viewIndex: nextProps.viewIndex });
+      this.modelScene.updateWalkthroughViewIndex({
+        walkthroughPoints: nextProps.walkthroughPoints,
+        viewIndex: nextProps.viewIndex
+      });
       dispatch(WalkthroughActions.viewWalkthroughPoint(-1));
     }
 
@@ -149,9 +152,7 @@ class ModelCanvas extends React.Component {
   }
 
   _onPlaybackCompleted() {
-    console.log(this.modelScene.walkthroughState.startPlayback);
-    // const { dispatch } = this.props;
-    // dispatch(WalkthroughActions.playbackWalkthrough());
+
   }
 
   render() {

diff --git a/src/webapp/render/OrbitControls.js b/src/webapp/render/OrbitControls.js
@@ -283,7 +283,7 @@ class OrbitControl extends Three.EventDispatcher {
         this._rotateStart.set(event.touches[0].pageX, event.touches[0].pageY);
         break;
 
-      case 2: // two-fingered touch: dolly
+      case 2: { // two-fingered touch: dolly
         if (this.enableZoom === false) {
           return;
         }
@@ -293,7 +293,7 @@ class OrbitControl extends Three.EventDispatcher {
         const distance = Math.sqrt(dx * dx + dy * dy);
         this._dollyStart.set(0, distance);
         break;
-
+      }
       case 3: // three-fingered touch: pan
         if (this.enablePan === false) {
           return;
@@ -341,7 +341,7 @@ class OrbitControl extends Three.EventDispatcher {
         this.update();
         break;
 
-      case 2: // two-fingered touch: dolly
+      case 2: {// two-fingered touch: dolly
         if (this.enableZoom === false) {
           return;
         }
@@ -366,7 +366,7 @@ class OrbitControl extends Three.EventDispatcher {
 
         this.update();
         break;
-
+      }
       case 3: // three-fingered touch: pan
 
         if (this.enablePan === false) {