[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. bbbafc4936ef4734e05a5e9a701562472140d498
Evergreen Git
git at git.evergreen-ils.org
Wed Oct 10 15:47:59 EDT 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, rel_3_0 has been updated
via bbbafc4936ef4734e05a5e9a701562472140d498 (commit)
via 59c21e28aba87a9859670e47f536e40186226f7f (commit)
via ef34ccc8db15beee7d31273b3a8783561549063c (commit)
via 1acb25976659bae0166bc1d2680217f0581e7d12 (commit)
via ae9d1c8b527e867512b210274f14b41607d4d719 (commit)
from 940446e32e42b45e7e866b0670cd46ad8610666c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bbbafc4936ef4734e05a5e9a701562472140d498
Author: Jason Stephenson <jason at sigio.com>
Date: Wed Oct 10 15:47:46 2018 -0400
Revert "LP#1740412 Grid cell content tooltips"
This reverts commit b1e0da12b30a3a960fe7834f5862c02f5828846f.
Remove tooltips functionality that causes performance hit.
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2
index 183d848..9213e8c 100644
--- a/Open-ILS/src/templates/staff/css/style.css.tt2
+++ b/Open-ILS/src/templates/staff/css/style.css.tt2
@@ -421,14 +421,6 @@ table.list tr.selected td { /* deprecated? */
box-shadow: none;
}
-.eg-grid-tooltip {
- font-size: 110%;
-}
-/* avoid visited "blue" links over black background */
-.eg-grid-tooltip a {
- color: white;
-}
-
/* ----------------------------------------------------------------------
* /Grid
diff --git a/Open-ILS/src/templates/staff/share/t_autogrid.tt2 b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
index 8e07c7b..cf48ed8 100644
--- a/Open-ILS/src/templates/staff/share/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
@@ -345,20 +345,13 @@
<!-- if the cell comes with its own template,
translate that content into HTML and insert it here -->
<span ng-if="col.template" style="padding-left:5px; padding-right:10px;"
- ng-init="html_value=translateCellTemplate(col, item)">
- <span uib-tooltip-html="html_value" tooltip-class="eg-grid-tooltip">
- <span ng-bind-html="html_value"></span>
- </span>
+ ng-bind-html="translateCellTemplate(col, item)">
</span>
<!-- otherwise, simply display the item value, which may
pass through datatype-specific filtering. -->
- <span ng-if="!col.template"
- ng-init="text_value = (itemFieldValue(item, col) | egGridValueFilter:col:item)"
- uib-tooltip="{{text_value}}"
- tooltip-class="eg-grid-tooltip"
- style="padding-left:5px; padding-right:10px;">
- {{text_value}}
+ <span ng-if="!col.template" style="padding-left:5px; padding-right:10px;">
+ {{itemFieldValue(item, col) | egGridValueFilter:col:item}}
</span>
</div>
</div>
commit 59c21e28aba87a9859670e47f536e40186226f7f
Author: Jason Stephenson <jason at sigio.com>
Date: Wed Oct 10 15:47:37 2018 -0400
Revert "LP#1740412 Grid cell tooltips limited to long content"
This reverts commit e8115509bd907248bdb1088e68fcacd5dc15d899.
Remove tooltips functionality that causes performance hit.
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/templates/staff/share/t_autogrid.tt2 b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
index 12996ea..8e07c7b 100644
--- a/Open-ILS/src/templates/staff/share/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
@@ -345,10 +345,8 @@
<!-- if the cell comes with its own template,
translate that content into HTML and insert it here -->
<span ng-if="col.template" style="padding-left:5px; padding-right:10px;"
- id="{{cellId(col, item)}}"
ng-init="html_value=translateCellTemplate(col, item)">
- <span tooltip-class="eg-grid-tooltip"
- uib-tooltip-html="cellOverflowed(cellId(col, item), 1) ? html_value : ''">
+ <span uib-tooltip-html="html_value" tooltip-class="eg-grid-tooltip">
<span ng-bind-html="html_value"></span>
</span>
</span>
@@ -356,9 +354,8 @@
<!-- otherwise, simply display the item value, which may
pass through datatype-specific filtering. -->
<span ng-if="!col.template"
- id="{{cellId(col, item)}}"
ng-init="text_value = (itemFieldValue(item, col) | egGridValueFilter:col:item)"
- uib-tooltip="{{cellOverflowed(cellId(col, item), 1) ? text_value : ''}}"
+ uib-tooltip="{{text_value}}"
tooltip-class="eg-grid-tooltip"
style="padding-left:5px; padding-right:10px;">
{{text_value}}
diff --git a/Open-ILS/web/js/ui/default/staff/services/grid.js b/Open-ILS/web/js/ui/default/staff/services/grid.js
index ce494da..33998a1 100644
--- a/Open-ILS/web/js/ui/default/staff/services/grid.js
+++ b/Open-ILS/web/js/ui/default/staff/services/grid.js
@@ -833,32 +833,6 @@ angular.module('egGridMod',
return grid.modifyColumnPos(col, diff);
}
- // Returns true of the contents of the cell overflow its container.
- // parentDepth tells the code how far up the DOM tree to traverse
- // via parentNode before stopping to inspect the value.
- // There's no way to pass a reference to a DOM node directly via
- // a scope function (except ng-click, etc.) so pass the
- // DOM id instead and get the node from there.
- $scope.cellOverflowed = function(id, parentDepth) {
- var node = document.getElementById(id);
- if (!node) return;
- for (var i = 0; i < parentDepth; i++) {
- node = node.parentNode;
- }
- return node.scrollHeight > node.clientHeight
- || node.scrollWidth > node.clientWidth;
- }
-
- // Generates a unique identifier per cell per grid.
- $scope.cellId = function(col, item) {
- if (!col || !item) return '';
- return 'grid-cell-span-'
- // differentiate grids
- + ($scope.persistKey || $scope.idlClass || $scope.grid_element.id)
- // differentiate rows and columns.
- + '-' + col.name + '-' + $scope.indexValue(item);
-
- }
// handles click, control-click, and shift-click
$scope.handleRowClick = function($event, item) {
commit ef34ccc8db15beee7d31273b3a8783561549063c
Author: Jason Stephenson <jason at sigio.com>
Date: Wed Oct 10 15:47:26 2018 -0400
Revert "LP#1740412 Grid cell tooltips moved to top-left"
This reverts commit d2ab77bc8a2e59d3ad535868525b1a99fbe4ebdd.
Remove tooltips functionality that causes performance hit.
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/templates/staff/share/t_autogrid.tt2 b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
index 61d939e..12996ea 100644
--- a/Open-ILS/src/templates/staff/share/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
@@ -348,7 +348,6 @@
id="{{cellId(col, item)}}"
ng-init="html_value=translateCellTemplate(col, item)">
<span tooltip-class="eg-grid-tooltip"
- tooltip-placement="top-left"
uib-tooltip-html="cellOverflowed(cellId(col, item), 1) ? html_value : ''">
<span ng-bind-html="html_value"></span>
</span>
@@ -360,7 +359,6 @@
id="{{cellId(col, item)}}"
ng-init="text_value = (itemFieldValue(item, col) | egGridValueFilter:col:item)"
uib-tooltip="{{cellOverflowed(cellId(col, item), 1) ? text_value : ''}}"
- tooltip-placement="top-left"
tooltip-class="eg-grid-tooltip"
style="padding-left:5px; padding-right:10px;">
{{text_value}}
commit 1acb25976659bae0166bc1d2680217f0581e7d12
Author: Jason Stephenson <jason at sigio.com>
Date: Wed Oct 10 15:47:17 2018 -0400
Revert "LP#1740412 Double grid tooltip max width"
This reverts commit 76fa907a2fd76bbfb3899f302109f9d51c6d756e.
Remove tooltips functionality that causes performance hit.
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2
index c5d28b5..183d848 100644
--- a/Open-ILS/src/templates/staff/css/style.css.tt2
+++ b/Open-ILS/src/templates/staff/css/style.css.tt2
@@ -504,10 +504,6 @@ eg-grid-field {
display: none;
}
-.eg-grid-tooltip .tooltip-inner {
- max-width: 400px;
-}
-
[%#
vim: ft=css
%]
diff --git a/Open-ILS/src/templates/staff/share/t_autogrid.tt2 b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
index 80c5430..61d939e 100644
--- a/Open-ILS/src/templates/staff/share/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
@@ -348,7 +348,6 @@
id="{{cellId(col, item)}}"
ng-init="html_value=translateCellTemplate(col, item)">
<span tooltip-class="eg-grid-tooltip"
- tooltip-class="eg-grid-tooltip"
tooltip-placement="top-left"
uib-tooltip-html="cellOverflowed(cellId(col, item), 1) ? html_value : ''">
<span ng-bind-html="html_value"></span>
@@ -361,7 +360,6 @@
id="{{cellId(col, item)}}"
ng-init="text_value = (itemFieldValue(item, col) | egGridValueFilter:col:item)"
uib-tooltip="{{cellOverflowed(cellId(col, item), 1) ? text_value : ''}}"
- tooltip-class="eg-grid-tooltip"
tooltip-placement="top-left"
tooltip-class="eg-grid-tooltip"
style="padding-left:5px; padding-right:10px;">
commit ae9d1c8b527e867512b210274f14b41607d4d719
Author: Jason Stephenson <jason at sigio.com>
Date: Wed Oct 10 15:46:40 2018 -0400
Revert "LP#1794176 Avoid capturing grid cell tooltip/display values"
This reverts commit 4a5521ec38cdef5d47dd76b0b6bf994ba8998995.
Remove tooltips functionality that causes performance hit.
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/templates/staff/share/t_autogrid.tt2 b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
index d5f7f18..80c5430 100644
--- a/Open-ILS/src/templates/staff/share/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
@@ -344,14 +344,14 @@
<!-- if the cell comes with its own template,
translate that content into HTML and insert it here -->
- <span ng-if="col.template"
+ <span ng-if="col.template" style="padding-left:5px; padding-right:10px;"
id="{{cellId(col, item)}}"
- style="padding-left:5px; padding-right:10px;">
+ ng-init="html_value=translateCellTemplate(col, item)">
<span tooltip-class="eg-grid-tooltip"
tooltip-class="eg-grid-tooltip"
tooltip-placement="top-left"
- uib-tooltip-html="getHtmlTooltip(col, item)">
- <span ng-bind-html="translateCellTemplate(col, item)"></span>
+ uib-tooltip-html="cellOverflowed(cellId(col, item), 1) ? html_value : ''">
+ <span ng-bind-html="html_value"></span>
</span>
</span>
@@ -359,12 +359,13 @@
pass through datatype-specific filtering. -->
<span ng-if="!col.template"
id="{{cellId(col, item)}}"
- uib-tooltip="{{cellOverflowed(cellId(col, item), 1) ? (itemFieldValue(item, col) | egGridValueFilter:col:item) : ''}}"
+ ng-init="text_value = (itemFieldValue(item, col) | egGridValueFilter:col:item)"
+ uib-tooltip="{{cellOverflowed(cellId(col, item), 1) ? text_value : ''}}"
tooltip-class="eg-grid-tooltip"
tooltip-placement="top-left"
tooltip-class="eg-grid-tooltip"
style="padding-left:5px; padding-right:10px;">
- {{itemFieldValue(item, col) | egGridValueFilter:col:item}}
+ {{text_value}}
</span>
</div>
</div>
diff --git a/Open-ILS/web/js/ui/default/staff/services/grid.js b/Open-ILS/web/js/ui/default/staff/services/grid.js
index 6df298c..ce494da 100644
--- a/Open-ILS/web/js/ui/default/staff/services/grid.js
+++ b/Open-ILS/web/js/ui/default/staff/services/grid.js
@@ -1094,13 +1094,6 @@ angular.module('egGridMod',
return val;
}
- $scope.getHtmlTooltip = function(col, item) {
- if ($scope.cellOverflowed($scope.cellId(col, item), 1)) {
- return grid.getItemTextContent(item, col);
- }
- return "";
- }
-
/**
* Fetches all grid data and transates each item into a simple
* key-value pair of column name => text-value.
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/staff/css/style.css.tt2 | 12 -------
Open-ILS/src/templates/staff/share/t_autogrid.tt2 | 19 ++----------
Open-ILS/web/js/ui/default/staff/services/grid.js | 33 ---------------------
3 files changed, 3 insertions(+), 61 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list