diff options
| author | Ananya Sen | 2012-02-18 18:49:45 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-18 18:49:45 -0800 |
| commit | 8fdce771bfcf662cf1acc16d45e4361ffd06c53e (patch) | |
| tree | 4ac283e0e7724e5ede21c1a1e97d121033578c72 /js/controllers | |
| parent | c2a5918480adae0124e1dc2531c019562f1e3e60 (diff) | |
| parent | e23708721a71ca4c71365f5f8e8ac7d6113926db (diff) | |
| download | ninja-8fdce771bfcf662cf1acc16d45e4361ffd06c53e.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/controllers')
| -rwxr-xr-x | js/controllers/document-controller.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index df3c74f8..57289448 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
| @@ -59,10 +59,12 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
| 59 | this.eventManager.addEventListener("executeNewFile", this, false); | 59 | this.eventManager.addEventListener("executeNewFile", this, false); |
| 60 | this.eventManager.addEventListener("executeSave", this, false); | 60 | this.eventManager.addEventListener("executeSave", this, false); |
| 61 | 61 | ||
| 62 | this.eventManager.addEventListener("recordStyleChanged", this, false); | 62 | this.eventManager.addEventListener("recordStyleChanged", this, false); |
| 63 | |||
| 63 | } | 64 | } |
| 64 | }, | 65 | }, |
| 65 | 66 | ||
| 67 | |||
| 66 | 68 | ||
| 67 | handleWebRequest: { | 69 | handleWebRequest: { |
| 68 | value: function (request) { | 70 | value: function (request) { |