diff options
| author | Ananya Sen | 2012-02-10 02:04:42 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-10 02:04:42 -0800 |
| commit | cc3d8f5dfa82cf0a3620653af7e974f7417650f9 (patch) | |
| tree | 4afe69f30f364f2011d706faced7243fb0eb6256 /js/io/system | |
| parent | ad0ee69be3512325ede94738f23597086a141a3e (diff) | |
| parent | fbe830fabe497d01f4f2eaddb867161a8187c101 (diff) | |
| download | ninja-cc3d8f5dfa82cf0a3620653af7e974f7417650f9.tar.gz | |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
js/io/document/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/io/system')
| -rwxr-xr-x | js/io/system/coreioapi.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js index f62133ac..b19f1e70 100755 --- a/js/io/system/coreioapi.js +++ b/js/io/system/coreioapi.js | |||
| @@ -323,7 +323,7 @@ window.hack = function (name, type) { | |||
| 323 | // | 323 | // |
| 324 | this._cloudDialogComponents.dialog.element.style.opacity = 1; | 324 | this._cloudDialogComponents.dialog.element.style.opacity = 1; |
| 325 | this._cloudDialogComponents.popup.element.style.opacity = 1; | 325 | this._cloudDialogComponents.popup.element.style.opacity = 1; |
| 326 | this._cloudDialogComponents.popup.element.style.margin = '-100px 0px 0px -190px'; | 326 | this._cloudDialogComponents.popup.element.style.margin = '-170px 0px 0px -190px'; |
| 327 | } | 327 | } |
| 328 | } | 328 | } |
| 329 | }, | 329 | }, |