You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2018/11/06 15:21:20 UTC
[8/9] brooklyn-ui git commit: fix popover title and flicker,
minor other code tidies following PR
fix popover title and flicker, minor other code tidies following PR
also add message for freeform tile
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/1da5338f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/1da5338f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/1da5338f
Branch: refs/heads/master
Commit: 1da5338f77559ea9d9712c106afd2c8723f6acf2
Parents: 08bd8dd
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Nov 2 14:27:05 2018 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Nov 2 14:27:05 2018 +0000
----------------------------------------------------------------------
.../catalog-selector/catalog-selector.directive.js | 11 ++++++-----
.../components/catalog-selector/catalog-selector.less | 5 +++--
.../catalog-selector/catalog-selector.template.html | 9 +++++----
.../app/components/spec-editor/spec-editor.directive.js | 2 +-
4 files changed, 15 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/1da5338f/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
----------------------------------------------------------------------
diff --git a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
index 4ff04b8..b8b3bc6 100644
--- a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
+++ b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
@@ -241,30 +241,32 @@ function controller($scope, $element, $timeout, $q, $uibModal, $log, $templateCa
}
}
$scope.mouseInfoPopover = (item, enter) => {
- if ($scope.popoverModal && $scope.popover==item) {
+ if ($scope.popoverModal && $scope.popoverVisible && $scope.popover==item) {
// ignore if modal
return;
}
$scope.popoverModal = false;
if (enter) {
$scope.popover = item;
+ $scope.popoverVisible = true;
} else {
- $scope.popover = null;
+ $scope.popoverVisible = false;
}
}
$scope.onClickItem = (item, isInfoIcon, $event) => {
if (!isInfoIcon && $scope.iconSelects) {
$scope.onSelectItem(item);
- } else if ($scope.popoverModal && $scope.popover == item) {
+ } else if ($scope.popoverModal && $scope.popoverVisible && $scope.popover == item) {
$scope.closePopover();
} else {
$scope.popover = item;
+ $scope.popoverVisible = true;
$scope.popoverModal = true;
}
$event.stopPropagation();
}
$scope.closePopover = () => {
- $scope.popover = null;
+ $scope.popoverVisible = false;
$scope.popoverModal = false;
}
$scope.getOnSelectText = function (item) {
@@ -365,7 +367,6 @@ function controller($scope, $element, $timeout, $q, $uibModal, $log, $templateCa
if (l < 100000) return 'Preselected for inclusion in "Recent" filter.';
return 'Last used: ' + distanceInWordsToNow(l, { includeSeconds: true, addSuffix: true });
};
- $scope.roundTwoDecimals = (num) => Math.round(num*100)/100.0;
$scope.showPaletteControls = false;
$scope.onFiltersShown = () => {
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/1da5338f/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.less
----------------------------------------------------------------------
diff --git a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.less b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.less
index 05f5da2..c7aae95 100644
--- a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.less
+++ b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.less
@@ -288,9 +288,10 @@ catalog-selector {
border-bottom: 1px solid @popover-border-color;
margin-left: -15px;
margin-right: -15px;
- margin-top: -3px;
+ margin-top: -10px;
margin-bottom: 12px;
- padding: 0px 16px 6px 16px;
+ padding: 8px 16px 6px 16px;
+ border-radius: 5px 5px 0 0;
.closer {
margin-top: 6px;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/1da5338f/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
----------------------------------------------------------------------
diff --git a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
index 53efe76..3b6eaa3 100644
--- a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
+++ b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
@@ -112,7 +112,7 @@
<i class="fa fa-info-circle"
uib-popover-template="'QuickInfoTemplate.html'"
ng-click="onClickItem(item, true, $event)"
- popover-is-open="popover == item"
+ popover-is-open="popover == item && popoverVisible"
popover-placement="right" popover-trigger="'none'"
popover-class="catalog-selector-popover" popover-append-to-body="true"
ng-mouseenter="mouseInfoPopover(item, true)"
@@ -132,7 +132,7 @@
</div>
<i class="fa fa-info-circle"
uib-popover-template="'QuickInfoTemplate.html'"
- popover-is-open="popover == freeFormTile"
+ popover-is-open="popover == freeFormTile && popoverVisible"
popover-placement="right-top" popover-trigger="'none'"
popover-class="catalog-selector-popover" popover-append-to-body="true"
ng-mouseenter="mouseInfoPopover(freeFormTile, true)"
@@ -163,6 +163,7 @@
<p ng-if="popover.version"><i class="mini-icon fa fa-fw fa-code-fork"></i> {{popover.version}}</p>
</div>
<p class="quick-info-description" ng-if="popover.description">{{popover.description}}</p>
+ <p class="quick-info-description" ng-if="popover == freeFormTile">This is an ad hoc tile for an item entered by the user not known in the catalog.</p>
<div class="quick-info-metadata bundle">
<p ng-if="lastUsedText(popover)"><i class="mini-icon fa fa-clock-o"></i> {{ lastUsedText(popover) }}
<br-svg type="close" class="closer" ng-click="popover.lastUsed = 0"></br-svg>
@@ -170,8 +171,8 @@
<p ng-if="popover.displayTags && popover.displayTags.length"><i class="mini-icon fa fa-fw fa-tags"></i>
<span ng-repeat-start="tag in popover.displayTags" class="label label-primary palette-item-tag">{{ tag }}</span>
<span ng-repeat-end> </span> </p>
- <p><i class="mini-icon fa fa-fw fa-file-zip-o"></i> {{popover.containingBundle}}</p>
- <p ng-if="popover.relevance"><i class="mini-icon fa fa-sort-numeric-asc"></i> Relevance score: {{ roundTwoDecimals(popover.relevance) }}</p>
+ <p ng-if="popover.containingBundle"><i class="mini-icon fa fa-fw fa-file-zip-o"></i> {{popover.containingBundle}}</p>
+ <p ng-if="popover.relevance"><i class="mini-icon fa fa-sort-numeric-asc"></i> Relevance score: {{ popover.relevance | number:2 }}</p>
</div>
<div class="quick-info-buttons">
<div class="spacer"></div>
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/1da5338f/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
----------------------------------------------------------------------
diff --git a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
index b0663a1..9c18129 100644
--- a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
+++ b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
@@ -320,7 +320,7 @@ export function specEditorDirective($rootScope, $templateCache, $injector, $sani
scope.state.config.filter.values.all = true;
}
};
- scope.recordFocus = specEditor.recordFocus = ($item)=> {
+ scope.recordFocus = specEditor.recordFocus = ($item) => {
scope.state.config.focus = $item.name;
};