storytime 2.1.6 → 2.1.7

data/spec/requests/routings_spec.rb

@@ -2,8 +2,8 @@ require "spec_helper"
 
 describe "Root path", type: :request do
   it "routes to blog_homepage#show when site homepage is a blog" do
-    site = FactoryGirl.create(:site)
-    user = FactoryGirl.create(:admin)
+    site = FactoryBot.create(:site)
+    user = FactoryBot.create(:admin)
     site.save_with_seeds(user)
     site.homepage = site.blogs.first
 
@@ -14,12 +14,11 @@ describe "Root path", type: :request do
   end
 
   it "routes to pages#show when site homepage is page" do
-    site = FactoryGirl.create(:site)
-    user = FactoryGirl.create(:admin)
-    home_page = FactoryGirl.create(:page, site: site)
+    site = FactoryBot.create(:site)
+    user = FactoryBot.create(:admin)
+    home_page = FactoryBot.create(:page, site: site)    
     site.save_with_seeds(user)
-    site.homepage = home_page
-    site.save
+    site.update_attribute :root_post_id, home_page.id
 
     get "/"
 
@@ -31,8 +30,8 @@ end
 
 describe "Post path", type: :request do
   it "uses /posts/post-slug when site#post_slug_style is default" do
-    site = FactoryGirl.create(:site, post_slug_style: :default, custom_domain: "www.example.com")
-    post = FactoryGirl.create(:post, site: site)
+    site = FactoryBot.create(:site, post_slug_style: :default, custom_domain: "www.example.com")
+    post = FactoryBot.create(:post, site: site)
     expect(storytime.post_path(post)).to  eq("/posts/#{post.slug}")
 
     get url_for([post, only_path: true])
@@ -43,8 +42,8 @@ describe "Post path", type: :request do
   end
 
   it "uses /year/month/day/post-slug when site#post_slug_style is day_and_name" do
-    site = FactoryGirl.create(:site, post_slug_style: :day_and_name, custom_domain: "www.example.com")
-    post = FactoryGirl.create(:post, site: site)
+    site = FactoryBot.create(:site, post_slug_style: :day_and_name, custom_domain: "www.example.com")
+    post = FactoryBot.create(:post, site: site)
     date = post.created_at.to_date
 
     expect(url_for([post, only_path: true])).to  eq("/#{date.year}/#{date.strftime('%m')}/#{date.strftime('%d')}/#{post.slug}")
@@ -57,8 +56,8 @@ describe "Post path", type: :request do
   end
 
   it "uses /year/month/post-slug when site#post_slug_style is month_and_name" do
-    site = FactoryGirl.create(:site, post_slug_style: :month_and_name, custom_domain: "www.example.com")
-    post = FactoryGirl.create(:post, site: site)
+    site = FactoryBot.create(:site, post_slug_style: :month_and_name, custom_domain: "www.example.com")
+    post = FactoryBot.create(:post, site: site)
     date = post.created_at.to_date
     expect(url_for([post, only_path: true])).to  eq("/#{date.year}/#{date.strftime('%m')}/#{post.slug}")
 
@@ -70,8 +69,8 @@ describe "Post path", type: :request do
   end
 
   it "uses /post-id when site#post_slug_style is post_id" do
-    site = FactoryGirl.create(:site, post_slug_style: :post_id, custom_domain: "www.example.com")
-    post = FactoryGirl.create(:post, site: site)
+    site = FactoryBot.create(:site, post_slug_style: :post_id, custom_domain: "www.example.com")
+    post = FactoryBot.create(:post, site: site)
     expect(url_for([post, only_path: true])).to eq("/posts/#{post.id}")
 
     get url_for([post, only_path: true])

data/spec/spec_helper.rb

@@ -2,32 +2,25 @@
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
-require 'factory_girl_rails'
+require 'factory_bot_rails'
 require 'capybara/rails'
 require 'capybara/rspec'
-require 'capybara/poltergeist'
+require 'capybara/cuprite'
 require "pundit/rspec"
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
+# require "pry-byebug"
+# binding.pry
 ActiveRecord::Migration.maintain_test_schema!
 
