diff options
author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /node_modules/montage/ui/loading.reel/loading.js | |
parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/loading.reel/loading.js')
-rwxr-xr-x | node_modules/montage/ui/loading.reel/loading.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/node_modules/montage/ui/loading.reel/loading.js b/node_modules/montage/ui/loading.reel/loading.js index f0574d72..7ad180da 100755 --- a/node_modules/montage/ui/loading.reel/loading.js +++ b/node_modules/montage/ui/loading.reel/loading.js | |||
@@ -37,7 +37,8 @@ var Loading = exports.Loading = Montage.create(Component,/** @lends module:"mont | |||
37 | this._loading = isloading; | 37 | this._loading = isloading; |
38 | this.needsDraw = true; | 38 | this.needsDraw = true; |
39 | } | 39 | } |
40 | } | 40 | }, |
41 | serializable: true | ||
41 | }, | 42 | }, |
42 | /** | 43 | /** |
43 | Description TODO | 44 | Description TODO |