Update to v4

.gitignore

@@ -1,6 +1,8 @@
 tmp
 *.gem
 Gemfile.lock
+gemfiles/*.lock
 sandbox/log
 sandbox/tmp
 sandbox/public/assets
+vendor/assets/**/*.less

.travis.yml

@@ -1,13 +1,24 @@
 language: ruby
 
+before_install:
+  - gem update bundler
+
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 
 gemfile:
   - gemfiles/rails-3.2.gemfile
   - gemfiles/rails-4.0.gemfile
   - gemfiles/rails-4.1.gemfile
   - gemfiles/rails-4.2.gemfile
-
+  - gemfiles/rails-5.0.gemfile
+  - gemfiles/rails-5.1.gemfile
+
+matrix:
+  exclude:
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails-4.0.gemfile
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails-4.1.gemfile

Gemfile

@@ -1,16 +1,18 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.2.1'
-#gem 'rails', '~> 4.1.10'
+gem 'rails', '~> 5.0.0'
+#gem 'rails', '~> 4.2.5'
+#gem 'rails', '~> 4.1.14'
 #gem 'rails', '~> 4.0.13'
-#gem 'rails', '~> 3.2.21'
+#gem 'rails', '~> 3.2.22'
 
 gem 'jquery-rails'
+gem 'turbolinks'
 gem 'uglifier'
 
 group :test do
   gem "test-unit",   "~> 3.0"
-  gem "rspec-rails", "~> 3.2.1"
+  gem "rspec-rails", "~> 3.5.0"
   gem "capybara",    "~> 2.4.4"
 end
 

README.md

@@ -51,7 +51,7 @@ alternate:
     - table
 ```
 
-See the [TinyMCE 4 Documentation](http://www.tinymce.com/wiki.php/Configuration) for a full list of configuration options.
+See the [TinyMCE 4 Documentation](https://www.tinymce.com/docs/configure/) for a full list of configuration options.
 
 
 **3. Include the TinyMCE assets**
@@ -85,7 +85,7 @@ For each textarea that you want to use with TinyMCE, add the "tinymce" class and
 ```erb
 <%= text_area_tag :content, "", :class => "tinymce", :rows => 40, :cols => 120 %>
 ```
- 
+
 or if you are using Rails' form builders:
 
 ```erb
@@ -114,7 +114,7 @@ Alternate configurations defined in 'config/tinymce.yml' can be used with:
 Language Packs
 --------------
 
-See the [tinymce-rails-langs](https://github.com/spohlenz/tinymce-rails-langs) gem for additional language packs for TinyMCE. The `tinymce` helper will use the current locale as the language if available, falling back to English if the core language files are missing.
+See the [tinymce-rails-langs](https://github.com/spohlenz/tinymce-rails-langs) gem for additional language packs for TinyMCE.
 
 
 Manual Initialization
@@ -138,22 +138,20 @@ Asset Compilation
 
 Since TinyMCE loads most of its files dynamically, some workarounds are required to ensure that the TinyMCE asset files are accessible using non-digested filenames.
 
-As of tinymce-rails 3.5.11, 4.1.10 and 4.2.1, two alternative asset installation methods are available, which can be changed by setting `config.tinymce.install` within your `config/application.rb` file. Both methods are called when you run `rake asset:precompile` (via `Rake::Task#enhance`) after the regular application assets are compiled.
+As of tinymce-rails 3.5.11, 4.1.10 and 4.2.1, two alternative asset installation methods are available, which can be changed by setting `config.tinymce.install` within your `config/application.rb` file. These methods are called when you run `rake asset:precompile` (via `Rake::Task#enhance`) after the regular application assets are compiled.
 
-The default method, `copy`, copies the TinyMCE assets directly into `public/assets` and appends the file information into the asset manifest.
+The default method (as of 4.5.2), `compile`, adds the TinyMCE paths to the Sprockets precompilation paths and then creates symlinks from the non-digested filenames to their digested versions.
 
 ```ruby
-config.tinymce.install = :copy
+config.tinymce.install = :compile
 ```
 
-The new method, `compile`, adds the TinyMCE paths to the Sprockets precompilation paths and then creates symlinks from the non-digested filenames to their digested versions.
+If you experience issues with the `compile` method, you may wish to use the `copy` method instead, which copies the TinyMCE assets directly into `public/assets` and appends the file information into the asset manifest. The `copy_no_preserve` method is also available of you do not wish to or cannot preserve file modes on your filesystem.
 
 ```ruby
-config.tinymce.install = :compile
+config.tinymce.install = :copy
 ```
 
-Due to compilation times, this method is only recommended using Rails 4 and up. This method is intended to eventually become the default, so please try it if it suits your environment and report any issues.
-
 If you are including TinyMCE via `application.js` or using the `tinymce_assets` helper, you do not need to manually alter the precompile paths. However if you wish to include `tinymce-jquery.js` independently (i.e. using `javascript_include_tag`), you will need to add it to the precompile list in `config/environments/production.rb`:
 
 ```ruby

Rakefile

@@ -16,8 +16,8 @@ desc "Update TinyMCE to version #{TinyMCE::Rails::TINYMCE_VERSION}"
 task :update => [ :fetch, :extract, :rename ]
 
 task :fetch do
-  download("http://download.moxiecode.com/tinymce/tinymce_#{TinyMCE::Rails::TINYMCE_VERSION}.zip", "tinymce.zip")
-  download("http://download.moxiecode.com/tinymce/tinymce_#{TinyMCE::Rails::TINYMCE_VERSION}_dev.zip", "tinymce.dev.zip")
+  download("http://download.ephox.com/tinymce/community/tinymce_#{TinyMCE::Rails::TINYMCE_VERSION}.zip", "tinymce.zip")
+  download("http://download.ephox.com/tinymce/community/tinymce_#{TinyMCE::Rails::TINYMCE_VERSION}_dev.zip", "tinymce.dev.zip")
 end
 
 task :extract do
@@ -28,15 +28,13 @@ task :extract do
     `mkdir -p vendor/assets/javascripts/tinymce`
     `mv tmp/tinymce/js/tinymce/* vendor/assets/javascripts/tinymce/`
   end
-  
+
   step "Extracting jQuery & unminified source files" do
    `rm -rf tmp/tinymce`
    `unzip -u tmp/tinymce.dev.zip -d tmp`
    `mv tmp/tinymce/js/tinymce/jquery.tinymce.min.js vendor/assets/javascripts/tinymce/jquery.tinymce.js`
-   `mv tmp/tinymce/js/tinymce/tinymce.jquery.min.js vendor/assets/javascripts/tinymce/tinymce.jquery.js`
    `mkdir -p app/assets/source/tinymce`
    `mv tmp/tinymce/js/tinymce/tinymce.js app/assets/source/tinymce/tinymce.js`
-   `mv tmp/tinymce/js/tinymce/tinymce.jquery.js app/assets/source/tinymce/tinymce.jquery.js`
   end
 end
 

app/assets/javascripts/tinymce-jquery.js

@@ -1,3 +1,3 @@
 //= require tinymce/preinit.js
-//= require tinymce/tinymce.jquery.js
+//= require tinymce/tinymce.js
 //= require tinymce/jquery.tinymce.js

app/assets/javascripts/tinymce/preinit.js.erb

@@ -2,3 +2,9 @@ window.tinymce = window.tinymce || {
   base:   '<%= TinyMCE::Rails::Engine.base %>',
   suffix: ''
 };
+
+if (typeof Turbolinks != 'undefined' && Turbolinks.supported) {
+  document.addEventListener('turbolinks:before-render', function() {
+    tinymce.remove();
+  });
+}