Skip to content

PlgScheme: Enable tooltips on mobile browser #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kumajaya wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

PlgScheme: Enable tooltips on mobile browser #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions ScadaWeb/ScadaScheme/PlgScheme/plugins/Scheme/Scheme.aspx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
<link href="~/lib/open-sans/css/open-sans.css" rel="stylesheet" type="text/css" />
<link href="~/css/controls/notifier.min.css" rel="stylesheet" type="text/css" />
<link href="~/plugins/Scheme/css/schemeform.min.css" rel="stylesheet" type="text/css" />
<link href="~/lib/bootstrap-tooltip/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
<%= compStyles %>
<script type="text/javascript" src="../../lib/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../lib/bootstrap-tooltip/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../../js/api/utils.js"></script>
<script type="text/javascript" src="../../js/api/ajaxqueue.js"></script>
<script type="text/javascript" src="../../js/api/clientapi.js"></script>
Expand All @@ -33,17 +35,22 @@
var schemeOptions = <%= schemeOptions %>;
</script>
<script type="text/javascript" src="js/schemeform.js"></script>
<script>
$(function () {
$('[data-toggle-tb="tooltip"]').tooltip({ container: 'body', placement: 'bottom' })
})
</script>
</head>
<body>
<div id="divNotif" class="notifier">
</div>
<div id="divSchWrapper" class="scheme-wrapper">
</div>
<div id="divToolbar"><asp:Label
ID="lblFitScreenBtn" runat="server" CssClass="tool-btn" ToolTip="Fit to Screen"><i class="fa fa-arrows"></i></asp:Label><asp:Label
ID="lblFitWidthBtn" runat="server" CssClass="tool-btn" ToolTip="Fit to Width"><i class="fa fa-arrows-h"></i></asp:Label><asp:Label
ID="lblZoomOutBtn" runat="server" CssClass="tool-btn" ToolTip="Zoom Out"><i class="fa fa-search-minus"></i></asp:Label><asp:Label
ID="lblZoomInBtn" runat="server" CssClass="tool-btn" ToolTip="Zoom In"><i class="fa fa-search-plus"></i></asp:Label><span id="spanCurScale">100%</span><div id="divDebugTools"><span
ID="lblFitScreenBtn" runat="server" CssClass="tool-btn" ToolTip="Fit to Screen" data-toggle-tb="tooltip"><i class="fa fa-arrows"></i></asp:Label><asp:Label
ID="lblFitWidthBtn" runat="server" CssClass="tool-btn" ToolTip="Fit to Width" data-toggle-tb="tooltip"><i class="fa fa-arrows-h"></i></asp:Label><asp:Label
ID="lblZoomOutBtn" runat="server" CssClass="tool-btn" ToolTip="Zoom Out" data-toggle-tb="tooltip"><i class="fa fa-search-minus"></i></asp:Label><asp:Label
ID="lblZoomInBtn" runat="server" CssClass="tool-btn" ToolTip="Zoom In" data-toggle-tb="tooltip"><i class="fa fa-search-plus"></i></asp:Label><span id="spanCurScale" class="user-select-none">100%</span><div id="divDebugTools"><span
id="spanLoadSchemeBtn" class="tool-btn">Load Scheme</span><span
id="spanCreateDomBtn" class="tool-btn">Create DOM</span><span
id="spanStartUpdBtn" class="tool-btn">Start Updating</span><span
Expand Down
16 changes: 16 additions & 0 deletions ScadaWeb/ScadaScheme/PlgScheme/plugins/Scheme/css/scheme.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,20 @@
background-size: 40px 40px;
border: 1px solid @cmd-frame-border-color;
border-radius: 6px;
}

.tooltip-inner {
text-align: left !important;
max-width: none !important;
white-space: nowrap;
}

.user-select-none {
cursor: default;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
14 changes: 14 additions & 0 deletions ScadaWeb/ScadaScheme/PlgScheme/plugins/Scheme/css/schemeform.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,20 @@
border: 1px solid #999;
border-radius: 6px;
}
.tooltip-inner {
text-align: left !important;
max-width: none !important;
white-space: nowrap;
}
.user-select-none {
cursor: default;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
body {
margin: 0;
padding: 0;
Expand Down
2 changes: 1 addition & 1 deletion ScadaWeb/ScadaScheme/PlgScheme/plugins/Scheme/css/schemeform.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions ScadaWeb/ScadaScheme/PlgScheme/plugins/Scheme/js/schemeform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ function loadScheme(viewID) {
scheme.createDom(controlRight);
loadScale();
displayScale();
$(function () {
$('[data-toggle="tooltip"]').tooltip({ container: '#divSchWrapper', html: true, placement: 'auto top' })
})
startUpdatingScheme();
}
} else {
Expand Down
4 changes: 3 additions & 1 deletion ScadaWeb/ScadaScheme/PlgScheme/plugins/Scheme/js/schemerender.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,9 @@ scada.scheme.ComponentRenderer.prototype.setVAlign = function (jqObj, vAlign) {
// Set tooltip (title) of the jQuery object
scada.scheme.ComponentRenderer.prototype.setToolTip = function (jqObj, toolTip) {
if (toolTip) {
jqObj.prop("title", toolTip);
jqObj.prop("title", toolTip.replace(/\n|\r\n|\r/g, '<br>'));
jqObj.attr("data-toggle", "tooltip");
jqObj.addClass("user-select-none");
}
};

Expand Down
Loading