better code layout

ripe-tech · Jul 5, 2018 · acf42b7 · acf42b7
1 parent 9067e77
commit acf42b7
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 35 deletions.
diff --git a/src/js/base/ripe.js b/src/js/base/ripe.js
@@ -191,19 +191,12 @@ ripe.Ripe.prototype.setParts = function(update, noUpdate, options) {
         update = this._partsList(update);
     }
 
-    if (!noUpdate) {
-        this.trigger("pre_parts", this.parts, options);
-    }
-
-    for (var index = 0; index < update.length; index++) {
-        var part = update[index];
-        this._setPart(part[0], part[1], part[2]);
-    }
-
     if (noUpdate) {
-        return;
+        return this._setParts(update);
     }
 
+    this.trigger("pre_parts", this.parts, options);
+    this._setParts(update);
     this.update();
     this.trigger("parts", this.parts, options);
     this.trigger("post_parts", this.parts, options);
@@ -367,6 +360,13 @@ ripe.Ripe.prototype._setPart = function(part, material, color) {
     this.trigger("post_part", part, value);
 };
 
+ripe.Ripe.prototype._setParts = function(update) {
+    for (var index = 0; index < update.length; index++) {
+        var part = update[index];
+        this._setPart(part[0], part[1], part[2]);
+    }
+};
+
 ripe.Ripe.prototype._partsList = function(parts) {
     parts = parts || this.parts;
     var partsList = [];

diff --git a/src/js/ripe-min.js b/src/js/ripe-min.js
diff --git a/src/js/ripe.js b/src/js/ripe.js
@@ -436,19 +436,12 @@ ripe.Ripe.prototype.setParts = function(update, noUpdate, options) {
         update = this._partsList(update);
     }
 
-    if (!noUpdate) {
-        this.trigger("pre_parts", this.parts, options);
-    }
-
-    for (var index = 0; index < update.length; index++) {
-        var part = update[index];
-        this._setPart(part[0], part[1], part[2]);
-    }
-
     if (noUpdate) {
-        return;
+        return this._setParts(update);
     }
 
+    this.trigger("pre_parts", this.parts, options);
+    this._setParts(update);
     this.update();
     this.trigger("parts", this.parts, options);
     this.trigger("post_parts", this.parts, options);
@@ -612,6 +605,13 @@ ripe.Ripe.prototype._setPart = function(part, material, color) {
     this.trigger("post_part", part, value);
 };
 
+ripe.Ripe.prototype._setParts = function(update) {
+    for (var index = 0; index < update.length; index++) {
+        var part = update[index];
+        this._setPart(part[0], part[1], part[2]);
+    }
+};
+
 ripe.Ripe.prototype._partsList = function(parts) {
     parts = parts || this.parts;
     var partsList = [];

diff --git a/src/python/ripe_demo/static/js/ripe.js b/src/python/ripe_demo/static/js/ripe.js
@@ -436,19 +436,12 @@ ripe.Ripe.prototype.setParts = function(update, noUpdate, options) {
         update = this._partsList(update);
     }
 
-    if (!noUpdate) {
-        this.trigger("pre_parts", this.parts, options);
-    }
-
-    for (var index = 0; index < update.length; index++) {
-        var part = update[index];
-        this._setPart(part[0], part[1], part[2]);
-    }
-
     if (noUpdate) {
-        return;
+        return this._setParts(update);
     }
 
+    this.trigger("pre_parts", this.parts, options);
+    this._setParts(update);
     this.update();
     this.trigger("parts", this.parts, options);
     this.trigger("post_parts", this.parts, options);
@@ -612,6 +605,13 @@ ripe.Ripe.prototype._setPart = function(part, material, color) {
     this.trigger("post_part", part, value);
 };
 
+ripe.Ripe.prototype._setParts = function(update) {
+    for (var index = 0; index < update.length; index++) {
+        var part = update[index];
+        this._setPart(part[0], part[1], part[2]);
+    }
+};
+
 ripe.Ripe.prototype._partsList = function(parts) {
     parts = parts || this.parts;
     var partsList = [];