-poltergeist_options = {
-  phantomjs_logger: Logger.new('/dev/null'),
-  # inspector: true,
-  # debug: true,
-  phantomjs_options: ['--load-images=no', '--ignore-ssl-errors=yes', '--ssl-protocol=TLSv1'],
-  js_errors: false
-}
-
-Capybara.register_driver :poltergeist_st do |app|
-  Capybara::Poltergeist::Driver.new(app, poltergeist_options)
+Capybara.register_driver :cuprite do |app|
+  Capybara::Cuprite::Driver.new(app, js_errors: false, headless: true)
 end
 
-Capybara.javascript_driver = :poltergeist_st
+Capybara.javascript_driver = :cuprite
 
 RSpec.configure do |config|
 
@@ -79,7 +72,7 @@ RSpec.configure do |config|
 
   config.include FeatureMacros, type: :feature
   config.include Storytime::Engine.routes.url_helpers
-  config.include Devise::TestHelpers, type: :controller
+  config.include Devise::Test::ControllerHelpers, type: :controller
 
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true

data/spec/support/domains.rb

@@ -2,13 +2,13 @@ RSpec.configure do |config|
   Capybara.always_include_port = true
 
   config.before(type: :feature) do
-    @current_site ||= FactoryGirl.build(:site)
+    @current_site ||= FactoryBot.build(:site)
     set_domain @current_site.custom_domain
   end
 
   config.before(type: :controller) do
     @request.env["devise.mapping"] = Devise.mappings[:user]
-    @current_site ||= FactoryGirl.create(:site)
+    @current_site ||= FactoryBot.create(:site)
     @request.host = @current_site.custom_domain
   end
 end

data/spec/support/feature_macros.rb

@@ -1,6 +1,6 @@
 module FeatureMacros
   def login(user = nil, skip_site = false)
-    user ||= FactoryGirl.create(:user)
+    user ||= FactoryBot.create(:user)
     unless skip_site
       setup_site(user)
       set_domain(@current_site.custom_domain)
@@ -18,15 +18,15 @@ module FeatureMacros
   end
 
   def login_admin(admin = nil)
-    login FactoryGirl.create(:admin)
+    login FactoryBot.create(:admin)
   end
 
   def login_editor(editor = nil)
-    login FactoryGirl.create(:editor)
+    login FactoryBot.create(:editor)
   end
 
   def login_writer(writer = nil)
-    login FactoryGirl.create(:writer)
+    login FactoryBot.create(:writer)
   end
   
   def current_user
@@ -38,7 +38,7 @@ module FeatureMacros
   end
 
   def setup_site(user)
-    @current_site ||= FactoryGirl.create(:site)
+    @current_site ||= FactoryBot.create(:site)
     @current_site.save_with_seeds(user)
     @current_site.homepage = @current_site.blogs.first
     @current_site.save

data/spec/support/pundit_matcher.rb

@@ -3,11 +3,11 @@ RSpec::Matchers.define :permit! do |action|
     policy.public_send("#{action}?")
   end
 
-  failure_message_for_should do |policy|
+  failure_message do |policy|
     "#{policy.class} does not permit #{action} on #{policy.record} for #{policy.user.inspect}."
   end
 
-  failure_message_for_should_not do |policy|
+  failure_message_when_negated do |policy|
     "#{policy.class} does not forbid #{action} on #{policy.record} for #{policy.user.inspect}."
   end
-end
+end

data/storytime.gemspec

@@ -18,44 +18,39 @@ Gem::Specification.new do |s|
   s.test_files = Dir["spec/**/*"] - Dir["spec/dummy/tmp/**/*"] - Dir["spec/dummy/log/*"] - Dir["spec/dummy/public/uploads/**/*"]
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", ">= 4.0", '< 5.1'
-  s.add_dependency "pundit", ">= 0.2"
-  s.add_dependency "kaminari", ">= 0.15"
-  s.add_dependency "jbuilder", ">= 1.5"
+  s.add_dependency "rails", ">= 7.0"
+  s.add_dependency "pundit", ">= 2.0.0"
+  s.add_dependency "kaminari", ">= 1.0.0"
+  s.add_dependency "jbuilder", ">= 2.0.0"
   s.add_dependency "sass-rails", ">= 4.0"
   s.add_dependency "bootstrap-sass", ">= 3.1"
   s.add_dependency "coffee-rails", ">= 4.0"
   s.add_dependency "jquery-rails", ">= 3.0"
   s.add_dependency "simple_form", ">= 3.0"
   s.add_dependency "friendly_id", ">= 5.0"
