Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
7e3405d7
Commit
7e3405d7
authored
Jan 08, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix last eslint rules
parent
349d0668
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
169 additions
and
156 deletions
+169
-156
.eslintrc
.eslintrc
+2
-1
app/assets/javascripts/commit/image_file.js
app/assets/javascripts/commit/image_file.js
+98
-96
app/assets/javascripts/groups/components/item_actions.vue
app/assets/javascripts/groups/components/item_actions.vue
+45
-45
app/assets/javascripts/notebook/cells/output/index.vue
app/assets/javascripts/notebook/cells/output/index.vue
+13
-12
app/assets/javascripts/notes/components/comment_form.vue
app/assets/javascripts/notes/components/comment_form.vue
+2
-1
app/assets/javascripts/vue_shared/components/modal.vue
app/assets/javascripts/vue_shared/components/modal.vue
+1
-1
app/assets/javascripts/vue_shared/components/pikaday.vue
app/assets/javascripts/vue_shared/components/pikaday.vue
+3
-0
app/assets/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue
...ared/components/sidebar/collapsed_grouped_date_picker.vue
+2
-0
app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue
...javascripts/vue_shared/components/sidebar/date_picker.vue
+3
-0
No files found.
.eslintrc
View file @
7e3405d7
...
...
@@ -16,7 +16,8 @@
"localStorage": false
},
"parserOptions": {
"parser": "babel-eslint"
"parser": "babel-eslint",
"ecmaVersion": 2017
},
"plugins": [
"filenames",
...
...
app/assets/javascripts/commit/image_file.js
View file @
7e3405d7
...
...
@@ -94,102 +94,104 @@ export default class ImageFile {
});
return
[
maxWidth
,
maxHeight
];
}
views
=
{
'
two-up
'
:
function
()
{
return
$
(
'
.two-up.view .wrap
'
,
this
.
file
).
each
((
function
(
_this
)
{
return
function
(
index
,
wrap
)
{
$
(
'
img
'
,
wrap
).
each
(
function
()
{
var
currentWidth
;
currentWidth
=
$
(
this
).
width
();
if
(
currentWidth
>
availWidth
/
2
)
{
return
$
(
this
).
width
(
availWidth
/
2
);
}
});
return
_this
.
requestImageInfo
(
$
(
'
img
'
,
wrap
),
function
(
width
,
height
)
{
$
(
'
.image-info .meta-width
'
,
wrap
).
text
(
width
+
"
px
"
);
$
(
'
.image-info .meta-height
'
,
wrap
).
text
(
height
+
"
px
"
);
return
$
(
'
.image-info
'
,
wrap
).
removeClass
(
'
hide
'
);
});
};
})(
this
));
},
'
swipe
'
:
function
()
{
var
maxHeight
,
maxWidth
;
maxWidth
=
0
;
maxHeight
=
0
;
return
$
(
'
.swipe.view
'
,
this
.
file
).
each
((
function
(
_this
)
{
return
function
(
index
,
view
)
{
var
$swipeWrap
,
$swipeBar
,
$swipeFrame
,
wrapPadding
,
ref
;
ref
=
_this
.
prepareFrames
(
view
),
maxWidth
=
ref
[
0
],
maxHeight
=
ref
[
1
];
$swipeFrame
=
$
(
'
.swipe-frame
'
,
view
);
$swipeWrap
=
$
(
'
.swipe-wrap
'
,
view
);
$swipeBar
=
$
(
'
.swipe-bar
'
,
view
);
$swipeFrame
.
css
({
width
:
maxWidth
+
16
,
height
:
maxHeight
+
28
});
$swipeWrap
.
css
({
width
:
maxWidth
+
1
,
height
:
maxHeight
+
2
});
// Set swipeBar left position to match image frame
$swipeBar
.
css
({
left
:
1
});
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
);
}
});
};
})(
this
));
},
'
onion-skin
'
:
function
()
{
var
dragTrackWidth
,
maxHeight
,
maxWidth
;
maxWidth
=
0
;
maxHeight
=
0
;
dragTrackWidth
=
$
(
'
.drag-track
'
,
this
.
file
).
width
()
-
$
(
'
.dragger
'
,
this
.
file
).
width
();
return
$
(
'
.onion-skin.view
'
,
this
.
file
).
each
((
function
(
_this
)
{
return
function
(
index
,
view
)
{
var
$frame
,
$track
,
$dragger
,
$frameAdded
,
framePadding
,
ref
,
dragging
=
false
;
ref
=
_this
.
prepareFrames
(
view
),
maxWidth
=
ref
[
0
],
maxHeight
=
ref
[
1
];
$frame
=
$
(
'
.onion-skin-frame
'
,
view
);
$frameAdded
=
$
(
'
.frame.added
'
,
view
);
$track
=
$
(
'
.drag-track
'
,
view
);
$dragger
=
$
(
'
.dragger
'
,
$track
);
$frame
.
css
({
width
:
maxWidth
+
16
,
height
:
maxHeight
+
28
});
$
(
'
.swipe-wrap
'
,
view
).
css
({
width
:
maxWidth
+
1
,
height
:
maxHeight
+
2
});
$dragger
.
css
({
left
:
dragTrackWidth
});
$frameAdded
.
css
(
'
opacity
'
,
1
);
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
);
}
});
};
})(
this
));
}
// eslint-disable-next-line class-methods-use-this
views
()
{
return
{
'
two-up
'
:
function
()
{
return
$
(
'
.two-up.view .wrap
'
,
this
.
file
).
each
((
function
(
_this
)
{
return
function
(
index
,
wrap
)
{
$
(
'
img
'
,
wrap
).
each
(
function
()
{
var
currentWidth
;
currentWidth
=
$
(
this
).
width
();
if
(
currentWidth
>
availWidth
/
2
)
{
return
$
(
this
).
width
(
availWidth
/
2
);
}
});
return
_this
.
requestImageInfo
(
$
(
'
img
'
,
wrap
),
function
(
width
,
height
)
{
$
(
'
.image-info .meta-width
'
,
wrap
).
text
(
width
+
"
px
"
);
$
(
'
.image-info .meta-height
'
,
wrap
).
text
(
height
+
"
px
"
);
return
$
(
'
.image-info
'
,
wrap
).
removeClass
(
'
hide
'
);
});
};
})(
this
));
},
'
swipe
'
:
function
()
{
var
maxHeight
,
maxWidth
;
maxWidth
=
0
;
maxHeight
=
0
;
return
$
(
'
.swipe.view
'
,
this
.
file
).
each
((
function
(
_this
)
{
return
function
(
index
,
view
)
{
var
$swipeWrap
,
$swipeBar
,
$swipeFrame
,
wrapPadding
,
ref
;
ref
=
_this
.
prepareFrames
(
view
),
maxWidth
=
ref
[
0
],
maxHeight
=
ref
[
1
];
$swipeFrame
=
$
(
'
.swipe-frame
'
,
view
);
$swipeWrap
=
$
(
'
.swipe-wrap
'
,
view
);
$swipeBar
=
$
(
'
.swipe-bar
'
,
view
);
$swipeFrame
.
css
({
width
:
maxWidth
+
16
,
height
:
maxHeight
+
28
});
$swipeWrap
.
css
({
width
:
maxWidth
+
1
,
height
:
maxHeight
+
2
});
// Set swipeBar left position to match image frame
$swipeBar
.
css
({
left
:
1
});
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
);
}
});
};
})(
this
));
},
'
onion-skin
'
:
function
()
{
var
dragTrackWidth
,
maxHeight
,
maxWidth
;
maxWidth
=
0
;
maxHeight
=
0
;
dragTrackWidth
=
$
(
'
.drag-track
'
,
this
.
file
).
width
()
-
$
(
'
.dragger
'
,
this
.
file
).
width
();
return
$
(
'
.onion-skin.view
'
,
this
.
file
).
each
((
function
(
_this
)
{
return
function
(
index
,
view
)
{
var
$frame
,
$track
,
$dragger
,
$frameAdded
,
framePadding
,
ref
,
dragging
=
false
;
ref
=
_this
.
prepareFrames
(
view
),
maxWidth
=
ref
[
0
],
maxHeight
=
ref
[
1
];
$frame
=
$
(
'
.onion-skin-frame
'
,
view
);
$frameAdded
=
$
(
'
.frame.added
'
,
view
);
$track
=
$
(
'
.drag-track
'
,
view
);
$dragger
=
$
(
'
.dragger
'
,
$track
);
$frame
.
css
({
width
:
maxWidth
+
16
,
height
:
maxHeight
+
28
});
$
(
'
.swipe-wrap
'
,
view
).
css
({
width
:
maxWidth
+
1
,
height
:
maxHeight
+
2
});
$dragger
.
css
({
left
:
dragTrackWidth
});
$frameAdded
.
css
(
'
opacity
'
,
1
);
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
);
}
});
};
})(
this
));
}
};
}
requestImageInfo
(
img
,
callback
)
{
...
...
app/assets/javascripts/groups/components/item_actions.vue
View file @
7e3405d7
<
script
>
import
{
s__
}
from
'
~/locale
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
icon
from
'
~/vue_shared/components/icon.vue
'
;
import
modal
from
'
~/vue_shared/components/modal.vue
'
;
import
eventHub
from
'
../event_hub
'
;
import
{
COMMON_STR
}
from
'
../constants
'
;
import
{
s__
}
from
'
~/locale
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
icon
from
'
~/vue_shared/components/icon.vue
'
;
import
modal
from
'
~/vue_shared/components/modal.vue
'
;
import
eventHub
from
'
../event_hub
'
;
import
{
COMMON_STR
}
from
'
../constants
'
;
export
default
{
components
:
{
icon
,
modal
,
},
directives
:
{
tooltip
,
},
props
:
{
parentGroup
:
{
type
:
Object
,
required
:
false
,
default
:
()
=>
({}),
export
default
{
components
:
{
icon
,
modal
,
},
group
:
{
type
:
Object
,
required
:
true
,
directives
:
{
tooltip
,
},
},
data
()
{
return
{
modalStatus
:
false
,
};
},
computed
:
{
leaveBtnTitle
()
{
return
COMMON_STR
.
LEAVE_BTN_TITLE
;
props
:
{
parentGroup
:
{
type
:
Object
,
required
:
false
,
default
:
()
=>
({}),
},
group
:
{
type
:
Object
,
required
:
true
,
},
},
editBtnTitle
()
{
return
COMMON_STR
.
EDIT_BTN_TITLE
;
data
()
{
return
{
modalStatus
:
false
,
};
},
leaveConfirmationMessage
()
{
return
s__
(
`GroupsTree|Are you sure you want to leave the "
${
this
.
group
.
fullName
}
" group?`
);
computed
:
{
leaveBtnTitle
()
{
return
COMMON_STR
.
LEAVE_BTN_TITLE
;
},
editBtnTitle
()
{
return
COMMON_STR
.
EDIT_BTN_TITLE
;
},
leaveConfirmationMessage
()
{
return
s__
(
`GroupsTree|Are you sure you want to leave the "
${
this
.
group
.
fullName
}
" group?`
);
},
},
},
methods
:
{
onLeaveGroup
()
{
this
.
modalStatus
=
true
;
methods
:
{
onLeaveGroup
()
{
this
.
modalStatus
=
true
;
},
leaveGroup
()
{
this
.
modalStatus
=
false
;
eventHub
.
$emit
(
'
leaveGroup
'
,
this
.
group
,
this
.
parentGroup
);
},
},
leaveGroup
()
{
this
.
modalStatus
=
false
;
eventHub
.
$emit
(
'
leaveGroup
'
,
this
.
group
,
this
.
parentGroup
);
},
},
};
};
</
script
>
<
template
>
...
...
app/assets/javascripts/notebook/cells/output/index.vue
View file @
7e3405d7
...
...
@@ -26,30 +26,18 @@
default
:
()
=>
({}),
},
},
data
()
{
return
{
outputType
:
''
,
};
},
computed
:
{
componentName
()
{
if
(
this
.
output
.
text
)
{
return
'
code-cell
'
;
}
else
if
(
this
.
output
.
data
[
'
image/png
'
])
{
this
.
outputType
=
'
image/png
'
;
return
'
image-output
'
;
}
else
if
(
this
.
output
.
data
[
'
text/html
'
])
{
this
.
outputType
=
'
text/html
'
;
return
'
html-output
'
;
}
else
if
(
this
.
output
.
data
[
'
image/svg+xml
'
])
{
this
.
outputType
=
'
image/svg+xml
'
;
return
'
html-output
'
;
}
this
.
outputType
=
'
text/plain
'
;
return
'
code-cell
'
;
},
rawCode
()
{
...
...
@@ -59,6 +47,19 @@
return
this
.
dataForType
(
this
.
outputType
);
},
outputType
()
{
if
(
this
.
output
.
text
)
{
return
''
;
}
else
if
(
this
.
output
.
data
[
'
image/png
'
])
{
return
'
image/png
'
;
}
else
if
(
this
.
output
.
data
[
'
text/html
'
])
{
return
'
text/html
'
;
}
else
if
(
this
.
output
.
data
[
'
image/svg+xml
'
])
{
return
'
image/svg+xml
'
;
}
return
'
text/plain
'
;
},
},
methods
:
{
dataForType
(
type
)
{
...
...
app/assets/javascripts/notes/components/comment_form.vue
View file @
7e3405d7
...
...
@@ -305,7 +305,8 @@ js-gfm-input js-autosize markdown-area js-vue-textarea"
</textarea>
</markdown-field>
<div
class=
"note-form-actions"
>
<div
class=
"pull-left btn-group
<div
class=
"pull-left btn-group
append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
>
<button
@
click.prevent=
"handleSave()"
...
...
app/assets/javascripts/vue_shared/components/modal.vue
View file @
7e3405d7
...
...
@@ -115,7 +115,7 @@
name=
"body"
:text=
"text"
>
<p>
{{
t
his
.
t
ext
}}
</p>
<p>
{{
text
}}
</p>
</slot>
</div>
<div
...
...
app/assets/javascripts/vue_shared/components/pikaday.vue
View file @
7e3405d7
...
...
@@ -13,14 +13,17 @@
selectedDate
:
{
type
:
Date
,
required
:
false
,
default
:
null
,
},
minDate
:
{
type
:
Date
,
required
:
false
,
default
:
null
,
},
maxDate
:
{
type
:
Date
,
required
:
false
,
default
:
null
,
},
},
mounted
()
{
...
...
app/assets/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue
View file @
7e3405d7
...
...
@@ -23,10 +23,12 @@
minDate
:
{
type
:
Date
,
required
:
false
,
default
:
null
,
},
maxDate
:
{
type
:
Date
,
required
:
false
,
default
:
null
,
},
disableClickableIcons
:
{
type
:
Boolean
,
...
...
app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue
View file @
7e3405d7
...
...
@@ -42,14 +42,17 @@
selectedDate
:
{
type
:
Date
,
required
:
false
,
default
:
null
,
},
minDate
:
{
type
:
Date
,
required
:
false
,
default
:
null
,
},
maxDate
:
{
type
:
Date
,
required
:
false
,
default
:
null
,
},
},
data
()
{
...
...
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