markitup-rails 1.1.2 → 1.1.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (15) hide show
  1. data/README.md +2 -0
  2. data/lib/markitup/rails/version.rb +1 -1
  3. data/vendor/assets/javascripts/markitup/sets/bbcode/set.js +1 -1
  4. data/vendor/assets/javascripts/markitup/sets/css/set.js +1 -1
  5. data/vendor/assets/javascripts/markitup/sets/dotclear/set.js +1 -1
  6. data/vendor/assets/javascripts/markitup/sets/html/set.js +1 -1
  7. data/vendor/assets/javascripts/markitup/sets/markdown/set.js +1 -1
  8. data/vendor/assets/javascripts/markitup/sets/markmin/set.js +1 -1
  9. data/vendor/assets/javascripts/markitup/sets/rest/set.js +1 -1
  10. data/vendor/assets/javascripts/markitup/sets/textile/set.js +1 -1
  11. data/vendor/assets/javascripts/markitup/sets/texy/set.js +1 -1
  12. data/vendor/assets/javascripts/markitup/sets/txt2tags/set.js +1 -1
  13. data/vendor/assets/javascripts/markitup/sets/wiki/set.js +1 -1
  14. data/vendor/assets/javascripts/markitup/sets/xbbcode/set.js +1 -1
  15. metadata +2 -2
data/README.md CHANGED
@@ -185,6 +185,8 @@ Many thanks go to the following who have contributed to making this gem even bet
185
185
  * fix invalid images url in simple skin
