eslintにそって修正

Babibubebon · May 3, 2016 · faece58 · faece58
1 parent dc64b6a
commit faece58
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 28 deletions.
diff --git a/js/canvas-model.js b/js/canvas-model.js
@@ -2,13 +2,15 @@ import eventPublisher from "./publisher";
 
 // HTMLCanvasElementをラップし, canvasRenderingContext2Dに関する操作を提供する
 function CanvasModel(element) {
+  let changeDrawState;
+
   this.element = element;
 
   this.context = this.element.getContext("2d");
   this.drawState = "idling";
 
   // TODO: PaintManagerにうつす
-  var changeDrawState = (drawState) => {
+  changeDrawState = (drawState) => {
     this.drawState = drawState;
   };
   eventPublisher.subscribe("drawState", changeDrawState);

diff --git a/js/drawing-configuration.js b/js/drawing-configuration.js
@@ -11,9 +11,10 @@ function DrawingConfiguration() {
 // publishをしたいため。
 DrawingConfiguration.prototype.setDefaultValues = function() {
   this.defaultPalleteColors = [];
-  eventPublisher.subscribe("defaultPalleteColors:after", (defaultPalleteColors) => {
-    this.defaultPalleteColors = defaultPalleteColors;
-  });
+  eventPublisher.subscribe("defaultPalleteColors:after",
+      (defaultPalleteColors) => {
+        this.defaultPalleteColors = defaultPalleteColors;
+      });
   eventPublisher.publish("defaultPalleteColors", ["red", "orange", "yellow",
     "lightgreen", "green", "skyblue", "blue", "purple", "black", "white"]);
 

diff --git a/js/frames-controller.js b/js/frames-controller.js
@@ -4,11 +4,14 @@ import CanvasModel from "./canvas-model";
 
 // frame の追加・削除、currentFrameの切り替えをModel上で行う
 function FramesController(canvas) {
+  let updateImageDataToNextData;
+  let callAppendFrame;
+  let callRemoveFrame;
   this.frames = [];
   this.currentFrameId = 0;
   this.canvasModel = new CanvasModel(canvas);
-  var updateImageDataToNextData = (frameId) => {
-    var beforeFrame = this.getCurrentFrame();
+  updateImageDataToNextData = (frameId) => {
+    let beforeFrame = this.getCurrentFrame();
     // beforeFrameは削除されている可能性がある
     if (typeof beforeFrame !== "undefined") {
       beforeFrame.imageData = this.canvasModel.getImageData();
@@ -18,25 +21,16 @@ function FramesController(canvas) {
   };
   eventPublisher.subscribe("currentFrameId", updateImageDataToNextData);
 
-  var callAppendFrame = (nextFrameId) => {
+  callAppendFrame = (nextFrameId) => {
     this.append(nextFrameId);
   };
   eventPublisher.subscribe("appendFrame", callAppendFrame);
 
-  var callRemoveFrame = (frameId) => {
+  callRemoveFrame = (frameId) => {
     this.remove(frameId);
   };
   eventPublisher.subscribe("removeFrame", callRemoveFrame);
-
-}
-
-function changeCurrentFrameIdAfter(frameId) {
-  let nextImageData;
 
-  this.currentFrameId = frameId;
-
-  nextImageData = this.getCurrentFrame().imageData;
-  eventPublisher.publish("imageData", nextImageData);
 }
 
 // パラメータ id : どこの後ろに追加するのか（今は実装していない）
@@ -53,7 +47,8 @@ FramesController.prototype.remove = function(id) {
     nextCurrentFrameId--;
   }
   this.frames.splice(id, 1);
-  this.canvasModel.setImageData(this.getFrameById(nextCurrentFrameId).imageData);
+  this.canvasModel.setImageData(
+    this.getFrameById(nextCurrentFrameId).imageData);
   eventPublisher.publish("frames", this.frames);
   eventPublisher.publish("currentFrameId", nextCurrentFrameId);
 };

diff --git a/js/publisher.js b/js/publisher.js
@@ -14,22 +14,17 @@ Publisher.prototype.publish = function(type, nextData) {
   if (type.indexOf(":") !== -1) {
     throw new Error("publishのtypeに「:」を含むことはできません。");
   }
-  console.log({type: type, nextData: nextData, observers: this.observers[type]});
-
   if (typeof this.observers[type] === "undefined") {
     this.observers[type] = [];
   }
   this.observers[type].forEach(observer => {
     observer(nextData);
   });
   if (typeof this.observers[type + ":after"] !== "undefined") {
-    console.log(":after " + type);
-    console.log({type: type, nextData: nextData, observersAfter: this.observers[type + ":after"]});
     this.observers[type + ":after"].forEach(observer => {
       observer(nextData);
     });
   }
-  console.log(":end " + type);
 };
 
 export default new Publisher();

diff --git a/js/view/color-picker-view.js b/js/view/color-picker-view.js
@@ -4,8 +4,8 @@ function ColorPickerView(elem) {
   // このelem には、ul要素が入ってくる（はず）。
   this.element = elem;
   eventPublisher.subscribe("color", (color) => {
-    var selectedPalette = this.element.querySelector(".selected-palette");
-    var nextPalette;
+    let selectedPalette = this.element.querySelector(".selected-palette");
+    let nextPalette;
     if (selectedPalette !== null) {
       selectedPalette.classList.remove("selected-palette");
     }

diff --git a/js/view/sequence-view.js b/js/view/sequence-view.js
@@ -1,7 +1,6 @@
 import eventPublisher from "./../publisher";
 
 function SequencePanel(elem) {
-  console.log(eventPublisher);
   this.elem = elem;
   this.maxFrameId = 0;
   this.currentFrameId = 0;
@@ -11,7 +10,8 @@ function SequencePanel(elem) {
   });
   eventPublisher.subscribe("frames", (frames) => {
     this.clear();
-    for (this.maxFrameId = 0; this.maxFrameId < frames.length; this.maxFrameId++) {
+    for (this.maxFrameId = 0;
+        this.maxFrameId < frames.length; this.maxFrameId++) {
       this.append(this.maxFrameId);
     }
     this.maxFrameId--; // 1つ多くなってしまうから
@@ -38,7 +38,10 @@ function SequencePanel(elem) {
   </div>
 </div>
 */
-function getFrameTemplate(frameId, mousedownFrameCallback, mousedownRemoveCallback) {
+function getFrameTemplate(
+    frameId,
+    mousedownFrameCallback,
+    mousedownRemoveCallback) {
   let frame = document.createElement("div");
   let frameDeleteBtn = document.createElement("button");
   let frameUpBtn = document.createElement("button");