diff options
| author | Armen Kesablyan | 2012-06-25 11:14:40 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-25 11:14:40 -0700 |
| commit | 446f475c35e3d0d5d6cb6ca35346e548de6c36f9 (patch) | |
| tree | 0b7e7154979754db2c0ebb7b7908c555068d515d /js/ninja.reel | |
| parent | 7867aec2620b65605180979b5049cfa154ca7dd1 (diff) | |
| parent | 35aebe8d72ccfa9ea010eb79c09ecf89cc1ed44d (diff) | |
| download | ninja-446f475c35e3d0d5d6cb6ca35346e548de6c36f9.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/ninja.reel')
| -rwxr-xr-x | js/ninja.reel/ninja.html | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 0a959812..a94d670c 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.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. |
| @@ -366,12 +366,16 @@ | |||
| 366 | } | 366 | } |
| 367 | }, | 367 | }, |
| 368 | 368 | ||
| 369 | "clipboardController": { | ||
| 370 | "prototype": "js/controllers/clipboard-controller" | ||
| 371 | }, | ||
| 372 | |||
| 369 | "owner": { | 373 | "owner": { |
| 370 | "prototype": "js/ninja.reel", | 374 | "prototype": "js/ninja.reel", |
| 371 | "properties": { | 375 | "properties": { |
| 372 | "element": {"#": "main"}, | 376 | "element": {"#": "main"}, |
| 373 | "rulerTop": {"#": "rulerTop"}, | 377 | "rulerTop": {"#": "rulerTop"}, |
| 374 | "rulerLeft": {"#": "rulerLeft"}, | 378 | "rulerLeft": {"#": "rulerLeft"}, |
| 375 | "appModel": {"@": "appModel"}, | 379 | "appModel": {"@": "appModel"}, |
| 376 | "toolsData": {"@": "toolsData1"}, | 380 | "toolsData": {"@": "toolsData1"}, |
| 377 | "toolsList": {"@": "toolsList"}, | 381 | "toolsList": {"@": "toolsList"}, |
| @@ -385,10 +389,10 @@ | |||
| 385 | "popupManager": {"@": "popupManager1"}, | 389 | "popupManager": {"@": "popupManager1"}, |
| 386 | "colorController": {"@": "colorController1"}, | 390 | "colorController": {"@": "colorController1"}, |
| 387 | "stylesController": {"@": "stylesController"}, | 391 | "stylesController": {"@": "stylesController"}, |
| 388 | "presetsController": {"@": "presetsController"}, | 392 | "presetsController": {"@": "presetsController"}, |
| 389 | "filePickerController": {"@": "filePickerController"}, | 393 | "filePickerController": {"@": "filePickerController"}, |
| 390 | "newFileController": {"@": "newFileController"}, | 394 | "newFileController": {"@": "newFileController"}, |
| 391 | "coreIoApi": {"@": "coreIoApi1"}, | 395 | "coreIoApi": {"@": "coreIoApi1"}, |
| 392 | "documentBar": {"@": "documentBar"}, | 396 | "documentBar": {"@": "documentBar"}, |
| 393 | "editorViewOptions": {"@": "editorViewOptions"}, | 397 | "editorViewOptions": {"@": "editorViewOptions"}, |
| 394 | "ioMediator": {"@": "ioMediator"}, | 398 | "ioMediator": {"@": "ioMediator"}, |
| @@ -401,6 +405,7 @@ | |||
| 401 | "timelineSplitter": {"@": "splitter4"}, | 405 | "timelineSplitter": {"@": "splitter4"}, |
| 402 | "toolsSplitter": {"@": "splitter2"}, | 406 | "toolsSplitter": {"@": "splitter2"}, |
| 403 | "optionsSplitter": {"@": "splitter1"}, | 407 | "optionsSplitter": {"@": "splitter1"}, |
| 408 | "clipboardController": {"@": "clipboardController"}, | ||
| 404 | "documentList": {"@": "documentList"} | 409 | "documentList": {"@": "documentList"} |
| 405 | } | 410 | } |
| 406 | } | 411 | } |