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

# Conflicts:
#	index.js
This commit is contained in:
Keegan committed 2016-03-12 10:27:27 +11:00
commit 6f92c0d267
12 files changed
+109 -57

No files matched your search

+1 -1
View File
@@ -59,7 +59,7 @@ function ClayItem(config) {
};
// attach event methods
ClayEvents.call(self, self.$element);
ClayEvents.call(self, self.$manipulatorTarget);
// attach the manipulator methods to the clayItem
_.eachObj(_component.manipulator, function(methodName, method) {
@@ -8,7 +8,6 @@
type="checkbox"
value="{{this.value}}"
name="clay-{{clayId}}"
data-manipulator-target
{{each key: attributes}}{{key}}="{{this}}"{{/each}}
/>
<i></i>
-1
View File
@@ -8,7 +8,6 @@
type="radio"
value="{{this.value}}"
name="clay-{{clayId}}"
data-manipulator-target
{{each key: attributes}}{{key}}="{{this}}"{{/each}}
/>
<i></i>