Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update lots of dependencies #596

Merged
merged 3 commits into from
Apr 12, 2018
Merged

Update lots of dependencies #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
548397f
Update some dependencies
Gaurav0 Apr 12, 2018
c1f127d
Update more dependencies
Gaurav0 Apr 12, 2018
ce71e54
Update yet more dependencies
Gaurav0 Apr 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/components/twiddle-panes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Ember from 'ember';

const { inject } = Ember;
const { inject, run } = Ember;

export default Ember.Component.extend({
resizeableColumns: inject.service(),
Expand All @@ -13,6 +13,10 @@ export default Ember.Component.extend({

didRender() {
this._super(...arguments);
run.schedule('afterRender', this, this.setupHandles);
},

setupHandles() {
if (!this.get('media.isMobile')) {
this.$('.twiddle-pane').after('<div class="handle"></div>');
this.$('.handle').last().remove();
Expand Down
2 changes: 1 addition & 1 deletion app/models/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Ember from 'ember';
import _merge from 'lodash/object/merge';
import _merge from 'lodash/merge';

const {
ObjectProxy,
Expand Down
6 changes: 5 additions & 1 deletion app/routes/gist-base-route.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ export default Ember.Route.extend({
} else {
return true;
}
}
},

showRevision() {},
showCurrentVersion() {},
signInViaGithub() {}
}
});
3 changes: 2 additions & 1 deletion app/routes/twiddles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export default Ember.Route.extend({
this.session.close().then(() => {
this.transitionTo('/');
});
}
},
signInViaGithub() {}
}
});
2 changes: 1 addition & 1 deletion app/services/ember-cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import HbsPlugin from '../plugins/hbs-plugin';
import blueprints from '../lib/blueprints';
import Ember from 'ember';
import moment from 'moment';
import _template from "lodash/string/template";
import _template from "lodash/template";

