gluttonberg-core 2.5.7 → 2.5.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (29) hide show
  1. data/app/assets/images/gb_360-button-pause-light.gif +0 -0
  2. data/app/assets/images/gb_360-button-pause-light.png +0 -0
  3. data/app/assets/images/gb_360-button-pause.gif +0 -0
  4. data/app/assets/images/gb_360-button-pause.png +0 -0
  5. data/app/assets/images/gb_360-button-play-light.gif +0 -0
  6. data/app/assets/images/gb_360-button-play-light.png +0 -0
  7. data/app/assets/images/gb_360-button-play.gif +0 -0
  8. data/app/assets/images/gb_360-button-play.png +0 -0
  9. data/app/assets/images/gb_360-button-vis-pause-light.gif +0 -0
  10. data/app/assets/images/gb_360-button-vis-pause-light.png +0 -0
  11. data/app/assets/images/gb_360-button-vis-pause.gif +0 -0
  12. data/app/assets/images/gb_360-button-vis-pause.png +0 -0
  13. data/app/assets/images/gb_360-button-vis-play-light.gif +0 -0
  14. data/app/assets/images/gb_360-button-vis-play-light.png +0 -0
  15. data/app/assets/images/gb_360-button-vis-play.gif +0 -0
  16. data/app/assets/images/gb_360-button-vis-play.png +0 -0
  17. data/app/assets/javascripts/gb_360player.js +1396 -0
  18. data/app/assets/javascripts/gb_application.js +49 -4
  19. data/app/assets/javascripts/gb_berniecode-animator.js +674 -0
  20. data/app/assets/javascripts/gb_soundmanager2-jsmin.js +106 -0
  21. data/app/assets/stylesheets/gb_360player.css +271 -0
  22. data/app/assets/stylesheets/gb_admin-override.sass +6 -0
  23. data/app/helpers/gluttonberg/asset_library.rb +5 -1
  24. data/app/views/gluttonberg/admin/asset_library/assets/show.html.haml +7 -1
  25. data/app/views/gluttonberg/admin/asset_library/shared/_asset_panels.html.haml +9 -3
  26. data/app/views/gluttonberg/admin/shared/_asset_panel.html.haml +12 -6
  27. data/app/views/layouts/gluttonberg.html.haml +4 -1
  28. data/lib/gluttonberg/version.rb +1 -1
  29. metadata +38 -18
@@ -28,6 +28,8 @@ $(document).ready(function() {
28
28
  $(this).parent("li").addClass('active')
29
29
  });
30
30
 
31
+ setUpAudio();
32
+
31
33
  });
32
34
 
33
35
  function initBetterSlugManagement() {
@@ -267,6 +269,8 @@ var AssetBrowser = {
267
269
  AssetBrowser.target = null;
268
270
  }
269
271
 
272
+ threeSixtyPlayer.init();
273
+
270
274
  // Grab the various nodes we need
271
275
  AssetBrowser.display = AssetBrowser.browser.find("#assetsDisplay");
272
276
  AssetBrowser.offsets = AssetBrowser.browser.find("> *:not(#assetsDisplay)");
@@ -382,6 +386,13 @@ var AssetBrowser = {
382
386
  display: "none"
383
387
  });
384
388
  AssetBrowser.browser.remove();
389
+
390
+ if(threeSixtyPlayer != null){
391
+ try{
392
+ threeSixtyPlayer.stopSound(threeSixtyPlayer.lastSound);
393
+ }catch(e){}
394
+ }
395
+
385
396
  },
386
397
  handleJSON: function(json) {
387
398
  if (json.backURL) {
@@ -438,13 +449,25 @@ var AssetBrowser = {
438
449
  insert_image_in_wysiwyg(image_url,file_type,file_title);
439
450
 
440
451
  AssetBrowser.nameDisplay.html(name);
441
- if (AssetBrowser.link_parent.find("img").length > 0) {
442
- AssetBrowser.link_parent.find("img").attr('src', image_src)
443
452
 
444
- } else {
445
- AssetBrowser.link_parent.prepend("<img src='" + image_src + "' />")
453
+ if(file_type == "image"){
454
+ if (AssetBrowser.link_parent.find("img").length > 0) {
455
+ AssetBrowser.link_parent.find("img").attr('src', image_src);
456
+ } else {
457
+ AssetBrowser.link_parent.prepend("<img src='" + image_src + "' />");
458
+ }
459
+ }else if(file_type == "audio"){
460
+ if (AssetBrowser.link_parent.find("div.ui360 a").length > 0) {
461
+ AssetBrowser.link_parent.find("div.ui360 a").attr('href', image_url);
462
+ AssetBrowser.link_parent.find("div.ui360 a").text(name);
463
+ } else {
464
+ AssetBrowser.link_parent.prepend("<div class='ui360'><a href='" + image_url + "' >"+name+"</a><div>");
465
+ threeSixtyPlayer.init();
466
+ AssetBrowser.nameDisplay.html('');
467
+ }
446
468
  }
447
469
 
470
+
448
471
  auto_save_asset(AssetBrowser.logo_setting_url, id); //auto save if it is required
449
472
  } else {
450
473
  if (AssetBrowser.actualLink.hasClass("add_image_to_gallery")) {
@@ -860,3 +883,25 @@ Array.prototype.remove= function(){
860
883
  }
861
884
  return this;
862
885
  }
886
+
887
+ // Audio
888
+
889
+ function setUpAudio(){
890
+ soundManager.setup({
891
+ useFlashBlock: true, // optional - if used, required flashblock.css
892
+ url: '/swf/', // required: path to directory containing SM2 SWF files
893
+ debugMode: false
894
+ });
895
+ // basicMP3Player = new BasicMP3Player();
896
+ // console.log(basicMP3Player)
897
+ }
898
+
899
+ function setUp360(){
900
+
901
+ }
902
+
903
+ function stopAudio(){
904
+ if(!blank(basicMP3Player) && basicMP3Player.lastSound !== null){
905
+ basicMP3Player.stopSound(basicMP3Player.lastSound);
906
+ }
907
+ }