-  s.add_dependency "fog", ">= 1.18"
-  s.add_dependency "carrierwave", ">= 1.0"
+  s.add_dependency "fog-aws", ">= 3.0"
+  s.add_dependency "carrierwave", ">= 3.0"
   s.add_dependency "mini_magick", ">= 3.7"
   s.add_dependency "nokogiri", ">= 1.6"
-  s.add_dependency "font-awesome-sass", ">= 4.0.3"
-  s.add_dependency "jquery-ui-rails", "~> 5.0"
-  s.add_dependency "thor", "~> 0.19.1"
-  s.add_dependency "leather", ">= 3.5"
-  s.add_dependency "codemirror-rails", ">=5.0"
-  s.add_dependency "storytime-admin", "~> 0.2"
+  s.add_dependency "font-awesome-sass", "<= 4.7.0"
+  s.add_dependency "jquery-ui-rails", ">= 6.0"
+  s.add_dependency "thor", ">= 0.19.1"
   s.add_dependency "devise", ">= 3.2"
   s.add_dependency "cocoon"
   s.add_dependency "acts_as_list"
+  s.add_dependency "sprockets", ">= 3.7", "< 4.0"
 
   s.add_development_dependency "pg"
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency "capybara"
-  s.add_development_dependency "poltergeist", "~>1.5"
-  s.add_development_dependency "factory_girl_rails"
-  s.add_development_dependency "guard-rspec", "~> 4.2.8"
-  s.add_development_dependency "spring-commands-rspec"
-  s.add_development_dependency "spring", "1.1.3"
+  s.add_development_dependency "cuprite"
+  s.add_development_dependency "factory_bot_rails"
+  s.add_development_dependency "guard-rspec"
   s.add_development_dependency "rb-fsevent"
-  s.add_development_dependency "pry-nav"
-  s.add_development_dependency "pry-stack_explorer"
+  s.add_development_dependency "debug"
   s.add_development_dependency "database_cleaner"
   s.add_development_dependency "better_errors"
   s.add_development_dependency "binding_of_caller"
   s.add_development_dependency "launchy"
-  s.add_development_dependency "thin"
+  s.add_development_dependency "puma"
 end

data/vendor/assets/javascripts/codemirror/addons/edit/closebrackets.js

