BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
288064c5
Commit
288064c5
authored
Jan 15, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed jQuery UI draggable
parent
8b855eaf
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
58 additions
and
25 deletions
+58
-25
application.js
app/assets/javascripts/application.js
+0
-2
image_file.js
app/assets/javascripts/commit/image_file.js
+58
-23
No files found.
app/assets/javascripts/application.js
View file @
288064c5
...
...
@@ -7,8 +7,6 @@
/* global Aside */
window
.
$
=
window
.
jQuery
=
require
(
'jquery'
);
require
(
'jquery-ui/ui/draggable'
);
require
(
'jquery-ui/ui/sortable'
);
require
(
'jquery-ujs'
);
require
(
'vendor/jquery.endless-scroll'
);
require
(
'vendor/jquery.highlight'
);
...
...
app/assets/javascripts/commit/image_file.js
View file @
288064c5
...
...
@@ -52,6 +52,30 @@
return
this
.
views
[
viewMode
].
call
(
this
);
};
ImageFile
.
prototype
.
initDraggable
=
function
(
$el
,
padding
,
callback
)
{
var
dragging
=
false
;
var
$body
=
$
(
'body'
);
var
$offsetEl
=
$el
.
parent
();
$el
.
off
(
'mousedown'
).
on
(
'mousedown'
,
function
()
{
dragging
=
true
;
$body
.
css
(
'user-select'
,
'none'
);
});
$body
.
off
(
'mouseup'
).
off
(
'mousemove'
).
on
(
'mouseup'
,
function
()
{
dragging
=
false
;
$body
.
css
(
'user-select'
,
''
);
})
.
on
(
'mousemove'
,
function
(
e
)
{
var
left
;
if
(
!
dragging
)
return
;
left
=
e
.
pageX
-
(
$offsetEl
.
offset
().
left
+
padding
);
callback
(
e
,
left
);
});
};
prepareFrames
=
function
(
view
)
{
var
maxHeight
,
maxWidth
;
maxWidth
=
0
;
...
...
@@ -96,26 +120,30 @@
maxHeight
=
0
;
return
$
(
'.swipe.view'
,
this
.
file
).
each
((
function
(
_this
)
{
return
function
(
index
,
view
)
{
var
ref
;
var
$swipeWrap
,
$swipeBar
,
$swipeFrame
,
wrapPadding
,
ref
;
ref
=
prepareFrames
(
view
),
maxWidth
=
ref
[
0
],
maxHeight
=
ref
[
1
];
$
(
'.swipe-frame'
,
view
).
css
({
$swipeFrame
=
$
(
'.swipe-frame'
,
view
);
$swipeWrap
=
$
(
'.swipe-wrap'
,
view
);
$swipeBar
=
$
(
'.swipe-bar'
,
view
);
$swipeFrame
.
css
({
width
:
maxWidth
+
16
,
height
:
maxHeight
+
28
});
$
(
'.swipe-wrap'
,
view
)
.
css
({
$
swipeWrap
.
css
({
width
:
maxWidth
+
1
,
height
:
maxHeight
+
2
});
return
$
(
'.swipe-bar'
,
view
)
.
css
({
$swipeBar
.
css
({
left
:
0
})
.
draggable
({
axis
:
'x'
,
containment
:
'parent'
,
drag
:
function
(
event
)
{
return
$
(
'.swipe-wrap'
,
view
).
width
((
maxWidth
+
1
)
-
$
(
this
).
position
().
left
);
},
stop
:
function
(
event
)
{
return
$
(
'.swipe-wrap'
,
view
).
width
((
maxWidth
+
1
)
-
$
(
this
).
position
().
left
);
})
;
wrapPadding
=
parseInt
(
$swipeWrap
.
css
(
'right'
).
replace
(
'px'
,
''
),
10
);
_this
.
initDraggable
(
$swipeBar
,
wrapPadding
,
function
(
e
,
left
)
{
if
(
left
>
0
&&
left
<
$swipeFrame
.
width
()
-
(
wrapPadding
*
2
))
{
$swipeWrap
.
width
((
maxWidth
+
1
)
-
left
);
$swipeBar
.
css
(
'left'
,
left
);
}
});
};
...
...
@@ -128,9 +156,14 @@
dragTrackWidth
=
$
(
'.drag-track'
,
this
.
file
).
width
()
-
$
(
'.dragger'
,
this
.
file
).
width
();
return
$
(
'.onion-skin.view'
,
this
.
file
).
each
((
function
(
_this
)
{
return
function
(
index
,
view
)
{
var
ref
;
var
$frame
,
$track
,
$dragger
,
$frameAdded
,
framePadding
,
ref
,
dragging
=
false
;
ref
=
prepareFrames
(
view
),
maxWidth
=
ref
[
0
],
maxHeight
=
ref
[
1
];
$
(
'.onion-skin-frame'
,
view
).
css
({
$frame
=
$
(
'.onion-skin-frame'
,
view
);
$frameAdded
=
$
(
'.frame.added'
,
view
);
$track
=
$
(
'.drag-track'
,
view
);
$dragger
=
$
(
'.dragger'
,
$track
);
$frame
.
css
({
width
:
maxWidth
+
16
,
height
:
maxHeight
+
28
});
...
...
@@ -138,16 +171,18 @@
width
:
maxWidth
+
1
,
height
:
maxHeight
+
2
});
return
$
(
'.dragger'
,
view
)
.
css
({
$dragger
.
css
({
left
:
dragTrackWidth
}).
draggable
({
axis
:
'x'
,
containment
:
'parent'
,
drag
:
function
(
event
)
{
return
$
(
'.frame.added'
,
view
).
css
(
'opacity'
,
$
(
this
).
position
().
left
/
dragTrackWidth
);
},
stop
:
function
(
event
)
{
return
$
(
'.frame.added'
,
view
).
css
(
'opacity'
,
$
(
this
).
position
().
left
/
dragTrackWidth
);
});
framePadding
=
parseInt
(
$frameAdded
.
css
(
'right'
).
replace
(
'px'
,
''
),
10
);
_this
.
initDraggable
(
$dragger
,
framePadding
,
function
(
e
,
left
)
{
var
opacity
=
left
/
dragTrackWidth
;
if
(
opacity
>=
0
&&
opacity
<=
1
)
{
$dragger
.
css
(
'left'
,
left
);
$frameAdded
.
css
(
'opacity'
,
opacity
);
}
});
};
...
...
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