angular2-now
Advanced tools
Comparing version 0.3.17 to 0.3.18
@@ -171,6 +171,6 @@ var angular2now = function () { | ||
var ddo = { | ||
restrict: options.restrict || (options.template + options.templateUrl) ? 'EA' : isClass ? 'C' : 'A', | ||
restrict: options.restrict || ((options.template + options.templateUrl) ? 'EA' : isClass ? 'C' : 'A'), | ||
controllerAs: options.controllerAs || controllerAs || target.controllerAs || options.selector, | ||
scope: target.hasOwnProperty('scope') ? target.scope : options.hasOwnProperty('scope') ? options.scope : options['bind'] || {}, | ||
bindToController: target.bindToController || true, | ||
bindToController: typeof target.bindToController === 'boolean' ? target.bindToController : true, | ||
template: options.template, | ||
@@ -567,3 +567,3 @@ templateUrl: options.templateUrl, | ||
// Custom parent State | ||
parent: options.parent | ||
parent: options.parent, | ||
@@ -651,3 +651,3 @@ // Custom data | ||
function MeteorMethod(_options) { | ||
var options = angular.merge({}, _options, ng2nOptions); | ||
var options = angular.merge({}, ng2nOptions, _options); | ||
var spinner = options.spinner || {show: angular.noop, hide: angular.noop}; | ||
@@ -675,3 +675,3 @@ var events = options.events || {beforeCall: angular.noop, afterCall: angular.noop}; | ||
if (spinner) spinner.show(); | ||
events.beforeCall(); // Call optional events.beforeCall() | ||
if (events.beforeCall) events.beforeCall(); // Call optional events.beforeCall() | ||
@@ -683,3 +683,3 @@ // todo: should call Meteor after resolution of promise returned by beforeCall() | ||
spinner.hide(); | ||
options.events.afterCall(); // Call optional events.afterCall() | ||
if (events.afterCall) events.afterCall(); // Call optional events.afterCall() | ||
}); | ||
@@ -686,0 +686,0 @@ |
{ | ||
"name": "angular2-now", | ||
"version": "0.3.16", | ||
"version": "0.3.18", | ||
"authors": [ | ||
@@ -5,0 +5,0 @@ "pbastowski@gmail.com" |
Package.describe({ | ||
name: 'pbastowski:angular2-now', | ||
version: '0.3.17', | ||
version: '0.3.18', | ||
summary: 'Angular 2 @Component syntax for Angular 1', | ||
@@ -5,0 +5,0 @@ git: 'https://github.com/pbastowski/angular2-now.git', |
{ | ||
"name": "angular2-now", | ||
"version": "0.3.17", | ||
"version": "0.3.18", | ||
"description": "Angular 2 component syntax for Angular 1 apps", | ||
@@ -5,0 +5,0 @@ "main": "angular2-now.js", |
53892