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.

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

Swap the modal-dialog template based on Ember version. #43

Merged
merged 4 commits into from
Jun 18, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion addon/components/positioned-container.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default Ember.Component.extend({
var alignmentTarget = this.get('alignmentTarget');
if (Ember.typeOf(alignmentTarget) === 'string') {
alignmentTarget = Ember.$(alignmentTarget)[0];
} else if (Ember.View.detectInstance(alignmentTarget)) {
} else if (alignmentTarget && alignmentTarget.element) {
alignmentTarget = alignmentTarget.element;
}
var $alignmentTarget = Ember.$(alignmentTarget);
Expand Down
22 changes: 22 additions & 0 deletions addon/templates/current/components/modal-dialog.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{{#ember-wormhole to=destinationElementId renderInPlace=renderInPlace}}
{{#if hasOverlay}}
<div class="{{overlayClassNamesString}} {{if translucentOverlay 'translucent'}} {{overlay-class}}" {{action 'close'}}></div>
{{/if}}
{{#if useEmberTether}}
{{#ember-tether classNameBindings="containerClassNamesString alignmentClass renderInPlaceClass container-class"
target=_alignmentTargetNormalized
attachment=_attachmentNormalized
targetAttachment=_targetAttachmentNormalized
targetModifier=_targetModifierNormalized
}}
{{yield}}
{{/ember-tether}}
{{else}}
{{#ember-modal-dialog-positioned-container classNameBindings="containerClassNamesString alignmentClass renderInPlaceClass container-class"
alignment=_alignmentNormalized
alignmentTarget=alignmentTarget
}}
{{yield}}
{{/ember-modal-dialog-positioned-container}}
{{/if}}
{{/ember-wormhole}}
19 changes: 18 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
/* jshint node: true */
'use strict';
var path = require('path');
var fs = require('fs');

var VersionChecker = require('ember-cli-version-checker');

module.exports = {
name: 'ember-modal-dialog'
name: 'ember-modal-dialog',

treeForAddonTemplates: function treeForAddonTemplates (tree) {
var checker = new VersionChecker(this);
var dep = checker.for('ember', 'bower');

var baseTemplatesPath = path.join(this.root, 'addon/templates');

if (dep.satisfies('>= 1.13.0')) {
return this.treeGenerator(path.join(baseTemplatesPath, 'current'));
} else {
return this.treeGenerator(path.join(baseTemplatesPath, 'lt-1-13'));
}
}
};
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,14 @@
"ember-disable-prototype-extensions": "^1.0.0",
"ember-disable-proxy-controllers": "^1.0.0",
"ember-export-application-global": "^1.0.2",
"ember-tether": "^0.1.1",
"ember-tether": "^0.1.3",
"ember-try": "0.0.6",
"glob": "4.4.0"
},
"dependencies": {
"ember-cli-babel": "^5.0.0",
"ember-cli-htmlbars": "^0.7.6",
"ember-cli-version-checker": "^1.1.0",
"ember-wormhole": "^0.3.1"
},
"keywords": [
Expand Down