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
14d681eb
Commit
14d681eb
authored
Sep 29, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor TemplateSelector and fix for tests.
parent
5ef3e866
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
109 additions
and
5 deletions
+109
-5
app/assets/javascripts/blob/blob_ci_yaml.js.es6
app/assets/javascripts/blob/blob_ci_yaml.js.es6
+7
-2
app/assets/javascripts/blob/blob_gitignore_selector.js
app/assets/javascripts/blob/blob_gitignore_selector.js
+1
-1
app/assets/javascripts/blob/blob_license_selector.js
app/assets/javascripts/blob/blob_license_selector.js
+1
-1
app/assets/javascripts/blob/template_selector.js.es6
app/assets/javascripts/blob/template_selector.js.es6
+99
-0
app/assets/javascripts/templates/issuable_template_selector.js.es6
...s/javascripts/templates/issuable_template_selector.js.es6
+1
-1
No files found.
app/assets/javascripts/blob/blob_ci_yaml.js.es6
View file @
14d681eb
/*= require blob/template_selector */
/*= require blob/template_selector */
((global) => {
((global) => {
class BlobCiYamlSelector extends TemplateSelector {
class BlobCiYamlSelector extends
gl.
TemplateSelector {
requestFile(query) {
requestFile(query) {
return Api.gitlabCiYml(query.name, this.requestFileSuccess.bind(this));
return Api.gitlabCiYml(query.name, this.requestFileSuccess.bind(this));
}
}
};
requestFileSuccess(file) {
return super.requestFileSuccess(file);
}
}
global.BlobCiYamlSelector = BlobCiYamlSelector;
global.BlobCiYamlSelector = BlobCiYamlSelector;
...
@@ -17,6 +21,7 @@
...
@@ -17,6 +21,7 @@
}
}
initSelectors() {
initSelectors() {
const editor = this.editor;
this.$dropdowns.each((i, dropdown) => {
this.$dropdowns.each((i, dropdown) => {
const $dropdown = $(dropdown);
const $dropdown = $(dropdown);
return new BlobCiYamlSelector({
return new BlobCiYamlSelector({
...
...
app/assets/javascripts/blob/blob_gitignore_selector.js
View file @
14d681eb
...
@@ -18,6 +18,6 @@
...
@@ -18,6 +18,6 @@
return
BlobGitignoreSelector
;
return
BlobGitignoreSelector
;
})(
TemplateSelector
);
})(
gl
.
TemplateSelector
);
}).
call
(
this
);
}).
call
(
this
);
app/assets/javascripts/blob/blob_license_selector.js
View file @
14d681eb
...
@@ -23,6 +23,6 @@
...
@@ -23,6 +23,6 @@
return
BlobLicenseSelector
;
return
BlobLicenseSelector
;
})(
TemplateSelector
);
})(
gl
.
TemplateSelector
);
}).
call
(
this
);
}).
call
(
this
);
app/assets/javascripts/blob/template_selector.js.es6
0 → 100644
View file @
14d681eb
((global) => {
class TemplateSelector {
constructor({ dropdown, data, pattern, wrapper, editor, fileEndpoint, $input } = {}) {
this.onClick = this.onClick.bind(this);
this.dropdown = dropdown;
this.data = data;
this.pattern = pattern;
this.wrapper = wrapper;
this.editor = editor;
this.fileEndpoint = fileEndpoint;
this.$input = $input || $('#file_name');
this.dropdownIcon = $('.fa-chevron-down', this.dropdown);
this.buildDropdown();
this.bindEvents();
this.onFilenameUpdate();
this.autosizeUpdateEvent = document.createEvent('Event');
this.autosizeUpdateEvent.initEvent('autosize:update', true, false);
}
buildDropdown() {
return this.dropdown.glDropdown({
data: this.data,
filterable: true,
selectable: true,
toggleLabel: this.toggleLabel,
search: {
fields: ['name']
},
clicked: this.onClick,
text: function(item) {
return item.name;
}
});
}
bindEvents() {
return this.$input.on('keyup blur', (function(_this) {
return function(e) {
return _this.onFilenameUpdate();
};
})(this));
}
toggleLabel(item) {
return item.name;
}
onFilenameUpdate() {
var filenameMatches;
if (!this.$input.length) {
return;
}
filenameMatches = this.pattern.test(this.$input.val().trim());
if (!filenameMatches) {
this.wrapper.addClass('hidden');
return;
}
return this.wrapper.removeClass('hidden');
}
onClick(item, el, e) {
e.preventDefault();
return this.requestFile(item);
}
requestFile(item) {
// This `requestFile` method is an abstract method that should
// be added by all subclasses.
}
// To be implemented on the extending class
// e.g.
// Api.gitignoreText item.name, @requestFileSuccess.bind(@)
requestFileSuccess(file, skipFocus) {
this.editor.setValue(file.content, 1);
if (!skipFocus) this.editor.focus();
if (this.editor instanceof jQuery) {
this.editor.get(0).dispatchEvent(this.autosizeUpdateEvent);
}
}
startLoadingSpinner() {
this.dropdownIcon
.addClass('fa-spinner fa-spin')
.removeClass('fa-chevron-down');
}
stopLoadingSpinner() {
this.dropdownIcon
.addClass('fa-chevron-down')
.removeClass('fa-spinner fa-spin');
}
}
global.TemplateSelector = TemplateSelector;
})(window.gl || ( window.gl = {}));
app/assets/javascripts/templates/issuable_template_selector.js.es6
View file @
14d681eb
/*= require ../blob/template_selector */
/*= require ../blob/template_selector */
((global) => {
((global) => {
class IssuableTemplateSelector extends TemplateSelector {
class IssuableTemplateSelector extends
gl.
TemplateSelector {
constructor(...args) {
constructor(...args) {
super(...args);
super(...args);
this.projectPath = this.dropdown.data('project-path');
this.projectPath = this.dropdown.data('project-path');
...
...
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