Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-05 05:25:27 +02:00
Code Releases Activity

ember.js upgrade 2.12, jshint replaced with eslint

Browse source
This commit is contained in:
Harvey Kandola 2017-03-19 11:37:18 +00:00
parent 945fadaf00
commit b2620e80e1
34 changed files with 131 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/app/components/auth-settings.js
View file

@ -43,8 +43,9 @@ export default Ember.Component.extend({
switch (provider) {
case constants.AuthProvider.Documize:
// nothing to do
break;
case constants.AuthProvider.Keycloak:
case constants.AuthProvider.Keycloak: // eslint-disable-line no-case-declarations
let config = this.get('authConfig');
if (is.undefined(config) || is.null(config) || is.empty(config) ) {

2
app/app/components/document/document-view.js
View file

@ -34,7 +34,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
this.loadBlocks();
Ember.run.schedule('afterRender', () => {
Ember.run.schedule('afterRender', () => {
let jumpTo = "#page-" + this.get('pageId');
if (!$(jumpTo).inView()) {
$(jumpTo).velocity("scroll", { duration: 250, offset: -100 });

4
app/app/components/folder/documents-list.js
View file

@ -15,8 +15,8 @@ export default Ember.Component.extend({
selectedDocuments: [],
emptyState: Ember.computed('documents', function() {
return this.get('documents.length') === 0;
}),
return this.get('documents.length') === 0;
}),
didReceiveAttrs() {
this.set('selectedDocuments', []);

2
app/app/components/folder/folder-settings.js
View file

@ -103,7 +103,7 @@ export default Ember.Component.extend({
message = this.getDefaultInvitationMessage();
}
this.get('permissions').forEach((permission, index) => { /* jshint ignore:line */
this.get('permissions').forEach((permission, index) => { // eslint-disable-line no-unused-vars
Ember.set(permission, 'canView', $("#canView-" + permission.userId).prop('checked'));
Ember.set(permission, 'canEdit', $("#canEdit-" + permission.userId).prop('checked'));
});

2
app/app/components/folder/start-document.js
View file

@ -64,7 +64,7 @@ export default Ember.Component.extend(NotifierMixin, {
});
this.on("error", function (x) {
console.log("Conversion failed for ", x.name, " obj ", x); // TODO proper error handling
console.log("Conversion failed for ", x.name, " obj ", x); // eslint-disable-line no-console
});
this.on("queuecomplete", function () {});

2
app/app/components/layout/zone-navigation.js
View file

@ -77,7 +77,7 @@ export default Ember.Component.extend(TooltipMixin, {
self.get('pinned').updateSequence(this.toArray()).then((pins) => {
self.set('pins', pins);
});
}
}
});
this.set('sortable', sortable);

11
app/app/components/section/gemini/type-editor.js
View file

@ -28,7 +28,7 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
try {
config = JSON.parse(this.get('meta.config'));
} catch (e) {}
} catch (e) {} // eslint-disable-line no-empty
if (is.empty(config)) {
config = {
@ -57,8 +57,7 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
if (response.apikey.length > 0 && response.url.length > 0 && response.username.length > 0) {
self.send('auth');
}
}, function (reason) { //jshint ignore: line
console.log(reason);
}, function (reason) { // eslint-disable-line no-unused-vars
self.set('waiting', false);
if (self.get('config.userId') > 0) {
self.send('auth');
@ -96,7 +95,7 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
});
});
self.set('waiting', false);
}, function (reason) { //jshint ignore: line
}, function (reason) { // eslint-disable-line no-unused-vars
self.set('workspaces', []);
self.set('waiting', false);
});
@ -116,7 +115,7 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
self.set('items', response);
self.set('config.itemCount', response.length);
self.set('waiting', false);
}, function (reason) { //jshint ignore: line
}, function (reason) { // eslint-disable-line no-unused-vars
if (self.get('isDestroyed') || self.get('isDestroying')) {
return;
}
@ -187,7 +186,7 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
self.set('config.userId', response.BaseEntity.id);
self.set('waiting', false);
self.getWorkspaces();
}, function (reason) { //jshint ignore: line
}, function (reason) { // eslint-disable-line no-unused-vars
self.set('authenticated', false);
self.set('user', null);
self.set('config.userId', 0);

25
app/app/components/section/github/type-editor.js
View file

@ -56,7 +56,8 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
config.showMilestones = metaConfig.showMilestones;
config.showIssues = metaConfig.showIssues;
config.showCommits = metaConfig.showCommits;
} catch (e) {}
} catch (e) { // eslint-disable-line no-empty
}
if (_.isUndefined(config.showCommits)) {
config.showCommits = true;
@ -75,24 +76,24 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
.then(function () {
self.send('authStage2');
}, function (error) { //jshint ignore: line
console.log(error);
console.log(error); // eslint-disable-line no-console
self.send('auth');
});
} else {
if (config.userId !== self.get("session.session.authenticated.user.id")) {
console.log("github auth wrong user ID, switching");
console.log("github auth wrong user ID, switching"); // eslint-disable-line no-console
self.set('config.userId', self.get("session.session.authenticated.user.id"));
}
self.get('sectionService').fetch(page, "checkAuth", self.get('config'))
.then(function () {
self.send('authStage2');
}, function (error) { //jshint ignore: line
console.log(error);
}, function (error) {
console.log(error); // eslint-disable-line no-console
self.send('auth'); // require auth if the db token is invalid
});
}
}, function (error) { //jshint ignore: line
console.log(error);
}, function (error) {
console.log(error); // eslint-disable-line no-console
});
}
},
@ -163,11 +164,11 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
self.set('config.lists', lists);
self.set('busy', false);
}, function (error) { //jshint ignore: line
}, function (error) {
self.set('busy', false);
self.set('authenticated', false);
self.showNotification("Unable to fetch repositories");
console.log(error);
console.log(error); // eslint-disable-line no-console
});
},
@ -201,11 +202,11 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
self.set('busy', false);
self.set('owners', owners);
self.getOwnerLists();
}, function (error) { //jshint ignore: line
}, function (error) {
self.set('busy', false);
self.set('authenticated', false);
self.showNotification("Unable to fetch owners");
console.log(error);
console.log(error); // eslint-disable-line no-console
});
},
@ -253,7 +254,7 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
meta.set('rawBody', JSON.stringify(response));
self.set('busy', false);
self.attrs.onAction(page, meta);
}, function (reason) { //jshint ignore: line
}, function (reason) { // eslint-disable-line no-unused-vars
self.set('busy', false);
self.attrs.onAction(page, meta);
});

