bootstrap-wysihtml5-rails 0.3.0 → 0.3.1

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,5 +1,5 @@
1
1
  module BootstrapWysihtml5Rails
2
2
  module Rails
3
- VERSION = "0.3.0"
3
+ VERSION = "0.3.1"
4
4
  end
5
5
  end
@@ -166,20 +166,26 @@
166
166
  if(value === true) {
167
167
  toolbar.append(templates[key]);
168
168
 
169
- if(key == "html") {
169
+ if(key === "html") {
170
170
  this.initHtml(toolbar);
171
171
  }
172
172
 
173
- if(key == "link") {
173
+ if(key === "link") {
174
174
  this.initInsertLink(toolbar);
175
175
  }
176
176
 
177
- if(key == "image") {
177
+ if(key === "image") {
178
178
  this.initInsertImage(toolbar);
179
179
  }
180
180
  }
181
181
  }
182
182
 
183
+ if(options.toolbar) {
184
+ for(key in options.toolbar) {
185
+ toolbar.append(options.toolbar[key]);
186
+ }
187
+ }
188
+
183
189
  toolbar.find("a[data-wysihtml5-command='formatBlock']").click(function(e) {
184
190
  var el = $(e.srcElement);
185
191
  self.toolbar.find('.current-font').text(el.html());
@@ -8516,6 +8516,8 @@ wysihtml5.views.View = Base.extend(
8516
8516
  var dataTransfer = event.dataTransfer,
8517
8517
  data;
8518
8518
 
8519
+
8520
+ console.log('PASTED', event);
8519
8521
  if (dataTransfer && browser.supportsDataTransfer()) {
8520
8522
  data = dataTransfer.getData("text/html") || dataTransfer.getData("text/plain");
8521
8523
  }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrap-wysihtml5-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.0
4
+ version: 0.3.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-07-28 00:00:00.000000000 Z
12
+ date: 2012-08-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
94
94
  version: '0'
95
95
  segments:
96
96
  - 0
97
- hash: -599525991395027129
97
+ hash: 1706980044175295282
98
98
  required_rubygems_version: !ruby/object:Gem::Requirement
99
99
  none: false
100
100
  requirements:
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
103
103
  version: '0'
104
104
  segments:
105
105
  - 0
106
- hash: -599525991395027129
106
+ hash: 1706980044175295282
107
107
  requirements: []
108
108
  rubyforge_project:
109
109
  rubygems_version: 1.8.24