From 782329f896775652466bc0582e42bccc905d191e Mon Sep 17 00:00:00 2001
From: Nico Rehwaldt <nico.rehwaldt@camunda.com>
Date: Wed, 6 Aug 2014 14:40:34 +0200
Subject: [PATCH] fix(modeler): add modeling components last

---
 lib/Modeler.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/Modeler.js b/lib/Modeler.js
index 6007d45a..831419d0 100644
--- a/lib/Modeler.js
+++ b/lib/Modeler.js
@@ -54,12 +54,15 @@ Modeler.prototype.createModdle = function() {
 
 // modules the modeler is composed of
 Modeler.prototype._modules = Modeler.prototype._modules.concat([
-  // TODO (nre): buggy in conjunction with zoomscroll / move canvas
-  require('diagram-js/lib/features/move'),
+  // non-modeling components
   require('./features/label-editing'),
   require('./features/zoomscroll'),
   require('./features/touch'),
   require('./features/movecanvas'),
+
+  // modeling components
+  require('./features/modeling'),
+  require('diagram-js/lib/features/move'),
   require('./features/context-pad')
 ]);