@@ -0,0 +1,195 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  var defaults = {
+    pairs: "()[]{}''\"\"",
+    triples: "",
+    explode: "[]{}"
+  };
+
+  var Pos = CodeMirror.Pos;
+
+  CodeMirror.defineOption("autoCloseBrackets", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.removeKeyMap(keyMap);
+      cm.state.closeBrackets = null;
+    }
+    if (val) {
+      cm.state.closeBrackets = val;
+      cm.addKeyMap(keyMap);
+    }
+  });
+
+  function getOption(conf, name) {
+    if (name == "pairs" && typeof conf == "string") return conf;
+    if (typeof conf == "object" && conf[name] != null) return conf[name];
+    return defaults[name];
+  }
+
+  var bind = defaults.pairs + "`";
+  var keyMap = {Backspace: handleBackspace, Enter: handleEnter};
+  for (var i = 0; i < bind.length; i++)
+    keyMap["'" + bind.charAt(i) + "'"] = handler(bind.charAt(i));
+
+  function handler(ch) {
+    return function(cm) { return handleChar(cm, ch); };
+  }
+
+  function getConfig(cm) {
+    var deflt = cm.state.closeBrackets;
+    if (!deflt) return null;
+    var mode = cm.getModeAt(cm.getCursor());
+    return mode.closeBrackets || deflt;
+  }
+
+  function handleBackspace(cm) {
+    var conf = getConfig(cm);
+    if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var pairs = getOption(conf, "pairs");
+    var ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var around = charsAround(cm, ranges[i].head);
+      if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+    }
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var cur = ranges[i].head;
+      cm.replaceRange("", Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1), "+delete");
+    }
+  }
+
+  function handleEnter(cm) {
+    var conf = getConfig(cm);
+    var explode = conf && getOption(conf, "explode");
+    if (!explode || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var around = charsAround(cm, ranges[i].head);
+      if (!around || explode.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+    }
+    cm.operation(function() {
+      cm.replaceSelection("\n\n", null);
+      cm.execCommand("goCharLeft");
+      ranges = cm.listSelections();
+      for (var i = 0; i < ranges.length; i++) {
+        var line = ranges[i].head.line;
+        cm.indentLine(line, null, true);
+        cm.indentLine(line + 1, null, true);
+      }
+    });
+  }
+
+  function contractSelection(sel) {
+    var inverted = CodeMirror.cmpPos(sel.anchor, sel.head) > 0;
+    return {anchor: new Pos(sel.anchor.line, sel.anchor.ch + (inverted ? -1 : 1)),
+            head: new Pos(sel.head.line, sel.head.ch + (inverted ? 1 : -1))};
+  }
+
+  function handleChar(cm, ch) {
+    var conf = getConfig(cm);
+    if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var pairs = getOption(conf, "pairs");
+    var pos = pairs.indexOf(ch);
+    if (pos == -1) return CodeMirror.Pass;
+    var triples = getOption(conf, "triples");
+
+    var identical = pairs.charAt(pos + 1) == ch;
+    var ranges = cm.listSelections();
+    var opening = pos % 2 == 0;
+
+    var type;
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i], cur = range.head, curType;
+      var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
+      if (opening && !range.empty()) {
+        curType = "surround";
+      } else if ((identical || !opening) && next == ch) {
+        if (triples.indexOf(ch) >= 0 && cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == ch + ch + ch)
+          curType = "skipThree";
+        else
+          curType = "skip";
+      } else if (identical && cur.ch > 1 && triples.indexOf(ch) >= 0 &&
+                 cm.getRange(Pos(cur.line, cur.ch - 2), cur) == ch + ch &&
+                 (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != ch)) {
+        curType = "addFour";
+      } else if (identical) {
+        if (!CodeMirror.isWordChar(next) && enteringString(cm, cur, ch)) curType = "both";
+        else return CodeMirror.Pass;
+      } else if (opening && (cm.getLine(cur.line).length == cur.ch ||
+                             isClosingBracket(next, pairs) ||
+                             /\s/.test(next))) {
+        curType = "both";
+      } else {
+        return CodeMirror.Pass;
+      }
+      if (!type) type = curType;
+      else if (type != curType) return CodeMirror.Pass;
+    }
+
+    var left = pos % 2 ? pairs.charAt(pos - 1) : ch;
+    var right = pos % 2 ? ch : pairs.charAt(pos + 1);
+    cm.operation(function() {
+      if (type == "skip") {
+        cm.execCommand("goCharRight");
+      } else if (type == "skipThree") {
+        for (var i = 0; i < 3; i++)
+          cm.execCommand("goCharRight");
+      } else if (type == "surround") {
+        var sels = cm.getSelections();
+        for (var i = 0; i < sels.length; i++)
+          sels[i] = left + sels[i] + right;
+        cm.replaceSelections(sels, "around");
+        sels = cm.listSelections().slice();
+        for (var i = 0; i < sels.length; i++)
+          sels[i] = contractSelection(sels[i]);
+        cm.setSelections(sels);
+      } else if (type == "both") {
+        cm.replaceSelection(left + right, null);
+        cm.triggerElectric(left + right);
+        cm.execCommand("goCharLeft");
+      } else if (type == "addFour") {
+        cm.replaceSelection(left + left + left + left, "before");
+        cm.execCommand("goCharRight");
+      }
+    });
+  }
+
+  function isClosingBracket(ch, pairs) {
+    var pos = pairs.lastIndexOf(ch);
+    return pos > -1 && pos % 2 == 1;
+  }
+
+  function charsAround(cm, pos) {
+    var str = cm.getRange(Pos(pos.line, pos.ch - 1),
+                          Pos(pos.line, pos.ch + 1));
+    return str.length == 2 ? str : null;
+  }
+
+  // Project the token type that will exists after the given char is
+  // typed, and use it to determine whether it would cause the start
+  // of a string token.
+  function enteringString(cm, pos, ch) {
+    var line = cm.getLine(pos.line);
+    var token = cm.getTokenAt(pos);
+    if (/\bstring2?\b/.test(token.type)) return false;
+    var stream = new CodeMirror.StringStream(line.slice(0, pos.ch) + ch + line.slice(pos.ch), 4);
+    stream.pos = stream.start = token.start;
+    for (;;) {
+      var type1 = cm.getMode().token(stream, token.state);
+      if (stream.pos >= pos.ch + 1) return /\bstring2?\b/.test(type1);
+      stream.start = stream.pos;
+    }
+  }
+});

