From 39717b197a7b9105ea2f54edf411c268d797a182 Mon Sep 17 00:00:00 2001 From: Aurelio Saraiva Date: Tue, 8 Nov 2016 15:24:03 -0200 Subject: [PATCH 1/9] change version ember-resize --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ffe8881..d753aa4 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "ember-addon" ], "dependencies": { - "ember-resize": "0.0.10", + "ember-resize": "0.0.17", "ember-cli-sass": "4.0.1", "ember-cli-babel": "^5.1.5" }, From 21a88f1edf6aab9ae6a78f034812b266fcfb7e58 Mon Sep 17 00:00:00 2001 From: Aurelio Saraiva Date: Wed, 9 Nov 2016 17:55:11 -0200 Subject: [PATCH 2/9] adjust ember 2.9 --- addon/components/split-child.js | 47 ++++++++++------------ addon/components/split-sash.js | 21 +++++----- addon/components/split-view.js | 2 + addon/templates/components/split-child.hbs | 1 + addon/templates/components/split-view.hbs | 1 + bower.json | 2 +- package.json | 4 +- tests/dummy/app/templates/vertical.hbs | 12 +++--- 8 files changed, 44 insertions(+), 46 deletions(-) create mode 100644 addon/templates/components/split-child.hbs create mode 100644 addon/templates/components/split-view.hbs diff --git a/addon/components/split-child.js b/addon/components/split-child.js index 2e7fb5d..20d140d 100644 --- a/addon/components/split-child.js +++ b/addon/components/split-child.js @@ -1,19 +1,14 @@ import Ember from 'ember'; +import layout from 'ember-split-view/templates/components/split-child'; var computed = Ember.computed; var alias = computed.alias; var observer = Ember.observer; export default Ember.Component.extend({ + layout: layout, classNames: ['child'], - classNameBindings: ['isDragging:dragging', 'isVertical:vertical:horizontal', 'childSplitView:nested'], - - splitPosition: alias('parentView.splitPosition'), - sashWidth: alias('parentView.sash.width'), - parentWidth: alias('parentView.width'), - parentHeight: alias('parentView.height'), - isVertical: alias('parentView.isVertical'), - isDragging: alias('parentView.isDragging'), + classNameBindings: ['parent.isDragging:dragging', 'parent.isVertical:vertical:horizontal', 'childSplitView:nested'], childSplitView: null, anchorSide: null, @@ -27,7 +22,7 @@ export default Ember.Component.extend({ }, didInsertElement: function() { - var parent = this.get('parentView'); + var parent = this.get('parent'); // run next to avoid changing the component during a render iteration Ember.run.next(this, function() { @@ -39,7 +34,7 @@ export default Ember.Component.extend({ }, willDestroyElement: function() { - var parent = this.get('parentView'); + var parent = this.get('parent'); if(parent && parent.removeSplit) { parent.removeSplit(this); @@ -72,22 +67,22 @@ export default Ember.Component.extend({ this._setStyle(); }), - parentSize: computed('anchorSide', 'parentWidth', 'parentHeight', function() { + parentSize: computed('anchorSide', 'parent.width', 'parent.height', function() { var anchorSide = this.get('anchorSide'); if(!anchorSide) { return 0; } - return (anchorSide === "left" || anchorSide === "right") ? this.get('parentWidth') : this.get('parentHeight'); + return (anchorSide === "left" || anchorSide === "right") ? this.get('parent.width') : this.get('parent.height'); }), - anchorOffset: computed('sashWidth', 'splitPosition', 'anchorSide', 'parentSize', function() { + anchorOffset: computed('parent.sash.width', 'parent.splitPosition', 'anchorSide', 'parentSize', function() { var anchorSide = this.get('anchorSide'); if(!anchorSide) { return; } - var sashWidth = this.get('sashWidth'); - var splitPosition = this.get('splitPosition'); + var sashWidth = this.get('parent.sash.width'); + var splitPosition = this.get('parent.splitPosition'); if(anchorSide === "left" || anchorSide === "top") { return splitPosition + sashWidth / 2; } else { @@ -100,7 +95,7 @@ export default Ember.Component.extend({ } }), - updateChildSplitView: observer('childSplitView', 'anchorOffset', 'parentWidth', 'parentHeight', function() { + updateChildSplitView: observer('childSplitView', 'anchorOffset', 'parent.width', 'parent.height', function() { // must run afterRender so that the size has updated Ember.run.scheduleOnce('afterRender', this, function() { @@ -116,14 +111,14 @@ export default Ember.Component.extend({ collapse: function() { if(this.get('anchorSide') === "left" || this.get('anchorSide') === "top") { - this.set('splitPosition', this.get('parentSize')); + this.set('parent.splitPosition', this.get('parentSize')); } else { - this.set('splitPosition', 0); + this.set('parent.splitPosition', 0); } - this.get('parentView').constrainSplit(); + this.get('parent').constrainSplit(); }, - minSize: computed('isVertical', 'childSplitView.minSize', function() { + minSize: computed('parent.isVertical', 'childSplitView.minSize', function() { var childSplitView = this.get('childSplitView'); if (childSplitView) { @@ -134,17 +129,17 @@ export default Ember.Component.extend({ var cssInt = function(name) { return parseInt(this.css(name)); }.bind(element); - - if(this.get('isVertical')) { - return cssInt("min-width") + cssInt("padding-left") + cssInt("padding-right") + - cssInt("border-left") + cssInt("border-right") + + + if(this.get('parent.isVertical')) { + return cssInt("min-width") + cssInt("padding-left") + cssInt("padding-right") + + cssInt("border-left") + cssInt("border-right") + cssInt("margin-left") + cssInt("margin-right") + - this.get('sashWidth') / 2; + this.get('parent.sash.width') / 2; } else { return cssInt("min-height") + cssInt("padding-top") + cssInt("padding-bottom") + cssInt("border-top") + cssInt("border-bottom") + cssInt("margin-top") + cssInt("margin-bottom") + - this.get('sashWidth') / 2; + this.get('parent.sash.width') / 2; } }) diff --git a/addon/components/split-sash.js b/addon/components/split-sash.js index 43c49cd..c5110f3 100644 --- a/addon/components/split-sash.js +++ b/addon/components/split-sash.js @@ -19,19 +19,15 @@ export default Ember.Component.extend({ widthPercentage: null, classNames: ['sash'], - classNameBindings: ['isDragging:dragging', 'isVertical:vertical:horizontal'], - - isVertical: alias('parentView.isVertical'), - isDragging: alias('parentView.isDragging'), - position: alias('parentView.splitPosition'), + classNameBindings: ['parent.isDragging:dragging', 'parent.isVertical:vertical:horizontal'], didInsertElement: function() { // run next to avoid changing the component during a render iteration - var parent = this.get('parentView'); + var parent = this.get('parent'); run.next(this, function() { if (parent) { - parent.set('sash', this); + this.set('parent.sash', this); } this._setStyle(); }); @@ -39,11 +35,12 @@ export default Ember.Component.extend({ _setStyle: function() { var width = this.get('width'); - var position = this.get('position'); - var isVertical = this.get('isVertical'); - + var position = this.get('parent.splitPosition'); + var isVertical = this.get('parent.isVertical'); + var style = this.get('element').style; + if(isVertical) { style.left = (position - width / 2) + 'px'; style.top = null; @@ -61,12 +58,12 @@ export default Ember.Component.extend({ } }, - style: observer('position', 'isVertical', 'width', function() { + style: observer('parent.splitPosition', 'parent.isVertical', 'width', function() { this._setStyle(); }), mouseDown: function(event) { - this.set('isDragging', true); + this.set('parent.isDragging', true); event.preventDefault(); } }); diff --git a/addon/components/split-view.js b/addon/components/split-view.js index 45c8ad4..10507d5 100644 --- a/addon/components/split-view.js +++ b/addon/components/split-view.js @@ -1,5 +1,6 @@ import Ember from 'ember'; import SplitChild from './split-child'; +import layout from 'ember-split-view/templates/components/split-view'; var computed = Ember.computed; var observer = Ember.observer; @@ -42,6 +43,7 @@ var observer = Ember.observer; * @extends Ember.Component */ export default Ember.Component.extend({ + layout: layout, /** * @property {boolean} isVertical - the orientation of the split: true = vertical, false = horizontal * @default true diff --git a/addon/templates/components/split-child.hbs b/addon/templates/components/split-child.hbs new file mode 100644 index 0000000..889d9ee --- /dev/null +++ b/addon/templates/components/split-child.hbs @@ -0,0 +1 @@ +{{yield}} diff --git a/addon/templates/components/split-view.hbs b/addon/templates/components/split-view.hbs new file mode 100644 index 0000000..2886dd5 --- /dev/null +++ b/addon/templates/components/split-view.hbs @@ -0,0 +1 @@ +{{yield (hash child=(component "split-child" parent=this) sash=(component "split-sash" parent=this) ) }} diff --git a/bower.json b/bower.json index f7bf471..c7627d5 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "ember-split-view", "dependencies": { - "ember": "~2.4.1", + "ember": "~2.9.0", "ember-cli-shims": "0.1.0", "ember-cli-test-loader": "0.2.2", "loader.js": "^3.5.0", diff --git a/package.json b/package.json index d753aa4..cbca65b 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,9 @@ "dependencies": { "ember-resize": "0.0.17", "ember-cli-sass": "4.0.1", - "ember-cli-babel": "^5.1.5" + "ember-cli-babel": "^5.1.5", + "ember-cli-htmlbars": "^1.0.3", + "ember-cli-htmlbars-inline-precompile": "^0.3.1" }, "ember-addon": { "configPath": "tests/dummy/config", diff --git a/tests/dummy/app/templates/vertical.hbs b/tests/dummy/app/templates/vertical.hbs index 3a0848e..bba6031 100644 --- a/tests/dummy/app/templates/vertical.hbs +++ b/tests/dummy/app/templates/vertical.hbs @@ -1,11 +1,11 @@
- {{#split-view isVertical=true class="splitViewVertical"}} - {{#split-child class="border"}} + {{#split-view isVertical=true class="splitViewVertical" as |split|}} + {{#split.child class="border"}} {{partial "ring"}} - {{/split-child}} - {{split-sash}} - {{#split-child class="border"}} + {{/split.child}} + {{split.sash}} + {{#split.child class="border"}} {{partial "yoda"}} - {{/split-child}} + {{/split.child}} {{/split-view}}
From 6575d891a7c639b94b6e9fefe59d450e082942c2 Mon Sep 17 00:00:00 2001 From: Aurelio Saraiva Date: Fri, 11 Nov 2016 10:49:01 -0200 Subject: [PATCH 3/9] fix firefox --- addon/components/split-child.js | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addon/components/split-child.js b/addon/components/split-child.js index 20d140d..9533c0a 100644 --- a/addon/components/split-child.js +++ b/addon/components/split-child.js @@ -127,7 +127,8 @@ export default Ember.Component.extend({ var element = this.$(); var cssInt = function(name) { - return parseInt(this.css(name)); + //fix firefox + return parseInt(this.css(name), 10) || 0; }.bind(element); if(this.get('parent.isVertical')) { diff --git a/package.json b/package.json index cbca65b..ab9e2d0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ember-split-view", "description": "EmberJS components for creating split views", - "version": "0.11.0", + "version": "0.11.1", "directories": { "doc": "doc", "test": "tests" From 7cfa246c97dfe029e69e37d5706c0cdb4a1a231a Mon Sep 17 00:00:00 2001 From: Aurelio Saraiva Date: Fri, 11 Nov 2016 19:08:40 -0200 Subject: [PATCH 4/9] change version ember --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index c7627d5..f7bf471 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "ember-split-view", "dependencies": { - "ember": "~2.9.0", + "ember": "~2.4.1", "ember-cli-shims": "0.1.0", "ember-cli-test-loader": "0.2.2", "loader.js": "^3.5.0", From 27bb5f3e735f47140479fe9417b5ff6c6f3e97a4 Mon Sep 17 00:00:00 2001 From: Aurelio Saraiva Date: Fri, 11 Nov 2016 19:27:30 -0200 Subject: [PATCH 5/9] change dummy example --- tests/dummy/app/templates/collapsible.hbs | 12 ++++++------ tests/dummy/app/templates/composite.hbs | 18 +++++++++--------- .../app/templates/horizontal-composite.hbs | 18 +++++++++--------- tests/dummy/app/templates/horizontal.hbs | 8 ++++---- .../dummy/app/templates/vertical-composite.hbs | 18 +++++++++--------- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/tests/dummy/app/templates/collapsible.hbs b/tests/dummy/app/templates/collapsible.hbs index f2b0663..c92aa00 100644 --- a/tests/dummy/app/templates/collapsible.hbs +++ b/tests/dummy/app/templates/collapsible.hbs @@ -1,13 +1,13 @@
- {{#split-view isVertical=true class="splitViewVertical"}} - {{#split-child class="border" register-as=leftChild}} + {{#split-view isVertical=true class="splitViewVertical" as |split|}} + {{#split.child class="border" register-as=leftChild}} {{partial "ring"}} - {{/split-child}} - {{split-sash}} - {{#split-child class="border" register-as=rightChild}} + {{/split.child}} + {{split.sash}} + {{#split.child class="border" register-as=rightChild}} {{partial "yoda"}} - {{/split-child}} + {{/split.child}} {{/split-view}}
diff --git a/tests/dummy/app/templates/composite.hbs b/tests/dummy/app/templates/composite.hbs index 46c796c..cab6c08 100644 --- a/tests/dummy/app/templates/composite.hbs +++ b/tests/dummy/app/templates/composite.hbs @@ -1,13 +1,13 @@
- {{#split-view isVertical=true splitPercentage=30 class="splitViewVertical"}} - {{split-child class="border"}} - {{split-sash}} - {{#split-child}} - {{#split-view isVertical=false}} - {{split-child class="border"}} - {{split-sash}} - {{split-child class="border"}} + {{#split-view isVertical=true splitPercentage=30 class="splitViewVertical" as |split|}} + {{split.child class="border"}} + {{split.sash}} + {{#split.child}} + {{#split-view isVertical=false as |split2|}} + {{split2.child class="border"}} + {{split2.sash}} + {{split2.child class="border"}} {{/split-view}} - {{/split-child}} + {{/split.child}} {{/split-view}}
diff --git a/tests/dummy/app/templates/horizontal-composite.hbs b/tests/dummy/app/templates/horizontal-composite.hbs index 0c30055..3f730f7 100644 --- a/tests/dummy/app/templates/horizontal-composite.hbs +++ b/tests/dummy/app/templates/horizontal-composite.hbs @@ -1,13 +1,13 @@
- {{#split-view isVertical=false class="splitViewHorizontal"}} - {{split-child class="border"}} - {{split-sash}} - {{#split-child class="composite"}} - {{#split-view isVertical=false}} - {{split-child class="border"}} - {{split-sash}} - {{split-child class="border"}} + {{#split-view isVertical=false class="splitViewHorizontal" as |split|}} + {{split.child class="border"}} + {{split.sash}} + {{#split.child class="composite"}} + {{#split-view isVertical=false as |split2|}} + {{split2.child class="border"}} + {{split2.sash}} + {{split2.child class="border"}} {{/split-view}} - {{/split-child}} + {{/split.child}} {{/split-view}}
diff --git a/tests/dummy/app/templates/horizontal.hbs b/tests/dummy/app/templates/horizontal.hbs index f6a2b3c..d4c913d 100644 --- a/tests/dummy/app/templates/horizontal.hbs +++ b/tests/dummy/app/templates/horizontal.hbs @@ -1,7 +1,7 @@
- {{#split-view isVertical=false class="splitViewHorizontal"}} - {{split-child class="border"}} - {{split-sash}} - {{split-child class="border"}} + {{#split-view isVertical=false class="splitViewHorizontal" as |split|}} + {{split.child class="border"}} + {{split.sash}} + {{split.child class="border"}} {{/split-view}}
diff --git a/tests/dummy/app/templates/vertical-composite.hbs b/tests/dummy/app/templates/vertical-composite.hbs index 483b12f..da7ee35 100644 --- a/tests/dummy/app/templates/vertical-composite.hbs +++ b/tests/dummy/app/templates/vertical-composite.hbs @@ -1,13 +1,13 @@
- {{#split-view isVertical=true class="splitViewVertical"}} - {{split-child class="border"}} - {{split-sash}} - {{#split-child class="composite"}} - {{#split-view isVertical=true}} - {{split-child class="border"}} - {{split-sash}} - {{split-child class="border"}} + {{#split-view isVertical=true class="splitViewVertical" as |split|}} + {{split.child class="border"}} + {{split.sash}} + {{#split.child class="composite"}} + {{#split-view isVertical=true as |split2|}} + {{split2.child class="border"}} + {{split2.sash}} + {{split2.child class="border"}} {{/split-view}} - {{/split-child}} + {{/split.child}} {{/split-view}}
From ac46e59d8c5c9dd73f5d0e30ac3392c50b1db423 Mon Sep 17 00:00:00 2001 From: Aurelio Saraiva Date: Fri, 11 Nov 2016 19:37:21 -0200 Subject: [PATCH 6/9] adjust README --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 07f1116..409246f 100644 --- a/README.md +++ b/README.md @@ -39,28 +39,28 @@ resizeServiceDefaults: { Vertical SplitView example: ``` -{{#split-view isVertical=true}} - {{#split-child}} +{{#split-view isVertical=true as |split| }} + {{#split.child}} Content of the left view here. - {{/split-child}} - {{split-sash}} - {{#split-child}} + {{/split.child}} + {{split.sash}} + {{#split.child}} Content of the right view here. - {{/split-child}} + {{/split.child}} {{/split-view}} ``` Horizontal SplitView example: ``` -{{#split-view isVertical=false}} - {{#split-child}} +{{#split-view isVertical=false as |split|}} + {{#split.child}} Content of the top view here. - {{/split-child}} - {{split-sash}} - {{#split-child}} + {{/split.child}} + {{split.sash}} + {{#split.child}} Content of the bottom view here. - {{/split-child}} + {{/split.child}} {{/split-view}} ``` From 66a3116676ce3ea74a96347111b6e8f2b249ad83 Mon Sep 17 00:00:00 2001 From: Aurelio Saraiva Date: Fri, 11 Nov 2016 19:37:56 -0200 Subject: [PATCH 7/9] restore version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ab9e2d0..cbca65b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ember-split-view", "description": "EmberJS components for creating split views", - "version": "0.11.1", + "version": "0.11.0", "directories": { "doc": "doc", "test": "tests" From 3a16597a06e9c5ff1ed07c8146fef2ab0e8651e2 Mon Sep 17 00:00:00 2001 From: Aurelio Saraiva Date: Fri, 11 Nov 2016 20:00:08 -0200 Subject: [PATCH 8/9] removed support ember 1.13 --- config/ember-try.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/config/ember-try.js b/config/ember-try.js index 7ded6fc..be846e1 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -7,17 +7,6 @@ module.exports = { dependencies: { } } }, - { - name: 'ember-1-13', - bower: { - dependencies: { - 'ember': '~1.13.0' - }, - resolutions: { - 'ember': '~1.13.0' - } - } - }, { name: 'ember-release', bower: { From 9e6a6ccc7a02511caae7421a3f4f74a4a9a242e9 Mon Sep 17 00:00:00 2001 From: Aurelio Saraiva Date: Fri, 11 Nov 2016 20:01:26 -0200 Subject: [PATCH 9/9] removed ember 1.13 travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index caf4b7c..8197d31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ cache: env: - EMBER_TRY_SCENARIO=default - - EMBER_TRY_SCENARIO=ember-1-13 - EMBER_TRY_SCENARIO=ember-release - EMBER_TRY_SCENARIO=ember-beta - EMBER_TRY_SCENARIO=ember-canary