summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.eslintrc.yml4
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--examples/gtk-application.js6
-rw-r--r--installed-tests/js/testTweener.js4
4 files changed, 9 insertions, 7 deletions
diff --git a/.eslintrc.yml b/.eslintrc.yml
index 3fa6b86b..7bcb5eb0 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -24,7 +24,9 @@ rules:
# allow: [^vfunc_, ^on_, _instance_init]
comma-dangle:
- error
- - always-multiline
+ - arrays: always-multiline
+ objects: always-multiline
+ functions: never
comma-spacing:
- error
- before: false
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a16a844c..9b85658d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -171,7 +171,7 @@ cpplint:
eslint:
when: on_success
- image: singapore/lint-condo
+ image: ewlsh/lint-condo
stage: source_check
script:
- node /usr/src/lint-condo
diff --git a/examples/gtk-application.js b/examples/gtk-application.js
index 514b8bdd..e8ea05a4 100644
--- a/examples/gtk-application.js
+++ b/examples/gtk-application.js
@@ -20,7 +20,7 @@ var ExampleApplication = GObject.registerClass({
'ExampleProperty', // nickname
'An example read write property', // description
GObject.ParamFlags.READWRITE, // read/write/construct...
- 'a default value',
+ 'a default value'
),
},
Signals: {'examplesig': {param_types: [GObject.TYPE_INT]}},
@@ -83,7 +83,7 @@ var ExampleApplication = GObject.registerClass({
notif.set_title('Example Notification');
notif.set_body('Example Body');
notif.set_icon(
- new Gio.ThemedIcon({name: 'dialog-information-symbolic'}),
+ new Gio.ThemedIcon({name: 'dialog-information-symbolic'})
);
// A default action for when the body of the notification is clicked
@@ -92,7 +92,7 @@ var ExampleApplication = GObject.registerClass({
// A button for the notification
notif.add_button(
'Button Text',
- "app.exampleAction('exampleParameter')",
+ "app.exampleAction('exampleParameter')"
);
// This won't actually be shown, since an application needs a .desktop
diff --git a/installed-tests/js/testTweener.js b/installed-tests/js/testTweener.js
index a674e074..1f6efe57 100644
--- a/installed-tests/js/testTweener.js
+++ b/installed-tests/js/testTweener.js
@@ -282,7 +282,7 @@ describe('Tweener', function () {
},
function (obj, val) {
obj.x = -val;
- },
+ }
);
var objectA = {
@@ -343,7 +343,7 @@ describe('Tweener', function () {
function (val) {
return [{name: 'x', value: val},
{name: 'y', value: -val}];
- },
+ }
);
var objectA = {