bootstrap-wysihtml5-rails 0.3.1.20 → 0.3.1.21

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d677d6beb4229ec2375734e26167982487ab36b4
4
- data.tar.gz: a939716fc1d9a0c4d3d7c6aa6e548d0a8223778a
3
+ metadata.gz: 2c35299964f2443a245133bfcbbcc7804443f284
4
+ data.tar.gz: bb41e6b0dad8b507d18cc532263c332ee5ccece6
5
5
  SHA512:
6
- metadata.gz: 3b36d07ef7da14c6e60610edc494ba4678c250597367a8d10fc63fa284030a8e1f7d40b1ed29d22321a8650ede1054a93dfe6e0fc3b96aaf1b2f8765bd92ef9b
7
- data.tar.gz: 773601b3cd8422c10ca29ebd4e614fffa8f7ef26468d6c2d203cab779304be00874caeb2a4e8804472dccde0b01b0c24d801aad2a6206fc5d1a25d762aa9c787
6
+ metadata.gz: 285996fb9be560abef551e81c969405a323f75e6b8f15419d1f6fe2f9a13ea7817cec8b6d6c702f6e30b7e79c11ee7612cd0382fabba012c5c2497063149e4ba
7
+ data.tar.gz: 1d865e37ea9c4a71f3e96b26f2c7588614afbd080e6a156b6bc2791b998c254372b76983356b0069b9dadb68c80669eff6d668365ec2736d8a9534faae8878ae
data/.rvmrc CHANGED
@@ -6,10 +6,10 @@
6
6
  # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
7
7
  # Only full ruby name is supported here, for short names use:
8
8
  # echo "rvm use 2.0.0" > .rvmrc
9
- environment_id="ruby-2.0.0-p0@bootstrap-wysihtml5-rails"
9
+ environment_id="ruby-2.0.0-p195@wysihtml5"
10
10
 
11
11
  # Uncomment the following lines if you want to verify rvm version per project
12
- # rvmrc_rvm_version="1.19.0 (master)" # 1.10.1 seams as a safe start
12
+ # rvmrc_rvm_version="1.20.13 (master)" # 1.10.1 seams as a safe start
13
13
  # eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
14
14
  # echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
15
15
  # return 1
@@ -30,6 +30,13 @@ then
30
30
  fi
31
31
  done
32
32
  unset __hook
33
+ if (( ${rvm_use_flag:=1} >= 2 )) # display only when forced
34
+ then
35
+ if [[ $- == *i* ]] # check for interactive shells
36
+ then printf "%b" "Using: \E[32m$GEM_HOME\E[0m" # show the user the ruby and gemset they are using in green
37
+ else printf "%b" "Using: $GEM_HOME" # don't use colors in non-interactive shells
38
+ fi
39
+ fi
33
40
  else
34
41
  # If the environment file has not yet been created, use the RVM CLI to select.
