scrivito_section_widgets 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51fbd2e71f117e6c7c4c2bea949c20836795d98f
-  data.tar.gz: ab9a2a08e8a690dbd9e07af85dae04accb06206c
+  metadata.gz: 4f3556de3c06d11e61196238f2e7e156702d7c79
+  data.tar.gz: 95c492f668b7092f07a1f51addd9591f9c8e4aaa
 SHA512:
-  metadata.gz: dced368dddc188d551226899ee057d4b49e99d5d74985c4f486a74b6ef38df3f3174ee81823c36725cec52cb64c283c5d58592c2dea3df5103f583278323ee66
-  data.tar.gz: 570b120430a4dd05e06a73d59cfd5b6cb5d9d96471df424777a0ccd938e8389904bbc214adc44473ab9ac1c3a9792aaf67d0058013e19822618b020041dc3049
+  metadata.gz: f62862dd4ffed46a83c813a0fe9e4c4178be010c0f52c8a53ab73965680aec594b440115c9569e6f0e6f5d3bc8ea74922720c2757e9b2f94f5a5b22550d3011e
+  data.tar.gz: 8f53de1070b57fa3da8e93744d378ee30111d08e62372f37aa31dacbf8829436c75612ca814b89fa44762668b8927064e40ac102bd059a04911b1d2b505df60b

data/app/assets/javascripts/scrivito_section_widgets/parallax.js

@@ -7,7 +7,7 @@ $(function(){
    || function(f){setTimeout(f, 1000/60)}
 
   scrivito.on('content', function() {
-    var images = $(".parallax-image");
+    var images = $(".parallax-image-fast, .parallax-image-medium, .parallax-image-slow");
 
     if($('body').width() > 1024) {
       set_background_positions(images);
@@ -15,32 +15,10 @@ $(function(){
       $(window).on('scroll', function(event) {
         window.requestAnimationFrame(function(){ set_background_positions(images); });
       });
-    } else {
-      set_dimension(images);
     }
-
-    $(window).on('resize', function(event) {
-      set_dimension(images);
-    });
   });
 });
 
-function set_dimension(images) {
-  var height = 0;
-  var container = null;
-
-  $.each(images, function(i, image) {
-    container = $(image).parents('.parallax');
-    height = $(image).get(0).clientHeight / 1.3;
-
-    if(height > 0) {
-      container.css({
-        'height': height,
-      });
-    }
-  });
-}
-
 function set_background_positions(images) {
   $.each(images, function(i, image) {
     set_background_position(image);
@@ -49,16 +27,14 @@ function set_background_positions(images) {
 
 function set_background_position(image) {
   var value = $(image).data('parallax-speed');
-  if(!(value == "fixed" || value == "deactivate")) {
-    var data = calulate_position(image, value);
-    $(image).css({
-      '-webkit-transform': data,
-      '-ms-transform': data,
-      '-o-transform': data,
-      '-moz-transform': data,
-      'transform': data,
-    });
-  }
+  var data = calulate_position(image, value);
+  $(image).css({
+    '-webkit-transform': data,
+    '-ms-transform': data,
+    '-o-transform': data,
+    '-moz-transform': data,
+    'transform': data,
+  });
 }
 
 function calulate_position(image, value) {

data/app/assets/stylesheets/scrivito_section_widgets/bootstrap_sectionize.css

@@ -1,52 +1,3 @@
-.container {
-  width: 100%;
-  padding: 0;
-  margin: 0;
-}
-
-#wrap > .container {
-  overflow: hidden;
-  width: 100%;
-  margin: 0;
-  padding: 0;
-}
-
-section .container {
-  width: 100%;
-  padding: 15px;
-  margin: 0 auto;
-}
-
 .navbar {
   margin-bottom: 0 !important;
 }
-
-@media (min-width: 768px) {
-  .container {
-    width: 100%;
-  }
-
-  section .container {
-    width: 750px;
-  }
-}
-
-@media (min-width: 992px) {
-  .container {
-    width: 100%;
-  }
-
-  section .container {
-    width: 970px;
-  }
-}
-
-@media (min-width: 1220px) {
-  .container {
-    width: 100%;
-  }
-
-  section .container {
-    width: 1170px;
-  }
-}

data/app/assets/stylesheets/scrivito_section_widgets/parallax_section.css

@@ -11,15 +11,15 @@
   height: auto;
 }
 
-.scrivito_section_parallax_widget.parallax_speed_fixed .parallax-image {
-  position: fixed;
-}
-
 .scrivito_section_video_widget video {
   width: 100%;
   display: block;
 }
 
+.section_speed_fixed {
+  background-size: cover !important;
+}
+
 .scrivito_section_video_widget .container {
   position: absolute;
   top: 0;

data/app/models/section_parallax_widget.rb

@@ -3,4 +3,24 @@ class SectionParallaxWidget < Widget
   attribute :background_image, :reference
   attribute :height, :string
   attribute :speed, :enum, values: ["fixed", "slow", "medium", "fast", "deactivate"], default: "medium"
+
+  def section_class
+    "parallax scrivito_section_parallax_widget section_speed_#{speed}"
+  end
+
+  def section_style
+    styles = "height: #{height}; max-height: #{height};"
+    styles += "background: url(#{background_image.binary_url}) top center #{'fixed' if speed=='fixed'} no-repeat;" unless with_parallax?
+    return styles
+  end
+
+  def with_parallax?
+    return true unless speed.present?
+    ["slow", "medium", "fast"].include? speed
+  end
+
+  def parallax_speed
+    # legacy support for widgets before speed option
+    speed.presence || 'medium'
+  end
 end

data/app/views/section_parallax_widget/show.html.erb

@@ -1,4 +1,6 @@
-<section class="parallax scrivito_section_parallax_widget parallax_speed_<%= widget.speed %>" style="height: <%= widget.height %>; max-height: <%= widget.height %>">
-  <%= scrivito_image_tag widget, :background_image, class: "parallax-image", data: { parallax_speed: widget.speed } %>
+<section class="<%= widget.section_class %>" style="<%= widget.section_style %>">
+  <% if widget.with_parallax? %>
+    <%= scrivito_image_tag(widget, :background_image, class: "parallax-image parallax-image-#{widget.parallax_speed}", data: { parallax_speed: widget.speed }) %>
+  <% end %>
   <%= scrivito_tag(:div, widget, :section_content, class: 'container') %>
 </section>

data/lib/scrivito_section_widgets/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoSectionWidgets
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_section_widgets
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler