diff --git a/dist/bespoke-scale.js b/dist/bespoke-scale.js old mode 100755 new mode 100644 index 4b06a5f..ba71a69 --- a/dist/bespoke-scale.js +++ b/dist/bespoke-scale.js @@ -1,7 +1,7 @@ /*! * bespoke-scale v1.0.1 * - * Copyright 2014, Mark Dalgleish + * Copyright 2015, Mark Dalgleish * This content is released under the MIT license * http://mit-license.org/markdalgleish */ @@ -26,11 +26,15 @@ module.exports = function(options) { elements = useZoom ? deck.slides : deck.slides.map(wrap), transformProperty = (function(property) { - var prefixes = 'Moz Webkit O ms'.split(' '); - return prefixes.reduce(function(currentProperty, prefix) { - return prefix + property in parent.style ? prefix + property : currentProperty; - }, property.toLowerCase()); - }('Transform')), + if (!(property in parent.style)) { + var prefix = ['webkit', 'Moz', 'ms', 'O']; + var proper = property.charAt(0).toUpperCase() + property.substr(1); + for (var i = 0, len = prefix.length; i < len; i++) { + if (prefix[i] + proper in parent.style) { return prefix[i] + proper; } + } + } + return property; + }('transform')), scale = useZoom ? function(ratio, element) { @@ -50,7 +54,6 @@ module.exports = function(options) { window.addEventListener('resize', scaleAll); scaleAll(); }; - }; },{}]},{},[1]) diff --git a/dist/bespoke-scale.min.js b/dist/bespoke-scale.min.js old mode 100755 new mode 100644 index 66acbc8..2b97534 --- a/dist/bespoke-scale.min.js +++ b/dist/bespoke-scale.min.js @@ -1,2 +1,2 @@ -/*! bespoke-scale v1.0.1 © 2014 Mark Dalgleish, MIT License */ -!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var n;"undefined"!=typeof window?n=window:"undefined"!=typeof global?n=global:"undefined"!=typeof self&&(n=self);var t=n;t=t.bespoke||(t.bespoke={}),t=t.plugins||(t.plugins={}),t.scale=e()}}(function(){return function e(n,t,o){function r(f,s){if(!t[f]){if(!n[f]){var u="function"==typeof require&&require;if(!s&&u)return u(f,!0);if(i)return i(f,!0);throw new Error("Cannot find module '"+f+"'")}var d=t[f]={exports:{}};n[f][0].call(d.exports,function(e){var t=n[f][1][e];return r(t?t:e)},d,d.exports,e,n,t,o)}return t[f].exports}for(var i="function"==typeof require&&require,f=0;fo;o++)if(n[o]+r in t.style)return n[o]+r;return e}("transform"),l=f?function(e,n){n.style.zoom=e}:function(e,n){n.style[a]="scale("+e+")"},d=function(){var e=t.offsetWidth/i,n=t.offsetHeight/o;u.forEach(l.bind(null,Math.min(e,n)))};window.addEventListener("resize",d),d()}}},{}]},{},[1])(1)}); \ No newline at end of file diff --git a/lib/bespoke-scale.js b/lib/bespoke-scale.js index e45a209..04e08eb 100644 --- a/lib/bespoke-scale.js +++ b/lib/bespoke-scale.js @@ -17,11 +17,15 @@ module.exports = function(options) { elements = useZoom ? deck.slides : deck.slides.map(wrap), transformProperty = (function(property) { - var prefixes = 'Moz Webkit O ms'.split(' '); - return prefixes.reduce(function(currentProperty, prefix) { - return prefix + property in parent.style ? prefix + property : currentProperty; - }, property.toLowerCase()); - }('Transform')), + if (!(property in parent.style)) { + var prefix = ['webkit', 'Moz', 'ms', 'O']; + var proper = property.charAt(0).toUpperCase() + property.substr(1); + for (var i = 0, len = prefix.length; i < len; i++) { + if (prefix[i] + proper in parent.style) { return prefix[i] + proper; } + } + } + return property; + }('transform')), scale = useZoom ? function(ratio, element) { @@ -41,5 +45,4 @@ module.exports = function(options) { window.addEventListener('resize', scaleAll); scaleAll(); }; - };