35
42
  rvm --create "$environment_id" || {
data/README.md CHANGED
@@ -1,5 +1,7 @@
1
1
  # Bootstrap Wysihtml5 for Rails
2
2
 
3
+ [![endorse](https://api.coderwall.com/nerian/endorsecount.png)](https://coderwall.com/nerian)
4
+
3
5
  Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
4
6
  It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
5
7
 
@@ -30,7 +32,7 @@ gem 'bootstrap-wysihtml5-rails', :require => 'bootstrap-wysihtml5-rails',
30
32
 
31
33
  and run bundle install.
32
34
 
33
- This gem doesn't include Bootstrap. You can get Bootstrap here: https://github.com/anjlab/bootstrap-rails
35
+ This gem doesn't include Bootstrap. You can get Bootstrap here: https://github.com/anjlab/bootstrap-rails
34
36
 
35
37
  ## Configuration
36
38
 
@@ -63,7 +65,7 @@ Just call wysihtml5() with any selector.
63
65
 
64
66
  ```html
65
67
  <textarea id="some-textarea" class='wysihtml5' placeholder="Enter text ..."></textarea>
66
-
68
+
67
69
  <script type="text/javascript">
68
70
  $('.wysihtml5').each(function(i, elem) {
69
71
  $(elem).wysihtml5();
@@ -74,6 +76,14 @@ Just call wysihtml5() with any selector.
74
76
 
75
77
  A live example: http://jsfiddle.net/5UUrg/
76
78
 
79
+ ## If using Turbolinks
80
+
81
+ ```
82
+ $(document).on('page:load', function(){
83
+ window['rangy'].initialized = false
84
+ })
85
+ ```
86
+
77
87
  ## License
78
88
  Copyright (c) 2011 Gonzalo Rodríguez-Baltanás Díaz
79
89
 
data/Rakefile CHANGED
@@ -46,7 +46,8 @@ end
46
46
  desc "Publish a new version"
47
47
  task :publish => :build do
48
48
  tags = `git tag`.split
49
- system("git tag #{BootstrapWysihtml5Rails::Rails::VERSION}") unless tags.include?(BootstrapWysihtml5Rails::Rails::VERSION)
50
- system("gem push bootstrap-wysihtml5-rails-#{BootstrapWysihtml5Rails::Rails::VERSION}.gem")
51
- system("git push")
49
+ version = BootstrapWysihtml5Rails::Rails::VERSION
50
+ system("git tag -a #{version} -m 'Release #{version}' ") unless tags.include?(version)
51
+ system("gem push bootstrap-wysihtml5-rails-#{version}.gem")
52
+ system("git push --follow-tags")
52
53
  end
@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
7
7
  gem.description = %q{A wysiwyg text editor for Twitter Bootstrap}
8
8
  gem.homepage = "https://github.com/Nerian/bootstrap-wysihtml5-rails"
9
9
  gem.summary = gem.description
10
+ gem.license = 'MIT'
10
11
 
11
12
  gem.name = "bootstrap-wysihtml5-rails"
12
13
  gem.require_paths = ["lib"]
@@ -1,5 +1,5 @@
1
1
  module BootstrapWysihtml5Rails
2
2
  module Rails
3
- VERSION = "0.3.1.20"
3
+ VERSION = "0.3.1.21"
4
4
  end
5
5
  end
data/testapp/Gemfile CHANGED
@@ -4,15 +4,13 @@ gem 'rails'
4
4
 
5
5
  gem 'sqlite3'
6
6
 
7
- group :assets do
8
- gem 'sass-rails', '~> 3.2.3'
9
- gem 'coffee-rails', '~> 3.2.1'
7
+ gem 'sass-rails'
8
+ gem 'coffee-rails'
10
9
 
11
- # See https://github.com/sstephenson/execjs#readme for more supported runtimes
12
- # gem 'therubyracer', :platform => :ruby
10
+ # See https://github.com/sstephenson/execjs#readme for more supported runtimes
11
+ # gem 'therubyracer', :platform => :ruby
13
12
 
14
- gem 'uglifier', '>= 1.0.3'
15
- gem 'anjlab-bootstrap-rails', '>= 2.1', :require => 'bootstrap-rails'
16
- gem 'bootstrap-wysihtml5-rails', :path => '../'
17
- gem 'jquery-rails'
18
- end
13
+ gem 'uglifier'
14
+ gem 'anjlab-bootstrap-rails', '>= 2.1', :require => 'bootstrap-rails'
15
+ gem 'bootstrap-wysihtml5-rails', :path => '../'
16
+ gem 'jquery-rails'
@@ -1,7 +1,9 @@
1
1
  <h1>Home#index</h1>
2
2
  <p>Find me in app/views/home/index.html.erb</p>
3
3
 
4
- <textarea id="some-textarea" placeholder="Enter text ..."></textarea>
4
+ <textarea id="some-textarea" style="width: 810px; height: 200px;" placeholder="Enter text ...">
5
+ <b>This is some previous text</b>
6
+ </textarea>
5
7
 
6
8
  <script type="text/javascript">
7
9
  $('#some-textarea').wysihtml5({
@@ -11,6 +13,6 @@
11
13
  "html": true, //Button which allows you to edit the generated HTML. Default false
12
14
  "link": true, //Button to insert a link. Default true
13
15
  "image": true, //Button to insert an image. Default true,
14
- "color": true //Button to change color of font
16
+ "color": true //Button to change color of font
15
17
  });
16
18
  </script>
@@ -4,9 +4,9 @@ require 'rails/all'
4
4
 
5
5
  if defined?(Bundler)
6
6
  # If you precompile assets before deploying to production, use this line
7
- Bundler.require(*Rails.groups(:assets => %w(development test)))
7
+ # Bundler.require(*Rails.groups(:assets => %w(development test)))
8
8
  # If you want your assets lazily compiled in production, use this line
9
- # Bundler.require(:default, :assets, Rails.env)
9
+ Bundler.require(:default, Rails.env)
10
10
  end
11
11
 
12
12
  module Testapp
@@ -48,7 +48,7 @@ module Testapp
48
48
  # This will create an empty whitelist of attributes available for mass-assignment for all models
49
49
  # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
50
50
  # parameters by using an attr_accessible or attr_protected declaration.
51
- config.active_record.whitelist_attributes = true
51
+ # config.active_record.whitelist_attributes = true
52
52
 
53
53
  # Enable the asset pipeline
54
54
  config.assets.enabled = true
@@ -7,7 +7,7 @@ Testapp::Application.configure do
7
7
  config.cache_classes = false
8
8
 
9
9
  # Log error messages when you accidentally call methods on nil.
10
- config.whiny_nils = true
10
+ # config.whiny_nils = true
11
11
 
12
12
  # Show full error reports and disable caching
13
13
  config.consider_all_requests_local = true
@@ -15,7 +15,9 @@ Testapp::Application.configure do
15
15
 
16
16
  # Don't care if the mailer can't send
17
17
  config.action_mailer.raise_delivery_errors = false
18
-
18
+
19
+ config.eager_load = false
20
+
19
21
  # config.action_controller.asset_host = 'testing'
20
22
 
21
23
  # Print deprecation notices to the Rails logger
@@ -25,11 +27,7 @@ Testapp::Application.configure do
25
27
  config.action_dispatch.best_standards_support = :builtin
26
28
 
27
29
  # Raise exception on mass assignment protection for Active Record models
28
- config.active_record.mass_assignment_sanitizer = :strict
29
-
30
- # Log the query plan for queries taking more than this (works
31
- # with SQLite, MySQL, and PostgreSQL)
32
- config.active_record.auto_explain_threshold_in_seconds = 0.5
30
+ # config.active_record.mass_assignment_sanitizer = :strict
33
31
 
34
32
  # Do not compress assets
35
33
  config.assets.compress = false
@@ -18,7 +18,7 @@ Testapp::Application.configure do
18
18
  config.assets.compile = false
19
19
 
20
20
  config.serve_static_assets = true
21
-
21
+
22
22
  # Generate digests for assets URLs
23
23
  config.assets.digest = true
24
24
 
@@ -62,8 +62,4 @@ Testapp::Application.configure do
62
62
 
63
63
  # Send deprecation notices to registered listeners
64
64
  config.active_support.deprecation = :notify
65
-
66
- # Log the query plan for queries taking more than this (works
67
- # with SQLite, MySQL, and PostgreSQL)
68
- # config.active_record.auto_explain_threshold_in_seconds = 0.5
69
65
  end
@@ -12,7 +12,7 @@ Testapp::Application.configure do
12
12
  config.static_cache_control = "public, max-age=3600"
13
13
 
14
14
  # Log error messages when you accidentally call methods on nil
15
- config.whiny_nils = true
15
+ # config.whiny_nils = true
16
16
 
17
17
  # Show full error reports and disable caching
18
18
  config.consider_all_requests_local = true
@@ -30,7 +30,7 @@ Testapp::Application.configure do
30
30
  config.action_mailer.delivery_method = :test
31
31
 
32
32
  # Raise exception on mass assignment protection for Active Record models
33
- config.active_record.mass_assignment_sanitizer = :strict
33
+ # config.active_record.mass_assignment_sanitizer = :strict
34
34
 
35
35
  # Print deprecation notices to the stderr
36
36
  config.active_support.deprecation = :stderr
@@ -5,3 +5,4 @@
5
5
  # Make sure the secret is at least 30 characters and all random,
6
6
  # no regular words or you'll be exposed to dictionary attacks.
7
7
  Testapp::Application.config.secret_token = '412cfb8d8bc8bdf1ebd1d91b077635cd9eaae339ee4f2fd2bd8882172fda7ac99a34e80974328a567ba6764c5dc2febbda4075ef9cae80baa29ba7632ab51ee9'
8
+ Testapp::Application.config.secret_key_base = 'new secret key base'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrap-wysihtml5-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.1.20
4
+ version: 0.3.1.21
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gonzalo Rodríguez-Baltanás Díaz
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-05-10 00:00:00.000000000 Z
11
+ date: 2013-07-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: railties
@@ -160,7 +160,8 @@ files:
160
160
  - vendor/assets/stylesheets/bootstrap-wysihtml5/index.css
161
161
  - vendor/assets/stylesheets/bootstrap-wysihtml5/wysiwyg-color.css
162
162
  homepage: https://github.com/Nerian/bootstrap-wysihtml5-rails
163
- licenses: []
163
+ licenses:
164
+ - MIT
164
165
  metadata: {}
165
166
  post_install_message:
166
167
  rdoc_options: []