Permalink
Browse files

finally fixed javascript bug, had to do with precompiling in the asse…

…t pipeline
  • Loading branch information...
drdavidg committed Jan 21, 2012
1 parent 38f2708 commit 4dae86746693759589f46e5583179de5f8085fc6
Showing with 1,379 additions and 10,306 deletions.
  1. BIN app/assets/.DS_Store
  2. BIN app/assets/images/.DS_Store
  3. BIN app/assets/images/bg-black.png
  4. BIN public/assets/loading copy-5244b6c6280ccc90bc6c2a0707e24d45.gif → app/assets/images/progress.gif
  5. BIN app/assets/images/slidepics/1.JPG
  6. BIN app/assets/images/slidepics/2.JPG
  7. BIN app/assets/images/supersized-logo.png
  8. BIN app/assets/javascripts/.DS_Store
  9. +4 −55 app/assets/javascripts/application.js
  10. +0 −487 app/assets/javascripts/coin-slider.js
  11. +0 −51 app/assets/javascripts/coin-slider.min.js
  12. +0 −5,060 app/assets/javascripts/galleria-1.2.6.js
  13. +0 −102 app/assets/javascripts/galleria-1.2.6.min.js
  14. +0 −94 app/assets/javascripts/galleria.classic.js
  15. +0 −11 app/assets/javascripts/galleria.classic.min.js
  16. +0 −146 app/assets/javascripts/galleria.history.js
  17. +0 −321 app/assets/javascripts/galleria.picasa.js
  18. +0 −14 app/assets/javascripts/galleria.picasa.min.js
  19. +16 −0 app/assets/javascripts/jquery-1.5.1.min.js
  20. +0 −281 app/assets/javascripts/jquery.nivo.gallery.js
  21. +0 −12 app/assets/javascripts/jquery.nivo.gallery.min.js
  22. +0 −694 app/assets/javascripts/jquery.nivo.slider.js
  23. +0 −12 app/assets/javascripts/jquery.nivo.slider.pack.js
  24. +0 −400 app/assets/javascripts/jquery.orbit-1.2.3.js
  25. +0 −17 app/assets/javascripts/jquery.orbit-1.2.3.min.js
  26. +571 −0 app/assets/javascripts/jquery.orbit-1.3.0.js
  27. +0 −555 app/assets/javascripts/slides.jquery.js
  28. BIN app/assets/javascripts/themes/default/arrows.png
  29. BIN app/assets/javascripts/themes/default/bullets.png
  30. +0 −75 app/assets/javascripts/themes/default/default.css
  31. BIN app/assets/javascripts/themes/default/loading.gif
  32. BIN app/assets/javascripts/themes/orman/arrows.png
  33. BIN app/assets/javascripts/themes/orman/bullets.png
  34. BIN app/assets/javascripts/themes/orman/loading.gif
  35. +0 −100 app/assets/javascripts/themes/orman/orman.css
  36. +0 −1 app/assets/javascripts/themes/orman/readme.txt
  37. BIN app/assets/javascripts/themes/orman/ribbon.png
  38. BIN app/assets/javascripts/themes/orman/slider.png
  39. BIN app/assets/javascripts/themes/pascal/bullets.png
  40. BIN app/assets/javascripts/themes/pascal/controlnav.png
  41. BIN app/assets/javascripts/themes/pascal/featured.png
  42. BIN app/assets/javascripts/themes/pascal/loading.gif
  43. +0 −104 app/assets/javascripts/themes/pascal/pascal.css
  44. +0 −1 app/assets/javascripts/themes/pascal/readme.txt
  45. BIN app/assets/javascripts/themes/pascal/ribbon.png
  46. BIN app/assets/javascripts/themes/pascal/slider.png
  47. +1 −7 app/assets/stylesheets/application.css
  48. +0 −17 app/assets/stylesheets/coin-slider-styles.css
  49. +0 −219 app/assets/stylesheets/galleria.classic.css.scss
  50. +0 −864 app/assets/stylesheets/nivo-default.css
  51. +0 −215 app/assets/stylesheets/nivo-gallery.css
  52. +0 −104 app/assets/stylesheets/nivo-slider.css
  53. +201 −0 app/assets/stylesheets/orbit-1.3.0.css
  54. +4 −4 app/views/layouts/_header.html.erb
  55. +9 −52 app/views/pages/albums.html.erb
  56. +1 −1 app/views/pages/registry.html.erb
  57. +571 −0 jquery.orbit-1.3.0.js
  58. +1 −1 app/assets/stylesheets/orbit-1.2.3.css → orbit-1.3.0.css
  59. BIN public/assets/Thumbs-664e9e97f915a4000b9ae1c8157ca98d.db
  60. BIN public/assets/Thumbs.db
  61. +0 −24 public/assets/application-10ac42ece60f9ec64186000da5bc0de3.js
  62. BIN public/assets/application-10ac42ece60f9ec64186000da5bc0de3.js.gz
  63. +0 −24 public/assets/application-2aaf9fba4722c682f682fdc352f06ffb.js
  64. BIN public/assets/application-2aaf9fba4722c682f682fdc352f06ffb.js.gz
  65. +0 −24 public/assets/application-41dd6bf1aa1963fbca20e05f1e71c49b.js
  66. BIN public/assets/application-41dd6bf1aa1963fbca20e05f1e71c49b.js.gz
  67. +0 −1 public/assets/application-86500161c944a1829482f74f5671ed1f.css
  68. BIN public/assets/application-86500161c944a1829482f74f5671ed1f.css.gz
  69. +0 −24 public/assets/application-873b85ef8ebe1f4a72b6a7876c9437fe.js
  70. BIN public/assets/application-873b85ef8ebe1f4a72b6a7876c9437fe.js.gz
  71. +0 −24 public/assets/application-a45c7826b71b59dbe288f4418ac3f14d.js
  72. BIN public/assets/application-a45c7826b71b59dbe288f4418ac3f14d.js.gz
  73. +0 −21 public/assets/application-bd3d3d48dbdde8e434fb0822df9faff8.js
  74. BIN public/assets/application-bd3d3d48dbdde8e434fb0822df9faff8.js.gz
  75. +0 −1 public/assets/application-dab55d9f08a00854329f35874375dbca.css
  76. BIN public/assets/application-dab55d9f08a00854329f35874375dbca.css.gz
  77. +0 −24 public/assets/application-f9774f1c31208bd868478a082256220b.js
  78. BIN public/assets/application-f9774f1c31208bd868478a082256220b.js.gz
  79. +0 −1 public/assets/application.css
  80. BIN public/assets/application.css.gz
  81. +0 −24 public/assets/application.js
  82. BIN public/assets/application.js.gz
  83. BIN public/assets/arrows-52cef808607310ac04b67a1d01630828.png
  84. BIN public/assets/arrows.png
  85. BIN public/assets/bullets-cf43452ef4842441768db1253f57008f.jpg
  86. BIN public/assets/classic-loader-c00d11b554c986fb60ec35bae8d78908.gif
  87. BIN public/assets/classic-loader.gif
  88. BIN public/assets/classic-map-52693d47b95c455474b76ade6c380a5e.png
  89. BIN public/assets/classic-map.png
  90. BIN public/assets/fullscreen-b3b173027fad7657f4e83d15a20bb087.png
  91. BIN public/assets/fullscreen.png
  92. BIN public/assets/left-arrow-8e640f9bd264b7194ce3a6ba340cac21.png
  93. BIN public/assets/lightbox-blank-abe4466721920bfb910c03b38e506601.gif
  94. BIN public/assets/lightbox-blank.gif
  95. BIN public/assets/lightbox-btn-close-789eea082d6dc75357f8a91aa3f26c3d.gif
  96. BIN public/assets/lightbox-btn-close.gif
  97. BIN public/assets/lightbox-btn-next-5a9de4b42699720c57e52d9a6bbf8100.gif
  98. BIN public/assets/lightbox-btn-next.gif
  99. BIN public/assets/lightbox-btn-prev-99899947dfff81744bcc6ec0ec08c6e9.gif
  100. BIN public/assets/lightbox-btn-prev.gif
  101. BIN public/assets/lightbox-ico-loading-c37d0277518cce8133f2f89c0c0fd036.gif
  102. BIN public/assets/lightbox-ico-loading.gif
  103. BIN public/assets/loader-c00d11b554c986fb60ec35bae8d78908.gif
  104. BIN public/assets/loader.gif
  105. BIN public/assets/loading-6b90bd21fa9e029d4b7a7aa796127623.gif
  106. BIN public/assets/loading.gif
  107. +0 −33 public/assets/manifest.yml
  108. BIN public/assets/mask-black-8ea1e98e1d5e9cd0e582d98b105d9729.png
  109. BIN public/assets/orbit/bullets-cf43452ef4842441768db1253f57008f.jpg
  110. BIN public/assets/orbit/left-arrow-8e640f9bd264b7194ce3a6ba340cac21.png
  111. BIN public/assets/orbit/loading-5244b6c6280ccc90bc6c2a0707e24d45.gif
  112. BIN public/assets/orbit/mask-black-8ea1e98e1d5e9cd0e582d98b105d9729.png
  113. BIN public/assets/orbit/pause-black-a2198d2bb659dda165b57f4fd36687ac.png
  114. BIN public/assets/orbit/right-arrow-8ef9af8051cebbef385aadab20fb12d8.png
  115. BIN public/assets/orbit/rotator-black-e0ca6bf8eef0a367922c8b6a1aa55cac.png
  116. BIN public/assets/orbit/timer-black-8ea1e98e1d5e9cd0e582d98b105d9729.png
  117. BIN public/assets/pause-black-a2198d2bb659dda165b57f4fd36687ac.png
  118. BIN public/assets/playpause-e87a59a3ce582056ab24069d31d22575.png
  119. BIN public/assets/playpause.png
  120. BIN public/assets/rails-e4b51606cd77fda2615e7439907bfc92.png
  121. BIN public/assets/rails.png
  122. BIN public/assets/right-arrow-8ef9af8051cebbef385aadab20fb12d8.png
  123. BIN public/assets/rotator-black-e0ca6bf8eef0a367922c8b6a1aa55cac.png
  124. BIN public/assets/themes/default/arrows-cddf7535dac4df32dd66bacacf5c1911.png
  125. BIN public/assets/themes/default/arrows.png
  126. BIN public/assets/themes/default/bullets-ef89ea99141fdbbb5f7392aa23568232.png
  127. BIN public/assets/themes/default/bullets.png
  128. BIN public/assets/themes/default/loading-e26c97d156b7747cd4d45581116dc1ff.gif
  129. BIN public/assets/themes/default/loading.gif
  130. BIN public/assets/themes/orman/arrows-2791c355b6f622771884b0845574d08b.png
  131. BIN public/assets/themes/orman/arrows.png
  132. BIN public/assets/themes/orman/bullets-7e78f09d72e84f6f6cb2ddf7f98f222c.png
  133. BIN public/assets/themes/orman/bullets.png
  134. BIN public/assets/themes/orman/loading-e68a669315add4ed09ca4e3b4417e359.gif
  135. BIN public/assets/themes/orman/loading.gif
  136. +0 −1 public/assets/themes/orman/readme-a091c0147898d14b65fa1e8138bce651.txt
  137. +0 −1 public/assets/themes/orman/readme.txt
  138. BIN public/assets/themes/orman/ribbon-cfd0e65e044941f3b921fe282f9ae980.png
  139. BIN public/assets/themes/orman/ribbon.png
  140. BIN public/assets/themes/orman/slider-7e3d3bccbb4ed6c70f45fa7d14416797.png
  141. BIN public/assets/themes/orman/slider.png
  142. BIN public/assets/themes/pascal/bullets-4c024a842f97450d8403274e5e392c97.png
  143. BIN public/assets/themes/pascal/bullets.png
  144. BIN public/assets/themes/pascal/controlnav-bbe1b30e886bb3ef5bd8bfe258c0e9d0.png
  145. BIN public/assets/themes/pascal/controlnav.png
  146. BIN public/assets/themes/pascal/featured-62a3dd672706a86eea3d69f96c8c1821.png
  147. BIN public/assets/themes/pascal/featured.png
  148. BIN public/assets/themes/pascal/loading-e68a669315add4ed09ca4e3b4417e359.gif
  149. BIN public/assets/themes/pascal/loading.gif
  150. +0 −1 public/assets/themes/pascal/readme-b33e3e733946d55dd8314fdebab23782.txt
  151. +0 −1 public/assets/themes/pascal/readme.txt
  152. BIN public/assets/themes/pascal/ribbon-62a3dd672706a86eea3d69f96c8c1821.png
  153. BIN public/assets/themes/pascal/ribbon.png
  154. BIN public/assets/themes/pascal/slider-332abe437fd0e191401c2e6e3010d323.png
  155. BIN public/assets/themes/pascal/slider.png
  156. BIN public/assets/timer-black-8ea1e98e1d5e9cd0e582d98b105d9729.png
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -3,23 +3,14 @@
// be included in the compiled file accessible from http://example.com/assets/application.js
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// the compiled file.
-//
-//= require jquery
+//= require jquery-1.5.1.min
//= require jquery_ujs
//= require_tree .
-//= require twitter/bootstrap
-//= require galleria-1.2.6
-//= require galleria.classic
-//= require jquery.nivo.slider.pack
-//= require jquery.nivo.slider
-//= require jquery.nivo.gallery
-//= require coin-slider
-//= require jquery.orbit-1.2.3
-//= require_tree .
-//= require twitter/bootstrap
-//= require jquery_ujs
+
+
$(document).ready(function(){
+
 $('a.lightbox').lightBox({
     fixedNavigation:true,
     imageLoading: "<%= asset_path 'lightbox-ico-loading.gif' %>",
@@ -31,49 +22,7 @@ $(document).ready(function(){
});
$(window).load(function() {
- $('#slider').nivoSlider({
- effect: 'random', // Specify sets like: 'fold,fade,sliceDown'
- slices: 15, // For slice animations
- boxCols: 8, // For box animations
- boxRows: 4, // For box animations
- animSpeed: 500, // Slide transition speed
- pauseTime: 3000, // How long each slide will show
- startSlide: 0, // Set starting Slide (0 index)
- directionNav: true, // Next & Prev navigation
- directionNavHide: true, // Only show on hover
- controlNav: true, // 1,2,3... navigation
- controlNavThumbs: false, // Use thumbnails for Control Nav
- controlNavThumbsFromRel: false, // Use image rel for thumbs
- controlNavThumbsSearch: '.jpg', // Replace this with...
- controlNavThumbsReplace: '_thumb.jpg', // ...this in thumb Image src
- keyboardNav: true, // Use left & right arrows
- pauseOnHover: true, // Stop animation while hovering
- manualAdvance: false, // Force manual transitions
- captionOpacity: 0.8, // Universal caption opacity
- prevText: 'Prev', // Prev directionNav text
- nextText: 'Next', // Next directionNav text
- randomStart: false, // Start on a random slide
- beforeChange: function(){}, // Triggers before a slide transition
- afterChange: function(){}, // Triggers after a slide transition
- slideshowEnd: function(){}, // Triggers after all slides have been shown
- lastSlide: function(){}, // Triggers when last slide is shown
- afterLoad: function(){} // Triggers when slider has loaded
- });
-});
-
-$(document).ready(function() {
- $('#gallery').nivoGallery();
-});
-$(document).ready(function() {
- $('#coin-slider').coinslider();
});
-$(window).load(function() {
- $('#featured').orbit();
- });
- $('#gallery').galleria({
- width:500,
- height:500
- });
Oops, something went wrong.

0 comments on commit 4dae867

Please sign in to comment.