aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Panel.reel
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/Panel.reel
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/Panel.reel')
-rwxr-xr-xjs/panels/Panel.reel/Panel.html6
-rwxr-xr-xjs/panels/Panel.reel/Panel.js2
2 files changed, 4 insertions, 4 deletions
diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html
index c6c4f4b3..eb314b31 100755
--- a/js/panels/Panel.reel/Panel.html
+++ b/js/panels/Panel.reel/Panel.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
31<html lang="en"> 31<html lang="en">
32<head> 32<head>
33 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 33 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
34 34
35 <script type="text/montage-serialization"> 35 <script type="text/montage-serialization">
36 { 36 {
37 "Resizer": { 37 "Resizer": {
@@ -157,7 +157,7 @@ POSSIBILITY OF SUCH DAMAGE.
157 } 157 }
158 </script> 158 </script>
159 159
160 </head> 160 </head>
161<body> 161<body>
162 162
163<article data-montage-id="panel" class="panel" draggable="draggable"> 163<article data-montage-id="panel" class="panel" draggable="draggable">
diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js
index 6de011ed..921292e6 100755
--- a/js/panels/Panel.reel/Panel.js
+++ b/js/panels/Panel.reel/Panel.js
@@ -37,7 +37,7 @@ exports.Panel = Montage.create(Component, {
37 value: "Panel" 37 value: "Panel"
38 }, 38 },
39 39
40 groups: { 40 groups: {
41 value: [] 41 value: []
42 }, 42 },
43 43