Compare commits

..

1 Commits

Author SHA1 Message Date
Charles Hacskaylo
b4fbf0a187 [Frontend] Removed icon, changed name
Fixes #1978
- "Remove" changed to "Delete..."
- Removed icon from context menu
2018-04-23 13:35:41 -07:00
3 changed files with 6 additions and 20 deletions

View File

@@ -1,6 +1,6 @@
machine:
node:
version: 8.11.0
version: 4.7.0
dependencies:
pre:
@@ -24,4 +24,4 @@ test:
general:
branches:
ignore:
- gh-pages
- gh-pages

View File

@@ -186,9 +186,8 @@ define([
"key": "remove",
"category": "contextual",
"implementation": RemoveAction,
"cssClass": "icon-trash",
"name": "Remove",
"description": "Remove this object from its containing object.",
"name": "Delete...",
"description": "Delete this object.",
"depends": [
"navigationService"
]

View File

@@ -220,7 +220,6 @@ define([
return;
}
this.marquee.end = this.positionOverPlot;
this.marquee.endPixels = this.positionOverElement;
};
MCTPlotController.prototype.startMarquee = function ($event) {
@@ -228,8 +227,6 @@ define([
if (this.positionOverPlot) {
this.freeze();
this.marquee = {
startPixels: this.positionOverElement,
endPixels: this.positionOverElement,
start: this.positionOverPlot,
end: this.positionOverPlot,
color: [1, 1, 1, 0.5]
@@ -240,14 +237,8 @@ define([
};
MCTPlotController.prototype.endMarquee = function () {
var startPixels = this.marquee.startPixels;
var endPixels = this.marquee.endPixels;
var marqueeDistance = Math.sqrt(
Math.pow(startPixels.x - endPixels.x, 2) +
Math.pow(startPixels.y - endPixels.y, 2)
);
// Don't zoom if mouse moved less than 7.5 pixels.
if (marqueeDistance > 7.5) {
if (this.marquee.start.x !== this.marquee.end.x &&
this.marquee.start.y !== this.marquee.end.y) {
this.$scope.xAxis.set('displayRange', {
min: Math.min(this.marquee.start.x, this.marquee.end.x),
max: Math.max(this.marquee.start.x, this.marquee.end.x)
@@ -257,10 +248,6 @@ define([
max: Math.max(this.marquee.start.y, this.marquee.end.y)
});
this.$scope.$emit('user:viewport:change:end');
} else {
// A history entry is created by startMarquee, need to remove
// if marquee zoom doesn't occur.
this.back();
}
this.$scope.rectangles = [];
this.marquee = undefined;