data/vendor/assets/javascripts/codemirror/addons/edit/closetag.js

@@ -0,0 +1,169 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/**
+ * Tag-closer extension for CodeMirror.
+ *
+ * This extension adds an "autoCloseTags" option that can be set to
+ * either true to get the default behavior, or an object to further
+ * configure its behavior.
+ *
+ * These are supported options:
+ *
+ * `whenClosing` (default true)
+ *   Whether to autoclose when the '/' of a closing tag is typed.
+ * `whenOpening` (default true)
+ *   Whether to autoclose the tag when the final '>' of an opening
+ *   tag is typed.
+ * `dontCloseTags` (default is empty tags for HTML, none for XML)
+ *   An array of tag names that should not be autoclosed.
+ * `indentTags` (default is block tags for HTML, none for XML)
+ *   An array of tag names that should, when opened, cause a
+ *   blank line to be added inside the tag, and the blank line and
+ *   closing line to be indented.
+ *
+ * See demos/closetag.html for a usage example.
+ */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../fold/xml-fold"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../fold/xml-fold"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  CodeMirror.defineOption("autoCloseTags", false, function(cm, val, old) {
+    if (old != CodeMirror.Init && old)
+      cm.removeKeyMap("autoCloseTags");
+    if (!val) return;
+    var map = {name: "autoCloseTags"};
+    if (typeof val != "object" || val.whenClosing)
+      map["'/'"] = function(cm) { return autoCloseSlash(cm); };
+    if (typeof val != "object" || val.whenOpening)
+      map["'>'"] = function(cm) { return autoCloseGT(cm); };
+    cm.addKeyMap(map);
+  });
+
+  var htmlDontClose = ["area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "meta", "param",
+                       "source", "track", "wbr"];
+  var htmlIndent = ["applet", "blockquote", "body", "button", "div", "dl", "fieldset", "form", "frameset", "h1", "h2", "h3", "h4",
+                    "h5", "h6", "head", "html", "iframe", "layer", "legend", "object", "ol", "p", "select", "table", "ul"];
+
+  function autoCloseGT(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    var ranges = cm.listSelections(), replacements = [];
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var pos = ranges[i].head, tok = cm.getTokenAt(pos);
+      var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
+      if (inner.mode.name != "xml" || !state.tagName) return CodeMirror.Pass;
+
+      var opt = cm.getOption("autoCloseTags"), html = inner.mode.configuration == "html";
+      var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
+      var indentTags = (typeof opt == "object" && opt.indentTags) || (html && htmlIndent);
+
+      var tagName = state.tagName;
+      if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
+      var lowerTagName = tagName.toLowerCase();
+      // Don't process the '>' at the end of an end-tag or self-closing tag
+      if (!tagName ||
+          tok.type == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
+          tok.type == "tag" && state.type == "closeTag" ||
+          tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
+          dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1 ||
+          closingTagExists(cm, tagName, pos, state, true))
+        return CodeMirror.Pass;
+
+      var indent = indentTags && indexOf(indentTags, lowerTagName) > -1;
+      replacements[i] = {indent: indent,
+                         text: ">" + (indent ? "\n\n" : "") + "</" + tagName + ">",
+                         newPos: indent ? CodeMirror.Pos(pos.line + 1, 0) : CodeMirror.Pos(pos.line, pos.ch + 1)};
+    }
+
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var info = replacements[i];
+      cm.replaceRange(info.text, ranges[i].head, ranges[i].anchor, "+insert");
+      var sel = cm.listSelections().slice(0);
+      sel[i] = {head: info.newPos, anchor: info.newPos};
+      cm.setSelections(sel);
+      if (info.indent) {
+        cm.indentLine(info.newPos.line, null, true);
+        cm.indentLine(info.newPos.line + 1, null, true);
+      }
+    }
+  }
+
+  function autoCloseCurrent(cm, typingSlash) {
+    var ranges = cm.listSelections(), replacements = [];
+    var head = typingSlash ? "/" : "</";
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var pos = ranges[i].head, tok = cm.getTokenAt(pos);
+      var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
+      if (typingSlash && (tok.type == "string" || tok.string.charAt(0) != "<" ||
+                          tok.start != pos.ch - 1))
+        return CodeMirror.Pass;
+      // Kludge to get around the fact that we are not in XML mode
+      // when completing in JS/CSS snippet in htmlmixed mode. Does not
+      // work for other XML embedded languages (there is no general
+      // way to go from a mixed mode to its current XML state).
+      var replacement;
+      if (inner.mode.name != "xml") {
+        if (cm.getMode().name == "htmlmixed" && inner.mode.name == "javascript")
+          replacement = head + "script";
+        else if (cm.getMode().name == "htmlmixed" && inner.mode.name == "css")
+          replacement = head + "style";
+        else
+          return CodeMirror.Pass;
+      } else {
+        if (!state.context || !state.context.tagName ||
+            closingTagExists(cm, state.context.tagName, pos, state))
+          return CodeMirror.Pass;
+        replacement = head + state.context.tagName;
+      }
+      if (cm.getLine(pos.line).charAt(tok.end) != ">") replacement += ">";
+      replacements[i] = replacement;
+    }
+    cm.replaceSelections(replacements);
+    ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++)
+      if (i == ranges.length - 1 || ranges[i].head.line < ranges[i + 1].head.line)
+        cm.indentLine(ranges[i].head.line);
+  }
+
+  function autoCloseSlash(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    return autoCloseCurrent(cm, true);
+  }
+
+  CodeMirror.commands.closeTag = function(cm) { return autoCloseCurrent(cm); };
+
+  function indexOf(collection, elt) {
+    if (collection.indexOf) return collection.indexOf(elt);
+    for (var i = 0, e = collection.length; i < e; ++i)
+      if (collection[i] == elt) return i;
+    return -1;
+  }
+
+  // If xml-fold is loaded, we use its functionality to try and verify
+  // whether a given tag is actually unclosed.
+  function closingTagExists(cm, tagName, pos, state, newTag) {
+    if (!CodeMirror.scanForClosingTag) return false;
+    var end = Math.min(cm.lastLine() + 1, pos.line + 500);
+    var nextClose = CodeMirror.scanForClosingTag(cm, pos, null, end);
+    if (!nextClose || nextClose.tag != tagName) return false;
+    var cx = state.context;
+    // If the immediate wrapping context contains onCx instances of
+    // the same tag, a closing tag only exists if there are at least
+    // that many closing tags of that type following.
+    for (var onCx = newTag ? 1 : 0; cx && cx.tagName == tagName; cx = cx.prev) ++onCx;
+    pos = nextClose.to;
+    for (var i = 1; i < onCx; i++) {
+      var next = CodeMirror.scanForClosingTag(cm, pos, null, end);
+      if (!next || next.tag != tagName) return false;
+      pos = next.to;
+    }
+    return true;
+  }
+});