diff options
| author | Ananya Sen | 2012-05-07 11:07:45 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-07 11:07:45 -0700 |
| commit | f6e4436b024bddae92348fc975b5fd6c4595cb61 (patch) | |
| tree | ba6af0fb032513826dc476a5b9fedbbfe6037fc0 /js/ninja.reel | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-f6e4436b024bddae92348fc975b5fd6c4595cb61.tar.gz | |
copy/paste POC
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/ninja.reel')
| -rwxr-xr-x | js/ninja.reel/ninja.html | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 52a6daa2..b955a4c9 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. |
| @@ -321,12 +321,16 @@ | |||
| 321 | "prototype": "js/controllers/code-editor-controller" | 321 | "prototype": "js/controllers/code-editor-controller" |
| 322 | }, | 322 | }, |
| 323 | 323 | ||
| 324 | "clipboardController": { | ||
| 325 | "prototype": "js/controllers/clipboard-controller[ClipboardController]" | ||
| 326 | }, | ||
| 327 | |||
| 324 | "owner": { | 328 | "owner": { |
| 325 | "prototype": "js/ninja.reel", | 329 | "prototype": "js/ninja.reel", |
| 326 | "properties": { | 330 | "properties": { |
| 327 | "element": {"#": "main"}, | 331 | "element": {"#": "main"}, |
| 328 | "rulerTop": {"#": "rulerTop"}, | 332 | "rulerTop": {"#": "rulerTop"}, |
| 329 | "rulerLeft": {"#": "rulerLeft"}, | 333 | "rulerLeft": {"#": "rulerLeft"}, |
| 330 | "appModel": {"@": "appModel"}, | 334 | "appModel": {"@": "appModel"}, |
| 331 | "toolsData": {"@": "toolsData1"}, | 335 | "toolsData": {"@": "toolsData1"}, |
| 332 | "toolsList": {"@": "toolsList1"}, | 336 | "toolsList": {"@": "toolsList1"}, |
| @@ -340,10 +344,10 @@ | |||
| 340 | "popupManager": {"@": "popupManager1"}, | 344 | "popupManager": {"@": "popupManager1"}, |
| 341 | "colorController": {"@": "colorController1"}, | 345 | "colorController": {"@": "colorController1"}, |
| 342 | "stylesController": {"@": "stylesController"}, | 346 | "stylesController": {"@": "stylesController"}, |
| 343 | "presetsController": {"@": "presetsController"}, | 347 | "presetsController": {"@": "presetsController"}, |
| 344 | "filePickerController": {"@": "filePickerController"}, | 348 | "filePickerController": {"@": "filePickerController"}, |
| 345 | "newFileController": {"@": "newFileController"}, | 349 | "newFileController": {"@": "newFileController"}, |
| 346 | "coreIoApi": {"@": "coreIoApi1"}, | 350 | "coreIoApi": {"@": "coreIoApi1"}, |
| 347 | "documentBar": {"@": "documentBar"}, | 351 | "documentBar": {"@": "documentBar"}, |
| 348 | "editorViewOptions": {"@": "editorViewOptions"}, | 352 | "editorViewOptions": {"@": "editorViewOptions"}, |
| 349 | "ioMediator": {"@": "ioMediator"}, | 353 | "ioMediator": {"@": "ioMediator"}, |
| @@ -354,7 +358,8 @@ | |||
| 354 | "panelSplitter": {"@": "splitter3"}, | 358 | "panelSplitter": {"@": "splitter3"}, |
| 355 | "timelineSplitter": {"@": "splitter4"}, | 359 | "timelineSplitter": {"@": "splitter4"}, |
| 356 | "toolsSplitter": {"@": "splitter2"}, | 360 | "toolsSplitter": {"@": "splitter2"}, |
| 357 | "optionsSplitter": {"@": "splitter1"} | 361 | "optionsSplitter": {"@": "splitter1"}, |
| 362 | "clipboardController": {"@": "clipboardController"} | ||
| 358 | } | 363 | } |
| 359 | } | 364 | } |
| 360 | } | 365 | } |