diff options
| author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
| commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
| tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/components/popup.reel/popup.html | |
| parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
| parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
| download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz | |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/components/popup.reel/popup.html')
| -rwxr-xr-x | js/components/popup.reel/popup.html | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/js/components/popup.reel/popup.html b/js/components/popup.reel/popup.html index cc31106e..2262289c 100755 --- a/js/components/popup.reel/popup.html +++ b/js/components/popup.reel/popup.html | |||
| @@ -16,7 +16,9 @@ | |||
| 16 | "owner": { | 16 | "owner": { |
| 17 | "prototype": "js/components/Popup.reel", | 17 | "prototype": "js/components/Popup.reel", |
| 18 | "properties": { | 18 | "properties": { |
| 19 | "element": {"#": "default_popup"} | 19 | "element": {"#": "default_popup"}, |
| 20 | "popupTooltip": {"#": "tooltip"}, | ||
| 21 | "popupContent": {"#": "content"} | ||
| 20 | } | 22 | } |
| 21 | } | 23 | } |
| 22 | } | 24 | } |
| @@ -27,8 +29,8 @@ | |||
| 27 | <body> | 29 | <body> |
| 28 | 30 | ||
| 29 | <div data-montage-id="default_popup" class="default_popup"> | 31 | <div data-montage-id="default_popup" class="default_popup"> |
| 30 | <div class="tooltip"><span/></div> | 32 | <div data-montage-id="tooltip" class="tooltip"><span/></div> |
| 31 | <div class="content"></div> | 33 | <div data-montage-id="content" class="content"></div> |
| 32 | </div> | 34 | </div> |
| 33 | 35 | ||
| 34 | </body> | 36 | </body> |