Permalink
Browse files

minor bug fixes, and v0.7.1 bump.

  • Loading branch information...
1 parent 543d83a commit e0c6ad948f472adb0710b2c1906cc8bca46c6862 @jejacks0n committed Jun 12, 2012
View
@@ -148,7 +148,7 @@ you'll write in what you want.
### For Non-Rails Environments
-[Download the zip file](https://github.com/downloads/jejacks0n/mercury/mercury-v0.7.0.zip), and then follow the
+[Download the zip file](https://github.com/downloads/jejacks0n/mercury/mercury-v0.7.1.zip), and then follow the
installation instructions on the [wiki article](https://github.com/jejacks0n/mercury/wiki/Using-Mercury-without-Rails).
@@ -34,7 +34,7 @@
#
@Mercury ||= {}
jQuery.extend @Mercury,
- version: '0.7.0'
+ version: '0.7.1'
# Mercury object namespaces
Regions: Mercury.Regions || {}
@@ -148,14 +148,14 @@ class @Mercury.PageEditor
@statusbar.hide()
Mercury.trigger('mode', {mode: 'preview'}) unless @previewing
@previewing = true
+ @resize()
else
@visible = true
@iframe.animate({top: @toolbar.height(true)}, 200, 'easeInOutSine', => @resize())
@toolbar.show()
@statusbar.show()
Mercury.trigger('mode', {mode: 'preview'})
@previewing = false
- @resize()
resize: ->
@@ -147,14 +147,15 @@
/* table */
#mercury_table #table_display {
float: left;
- width: 225px;
- height: 259px;
- padding: 10px;
margin-right: 13px;
overflow: auto;
+ padding: 0;
}
#mercury_table #table_display .controls {
margin: 0;
+ width: 225px;
+ height: 259px;
+ padding: 10px;
}
#mercury_table #table_display table {
width: 100%;
@@ -13253,7 +13253,7 @@ Showdown.converter = function() {
this.Mercury || (this.Mercury = {});
jQuery.extend(this.Mercury, {
- version: '0.7.0',
+ version: '0.7.1',
Regions: Mercury.Regions || {},
modalHandlers: Mercury.modalHandlers || {},
lightviewHandlers: Mercury.lightviewHandlers || {},
@@ -13661,6 +13661,7 @@ Showdown.converter = function() {
});
}
this.previewing = true;
+ return this.resize();
} else {
this.visible = true;
this.iframe.animate({
@@ -13673,9 +13674,8 @@ Showdown.converter = function() {
Mercury.trigger('mode', {
mode: 'preview'
});
- this.previewing = false;
+ return this.previewing = false;
}
- return this.resize();
};
PageEditor.prototype.resize = function() {
Oops, something went wrong.
@@ -332,8 +332,8 @@
#mercury_html_editor textarea { resize: none; padding: 0; box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; margin: 0 0 -2px 0; border: 2px solid #CCC; width: 100%; }
#mercury_character .character { float: left; width: 20px; height: 20px; border: 1px solid #999; background: #FFF; margin: 0 2px 2px 0; text-align: center; font-size: 11pt; line-height: 23px; cursor: pointer; }
#mercury_character .character:hover { position: relative; margin: -11px -5px 1px -5px; width: 32px; height: 32px; font-size: 19pt; line-height: 35px; background: #DDD; }
- #mercury_table #table_display { float: left; width: 225px; height: 259px; padding: 10px; margin-right: 13px; overflow: auto; }
- #mercury_table #table_display .controls { margin: 0; }
+ #mercury_table #table_display { float: left; margin-right: 13px; overflow: auto; padding: 0; }
+ #mercury_table #table_display .controls { margin: 0; width: 225px; height: 259px; padding: 10px; }
#mercury_table #table_display table { width: 100%; height: 100%; }
#mercury_table #table_display .selected { background: #09F; }
.mercury-statusbar { position: fixed; -webkit-user-select: none; -moz-user-select: none; user-select: none; box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; z-index: 10020; bottom: 0; left: 0; width: 100%; height: 23px; cursor: default; padding: 0 10px; background: #E2E1E2; border-top: 1px solid #727272; font-family: Helvetica, Tahoma, Arial, sans-serif; font-size: 8.5pt; line-height: 23px; color: #222; }
@@ -1967,14 +1967,15 @@ label input[type=radio] {
/* table */
#mercury_table #table_display {
float: left;
- width: 225px;
- height: 259px;
- padding: 10px;
margin-right: 13px;
overflow: auto;
+ padding: 0;
}
#mercury_table #table_display .controls {
margin: 0;
+ width: 225px;
+ height: 259px;
+ padding: 10px;
}
#mercury_table #table_display table {
width: 100%;
@@ -21,5 +21,5 @@ Feature:
# Latest selenium webdriver seems to consider the lightview hidden
@use_hidden_elements
Scenario: A user can expect to see the status bar
- Then I should see "Mercury Editor v0.7.0" within the statusbar
+ Then I should see "Mercury Editor v0.7.1" within the statusbar
@@ -1,3 +1,3 @@
module Mercury
- VERSION = '0.7.0'
+ VERSION = '0.7.1'
end

0 comments on commit e0c6ad9

Please sign in to comment.