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
Tatuya Kamada
gitlab-ce
Commits
45ae34f8
Commit
45ae34f8
authored
Sep 08, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Properly scope BlobCiYamlSelector and BlobCiYamlSelectors.
parent
cfb03b3d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
25 deletions
+32
-25
app/assets/javascripts/blob/blob_ci_yaml.js.es6
app/assets/javascripts/blob/blob_ci_yaml.js.es6
+31
-24
app/assets/javascripts/blob_edit/edit_blob.js
app/assets/javascripts/blob_edit/edit_blob.js
+1
-1
No files found.
app/assets/javascripts/blob/blob_ci_yaml.js.es6
View file @
45ae34f8
/*= require blob/template_selector */
/*= require blob/template_selector */
((global) => {
class BlobCiYamlSelector extends TemplateSelector {
class BlobCiYamlSelector extends TemplateSelector {
constructor(...args) {
constructor(...args) {
super(...args);
super(...args);
}
}
requestFile(query) {
requestFile(query) {
return Api.gitlabCiYml(query.name, this.requestFileSuccess.bind(this));
return Api.gitlabCiYml(query.name, this.requestFileSuccess.bind(this));
};
};
};
};
class BlobCiYamlSelectors {
global.BlobCiYamlSelector = BlobCiYamlSelector;
constructor(opts) {
this.$dropdowns = opts.$dropdowns || $('.js-gitlab-ci-yml-selector');
class BlobCiYamlSelectors {
this.editor = opts.editor;
constructor(opts) {
this.initSelectors();
this.$dropdowns = opts.$dropdowns || $('.js-gitlab-ci-yml-selector');
}
this.editor = opts.editor;
this.initSelectors();
}
initSelectors() {
initSelectors() {
this.$dropdowns.each((i, dropdown) => {
this.$dropdowns.each((i, dropdown) => {
const $dropdown = $(dropdown);
const $dropdown = $(dropdown);
return new BlobCiYamlSelector({
return new BlobCiYamlSelector({
pattern: /(.gitlab-ci.yml)/,
pattern: /(.gitlab-ci.yml)/,
data: $dropdown.data('data'),
data: $dropdown.data('data'),
wrapper: $dropdown.closest('.js-gitlab-ci-yml-selector-wrap'),
wrapper: $dropdown.closest('.js-gitlab-ci-yml-selector-wrap'),
dropdown: $dropdown,
dropdown: $dropdown,
editor: this.editor
editor: this.editor
});
});
});
}
);
}
}
}
}
global.BlobCiYamlSelectors = BlobCiYamlSelectors;
})(window.gl || (window.gl = {}));
app/assets/javascripts/blob_edit/edit_blob.js
View file @
45ae34f8
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
new
BlobGitignoreSelectors
({
new
BlobGitignoreSelectors
({
editor
:
this
.
editor
editor
:
this
.
editor
});
});
new
BlobCiYamlSelectors
({
new
gl
.
BlobCiYamlSelectors
({
editor
:
this
.
editor
editor
:
this
.
editor
});
});
}
}
...
...
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