Merge branch 'master' of github.com:cargomedia/CM into model-create

.travis.yml

@@ -34,7 +34,7 @@ before_script:
   - npm install -g [email protected]
   - composer install
   - cp tests/travis/config.php resources/config/local.php
-  - bin/cm app set-deploy-version
+  - bin/cm app set-config deploy '{"deployVersion":'$(date +"%s")'}'
 
 script:
   - bin/phpunit

client-vendor/after-body/jquery.floatbox/jquery.floatbox.js

@@ -33,6 +33,15 @@
     $parent: null,
     $layer: null,
     $floatbox: null,
+    setOptions: function(value){
+      if (_.isObject(value)) {
+        //`value` as object to rewrite options
+        _.extend(this.options, value);
+        this.repaint();
+      } else {
+        throw new Error('Invalid param to floatbox.setOptions');
+      }
+    },
     show: function($element) {
       var $floatboxConfig = $element.find('.floatbox-config:first');
       this.options.fullscreen = $floatboxConfig.data('fullscreen') || this.options.fullscreen;
@@ -155,4 +164,12 @@
       }
     });
   };
+  $.fn.floatbox = function(method, value) {
+    return this.each(function() {
+      var floatbox = $(this).data('floatbox');
+      if (floatbox && _.isFunction(floatbox[method])) {
+        floatbox[method](value);
+      }
+    });
+  };
 })(jQuery);

client-vendor/after-body/jquery.lazyImageSetup/jquery.lazyImageSetup.js

@@ -11,14 +11,14 @@
   $.fn.lazyImageSetup = function(lazyLoadOptions) {
     return this.each(function() {
       var options = _.defaults(lazyLoadOptions || {}, {
-        threshold: 600,
-        failure_limit: 10
+        offset: 600,
+        attribute: 'original'
       });
       var $this = $(this);
       if ($this.closest('.scrollable').length) {
         options.container = $this.closest('.scrollable');
       }
-      $this.find('img.lazy').lazyload(options);
+      $this.find('img.lazy').unveil(options);
     });
   };
 

client-vendor/after-body/jquery.unveil2/README.md

@@ -0,0 +1,5 @@
+Currently we use a custom fork https://github.com/vogdb/unveil2. As soon as out changes are merged please remove this file.
+Our changes are:
+- https://github.com/nabble/unveil2/pull/27
+- https://github.com/nabble/unveil2/pull/28
+- https://github.com/nabble/unveil2/pull/30