diff options
| author | Valerio Virgillito | 2012-05-04 15:31:40 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-05-04 15:31:40 -0700 |
| commit | 3ebed34665fa73b0ce613b400f3029ebf4476439 (patch) | |
| tree | 09a3c592035030bda7bb62d1f908ce263377d74c /js/components/ui/property-control.reel | |
| parent | 8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-3ebed34665fa73b0ce613b400f3029ebf4476439.tar.gz | |
Merge branch 'refs/heads/master' into dom-architecture
Diffstat (limited to 'js/components/ui/property-control.reel')
| -rwxr-xr-x | js/components/ui/property-control.reel/property-control.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/components/ui/property-control.reel/property-control.html b/js/components/ui/property-control.reel/property-control.html index d85cb0e3..0535ea5f 100755 --- a/js/components/ui/property-control.reel/property-control.html +++ b/js/components/ui/property-control.reel/property-control.html | |||
| @@ -28,10 +28,10 @@ | |||
| 28 | </script> | 28 | </script> |
| 29 | </head> | 29 | </head> |
| 30 | <body> | 30 | <body> |
| 31 | <div id="propControl" class="propControl"> | 31 | <div data-montage-id="propControl" class="propControl"> |
| 32 | <div id="propLabel" class="prop-label"></div> | 32 | <div data-montage-id="propLabel" class="prop-label"></div> |
| 33 | <div id="propController" class="prop-controller"> | 33 | <div data-montage-id="propController" class="prop-controller"> |
| 34 | <div id="subDummy"></div> | 34 | <div data-montage-id="subDummy"></div> |
| 35 | </div> | 35 | </div> |
| 36 | </div> | 36 | </div> |
| 37 | </body> | 37 | </body> |