Skip to content

Commit

Permalink
gMultiSelectToogleBlockId
Browse files Browse the repository at this point in the history
  • Loading branch information
tomasz75 committed Dec 22, 2020
1 parent 3287eaf commit b0b66ee
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 12 deletions.
2 changes: 2 additions & 0 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
<!-- endbuild -->
<script>
var clickB;
// This is last toggled block via multiselect
var gMultiSelectToogleBlockId = null;
// test url
//http://localhost:3000/?params={"options":{"min":360,"max":1140,"mode":"real"},"schedule":{"blocks":[{"id":1,"start":480,"value":60,"planned":"1","real":"1"}],"meal":"1","rmeal":"1"}}

Expand Down
11 changes: 5 additions & 6 deletions app/scripts/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@
var holdDelay = 500;
// This flag indicates the user is currently holding the mouse down
var holdActive = false;
// This is last toggled block via multiselect
var multiSelectToogleBlockId = null;


function _init() {
_mergeOptions();
Expand Down Expand Up @@ -350,12 +349,12 @@
// multiselect
step.on('mouseenter', function(e){
if(e.buttons == 1 || e.buttons == 3){
if (multiSelectToogleBlockId !== blockSelector){
multiSelectToogleBlockId = blockSelector;
if (gMultiSelectToogleBlockId !== blockSelector){
gMultiSelectToogleBlockId = blockSelector;
_togglePlan(blockSelector);
setTimeout(function() {
multiSelectToogleBlockId = null;
}, 1000);
gMultiSelectToogleBlockId = null;
}, 1500);
$('html').addClass('multiSelectMode');
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/styles/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ a.introjs-button {
font-size: 1em;
margin: 10px;
padding-left: 20px;
introjs-tooltiptext padding-right: 20px;
padding-right: 20px;
padding-top: 10px;
padding-bottom: 10px;
}
Expand Down
6 changes: 4 additions & 2 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<!DOCTYPE html><html class=no-js><head><meta charset=utf-8><title>ClickableBlocks</title><meta name=description content=""><meta name=viewport content="width=device-width"><link rel="shortcut icon" href=/6dfcc63f.favicon.ico><!-- the same like in apex --><link href=//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css rel=stylesheet><link rel=stylesheet href=styles/1b71b0f4.vendor.css><link rel=stylesheet href=styles/61fa2b15.main.css><style>i.fa.fa-cutlery.fa-2x{
<!DOCTYPE html><html class=no-js><head><meta charset=utf-8><title>ClickableBlocks</title><meta name=description content=""><meta name=viewport content="width=device-width"><link rel="shortcut icon" href=/6dfcc63f.favicon.ico><!-- the same like in apex --><link href=//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css rel=stylesheet><link rel=stylesheet href=styles/1b71b0f4.vendor.css><link rel=stylesheet href=styles/f7b71e53.main.css><style>i.fa.fa-cutlery.fa-2x{
width: 70px !important;
}
i.AddIcon > svg{
height: 1em;
}</style><body style="margin-top: 2em"><div id=bipSchedule_parent style="float:left; display: inline-block"><p>xxxx</p></div><script src=scripts/834911ac.vendor.js></script><script src=scripts/1c3b60a7.main.js></script><script>var clickB;
}</style><body style="margin-top: 2em"><div id=bipSchedule_parent style="float:left; display: inline-block"><p>xxxx</p></div><script src=scripts/834911ac.vendor.js></script><script src=scripts/d09667c9.main.js></script><script>var clickB;
// This is last toggled block via multiselect
var gMultiSelectToogleBlockId = null;
// test url
//http://localhost:3000/?params={"options":{"min":360,"max":1140,"mode":"real"},"schedule":{"blocks":[{"id":1,"start":480,"value":60,"planned":"1","real":"1"}],"meal":"1","rmeal":"1"}}

Expand Down
1 change: 0 additions & 1 deletion dist/scripts/1c3b60a7.main.js

This file was deleted.

1 change: 1 addition & 0 deletions dist/scripts/d09667c9.main.js

Large diffs are not rendered by default.

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

2 changes: 1 addition & 1 deletion dist/test.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html class=no-js><head><meta charset=utf-8><title>ClickableBlocks</title><meta name=description content=""><meta name=viewport content="width=device-width"><link rel="shortcut icon" href=/6dfcc63f.favicon.ico><link href=//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css rel=stylesheet><link rel=stylesheet href=styles/61fa2b15.main.css><body><div class=ClickableBlocksContent style="width: 1200px; margin-right: 20px;padding-top: 20px; white-space: nowrap; overflow: auto"><div id=P6_CB_1_parent style="float:left; display: inline-block"></div><div style="float:left; display: inline-block" id=clickB0_parent></div><div style=float:left id=clickB1_parent></div><div style=float:left id=clickB2_parent></div><div style=float:left id=clickB3_parent></div><div style=float:left id=clickB4_parent></div><div style=float:left id=clickB5_parent></div><div style=float:left id=clickB6_parent></div><div style=float:left id=clickB7_parent></div><div style=float:left id=clickB8_parent></div><div style=float:left id=clickB9_parent></div></div><script src=scripts/834911ac.vendor.js></script><script src=scripts/1c3b60a7.main.js></script><script>var cb;
<!DOCTYPE html><html class=no-js><head><meta charset=utf-8><title>ClickableBlocks</title><meta name=description content=""><meta name=viewport content="width=device-width"><link rel="shortcut icon" href=/6dfcc63f.favicon.ico><link href=//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css rel=stylesheet><link rel=stylesheet href=styles/f7b71e53.main.css><body><div class=ClickableBlocksContent style="width: 1200px; margin-right: 20px;padding-top: 20px; white-space: nowrap; overflow: auto"><div id=P6_CB_1_parent style="float:left; display: inline-block"></div><div style="float:left; display: inline-block" id=clickB0_parent></div><div style=float:left id=clickB1_parent></div><div style=float:left id=clickB2_parent></div><div style=float:left id=clickB3_parent></div><div style=float:left id=clickB4_parent></div><div style=float:left id=clickB5_parent></div><div style=float:left id=clickB6_parent></div><div style=float:left id=clickB7_parent></div><div style=float:left id=clickB8_parent></div><div style=float:left id=clickB9_parent></div></div><script src=scripts/834911ac.vendor.js></script><script src=scripts/d09667c9.main.js></script><script>var cb;
$(function () {
var block1 = {
"start": "480",
Expand Down

0 comments on commit b0b66ee

Please sign in to comment.