diff options
author | Ananya Sen | 2012-06-13 16:36:39 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-13 16:36:39 -0700 |
commit | 8e5cfac34edc9772ba89e0206890c23afa0a6fcc (patch) | |
tree | 8778ace5e072d86cc43d7930fc880bbc3648f3dd | |
parent | 41cd3496b403962179c2f497199b5ffa97061c80 (diff) | |
download | ninja-8e5cfac34edc9772ba89e0206890c23afa0a6fcc.tar.gz |
- Eric Guzman's styles-controller fix for relatively positioned
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
-rwxr-xr-x | js/controllers/styles-controller.js | 2 | ||||
-rw-r--r-- | js/mediators/io-mediator.js | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js index 8ab07b20..1c1e75ed 100755 --- a/js/controllers/styles-controller.js +++ b/js/controllers/styles-controller.js | |||
@@ -1077,7 +1077,7 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
1077 | } | 1077 | } |
1078 | 1078 | ||
1079 | ///// Did we find a dominant rule? | 1079 | ///// Did we find a dominant rule? |
1080 | else if(!dominantRule) { | 1080 | if(!dominantRule) { |
1081 | ///// No. This means there was no rule with this property, and no | 1081 | ///// No. This means there was no rule with this property, and no |
1082 | ///// single-target rule we can use to add the style to. | 1082 | ///// single-target rule we can use to add the style to. |
1083 | ///// There's is no chance of colliding with another rule, so we | 1083 | ///// There's is no chance of colliding with another rule, so we |
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js index c487fef5..c9ea0468 100644 --- a/js/mediators/io-mediator.js +++ b/js/mediators/io-mediator.js | |||
@@ -205,9 +205,15 @@ exports.IoMediator = Montage.create(Component, { | |||
205 | value: function (file, callback) { | 205 | value: function (file, callback) { |
206 | //TODO: Implement Delete functionality | 206 | //TODO: Implement Delete functionality |
207 | } | 207 | } |
208 | } | 208 | }, |
209 | //////////////////////////////////////////////////////////////////// | 209 | //////////////////////////////////////////////////////////////////// |
210 | //////////////////////////////////////////////////////////////////// | 210 | //////////////////////////////////////////////////////////////////// |
211 | createFileFromBinary:{ | ||
212 | enumerable: false, | ||
213 | value: function(blob, filename){ | ||
214 | |||
215 | } | ||
216 | } | ||
211 | }); | 217 | }); |
212 | //////////////////////////////////////////////////////////////////////// | 218 | //////////////////////////////////////////////////////////////////////// |
213 | //////////////////////////////////////////////////////////////////////// \ No newline at end of file | 219 | //////////////////////////////////////////////////////////////////////// \ No newline at end of file |