From 8d24c603ba5be15a39f819d289a6da9830a221c7 Mon Sep 17 00:00:00 2001 From: Andreas Berenz Date: Thu, 6 Oct 2016 09:58:03 +0200 Subject: removed obsolete 'obstacle' attribute --- modules-available/roomplanner/js/grid.js | 21 +---- modules-available/roomplanner/templates/page.html | 102 +++++++++++----------- 2 files changed, 53 insertions(+), 70 deletions(-) diff --git a/modules-available/roomplanner/js/grid.js b/modules-available/roomplanner/js/grid.js index a2e56103..09e52099 100644 --- a/modules-available/roomplanner/js/grid.js +++ b/modules-available/roomplanner/js/grid.js @@ -117,9 +117,6 @@ if (!roomplanner) var roomplanner = { "helper" : false, "grid" : [(roomplanner.settings.scale / 4), (roomplanner.settings.scale / 4)], "stop": function(ev,ui) { - if ($(this).attr("obstacle") == "true") { - $(this).addClass("obstacle"); - } if ($(this).attr('itemtype').indexOf('_drag') > -1) { var itemtype = $(this).attr('itemtype').replace('_drag',''); @@ -138,7 +135,6 @@ if (!roomplanner) var roomplanner = { var itemtype = $(this).attr('itemtype'); $(this).attr('itemtype',itemtype+'_drag'); - $(this).removeClass("obstacle"); } }; @@ -206,7 +202,6 @@ if (!roomplanner) var roomplanner = { } }, start: function(ev,ui) { - $(this).removeClass("obstacle"); var itemtype = $(this).attr('itemtype'); $(this).attr('itemtype',itemtype+'_drag'); @@ -239,10 +234,7 @@ if (!roomplanner) var roomplanner = { }, stop: function(ev,ui) { - if ($(this).attr("obstacle") == "true") { - $(this).addClass("obstacle"); - } - + if ($(this).attr('itemtype').indexOf('_drag') > -1) { var itemtype = $(this).attr('itemtype').replace('_drag',''); $(this).attr('itemtype',itemtype); @@ -339,11 +331,6 @@ if (!roomplanner) var roomplanner = { html += prop+'="'+item[prop]+'" '; } html += 'class="draggable ui-draggable'; - - if (obstacle) { - html += " obstacle"; - } - html+= '">'; return html; } @@ -557,10 +544,7 @@ $(document).ready(function(){ var gridPositions = roomplanner.getGridFromPixels(parseInt($(el).css('left')),parseInt($(el).css('top'))); $(el).attr('gridRow',gridPositions[0]); $(el).attr('gridCol',gridPositions[1]); - - if ($(el).attr("obstacle") == "true") { - $(el).addClass("obstacle"); - } + roomplanner.initResizable(el); roomplanner.initDraggable(el); @@ -604,7 +588,6 @@ $(document).ready(function(){ //grid : [(roomplanner.settings.scale / 4), (roomplanner.settings.scale / 4)], preventCollision: true, restraint: "#draw-element-area", - obstacle: ".obstacle", cursorAt: {left:5,top:5}, start: function(ev,ui) { $(ui.helper).css('opacity',0.8); diff --git a/modules-available/roomplanner/templates/page.html b/modules-available/roomplanner/templates/page.html index 52916aa9..ba51b893 100644 --- a/modules-available/roomplanner/templates/page.html +++ b/modules-available/roomplanner/templates/page.html @@ -74,42 +74,42 @@
@@ -119,16 +119,16 @@
@@ -136,13 +136,13 @@
@@ -150,50 +150,50 @@