const { computed, inject, RSVP, $, testing } = Ember;
const twiddleAppName = 'twiddle';
Expand Down
6 changes: 0 additions & 6 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,12 @@
"version": "0.13.1",
"dependencies": {
"jquery": "1.11.3",
"codemirror": "~5.19.0",
"bootstrap-sass": "~3.3.5",
"dom-ruler": "~0.2.4",
"pretender": "~1.4.1",
"lodash": "~3.10.1",
"Faker": "~3.1.0",
"file-saver": "1.3.4",
"jstree": "~3.3.0"
},
"resolutions": {
"codemirror": "~5.19.0",
"FakeXMLHttpRequest": "^1.3.0",
"route-recognizer": "^0.2.3"
}
}
99 changes: 49 additions & 50 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,68 +20,67 @@
"babel-preset-es2017": "^6.24.1",
"babel-standalone": "^6.26.0",
"broccoli-asset-rev": "^2.4.5",
"broccoli-babel-transpiler": "~6.1.4",
"broccoli-concat": "^2.3.2",
"broccoli-funnel": "^1.0.1",
"broccoli-merge-trees": "^1.1.1",
"browserify": "^13.0.1",
"dc-tabs": "0.1.0",
"dedent": "~0.6.0",
"ember-ajax": "~2.4.1",
"ember-api-actions": "~0.1.4",
"ember-autoresize": "~0.5.17",
"broccoli-babel-transpiler": "^6.1.4",
"broccoli-concat": "^3.2.2",
"broccoli-funnel": "^2.0.1",
"broccoli-merge-trees": "^3.0.0",
"browserify": "^16.2.0",
"dedent": "~0.7.0",
"ember-ajax": "^2.5.6",
"ember-api-actions": "~0.1.8",
"ember-autoresize": "~0.6.1",
"ember-cli": "2.12.2",
"ember-cli-app-version": "^2.0.0",
"ember-cli-app-version": "^2.1.0",
"ember-cli-babel": "^6.12.0",
"ember-cli-bootstrap-sassy": "~0.5.5",
"ember-cli-build-notifications": "0.2.0",
"ember-cli-code-coverage": "~0.3.4",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-deploy": "^1.0.0",
"ember-cli-deploy-s3-pack": "^1.0.0-beta.1",
"ember-cli-deploy-slack": "~0.1.0",
"ember-cli-bootstrap-sassy": "~0.5.8",
"ember-cli-build-notifications": "~0.2.0",
"ember-cli-code-coverage": "~0.3.12 ",
"ember-cli-dependency-checker": "^2.1.0",
"ember-cli-deploy": "^1.0.2",
"ember-cli-deploy-s3-pack": "^1.0.0-beta.2",
"ember-cli-deploy-slack": "^1.0.0",
"ember-cli-document-title": "~0.3.3",
"ember-cli-eslint": "^4.2.1",
"ember-cli-eslint": "^4.2.3",
"ember-cli-fastboot": "1.0.0-beta.11",
"ember-cli-file-creator": "~0.4.0",
"ember-cli-htmlbars": "^1.1.1",
"ember-cli-htmlbars-inline-precompile": "^0.4.0",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-jstree": "~1.0.7",
"ember-cli-legacy-blueprints": "^0.1.0",
"ember-cli-mirage": "0.2.3",
"ember-cli-moment-shim": "~2.2.1",
"ember-cli-node-assets": "~0.1.6",
"ember-cli-qunit": "^3.1.2",
"ember-cli-htmlbars": "^1.3.4",
"ember-cli-htmlbars-inline-precompile": "~0.4.4",
"ember-cli-inject-live-reload": "^1.7.0",
"ember-cli-jstree": "^1.0.9",
"ember-cli-legacy-blueprints": "~0.2.1",
"ember-cli-mirage": "~0.2.9",
"ember-cli-moment-shim": "^2.2.1",
"ember-cli-node-assets": "~0.2.2",
"ember-cli-qunit": "^3.1.3",
"ember-cli-release": "1.0.0-beta.2",
"ember-cli-sass": "~6.0.0",
"ember-cli-sass": "^6.2.0",
"ember-cli-shims": "~1.0.2",
"ember-cli-sri": "~2.1.0",
"ember-cli-test-loader": "~1.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-test-loader": "^1.1.1",
"ember-cli-uglify": "^2.1.0",
"ember-concurrency": "~0.8.2",
"ember-concurrency": "~0.8.17",
"ember-data": "~2.12.0",
"ember-disable-proxy-controllers": "~1.0.1",
"ember-export-application-global": "~1.1.1",
"ember-git-version": "~0.1.1",
"ember-inflector": "~1.9.4",
"ember-load": "0.0.9",
"ember-load-initializers": "~1.0.0",
"ember-lodash": "~0.0.10",
"ember-moment": "7.0.0-beta.5",
"ember-notify": "~5.1.6",
"ember-resolver": "^2.0.3",
"ember-responsive": "~1.2.7",
"ember-route-action-helper": "^1.0.0",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.1.1",
"ember-git-version": "~0.1.2",
"ember-inflector": "^1.12.1",
"ember-load": "~0.0.12",
"ember-load-initializers": "^1.0.0",
"ember-lodash": "^4.18.0",
"ember-moment": "^7.6.0",
"ember-notify": "^5.2.1",
"ember-resolver": "^2.1.1",
"ember-responsive": "^2.0.8",
"ember-route-action-helper": "^2.0.6",
"ember-source": "~2.12.0",
"ember-test-helpers": "~0.6.3",
"eslint-plugin-ember": "~5.1.0",
"ivy-codemirror": "~2.0.3",
"loader.js": "~4.2.3",
"moment": "~2.19.3",
"moment-timezone": "~0.5.4",
"eslint-plugin-ember": "^5.1.0",
"ivy-codemirror": "^2.1.0",
"loader.js": "^4.7.0",
"moment": "^2.22.0",
"moment-timezone": "~0.5.14",
"path-browser": "^2.2.1",
"torii": "~0.8.0"
"torii": "~0.10.1"
},
"engines": {
"node": "^4.5 || 6.* || >= 8"
Expand Down
Loading