Commit f775a08f authored by Steffen Michels's avatar Steffen Michels

Merge branch 'master' into typed-task-editor

parents b2b08e0a fe587171
......@@ -168,8 +168,8 @@ where
# c = toInt c
# dest = {dest & [di]='\\', [di+1]='x', [di+2]=hex (c>>4), [di+3]=hex (c bitand 0x0f)}
= copy_and_escape src (si+1) dest (di+4)
| c == '\''
# dest = {dest & [di]='\\', [di+1]='\''}
| c == '\'' || c == '\\'
# dest = {dest & [di]='\\', [di+1]=c}
= copy_and_escape src (si+1) dest (di+2)
| otherwise
# dest = {dest & [di]=c}
......@@ -193,9 +193,11 @@ where
escaped_size :: !String !Int !Int -> Int
escaped_size s -1 n = n
escaped_size s i n
| s.[i] < '\x20' = escaped_size s (i-1) (n+4)
| s.[i] == '\'' = escaped_size s (i-1) (n+2)
| otherwise = escaped_size s (i-1) (n+1)
| s.[i] < '\x20'
= escaped_size s (i-1) (n+4)
| s.[i] == '\'' || s.[i] == '\\'
= escaped_size s (i-1) (n+2)
= escaped_size s (i-1) (n+1)
JSReal r -> size (toString r) + l
JSVar v -> size v + l
......
......@@ -241,11 +241,11 @@ div.itasks-exception {
*.itasks-viewport .icon-fullscreen {
background-image: url("/css/icons/fullscreen.png") !important;
}
*.itasks-viewport [tooltip] {
*.itasks-viewport [data-tooltip] {
position: relative;
display: inline-block;
}
*.itasks-viewport [tooltip]:before, *.itasks-viewport [tooltip]:after {
*.itasks-viewport [data-tooltip]:before, *.itasks-viewport [data-tooltip]:after {
position: absolute;
transform: translate3d(0, 0, 0);
visibility: hidden;
......@@ -254,19 +254,19 @@ div.itasks-exception {
pointer-events: none;
transition: 0.3s ease;
}
*.itasks-viewport [tooltip]:hover:before, *.itasks-viewport [tooltip]:hover:after, *.itasks-viewport [tooltip]:focus:before, *.itasks-viewport [tooltip]:focus:after {
*.itasks-viewport [data-tooltip]:hover:before, *.itasks-viewport [data-tooltip]:hover:after, *.itasks-viewport [data-tooltip]:focus:before, *.itasks-viewport [data-tooltip]:focus:after {
visibility: visible;
opacity: 1;
}
*.itasks-viewport [tooltip]:before {
*.itasks-viewport [data-tooltip]:before {
content: "";
position: absolute;
background: transparent;
border: 6px solid transparent;
z-index: 1000001;
}
*.itasks-viewport [tooltip]:after {
content: attr(tooltip);
*.itasks-viewport [data-tooltip]:after {
content: attr(data-tooltip);
background: #ccc;
color: #000;
padding: 8px 10px;
......@@ -275,19 +275,19 @@ div.itasks-exception {
white-space: nowrap;
box-shadow: 4px 4px 8px rgba(0, 0, 0, 0.3);
}
*.itasks-viewport [tooltip]:before {
*.itasks-viewport [data-tooltip]:before {
border-left-color: #ccc;
margin-right: -12px;
margin-bottom: -6px;
}
*.itasks-viewport [tooltip]:after {
*.itasks-viewport [data-tooltip]:after {
margin-bottom: -14px;
}
*.itasks-viewport [tooltip]:before, *.itasks-viewport [tooltip]:after {
*.itasks-viewport [data-tooltip]:before, *.itasks-viewport [data-tooltip]:after {
right: 100%;
bottom: 50%;
}
*.itasks-viewport [tooltip]:hover:after, *.itasks-viewport [tooltip]:hover:before, *.itasks-viewport [tooltip]:focus:after, *.itasks-viewport [tooltip]:focus:before {
*.itasks-viewport [data-tooltip]:hover:after, *.itasks-viewport [data-tooltip]:hover:before, *.itasks-viewport [data-tooltip]:focus:after, *.itasks-viewport [data-tooltip]:focus:before {
transform: translateX(-8px);
}
......
......@@ -241,11 +241,11 @@ div.itasks-exception {
*.itasks-viewport .icon-fullscreen {
background-image: url("/css/icons/fullscreen.png") !important;
}
*.itasks-viewport [tooltip] {
*.itasks-viewport [data-tooltip] {
position: relative;
display: inline-block;
}
*.itasks-viewport [tooltip]:before, *.itasks-viewport [tooltip]:after {
*.itasks-viewport [data-tooltip]:before, *.itasks-viewport [data-tooltip]:after {
position: absolute;
transform: translate3d(0, 0, 0);
visibility: hidden;
......@@ -254,19 +254,19 @@ div.itasks-exception {
pointer-events: none;
transition: 0.3s ease;
}
*.itasks-viewport [tooltip]:hover:before, *.itasks-viewport [tooltip]:hover:after, *.itasks-viewport [tooltip]:focus:before, *.itasks-viewport [tooltip]:focus:after {
*.itasks-viewport [data-tooltip]:hover:before, *.itasks-viewport [data-tooltip]:hover:after, *.itasks-viewport [data-tooltip]:focus:before, *.itasks-viewport [data-tooltip]:focus:after {
visibility: visible;
opacity: 1;
}
*.itasks-viewport [tooltip]:before {
*.itasks-viewport [data-tooltip]:before {
content: "";
position: absolute;
background: transparent;
border: 6px solid transparent;
z-index: 1000001;
}
*.itasks-viewport [tooltip]:after {
content: attr(tooltip);
*.itasks-viewport [data-tooltip]:after {
content: attr(data-tooltip);
background: #ccc;
color: #000;
padding: 8px 10px;
......@@ -275,19 +275,19 @@ div.itasks-exception {
white-space: nowrap;
box-shadow: 4px 4px 8px rgba(0, 0, 0, 0.3);
}
*.itasks-viewport [tooltip]:before {
*.itasks-viewport [data-tooltip]:before {
border-left-color: #ccc;
margin-right: -12px;
margin-bottom: -6px;
}
*.itasks-viewport [tooltip]:after {
*.itasks-viewport [data-tooltip]:after {
margin-bottom: -14px;
}
*.itasks-viewport [tooltip]:before, *.itasks-viewport [tooltip]:after {
*.itasks-viewport [data-tooltip]:before, *.itasks-viewport [data-tooltip]:after {
right: 100%;
bottom: 50%;
}
*.itasks-viewport [tooltip]:hover:after, *.itasks-viewport [tooltip]:hover:before, *.itasks-viewport [tooltip]:focus:after, *.itasks-viewport [tooltip]:focus:before {
*.itasks-viewport [data-tooltip]:hover:after, *.itasks-viewport [data-tooltip]:hover:before, *.itasks-viewport [data-tooltip]:focus:after, *.itasks-viewport [data-tooltip]:focus:before {
transform: translateX(-8px);
}
......
[tooltip] {
[data-tooltip] {
position: relative;
display: inline-block;
}
[tooltip]:before, [tooltip]:after {
[data-tooltip]:before, [data-tooltip]:after {
position: absolute;
transform: translate3d(0, 0, 0);
visibility: hidden;
......@@ -11,19 +11,19 @@
pointer-events: none;
transition: 0.3s ease;
}
[tooltip]:hover:before, [tooltip]:hover:after, [tooltip]:focus:before, [tooltip]:focus:after {
[data-tooltip]:hover:before, [data-tooltip]:hover:after, [data-tooltip]:focus:before, [data-tooltip]:focus:after {
visibility: visible;
opacity: 1;
}
[tooltip]:before {
[data-tooltip]:before {
content: '';
position: absolute;
background: transparent;
border: 6px solid transparent;
z-index: 1000001;
}
[tooltip]:after {
content: attr(tooltip);
[data-tooltip]:after {
content: attr(data-tooltip);
background: #ccc;
color: #000;
padding: 8px 10px;
......@@ -32,18 +32,18 @@
white-space: nowrap;
box-shadow: 4px 4px 8px rgba(0, 0, 0, 0.3);
}
[tooltip]:before {
[data-tooltip]:before {
border-left-color: #ccc;
margin-right: -12px;
margin-bottom: -6px;
}
[tooltip]:after {
[data-tooltip]:after {
margin-bottom: -14px;
}
[tooltip]:before, [tooltip]:after {
[data-tooltip]:before, [data-tooltip]:after {
right: 100%;
bottom: 50%;
}
[tooltip]:hover:after, [tooltip]:hover:before, [tooltip]:focus:after, [tooltip]:focus:before {
[data-tooltip]:hover:after, [data-tooltip]:hover:before, [data-tooltip]:focus:after, [data-tooltip]:focus:before {
transform: translateX(-8px);
}
......@@ -426,9 +426,9 @@ itasks.Icon = {
me.currentIcon = me.attributes.iconCls;
if(me.attributes.tooltip) {
el.tooltip=me.attributes.tooltip;
el.dataset.tooltip=me.attributes.tooltip;
}
},
},
onAttributeChange: function(name,value) {
var me = this,
el = me.domEl;
......@@ -439,9 +439,8 @@ itasks.Icon = {
el.classList.add(me.currentIcon);
break;
case 'tooltip':
el.tooltip=value;
el.dataset.tooltip=value;
break;
}
}
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment