aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorAnanya Sen2012-02-15 09:58:37 -0800
committerAnanya Sen2012-02-15 09:58:37 -0800
commita90e3be8850b64e8e370aa8ff8cadaa448dd0c82 (patch)
treee47dbf5dfd4a3e466cc97acbce21262b24cf89e7 /js/controllers
parent9048cd50bf5e0a418d1d95498bb593961f72db36 (diff)
downloadninja-a90e3be8850b64e8e370aa8ff8cadaa448dd0c82.tar.gz
Revert "Cleaning up"
This reverts commit a7952c5a16e2cae3fd1a459b03b9f16bba1004da. Conflicts: js/controllers/document-controller.js js/io/document/text-document.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/document-controller.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 25f60cc5..9ece27f9 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -9,8 +9,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
9var Montage = require("montage/core/core").Montage, 9var Montage = require("montage/core/core").Montage,
10 Component = require("montage/ui/component").Component, 10 Component = require("montage/ui/component").Component,
11 Uuid = require("montage/core/uuid").Uuid, 11 Uuid = require("montage/core/uuid").Uuid,
12 HTMLDocument = require("js/document/models/html-document").HTMLDocument, 12 HTMLDocument = require("js/io/document/html-document").HTMLDocument,
13 BaseDocument = require("js/document/models/base-document").BaseDocument, 13 TextDocument = require("js/io/document/text-document").TextDocument,
14 DocumentController; 14 DocumentController;
15//////////////////////////////////////////////////////////////////////// 15////////////////////////////////////////////////////////////////////////
16// 16//