diff --git a/app/assets/javascripts/user/app/controllers/settings_controller.js.coffee b/app/assets/javascripts/user/app/controllers/settings_controller.js.coffee index 2968553e..4ff55a1e 100644 --- a/app/assets/javascripts/user/app/controllers/settings_controller.js.coffee +++ b/app/assets/javascripts/user/app/controllers/settings_controller.js.coffee @@ -5,6 +5,9 @@ App.SettingsController = Ember.Controller.extend if text = $('#debug-eval-string') result = eval(text) #result = JSON.stringify(result) - result = result.toString() + if result + result = result.toString() + else + result = 'null' $('.debug-info').append result $('.debug-info').append "\n" diff --git a/app/assets/javascripts/user/app/templates/settings.emblem b/app/assets/javascripts/user/app/templates/settings.emblem index ea4f76b8..8cbdfe5b 100644 --- a/app/assets/javascripts/user/app/templates/settings.emblem +++ b/app/assets/javascripts/user/app/templates/settings.emblem @@ -8,7 +8,7 @@ .display-row .display-label .display-field: a.button href="./index.html"=t 'settings.reload_application' -.row +/.row .small-8.columns: input#debug-eval-string .small-4.columns: button{action "evalDebugString"} Debug -.row: .small-12.columns: pre.panel.debug-info +/.row: .small-12.columns: pre.panel.debug-info diff --git a/app/assets/javascripts/user/app/views/application_view.js.coffee b/app/assets/javascripts/user/app/views/application_view.js.coffee index aeb692ae..2d5d94f9 100644 --- a/app/assets/javascripts/user/app/views/application_view.js.coffee +++ b/app/assets/javascripts/user/app/views/application_view.js.coffee @@ -18,4 +18,6 @@ App.ApplicationView = Ember.View.extend #ios7 detection if window.device and window.device.platform and window.device.platform.toLowerCase() is "ios" and parseFloat(window.device.version) >= 7.0 controller.set 'ios7', true - $('body').addClass 'ios7' + body = $('body') + body.addClass 'ios7' + body.append $('
').addClass("ios7-menu-panel") diff --git a/app/assets/stylesheets/user/foundation/components/_ios.css.sass b/app/assets/stylesheets/user/foundation/components/_ios.css.sass index 0cab788c..a680e436 100644 --- a/app/assets/stylesheets/user/foundation/components/_ios.css.sass +++ b/app/assets/stylesheets/user/foundation/components/_ios.css.sass @@ -8,3 +8,9 @@ body.ios7 padding-top: $ios-menu-height .main-section top: $top-menu-height + $ios-menu-height + .ios7-menu-panel + position: absolute + top: 0 + width: 100% + height: $ios-menu-height + background-color: white diff --git a/config/version b/config/version index 68a59457..37d8b0b7 100644 --- a/config/version +++ b/config/version @@ -1 +1 @@ -0.9.23 +0.9.24