From f6e4436b024bddae92348fc975b5fd6c4595cb61 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 7 May 2012 11:07:45 -0700
Subject: 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>
---
 js/ninja.reel/ninja.html | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'js/ninja.reel/ninja.html')
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 @@
-﻿<!DOCTYPE html>
+<!DOCTYPE html>
 
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.
@@ -321,12 +321,16 @@
                 "prototype": "js/controllers/code-editor-controller"
             },
 
+            "clipboardController": {
+                "prototype": "js/controllers/clipboard-controller[ClipboardController]"
+            },
+
             "owner": {
                 "prototype": "js/ninja.reel",
                 "properties": {
                     "element":              {"#": "main"},
-                    "rulerTop":        		{"#": "rulerTop"},
-                    "rulerLeft":        	{"#": "rulerLeft"},
+                    "rulerTop":             {"#": "rulerTop"},
+                    "rulerLeft":            {"#": "rulerLeft"},
                     "appModel":             {"@": "appModel"},
                     "toolsData":            {"@": "toolsData1"},
                     "toolsList":            {"@": "toolsList1"},
@@ -340,10 +344,10 @@
                     "popupManager":         {"@": "popupManager1"},
 					"colorController":      {"@": "colorController1"},
                     "stylesController":     {"@": "stylesController"},
-                    "presetsController":     {"@": "presetsController"},
+                    "presetsController":    {"@": "presetsController"},
                     "filePickerController": {"@": "filePickerController"},
                     "newFileController":    {"@": "newFileController"},
-                    "coreIoApi":    		{"@": "coreIoApi1"},
+                    "coreIoApi":            {"@": "coreIoApi1"},
                     "documentBar":          {"@": "documentBar"},
                     "editorViewOptions":    {"@": "editorViewOptions"},
                     "ioMediator":           {"@": "ioMediator"},
@@ -354,7 +358,8 @@
                     "panelSplitter":        {"@": "splitter3"},
                     "timelineSplitter":     {"@": "splitter4"},
                     "toolsSplitter":        {"@": "splitter2"},
-                    "optionsSplitter":      {"@": "splitter1"}
+                    "optionsSplitter":      {"@": "splitter1"},
+                    "clipboardController":  {"@": "clipboardController"}
                 }
             }
         }
-- 
cgit v1.2.3


From 47be0919aa271e97fd7ca86e65cdf93aeee2bf81 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 21 Jun 2012 11:46:10 -0700
Subject: removed some redundants

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/ninja.reel/ninja.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/ninja.reel/ninja.html')

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 2a271d7e..beae59d9 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -359,7 +359,7 @@
             },
 
             "clipboardController": {
-                "prototype": "js/controllers/clipboard-controller[ClipboardController]"
+                "prototype": "js/controllers/clipboard-controller"
             },
 
             "owner": {
-- 
cgit v1.2.3

