Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Urigo committed Oct 24, 2014
2 parents 71752e4 + 8d5d175 commit 9ad1b4b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
13 changes: 10 additions & 3 deletions urigo:angular.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ angularMeteor.config(['$interpolateProvider',
}
]);

// Manual initialisation of angular-meteor
angular.element(document).ready(function () {
var onReady = function () {
if (!angular.element(document).injector()) {
angular.bootstrap(document, ['angular-meteor']);
}
Expand All @@ -44,4 +43,12 @@ angular.element(document).ready(function () {
});
}
}
});
};

// Manual initialisation of angular-meteor
if (Meteor.isCordova) {
angular.element(document).on("deviceready", onReady);
}
else {
angular.element(document).ready(onReady);
}
4 changes: 2 additions & 2 deletions versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"dependencies": [
[
"meteor",
"1.0.2"
"1.1.2"
],
[
"mquandalle:bower",
"0.1.11"
],
[
"underscore",
"1.0.0"
"1.0.1"
]
],
"pluginDependencies": [],
Expand Down

0 comments on commit 9ad1b4b

Please sign in to comment.