12
app/app/components/section/papertrail/type-editor.js
View file

@ -28,7 +28,7 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
try {
config = JSON.parse(this.get('meta.config'));
} catch (e) {}
} catch (e) {} // eslint-disable-line no-empty
if (is.empty(config)) {
config = {
@ -90,19 +90,19 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
if (is.not.undefined(group)) {
Ember.set(config, 'group', group);
}
}, function (reason) { //jshint ignore: line
}, function (reason) {
self.set('authenticated', false);
self.set('waiting', false);
self.set('config.APIToken', ''); // clear the api token
self.displayError(reason);
console.log("get options call failed");
console.log("get options call failed"); // eslint-disable-line no-console
});
}, function (reason) { //jshint ignore: line
}, function (reason) {
self.set('authenticated', false);
self.set('waiting', false);
self.set('config.APIToken', ''); // clear the api token
self.displayError(reason);
console.log("auth token invalid");
console.log("auth token invalid"); // eslint-disable-line no-console
});
},
@ -176,7 +176,7 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
self.set('waiting', false);
self.attrs.onAction(page, meta);
}, function (reason) { //jshint ignore: line
}, function (reason) { // eslint-disable-line no-unused-vars
self.set('authenticated', false);
self.set('waiting', false);
self.showNotification(`Something went wrong, try again!`);

16
app/app/components/section/trello/type-editor.js
View file

@ -43,7 +43,7 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
try {
config = JSON.parse(this.get('meta.config'));
} catch (e) {}
} catch (e) {} // eslint-disable-line no-empty
if (is.empty(config)) {
config = {
@ -77,8 +77,8 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
Trello.deauthorize();
});
}
}, function (error) { //jshint ignore: line
console.log(error);
}, function (error) {
console.log(error); // eslint-disable-line no-console
});
},
@ -132,7 +132,7 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
self.set('busy', false);
self.set('authenticated', false);
self.showNotification("Unable to fetch board lists");
console.log(error);
console.log(error); // eslint-disable-line no-console
});
},
@ -181,7 +181,7 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
Trello.members.get("me", function (user) {
self.set('config.user', user);
}, function (error) {
console.log(error);
console.log(error); // eslint-disable-line no-console
});
self.get('sectionService').fetch(page, "boards", self.get('config'))
@ -193,14 +193,14 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
self.set('busy', false);
self.set('authenticated', false);
self.showNotification("Unable to fetch boards");
console.log(error);
console.log(error); // eslint-disable-line no-console
});
},
error: function (error) {
self.set('busy', false);
self.set('authenticated', false);
self.showNotification("Unable to authenticate");
console.log(error);
console.log(error); // eslint-disable-line no-console
}
});
});
@ -233,7 +233,7 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
meta.set('rawBody', JSON.stringify(response));
self.set('busy', false);
self.attrs.onAction(page, meta);
}, function (reason) { //jshint ignore: line
}, function (reason) { // eslint-disable-line no-unused-vars
self.set('busy', false);
self.attrs.onAction(page, meta);
});

20
app/app/components/section/wysiwyg/type-editor.js
View file

@ -54,16 +54,16 @@ export default Ember.Component.extend({
}
},
codesample_languages: [
{text: 'HTML/XML', value: 'markup'},
{text: 'JavaScript', value: 'javascript'},
{text: 'CSS', value: 'css'},
{text: 'PHP', value: 'php'},
{text: 'Ruby', value: 'ruby'},
{text: 'Python', value: 'python'},
{text: 'Java', value: 'java'},
{text: 'C', value: 'c'},
{text: 'C#', value: 'csharp'},
{text: 'C++', value: 'cpp'}],
{text: 'HTML/XML', value: 'markup'},
{text: 'JavaScript', value: 'javascript'},
{text: 'CSS', value: 'css'},
{text: 'PHP', value: 'php'},
{text: 'Ruby', value: 'ruby'},
{text: 'Python', value: 'python'},
{text: 'Java', value: 'java'},
{text: 'C', value: 'c'},
{text: 'C#', value: 'csharp'},
{text: 'C++', value: 'cpp'}],
extended_valid_elements: "b,i,b/strong,i/em",
plugins: [
'advlist autolink lists link image charmap print preview hr anchor pagebreak',

1
app/app/components/widget-sample.js
View file

@ -48,7 +48,6 @@ export default Ember.Component.extend(NotifierMixin, {
},
addFolder() {
console.log("adding folder!");
return true;
}
}