Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Зуев Егор
/
wiki.dev
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Authored by
Dan Brown
2015-08-13 20:28:11 +0100
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Commit
b269b3bb3ed96dc953b0f7a2bae81806f0f0faf4
b269b3bb
1 parent
59184fa6
Some image manager fixes
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
6 deletions
resources/assets/js/image-manager.js
resources/assets/sass/image-manager.scss
resources/assets/js/image-manager.js
View file @
b269b3b
...
...
@@ -18,7 +18,7 @@
this
.
callback
=
callback
;
}
hide
(
e
)
{
hide
()
{
console
.
log
(
'test'
);
$
(
React
.
findDOMNode
(
this
)).
hide
();
}
...
...
@@ -70,12 +70,19 @@
});
}
overlayClick
(
e
)
{
if
(
e
.
target
.
className
===
'overlay'
)
{
this
.
hide
();
}
}
render
()
{
var
loadMore
=
this
.
loadMore
.
bind
(
this
);
var
selectImage
=
this
.
selectImage
.
bind
(
this
);
var
overlayClick
=
this
.
overlayClick
.
bind
(
this
);
var
hide
=
this
.
hide
.
bind
(
this
);
return
(
<
div
className
=
"overlay"
onClick
=
{
hide
}
>
<
div
className
=
"overlay"
onClick
=
{
overlayClick
}
>
<
div
id
=
"image-manager"
>
<
div
className
=
"image-manager-content"
>
<
div
className
=
"dropzone-container"
ref
=
"dropZone"
>
...
...
@@ -117,7 +124,7 @@
constructor
(){
super
();
this
.
_dblClickTime
=
16
0
;
this
.
_dblClickTime
=
35
0
;
this
.
_cClickTime
=
0
;
}
...
...
@@ -142,7 +149,7 @@
var
imageClick
=
this
.
imageClick
.
bind
(
this
);
return
(
<
div
>
<
img
on
Double
Click
=
{
imageClick
}
src
=
{
this
.
props
.
image
.
thumbnail
}
/
>
<
img
onClick
=
{
imageClick
}
src
=
{
this
.
props
.
image
.
thumbnail
}
/
>
<
/div
>
);
}
...
...
resources/assets/sass/image-manager.scss
View file @
b269b3b
#image-manager
{
background-color
:
#EEE
;
background-color
:
rgb
(
37
,
37
,
37
)
;
max-width
:
90%
;
max-height
:
90%
;
width
:
90%
;
...
...
@@ -21,6 +21,12 @@
left
:
0
;
z-index
:
999
;
display
:
flex
;
p
,
h1
,
h2
,
h3
,
h4
,
label
,
input
{
color
:
#EEE
;
}
h1
,
h2
,
h3
{
font-weight
:
300
;
}
}
#image-manager
.dropzone-container
{
height
:
100px
;
...
...
@@ -38,7 +44,7 @@
display
:
block
;
float
:
left
;
text-align
:
center
;
background-color
:
#
888
;
background-color
:
#
404040
;
margin
:
1px
;
color
:
#FFF
;
line-height
:
140px
;
...
...
Please
register
or
sign in
to post a comment