diff options
| author | Jose Antonio Marquez | 2012-06-21 16:53:46 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-21 16:53:46 -0700 |
| commit | 9a568f56b2684e268975231544a80db78497db02 (patch) | |
| tree | 5e76e47dbec5e5581c9d96beb312c6bbeb910082 /js/ninja.reel/ninja.html | |
| parent | 1e9af08f42e4ba18fc8c5a8501d8cbecec0f4fe8 (diff) | |
| parent | 2af33f19de48bb8fe269c51ceddd1bc1f591651f (diff) | |
| download | ninja-9a568f56b2684e268975231544a80db78497db02.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/ninja.reel/ninja.html')
| -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 405f57da..beae59d9 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. |
| @@ -358,12 +358,16 @@ | |||
| 358 | } | 358 | } |
| 359 | }, | 359 | }, |
| 360 | 360 | ||
| 361 | "clipboardController": { | ||
| 362 | "prototype": "js/controllers/clipboard-controller" | ||
| 363 | }, | ||
| 364 | |||
| 361 | "owner": { | 365 | "owner": { |
| 362 | "prototype": "js/ninja.reel", | 366 | "prototype": "js/ninja.reel", |
| 363 | "properties": { | 367 | "properties": { |
| 364 | "element": {"#": "main"}, | 368 | "element": {"#": "main"}, |
| 365 | "rulerTop": {"#": "rulerTop"}, | 369 | "rulerTop": {"#": "rulerTop"}, |
| 366 | "rulerLeft": {"#": "rulerLeft"}, | 370 | "rulerLeft": {"#": "rulerLeft"}, |
| 367 | "appModel": {"@": "appModel"}, | 371 | "appModel": {"@": "appModel"}, |
| 368 | "toolsData": {"@": "toolsData1"}, | 372 | "toolsData": {"@": "toolsData1"}, |
| 369 | "toolsList": {"@": "toolsList"}, | 373 | "toolsList": {"@": "toolsList"}, |
| @@ -377,10 +381,10 @@ | |||
| 377 | "popupManager": {"@": "popupManager1"}, | 381 | "popupManager": {"@": "popupManager1"}, |
| 378 | "colorController": {"@": "colorController1"}, | 382 | "colorController": {"@": "colorController1"}, |
| 379 | "stylesController": {"@": "stylesController"}, | 383 | "stylesController": {"@": "stylesController"}, |
| 380 | "presetsController": {"@": "presetsController"}, | 384 | "presetsController": {"@": "presetsController"}, |
| 381 | "filePickerController": {"@": "filePickerController"}, | 385 | "filePickerController": {"@": "filePickerController"}, |
| 382 | "newFileController": {"@": "newFileController"}, | 386 | "newFileController": {"@": "newFileController"}, |
| 383 | "coreIoApi": {"@": "coreIoApi1"}, | 387 | "coreIoApi": {"@": "coreIoApi1"}, |
| 384 | "documentBar": {"@": "documentBar"}, | 388 | "documentBar": {"@": "documentBar"}, |
| 385 | "editorViewOptions": {"@": "editorViewOptions"}, | 389 | "editorViewOptions": {"@": "editorViewOptions"}, |
| 386 | "ioMediator": {"@": "ioMediator"}, | 390 | "ioMediator": {"@": "ioMediator"}, |
| @@ -392,6 +396,7 @@ | |||
| 392 | "timelineSplitter": {"@": "splitter4"}, | 396 | "timelineSplitter": {"@": "splitter4"}, |
| 393 | "toolsSplitter": {"@": "splitter2"}, | 397 | "toolsSplitter": {"@": "splitter2"}, |
| 394 | "optionsSplitter": {"@": "splitter1"}, | 398 | "optionsSplitter": {"@": "splitter1"}, |
| 399 | "clipboardController": {"@": "clipboardController"}, | ||
| 395 | "documentList": {"@": "documentList"} | 400 | "documentList": {"@": "documentList"} |
| 396 | } | 401 | } |
| 397 | } | 402 | } |