From e31eab4ccef26e5f34f75e149674f699ff4b4f01 Mon Sep 17 00:00:00 2001 From: patsy-issa Date: Tue, 13 Oct 2015 13:57:54 +0300 Subject: [PATCH] Upgraded to ember 1.12.0 Upgraded ember list view to v 0.0.6 Moved required properties into list-view mixin Part of #360 --- app/mixins/views/list-view.js | 22 ++++++++++++++++++++ app/styles/list_view.scss | 3 +-- app/views/instance-list.js | 8 ++++---- app/views/list-item.js | 3 ++- app/views/list.js | 24 +++------------------- app/views/promise-list.js | 6 +++--- app/views/record-list.js | 8 ++++---- app/views/route-list.js | 9 ++++---- app/views/view-list.js | 5 +++-- bower.json | 2 +- ember_debug/object-inspector.js | 3 ++- package.json | 4 ++-- tests/integration/object_inspector_test.js | 4 ++-- 13 files changed, 54 insertions(+), 47 deletions(-) create mode 100644 app/mixins/views/list-view.js diff --git a/app/mixins/views/list-view.js b/app/mixins/views/list-view.js new file mode 100644 index 0000000000..1ca9931f05 --- /dev/null +++ b/app/mixins/views/list-view.js @@ -0,0 +1,22 @@ +import Ember from "ember"; +import ListItemView from "ember-inspector/views/list-item"; + +const { Mixin, computed } = Ember; + +export default Mixin.create({ + contentHeight: Ember.computed.alias('controller.controllers.application.contentHeight'), + + height: computed('contentHeight', function() { + let headerHeight = 31; + let contentHeight = this.get('contentHeight'); + + // In testing list-view is created before `contentHeight` is set + // which will trigger an exception + if (!contentHeight) { + return 1; + } + return contentHeight - headerHeight; + }), + rowHeight: 30, + itemViewClass: ListItemView +}); diff --git a/app/styles/list_view.scss b/app/styles/list_view.scss index 827729b98b..71b358f5ff 100644 --- a/app/styles/list_view.scss +++ b/app/styles/list_view.scss @@ -1,5 +1,4 @@ - - .list-view { +.list-view { position: relative; font-size: 11px; height: 100%; diff --git a/app/views/instance-list.js b/app/views/instance-list.js index 8553d1b3ce..a53209298d 100644 --- a/app/views/instance-list.js +++ b/app/views/instance-list.js @@ -1,9 +1,9 @@ -import ListView from "ember-inspector/views/list"; -import ListItemView from "ember-inspector/views/list-item"; +import ListView from 'ember-list-view'; +import ListItemView from 'ember-inspector/views/list-item'; +import ListViewMixin from 'ember-inspector/mixins/views/list-view'; -export default ListView.extend({ +export default ListView.extend(ListViewMixin, { itemViewClass: ListItemView.extend({ templateName: "instance_item" }) - }); diff --git a/app/views/list-item.js b/app/views/list-item.js index 8571a3e3cf..fdd92875e6 100644 --- a/app/views/list-item.js +++ b/app/views/list-item.js @@ -1,4 +1,5 @@ -import ListItemView from "list-view/list-item-view"; +import ListItemView from 'ember-list-view/list-item-view'; + export default ListItemView.extend({ classNames: ["list-tree__item-wrapper", "row-wrapper"] }); diff --git a/app/views/list.js b/app/views/list.js index 77cc41c968..84c5f3ca80 100644 --- a/app/views/list.js +++ b/app/views/list.js @@ -1,24 +1,6 @@ -import Ember from "ember"; -import ListItemView from "ember-inspector/views/list-item"; import ListView from "list-view/list-view"; -const { computed } = Ember; +import ListViewMixin from 'ember-inspector/mixins/views/list-view'; -export default ListView.extend({ - classNames: ["list-tree"], - - contentHeight: Ember.computed.alias('controller.controllers.application.contentHeight'), - - height: computed('contentHeight', function() { - let headerHeight = 31; - let contentHeight = this.get('contentHeight'); - - // In testing list-view is created before `contentHeight` is set - // which will trigger an exception - if (!contentHeight) { - return 1; - } - return contentHeight - headerHeight; - }), - rowHeight: 30, - itemViewClass: ListItemView +export default ListView.extend(ListViewMixin, { + classNames: ["list-tree"] }); diff --git a/app/views/promise-list.js b/app/views/promise-list.js index dc98b6687f..a7448efafe 100644 --- a/app/views/promise-list.js +++ b/app/views/promise-list.js @@ -1,9 +1,9 @@ -import ListView from "ember-inspector/views/list"; +import ListView from 'ember-list-view'; import ListItemView from "ember-inspector/views/list-item"; +import ListViewMixin from 'ember-inspector/mixins/views/list-view'; -export default ListView.extend({ +export default ListView.extend(ListViewMixin, { itemViewClass: ListItemView.extend({ templateName: "promise_item" }) - }); diff --git a/app/views/record-list.js b/app/views/record-list.js index 757f9ebee6..af76da5044 100644 --- a/app/views/record-list.js +++ b/app/views/record-list.js @@ -1,11 +1,11 @@ import Ember from 'ember'; -import ListView from "ember-inspector/views/list"; +import ListView from 'ember-list-view'; import ListItemView from "ember-inspector/views/list-item"; +import ListViewMixin from 'ember-inspector/mixins/views/list-view'; -const { computed } = Ember; -const { readOnly } = computed; +const { computed: { readOnly } } = Ember; -export default ListView.extend({ +export default ListView.extend(ListViewMixin, { itemViewClass: ListItemView.extend({ templateName: "record_item", diff --git a/app/views/route-list.js b/app/views/route-list.js index a742cbbf88..1f4c9275e0 100644 --- a/app/views/route-list.js +++ b/app/views/route-list.js @@ -1,10 +1,11 @@ import Ember from 'ember'; -import ListView from "ember-inspector/views/list"; +import ListView from 'ember-list-view'; import ListItemView from "ember-inspector/views/list-item"; -const { computed } = Ember; -const { readOnly } = computed; +import ListViewMixin from 'ember-inspector/mixins/views/list-view'; -export default ListView.extend({ +const { computed: { readOnly } } = Ember; + +export default ListView.extend(ListViewMixin, { itemViewClass: ListItemView.extend({ templateName: "route_item", diff --git a/app/views/view-list.js b/app/views/view-list.js index 3d1f84e6a0..f3a3d65508 100644 --- a/app/views/view-list.js +++ b/app/views/view-list.js @@ -1,11 +1,12 @@ import Ember from "ember"; -import ListView from "ember-inspector/views/list"; +import ListView from 'ember-list-view'; import ListItemView from "ember-inspector/views/list-item"; +import ListViewMixin from 'ember-inspector/mixins/views/list-view'; const { computed } = Ember; const { readOnly } = computed; -export default ListView.extend({ +export default ListView.extend(ListViewMixin, { itemViewClass: ListItemView.extend({ templateName: "view_item", diff --git a/bower.json b/bower.json index 7a794347ad..7c24b49c2d 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,7 @@ "name": "ember-inspector", "dependencies": { "jquery": "^1.11.1", - "ember": "1.10.0", + "ember": "1.12.0", "ember-resolver": "~0.1.12", "loader.js": "ember-cli/loader.js#3.2.0", "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", diff --git a/ember_debug/object-inspector.js b/ember_debug/object-inspector.js index 033cb3ebac..359dce28aa 100644 --- a/ember_debug/object-inspector.js +++ b/ember_debug/object-inspector.js @@ -680,7 +680,8 @@ function getDebugInfo(object) { 'layout', 'templateData', 'domManager', - 'states' + 'states', + 'element' ); } diff --git a/package.json b/package.json index 36dfeea86c..dda9b58f88 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "ember-cli-qunit": "0.3.9", "ember-cli-uglify": "1.0.1", "ember-export-application-global": "^1.0.2", + "ember-list-view": "0.0.6", "ember-pikaday": "^0.2.1", "eslint-config-ember": "0.2.0", "grunt": "^0.4.5", @@ -59,8 +60,7 @@ "grunt-mozilla-addon-sdk": "~0.4.0", "grunt-s3": "^0.2.0-alpha.3", "grunt-version": "^0.3.0", - "js-string-escape": "^1.0.0", - "list-view": "emberjs/list-view#aefb20f" + "js-string-escape": "^1.0.0" }, "dependencies": { "ember-new-computed": "^1.0.0" diff --git a/tests/integration/object_inspector_test.js b/tests/integration/object_inspector_test.js index 4d694f166c..92b594ced7 100644 --- a/tests/integration/object_inspector_test.js +++ b/tests/integration/object_inspector_test.js @@ -464,7 +464,7 @@ test("Date fields are editable", async function t(assert) { }); test("Errors are correctly displayed", async function t(assert) { - let obj = objectFactory( { + let obj = objectFactory({ name: 'My Object', objectId: '1', errors: [ @@ -479,7 +479,7 @@ test("Errors are correctly displayed", async function t(assert) { assert.equal(findByLabel('object-inspector-errors').length, 1); assert.equal(findByLabel('object-inspector-error').length, 2); - clickByLabel('send-errors-to-console'); + await clickByLabel('send-errors-to-console'); assert.equal(name, 'objectInspector:traceErrors'); assert.equal(message.objectId, '1');