From c48eeb01bd726895dc577d8b843b2a75883eee07 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 10 Feb 2012 16:03:52 -0800
Subject: Merge from /joseeight/ninja-internal/tree/FileIO

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/stage/stage.reel/stage.html | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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

diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index f28d9800..9ed0f636 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -42,6 +42,14 @@
                     }
                 }
             },
+
+            "textTool": {
+                "module": "node_modules/labs/rich-text-editor.reel",
+                "name": "RichTextEditor",
+                "properties": {
+                    "element" : {"#": "textToolObject"}
+                }
+            },
             
             "owner": {
                 "module": "js/stage/stage.reel",
@@ -54,7 +62,8 @@
                     "_drawingCanvas":  {"#": "drawingCanvas"},
                     "stageDeps": {"@": "StageDeps1"},
                     "layout":   {"@": "layout1"},
-					"stageView": {"@": "stageView"}
+					"stageView": {"@": "stageView"},
+                    "textTool": {"@": "textTool"}
                 },
                 "bindings": {
                     "currentDocumentStageView": {
@@ -73,6 +82,7 @@
     <section id="stageAndScenesContainer" class="stageAndScenesContainer">
         <section id="stageView"></section>
         <section id="iframeContainer"></section>
+        <section id="textToolObject">asdasd asd asd asd asd asd </section>
         <canvas id="layoutCanvas"></canvas>
         <canvas id="stageCanvas"></canvas>
         <canvas id="drawingCanvas"></canvas>
-- 
cgit v1.2.3