{{'datakey.timeseries' | translate }}
@@ -80,7 +80,7 @@
{{'datakey.attributes' | translate }}
-
+
{{'datakey.timeseries' | translate }}
@@ -103,7 +103,7 @@
= horizontalMidPoint || verticalOffset >= verticalMidPoint) {
dropPosition = 'after';
- $element.removeClass(droppingBeforeClassName);
$element.addClass(droppingAfterClassName);
} else {
dropPosition = 'before';
- $element.removeClass(droppingAfterClassName);
$element.addClass(droppingBeforeClassName);
}
};
var dropHandler = function (event) {
+ counter = 0;
event.preventDefault();
+
+ var targetChipsWrapId = angular.element($element[0].closest('md-chips-wrap')).attr('id');
+ if (globalDraggingChipsWrapId !== targetChipsWrapId) {
+ return;
+ }
+
var droppedItemIndex = parseInt((event.dataTransfer || event.originalEvent.dataTransfer).getData('text/plain'), 10);
var currentIndex = $scope.$parent.$mdChipsCtrl.items.indexOf($scope.$parent.$chip);
var newIndex = null;
@@ -146,14 +170,15 @@ export default angular.module('thingsboard.directives.mdChipDraggable', [])
});
$element.removeClass(droppingClassName);
- $element.removeClass(droppingBeforeClassName);
$element.removeClass(droppingAfterClassName);
+ $element.removeClass(droppingBeforeClassName);
$element.off('drop', dropHandler);
}, 1000 / 16);
};
$element.on('dragenter', function () {
+ counter++;
if (dragging) {
return;
}
@@ -166,9 +191,13 @@ export default angular.module('thingsboard.directives.mdChipDraggable', [])
});
$element.on('dragleave', function () {
- $element.removeClass(droppingClassName);
- $element.removeClass(droppingBeforeClassName);
- $element.removeClass(droppingAfterClassName);
+ counter--;
+ if (counter <=0) {
+ counter = 0;
+ $element.removeClass(droppingClassName);
+ $element.removeClass(droppingAfterClassName);
+ $element.removeClass(droppingBeforeClassName);
+ }
});
}],
diff --git a/ui/src/app/components/md-chip-draggable.scss b/ui/src/app/components/md-chip-draggable.scss
new file mode 100644
index 0000000000..d28d5842e4
--- /dev/null
+++ b/ui/src/app/components/md-chip-draggable.scss
@@ -0,0 +1,55 @@
+/**
+ * Copyright © 2016-2019 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+md-chip {
+ &.dropping {
+ //border: dashed 2px;
+ //opacity: .5;
+
+ //.md-chip-content {
+ // margin: -2px;
+ //}
+ }
+
+ &.dropping-before {
+ &::after {
+ position: absolute;
+ top: 0;
+ right: 50%;
+ bottom: 0;
+ left: 0;
+ content: "";
+ background-color: #fff;
+ border: dashed 2px;
+ border-radius: 16px;
+ opacity: .7;
+ }
+ }
+
+ &.dropping-after {
+ &::after {
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 50%;
+ content: "";
+ background-color: #fff;
+ border: dashed 2px;
+ border-radius: 16px;
+ opacity: .7;
+ }
+ }
+}