fix conflicts

This commit is contained in:
Nick Wientge 2015-02-11 09:27:03 -08:00
commit a432469fc3
2 changed files with 18 additions and 2 deletions

View file

@ -1,12 +1,12 @@
<template name="ionModal">
<div class="modal-backdrop">
<div class="modal-wrapper">
<div class="modal">
<div class="{{classes}}">
{{#if customTemplate}}
{{> UI.contentBlock}}
{{else}}
<div class="bar bar-header bar-stable">
<div class="{{barClass}}">
<h2 class="{{titleClass}}">{{title}}</h2>
{{#if closeText}}
<button data-dismiss="modal" class="button button-positive button-clear">{{closeText}}</button>

View file

@ -93,6 +93,12 @@ Template.ionModal.destroyed = function () {
};
Template.ionModal.helpers({
barClass: function () {
var classes = ['bar', 'bar-header', 'bar-stable'];
return classes.join(' ');
},
titleClass: function () {
var classes = ['title'];
@ -121,6 +127,16 @@ Template.ionModal.helpers({
customTemplate: function () {
return this.customTemplate;
},
classes: function () {
var classes = ['modal'];
if (this.class) {
classes.push(this.class);
}
return classes.join(' ');
}
});