Permalink
Browse files

add parallels env defaults when checking for a setting. update heroku…

… app.json with new env vars
  • Loading branch information...
futurefear committed Jul 18, 2015
1 parent e130c2f commit aae2752df384a40258734dce19d9691626d0a3a0
View
@@ -3,7 +3,7 @@
"description": "",
"scripts": {},
"env": {
"UPLOADER": {
"PARALLELS_FILE_UPLOADER": {
"required": true,
"description": "Type of uploader to use for multimedia upload: (s3Uploader)"
},
@@ -1,6 +1,6 @@
Template.navPanel.rendered = function() {
var displayIntro = Parallels.settings.get('PARALLELS_DISPLAY_INTRO_ANIMATION');
var displayIntro = Parallels.settings.get('PARALLELS_DISPLAY_INTRO_ANIMATION') || 'true';
if (Parallels.utils.stringToBoolean(displayIntro)) {
var timelineSequence = new TimelineMax({ paused: true });
@@ -13,7 +13,7 @@ Meteor.startup(function () {
Parallels.Keys.bindEsc();
Parallels.Keys.bindShortcuts();
var isAudioEnabled = Parallels.settings.get('PARALLELS_IS_AUDIO_ENABLED');
var isAudioEnabled = Parallels.settings.get('PARALLELS_IS_AUDIO_ENABLED') || "true";
Session.set('isAudioEnabled', Parallels.utils.stringToBoolean(isAudioEnabled));
Tracker.autorun(function () {
@@ -1,5 +1,5 @@
var enableHotCodePush = Parallels.settings.get('PARALLELS_IS_METEOR_HOT_CODE_PUSH_ENABLED');
var enableHotCodePush = Parallels.settings.get('PARALLELS_IS_METEOR_HOT_CODE_PUSH_ENABLED') || 'true';
if (!Parallels.utils.stringToBoolean(enableHotCodePush)) {
Meteor._reload.onMigrate(function() {
return [false];

0 comments on commit aae2752

Please sign in to comment.