Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
vidjil
vidjil
Commits
bb347508
Commit
bb347508
authored
Mar 30, 2015
by
Marc Duez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
browser move data-box from index.html to com.js/list.js
parent
bfa129f4
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
67 additions
and
30 deletions
+67
-30
browser/css/dark.css
browser/css/dark.css
+5
-3
browser/css/light.css
browser/css/light.css
+5
-3
browser/css/vidjil.less
browser/css/vidjil.less
+3
-3
browser/index.html
browser/index.html
+4
-11
browser/js/com.js
browser/js/com.js
+21
-8
browser/js/list.js
browser/js/list.js
+29
-2
No files found.
browser/css/dark.css
View file @
bb347508
...
@@ -705,7 +705,8 @@ span .substitution {
...
@@ -705,7 +705,8 @@ span .substitution {
.popup_container
a
:hover
{
.popup_container
a
:hover
{
color
:
#fdf6e3
;
color
:
#fdf6e3
;
}
}
#data-container
{
.data-container
,
.info-container
{
z-index
:
3
;
z-index
:
3
;
border
:
solid
;
border
:
solid
;
position
:
fixed
;
position
:
fixed
;
...
@@ -722,8 +723,9 @@ span .substitution {
...
@@ -722,8 +723,9 @@ span .substitution {
height
:
-webkit-calc
(
100%
-
200px
);
height
:
-webkit-calc
(
100%
-
200px
);
height
:
calc
(
100%
-
200px
);
height
:
calc
(
100%
-
200px
);
}
}
#data-msg
{
.data-msg
,
overflow
:
auto
;
.info-msg
{
overflow-x
:
hidden
;
height
:
100%
;
height
:
100%
;
width
:
100%
;
width
:
100%
;
}
}
...
...
browser/css/light.css
View file @
bb347508
...
@@ -705,7 +705,8 @@ span .substitution {
...
@@ -705,7 +705,8 @@ span .substitution {
.popup_container
a
:hover
{
.popup_container
a
:hover
{
color
:
#002b36
;
color
:
#002b36
;
}
}
#data-container
{
.data-container
,
.info-container
{
z-index
:
3
;
z-index
:
3
;
border
:
solid
;
border
:
solid
;
position
:
fixed
;
position
:
fixed
;
...
@@ -722,8 +723,9 @@ span .substitution {
...
@@ -722,8 +723,9 @@ span .substitution {
height
:
-webkit-calc
(
100%
-
200px
);
height
:
-webkit-calc
(
100%
-
200px
);
height
:
calc
(
100%
-
200px
);
height
:
calc
(
100%
-
200px
);
}
}
#data-msg
{
.data-msg
,
overflow
:
auto
;
.info-msg
{
overflow-x
:
hidden
;
height
:
100%
;
height
:
100%
;
width
:
100%
;
width
:
100%
;
}
}
...
...
browser/css/vidjil.less
View file @
bb347508
...
@@ -852,7 +852,7 @@ span .substitution{
...
@@ -852,7 +852,7 @@ span .substitution{
color : @select;
color : @select;
}
}
#
data-container{
.
data-container
, .info-container
{
z-index:3;
z-index:3;
border:solid;
border:solid;
position: fixed;
position: fixed;
...
@@ -870,8 +870,8 @@ span .substitution{
...
@@ -870,8 +870,8 @@ span .substitution{
height: calc(~"100%" - 200px);
height: calc(~"100%" - 200px);
}
}
#
data-msg{
.
data-msg
, .info-msg
{
overflow
: auto
;
overflow
-x: hidden
;
height : 100%;
height : 100%;
width : 100%;
width : 100%;
}
}
...
...
browser/index.html
View file @
bb347508
...
@@ -249,20 +249,20 @@
...
@@ -249,20 +249,20 @@
<!-- MID-CONTAINER -->
<!-- MID-CONTAINER -->
<div
id=
"mid-container"
onmouseover=
"hideSelector()"
>
<div
id=
"mid-container"
onmouseover=
"hideSelector()"
>
<!-- LEFT-CONTAINER -->
<!-- LEFT-CONTAINER -->
<div
id=
"left-container"
>
<div
id=
"left-container"
>
<div
id=
"info-row"
><div
id=
"info"
>
</div></div>
<div
id=
"info-row"
><div
id=
"info"
>
</div></div>
<div
id=
"list-row"
><div
id=
"list"
>
</div></div>
<div
id=
"list-row"
><div
id=
"list"
>
</div></div>
<div
id=
"data-row"
><div
id=
"data"
>
</div></div>
<div
id=
"data-row"
><div
id=
"data"
>
</div></div>
</div>
</div>
<!-- fin left-container -->
<!-- fin left-container -->
<div
id=
"vertical-separator"
></div>
<div
id=
"vertical-separator"
></div>
<!-- RIGHT-CONTAINER -->
<!-- RIGHT-CONTAINER -->
<div
id=
"right-container"
></div>
<div
id=
"right-container"
></div>
<!-- VISU-CONTAINER -->
<!-- VISU-CONTAINER -->
<div
id=
"visu-container"
>
<div
id=
"visu-container"
>
<div
id=
"visu2"
></div>
<div
id=
"visu2"
></div>
<div
id=
"visu-separator"
>
...
</div>
<div
id=
"visu-separator"
>
...
</div>
...
@@ -271,17 +271,10 @@
...
@@ -271,17 +271,10 @@
</div>
</div>
<!-- fin mid-container -->
<!-- fin mid-container -->
<!-- BOT-CONTAINER / SEGMENTER-CONTAINER -->
<!-- BOT-CONTAINER / SEGMENTER-CONTAINER -->
<div
id=
"bot-container"
>
</div>
<div
id=
"bot-container"
>
</div>
<div
id=
"data-container"
>
<span
class=
"closeButton"
onclick=
"console.closeDataBox()"
>
X
</span>
<div
id=
"data-msg"
></div>
</div>
<form
id=
"form"
></form>
<form
id=
"form"
></form>
</body>
</body>
...
...
browser/js/com.js
View file @
bb347508
...
@@ -143,6 +143,23 @@ Com.prototype = {
...
@@ -143,6 +143,23 @@ Com.prototype = {
document
.
body
.
appendChild
(
this
.
flash_container
);
document
.
body
.
appendChild
(
this
.
flash_container
);
document
.
body
.
appendChild
(
this
.
log_container
);
document
.
body
.
appendChild
(
this
.
log_container
);
document
.
body
.
appendChild
(
this
.
popup_container
);
document
.
body
.
appendChild
(
this
.
popup_container
);
this
.
div_dataBox
=
document
.
createElement
(
"
div
"
);
this
.
div_dataBox
.
className
=
"
data-container
"
;
var
closedataBox
=
document
.
createElement
(
"
span
"
);
closedataBox
.
className
=
"
closeButton
"
;
closedataBox
.
appendChild
(
document
.
createTextNode
(
"
X
"
));
closedataBox
.
onclick
=
function
()
{
self
.
closeDataBox
()};
this
.
div_dataBox
.
appendChild
(
closedataBox
);
var
div_data
=
document
.
createElement
(
"
div
"
);
div_data
.
className
=
"
data-msg
"
;
this
.
div_dataBox
.
appendChild
(
div_data
);
document
.
body
.
appendChild
(
this
.
div_dataBox
);
},
},
...
@@ -221,17 +238,13 @@ Com.prototype = {
...
@@ -221,17 +238,13 @@ Com.prototype = {
},
},
dataBox
:
function
(
msg
)
{
dataBox
:
function
(
msg
)
{
document
.
getElementById
(
this
.
data_id
)
this
.
div_dataBox
.
style
.
display
=
"
block
"
;
.
style
.
display
=
"
block
"
;
this
.
div_dataBox
.
lastElementChild
.
innerHTML
=
msg
;
document
.
getElementById
(
this
.
data_id
).
lastElementChild
.
innerHTML
=
msg
;
},
},
closeDataBox
:
function
()
{
closeDataBox
:
function
()
{
document
.
getElementById
(
this
.
data_id
)
this
.
div_dataBox
.
style
.
display
=
"
none
"
;
.
style
.
display
=
"
none
"
;
this
.
div_dataBox
.
lastElementChild
.
innerHTML
=
""
;
document
.
getElementById
(
this
.
data_id
).
lastElementChild
.
innerHTML
=
""
;
}
}
}
}
browser/js/list.js
View file @
bb347508
...
@@ -114,9 +114,26 @@ List.prototype = {
...
@@ -114,9 +114,26 @@ List.prototype = {
$
(
self
.
dataMenu
).
hide
(
'
fast
'
)
$
(
self
.
dataMenu
).
hide
(
'
fast
'
)
}
}
//build infoBox
this
.
infoBox
=
document
.
createElement
(
"
div
"
);
this
.
infoBox
.
className
=
"
info-container
"
;
var
closeinfoBox
=
document
.
createElement
(
"
span
"
);
closeinfoBox
.
className
=
"
closeButton
"
;
closeinfoBox
.
appendChild
(
document
.
createTextNode
(
"
X
"
));
closeinfoBox
.
onclick
=
function
()
{
self
.
closeInfoBox
()};
this
.
infoBox
.
appendChild
(
closeinfoBox
);
var
div_info
=
document
.
createElement
(
"
div
"
);
div_info
.
className
=
"
info-msg
"
;
this
.
infoBox
.
appendChild
(
div_info
);
//add to body
//add to body
document
.
body
.
appendChild
(
this
.
tagSelector
);
document
.
body
.
appendChild
(
this
.
tagSelector
);
document
.
body
.
appendChild
(
this
.
dataMenu
);
document
.
body
.
appendChild
(
this
.
dataMenu
);
document
.
body
.
appendChild
(
this
.
infoBox
);
},
},
/* initialise la liste et crée un div pour chaque clones
/* initialise la liste et crée un div pour chaque clones
...
@@ -404,7 +421,7 @@ List.prototype = {
...
@@ -404,7 +421,7 @@ List.prototype = {
var
span_info
=
document
.
createElement
(
'
span
'
)
var
span_info
=
document
.
createElement
(
'
span
'
)
span_info
.
className
=
"
infoBox
"
;
span_info
.
className
=
"
infoBox
"
;
span_info
.
onclick
=
function
()
{
span_info
.
onclick
=
function
()
{
console
.
data
Box
(
self
.
m
.
clone
(
cloneID
).
getHtmlInfo
());
self
.
displayInfo
Box
(
self
.
m
.
clone
(
cloneID
).
getHtmlInfo
());
}
}
span_info
.
appendChild
(
document
.
createTextNode
(
"
I
"
));
span_info
.
appendChild
(
document
.
createTextNode
(
"
I
"
));
...
@@ -486,7 +503,7 @@ List.prototype = {
...
@@ -486,7 +503,7 @@ List.prototype = {
var
span_info
=
document
.
createElement
(
'
span
'
)
var
span_info
=
document
.
createElement
(
'
span
'
)
span_info
.
className
=
"
infoBox
"
;
span_info
.
className
=
"
infoBox
"
;
span_info
.
onclick
=
function
()
{
span_info
.
onclick
=
function
()
{
console
.
data
Box
(
self
.
m
.
clone
(
this
.
parentNode
.
id2
).
getHtmlInfo
());
self
.
displayInfo
Box
(
self
.
m
.
clone
(
this
.
parentNode
.
id2
).
getHtmlInfo
());
}
}
span_info
.
appendChild
(
document
.
createTextNode
(
"
I
"
));
span_info
.
appendChild
(
document
.
createTextNode
(
"
I
"
));
...
@@ -894,6 +911,16 @@ List.prototype = {
...
@@ -894,6 +911,16 @@ List.prototype = {
$
(
this
.
dataMenu
).
show
(
"
fast
"
);
$
(
this
.
dataMenu
).
show
(
"
fast
"
);
this
.
dataMenuInfo
.
innerHTML
=
data
;
this
.
dataMenuInfo
.
innerHTML
=
data
;
},
},
displayInfoBox
:
function
(
msg
)
{
this
.
infoBox
.
style
.
display
=
"
block
"
;
this
.
infoBox
.
lastElementChild
.
innerHTML
=
msg
;
},
closeInfoBox
:
function
()
{
this
.
infoBox
.
style
.
display
=
"
none
"
;
this
.
infoBox
.
lastElementChild
.
innerHTML
=
""
;
}
}
//fin prototype
}
//fin prototype
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment