From ab97ea5557ea7f00fae543dcc61ae35beef028d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20H=C3=BCbner?= <hubnedav@fit.cvut.cz>
Date: Tue, 27 Jun 2017 14:04:07 +0200
Subject: [PATCH] Refactor ModelViewer

---
 app/Resources/assets/js/ModelViewer.js | 30 +++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/Resources/assets/js/ModelViewer.js b/app/Resources/assets/js/ModelViewer.js
index ab35f3b..1ca91ad 100644
--- a/app/Resources/assets/js/ModelViewer.js
+++ b/app/Resources/assets/js/ModelViewer.js
@@ -177,28 +177,17 @@ ModelViewer.prototype.addModel = function(geometry) {
 
 ModelViewer.prototype.loadStl = function(model) {
     var self = this;
-
     var loader = new THREE.STLLoader();
 
     loader.load(model,
         function (geometry) {
+            // Add model to view
             self.addModel(geometry);
         },
-        function(progress) {
-
-        },
+        function(progress) {},
         function(error) {
-
-            var wrapper = $('<div/>', {
-                'class': 'modelviewer-wrapper'
-            });
-
-            var errorText = $('<p/>', {
-                'class': 'ui center aligned icon header',
-                'html': '<i class="warning icon"/> Model could not be loaded!',
-            }).appendTo(wrapper);
-
-            self.dom_element.append(wrapper);
+            // Show error message
+            self.showError();
         }
     );
 };
@@ -256,6 +245,17 @@ ModelViewer.prototype.toggleMaterial = function () {
     });
 };
 
+
+ModelViewer.prototype.showError = function () {
+    var wrapper = $('<div/>', {'class': 'modelviewer-wrapper'});
+    var errorText = $('<p/>', {
+        'class': 'ui center aligned icon header',
+        'html': '<i class="warning icon"/> Model could not be loaded!',
+    }).appendTo(wrapper);
+
+    $this.dom_element.append(wrapper);
+};
+
 ModelViewer.prototype.objectCenter = function (mesh) {
     var middle = new THREE.Vector3();
     var geometry = mesh.geometry;