diff --git a/pandora/settings.py b/pandora/settings.py index 1fa86d871..6b5c9669f 100644 --- a/pandora/settings.py +++ b/pandora/settings.py @@ -95,6 +95,7 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'oxdjango.middleware.ExceptionMiddleware', + 'oxdjango.middleware.ChromeFrameMiddleware', ) ROOT_URLCONF = 'pandora.urls' @@ -129,7 +130,7 @@ AUTH_PROFILE_MODULE = 'oxuser.UserProfile' VIDEO_PROFILE = '96p' VIDEO_DERIVATIVES = [] -VIDEO_H264 = True +VIDEO_H264 = False #Pad.ma #VIDEO_PROFILE = '480p' diff --git a/pandora/static/js/pandora.local.js b/pandora/static/js/pandora.local.js index c5739c00d..20cc2c28e 100644 --- a/pandora/static/js/pandora.local.js +++ b/pandora/static/js/pandora.local.js @@ -59,7 +59,7 @@ app.afterLaunch.push(function() { return null; return function(result) { var data = JSON.parse(result); - cb(data) + cb(data); } } this.api.upload(JSON.stringify(options),