gluttonberg-core 2.5.9 → 2.6.0
Sign up to get free protection for your applications and to get access to all the features.
- data/app/assets/javascripts/gb_360player.js +1 -1
- data/app/assets/javascripts/gb_application.js +2 -4
- data/app/assets/javascripts/gb_soundmanager2-jsmin.js +5715 -103
- data/app/assets/javascripts/gb_swf/soundmanager2.swf +0 -0
- data/app/assets/javascripts/gb_swf/soundmanager2_debug.swf +0 -0
- data/app/assets/javascripts/gb_swf/soundmanager2_flash9.swf +0 -0
- data/app/assets/javascripts/gb_swf/soundmanager2_flash9_debug.swf +0 -0
- data/app/assets/javascripts/gb_swf/soundmanager2_flash_xdomain.zip +0 -0
- data/app/assets/stylesheets/gb_360player.css +1 -1
- data/app/controllers/gluttonberg/public/articles_controller.rb +23 -14
- data/app/controllers/gluttonberg/public/flag_controller.rb +10 -9
- data/app/controllers/gluttonberg/public/member_password_resets_controller.rb +15 -10
- data/app/controllers/gluttonberg/public/member_sessions_controller.rb +7 -4
- data/app/controllers/gluttonberg/public/members_controller.rb +23 -14
- data/app/controllers/gluttonberg/public/pages_controller.rb +21 -19
- data/app/controllers/gluttonberg/public/public_assets_controller.rb +8 -8
- data/app/models/gluttonberg/page.rb +1 -1
- data/app/views/gluttonberg/admin/asset_library/shared/_asset_panels.html.haml +4 -4
- data/lib/generators/gluttonberg/resource/templates/public_controller.rb +6 -0
- data/lib/gluttonberg/middleware/locales.rb +3 -2
- data/lib/gluttonberg/middleware/rewriter.rb +2 -2
- data/lib/gluttonberg/version.rb +1 -1
- metadata +7 -2
@@ -1023,7 +1023,7 @@ function ThreeSixtyPlayer() {
|
|
1023
1023
|
for (i=0,j=oItems.length; i<j; i++) {
|
1024
1024
|
oLinks.push(oItems[i].getElementsByTagName('a')[0]);
|
1025
1025
|
// remove "fake" play button (unsupported case)
|
1026
|
-
oItems[i].style.backgroundImage = 'none';
|
1026
|
+
//oItems[i].style.backgroundImage = 'none';
|
1027
1027
|
}
|
1028
1028
|
// grab all links, look for .mp3
|
1029
1029
|
|
@@ -889,11 +889,9 @@ Array.prototype.remove= function(){
|
|
889
889
|
function setUpAudio(){
|
890
890
|
soundManager.setup({
|
891
891
|
useFlashBlock: true, // optional - if used, required flashblock.css
|
892
|
-
url: '/
|
893
|
-
debugMode:
|
892
|
+
url: '/assets/gb_swf/', // required: path to directory containing SM2 SWF files
|
893
|
+
debugMode: true
|
894
894
|
});
|
895
|
-
// basicMP3Player = new BasicMP3Player();
|
896
|
-
// console.log(basicMP3Player)
|
897
895
|
}
|
898
896
|
|
899
897
|
function setUp360(){
|