Merge remote-tracking branch 'origin/master' into #47/range-slider-component

# Conflicts:
#	index.js
This commit is contained in:
Keegan
2016-03-12 10:27:27 +11:00
12 changed files with 109 additions and 57 deletions
+2
View File
@@ -21,4 +21,6 @@ module.exports = function() {
toggleBackground.call(coolStuffToggle);
coolStuffToggle.on('change', toggleBackground);
});
console.log('userData: ', Clay.meta.userData);
};
+3
View File
@@ -5,6 +5,9 @@ window.clayConfig = require('./config.js');
window.claySettings = {};
window.customFn = require('./custom-fn.js');
window.clayComponents = require('../src/scripts/components');
window.clayMeta = require('../test/fixture').meta({
userData: {foo: 'bar'}
});
var platform = window.navigator.userAgent.match(/Android/) ? 'android' : 'ios';
document.documentElement.classList.add('platform-' + platform);