]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge support for interchange with images.
authorJordan Humphreys <jordan@mailyard.net>
Mon, 3 Mar 2014 22:05:33 +0000 (14:05 -0800)
committerJordan Humphreys <jordan@mailyard.net>
Mon, 3 Mar 2014 22:05:33 +0000 (14:05 -0800)
1  2 
doc/pages/components/interchange.html
js/foundation/foundation.interchange.js

Simple merge
index a732e15a32df63ff10e1358bb107b50f20bb0be8,eaff496d6c13bd8f3bcd8d291fc4a07ce78541ef..6f6f390f537477082f9ca53c2ab4d9f9462063df
  
            if (last_path == path) return;
  
+           var regex = "/^.(\.jpg|\.jpeg|\.png|\.gif|\.tiff|\.bmp)\??|#?./";
+           if (new RegExp(regex,'i').test(path)){
+               $(el).css('background-image', 'url('+path+')');
+               el.data('interchange-last-path', path);
+               return trigger(path);
+           }
            return $.get(path, function (response) {
              el.html(response);
 -            el.data('interchange-last-path', path);
 +            el.data(this.data_attr + '-last-path', path);
              trigger();
            });
  
      },
  
      init : function (scope, method, options) {
 -      Foundation.inherit(this, 'throttle');
 -
 -      this.data_attr = 'data-' + this.settings.load_attr;
 +      Foundation.inherit(this, 'throttle random_str');
  
 +      this.data_attr = this.set_data_attr();
        $.extend(true, this.settings, method, options);
        this.bindings(method, options);
        this.load('images');
        this.load('nodes');