186
186
  * **[@tamaloa](https://github.com/tamaloa)**
187
187
  * added default /markitup/preview path to all default settings
188
+ * **[@tgjones](https://github.com/tgjones)**
189
+ * allow multiple settings objects to be used within a single page
188
190
 
189
191
 
190
192
  ## License
data/lib/markitup/rails/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Markitup
2
2
  module Rails
3
- VERSION = "1.1.2"
3
+ VERSION = "1.1.3"
4
4
  end
5
5
  end
data/vendor/assets/javascripts/markitup/sets/bbcode/set.js CHANGED
@@ -9,7 +9,7 @@
9
9
  // ----------------------------------------------------------------------------
10
10
  // Feel free to add more tags
11
11
  // ----------------------------------------------------------------------------
12
- mySettings = {
12
+ mySettings = bbcodeSettings = {
13
13
  previewParserPath: "/markitup/preview", // path to your BBCode parser
14
14
  markupSet: [
15
15
  {name:'Bold', key:'B', openWith:'[b]', closeWith:'[/b]'},
data/vendor/assets/javascripts/markitup/sets/css/set.js CHANGED
@@ -11,7 +11,7 @@
11
11
  // ----------------------------------------------------------------------------
12
12
  // Basic CSS set. Feel free to add more tags
13
13
  // ----------------------------------------------------------------------------
14
- mySettings = {
14
+ mySettings = cssSettings = {
15
15
  onEnter: {},
16
16
  onShiftEnter: {keepDefault:false, placeHolder:'Your comment here', openWith:'\n\/* ', closeWith:' *\/'},
17
17
  onCtrlEnter: {keepDefault:false, placeHolder:"classname", openWith:'\n.', closeWith:' { \n'},
data/vendor/assets/javascripts/markitup/sets/dotclear/set.js CHANGED
@@ -8,7 +8,7 @@
8
8
  // -------------------------------------------------------------------
9
9
  // Feel free to add more tags
10
10
  // -------------------------------------------------------------------
11
- mySettings = {
11
+ mySettings = dotclearSettings = {
12
12
  previewParserPath: "/markitup/preview", // path to your DotClear parser
13
13
  onShiftEnter: {keepDefault:false, replaceWith:'%%%\n'},
14
14
  onCtrlEnter: {keepDefault:false, replaceWith:'\n\n'},
data/vendor/assets/javascripts/markitup/sets/html/set.js CHANGED
@@ -9,7 +9,7 @@
9
9
  // ----------------------------------------------------------------------------
10
10
  // Basic set. Feel free to add more tags
11
11
  // ----------------------------------------------------------------------------
12
- mySettings = {
12
+ mySettings = htmlSettings = {
13
13
  onShiftEnter: {keepDefault:false, replaceWith:'<br />\n'},
14
14
  onCtrlEnter: {keepDefault:false, openWith:'\n<p>', closeWith:'</p>\n'},
15
15
  onTab: {keepDefault:false, openWith:' '},
data/vendor/assets/javascripts/markitup/sets/markdown/set.js CHANGED
@@ -10,7 +10,7 @@
10
10
  // -------------------------------------------------------------------
11
11
  // Feel free to add more tags
12
12
  // -------------------------------------------------------------------
13
- mySettings = {
13
+ mySettings = markdownSettings = {
14
14
  previewParserPath: "/markitup/preview",
15
15
  onShiftEnter: {keepDefault:false, openWith:'\n\n'},
16
16
  markupSet: [
data/vendor/assets/javascripts/markitup/sets/markmin/set.js CHANGED
@@ -11,7 +11,7 @@
11
11
  // -------------------------------------------------------------------
12
12
  // Feel free to add more tags
13
13
  // -------------------------------------------------------------------
14
- mySettings = {
14
+ mySettings = markminSettings = {
15
15
  previewParserPath: "/markitup/preview",
16
16
  onShiftEnter: {keepDefault:false, openWith:'\n\n'},
17
17
  markupSet: [
data/vendor/assets/javascripts/markitup/sets/rest/set.js CHANGED
@@ -12,7 +12,7 @@
12
12
  // -------------------------------------------------------------------
13
13
  // Feel free to add more tags
14
14
  // -------------------------------------------------------------------
15
- mySettings = {
15
+ mySettings = restSettings = {
16
16
  previewParserPath: "/markitup/preview",
17
17
  onShiftEnter: {keepDefault:false, replaceWith:'\n\n'},
18
18
  markupSet: [
data/vendor/assets/javascripts/markitup/sets/textile/set.js CHANGED
@@ -10,7 +10,7 @@
10
10
  // -------------------------------------------------------------------
11
11
  // Feel free to add more tags
12
12
  // -------------------------------------------------------------------
13
- mySettings = {
13
+ mySettings = textileSettings = {
14
14
  previewParserPath: "/markitup/preview",
15
15
  onShiftEnter: {keepDefault:false, replaceWith:'\n\n'},
16
16
  markupSet: [
data/vendor/assets/javascripts/markitup/sets/texy/set.js CHANGED
@@ -11,7 +11,7 @@
11
11
  // http://texy.info
12
12
  // Feel free to do anything with this.
13
13
  // -------------------------------------------------------------------
14
- mySettings = {
14
+ mySettings = texySettings = {
15
15
  previewParserPath: "/markitup/preview",
16
16
  onShiftEnter: {keepDefault:false, replaceWith:'\n\n'},
17
17
  markupSet: [
data/vendor/assets/javascripts/markitup/sets/txt2tags/set.js CHANGED
@@ -11,7 +11,7 @@
11
11
  // -------------------------------------------------------------------
12
12
  // Feel free to add more tags
13
13
  // -------------------------------------------------------------------
14
- mySettings = {
14
+ mySettings = txt2tagsSettings = {
15
15
  previewParserPath: "/markitup/preview", // path to your Txt2tags parser
16
16
  onShiftEnter: {keepDefault:false, replaceWith:'\n\n'},
17
17
  markupSet: [
data/vendor/assets/javascripts/markitup/sets/wiki/set.js CHANGED
@@ -8,7 +8,7 @@
8
8
  // -------------------------------------------------------------------
9
9
  // Feel free to add more tags
10
10
  // -------------------------------------------------------------------
11
- mySettings = {
11
+ mySettings = wikiSettings = {
12
12
  previewParserPath: "/markitup/preview", // path to your Wiki parser
13
13
  onShiftEnter: {keepDefault:false, replaceWith:'\n\n'},
14
14
  markupSet: [
data/vendor/assets/javascripts/markitup/sets/xbbcode/set.js CHANGED
@@ -4,7 +4,7 @@
4
4
  // Copyright (C) 2008 Jay Salvat
5
5
  // http://markitup.jaysalvat.com/
6
6
  // ----------------------------------------------------------------------------
7
- mySettings = {
7
+ mySettings = xbbcodeSettings = {
8
8
  nameSpace: "xbbcode", // Useful to prevent multi-instances CSS conflict
9
9
  previewParserPath: "/markitup/preview", // path to your XBBCode parser
10
10
  onShiftEnter: {keepDefault:false, replaceWith:'[br /]\n'},
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: markitup-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.2
4
+ version: 1.1.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-06-24 00:00:00.000000000 Z
13
+ date: 2013-06-27 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails