aboutsummaryrefslogtreecommitdiff
path: root/js/components/gradientpicker.reel
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/gradientpicker.reel
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/gradientpicker.reel')
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.html7
1 files changed, 3 insertions, 4 deletions
diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html
index f71c6705..b0e23653 100755
--- a/js/components/gradientpicker.reel/gradientpicker.html
+++ b/js/components/gradientpicker.reel/gradientpicker.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- 2<!--
3 <copyright> 3 <copyright>
4 This file contains proprietary software owned by Motorola Mobility, Inc. 4 This file contains proprietary software owned by Motorola Mobility, Inc.
@@ -16,8 +16,7 @@
16 <script type="text/montage-serialization"> 16 <script type="text/montage-serialization">
17 { 17 {
18 "owner": { 18 "owner": {
19 "module": "js/components/gradientpicker.reel", 19 "prototype": "js/components/gradientpicker.reel[GradientPicker]",
20 "name": "GradientPicker",
21 "properties": { 20 "properties": {
22 "element": {"#": "gradientpicker"} 21 "element": {"#": "gradientpicker"}
23 22
@@ -30,7 +29,7 @@
30 29
31 <body> 30 <body>
32 31
33 <div id="gradientpicker" class="gradientpicker"> 32 <div data-montage-id="gradientpicker" class="gradientpicker">
34 33
35 <div class="type"> 34 <div class="type">
36 <input type="radio" class="cp_gp_linear radio" name="gradient" value="linear" id="cp_gp_linear" checked="like a boss"/><label for="cp_gp_linear">Linear Gradient</label> 35 <input type="radio" class="cp_gp_linear radio" name="gradient" value="linear" id="cp_gp_linear" checked="like a boss"/><label for="cp_gp_linear">Linear Gradient</label>