summaryrefslogtreecommitdiffstats
path: root/modules-available/roomplanner/js/grid.js
diff options
context:
space:
mode:
Diffstat (limited to 'modules-available/roomplanner/js/grid.js')
-rw-r--r--modules-available/roomplanner/js/grid.js14
1 files changed, 9 insertions, 5 deletions
diff --git a/modules-available/roomplanner/js/grid.js b/modules-available/roomplanner/js/grid.js
index eb845f9f..80273441 100644
--- a/modules-available/roomplanner/js/grid.js
+++ b/modules-available/roomplanner/js/grid.js
@@ -286,11 +286,15 @@ if (!roomplanner) var roomplanner = {
return JSON.stringify(objects);
},
load: function(object) {
- try {
- var objects = JSON.parse(object);
- } catch(e) {
- alert('invalid JSON format');
- return false;
+ if (typeof object === 'string') {
+ try {
+ var objects = JSON.parse(object);
+ } catch (e) {
+ alert('invalid JSON format');
+ return false;
+ }
+ } else {
+ var objects = object;
}
$('#draw-element-area').html('');