mirror of
https://github.com/donl/meteor-ionic.git
synced 2026-06-30 06:12:08 -06:00
fix conflicts
This commit is contained in:
commit
a432469fc3
2 changed files with 18 additions and 2 deletions
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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(' ');
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue