ouvrages-tinymce-rails 3.4.6 → 3.4.9

data/README.md

@@ -11,35 +11,65 @@ Instructions
 
     gem 'tinymce-rails'
 
-Then run `bundle install`.
+Be sure to add to the global group, not the `assets` group. Then run `bundle install`.
 
 
-**2a. Use TinyMCE with the jQuery extension**
+**2. Create a `config/tinymce.yml` file with your global configuration options:**
+
+    theme_advanced_toolbar_location: top
+    theme_advanced_toolbar_align: left
+    theme_advanced_statusbar_location: bottom
+    theme_advanced_buttons3_add:
+      - tablecontrols
+      - fullscreen
+    plugins:
+      - table
+      - fullscreen
+
+See the [TinyMCE Documentation](http://www.tinymce.com/wiki.php/Configuration) for a full list of configuration options.
+
+
+**3. Include the TinyMCE assets**
 
 Add to your application.js:
 
+    //= require tinymce
+
+or with jQuery integration:
+
     //= require tinymce-jquery
 
-and use TinyMCE in your view:
+The TinyMCE assets can be included on a per-page basis using the `tinymce_assets` helper:
 
-    <%= text_area_tag :editor, "", :rows => 40, :cols => 120 %>
+    <%= tinymce_assets %>
+    #=> <script type="text/javascript" src="/assets/tinymce.js">
 
-    <script type="text/javascript">
-      $(function() {
-        $('textarea').tinymce({
-          theme: 'advanced'
-        });
-      });
-    </script>
 
+**4. Initialize TinyMCE**
 
-**2b. Use TinyMCE without jQuery**
+For each textarea that you want to use with TinyMCE, add the "tinymce" class and ensure it has a unique ID:
 
-Add to your application.js:
+    <%= text_area_tag :editor, "", :class => "tinymce", :rows => 40, :cols => 120 %>
 
-    //= require tinymce
+Then invoke the `tinymce` helper to initialize TinyMCE:
+
+    <%= tinymce %>
+
+Custom options can be passed to `tinymce` to override the global options specified in `config/tinymce.yml`:
+
+    <%= tinymce :theme => "simple", :language => "de", :plugins => ["inlinepopups", "paste"] %>
+
+
+Language Packs
+--------------
 
-Use TinyMCE in your view:
+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.
+
+
+Manual Initialization
+---------------------
+
+Using the `tinymce` helper and global configuration file is entirely optional. The `tinyMCE.init` function can be invoked manually if desired.
 
     <%= text_area_tag :editor, "", :rows => 40, :cols => 120 %>
 
@@ -58,7 +88,13 @@ To use custom plugins or skins, simply add the files to your asset load path so
 
 For example, a plugin called `mycustomplugin` could have its main JS file at `app/assets/javascripts/tinymce/plugins/mycustomplugin/editor_plugin.js`.
 
-Any files with a path beginning with `tinymce/` will be automatically precompiled, and the [digestion](https://github.com/spohlenz/digestion) gem is used to ensure that these files never have an asset digest appended to their filenames, even in production mode.
+You should also ensure that your custom paths are added to the asset precompile paths.
+
+
+Using tinymce-rails as an Engine Dependency
+-------------------------------------------
+
+Ensure that you explicitly require `tinymce-rails` within your engine file. Including tinymce-rails as a dependency in your gemspec is not enough.
 
 
 Updating

data/Rakefile

@@ -1,7 +1,4 @@
-unless defined? TinyMCE::VERSION
-  $:.unshift File.expand_path("../lib", __FILE__)
-  require "tinymce/version"
-end
+require File.expand_path('../lib/tinymce/rails/version', __FILE__)
 
 def step(name)
   print "#{name} ..."
@@ -15,29 +12,29 @@ def download(url, filename)
   `curl -L -# #{url} -o tmp/#{filename}`
 end
 
-desc "Update TinyMCE to version specified in lib/tinymce/version.rb"
+desc "Update TinyMCE to version #{TinyMCE::Rails::TINYMCE_VERSION}"
 task :update => [ :fetch, :extract, :process ]
 
 task :fetch do
-  download("https://github.com/downloads/tinymce/tinymce/tinymce_#{TinyMCE::TINYMCE_VERSION}.zip", "tinymce.zip")
-  download("https://github.com/downloads/tinymce/tinymce/tinymce_#{TinyMCE::TINYMCE_VERSION}_jquery.zip", "tinymce.jquery.zip")
+  download("https://github.com/downloads/tinymce/tinymce/tinymce_#{TinyMCE::Rails::TINYMCE_VERSION}.zip", "tinymce.zip")
+  download("https://github.com/downloads/tinymce/tinymce/tinymce_#{TinyMCE::Rails::TINYMCE_VERSION}_jquery.zip", "tinymce.jquery.zip")
 end
 
 task :extract do
   step "Extracting core files" do
     `rm -rf tmp/tinymce`
     `unzip -u tmp/tinymce.zip -d tmp`
-    `rm -rf assets/precompiled/tinymce`
-    `mkdir -p assets/precompiled/tinymce`
-    `mv tmp/tinymce/jscripts/tiny_mce/* assets/precompiled/tinymce/`
+    `rm -rf vendor/assets/javascripts/tinymce`
+    `mkdir -p vendor/assets/javascripts/tinymce`
+    `mv tmp/tinymce/jscripts/tiny_mce/* vendor/assets/javascripts/tinymce/`
   end
   
   step "Extracting jQuery files" do
     `rm -rf tmp/tinymce`
     `unzip -u tmp/tinymce.jquery.zip -d tmp`
-    `mv tmp/tinymce/jscripts/tiny_mce/jquery.tinymce.js assets/precompiled/tinymce/jquery.tinymce.js`
-    `mv tmp/tinymce/jscripts/tiny_mce/tiny_mce.js assets/precompiled/tinymce/tiny_mce_jquery.js`
-    `mv tmp/tinymce/jscripts/tiny_mce/tiny_mce_src.js assets/precompiled/tinymce/tiny_mce_jquery_src.js`
+    `mv tmp/tinymce/jscripts/tiny_mce/jquery.tinymce.js vendor/assets/javascripts/tinymce/jquery.tinymce.js`
+    `mv tmp/tinymce/jscripts/tiny_mce/tiny_mce.js vendor/assets/javascripts/tinymce/tiny_mce_jquery.js`
+    `mv tmp/tinymce/jscripts/tiny_mce/tiny_mce_src.js vendor/assets/javascripts/tinymce/tiny_mce_jquery_src.js`
   end
 end
 
@@ -45,15 +42,9 @@ task :process do
   step "Fixing file encoding" do
     require 'iconv'
     converter = Iconv.new('UTF-8', 'ISO-8859-1')
-    Dir["assets/precompiled/tinymce/**/*.js"].each do |file|
+    Dir["vendor/assets/javascripts/tinymce/**/*.js"].each do |file|
       contents = converter.iconv(File.read(file)).force_encoding('UTF-8')
       File.open(file, 'w') { |f| f.write(contents) }
     end
   end
-  
-  step "Copying includeable assets" do
-    `cp assets/precompiled/tinymce/tiny_mce_src.js assets/vendor/tinymce/tiny_mce.js`
-    `cp assets/precompiled/tinymce/tiny_mce_jquery_src.js assets/vendor/tinymce/tiny_mce_jquery.js`
-    `cp assets/precompiled/tinymce/jquery.tinymce.js assets/vendor/tinymce/jquery-tinymce.js`
-  end
 end

data/app/assets/javascripts/tinymce-jquery.js

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

data/app/assets/javascripts/tinymce.js

@@ -0,0 +1,2 @@
+//= require tinymce/preinit.js
+//= require tinymce/tiny_mce_src.js

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

@@ -0,0 +1,5 @@
+window.tinyMCEPreInit = window.tinyMCEPreInit || {
+  base:   '<%= TinyMCE::Rails::Engine.config.tinymce.base || asset_path("tinymce", :digest => false) %>',
+  query:  '<%= TinyMCE::Rails::VERSION %>',
+  suffix: ''
+};

data/lib/tasks/assets.rake

@@ -0,0 +1,7 @@
+Rake::Task['assets:precompile:primary'].enhance do
+  assets = File.expand_path(File.dirname(__FILE__) + "/../../vendor/assets/javascripts/tinymce")
+  target = File.join(Rails.public_path, Rails.application.config.assets.prefix)
+
+  mkdir_p target
+  cp_r assets, target
+end

data/lib/tinymce-rails.rb

@@ -1,2 +1 @@
-require "tinymce/version"
-require "tinymce/railtie"
+require "tinymce/rails"

data/lib/tinymce/rails.rb

@@ -0,0 +1,12 @@
+module TinyMCE
+  module Rails
+    require 'tinymce/rails/engine'
+    require 'tinymce/rails/version'
+    require "tinymce/rails/configuration"
+    require "tinymce/rails/helper"
+
+    def self.configuration
+      @configuration ||= Configuration.load(::Rails.root.join("config/tinymce.yml"))
+    end
+  end
+end

data/lib/tinymce/rails/configuration.rb

@@ -0,0 +1,67 @@
+module TinyMCE::Rails
+  class Configuration
+    def self.defaults
+      {
+        "mode"            => "specific_textareas",
+        "editor_selector" => "tinymce",
+        "theme"           => "advanced"
+      }
+    end
+    
+    attr_reader :options
+    
+    def initialize(options)
+      @options = options
+    end
+    
+    def options_for_tinymce
+      result = {}
+      
+      options.each do |key, value|
+        if value.is_a?(Array) && value.all? { |v| v.is_a?(String) }
+          result[key] = value.join(",")
+        else
+          result[key] = value
+        end
+      end
+      
+      result["language"] ||= self.class.default_language
+      
+      result
+    end
+    
+    def merge(options)
+      self.class.new(self.options.merge(options))
+    end
+    
+    def load(filename)
+      options.merge!(YAML::load(ERB.new(IO.read(filename)).result))
+    end
+    
+    def self.load(filename)
+      config = new(defaults)
+      config.load(filename) if File.exists?(filename)
+      config
+    end
+    
+    # Default language falls back to English if current locale is not available.
+    def self.default_language
+      available_languages.include?(I18n.locale.to_s) ? I18n.locale.to_s : "en"
+    end
+    
+    # Searches asset paths for TinyMCE language files.
+    def self.available_languages
+      assets.paths.map { |path|
+        files = assets.entries(File.join(path, "tinymce/langs"))
+        files.map { |file|
+          asset = assets.attributes_for(File.join(path, file))
+          asset.logical_path.sub(/\.js$/, "")
+        }
+      }.flatten.uniq
+    end
+  
+    def self.assets
+      Rails.application.assets
+    end
+  end
+end

data/lib/tinymce/rails/engine.rb

@@ -0,0 +1,16 @@
+module TinyMCE::Rails
+  class Engine < ::Rails::Engine
+    config.tinymce = ActiveSupport::OrderedOptions.new
+    
+    # Set an explicit base path for TinyMCE assets (usually defaults to /assets/tinymce)
+    config.tinymce.base = nil
+
+    initializer "precompile", :group => :all do |app|
+      app.config.assets.precompile << "tinymce.js"
+    end
+
+    initializer "helper" do |app|
+      ActionController::Base.helper(Helper)
+    end
+  end
+end

data/lib/tinymce/rails/helper.rb

@@ -0,0 +1,29 @@
+module TinyMCE::Rails
+  module Helper
+    # Initializes TinyMCE on the current page based on the global configuration.
+    #
+    # Custom options can be set via the options hash, which will be passed to
+    # the TinyMCE init function.
+    #
+    # By default, all textareas with a class of "tinymce" will have the TinyMCE
+    # editor applied. The current locale will also be used as the language when
+    # TinyMCE language files are available, falling back to English if not
+    # available. The :editor_selector and :language options can be used to
+    # override these defaults.
+    #
+    # @example
+    #   <%= tinymce(:theme => "advanced", :editor_selector => "editorClass") %>
+    def tinymce(options={})
+      configuration = TinyMCE::Rails.configuration.merge(options)
+      
+      javascript_tag do
+        "tinyMCE.init(#{configuration.options_for_tinymce.to_json});".html_safe
+      end
+    end
+    
+    # Includes TinyMCE javascript assets via a script tag.
+    def tinymce_assets
+      javascript_include_tag "tinymce"
+    end
+  end
+end

data/lib/tinymce/rails/version.rb

@@ -0,0 +1,6 @@
+module TinyMCE
+  module Rails
+    VERSION = "3.4.9"
+    TINYMCE_VERSION = "3.4.9"
+  end
+end

data/vendor/assets/javascripts/tinymce/jquery.tinymce.js

@@ -0,0 +1 @@
+(function(b){var e,d,a=[],c=window;b.fn.tinymce=function(j){var p=this,g,k,h,m,i,l="",n="";if(!p.length){return p}if(!j){return tinyMCE.get(p[0].id)}p.css("visibility","hidden");function o(){var r=[],q=0;if(f){f();f=null}p.each(function(t,u){var s,w=u.id,v=j.oninit;if(!w){u.id=w=tinymce.DOM.uniqueId()}s=new tinymce.Editor(w,j);r.push(s);s.onInit.add(function(){var x,y=v;p.css("visibility","");if(v){if(++q==r.length){if(tinymce.is(y,"string")){x=(y.indexOf(".")===-1)?null:tinymce.resolve(y.replace(/\.\w+$/,""));y=tinymce.resolve(y)}y.apply(x||tinymce,r)}}})});b.each(r,function(t,s){s.render()})}if(!c.tinymce&&!d&&(g=j.script_url)){d=1;h=g.substring(0,g.lastIndexOf("/"));if(/_(src|dev)\.js/g.test(g)){n="_src"}m=g.lastIndexOf("?");if(m!=-1){l=g.substring(m+1)}c.tinyMCEPreInit=c.tinyMCEPreInit||{base:h,suffix:n,query:l};if(g.indexOf("gzip")!=-1){i=j.language||"en";g=g+(/\?/.test(g)?"&":"?")+"js=true&core=true&suffix="+escape(n)+"&themes="+escape(j.theme)+"&plugins="+escape(j.plugins)+"&languages="+i;if(!c.tinyMCE_GZ){tinyMCE_GZ={start:function(){tinymce.suffix=n;function q(r){tinymce.ScriptLoader.markDone(tinyMCE.baseURI.toAbsolute(r))}q("langs/"+i+".js");q("themes/"+j.theme+"/editor_template"+n+".js");q("themes/"+j.theme+"/langs/"+i+".js");b.each(j.plugins.split(","),function(s,r){if(r){q("plugins/"+r+"/editor_plugin"+n+".js");q("plugins/"+r+"/langs/"+i+".js")}})},end:function(){}}}}b.ajax({type:"GET",url:g,dataType:"script",cache:true,success:function(){tinymce.dom.Event.domLoaded=1;d=2;if(j.script_loaded){j.script_loaded()}o();b.each(a,function(q,r){r()})}})}else{if(d===1){a.push(o)}else{o()}}return p};b.extend(b.expr[":"],{tinymce:function(g){return !!(g.id&&tinyMCE.get(g.id))}});function f(){function i(l){if(l==="remove"){this.each(function(n,o){var m=h(o);if(m){m.remove()}})}this.find("span.mceEditor,div.mceEditor").each(function(n,o){var m=tinyMCE.get(o.id.replace(/_parent$/,""));if(m){m.remove()}})}function k(n){var m=this,l;if(n!==e){i.call(m);m.each(function(p,q){var o;if(o=tinyMCE.get(q.id)){o.setContent(n)}})}else{if(m.length>0){if(l=tinyMCE.get(m[0].id)){return l.getContent()}}}}function h(m){var l=null;(m)&&(m.id)&&(c.tinymce)&&(l=tinyMCE.get(m.id));return l}function g(l){return !!((l)&&(l.length)&&(c.tinymce)&&(l.is(":tinymce")))}var j={};b.each(["text","html","val"],function(n,l){var o=j[l]=b.fn[l],m=(l==="text");b.fn[l]=function(s){var p=this;if(!g(p)){return o.apply(p,arguments)}if(s!==e){k.call(p.filter(":tinymce"),s);o.apply(p.not(":tinymce"),arguments);return p}else{var r="";var q=arguments;(m?p:p.eq(0)).each(function(u,v){var t=h(v);r+=t?(m?t.getContent().replace(/<(?:"[^"]*"|'[^']*'|[^'">])*>/g,""):t.getContent()):o.apply(b(v),q)});return r}}});b.each(["append","prepend"],function(n,m){var o=j[m]=b.fn[m],l=(m==="prepend");b.fn[m]=function(q){var p=this;if(!g(p)){return o.apply(p,arguments)}if(q!==e){p.filter(":tinymce").each(function(s,t){var r=h(t);r&&r.setContent(l?q+r.getContent():r.getContent()+q)});o.apply(p.not(":tinymce"),arguments);return p}}});b.each(["remove","replaceWith","replaceAll","empty"],function(m,l){var n=j[l]=b.fn[l];b.fn[l]=function(){i.call(this,l);return n.apply(this,arguments)}});j.attr=b.fn.attr;b.fn.attr=function(n,q,o){var m=this;if((!n)||(n!=="value")||(!g(m))){return j.attr.call(m,n,q,o)}if(q!==e){k.call(m.filter(":tinymce"),q);j.attr.call(m.not(":tinymce"),n,q,o);return m}else{var p=m[0],l=h(p);return l?l.getContent():j.attr.call(b(p),n,q,o)}}}})(jQuery);

data/{assets/precompiled → vendor/assets/javascripts}/tinymce/plugins/advlink/js/advlink.js

@@ -54,6 +54,13 @@ function init() {
 		document.getElementById('popupurl').style.width = '180px';
 
 	elm = inst.dom.getParent(elm, "A");
+	if (elm == null) {
+		var prospect = inst.dom.create("p", null, inst.selection.getContent());
+		if (prospect.childNodes.length === 1) {
+			elm = prospect.firstChild;
+		}
+	}
+
 	if (elm != null && elm.nodeName == "A")
 		action = "update";
 
@@ -503,7 +510,7 @@ function getTargetListHTML(elm_id, target_form_element) {
 	var targets = tinyMCEPopup.getParam('theme_advanced_link_targets', '').split(';');
 	var html = '';
 
-	html += '<select id="' + elm_id + '" name="' + elm_id + '" onf2ocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
+	html += '<select id="' + elm_id + '" name="' + elm_id + '" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
 	html += 'this.options[this.selectedIndex].value;">';
 	html += '<option value="_self">' + tinyMCEPopup.getLang('advlink_dlg.target_same') + '</option>';
 	html += '<option value="_blank">' + tinyMCEPopup.getLang('advlink_dlg.target_blank') + ' (_blank)</option>';

data/vendor/assets/javascripts/tinymce/plugins/autoresize/editor_plugin.js

@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.AutoResizePlugin",{init:function(a,c){var d=this,e=0;if(a.getParam("fullscreen_is_enabled")){return}function b(){var j,i=a.getDoc(),f=i.body,l=i.documentElement,h=tinymce.DOM,k=d.autoresize_min_height,g;g=tinymce.isIE?f.scrollHeight:(tinymce.isWebKit&&f.clientHeight==0?0:f.offsetHeight);if(g>d.autoresize_min_height){k=g}if(d.autoresize_max_height&&g>d.autoresize_max_height){k=d.autoresize_max_height;f.style.overflowY="auto";l.style.overflowY="auto"}else{f.style.overflowY="hidden";l.style.overflowY="hidden";f.scrollTop=0}if(k!==e){j=k-e;h.setStyle(h.get(a.id+"_ifr"),"height",k+"px");e=k;if(tinymce.isWebKit&&j<0){b()}}}d.editor=a;d.autoresize_min_height=parseInt(a.getParam("autoresize_min_height",a.getElement().offsetHeight));d.autoresize_max_height=parseInt(a.getParam("autoresize_max_height",0));a.onInit.add(function(f){f.dom.setStyle(f.getBody(),"paddingBottom",f.getParam("autoresize_bottom_margin",50)+"px")});a.onChange.add(b);a.onSetContent.add(b);a.onPaste.add(b);a.onKeyUp.add(b);a.onPostRender.add(b);if(a.getParam("autoresize_on_init",true)){a.onLoad.add(b);a.onLoadContent.add(b)}a.addCommand("mceAutoResize",b)},getInfo:function(){return{longname:"Auto Resize",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autoresize",tinymce.plugins.AutoResizePlugin)})();

data/{assets/precompiled → vendor/assets/javascripts}/tinymce/plugins/autoresize/editor_plugin_src.js

@@ -11,7 +11,7 @@
 (function() {
 	/**
 	 * Auto Resize
-	 * 
+	 *
 	 * This plugin automatically resizes the content area to fit its content height.
 	 * It will retain a minimum height, which is the height of the content area when
 	 * it's initialized.
@@ -35,10 +35,10 @@
 			 * This method gets executed each time the editor needs to resize.
 			 */
 			function resize() {
-				var d = ed.getDoc(), b = d.body, de = d.documentElement, DOM = tinymce.DOM, resizeHeight = t.autoresize_min_height, myHeight;
+				var deltaSize, d = ed.getDoc(), body = d.body, de = d.documentElement, DOM = tinymce.DOM, resizeHeight = t.autoresize_min_height, myHeight;
 
 				// Get height differently depending on the browser used
-				myHeight = tinymce.isIE ? b.scrollHeight : d.body.offsetHeight;
+				myHeight = tinymce.isIE ? body.scrollHeight : (tinymce.isWebKit && body.clientHeight == 0 ? 0 : body.offsetHeight);
 
 				// Don't make it smaller than the minimum height
 				if (myHeight > t.autoresize_min_height)
@@ -47,30 +47,34 @@
 				// If a maximum height has been defined don't exceed this height
 				if (t.autoresize_max_height && myHeight > t.autoresize_max_height) {
 					resizeHeight = t.autoresize_max_height;
-					ed.getBody().style.overflowY = "auto";
-				} else
-					ed.getBody().style.overflowY = "hidden";
+					body.style.overflowY = "auto";
+					de.style.overflowY = "auto"; // Old IE
+				} else {
+					body.style.overflowY = "hidden";
+					de.style.overflowY = "hidden"; // Old IE
+					body.scrollTop = 0;
+				}
 
 				// Resize content element
 				if (resizeHeight !== oldSize) {
+					deltaSize = resizeHeight - oldSize;
 					DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');
 					oldSize = resizeHeight;
-				}
 
-				// if we're throbbing, we'll re-throb to match the new size
-				if (t.throbbing) {
-					ed.setProgressState(false);
-					ed.setProgressState(true);
+					// WebKit doesn't decrease the size of the body element until the iframe gets resized
+					// So we need to continue to resize the iframe down until the size gets fixed
+					if (tinymce.isWebKit && deltaSize < 0)
+						resize();
 				}
 			};
 
 			t.editor = ed;
 
 			// Define minimum height
-			t.autoresize_min_height = parseInt( ed.getParam('autoresize_min_height', ed.getElement().offsetHeight) );
+			t.autoresize_min_height = parseInt(ed.getParam('autoresize_min_height', ed.getElement().offsetHeight));
 
-			// Define maximum height	
-			t.autoresize_max_height = parseInt( ed.getParam('autoresize_max_height', 0) );
+			// Define maximum height
+			t.autoresize_max_height = parseInt(ed.getParam('autoresize_max_height', 0));
 
 			// Add padding at the bottom for better UX
 			ed.onInit.add(function(ed){
@@ -85,30 +89,8 @@
 			ed.onPostRender.add(resize);
 
 			if (ed.getParam('autoresize_on_init', true)) {
-				// Things to do when the editor is ready
-				ed.onInit.add(function(ed, l) {
-					// Show throbber until content area is resized properly
-					ed.setProgressState(true);
-					t.throbbing = true;
-
-					// Hide scrollbars
-					ed.getBody().style.overflowY = "hidden";
-				});
-
-				ed.onLoadContent.add(function(ed, l) {
-					resize();
-
-					// Because the content area resizes when its content CSS loads,
-					// and we can't easily add a listener to its onload event,
-					// we'll just trigger a resize after a short loading period
-					setTimeout(function() {
-						resize();
-
-						// Disable throbber
-						ed.setProgressState(false);
-						t.throbbing = false;
-					}, 1250);
-				});
+				ed.onLoad.add(resize);
+				ed.onLoadContent.add(resize);
 			}
 
 			// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');