Permalink
Browse files

updated the version to 0.6.0

  • Loading branch information...
1 parent 41a2953 commit 10bba35a7139e4ec40c4397d8e0cb3ba90df8032 @jejacks0n committed Jun 7, 2012
@@ -34,7 +34,7 @@
#
@Mercury ||= {}
jQuery.extend @Mercury,
- version: '0.5.0'
+ version: '0.6.0'
# Mercury object namespaces
Regions: Mercury.Regions || {}
@@ -438,7 +438,7 @@ window.Mercury = {
'[data-mercury] th { border: 1px dotted red; min-width: 6px; }' +
'[data-mercury] td { border: 1px dotted red; min-width: 6px; }' +
'[data-mercury] .mercury-textarea { border: 0; box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; resize: none; }' +
- '[data-mercury] .mercury-textarea:focus { outline: none; }'
+ '[data-mercury] .mercury-textarea:focus { outline: none; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; }'
},
// ## Silent Mode
@@ -13252,7 +13252,7 @@ Showdown.converter = function() {
this.Mercury || (this.Mercury = {});
jQuery.extend(this.Mercury, {
- version: '0.5.0',
+ version: '0.6.0',
Regions: Mercury.Regions || {},
modalHandlers: Mercury.modalHandlers || {},
lightviewHandlers: Mercury.lightviewHandlers || {},
@@ -13443,8 +13443,9 @@ Showdown.converter = function() {
throw Mercury.I18n('Mercury.PageEditor can only be instantiated once.');
}
if (!(this.options.visible === false || this.options.visible === 'false')) {
- this.visible = this.options.visible = true;
+ this.options.visible = true;
}
+ this.visible = this.options.visible;
if (!(this.options.saveDataType === false || this.options.saveDataType)) {
this.options.saveDataType = 'json';
}

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -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.5.0" within the statusbar
+ Then I should see "Mercury Editor v0.6.0" within the statusbar
View
@@ -1,3 +1,3 @@
module Mercury
- VERSION = '0.5.0'
+ VERSION = '0.6.0'
end

0 comments on commit 10bba35

Please sign in to comment.