fixed #399

atatanasov · Aug 1, 2018 · b407573 · b407573
1 parent 3977182
commit b407573
Show file tree

Hide file tree

Showing 39 changed files with 75 additions and 63 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "gijgo",
-  "version": "1.9.9",
+  "version": "1.9.10",
   "description": "Gijgo is a set of free open source javascript controls distributed under MIT License with built-in support for Bootstrap and Material Design",
   "main": [
     "./dist/combined/js/gijgo.js",

diff --git a/dist/combined/js/gijgo.js b/dist/combined/js/gijgo.js
@@ -1,5 +1,5 @@
 /*
- * Gijgo JavaScript Library v1.9.9
+ * Gijgo JavaScript Library v1.9.10
  * http://gijgo.com/
  *
  * Copyright 2014, 2018 gijgo.com
@@ -516,7 +516,7 @@ gj.core = {
         } else {
             result = parseInt(style.height, 10);
             result += parseInt(style.paddingTop || 0, 10) + parseInt(style.paddingBottom || 0, 10);
-            result += parseInt(style.borderTop || 0, 10) + parseInt(style.borderBottom || 0, 10);
+            result += parseInt(style.borderTopWidth || 0, 10) + parseInt(style.borderBottomWidth || 0, 10);
         }
 
         if (margin) {
@@ -534,7 +534,7 @@ gj.core = {
         } else {
             result = parseInt(style.width, 10);
             result += parseInt(style.paddingLeft || 0, 10) + parseInt(style.paddingRight || 0, 10);
-            result += parseInt(style.borderLeft || 0, 10) + parseInt(style.borderRight || 0, 10);
+            result += parseInt(style.borderLeftWidth || 0, 10) + parseInt(style.borderRightWidth || 0, 10);
         }
 
         if (margin) {
@@ -563,11 +563,11 @@ gj.core = {
             if (el.tagName == "BODY") {
                 xScroll = el.scrollLeft || document.documentElement.scrollLeft;
                 yScroll = el.scrollTop || document.documentElement.scrollTop;
-                left += (el.offsetLeft - xScroll + el.clientLeft);
-                top += (el.offsetTop - yScroll + el.clientTop);
+                left += el.offsetLeft - xScroll; // + el.clientLeft);
+                top += el.offsetTop - yScroll; // + el.clientTop);
             } else {
-                left += (el.offsetLeft - el.scrollLeft + el.clientLeft);
-                top += (el.offsetTop - el.scrollTop + el.clientTop);
+                left += el.offsetLeft - el.scrollLeft; // + el.clientLeft;
+                top += el.offsetTop - el.scrollTop; // + el.clientTop;
             }
 
             el = el.offsetParent;
@@ -2131,7 +2131,7 @@ gj.draggable.events = {
      * <script>
      *     $('#element').draggable({
      *         drag: function (e, newPosition, mousePosition) {
-     *             $('body').append('<div>The drag event is fired. New Element Position = { top:' + offset.top + ', left: ' + offset.left + '}.</div>');
+     *             $('body').append('<div>The drag event is fired. New Element Position = { top:' + newPosition.top + ', left: ' + newPosition.left + '}.</div>');
      *         }
      *     });
      * </script>
@@ -12024,7 +12024,7 @@ gj.tree.plugins.dragAndDrop = {
                 $wrappers = gj.tree.plugins.dragAndDrop.private.getTargetWrappers($tree, $sourceNode),
 	            data = $tree.data();
 	        return function (e, mousePosition) {
-                var success = false, record, $targetNode, $sourceParentNode;
+                var success = false, record, $targetNode, $sourceParentNode, parent;
 	            $(this).draggable('destroy').remove();
 	            $displays.each(function () {
 	                var $targetDisplay = $(this), $ul;
@@ -12042,7 +12042,11 @@ gj.tree.plugins.dragAndDrop = {
                             //BEGIN: Change node position inside the backend data
                             record = $tree.getDataById($sourceNode.data('id'));
                             gj.tree.methods.removeDataById($tree, $sourceNode.data('id'), data.records);
-                            $tree.getDataById($ul.parent().data('id'))[data.childrenField].push(record);
+                            parent = $tree.getDataById($ul.parent().data('id'));
+                            if (parent[data.childrenField] === undefined) {
+                                parent[data.childrenField] = [];
+                            }
+                            parent[data.childrenField].push(record);
                             //END
 
 	                        gj.tree.plugins.dragAndDrop.private.refresh($tree, $sourceNode, $targetNode, $sourceParentNode);

diff --git a/dist/combined/js/gijgo.min.js b/dist/combined/js/gijgo.min.js
diff --git a/dist/modular/js/checkbox.js b/dist/modular/js/checkbox.js
@@ -1,5 +1,5 @@
 /*
- * Gijgo Checkbox v1.9.9
+ * Gijgo Checkbox v1.9.10
  * http://gijgo.com/checkbox
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/dist/modular/js/colorpicker.js b/dist/modular/js/colorpicker.js
@@ -1,5 +1,5 @@
 /*
- * Gijgo ColorPicker v1.9.9
+ * Gijgo ColorPicker v1.9.10
  * http://gijgo.com/colorpicker
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/dist/modular/js/core.js b/dist/modular/js/core.js
@@ -1,5 +1,5 @@
 /*
- * Gijgo JavaScript Library v1.9.9
+ * Gijgo JavaScript Library v1.9.10
  * http://gijgo.com/
  *
  * Copyright 2014, 2018 gijgo.com
@@ -431,7 +431,7 @@ gj.documentManager = {
         } else {
             result = parseInt(style.height, 10);
             result += parseInt(style.paddingTop || 0, 10) + parseInt(style.paddingBottom || 0, 10);
-            result += parseInt(style.borderTop || 0, 10) + parseInt(style.borderBottom || 0, 10);
+            result += parseInt(style.borderTopWidth || 0, 10) + parseInt(style.borderBottomWidth || 0, 10);
         }
 
         if (margin) {
@@ -449,7 +449,7 @@ gj.documentManager = {
         } else {
             result = parseInt(style.width, 10);
             result += parseInt(style.paddingLeft || 0, 10) + parseInt(style.paddingRight || 0, 10);
-            result += parseInt(style.borderLeft || 0, 10) + parseInt(style.borderRight || 0, 10);
+            result += parseInt(style.borderLeftWidth || 0, 10) + parseInt(style.borderRightWidth || 0, 10);
         }
 
         if (margin) {
@@ -478,11 +478,11 @@ gj.documentManager = {
             if (el.tagName == "BODY") {
                 xScroll = el.scrollLeft || document.documentElement.scrollLeft;
                 yScroll = el.scrollTop || document.documentElement.scrollTop;
-                left += (el.offsetLeft - xScroll + el.clientLeft);
-                top += (el.offsetTop - yScroll + el.clientTop);
+                left += el.offsetLeft - xScroll; // + el.clientLeft);
+                top += el.offsetTop - yScroll; // + el.clientTop);
             } else {
-                left += (el.offsetLeft - el.scrollLeft + el.clientLeft);
-                top += (el.offsetTop - el.scrollTop + el.clientTop);
+                left += el.offsetLeft - el.scrollLeft; // + el.clientLeft;
+                top += el.offsetTop - el.scrollTop; // + el.clientTop;
             }
 
             el = el.offsetParent;

diff --git a/dist/modular/js/core.min.js b/dist/modular/js/core.min.js
diff --git a/dist/modular/js/datepicker.js b/dist/modular/js/datepicker.js
@@ -1,5 +1,5 @@
 /*
- * Gijgo DatePicker v1.9.9
+ * Gijgo DatePicker v1.9.10
  * http://gijgo.com/datepicker
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/dist/modular/js/datetimepicker.js b/dist/modular/js/datetimepicker.js
@@ -1,5 +1,5 @@
 /*
- * Gijgo DateTimePicker v1.9.9
+ * Gijgo DateTimePicker v1.9.10
  * http://gijgo.com/datetimepicker
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/dist/modular/js/dialog.js b/dist/modular/js/dialog.js
@@ -1,5 +1,5 @@
 /*
- * Gijgo Dialog v1.9.9
+ * Gijgo Dialog v1.9.10
  * http://gijgo.com/dialog
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/dist/modular/js/draggable.js b/dist/modular/js/draggable.js
@@ -1,5 +1,5 @@
 /*
- * Gijgo Draggable v1.9.9
+ * Gijgo Draggable v1.9.10
  * http://gijgo.com/draggable
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/dist/modular/js/dropdown.js b/dist/modular/js/dropdown.js
@@ -1,5 +1,5 @@
 /*
- * Gijgo DropDown v1.9.9
+ * Gijgo DropDown v1.9.10
  * http://gijgo.com/dropdown
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/dist/modular/js/droppable.js b/dist/modular/js/droppable.js
@@ -1,5 +1,5 @@
 /*
- * Gijgo Droppable v1.9.9
+ * Gijgo Droppable v1.9.10
  * http://gijgo.com/droppable
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/dist/modular/js/editor.js b/dist/modular/js/editor.js
@@ -1,5 +1,5 @@
 /*
- * Gijgo Editor v1.9.9
+ * Gijgo Editor v1.9.10
  * http://gijgo.com/editor
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/dist/modular/js/grid.js b/dist/modular/js/grid.js
@@ -1,5 +1,5 @@
 /*
- * Gijgo Grid v1.9.9
+ * Gijgo Grid v1.9.10
  * http://gijgo.com/grid
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/dist/modular/js/slider.js b/dist/modular/js/slider.js
@@ -1,5 +1,5 @@
 /*
- * Gijgo Slider v1.9.9
+ * Gijgo Slider v1.9.10
  * http://gijgo.com/slider
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/dist/modular/js/timepicker.js b/dist/modular/js/timepicker.js
@@ -1,5 +1,5 @@
 /*
- * Gijgo TimePicker v1.9.9
+ * Gijgo TimePicker v1.9.10
  * http://gijgo.com/timepicker
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/dist/modular/js/tree.js b/dist/modular/js/tree.js
@@ -1,5 +1,5 @@
 /*
- * Gijgo Tree v1.9.9
+ * Gijgo Tree v1.9.10
  * http://gijgo.com/tree
  *
  * Copyright 2014, 2018 gijgo.com
@@ -1187,7 +1187,7 @@ gj.tree.widget.constructor = gj.tree.widget;
                 $wrappers = gj.tree.plugins.dragAndDrop.private.getTargetWrappers($tree, $sourceNode),
 	            data = $tree.data();
 	        return function (e, mousePosition) {
-                var success = false, record, $targetNode, $sourceParentNode;
+                var success = false, record, $targetNode, $sourceParentNode, parent;
 	            $(this).draggable('destroy').remove();
 	            $displays.each(function () {
 	                var $targetDisplay = $(this), $ul;
@@ -1205,7 +1205,11 @@ gj.tree.widget.constructor = gj.tree.widget;
                             //BEGIN: Change node position inside the backend data
                             record = $tree.getDataById($sourceNode.data('id'));
                             gj.tree.methods.removeDataById($tree, $sourceNode.data('id'), data.records);
-                            $tree.getDataById($ul.parent().data('id'))[data.childrenField].push(record);
+                            parent = $tree.getDataById($ul.parent().data('id'));
+                            if (parent[data.childrenField] === undefined) {
+                                parent[data.childrenField] = [];
+                            }
+                            parent[data.childrenField].push(record);
                             //END
 
 	                        gj.tree.plugins.dragAndDrop.private.refresh($tree, $sourceNode, $targetNode, $sourceParentNode);

diff --git a/dist/modular/js/tree.min.js b/dist/modular/js/tree.min.js
diff --git a/examples/draggable/Draggable.Base.drag.sample.html b/examples/draggable/Draggable.Base.drag.sample.html
@@ -17,7 +17,7 @@
  <script>
      $('#element').draggable({
          drag: function (e, newPosition, mousePosition) {
-             $('body').append('<div>The drag event is fired. New Element Position = { top:' + offset.top + ', left: ' + offset.left + '}.</div>');
+             $('body').append('<div>The drag event is fired. New Element Position = { top:' + newPosition.top + ', left: ' + newPosition.left + '}.</div>');
          }
      });
  </script>

diff --git a/examples/tests/tempslider.html b/examples/tests/tempslider.html
@@ -5,8 +5,8 @@
     <title>Bootstrap Slider</title>
     <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-    <script src="https://cdn.jsdelivr.net/npm/gijgo@1.9.9/js/gijgo.min.js" type="text/javascript"></script>
-    <link href="https://cdn.jsdelivr.net/npm/gijgo@1.9.9/css/gijgo.min.css" rel="stylesheet" type="text/css" />
+    <script src="https://cdn.jsdelivr.net/npm/gijgo@1.9.10/js/gijgo.min.js" type="text/javascript"></script>
+    <link href="https://cdn.jsdelivr.net/npm/gijgo@1.9.10/css/gijgo.min.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
     <input id="slider" width="300" />

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gijgo",
-  "version": "1.9.9",
+  "version": "1.9.10",
   "description": "Gijgo is a set of free open source javascript controls distributed under MIT License. All widgets are high performance, built on top of the jQuery JavaScript Library and with built-in support for Bootstrap and jQuery UI. They are designed to saves you time and scales with your development process.",
   "main": "js/gijgo.js",
   "homepage": "http://gijgo.com/",

diff --git a/src/checkbox/js/header.txt b/src/checkbox/js/header.txt
@@ -1,5 +1,5 @@
 /*
- * Gijgo Checkbox v1.9.9
+ * Gijgo Checkbox v1.9.10
  * http://gijgo.com/checkbox
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/src/colorpicker/js/header.txt b/src/colorpicker/js/header.txt
@@ -1,5 +1,5 @@
 /*
- * Gijgo ColorPicker v1.9.9
+ * Gijgo ColorPicker v1.9.10
  * http://gijgo.com/colorpicker
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/src/core/js/core.js b/src/core/js/core.js
@@ -509,7 +509,7 @@ gj.core = {
         } else {
             result = parseInt(style.height, 10);
             result += parseInt(style.paddingTop || 0, 10) + parseInt(style.paddingBottom || 0, 10);
-            result += parseInt(style.borderTop || 0, 10) + parseInt(style.borderBottom || 0, 10);
+            result += parseInt(style.borderTopWidth || 0, 10) + parseInt(style.borderBottomWidth || 0, 10);
         }
 
         if (margin) {
@@ -527,7 +527,7 @@ gj.core = {
         } else {
             result = parseInt(style.width, 10);
             result += parseInt(style.paddingLeft || 0, 10) + parseInt(style.paddingRight || 0, 10);
-            result += parseInt(style.borderLeft || 0, 10) + parseInt(style.borderRight || 0, 10);
+            result += parseInt(style.borderLeftWidth || 0, 10) + parseInt(style.borderRightWidth || 0, 10);
         }
 
         if (margin) {
@@ -556,11 +556,11 @@ gj.core = {
             if (el.tagName == "BODY") {
                 xScroll = el.scrollLeft || document.documentElement.scrollLeft;
                 yScroll = el.scrollTop || document.documentElement.scrollTop;
-                left += (el.offsetLeft - xScroll + el.clientLeft);
-                top += (el.offsetTop - yScroll + el.clientTop);
+                left += el.offsetLeft - xScroll; // + el.clientLeft);
+                top += el.offsetTop - yScroll; // + el.clientTop);
             } else {
-                left += (el.offsetLeft - el.scrollLeft + el.clientLeft);
-                top += (el.offsetTop - el.scrollTop + el.clientTop);
+                left += el.offsetLeft - el.scrollLeft; // + el.clientLeft;
+                top += el.offsetTop - el.scrollTop; // + el.clientTop;
             }
 
             el = el.offsetParent;

diff --git a/src/datepicker/js/header.txt b/src/datepicker/js/header.txt
@@ -1,5 +1,5 @@
 /*
- * Gijgo DatePicker v1.9.9
+ * Gijgo DatePicker v1.9.10
  * http://gijgo.com/datepicker
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/src/datetimepicker/js/header.txt b/src/datetimepicker/js/header.txt
@@ -1,5 +1,5 @@
 /*
- * Gijgo DateTimePicker v1.9.9
+ * Gijgo DateTimePicker v1.9.10
  * http://gijgo.com/datetimepicker
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/src/dialog/js/header.txt b/src/dialog/js/header.txt
@@ -1,5 +1,5 @@
 /*
- * Gijgo Dialog v1.9.9
+ * Gijgo Dialog v1.9.10
  * http://gijgo.com/dialog
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/src/draggable/js/draggable.base.js b/src/draggable/js/draggable.base.js
@@ -226,7 +226,7 @@ gj.draggable.events = {
      * <script>
      *     $('#element').draggable({
      *         drag: function (e, newPosition, mousePosition) {
-     *             $('body').append('<div>The drag event is fired. New Element Position = { top:' + offset.top + ', left: ' + offset.left + '}.</div>');
+     *             $('body').append('<div>The drag event is fired. New Element Position = { top:' + newPosition.top + ', left: ' + newPosition.left + '}.</div>');
      *         }
      *     });
      * </script>

diff --git a/src/draggable/js/header.txt b/src/draggable/js/header.txt
@@ -1,5 +1,5 @@
 /*
- * Gijgo Draggable v1.9.9
+ * Gijgo Draggable v1.9.10
  * http://gijgo.com/draggable
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/src/dropdown/js/header.txt b/src/dropdown/js/header.txt
@@ -1,5 +1,5 @@
 /*
- * Gijgo DropDown v1.9.9
+ * Gijgo DropDown v1.9.10
  * http://gijgo.com/dropdown
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/src/droppable/js/header.txt b/src/droppable/js/header.txt
@@ -1,5 +1,5 @@
 /*
- * Gijgo Droppable v1.9.9
+ * Gijgo Droppable v1.9.10
  * http://gijgo.com/droppable
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/src/editor/js/header.txt b/src/editor/js/header.txt
@@ -1,5 +1,5 @@
 /*
- * Gijgo Editor v1.9.9
+ * Gijgo Editor v1.9.10
  * http://gijgo.com/editor
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/src/grid/js/header.txt b/src/grid/js/header.txt
@@ -1,5 +1,5 @@
 /*
- * Gijgo Grid v1.9.9
+ * Gijgo Grid v1.9.10
  * http://gijgo.com/grid
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/src/header.txt b/src/header.txt
@@ -1,5 +1,5 @@
 /*
- * Gijgo JavaScript Library v1.9.9
+ * Gijgo JavaScript Library v1.9.10
  * http://gijgo.com/
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/src/slider/js/header.txt b/src/slider/js/header.txt
@@ -1,5 +1,5 @@
 /*
- * Gijgo Slider v1.9.9
+ * Gijgo Slider v1.9.10
  * http://gijgo.com/slider
  *
  * Copyright 2014, 2018 gijgo.com

diff --git a/src/timepicker/js/header.txt b/src/timepicker/js/header.txt
@@ -1,5 +1,5 @@
 /*
- * Gijgo TimePicker v1.9.9
+ * Gijgo TimePicker v1.9.10
  * http://gijgo.com/timepicker
  *
  * Copyright 2014, 2018 gijgo.com