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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
aa2d6eec
Commit
aa2d6eec
authored
Nov 29, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improvements after review
parent
6789befb
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
21 deletions
+21
-21
app/assets/javascripts/dispatcher.js.es6
app/assets/javascripts/dispatcher.js.es6
+1
-1
app/assets/javascripts/extensions/element.js.es6
app/assets/javascripts/extensions/element.js.es6
+12
-14
app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js.es6
...assets/javascripts/lib/utils/bootstrap_linked_tabs.js.es6
+7
-5
app/assets/javascripts/pipelines.js.es6
app/assets/javascripts/pipelines.js.es6
+1
-1
No files found.
app/assets/javascripts/dispatcher.js.es6
View file @
aa2d6eec
...
@@ -137,7 +137,7 @@
...
@@ -137,7 +137,7 @@
break;
break;
case 'projects:pipelines:builds':
case 'projects:pipelines:builds':
case 'projects:pipelines:show':
case 'projects:pipelines:show':
const
controllerAction = document.querySelector('.js-pipeline-container').dataset.controllerAction
;
const
{ controllerAction } = document.querySelector('.js-pipeline-container').dataset
;
new gl.Pipelines({
new gl.Pipelines({
initTabs: true,
initTabs: true,
...
...
app/assets/javascripts/extensions/element.js.es6
View file @
aa2d6eec
...
@@ -6,8 +6,7 @@ Element.prototype.closest = Element.prototype.closest || function closest(select
...
@@ -6,8 +6,7 @@ Element.prototype.closest = Element.prototype.closest || function closest(select
return selectedElement.matches(selector) ? selectedElement : Element.prototype.closest(selector, selectedElement.parentElement);
return selectedElement.matches(selector) ? selectedElement : Element.prototype.closest(selector, selectedElement.parentElement);
};
};
if (!Element.prototype.matches) {
Element.prototype.matches = Element.prototype.matches ||
Element.prototype.matches =
Element.prototype.matchesSelector ||
Element.prototype.matchesSelector ||
Element.prototype.mozMatchesSelector ||
Element.prototype.mozMatchesSelector ||
Element.prototype.msMatchesSelector ||
Element.prototype.msMatchesSelector ||
...
@@ -19,4 +18,3 @@ if (!Element.prototype.matches) {
...
@@ -19,4 +18,3 @@ if (!Element.prototype.matches) {
while (--i >= 0 && matches.item(i) !== this) {}
while (--i >= 0 && matches.item(i) !== this) {}
return i > -1;
return i > -1;
};
};
}
app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js.es6
View file @
aa2d6eec
...
@@ -53,16 +53,18 @@
...
@@ -53,16 +53,18 @@
this.defaultAction = this.options.defaultAction;
this.defaultAction = this.options.defaultAction;
this.action = this.options.action || this.defaultAction;
this.action = this.options.action || this.defaultAction;
this.currentLocation = window.location;
if (this.action === 'show') {
if (this.action === 'show') {
this.action = this.defaultAction;
this.action = this.defaultAction;
}
}
this.currentLocation = window.location;
const tabSelector = `${this.options.parentEl} a[data-toggle="tab"]`;
// since this is a custom event we need jQuery :(
// since this is a custom event we need jQuery :(
$(document)
$(document)
.off('shown.bs.tab',
`${this.options.parentEl} a[data-toggle="tab"]`
)
.off('shown.bs.tab',
tabSelector
)
.on('shown.bs.tab',
`${this.options.parentEl} a[data-toggle="tab"]`, evt => this.tabShown(evt
));
.on('shown.bs.tab',
tabSelector, e => this.tabShown(e
));
this.activateTab(this.action);
this.activateTab(this.action);
}
}
...
@@ -90,7 +92,7 @@
...
@@ -90,7 +92,7 @@
copySource.replace(/\/+$/, '');
copySource.replace(/\/+$/, '');
const newState =
copySource + this.currentLocation.search + this.currentLocation.hash
;
const newState =
`${copySource}${this.currentLocation.search}${this.currentLocation.hash}`
;
history.replaceState({
history.replaceState({
turbolinks: true,
turbolinks: true,
...
...
app/assets/javascripts/pipelines.js.es6
View file @
aa2d6eec
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
constructor(options) {
constructor(options) {
if (options.initTabs && options.tabsOptions) {
if (options.initTabs && options.tabsOptions) {
new
window.g
l.LinkedTabs(options.tabsOptions);
new
globa
l.LinkedTabs(options.tabsOptions);
}
}
this.addMarginToBuildColumns();
this.addMarginToBuildColumns();
...
...
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