tinymce-rails 4.6.3 → 4.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93f9f956e1b77cb470a5d45af711fc2a52852b08
-  data.tar.gz: 181e78dff51dc4ee7b10311beca8ba0e8751f8d6
+  metadata.gz: 6ce018de101ce52c7c97b1ec464c50a96f25805a
+  data.tar.gz: 31c037f319b428cecdd48ec343fdd5f28f5259bc
 SHA512:
-  metadata.gz: 52bcf8174f2c22c67f78a146b3fbdf82d90a2c17a156bebb4538ae09ed3ed1a302bc4ec22f63e2012b89e5a35133555f9dab6bcccb84b75e692c18a5e69817d3
-  data.tar.gz: 8b50bf67723ea5e42f4b289e0d40161ccc83f43e26cc7743e7ec6a24e736230279d83374062c214933d321ad6604dd3110765d67c7c2e1029a5d27fb2ac6cc97
+  metadata.gz: 83fc0e180593e62c25bcf6fc3b9a3d8d5aa19b747a67173045ee8db0237fca26f43ab826cc03187caf1feee8bfaf43067676bc45b450f398637331b2b575139b
+  data.tar.gz: ea0d70f73da56bca7beb9a6b0e4beb4862247c137a329c35d0ac9127ba47538ad4a09f7bf218633bff60c0a86a35f4819fd8fe1cff862d9dfc37efc504e09452

data/app/assets/source/tinymce/tinymce.js

@@ -1,4 +1,4 @@
-// 4.6.3 (2017-05-30)
+// 4.6.4 (2017-06-13)
 (function () {
 
 var defs = {}; // id -> {dependencies, definition, instance (possibly undefined)}
@@ -82,7 +82,7 @@ var defineGlobal = function (id, ref) {
   define(id, [], function () { return ref; });
 };
 /*jsc
-["tinymce.core.api.Main","tinymce.core.api.Tinymce","tinymce.core.Register","tinymce.core.geom.Rect","tinymce.core.util.Promise","tinymce.core.util.Delay","tinymce.core.Env","tinymce.core.dom.EventUtils","tinymce.core.dom.Sizzle","tinymce.core.util.Tools","tinymce.core.dom.DomQuery","tinymce.core.html.Styles","tinymce.core.dom.TreeWalker","tinymce.core.html.Entities","tinymce.core.dom.DOMUtils","tinymce.core.dom.ScriptLoader","tinymce.core.AddOnManager","tinymce.core.dom.RangeUtils","tinymce.core.html.Node","tinymce.core.html.Schema","tinymce.core.html.SaxParser","tinymce.core.html.DomParser","tinymce.core.html.Writer","tinymce.core.html.Serializer","tinymce.core.dom.Serializer","tinymce.core.util.VK","tinymce.core.dom.ControlSelection","tinymce.core.dom.BookmarkManager","tinymce.core.dom.Selection","tinymce.core.Formatter","tinymce.core.UndoManager","tinymce.core.EditorCommands","tinymce.core.util.URI","tinymce.core.util.Class","tinymce.core.util.EventDispatcher","tinymce.core.util.Observable","tinymce.core.WindowManager","tinymce.core.NotificationManager","tinymce.core.EditorObservable","tinymce.core.Shortcuts","tinymce.core.Editor","tinymce.core.util.I18n","tinymce.core.FocusManager","tinymce.core.EditorManager","tinymce.core.util.XHR","tinymce.core.util.JSON","tinymce.core.util.JSONRequest","tinymce.core.util.JSONP","tinymce.core.util.LocalStorage","tinymce.core.api.Compat","tinymce.core.util.Color","tinymce.core.ui.Api","tinymce.core.util.Arr","tinymce.core.dom.Range","tinymce.core.dom.StyleSheetLoader","tinymce.core.dom.NodeType","tinymce.core.caret.CaretContainer","tinymce.core.text.Zwsp","tinymce.core.caret.CaretBookmark","tinymce.core.caret.CaretPosition","tinymce.core.dom.ScrollIntoView","tinymce.core.dom.TridentSelection","tinymce.core.selection.FragmentReader","tinymce.core.dom.ElementUtils","tinymce.core.util.Fun","tinymce.core.fmt.Preview","tinymce.core.fmt.Hooks","tinymce.core.undo.Levels","tinymce.core.delete.DeleteCommands","tinymce.core.InsertContent","global!document","tinymce.core.ui.Window","tinymce.core.ui.MessageBox","tinymce.core.ui.Notification","tinymce.core.init.Render","tinymce.core.Mode","tinymce.core.ui.Sidebar","tinymce.core.util.Uuid","tinymce.core.ErrorReporter","tinymce.core.LegacyInput","tinymce.core.ui.Selector","tinymce.core.ui.Collection","tinymce.core.ui.ReflowQueue","tinymce.core.ui.Control","tinymce.core.ui.Factory","tinymce.core.ui.KeyboardNavigation","tinymce.core.ui.Container","tinymce.core.ui.DragHelper","tinymce.core.ui.Scrollable","tinymce.core.ui.Panel","tinymce.core.ui.Movable","tinymce.core.ui.Resizable","tinymce.core.ui.FloatPanel","tinymce.core.ui.Tooltip","tinymce.core.ui.Widget","tinymce.core.ui.Progress","tinymce.core.ui.Layout","tinymce.core.ui.AbsoluteLayout","tinymce.core.ui.Button","tinymce.core.ui.ButtonGroup","tinymce.core.ui.Checkbox","tinymce.core.ui.ComboBox","tinymce.core.ui.ColorBox","tinymce.core.ui.PanelButton","tinymce.core.ui.ColorButton","tinymce.core.ui.ColorPicker","tinymce.core.ui.Path","tinymce.core.ui.ElementPath","tinymce.core.ui.FormItem","tinymce.core.ui.Form","tinymce.core.ui.FieldSet","tinymce.core.ui.FilePicker","tinymce.core.ui.FitLayout","tinymce.core.ui.FlexLayout","tinymce.core.ui.FlowLayout","tinymce.core.ui.FormatControls","tinymce.core.ui.GridLayout","tinymce.core.ui.Iframe","tinymce.core.ui.InfoBox","tinymce.core.ui.Label","tinymce.core.ui.Toolbar","tinymce.core.ui.MenuBar","tinymce.core.ui.MenuButton","tinymce.core.ui.MenuItem","tinymce.core.ui.Throbber","tinymce.core.ui.Menu","tinymce.core.ui.ListBox","tinymce.core.ui.Radio","tinymce.core.ui.ResizeHandle","tinymce.core.ui.SelectBox","tinymce.core.ui.Slider","tinymce.core.ui.Spacer","tinymce.core.ui.SplitButton","tinymce.core.ui.StackLayout","tinymce.core.ui.TabPanel","tinymce.core.ui.TextBox","ephox.katamari.api.Arr","ephox.katamari.api.Fun","ephox.katamari.api.Future","ephox.katamari.api.Futures","ephox.katamari.api.Result","tinymce.core.caret.CaretCandidate","tinymce.core.geom.ClientRect","tinymce.core.text.ExtendingChar","ephox.sugar.api.dom.Insert","ephox.sugar.api.dom.Replication","ephox.sugar.api.node.Element","ephox.sugar.api.node.Fragment","ephox.sugar.api.node.Node","tinymce.core.dom.ElementType","tinymce.core.dom.Parents","tinymce.core.selection.SelectionUtils","tinymce.core.undo.Fragments","tinymce.core.delete.BlockBoundaryDelete","tinymce.core.delete.BlockRangeDelete","tinymce.core.delete.CefDelete","tinymce.core.delete.InlineBoundaryDelete","tinymce.core.caret.CaretWalker","tinymce.core.dom.RangeNormalizer","tinymce.core.InsertList","tinymce.core.data.ObservableObject","tinymce.core.ui.DomUtils","tinymce.core.ui.BoxUtils","tinymce.core.ui.ClassList","global!window","tinymce.core.init.Init","tinymce.core.PluginManager","tinymce.core.ThemeManager","tinymce.core.content.LinkTargets","tinymce.core.fmt.FontInfo","ephox.katamari.api.Option","global!Array","global!Error","global!String","ephox.katamari.api.LazyValue","ephox.katamari.async.Bounce","ephox.katamari.async.AsyncValues","ephox.sugar.api.search.Traverse","ephox.sugar.api.properties.Attr","global!console","ephox.sugar.api.dom.InsertAll","ephox.sugar.api.dom.Remove","ephox.sugar.api.node.NodeTypes","ephox.sugar.api.dom.Compare","ephox.katamari.api.Options","tinymce.core.undo.Diff","tinymce.core.delete.BlockBoundary","tinymce.core.delete.MergeBlocks","tinymce.core.delete.DeleteUtils","tinymce.core.caret.CaretUtils","tinymce.core.delete.CefDeleteAction","tinymce.core.delete.DeleteElement","tinymce.core.caret.CaretFinder","tinymce.core.keyboard.BoundaryCaret","tinymce.core.keyboard.BoundaryLocation","tinymce.core.keyboard.BoundarySelection","tinymce.core.keyboard.InlineUtils","tinymce.core.data.Binding","tinymce.core.init.InitContentBody","global!Object","global!setTimeout","ephox.katamari.api.Type","ephox.katamari.api.Struct","ephox.sugar.alien.Recurse","ephox.sand.api.Node","ephox.sand.api.PlatformDetection","ephox.sugar.api.search.Selectors","ephox.katamari.api.Obj","ephox.sugar.api.search.PredicateFind","tinymce.core.dom.Empty","ephox.katamari.api.Adt","tinymce.core.text.Bidi","tinymce.core.caret.CaretContainerInline","tinymce.core.caret.CaretContainerRemove","tinymce.core.util.LazyEvaluator","ephox.katamari.api.Cell","tinymce.core.caret.CaretContainerInput","tinymce.core.EditorUpload","tinymce.core.ForceBlocks","tinymce.core.keyboard.KeyboardOverrides","tinymce.core.NodeChange","tinymce.core.SelectionOverrides","tinymce.core.util.Quirks","ephox.katamari.data.Immutable","ephox.katamari.data.MixedBag","ephox.sand.util.Global","ephox.katamari.api.Thunk","ephox.sand.core.PlatformDetection","global!navigator","ephox.sugar.api.node.Body","ephox.sugar.impl.ClosestOrAncestor","ephox.sugar.api.search.SelectorExists","tinymce.core.file.Uploader","tinymce.core.file.ImageScanner","tinymce.core.file.BlobCache","tinymce.core.file.UploadStatus","tinymce.core.keyboard.ArrowKeys","tinymce.core.keyboard.DeleteBackspaceKeys","tinymce.core.keyboard.EnterKey","tinymce.core.keyboard.SpaceKey","tinymce.core.caret.FakeCaret","tinymce.core.caret.LineUtils","tinymce.core.DragDropOverrides","tinymce.core.keyboard.CefUtils","tinymce.core.dom.NodePath","ephox.katamari.util.BagUtils","ephox.katamari.api.Resolve","ephox.sand.core.Browser","ephox.sand.core.OperatingSystem","ephox.sand.detect.DeviceType","ephox.sand.detect.UaString","ephox.sand.info.PlatformInfo","ephox.sugar.api.search.SelectorFind","tinymce.core.file.Conversions","global!URL","tinymce.core.keyboard.CefNavigation","tinymce.core.keyboard.MatchKeys","tinymce.core.keyboard.InsertSpace","tinymce.core.dom.Dimensions","tinymce.core.dom.MousePosition","ephox.katamari.api.Global","ephox.sand.detect.Version","ephox.katamari.api.Strings","tinymce.core.caret.LineWalker","ephox.katamari.api.Merger","global!Number","ephox.katamari.str.StrAppend","ephox.katamari.str.StringParts"]
+["tinymce.core.api.Main","tinymce.core.api.Tinymce","tinymce.core.Register","tinymce.core.geom.Rect","tinymce.core.util.Promise","tinymce.core.util.Delay","tinymce.core.Env","tinymce.core.dom.EventUtils","tinymce.core.dom.Sizzle","tinymce.core.util.Tools","tinymce.core.dom.DomQuery","tinymce.core.html.Styles","tinymce.core.dom.TreeWalker","tinymce.core.html.Entities","tinymce.core.dom.DOMUtils","tinymce.core.dom.ScriptLoader","tinymce.core.AddOnManager","tinymce.core.dom.RangeUtils","tinymce.core.html.Node","tinymce.core.html.Schema","tinymce.core.html.SaxParser","tinymce.core.html.DomParser","tinymce.core.html.Writer","tinymce.core.html.Serializer","tinymce.core.dom.Serializer","tinymce.core.util.VK","tinymce.core.dom.ControlSelection","tinymce.core.dom.BookmarkManager","tinymce.core.dom.Selection","tinymce.core.Formatter","tinymce.core.UndoManager","tinymce.core.EditorCommands","tinymce.core.util.URI","tinymce.core.util.Class","tinymce.core.util.EventDispatcher","tinymce.core.util.Observable","tinymce.core.WindowManager","tinymce.core.NotificationManager","tinymce.core.EditorObservable","tinymce.core.Shortcuts","tinymce.core.Editor","tinymce.core.util.I18n","tinymce.core.FocusManager","tinymce.core.EditorManager","tinymce.core.util.XHR","tinymce.core.util.JSON","tinymce.core.util.JSONRequest","tinymce.core.util.JSONP","tinymce.core.util.LocalStorage","tinymce.core.api.Compat","tinymce.core.util.Color","tinymce.core.ui.Api","tinymce.core.util.Arr","tinymce.core.dom.Range","tinymce.core.dom.StyleSheetLoader","tinymce.core.dom.NodeType","tinymce.core.caret.CaretContainer","tinymce.core.text.Zwsp","ephox.katamari.api.Fun","tinymce.core.dom.RangePoint","tinymce.core.caret.CaretBookmark","tinymce.core.caret.CaretPosition","ephox.sugar.api.dom.Compare","ephox.sugar.api.node.Element","tinymce.core.dom.ScrollIntoView","tinymce.core.dom.TridentSelection","tinymce.core.selection.FragmentReader","tinymce.core.dom.ElementUtils","tinymce.core.util.Fun","tinymce.core.fmt.Preview","tinymce.core.fmt.Hooks","tinymce.core.undo.Levels","tinymce.core.delete.DeleteCommands","tinymce.core.InsertContent","global!document","tinymce.core.ui.Window","tinymce.core.ui.MessageBox","tinymce.core.ui.Notification","tinymce.core.EditorSettings","tinymce.core.init.Render","tinymce.core.Mode","tinymce.core.ui.Sidebar","tinymce.core.util.Uuid","tinymce.core.ErrorReporter","tinymce.core.LegacyInput","tinymce.core.ui.Selector","tinymce.core.ui.Collection","tinymce.core.ui.ReflowQueue","tinymce.core.ui.Control","tinymce.core.ui.Factory","tinymce.core.ui.KeyboardNavigation","tinymce.core.ui.Container","tinymce.core.ui.DragHelper","tinymce.core.ui.Scrollable","tinymce.core.ui.Panel","tinymce.core.ui.Movable","tinymce.core.ui.Resizable","tinymce.core.ui.FloatPanel","tinymce.core.ui.Tooltip","tinymce.core.ui.Widget","tinymce.core.ui.Progress","tinymce.core.ui.Layout","tinymce.core.ui.AbsoluteLayout","tinymce.core.ui.Button","tinymce.core.ui.ButtonGroup","tinymce.core.ui.Checkbox","tinymce.core.ui.ComboBox","tinymce.core.ui.ColorBox","tinymce.core.ui.PanelButton","tinymce.core.ui.ColorButton","tinymce.core.ui.ColorPicker","tinymce.core.ui.Path","tinymce.core.ui.ElementPath","tinymce.core.ui.FormItem","tinymce.core.ui.Form","tinymce.core.ui.FieldSet","tinymce.core.ui.FilePicker","tinymce.core.ui.FitLayout","tinymce.core.ui.FlexLayout","tinymce.core.ui.FlowLayout","tinymce.core.ui.FormatControls","tinymce.core.ui.GridLayout","tinymce.core.ui.Iframe","tinymce.core.ui.InfoBox","tinymce.core.ui.Label","tinymce.core.ui.Toolbar","tinymce.core.ui.MenuBar","tinymce.core.ui.MenuButton","tinymce.core.ui.MenuItem","tinymce.core.ui.Throbber","tinymce.core.ui.Menu","tinymce.core.ui.ListBox","tinymce.core.ui.Radio","tinymce.core.ui.ResizeHandle","tinymce.core.ui.SelectBox","tinymce.core.ui.Slider","tinymce.core.ui.Spacer","tinymce.core.ui.SplitButton","tinymce.core.ui.StackLayout","tinymce.core.ui.TabPanel","tinymce.core.ui.TextBox","ephox.katamari.api.Arr","global!Array","global!Error","ephox.katamari.api.Future","ephox.katamari.api.Futures","ephox.katamari.api.Result","tinymce.core.geom.ClientRect","tinymce.core.caret.CaretCandidate","tinymce.core.text.ExtendingChar","ephox.sand.api.Node","ephox.sand.api.PlatformDetection","ephox.sugar.api.search.Selectors","global!console","ephox.sugar.api.dom.Insert","ephox.sugar.api.dom.Replication","ephox.sugar.api.node.Fragment","ephox.sugar.api.node.Node","tinymce.core.dom.ElementType","tinymce.core.dom.Parents","tinymce.core.selection.SelectionUtils","tinymce.core.undo.Fragments","tinymce.core.delete.BlockBoundaryDelete","tinymce.core.delete.BlockRangeDelete","tinymce.core.delete.CefDelete","tinymce.core.delete.InlineBoundaryDelete","tinymce.core.caret.CaretWalker","tinymce.core.dom.RangeNormalizer","tinymce.core.InsertList","tinymce.core.data.ObservableObject","tinymce.core.ui.DomUtils","tinymce.core.ui.BoxUtils","tinymce.core.ui.ClassList","global!window","tinymce.core.init.Init","tinymce.core.PluginManager","tinymce.core.ThemeManager","tinymce.core.content.LinkTargets","tinymce.core.fmt.FontInfo","ephox.katamari.api.Option","global!String","ephox.katamari.api.LazyValue","ephox.katamari.async.Bounce","ephox.katamari.async.AsyncValues","ephox.sand.util.Global","ephox.katamari.api.Thunk","ephox.sand.core.PlatformDetection","global!navigator","ephox.sugar.api.node.NodeTypes","ephox.sugar.api.search.Traverse","ephox.sugar.api.properties.Attr","ephox.sugar.api.dom.InsertAll","ephox.sugar.api.dom.Remove","ephox.katamari.api.Options","tinymce.core.undo.Diff","tinymce.core.delete.BlockBoundary","tinymce.core.delete.MergeBlocks","tinymce.core.delete.DeleteUtils","tinymce.core.caret.CaretUtils","tinymce.core.delete.CefDeleteAction","tinymce.core.delete.DeleteElement","tinymce.core.caret.CaretFinder","tinymce.core.keyboard.BoundaryCaret","tinymce.core.keyboard.BoundaryLocation","tinymce.core.keyboard.BoundarySelection","tinymce.core.keyboard.InlineUtils","tinymce.core.data.Binding","tinymce.core.init.InitContentBody","global!Object","global!setTimeout","ephox.katamari.api.Resolve","ephox.sand.core.Browser","ephox.sand.core.OperatingSystem","ephox.sand.detect.DeviceType","ephox.sand.detect.UaString","ephox.sand.info.PlatformInfo","ephox.katamari.api.Type","ephox.katamari.api.Struct","ephox.sugar.alien.Recurse","ephox.katamari.api.Obj","ephox.sugar.api.search.PredicateFind","tinymce.core.dom.Empty","ephox.katamari.api.Adt","tinymce.core.text.Bidi","tinymce.core.caret.CaretContainerInline","tinymce.core.caret.CaretContainerRemove","tinymce.core.util.LazyEvaluator","ephox.katamari.api.Cell","tinymce.core.caret.CaretContainerInput","tinymce.core.EditorUpload","tinymce.core.ForceBlocks","tinymce.core.keyboard.KeyboardOverrides","tinymce.core.NodeChange","tinymce.core.SelectionOverrides","tinymce.core.util.Quirks","ephox.katamari.api.Global","ephox.sand.detect.Version","ephox.katamari.api.Strings","ephox.katamari.data.Immutable","ephox.katamari.data.MixedBag","ephox.sugar.api.node.Body","ephox.sugar.impl.ClosestOrAncestor","ephox.sugar.api.search.SelectorExists","tinymce.core.file.Uploader","tinymce.core.file.ImageScanner","tinymce.core.file.BlobCache","tinymce.core.file.UploadStatus","tinymce.core.keyboard.ArrowKeys","tinymce.core.keyboard.DeleteBackspaceKeys","tinymce.core.keyboard.EnterKey","tinymce.core.keyboard.SpaceKey","tinymce.core.caret.FakeCaret","tinymce.core.caret.LineUtils","tinymce.core.DragDropOverrides","tinymce.core.EditorView","tinymce.core.keyboard.CefUtils","tinymce.core.dom.NodePath","global!Number","ephox.katamari.str.StrAppend","ephox.katamari.str.StringParts","ephox.katamari.util.BagUtils","ephox.sugar.api.search.SelectorFind","tinymce.core.file.Conversions","global!URL","tinymce.core.keyboard.CefNavigation","tinymce.core.keyboard.MatchKeys","tinymce.core.keyboard.InsertSpace","tinymce.core.dom.Dimensions","tinymce.core.dom.MousePosition","ephox.sugar.api.properties.Css","tinymce.core.caret.LineWalker","ephox.katamari.api.Merger","ephox.sugar.impl.Style"]
 jsc*/
 /**
  * Rect.js
@@ -8973,7 +8973,7 @@ define(
       textInlineElementsMap = createLookupTable('text_inline_elements', 'span strong b em i font strike u var cite ' +
         'dfn code mark q sup sub samp');
 
-      each((settings.special || 'script noscript style textarea').split(' '), function (name) {
+      each((settings.special || 'script noscript noframes noembed title style textarea xmp').split(' '), function (name) {
         specialElements[name] = new RegExp('<\/' + name + '[^>]*>', 'gi');
       });
 
@@ -13672,6 +13672,10 @@ define(
       return name.indexOf('data-') === 0 || name.indexOf('aria-') === 0;
     };
 
+    var trimComments = function (text) {
+      return text.replace(/<!--|-->/g, '');
+    };
+
     /**
      * Returns the index of the end tag for a specific start tag. This can be
      * used to skip all children of a parent element from being processed.
@@ -13840,6 +13844,11 @@ define(
             }
           }
 
+          // Block data or event attributes on elements marked as internal
+          if (isInternalElement && (name in filteredUrlAttrs || name.indexOf('on') === 0)) {
+            return;
+          }
+
           // Add attribute to list and map
           attrList.map[name] = value;
           attrList.push({
@@ -14066,7 +14075,7 @@ define(
 
             self.comment(value);
           } else if ((value = matches[2])) { // CDATA
-            self.cdata(value);
+            self.cdata(trimComments(value));
           } else if ((value = matches[3])) { // DOCTYPE
             self.doctype(value);
           } else if ((value = matches[4])) { // PI
@@ -14871,34 +14880,35 @@ define(
         });
       }
 
-      if (!settings.allow_unsafe_link_target) {
-        self.addAttributeFilter('href', function (nodes) {
-          var i = nodes.length, node;
 
-          var appendRel = function (rel) {
-            var parts = rel.split(' ').filter(function (p) {
-              return p.length > 0;
-            });
-            return parts.concat(['noopener']).join(' ');
-          };
+      self.addAttributeFilter('href', function (nodes) {
+        var i = nodes.length, node;
 
-          var addNoOpener = function (rel) {
-            var newRel = rel ? Tools.trim(rel) : '';
-            if (!/\b(noopener)\b/g.test(newRel)) {
-              return appendRel(newRel);
-            } else {
-              return newRel;
-            }
-          };
+        var appendRel = function (rel) {
+          var parts = rel.split(' ').filter(function (p) {
+            return p.length > 0;
+          });
+          return parts.concat(['noopener']).sort().join(' ');
+        };
+
+        var addNoOpener = function (rel) {
+          var newRel = rel ? Tools.trim(rel) : '';
+          if (!/\b(noopener)\b/g.test(newRel)) {
+            return appendRel(newRel);
+          } else {
+            return newRel;
+          }
+        };
 
+        if (!settings.allow_unsafe_link_target) {
           while (i--) {
             node = nodes[i];
             if (node.name === 'a' && node.attr('target') === '_blank') {
               node.attr('rel', addNoOpener(node.attr('rel')));
             }
           }
-        });
-      }
+        }
+      });
 
       // Force anchor names closed, unless the setting "allow_html_in_named_anchor" is explicitly included.
       if (!settings.allow_html_in_named_anchor) {
@@ -15894,6 +15904,180 @@ define(
   }
 );
 
+/**
+ * ClientRect.js
+ *
+ * Released under LGPL License.
+ * Copyright (c) 1999-2017 Ephox Corp. All rights reserved
+ *
+ * License: http://www.tinymce.com/license
+ * Contributing: http://www.tinymce.com/contributing
+ */
+
+/**
+ * Utility functions for working with client rects.
+ *
+ * @private
+ * @class tinymce.geom.ClientRect
+ */
+define(
+  'tinymce.core.geom.ClientRect',
+  [
+  ],
+  function () {
+    var round = Math.round;
+
+    function clone(rect) {
+      if (!rect) {
+        return { left: 0, top: 0, bottom: 0, right: 0, width: 0, height: 0 };
+      }
+
+      return {
+        left: round(rect.left),
+        top: round(rect.top),
+        bottom: round(rect.bottom),
+        right: round(rect.right),
+        width: round(rect.width),
+        height: round(rect.height)
+      };
+    }
+
+    function collapse(clientRect, toStart) {
+      clientRect = clone(clientRect);
+
+      if (toStart) {
+        clientRect.right = clientRect.left;
+      } else {
+        clientRect.left = clientRect.left + clientRect.width;
+        clientRect.right = clientRect.left;
+      }
+
+      clientRect.width = 0;
+
+      return clientRect;
+    }
+
+    function isEqual(rect1, rect2) {
+      return (
+        rect1.left === rect2.left &&
+        rect1.top === rect2.top &&
+        rect1.bottom === rect2.bottom &&
+        rect1.right === rect2.right
+      );
+    }
+
+    function isValidOverflow(overflowY, clientRect1, clientRect2) {
+      return overflowY >= 0 && overflowY <= Math.min(clientRect1.height, clientRect2.height) / 2;
+
+    }
+
+    function isAbove(clientRect1, clientRect2) {
+      if ((clientRect1.bottom - clientRect1.height / 2) < clientRect2.top) {
+        return true;
+      }
+
+      if (clientRect1.top > clientRect2.bottom) {
+        return false;
+      }
+
+      return isValidOverflow(clientRect2.top - clientRect1.bottom, clientRect1, clientRect2);
+    }
+
+    function isBelow(clientRect1, clientRect2) {
+      if (clientRect1.top > clientRect2.bottom) {
+        return true;
+      }
+
+      if (clientRect1.bottom < clientRect2.top) {
+        return false;
+      }
+
+      return isValidOverflow(clientRect2.bottom - clientRect1.top, clientRect1, clientRect2);
+    }
+
+    function isLeft(clientRect1, clientRect2) {
+      return clientRect1.left < clientRect2.left;
+    }
+
+    function isRight(clientRect1, clientRect2) {
+      return clientRect1.right > clientRect2.right;
+    }
+
+    function compare(clientRect1, clientRect2) {
+      if (isAbove(clientRect1, clientRect2)) {
+        return -1;
+      }
+
+      if (isBelow(clientRect1, clientRect2)) {
+        return 1;
+      }
+
+      if (isLeft(clientRect1, clientRect2)) {
+        return -1;
+      }
+
+      if (isRight(clientRect1, clientRect2)) {
+        return 1;
+      }
+
+      return 0;
+    }
+
+    function containsXY(clientRect, clientX, clientY) {
+      return (
+        clientX >= clientRect.left &&
+        clientX <= clientRect.right &&
+        clientY >= clientRect.top &&
+        clientY <= clientRect.bottom
+      );
+    }
+
+    return {
+      clone: clone,
+      collapse: collapse,
+      isEqual: isEqual,
+      isAbove: isAbove,
+      isBelow: isBelow,
+      isLeft: isLeft,
+      isRight: isRight,
+      compare: compare,
+      containsXY: containsXY
+    };
+  }
+);
+
+/**
+ * RangePoint.js
+ *
+ * Released under LGPL License.
+ * Copyright (c) 1999-2017 Ephox Corp. All rights reserved
+ *
+ * License: http://www.tinymce.com/license
+ * Contributing: http://www.tinymce.com/contributing
+ */
+
+define(
+  'tinymce.core.dom.RangePoint',
+  [
+    'ephox.katamari.api.Arr',
+    'tinymce.core.geom.ClientRect'
+  ],
+  function (Arr, ClientRect) {
+    var isXYWithinRange = function (clientX, clientY, range) {
+      if (range.collapsed) {
+        return false;
+      }
+
+      return Arr.foldl(range.getClientRects(), function (state, rect) {
+        return state || ClientRect.containsXY(rect, clientX, clientY);
+      }, false);
+    };
+
+    return {
+      isXYWithinRange: isXYWithinRange
+    };
+  }
+);
 /**
  * ControlSelection.js
  *
@@ -15914,13 +16098,15 @@ define(
 define(
   'tinymce.core.dom.ControlSelection',
   [
-    "tinymce.core.util.VK",
-    "tinymce.core.util.Tools",
-    "tinymce.core.util.Delay",
-    "tinymce.core.Env",
-    "tinymce.core.dom.NodeType"
+    'ephox.katamari.api.Fun',
+    'tinymce.core.dom.NodeType',
+    'tinymce.core.dom.RangePoint',
+    'tinymce.core.Env',
+    'tinymce.core.util.Delay',
+    'tinymce.core.util.Tools',
+    'tinymce.core.util.VK'
   ],
-  function (VK, Tools, Delay, Env, NodeType) {
+  function (Fun, NodeType, RangePoint, Env, Delay, Tools, VK) {
     var isContentEditableFalse = NodeType.isContentEditableFalse;
     var isContentEditableTrue = NodeType.isContentEditableTrue;
 
@@ -15936,6 +16122,23 @@ define(
       return null;
     }
 
+    var isImage = function (elm) {
+      return elm && elm.nodeName === 'IMG';
+    };
+
+    var isEventOnImageOutsideRange = function (evt, range) {
+      return isImage(evt.target) && !RangePoint.isXYWithinRange(evt.clientX, evt.clientY, range);
+    };
+
+    var contextMenuSelectImage = function (editor, evt) {
+      var target = evt.target;
+
+      if (isEventOnImageOutsideRange(evt, editor.selection.getRng()) && !evt.isDefaultPrevented()) {
+        evt.preventDefault();
+        editor.selection.select(target);
+      }
+    };
+
     return function (selection, editor) {
       var dom = editor.dom, each = Tools.each;
       var selectedElm, selectedElmGhost, resizeHelper, resizeHandles, selectedHandle, lastMouseDownEvent;
@@ -16471,7 +16674,9 @@ define(
               var target = e.target, nodeName = target.nodeName;
 
               if (!resizeStarted && /^(TABLE|IMG|HR)$/.test(nodeName) && !isWithinContentEditableFalse(target)) {
-                editor.selection.select(target, nodeName == 'TABLE');
+                if (e.button !== 2) {
+                  editor.selection.select(target, nodeName == 'TABLE');
+                }
 
                 // Only fire once since nodeChange is expensive
                 if (e.type == 'mousedown') {
@@ -16523,6 +16728,7 @@ define(
         });
 
         editor.on('hide blur', hideResizeRect);
+        editor.on('contextmenu', Fun.curry(contextMenuSelectImage, editor));
 
         // Hide rect on focusout since it would float on top of windows otherwise
         //editor.on('focusout', hideResizeRect);
@@ -16737,148 +16943,6 @@ define(
     };
   }
 );
-/**
- * ClientRect.js
- *
- * Released under LGPL License.
- * Copyright (c) 1999-2017 Ephox Corp. All rights reserved
- *
- * License: http://www.tinymce.com/license
- * Contributing: http://www.tinymce.com/contributing
- */
-
-/**
- * Utility functions for working with client rects.
- *
- * @private
- * @class tinymce.geom.ClientRect
- */
-define(
-  'tinymce.core.geom.ClientRect',
-  [
-  ],
-  function () {
-    var round = Math.round;
-
-    function clone(rect) {
-      if (!rect) {
-        return { left: 0, top: 0, bottom: 0, right: 0, width: 0, height: 0 };
-      }
-
-      return {
-        left: round(rect.left),
-        top: round(rect.top),
-        bottom: round(rect.bottom),
-        right: round(rect.right),
-        width: round(rect.width),
-        height: round(rect.height)
-      };
-    }
-
-    function collapse(clientRect, toStart) {
-      clientRect = clone(clientRect);
-
-      if (toStart) {
-        clientRect.right = clientRect.left;
-      } else {
-        clientRect.left = clientRect.left + clientRect.width;
-        clientRect.right = clientRect.left;
-      }
-
-      clientRect.width = 0;
-
-      return clientRect;
-    }
-
-    function isEqual(rect1, rect2) {
-      return (
-        rect1.left === rect2.left &&
-        rect1.top === rect2.top &&
-        rect1.bottom === rect2.bottom &&
-        rect1.right === rect2.right
-      );
-    }
-
-    function isValidOverflow(overflowY, clientRect1, clientRect2) {
-      return overflowY >= 0 && overflowY <= Math.min(clientRect1.height, clientRect2.height) / 2;
-
-    }
-
-    function isAbove(clientRect1, clientRect2) {
-      if ((clientRect1.bottom - clientRect1.height / 2) < clientRect2.top) {
-        return true;
-      }
-
-      if (clientRect1.top > clientRect2.bottom) {
-        return false;
-      }
-
-      return isValidOverflow(clientRect2.top - clientRect1.bottom, clientRect1, clientRect2);
-    }
-
-    function isBelow(clientRect1, clientRect2) {
-      if (clientRect1.top > clientRect2.bottom) {
-        return true;
-      }
-
-      if (clientRect1.bottom < clientRect2.top) {
-        return false;
-      }
-
-      return isValidOverflow(clientRect2.bottom - clientRect1.top, clientRect1, clientRect2);
-    }
-
-    function isLeft(clientRect1, clientRect2) {
-      return clientRect1.left < clientRect2.left;
-    }
-
-    function isRight(clientRect1, clientRect2) {
-      return clientRect1.right > clientRect2.right;
-    }
-
-    function compare(clientRect1, clientRect2) {
-      if (isAbove(clientRect1, clientRect2)) {
-        return -1;
-      }
-
-      if (isBelow(clientRect1, clientRect2)) {
-        return 1;
-      }
-
-      if (isLeft(clientRect1, clientRect2)) {
-        return -1;
-      }
-
-      if (isRight(clientRect1, clientRect2)) {
-        return 1;
-      }
-
-      return 0;
-    }
-
-    function containsXY(clientRect, clientX, clientY) {
-      return (
-        clientX >= clientRect.left &&
-        clientX <= clientRect.right &&
-        clientY >= clientRect.top &&
-        clientY <= clientRect.bottom
-      );
-    }
-
-    return {
-      clone: clone,
-      collapse: collapse,
-      isEqual: isEqual,
-      isAbove: isAbove,
-      isBelow: isBelow,
-      isLeft: isLeft,
-      isRight: isRight,
-      compare: compare,
-      containsXY: containsXY
-    };
-  }
-);
-
 /**
  * ExtendingChar.js
  *
@@ -18081,1921 +18145,1921 @@ define(
     return BookmarkManager;
   }
 );
-/**
- * ScrollIntoView.js
- *
- * Released under LGPL License.
- * Copyright (c) 1999-2017 Ephox Corp. All rights reserved
- *
- * License: http://www.tinymce.com/license
- * Contributing: http://www.tinymce.com/contributing
- */
-
 define(
-  'tinymce.core.dom.ScrollIntoView',
+  'ephox.katamari.api.Global',
+
   [
-    'tinymce.core.dom.NodeType'
   ],
-  function (NodeType) {
-    var getPos = function (elm) {
-      var x = 0, y = 0;
-
-      var offsetParent = elm;
-      while (offsetParent && offsetParent.nodeType) {
-        x += offsetParent.offsetLeft || 0;
-        y += offsetParent.offsetTop || 0;
-        offsetParent = offsetParent.offsetParent;
-      }
 
-      return { x: x, y: y };
-    };
+  function () {
+    // Use window object as the global if it's available since CSP will block script evals
+    if (typeof window !== 'undefined') {
+      return window;
+    } else {
+      return Function('return this;')();
+    }
+  }
+);
 
-    var fireScrollIntoViewEvent = function (editor, elm, alignToTop) {
-      var scrollEvent = { elm: elm, alignToTop: alignToTop };
-      editor.fire('scrollIntoView', scrollEvent);
-      return scrollEvent.isDefaultPrevented();
-    };
 
-    var scrollIntoView = function (editor, elm, alignToTop) {
-      var y, viewPort, dom = editor.dom, root = dom.getRoot(), viewPortY, viewPortH, offsetY = 0;
+define(
+  'ephox.katamari.api.Resolve',
 
-      if (fireScrollIntoViewEvent(editor, elm, alignToTop)) {
-        return;
-      }
+  [
+    'ephox.katamari.api.Global'
+  ],
 
-      if (!NodeType.isElement(elm)) {
-        return;
-      }
+  function (Global) {
+    /** path :: ([String], JsObj?) -> JsObj */
+    var path = function (parts, scope) {
+      var o = scope !== undefined ? scope : Global;
+      for (var i = 0; i < parts.length && o !== undefined && o !== null; ++i)
+        o = o[parts[i]];
+      return o;
+    };
 
-      if (alignToTop === false) {
-        offsetY = elm.offsetHeight;
-      }
+    /** resolve :: (String, JsObj?) -> JsObj */
+    var resolve = function (p, scope) {
+      var parts = p.split('.');
+      return path(parts, scope);
+    };
 
-      if (root.nodeName !== 'BODY') {
-        var scrollContainer = editor.selection.getScrollContainer();
-        if (scrollContainer) {
-          y = getPos(elm).y - getPos(scrollContainer).y + offsetY;
-          viewPortH = scrollContainer.clientHeight;
-          viewPortY = scrollContainer.scrollTop;
-          if (y < viewPortY || y + 25 > viewPortY + viewPortH) {
-            scrollContainer.scrollTop = y < viewPortY ? y : y - viewPortH + 25;
-          }
+    /** step :: (JsObj, String) -> JsObj */
+    var step = function (o, part) {
+      if (o[part] === undefined || o[part] === null)
+        o[part] = {};
+      return o[part];
+    };
 
-          return;
-        }
-      }
+    /** forge :: ([String], JsObj?) -> JsObj */
+    var forge = function (parts, target) {
+      var o = target !== undefined ? target : Global;      
+      for (var i = 0; i < parts.length; ++i)
+        o = step(o, parts[i]);
+      return o;
+    };
 
-      viewPort = dom.getViewPort(editor.getWin());
-      y = dom.getPos(elm).y + offsetY;
-      viewPortY = viewPort.y;
-      viewPortH = viewPort.h;
-      if (y < viewPort.y || y + 25 > viewPortY + viewPortH) {
-        editor.getWin().scrollTo(0, y < viewPortY ? y : y - viewPortH + 25);
-      }
+    /** namespace :: (String, JsObj?) -> JsObj */
+    var namespace = function (name, target) {
+      var parts = name.split('.');
+      return forge(parts, target);
     };
 
     return {
-      scrollIntoView: scrollIntoView
+      path: path,
+      resolve: resolve,
+      forge: forge,
+      namespace: namespace
     };
   }
 );
 
-/**
- * TridentSelection.js
- *
- * Released under LGPL License.
- * Copyright (c) 1999-2017 Ephox Corp. All rights reserved
- *
- * License: http://www.tinymce.com/license
- * Contributing: http://www.tinymce.com/contributing
- */
 
-/**
- * Selection class for old explorer versions. This one fakes the
- * native selection object available on modern browsers.
- *
- * @private
- * @class tinymce.dom.TridentSelection
- */
 define(
-  'tinymce.core.dom.TridentSelection',
+  'ephox.sand.util.Global',
+
   [
+    'ephox.katamari.api.Resolve'
   ],
-  function () {
-    function Selection(selection) {
-      var self = this, dom = selection.dom, FALSE = false;
 
-      function getPosition(rng, start) {
-        var checkRng, startIndex = 0, endIndex, inside,
-          children, child, offset, index, position = -1, parent;
+  function (Resolve) {
+    var unsafe = function (name, scope) {
+      return Resolve.resolve(name, scope);
+    };
 
-        // Setup test range, collapse it and get the parent
-        checkRng = rng.duplicate();
-        checkRng.collapse(start);
-        parent = checkRng.parentElement();
+    var getOrDie = function (name, scope) {
+      var actual = unsafe(name, scope);
 
-        // Check if the selection is within the right document
-        if (parent.ownerDocument !== selection.dom.doc) {
-          return;
-        }
+      if (actual === undefined) throw name + ' not available on this browser';
+      return actual;
+    };
 
-        // IE will report non editable elements as it's parent so look for an editable one
-        while (parent.contentEditable === "false") {
-          parent = parent.parentNode;
-        }
+    return {
+      getOrDie: getOrDie
+    };
+  }
+);
+define(
+  'ephox.sand.api.Node',
 
-        // If parent doesn't have any children then return that we are inside the element
-        if (!parent.hasChildNodes()) {
-          return { node: parent, inside: 1 };
-        }
+  [
+    'ephox.sand.util.Global'
+  ],
 
-        // Setup node list and endIndex
-        children = parent.children;
-        endIndex = children.length - 1;
+  function (Global) {
+    /*
+     * MDN says (yes) for IE, but it's undefined on IE8
+     */
+    var node = function () {
+      var f = Global.getOrDie('Node');
+      return f;
+    };
 
-        // Perform a binary search for the position
-        while (startIndex <= endIndex) {
-          index = Math.floor((startIndex + endIndex) / 2);
+    /*
+     * Most of numerosity doesn't alter the methods on the object.
+     * We're making an exception for Node, because bitwise and is so easy to get wrong.
+     *
+     * Might be nice to ADT this at some point instead of having individual methods.
+     */
 
-          // Move selection to node and compare the ranges
-          child = children[index];
-          checkRng.moveToElementText(child);
-          position = checkRng.compareEndPoints(start ? 'StartToStart' : 'EndToEnd', rng);
+    var compareDocumentPosition = function (a, b, match) {
+      // Returns: 0 if e1 and e2 are the same node, or a bitmask comparing the positions
+      // of nodes e1 and e2 in their documents. See the URL below for bitmask interpretation
+      // https://developer.mozilla.org/en-US/docs/Web/API/Node/compareDocumentPosition
+      return (a.compareDocumentPosition(b) & match) !== 0;
+    };
 
-          // Before/after or an exact match
-          if (position > 0) {
-            endIndex = index - 1;
-          } else if (position < 0) {
-            startIndex = index + 1;
-          } else {
-            return { node: child };
-          }
-        }
+    var documentPositionPreceding = function (a, b) {
+      return compareDocumentPosition(a, b, node().DOCUMENT_POSITION_PRECEDING);
+    };
 
-        // Check if child position is before or we didn't find a position
-        if (position < 0) {
-          // No element child was found use the parent element and the offset inside that
-          if (!child) {
-            checkRng.moveToElementText(parent);
-            checkRng.collapse(true);
-            child = parent;
-            inside = true;
-          } else {
-            checkRng.collapse(false);
-          }
+    var documentPositionContainedBy = function (a, b) {
+      return compareDocumentPosition(a, b, node().DOCUMENT_POSITION_CONTAINED_BY);
+    };
 
-          // Walk character by character in text node until we hit the selected range endpoint,
-          // hit the end of document or parent isn't the right one
-          // We need to walk char by char since rng.text or rng.htmlText will trim line endings
-          offset = 0;
-          while (checkRng.compareEndPoints(start ? 'StartToStart' : 'StartToEnd', rng) !== 0) {
-            if (checkRng.move('character', 1) === 0 || parent != checkRng.parentElement()) {
-              break;
-            }
+    return {
+      documentPositionPreceding: documentPositionPreceding,
+      documentPositionContainedBy: documentPositionContainedBy
+    };
+  }
+);
+define(
+  'ephox.katamari.api.Thunk',
 
-            offset++;
-          }
-        } else {
-          // Child position is after the selection endpoint
-          checkRng.collapse(true);
+  [
+  ],
 
-          // Walk character by character in text node until we hit the selected range endpoint, hit
-          // the end of document or parent isn't the right one
-          offset = 0;
-          while (checkRng.compareEndPoints(start ? 'StartToStart' : 'StartToEnd', rng) !== 0) {
-            if (checkRng.move('character', -1) === 0 || parent != checkRng.parentElement()) {
-              break;
-            }
+  function () {
 
-            offset++;
-          }
+    var cached = function (f) {
+      var called = false;
+      var r;
+      return function() {
+        if (!called) {
+          called = true;
+          r = f.apply(null, arguments);
         }
+        return r;
+      };
+    };
 
-        return { node: child, position: position, offset: offset, inside: inside };
-      }
+    return {
+      cached: cached
+    };
+  }
+);
 
-      // Returns a W3C DOM compatible range object by using the IE Range API
-      function getRange() {
-        var ieRange = selection.getRng(), domRange = dom.createRng(), element, collapsed, tmpRange, element2, bookmark;
+defineGlobal("global!Number", Number);
+define(
+  'ephox.sand.detect.Version',
 
-        // If selection is outside the current document just return an empty range
-        element = ieRange.item ? ieRange.item(0) : ieRange.parentElement();
-        if (element.ownerDocument != dom.doc) {
-          return domRange;
-        }
+  [
+    'ephox.katamari.api.Arr',
+    'global!Number',
+    'global!String'
+  ],
 
-        collapsed = selection.isCollapsed();
+  function (Arr, Number, String) {
+    var firstMatch = function (regexes, s) {
+      for (var i = 0; i < regexes.length; i++) {
+        var x = regexes[i];
+        if (x.test(s)) return x;
+      }
+      return undefined;
+    };
 
-        // Handle control selection
-        if (ieRange.item) {
-          domRange.setStart(element.parentNode, dom.nodeIndex(element));
-          domRange.setEnd(domRange.startContainer, domRange.startOffset + 1);
+    var find = function (regexes, agent) {
+      var r = firstMatch(regexes, agent);
+      if (!r) return { major : 0, minor : 0 };
+      var group = function(i) {
+        return Number(agent.replace(r, '$' + i));
+      };
+      return nu(group(1), group(2));
+    };
 
-          return domRange;
-        }
+    var detect = function (versionRegexes, agent) {
+      var cleanedAgent = String(agent).toLowerCase();
 
-        function findEndPoint(start) {
-          var endPoint = getPosition(ieRange, start), container, offset, textNodeOffset = 0, sibling, undef, nodeValue;
+      if (versionRegexes.length === 0) return unknown();
+      return find(versionRegexes, cleanedAgent);
+    };
 
-          container = endPoint.node;
-          offset = endPoint.offset;
+    var unknown = function () {
+      return nu(0, 0);
+    };
 
-          if (endPoint.inside && !container.hasChildNodes()) {
-            domRange[start ? 'setStart' : 'setEnd'](container, 0);
-            return;
-          }
+    var nu = function (major, minor) {
+      return { major: major, minor: minor };
+    };
 
-          if (offset === undef) {
-            domRange[start ? 'setStartBefore' : 'setEndAfter'](container);
-            return;
-          }
+    return {
+      nu: nu,
+      detect: detect,
+      unknown: unknown
+    };
+  }
+);
+define(
+  'ephox.sand.core.Browser',
 
-          if (endPoint.position < 0) {
-            sibling = endPoint.inside ? container.firstChild : container.nextSibling;
+  [
+    'ephox.katamari.api.Fun',
+    'ephox.sand.detect.Version'
+  ],
 
-            if (!sibling) {
-              domRange[start ? 'setStartAfter' : 'setEndAfter'](container);
-              return;
-            }
+  function (Fun, Version) {
+    var edge = 'Edge';
+    var chrome = 'Chrome';
+    var ie = 'IE';
+    var opera = 'Opera';
+    var firefox = 'Firefox';
+    var safari = 'Safari';
 
-            if (!offset) {
-              if (sibling.nodeType == 3) {
-                domRange[start ? 'setStart' : 'setEnd'](sibling, 0);
-              } else {
-                domRange[start ? 'setStartBefore' : 'setEndBefore'](sibling);
-              }
+    var isBrowser = function (name, current) {
+      return function () {
+        return current === name;
+      };
+    };
 
-              return;
-            }
+    var unknown = function () {
+      return nu({
+        current: undefined,
+        version: Version.unknown()
+      });
+    };
 
-            // Find the text node and offset
-            while (sibling) {
-              if (sibling.nodeType == 3) {
-                nodeValue = sibling.nodeValue;
-                textNodeOffset += nodeValue.length;
+    var nu = function (info) {
+      var current = info.current;
+      var version = info.version;
 
-                // We are at or passed the position we where looking for
-                if (textNodeOffset >= offset) {
-                  container = sibling;
-                  textNodeOffset -= offset;
-                  textNodeOffset = nodeValue.length - textNodeOffset;
-                  break;
-                }
-              }
+      return {
+        current: current,
+        version: version,
 
-              sibling = sibling.nextSibling;
-            }
-          } else {
-            // Find the text node and offset
-            sibling = container.previousSibling;
+        // INVESTIGATE: Rename to Edge ?
+        isEdge: isBrowser(edge, current),
+        isChrome: isBrowser(chrome, current),
+        // NOTE: isIe just looks too weird
+        isIE: isBrowser(ie, current),
+        isOpera: isBrowser(opera, current),
+        isFirefox: isBrowser(firefox, current),
+        isSafari: isBrowser(safari, current)
+      };
+    };
 
-            if (!sibling) {
-              return domRange[start ? 'setStartBefore' : 'setEndBefore'](container);
-            }
+    return {
+      unknown: unknown,
+      nu: nu,
+      edge: Fun.constant(edge),
+      chrome: Fun.constant(chrome),
+      ie: Fun.constant(ie),
+      opera: Fun.constant(opera),
+      firefox: Fun.constant(firefox),
+      safari: Fun.constant(safari)
+    };
+  }
+);
+define(
+  'ephox.sand.core.OperatingSystem',
 
-            // If there isn't any text to loop then use the first position
-            if (!offset) {
-              if (container.nodeType == 3) {
-                domRange[start ? 'setStart' : 'setEnd'](sibling, container.nodeValue.length);
-              } else {
-                domRange[start ? 'setStartAfter' : 'setEndAfter'](sibling);
-              }
+  [
+    'ephox.katamari.api.Fun',
+    'ephox.sand.detect.Version'
+  ],
 
-              return;
-            }
+  function (Fun, Version) {
+    var windows = 'Windows';
+    var ios = 'iOS';
+    var android = 'Android';
+    var linux = 'Linux';
+    var osx = 'OSX';
+    var solaris = 'Solaris';
+    var freebsd = 'FreeBSD';
 
-            while (sibling) {
-              if (sibling.nodeType == 3) {
-                textNodeOffset += sibling.nodeValue.length;
+    // Though there is a bit of dupe with this and Browser, trying to 
+    // reuse code makes it much harder to follow and change.
+    var isOS = function (name, current) {
+      return function () {
+        return current === name;
+      };
+    };
 
-                // We are at or passed the position we where looking for
-                if (textNodeOffset >= offset) {
-                  container = sibling;
-                  textNodeOffset -= offset;
-                  break;
-                }
-              }
+    var unknown = function () {
+      return nu({
+        current: undefined,
+        version: Version.unknown()
+      });
+    };
 
-              sibling = sibling.previousSibling;
-            }
-          }
+    var nu = function (info) {
+      var current = info.current;
+      var version = info.version;
 
-          domRange[start ? 'setStart' : 'setEnd'](container, textNodeOffset);
-        }
+      return {
+        current: current,
+        version: version,
 
-        try {
-          // Find start point
-          findEndPoint(true);
+        isWindows: isOS(windows, current),
+        // TODO: Fix capitalisation
+        isiOS: isOS(ios, current),
+        isAndroid: isOS(android, current),
+        isOSX: isOS(osx, current),
+        isLinux: isOS(linux, current),
+        isSolaris: isOS(solaris, current),
+        isFreeBSD: isOS(freebsd, current)
+      };
+    };
 
-          // Find end point if needed
-          if (!collapsed) {
-            findEndPoint();
-          }
-        } catch (ex) {
-          // IE has a nasty bug where text nodes might throw "invalid argument" when you
-          // access the nodeValue or other properties of text nodes. This seems to happen when
-          // text nodes are split into two nodes by a delete/backspace call.
-          // So let us detect and try to fix it.
-          if (ex.number == -2147024809) {
-            // Get the current selection
-            bookmark = self.getBookmark(2);
-
-            // Get start element
-            tmpRange = ieRange.duplicate();
-            tmpRange.collapse(true);
-            element = tmpRange.parentElement();
-
-            // Get end element
-            if (!collapsed) {
-              tmpRange = ieRange.duplicate();
-              tmpRange.collapse(false);
-              element2 = tmpRange.parentElement();
-              element2.innerHTML = element2.innerHTML;
-            }
-
-            // Remove the broken elements
-            element.innerHTML = element.innerHTML;
-
-            // Restore the selection
-            self.moveToBookmark(bookmark);
-
-            // Since the range has moved we need to re-get it
-            ieRange = selection.getRng();
+    return {
+      unknown: unknown,
+      nu: nu,
 
-            // Find start point
-            findEndPoint(true);
+      windows: Fun.constant(windows),
+      ios: Fun.constant(ios),
+      android: Fun.constant(android),
+      linux: Fun.constant(linux),
+      osx: Fun.constant(osx),
+      solaris: Fun.constant(solaris),
+      freebsd: Fun.constant(freebsd)
+    };
+  }
+);
+define(
+  'ephox.sand.detect.DeviceType',
 
-            // Find end point if needed
-            if (!collapsed) {
-              findEndPoint();
-            }
-          } else {
-            throw ex; // Throw other errors
-          }
-        }
+  [
+    'ephox.katamari.api.Fun'
+  ],
 
-        return domRange;
-      }
+  function (Fun) {
+    return function (os, browser, userAgent) {
+      var isiPad = os.isiOS() && /ipad/i.test(userAgent) === true;
+      var isiPhone = os.isiOS() && !isiPad;
+      var isAndroid3 = os.isAndroid() && os.version.major === 3;
+      var isAndroid4 = os.isAndroid() && os.version.major === 4;
+      var isTablet = isiPad || isAndroid3 || ( isAndroid4 && /mobile/i.test(userAgent) === true );
+      var isTouch = os.isiOS() || os.isAndroid();
+      var isPhone = isTouch && !isTablet;
 
-      this.getBookmark = function (type) {
-        var rng = selection.getRng(), bookmark = {};
+      var iOSwebview = browser.isSafari() && os.isiOS() && /safari/i.test(userAgent) === false;
 
-        function getIndexes(node) {
-          var parent, root, children, i, indexes = [];
+      return {
+        isiPad : Fun.constant(isiPad),
+        isiPhone: Fun.constant(isiPhone),
+        isTablet: Fun.constant(isTablet),
+        isPhone: Fun.constant(isPhone),
+        isTouch: Fun.constant(isTouch),
+        isAndroid: os.isAndroid,
+        isiOS: os.isiOS,
+        isWebView: Fun.constant(iOSwebview)
+      };
+    };
+  }
+);
+define(
+  'ephox.sand.detect.UaString',
 
-          parent = node.parentNode;
-          root = dom.getRoot().parentNode;
+  [
+    'ephox.katamari.api.Arr',
+    'ephox.sand.detect.Version',
+    'global!String'
+  ],
 
-          while (parent != root && parent.nodeType !== 9) {
-            children = parent.children;
+  function (Arr, Version, String) {
+    var detect = function (candidates, userAgent) {
+      var agent = String(userAgent).toLowerCase();
+      return Arr.find(candidates, function (candidate) {
+        return candidate.search(agent);
+      });
+    };
 
-            i = children.length;
-            while (i--) {
-              if (node === children[i]) {
-                indexes.push(i);
-                break;
-              }
-            }
+    // They (browser and os) are the same at the moment, but they might
+    // not stay that way.
+    var detectBrowser = function (browsers, userAgent) {
+      return detect(browsers, userAgent).map(function (browser) {
+        var version = Version.detect(browser.versionRegexes, userAgent);
+        return {
+          current: browser.name,
+          version: version
+        };
+      });
+    };
 
-            node = parent;
-            parent = parent.parentNode;
-          }
+    var detectOs = function (oses, userAgent) {
+      return detect(oses, userAgent).map(function (os) {
+        var version = Version.detect(os.versionRegexes, userAgent);
+        return {
+          current: os.name,
+          version: version
+        };
+      });
+    };
 
-          return indexes;
-        }
+    return {
+      detectBrowser: detectBrowser,
+      detectOs: detectOs
+    };
+  }
+);
+define(
+  'ephox.katamari.str.StrAppend',
 
-        function getBookmarkEndPoint(start) {
-          var position;
+  [
 
-          position = getPosition(rng, start);
-          if (position) {
-            return {
-              position: position.position,
-              offset: position.offset,
-              indexes: getIndexes(position.node),
-              inside: position.inside
-            };
-          }
-        }
+  ],
 
-        // Non ubstructive bookmark
-        if (type === 2) {
-          // Handle text selection
-          if (!rng.item) {
-            bookmark.start = getBookmarkEndPoint(true);
+  function () {
+    var addToStart = function (str, prefix) {
+      return prefix + str;
+    };
 
-            if (!selection.isCollapsed()) {
-              bookmark.end = getBookmarkEndPoint();
-            }
-          } else {
-            bookmark.start = { ctrl: true, indexes: getIndexes(rng.item(0)) };
-          }
-        }
+    var addToEnd = function (str, suffix) {
+      return str + suffix;
+    };
 
-        return bookmark;
-      };
+    var removeFromStart = function (str, numChars) {
+      return str.substring(numChars);
+    };
 
-      this.moveToBookmark = function (bookmark) {
-        var rng, body = dom.doc.body;
+    var removeFromEnd = function (str, numChars) {
+      return str.substring(0, str.length - numChars);
+    };
+ 
+    return {
+      addToStart: addToStart,
+      addToEnd: addToEnd,
+      removeFromStart: removeFromStart,
+      removeFromEnd: removeFromEnd
+    };
+  }
+);
+define(
+  'ephox.katamari.str.StringParts',
 
-        function resolveIndexes(indexes) {
-          var node, i, idx, children;
+  [
+    'ephox.katamari.api.Option',
+    'global!Error'
+  ],
 
-          node = dom.getRoot();
-          for (i = indexes.length - 1; i >= 0; i--) {
-            children = node.children;
-            idx = indexes[i];
+  function (Option, Error) {
+    /** Return the first 'count' letters from 'str'.
+-     *  e.g. first("abcde", 2) === "ab"
+-     */
+    var first = function(str, count) {
+     return str.substr(0, count);
+    };
 
-            if (idx <= children.length - 1) {
-              node = children[idx];
-            }
-          }
+    /** Return the last 'count' letters from 'str'.
+    *  e.g. last("abcde", 2) === "de"
+    */
+    var last = function(str, count) {
+     return str.substr(str.length - count, str.length);
+    };
 
-          return node;
-        }
+    var head = function(str) {
+      return str === '' ? Option.none() : Option.some(str.substr(0, 1));
+    };
 
-        function setBookmarkEndPoint(start) {
-          var endPoint = bookmark[start ? 'start' : 'end'], moveLeft, moveRng, undef, offset;
+    var tail = function(str) {
+      return str === '' ? Option.none() : Option.some(str.substring(1));
+    };
 
-          if (endPoint) {
-            moveLeft = endPoint.position > 0;
+    return {
+      first: first,
+      last: last,
+      head: head,
+      tail: tail
+    };
+  }
+);
+define(
+  'ephox.katamari.api.Strings',
 
-            moveRng = body.createTextRange();
-            moveRng.moveToElementText(resolveIndexes(endPoint.indexes));
+  [
+    'ephox.katamari.str.StrAppend',
+    'ephox.katamari.str.StringParts',
+    'global!Error'
+  ],
 
-            offset = endPoint.offset;
-            if (offset !== undef) {
-              moveRng.collapse(endPoint.inside || moveLeft);
-              moveRng.moveStart('character', moveLeft ? -offset : offset);
-            } else {
-              moveRng.collapse(start);
-            }
+  function (StrAppend, StringParts, Error) {
+    var checkRange = function(str, substr, start) {
+      if (substr === '') return true;
+      if (str.length < substr.length) return false;
+      var x = str.substr(start, start + substr.length);
+      return x === substr;
+    };
 
-            rng.setEndPoint(start ? 'StartToStart' : 'EndToStart', moveRng);
+    /** Given a string and object, perform template-replacements on the string, as specified by the object.
+     * Any template fields of the form ${name} are replaced by the string or number specified as obj["name"]
+     * Based on Douglas Crockford's 'supplant' method for template-replace of strings. Uses different template format.
+     */
+    var supplant = function(str, obj) {
+      var isStringOrNumber = function(a) {
+        var t = typeof a;
+        return t === 'string' || t === 'number';
+      };
 
-            if (start) {
-              rng.collapse(true);
-            }
-          }
+      return str.replace(/\${([^{}]*)}/g,
+        function (a, b) {
+          var value = obj[b];
+          return isStringOrNumber(value) ? value : a;
         }
+      );
+    };
 
-        if (bookmark.start) {
-          if (bookmark.start.ctrl) {
-            rng = body.createControlRange();
-            rng.addElement(resolveIndexes(bookmark.start.indexes));
-            rng.select();
-          } else {
-            rng = body.createTextRange();
-            setBookmarkEndPoint(true);
-            setBookmarkEndPoint();
-            rng.select();
-          }
-        }
-      };
+    var removeLeading = function (str, prefix) {
+      return startsWith(str, prefix) ? StrAppend.removeFromStart(str, prefix.length) : str;
+    };
 
-      this.addRange = function (rng) {
-        var ieRng, ctrlRng, startContainer, startOffset, endContainer, endOffset, sibling,
-          doc = selection.dom.doc, body = doc.body, nativeRng, ctrlElm;
+    var removeTrailing = function (str, prefix) {
+      return endsWith(str, prefix) ? StrAppend.removeFromEnd(str, prefix.length) : str;
+    };
 
-        function setEndPoint(start) {
-          var container, offset, marker, tmpRng, nodes;
+    var ensureLeading = function (str, prefix) {
+      return startsWith(str, prefix) ? str : StrAppend.addToStart(str, prefix);
+    };
 
-          marker = dom.create('a');
-          container = start ? startContainer : endContainer;
-          offset = start ? startOffset : endOffset;
-          tmpRng = ieRng.duplicate();
+    var ensureTrailing = function (str, prefix) {
+      return endsWith(str, prefix) ? str : StrAppend.addToEnd(str, prefix);
+    };
+ 
+    var contains = function(str, substr) {
+      return str.indexOf(substr) !== -1;
+    };
 
-          if (container == doc || container == doc.documentElement) {
-            container = body;
-            offset = 0;
-          }
+    var capitalize = function(str) {
+      return StringParts.head(str).bind(function (head) {
+        return StringParts.tail(str).map(function (tail) {
+          return head.toUpperCase() + tail;
+        });
+      }).getOr(str);
+    };
 
-          if (container.nodeType == 3) {
-            container.parentNode.insertBefore(marker, container);
-            tmpRng.moveToElementText(marker);
-            tmpRng.moveStart('character', offset);
-            dom.remove(marker);
-            ieRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', tmpRng);
-          } else {
-            nodes = container.childNodes;
+    /** Does 'str' start with 'prefix'?
+     *  Note: all strings start with the empty string.
+     *        More formally, for all strings x, startsWith(x, "").
+     *        This is so that for all strings x and y, startsWith(y + x, y)
+     */
+    var startsWith = function(str, prefix) {
+      return checkRange(str, prefix, 0);
+    };
 
-            if (nodes.length) {
-              if (offset >= nodes.length) {
-                dom.insertAfter(marker, nodes[nodes.length - 1]);
-              } else {
-                container.insertBefore(marker, nodes[offset]);
-              }
+    /** Does 'str' end with 'suffix'?
+     *  Note: all strings end with the empty string.
+     *        More formally, for all strings x, endsWith(x, "").
+     *        This is so that for all strings x and y, endsWith(x + y, y)
+     */
+    var endsWith = function(str, suffix) {
+      return checkRange(str, suffix, str.length - suffix.length);
+    };
 
-              tmpRng.moveToElementText(marker);
-            } else if (container.canHaveHTML) {
-              // Empty node selection for example <div>|</div>
-              // Setting innerHTML with a span marker then remove that marker seems to keep empty block elements open
-              container.innerHTML = '<span>&#xFEFF;</span>';
-              marker = container.firstChild;
-              tmpRng.moveToElementText(marker);
-              tmpRng.collapse(FALSE); // Collapse false works better than true for some odd reason
-            }
+   
+    /** removes all leading and trailing spaces */
+    var trim = function(str) {
+      return str.replace(/^\s+|\s+$/g, '');
+    };
 
-            ieRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', tmpRng);
-            dom.remove(marker);
-          }
-        }
+    var lTrim = function(str) {
+      return str.replace(/^\s+/g, '');
+    };
 
-        // Setup some shorter versions
-        startContainer = rng.startContainer;
-        startOffset = rng.startOffset;
-        endContainer = rng.endContainer;
-        endOffset = rng.endOffset;
-        ieRng = body.createTextRange();
+    var rTrim = function(str) {
+      return str.replace(/\s+$/g, '');
+    };
 
-        // If single element selection then try making a control selection out of it
-        if (startContainer == endContainer && startContainer.nodeType == 1) {
-          // Trick to place the caret inside an empty block element like <p></p>
-          if (startOffset == endOffset && !startContainer.hasChildNodes()) {
-            if (startContainer.canHaveHTML) {
-              // Check if previous sibling is an empty block if it is then we need to render it
-              // IE would otherwise move the caret into the sibling instead of the empty startContainer see: #5236
-              // Example this: <p></p><p>|</p> would become this: <p>|</p><p></p>
-              sibling = startContainer.previousSibling;
-              if (sibling && !sibling.hasChildNodes() && dom.isBlock(sibling)) {
-                sibling.innerHTML = '&#xFEFF;';
-              } else {
-                sibling = null;
-              }
+    return {
+      supplant: supplant,
+      startsWith: startsWith,
+      removeLeading: removeLeading,
+      removeTrailing: removeTrailing,
+      ensureLeading: ensureLeading,
+      ensureTrailing: ensureTrailing,
+      endsWith: endsWith,
+      contains: contains,
+      trim: trim,
+      lTrim: lTrim,
+      rTrim: rTrim,
+      capitalize: capitalize
+    };
+  }
+);
 
-              startContainer.innerHTML = '<span>&#xFEFF;</span><span>&#xFEFF;</span>';
-              ieRng.moveToElementText(startContainer.lastChild);
-              ieRng.select();
-              dom.doc.selection.clear();
-              startContainer.innerHTML = '';
+define(
+  'ephox.sand.info.PlatformInfo',
 
-              if (sibling) {
-                sibling.innerHTML = '';
-              }
-              return;
-            }
+  [
+    'ephox.katamari.api.Fun',
+    'ephox.katamari.api.Strings'
+  ],
 
-            startOffset = dom.nodeIndex(startContainer);
-            startContainer = startContainer.parentNode;
-          }
+  function (Fun, Strings) {
+    var normalVersionRegex = /.*?version\/\ ?([0-9]+)\.([0-9]+).*/;
 
-          if (startOffset == endOffset - 1) {
-            try {
-              ctrlElm = startContainer.childNodes[startOffset];
-              ctrlRng = body.createControlRange();
-              ctrlRng.addElement(ctrlElm);
-              ctrlRng.select();
+    var checkContains = function (target) {
+      return function (uastring) {
+        return Strings.contains(uastring, target);
+      };
+    };
 
-              // Check if the range produced is on the correct element and is a control range
-              // On IE 8 it will select the parent contentEditable container if you select an inner element see: #5398
-              nativeRng = selection.getRng();
-              if (nativeRng.item && ctrlElm === nativeRng.item(0)) {
-                return;
-              }
-            } catch (ex) {
-              // Ignore
-            }
-          }
+    var browsers = [
+      {
+        name : 'Edge',
+        versionRegexes: [/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],
+        search: function (uastring) {
+          var monstrosity = Strings.contains(uastring, 'edge/') && Strings.contains(uastring, 'chrome') && Strings.contains(uastring, 'safari') && Strings.contains(uastring, 'applewebkit');
+          return monstrosity;
         }
+      },
+      {
+        name : 'Chrome',
+        versionRegexes: [/.*?chrome\/([0-9]+)\.([0-9]+).*/, normalVersionRegex],
+        search : function (uastring) {
+          return Strings.contains(uastring, 'chrome') && !Strings.contains(uastring, 'chromeframe');
+        }
+      },
+      {
+        name : 'IE',
+        versionRegexes: [/.*?msie\ ?([0-9]+)\.([0-9]+).*/, /.*?rv:([0-9]+)\.([0-9]+).*/],
+        search: function (uastring) {
+          return Strings.contains(uastring, 'msie') || Strings.contains(uastring, 'trident');
+        }
+      },
+      // INVESTIGATE: Is this still the Opera user agent?
+      {
+        name : 'Opera',
+        versionRegexes: [normalVersionRegex, /.*?opera\/([0-9]+)\.([0-9]+).*/],
+        search : checkContains('opera')
+      },
+      {
+        name : 'Firefox',
+        versionRegexes: [/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],
+        search : checkContains('firefox')
+      },
+      {
+        name : 'Safari',
+        versionRegexes: [normalVersionRegex, /.*?cpu os ([0-9]+)_([0-9]+).*/],
+        search : function (uastring) {
+          return (Strings.contains(uastring, 'safari') || Strings.contains(uastring, 'mobile/')) && Strings.contains(uastring, 'applewebkit');
+        }
+      }
+    ];
 
-        // Set start/end point of selection
-        setEndPoint(true);
-        setEndPoint();
-
-        // Select the new range and scroll it into view
-        ieRng.select();
-      };
-
-      // Expose range method
-      this.getRangeAt = getRange;
-    }
+    var oses = [
+      {
+        name : 'Windows',
+        search : checkContains('win'),
+        versionRegexes: [/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]
+      },
+      {
+        name : 'iOS',
+        search : function (uastring) {
+          return Strings.contains(uastring, 'iphone') || Strings.contains(uastring, 'ipad');
+        },
+        versionRegexes: [/.*?version\/\ ?([0-9]+)\.([0-9]+).*/, /.*cpu os ([0-9]+)_([0-9]+).*/, /.*cpu iphone os ([0-9]+)_([0-9]+).*/]
+      },
+      {
+        name : 'Android',
+        search : checkContains('android'),
+        versionRegexes: [/.*?android\ ?([0-9]+)\.([0-9]+).*/]
+      },
+      {
+        name : 'OSX',
+        search : checkContains('os x'),
+        versionRegexes: [/.*?os\ x\ ?([0-9]+)_([0-9]+).*/]
+      },
+      {
+        name : 'Linux',
+        search : checkContains('linux'),
+        versionRegexes: [ ]
+      },
+      { name : 'Solaris',
+        search : checkContains('sunos'),
+        versionRegexes: [ ]
+      },
+      {
+       name : 'FreeBSD',
+       search : checkContains('freebsd'),
+       versionRegexes: [ ]
+      }
+    ];
 
-    return Selection;
+    return {
+      browsers: Fun.constant(browsers),
+      oses: Fun.constant(oses)
+    };
   }
 );
-
 define(
-  'ephox.katamari.api.Type',
+  'ephox.sand.core.PlatformDetection',
 
   [
-    'global!Array',
-    'global!String'
+    'ephox.sand.core.Browser',
+    'ephox.sand.core.OperatingSystem',
+    'ephox.sand.detect.DeviceType',
+    'ephox.sand.detect.UaString',
+    'ephox.sand.info.PlatformInfo'
   ],
 
-  function (Array, String) {
-    var typeOf = function(x) {
-      if (x === null) return 'null';
-      var t = typeof x;
-      if (t === 'object' && Array.prototype.isPrototypeOf(x)) return 'array';
-      if (t === 'object' && String.prototype.isPrototypeOf(x)) return 'string';
-      return t;
-    };
+  function (Browser, OperatingSystem, DeviceType, UaString, PlatformInfo) {
+    var detect = function (userAgent) {
+      var browsers = PlatformInfo.browsers();
+      var oses = PlatformInfo.oses();
 
-    var isType = function (type) {
-      return function (value) {
-        return typeOf(value) === type;
+      var browser = UaString.detectBrowser(browsers, userAgent).fold(
+        Browser.unknown,
+        Browser.nu
+      );
+      var os = UaString.detectOs(oses, userAgent).fold(
+        OperatingSystem.unknown,
+        OperatingSystem.nu
+      );
+      var deviceType = DeviceType(os, browser, userAgent);
+
+      return {
+        browser: browser,
+        os: os,
+        deviceType: deviceType
       };
     };
 
     return {
-      isString: isType('string'),
-      isObject: isType('object'),
-      isArray: isType('array'),
-      isNull: isType('null'),
-      isBoolean: isType('boolean'),
-      isUndefined: isType('undefined'),
-      isFunction: isType('function'),
-      isNumber: isType('number')
+      detect: detect
     };
   }
 );
-
-
+defineGlobal("global!navigator", navigator);
 define(
-  'ephox.katamari.data.Immutable',
+  'ephox.sand.api.PlatformDetection',
 
   [
-    'ephox.katamari.api.Arr',
-    'ephox.katamari.api.Fun',
-    'global!Array',
-    'global!Error'
+    'ephox.katamari.api.Thunk',
+    'ephox.sand.core.PlatformDetection',
+    'global!navigator'
   ],
 
-  function (Arr, Fun, Array, Error) {
-    return function () {
-      var fields = arguments;
-      return function(/* values */) {
-        //  Don't use array slice(arguments), makes the whole function unoptimisable on Chrome
-        var values = new Array(arguments.length);
-        for (var i = 0; i < values.length; i++) values[i] = arguments[i];
-
-        if (fields.length !== values.length)
-          throw new Error('Wrong number of arguments to struct. Expected "[' + fields.length + ']", got ' + values.length + ' arguments');
+  function (Thunk, PlatformDetection, navigator) {
+    var detect = Thunk.cached(function () {
+      var userAgent = navigator.userAgent;
+      return PlatformDetection.detect(userAgent);
+    });
 
-        var struct = {};
-        Arr.each(fields, function (name, i) {
-          struct[name] = Fun.constant(values[i]);
-        });
-        return struct;
-      };
+    return {
+      detect: detect
     };
   }
 );
-
+define("global!console", [], function () { if (typeof console === "undefined") console = { log: function () {} }; return console; });
+defineGlobal("global!document", document);
 define(
-  'ephox.katamari.api.Obj',
+  'ephox.sugar.api.node.Element',
 
   [
-    'ephox.katamari.api.Option',
-    'global!Object'
+    'ephox.katamari.api.Fun',
+    'global!Error',
+    'global!console',
+    'global!document'
   ],
 
-  function (Option, Object) {
-    // There are many variations of Object iteration that are faster than the 'for-in' style:
-    // http://jsperf.com/object-keys-iteration/107
-    //
-    // Use the native keys if it is available (IE9+), otherwise fall back to manually filtering
-    var keys = (function () {
-      var fastKeys = Object.keys;
-
-      // This technically means that 'each' and 'find' on IE8 iterate through the object twice.
-      // This code doesn't run on IE8 much, so it's an acceptable tradeoff.
-      // If it becomes a problem we can always duplicate the feature detection inside each and find as well.
-      var slowKeys = function (o) {
-        var r = [];
-        for (var i in o) {
-          if (o.hasOwnProperty(i)) {
-            r.push(i);
-          }
-        }
-        return r;
-      };
-
-      return fastKeys === undefined ? slowKeys : fastKeys;
-    })();
-
-
-    var each = function (obj, f) {
-      var props = keys(obj);
-      for (var k = 0, len = props.length; k < len; k++) {
-        var i = props[k];
-        var x = obj[i];
-        f(x, i, obj);
+  function (Fun, Error, console, document) {
+    var fromHtml = function (html, scope) {
+      var doc = scope || document;
+      var div = doc.createElement('div');
+      div.innerHTML = html;
+      if (!div.hasChildNodes() || div.childNodes.length > 1) {
+        console.error('HTML does not have a single root node', html);
+        throw 'HTML must have a single root node';
       }
+      return fromDom(div.childNodes[0]);
     };
 
-    /** objectMap :: (JsObj(k, v), (v, k, JsObj(k, v) -> x)) -> JsObj(k, x) */
-    var objectMap = function (obj, f) {
-      return tupleMap(obj, function (x, i, obj) {
-        return {
-          k: i,
-          v: f(x, i, obj)
-        };
-      });
+    var fromTag = function (tag, scope) {
+      var doc = scope || document;
+      var node = doc.createElement(tag);
+      return fromDom(node);
     };
 
-    /** tupleMap :: (JsObj(k, v), (v, k, JsObj(k, v) -> { k: x, v: y })) -> JsObj(x, y) */
-    var tupleMap = function (obj, f) {
-      var r = {};
-      each(obj, function (x, i) {
-        var tuple = f(x, i, obj);
-        r[tuple.k] = tuple.v;
-      });
-      return r;
+    var fromText = function (text, scope) {
+      var doc = scope || document;
+      var node = doc.createTextNode(text);
+      return fromDom(node);
     };
 
-    /** bifilter :: (JsObj(k, v), (v, k -> Bool)) -> { t: JsObj(k, v), f: JsObj(k, v) } */
-    var bifilter = function (obj, pred) {
-      var t = {};
-      var f = {};
-      each(obj, function(x, i) {
-        var branch = pred(x, i) ? t : f;
-        branch[i] = x;
-      });
+    var fromDom = function (node) {
+      if (node === null || node === undefined) throw new Error('Node cannot be null or undefined');
       return {
-        t: t,
-        f: f
+        dom: Fun.constant(node)
       };
     };
 
-    /** mapToArray :: (JsObj(k, v), (v, k -> a)) -> [a] */
-    var mapToArray = function (obj, f) {
-      var r = [];
-      each(obj, function(value, name) {
-        r.push(f(value, name));
-      });
-      return r;
+    return {
+      fromHtml: fromHtml,
+      fromTag: fromTag,
+      fromText: fromText,
+      fromDom: fromDom
     };
+  }
+);
 
-    /** find :: (JsObj(k, v), (v, k, JsObj(k, v) -> Bool)) -> Option v */
-    var find = function (obj, pred) {
-      var props = keys(obj);
-      for (var k = 0, len = props.length; k < len; k++) {
-        var i = props[k];
-        var x = obj[i];
-        if (pred(x, i, obj)) {
-          return Option.some(x);
-        }
-      }
-      return Option.none();
-    };
+define(
+  'ephox.sugar.api.node.NodeTypes',
 
-    /** values :: JsObj(k, v) -> [v] */
-    var values = function (obj) {
-      return mapToArray(obj, function (v) {
-        return v;
-      });
-    };
+  [
 
-    var size = function (obj) {
-      return values(obj).length;
-    };
+  ],
 
+  function () {
     return {
-      bifilter: bifilter,
-      each: each,
-      map: objectMap,
-      mapToArray: mapToArray,
-      tupleMap: tupleMap,
-      find: find,
-      keys: keys,
-      values: values,
-      size: size
+      ATTRIBUTE:              2,
+      CDATA_SECTION:          4,
+      COMMENT:                8,
+      DOCUMENT:               9,
+      DOCUMENT_TYPE:          10,
+      DOCUMENT_FRAGMENT:      11,
+      ELEMENT:                1,
+      TEXT:                   3,
+      PROCESSING_INSTRUCTION: 7,
+      ENTITY_REFERENCE:       5,
+      ENTITY:                 6,
+      NOTATION:               12
     };
   }
 );
 define(
-  'ephox.katamari.util.BagUtils',
+  'ephox.sugar.api.search.Selectors',
 
   [
     'ephox.katamari.api.Arr',
-    'ephox.katamari.api.Type',
-    'global!Error'
+    'ephox.katamari.api.Option',
+    'ephox.sugar.api.node.Element',
+    'ephox.sugar.api.node.NodeTypes',
+    'global!Error',
+    'global!document'
   ],
 
-  function (Arr, Type, Error) {
-    var sort = function (arr) {
-      return arr.slice(0).sort();
-    };
+  function (Arr, Option, Element, NodeTypes, Error, document) {
+    /*
+     * There's a lot of code here; the aim is to allow the browser to optimise constant comparisons,
+     * instead of doing object lookup feature detection on every call
+     */
+    var STANDARD = 0;
+    var MSSTANDARD = 1;
+    var WEBKITSTANDARD = 2;
+    var FIREFOXSTANDARD = 3;
 
-    var reqMessage = function (required, keys) {
-      throw new Error('All required keys (' + sort(required).join(', ') + ') were not specified. Specified keys were: ' + sort(keys).join(', ') + '.');
-    };
+    var selectorType = (function () {
+      var test = document.createElement('span');
+      // As of Chrome 34 / Safari 7.1 / FireFox 34, everyone except IE has the unprefixed function.
+      // Still check for the others, but do it last.
+      return test.matches !== undefined ? STANDARD :
+             test.msMatchesSelector !== undefined ? MSSTANDARD :
+             test.webkitMatchesSelector !== undefined ? WEBKITSTANDARD :
+             test.mozMatchesSelector !== undefined ? FIREFOXSTANDARD :
+             -1;
+    })();
 
-    var unsuppMessage = function (unsupported) {
-      throw new Error('Unsupported keys for object: ' + sort(unsupported).join(', '));
-    };
 
-    var validateStrArr = function (label, array) {
-      if (!Type.isArray(array)) throw new Error('The ' + label + ' fields must be an array. Was: ' + array + '.');
-      Arr.each(array, function (a) {
-        if (!Type.isString(a)) throw new Error('The value ' + a + ' in the ' + label + ' fields was not a string.');
-      });
+    var ELEMENT = NodeTypes.ELEMENT;
+    var DOCUMENT = NodeTypes.DOCUMENT;
+
+    var is = function (element, selector) {
+      var elem = element.dom();
+      if (elem.nodeType !== ELEMENT) return false; // documents have querySelector but not matches
+
+      // As of Chrome 34 / Safari 7.1 / FireFox 34, everyone except IE has the unprefixed function.
+      // Still check for the others, but do it last.
+      else if (selectorType === STANDARD) return elem.matches(selector);
+      else if (selectorType === MSSTANDARD) return elem.msMatchesSelector(selector);
+      else if (selectorType === WEBKITSTANDARD) return elem.webkitMatchesSelector(selector);
+      else if (selectorType === FIREFOXSTANDARD) return elem.mozMatchesSelector(selector);
+      else throw new Error('Browser lacks native selectors'); // unfortunately we can't throw this on startup :(
     };
 
-    var invalidTypeMessage = function (incorrect, type) {
-      throw new Error('All values need to be of type: ' + type + '. Keys (' + sort(incorrect).join(', ') + ') were not.');
+    var bypassSelector = function (dom) {
+      // Only elements and documents support querySelector
+      return dom.nodeType !== ELEMENT && dom.nodeType !== DOCUMENT ||
+              // IE fix for complex queries on empty nodes: http://jsfiddle.net/spyder/fv9ptr5L/
+              dom.childElementCount === 0;
     };
 
-    var checkDupes = function (everything) {
-      var sorted = sort(everything);
-      var dupe = Arr.find(sorted, function (s, i) {
-        return i < sorted.length -1 && s === sorted[i + 1];
-      });
+    var all = function (selector, scope) {
+      var base = scope === undefined ? document : scope.dom();
+      return bypassSelector(base) ? [] : Arr.map(base.querySelectorAll(selector), Element.fromDom);
+    };
 
-      dupe.each(function (d) {
-        throw new Error('The field: ' + d + ' occurs more than once in the combined fields: [' + sorted.join(', ') + '].');
-      });
+    var one = function (selector, scope) {
+      var base = scope === undefined ? document : scope.dom();
+      return bypassSelector(base) ? Option.none() : Option.from(base.querySelector(selector)).map(Element.fromDom);
     };
 
     return {
-      sort: sort,
-      reqMessage: reqMessage,
-      unsuppMessage: unsuppMessage,
-      validateStrArr: validateStrArr,
-      invalidTypeMessage: invalidTypeMessage,
-      checkDupes: checkDupes
+      all: all,
+      is: is,
+      one: one
     };
   }
 );
+
 define(
-  'ephox.katamari.data.MixedBag',
+  'ephox.sugar.api.dom.Compare',
 
   [
     'ephox.katamari.api.Arr',
     'ephox.katamari.api.Fun',
-    'ephox.katamari.api.Obj',
-    'ephox.katamari.api.Option',
-    'ephox.katamari.util.BagUtils',
-    'global!Error',
-    'global!Object'
+    'ephox.sand.api.Node',
+    'ephox.sand.api.PlatformDetection',
+    'ephox.sugar.api.search.Selectors'
   ],
 
-  function (Arr, Fun, Obj, Option, BagUtils, Error, Object) {
-    
-    return function (required, optional) {
-      var everything = required.concat(optional);
-      if (everything.length === 0) throw new Error('You must specify at least one required or optional field.');
-
-      BagUtils.validateStrArr('required', required);
-      BagUtils.validateStrArr('optional', optional);
+  function (Arr, Fun, Node, PlatformDetection, Selectors) {
 
-      BagUtils.checkDupes(everything);
+    var eq = function (e1, e2) {
+      return e1.dom() === e2.dom();
+    };
 
-      return function (obj) {
-        var keys = Obj.keys(obj);
+    var isEqualNode = function (e1, e2) {
+      return e1.dom().isEqualNode(e2.dom());
+    };
 
-        // Ensure all required keys are present.
-        var allReqd = Arr.forall(required, function (req) {
-          return Arr.contains(keys, req);
-        });
+    var member = function (element, elements) {
+      return Arr.exists(elements, Fun.curry(eq, element));
+    };
 
-        if (! allReqd) BagUtils.reqMessage(required, keys);
+    // DOM contains() method returns true if e1===e2, we define our contains() to return false (a node does not contain itself).
+    var regularContains = function (e1, e2) {
+      var d1 = e1.dom(), d2 = e2.dom();
+      return d1 === d2 ? false : d1.contains(d2);
+    };
 
-        var unsupported = Arr.filter(keys, function (key) {
-          return !Arr.contains(everything, key);
-        });
+    var ieContains = function (e1, e2) {
+      // IE only implements the contains() method for Element nodes.
+      // It fails for Text nodes, so implement it using compareDocumentPosition()
+      // https://connect.microsoft.com/IE/feedback/details/780874/node-contains-is-incorrect
+      // Note that compareDocumentPosition returns CONTAINED_BY if 'e2 *is_contained_by* e1':
+      // Also, compareDocumentPosition defines a node containing itself as false.
+      return Node.documentPositionContainedBy(e1.dom(), e2.dom());
+    };
 
-        if (unsupported.length > 0) BagUtils.unsuppMessage(unsupported);
+    var browser = PlatformDetection.detect().browser;
 
-        var r = {};
-        Arr.each(required, function (req) {
-          r[req] = Fun.constant(obj[req]);
-        });
+    // Returns: true if node e1 contains e2, otherwise false.
+    // (returns false if e1===e2: A node does not contain itself).
+    var contains = browser.isIE() ? ieContains : regularContains;
 
-        Arr.each(optional, function (opt) {
-          r[opt] = Fun.constant(Object.prototype.hasOwnProperty.call(obj, opt) ? Option.some(obj[opt]): Option.none());
-        });
+    return {
+      eq: eq,
+      isEqualNode: isEqualNode,
+      member: member,
+      contains: contains,
 
-        return r;
-      };
+      // Only used by DomUniverse. Remove (or should Selectors.is move here?)
+      is: Selectors.is
     };
   }
 );
-define(
-  'ephox.katamari.api.Struct',
 
+/**
+ * ScrollIntoView.js
+ *
+ * Released under LGPL License.
+ * Copyright (c) 1999-2017 Ephox Corp. All rights reserved
+ *
+ * License: http://www.tinymce.com/license
+ * Contributing: http://www.tinymce.com/contributing
+ */
+
+define(
+  'tinymce.core.dom.ScrollIntoView',
   [
-    'ephox.katamari.data.Immutable',
-    'ephox.katamari.data.MixedBag'
+    'tinymce.core.dom.NodeType'
   ],
+  function (NodeType) {
+    var getPos = function (elm) {
+      var x = 0, y = 0;
 
-  function (Immutable, MixedBag) {
-    return {
-      immutable: Immutable,
-      immutableBag: MixedBag
+      var offsetParent = elm;
+      while (offsetParent && offsetParent.nodeType) {
+        x += offsetParent.offsetLeft || 0;
+        y += offsetParent.offsetTop || 0;
+        offsetParent = offsetParent.offsetParent;
+      }
+
+      return { x: x, y: y };
     };
-  }
-);
 
-define(
-  'ephox.sugar.alien.Recurse',
+    var fireScrollIntoViewEvent = function (editor, elm, alignToTop) {
+      var scrollEvent = { elm: elm, alignToTop: alignToTop };
+      editor.fire('scrollIntoView', scrollEvent);
+      return scrollEvent.isDefaultPrevented();
+    };
 
-  [
+    var scrollIntoView = function (editor, elm, alignToTop) {
+      var y, viewPort, dom = editor.dom, root = dom.getRoot(), viewPortY, viewPortH, offsetY = 0;
 
-  ],
+      if (fireScrollIntoViewEvent(editor, elm, alignToTop)) {
+        return;
+      }
 
-  function () {
-    /**
-     * Applies f repeatedly until it completes (by returning Option.none()).
-     *
-     * Normally would just use recursion, but JavaScript lacks tail call optimisation.
-     *
-     * This is what recursion looks like when manually unravelled :)
-     */
-    var toArray = function (target, f) {
-      var r = [];
+      if (!NodeType.isElement(elm)) {
+        return;
+      }
 
-      var recurse = function (e) {
-        r.push(e);
-        return f(e);
-      };
+      if (alignToTop === false) {
+        offsetY = elm.offsetHeight;
+      }
 
-      var cur = f(target);
-      do {
-        cur = cur.bind(recurse);
-      } while (cur.isSome());
+      if (root.nodeName !== 'BODY') {
+        var scrollContainer = editor.selection.getScrollContainer();
+        if (scrollContainer) {
+          y = getPos(elm).y - getPos(scrollContainer).y + offsetY;
+          viewPortH = scrollContainer.clientHeight;
+          viewPortY = scrollContainer.scrollTop;
+          if (y < viewPortY || y + 25 > viewPortY + viewPortH) {
+            scrollContainer.scrollTop = y < viewPortY ? y : y - viewPortH + 25;
+          }
 
-      return r;
+          return;
+        }
+      }
+
+      viewPort = dom.getViewPort(editor.getWin());
+      y = dom.getPos(elm).y + offsetY;
+      viewPortY = viewPort.y;
+      viewPortH = viewPort.h;
+      if (y < viewPort.y || y + 25 > viewPortY + viewPortH) {
+        editor.getWin().scrollTo(0, y < viewPortY ? y : y - viewPortH + 25);
+      }
     };
 
     return {
-      toArray: toArray
+      scrollIntoView: scrollIntoView
     };
   }
 );
+
+/**
+ * TridentSelection.js
+ *
+ * Released under LGPL License.
+ * Copyright (c) 1999-2017 Ephox Corp. All rights reserved
+ *
+ * License: http://www.tinymce.com/license
+ * Contributing: http://www.tinymce.com/contributing
+ */
+
+/**
+ * Selection class for old explorer versions. This one fakes the
+ * native selection object available on modern browsers.
+ *
+ * @private
+ * @class tinymce.dom.TridentSelection
+ */
 define(
-  'ephox.katamari.api.Global',
+  'tinymce.core.dom.TridentSelection',
+  [
+  ],
+  function () {
+    function Selection(selection) {
+      var self = this, dom = selection.dom, FALSE = false;
+
+      function getPosition(rng, start) {
+        var checkRng, startIndex = 0, endIndex, inside,
+          children, child, offset, index, position = -1, parent;
+
+        // Setup test range, collapse it and get the parent
+        checkRng = rng.duplicate();
+        checkRng.collapse(start);
+        parent = checkRng.parentElement();
+
+        // Check if the selection is within the right document
+        if (parent.ownerDocument !== selection.dom.doc) {
+          return;
+        }
+
+        // IE will report non editable elements as it's parent so look for an editable one
+        while (parent.contentEditable === "false") {
+          parent = parent.parentNode;
+        }
+
+        // If parent doesn't have any children then return that we are inside the element
+        if (!parent.hasChildNodes()) {
+          return { node: parent, inside: 1 };
+        }
+
+        // Setup node list and endIndex
+        children = parent.children;
+        endIndex = children.length - 1;
+
+        // Perform a binary search for the position
+        while (startIndex <= endIndex) {
+          index = Math.floor((startIndex + endIndex) / 2);
+
+          // Move selection to node and compare the ranges
+          child = children[index];
+          checkRng.moveToElementText(child);
+          position = checkRng.compareEndPoints(start ? 'StartToStart' : 'EndToEnd', rng);
+
+          // Before/after or an exact match
+          if (position > 0) {
+            endIndex = index - 1;
+          } else if (position < 0) {
+            startIndex = index + 1;
+          } else {
+            return { node: child };
+          }
+        }
+
+        // Check if child position is before or we didn't find a position
+        if (position < 0) {
+          // No element child was found use the parent element and the offset inside that
+          if (!child) {
+            checkRng.moveToElementText(parent);
+            checkRng.collapse(true);
+            child = parent;
+            inside = true;
+          } else {
+            checkRng.collapse(false);
+          }
+
+          // Walk character by character in text node until we hit the selected range endpoint,
+          // hit the end of document or parent isn't the right one
+          // We need to walk char by char since rng.text or rng.htmlText will trim line endings
+          offset = 0;
+          while (checkRng.compareEndPoints(start ? 'StartToStart' : 'StartToEnd', rng) !== 0) {
+            if (checkRng.move('character', 1) === 0 || parent != checkRng.parentElement()) {
+              break;
+            }
+
+            offset++;
+          }
+        } else {
+          // Child position is after the selection endpoint
+          checkRng.collapse(true);
+
+          // Walk character by character in text node until we hit the selected range endpoint, hit
+          // the end of document or parent isn't the right one
+          offset = 0;
+          while (checkRng.compareEndPoints(start ? 'StartToStart' : 'StartToEnd', rng) !== 0) {
+            if (checkRng.move('character', -1) === 0 || parent != checkRng.parentElement()) {
+              break;
+            }
+
+            offset++;
+          }
+        }
+
+        return { node: child, position: position, offset: offset, inside: inside };
+      }
+
+      // Returns a W3C DOM compatible range object by using the IE Range API
+      function getRange() {
+        var ieRange = selection.getRng(), domRange = dom.createRng(), element, collapsed, tmpRange, element2, bookmark;
+
+        // If selection is outside the current document just return an empty range
+        element = ieRange.item ? ieRange.item(0) : ieRange.parentElement();
+        if (element.ownerDocument != dom.doc) {
+          return domRange;
+        }
+
+        collapsed = selection.isCollapsed();
+
+        // Handle control selection
+        if (ieRange.item) {
+          domRange.setStart(element.parentNode, dom.nodeIndex(element));
+          domRange.setEnd(domRange.startContainer, domRange.startOffset + 1);
+
+          return domRange;
+        }
+
+        function findEndPoint(start) {
+          var endPoint = getPosition(ieRange, start), container, offset, textNodeOffset = 0, sibling, undef, nodeValue;
+
+          container = endPoint.node;
+          offset = endPoint.offset;
+
+          if (endPoint.inside && !container.hasChildNodes()) {
+            domRange[start ? 'setStart' : 'setEnd'](container, 0);
+            return;
+          }
+
+          if (offset === undef) {
+            domRange[start ? 'setStartBefore' : 'setEndAfter'](container);
+            return;
+          }
+
+          if (endPoint.position < 0) {
+            sibling = endPoint.inside ? container.firstChild : container.nextSibling;
+
+            if (!sibling) {
+              domRange[start ? 'setStartAfter' : 'setEndAfter'](container);
+              return;
+            }
 
-  [
-  ],
+            if (!offset) {
+              if (sibling.nodeType == 3) {
+                domRange[start ? 'setStart' : 'setEnd'](sibling, 0);
+              } else {
+                domRange[start ? 'setStartBefore' : 'setEndBefore'](sibling);
+              }
 
-  function () {
-    // Use window object as the global if it's available since CSP will block script evals
-    if (typeof window !== 'undefined') {
-      return window;
-    } else {
-      return Function('return this;')();
-    }
-  }
-);
+              return;
+            }
 
+            // Find the text node and offset
+            while (sibling) {
+              if (sibling.nodeType == 3) {
+                nodeValue = sibling.nodeValue;
+                textNodeOffset += nodeValue.length;
 
-define(
-  'ephox.katamari.api.Resolve',
+                // We are at or passed the position we where looking for
+                if (textNodeOffset >= offset) {
+                  container = sibling;
+                  textNodeOffset -= offset;
+                  textNodeOffset = nodeValue.length - textNodeOffset;
+                  break;
+                }
+              }
 
-  [
-    'ephox.katamari.api.Global'
-  ],
+              sibling = sibling.nextSibling;
+            }
+          } else {
+            // Find the text node and offset
+            sibling = container.previousSibling;
 
-  function (Global) {
-    /** path :: ([String], JsObj?) -> JsObj */
-    var path = function (parts, scope) {
-      var o = scope !== undefined ? scope : Global;
-      for (var i = 0; i < parts.length && o !== undefined && o !== null; ++i)
-        o = o[parts[i]];
-      return o;
-    };
+            if (!sibling) {
+              return domRange[start ? 'setStartBefore' : 'setEndBefore'](container);
+            }
 
-    /** resolve :: (String, JsObj?) -> JsObj */
-    var resolve = function (p, scope) {
-      var parts = p.split('.');
-      return path(parts, scope);
-    };
+            // If there isn't any text to loop then use the first position
+            if (!offset) {
+              if (container.nodeType == 3) {
+                domRange[start ? 'setStart' : 'setEnd'](sibling, container.nodeValue.length);
+              } else {
+                domRange[start ? 'setStartAfter' : 'setEndAfter'](sibling);
+              }
 
-    /** step :: (JsObj, String) -> JsObj */
-    var step = function (o, part) {
-      if (o[part] === undefined || o[part] === null)
-        o[part] = {};
-      return o[part];
-    };
+              return;
+            }
 
-    /** forge :: ([String], JsObj?) -> JsObj */
-    var forge = function (parts, target) {
-      var o = target !== undefined ? target : Global;      
-      for (var i = 0; i < parts.length; ++i)
-        o = step(o, parts[i]);
-      return o;
-    };
+            while (sibling) {
+              if (sibling.nodeType == 3) {
+                textNodeOffset += sibling.nodeValue.length;
 
-    /** namespace :: (String, JsObj?) -> JsObj */
-    var namespace = function (name, target) {
-      var parts = name.split('.');
-      return forge(parts, target);
-    };
+                // We are at or passed the position we where looking for
+                if (textNodeOffset >= offset) {
+                  container = sibling;
+                  textNodeOffset -= offset;
+                  break;
+                }
+              }
 
-    return {
-      path: path,
-      resolve: resolve,
-      forge: forge,
-      namespace: namespace
-    };
-  }
-);
+              sibling = sibling.previousSibling;
+            }
+          }
 
+          domRange[start ? 'setStart' : 'setEnd'](container, textNodeOffset);
+        }
 
-define(
-  'ephox.sand.util.Global',
+        try {
+          // Find start point
+          findEndPoint(true);
 
-  [
-    'ephox.katamari.api.Resolve'
-  ],
+          // Find end point if needed
+          if (!collapsed) {
+            findEndPoint();
+          }
+        } catch (ex) {
+          // IE has a nasty bug where text nodes might throw "invalid argument" when you
+          // access the nodeValue or other properties of text nodes. This seems to happen when
+          // text nodes are split into two nodes by a delete/backspace call.
+          // So let us detect and try to fix it.
+          if (ex.number == -2147024809) {
+            // Get the current selection
+            bookmark = self.getBookmark(2);
 
-  function (Resolve) {
-    var unsafe = function (name, scope) {
-      return Resolve.resolve(name, scope);
-    };
+            // Get start element
+            tmpRange = ieRange.duplicate();
+            tmpRange.collapse(true);
+            element = tmpRange.parentElement();
 
-    var getOrDie = function (name, scope) {
-      var actual = unsafe(name, scope);
+            // Get end element
+            if (!collapsed) {
+              tmpRange = ieRange.duplicate();
+              tmpRange.collapse(false);
+              element2 = tmpRange.parentElement();
+              element2.innerHTML = element2.innerHTML;
+            }
 
-      if (actual === undefined) throw name + ' not available on this browser';
-      return actual;
-    };
+            // Remove the broken elements
+            element.innerHTML = element.innerHTML;
 
-    return {
-      getOrDie: getOrDie
-    };
-  }
-);
-define(
-  'ephox.sand.api.Node',
+            // Restore the selection
+            self.moveToBookmark(bookmark);
 
-  [
-    'ephox.sand.util.Global'
-  ],
+            // Since the range has moved we need to re-get it
+            ieRange = selection.getRng();
 
-  function (Global) {
-    /*
-     * MDN says (yes) for IE, but it's undefined on IE8
-     */
-    var node = function () {
-      var f = Global.getOrDie('Node');
-      return f;
-    };
+            // Find start point
+            findEndPoint(true);
 
-    /*
-     * Most of numerosity doesn't alter the methods on the object.
-     * We're making an exception for Node, because bitwise and is so easy to get wrong.
-     *
-     * Might be nice to ADT this at some point instead of having individual methods.
-     */
+            // Find end point if needed
+            if (!collapsed) {
+              findEndPoint();
+            }
+          } else {
+            throw ex; // Throw other errors
+          }
+        }
 
-    var compareDocumentPosition = function (a, b, match) {
-      // Returns: 0 if e1 and e2 are the same node, or a bitmask comparing the positions
-      // of nodes e1 and e2 in their documents. See the URL below for bitmask interpretation
-      // https://developer.mozilla.org/en-US/docs/Web/API/Node/compareDocumentPosition
-      return (a.compareDocumentPosition(b) & match) !== 0;
-    };
+        return domRange;
+      }
 
-    var documentPositionPreceding = function (a, b) {
-      return compareDocumentPosition(a, b, node().DOCUMENT_POSITION_PRECEDING);
-    };
+      this.getBookmark = function (type) {
+        var rng = selection.getRng(), bookmark = {};
 
-    var documentPositionContainedBy = function (a, b) {
-      return compareDocumentPosition(a, b, node().DOCUMENT_POSITION_CONTAINED_BY);
-    };
+        function getIndexes(node) {
+          var parent, root, children, i, indexes = [];
 
-    return {
-      documentPositionPreceding: documentPositionPreceding,
-      documentPositionContainedBy: documentPositionContainedBy
-    };
-  }
-);
-define(
-  'ephox.katamari.api.Thunk',
+          parent = node.parentNode;
+          root = dom.getRoot().parentNode;
 
-  [
-  ],
+          while (parent != root && parent.nodeType !== 9) {
+            children = parent.children;
 
-  function () {
+            i = children.length;
+            while (i--) {
+              if (node === children[i]) {
+                indexes.push(i);
+                break;
+              }
+            }
 
-    var cached = function (f) {
-      var called = false;
-      var r;
-      return function() {
-        if (!called) {
-          called = true;
-          r = f.apply(null, arguments);
+            node = parent;
+            parent = parent.parentNode;
+          }
+
+          return indexes;
         }
-        return r;
-      };
-    };
 
-    return {
-      cached: cached
-    };
-  }
-);
+        function getBookmarkEndPoint(start) {
+          var position;
 
-defineGlobal("global!Number", Number);
-define(
-  'ephox.sand.detect.Version',
+          position = getPosition(rng, start);
+          if (position) {
+            return {
+              position: position.position,
+              offset: position.offset,
+              indexes: getIndexes(position.node),
+              inside: position.inside
+            };
+          }
+        }
 
-  [
-    'ephox.katamari.api.Arr',
-    'global!Number',
-    'global!String'
-  ],
+        // Non ubstructive bookmark
+        if (type === 2) {
+          // Handle text selection
+          if (!rng.item) {
+            bookmark.start = getBookmarkEndPoint(true);
 
-  function (Arr, Number, String) {
-    var firstMatch = function (regexes, s) {
-      for (var i = 0; i < regexes.length; i++) {
-        var x = regexes[i];
-        if (x.test(s)) return x;
-      }
-      return undefined;
-    };
+            if (!selection.isCollapsed()) {
+              bookmark.end = getBookmarkEndPoint();
+            }
+          } else {
+            bookmark.start = { ctrl: true, indexes: getIndexes(rng.item(0)) };
+          }
+        }
 
-    var find = function (regexes, agent) {
-      var r = firstMatch(regexes, agent);
-      if (!r) return { major : 0, minor : 0 };
-      var group = function(i) {
-        return Number(agent.replace(r, '$' + i));
+        return bookmark;
       };
-      return nu(group(1), group(2));
-    };
 
-    var detect = function (versionRegexes, agent) {
-      var cleanedAgent = String(agent).toLowerCase();
+      this.moveToBookmark = function (bookmark) {
+        var rng, body = dom.doc.body;
 
-      if (versionRegexes.length === 0) return unknown();
-      return find(versionRegexes, cleanedAgent);
-    };
+        function resolveIndexes(indexes) {
+          var node, i, idx, children;
 
-    var unknown = function () {
-      return nu(0, 0);
-    };
+          node = dom.getRoot();
+          for (i = indexes.length - 1; i >= 0; i--) {
+            children = node.children;
+            idx = indexes[i];
 
-    var nu = function (major, minor) {
-      return { major: major, minor: minor };
-    };
+            if (idx <= children.length - 1) {
+              node = children[idx];
+            }
+          }
 
-    return {
-      nu: nu,
-      detect: detect,
-      unknown: unknown
-    };
-  }
-);
-define(
-  'ephox.sand.core.Browser',
+          return node;
+        }
 
-  [
-    'ephox.katamari.api.Fun',
-    'ephox.sand.detect.Version'
-  ],
+        function setBookmarkEndPoint(start) {
+          var endPoint = bookmark[start ? 'start' : 'end'], moveLeft, moveRng, undef, offset;
 
-  function (Fun, Version) {
-    var edge = 'Edge';
-    var chrome = 'Chrome';
-    var ie = 'IE';
-    var opera = 'Opera';
-    var firefox = 'Firefox';
-    var safari = 'Safari';
+          if (endPoint) {
+            moveLeft = endPoint.position > 0;
 
-    var isBrowser = function (name, current) {
-      return function () {
-        return current === name;
-      };
-    };
+            moveRng = body.createTextRange();
+            moveRng.moveToElementText(resolveIndexes(endPoint.indexes));
 
-    var unknown = function () {
-      return nu({
-        current: undefined,
-        version: Version.unknown()
-      });
-    };
+            offset = endPoint.offset;
+            if (offset !== undef) {
+              moveRng.collapse(endPoint.inside || moveLeft);
+              moveRng.moveStart('character', moveLeft ? -offset : offset);
+            } else {
+              moveRng.collapse(start);
+            }
 
-    var nu = function (info) {
-      var current = info.current;
-      var version = info.version;
+            rng.setEndPoint(start ? 'StartToStart' : 'EndToStart', moveRng);
 
-      return {
-        current: current,
-        version: version,
+            if (start) {
+              rng.collapse(true);
+            }
+          }
+        }
 
-        // INVESTIGATE: Rename to Edge ?
-        isEdge: isBrowser(edge, current),
-        isChrome: isBrowser(chrome, current),
-        // NOTE: isIe just looks too weird
-        isIE: isBrowser(ie, current),
-        isOpera: isBrowser(opera, current),
-        isFirefox: isBrowser(firefox, current),
-        isSafari: isBrowser(safari, current)
+        if (bookmark.start) {
+          if (bookmark.start.ctrl) {
+            rng = body.createControlRange();
+            rng.addElement(resolveIndexes(bookmark.start.indexes));
+            rng.select();
+          } else {
+            rng = body.createTextRange();
+            setBookmarkEndPoint(true);
+            setBookmarkEndPoint();
+            rng.select();
+          }
+        }
       };
-    };
 
-    return {
-      unknown: unknown,
-      nu: nu,
-      edge: Fun.constant(edge),
-      chrome: Fun.constant(chrome),
-      ie: Fun.constant(ie),
-      opera: Fun.constant(opera),
-      firefox: Fun.constant(firefox),
-      safari: Fun.constant(safari)
-    };
-  }
-);
-define(
-  'ephox.sand.core.OperatingSystem',
+      this.addRange = function (rng) {
+        var ieRng, ctrlRng, startContainer, startOffset, endContainer, endOffset, sibling,
+          doc = selection.dom.doc, body = doc.body, nativeRng, ctrlElm;
 
-  [
-    'ephox.katamari.api.Fun',
-    'ephox.sand.detect.Version'
-  ],
+        function setEndPoint(start) {
+          var container, offset, marker, tmpRng, nodes;
 
-  function (Fun, Version) {
-    var windows = 'Windows';
-    var ios = 'iOS';
-    var android = 'Android';
-    var linux = 'Linux';
-    var osx = 'OSX';
-    var solaris = 'Solaris';
-    var freebsd = 'FreeBSD';
+          marker = dom.create('a');
+          container = start ? startContainer : endContainer;
+          offset = start ? startOffset : endOffset;
+          tmpRng = ieRng.duplicate();
 
-    // Though there is a bit of dupe with this and Browser, trying to 
-    // reuse code makes it much harder to follow and change.
-    var isOS = function (name, current) {
-      return function () {
-        return current === name;
-      };
-    };
+          if (container == doc || container == doc.documentElement) {
+            container = body;
+            offset = 0;
+          }
 
-    var unknown = function () {
-      return nu({
-        current: undefined,
-        version: Version.unknown()
-      });
-    };
+          if (container.nodeType == 3) {
+            container.parentNode.insertBefore(marker, container);
+            tmpRng.moveToElementText(marker);
+            tmpRng.moveStart('character', offset);
+            dom.remove(marker);
+            ieRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', tmpRng);
+          } else {
+            nodes = container.childNodes;
 
-    var nu = function (info) {
-      var current = info.current;
-      var version = info.version;
+            if (nodes.length) {
+              if (offset >= nodes.length) {
+                dom.insertAfter(marker, nodes[nodes.length - 1]);
+              } else {
+                container.insertBefore(marker, nodes[offset]);
+              }
 
-      return {
-        current: current,
-        version: version,
+              tmpRng.moveToElementText(marker);
+            } else if (container.canHaveHTML) {
+              // Empty node selection for example <div>|</div>
+              // Setting innerHTML with a span marker then remove that marker seems to keep empty block elements open
+              container.innerHTML = '<span>&#xFEFF;</span>';
+              marker = container.firstChild;
+              tmpRng.moveToElementText(marker);
+              tmpRng.collapse(FALSE); // Collapse false works better than true for some odd reason
+            }
 
-        isWindows: isOS(windows, current),
-        // TODO: Fix capitalisation
-        isiOS: isOS(ios, current),
-        isAndroid: isOS(android, current),
-        isOSX: isOS(osx, current),
-        isLinux: isOS(linux, current),
-        isSolaris: isOS(solaris, current),
-        isFreeBSD: isOS(freebsd, current)
-      };
-    };
+            ieRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', tmpRng);
+            dom.remove(marker);
+          }
+        }
+
+        // Setup some shorter versions
+        startContainer = rng.startContainer;
+        startOffset = rng.startOffset;
+        endContainer = rng.endContainer;
+        endOffset = rng.endOffset;
+        ieRng = body.createTextRange();
+
+        // If single element selection then try making a control selection out of it
+        if (startContainer == endContainer && startContainer.nodeType == 1) {
+          // Trick to place the caret inside an empty block element like <p></p>
+          if (startOffset == endOffset && !startContainer.hasChildNodes()) {
+            if (startContainer.canHaveHTML) {
+              // Check if previous sibling is an empty block if it is then we need to render it
+              // IE would otherwise move the caret into the sibling instead of the empty startContainer see: #5236
+              // Example this: <p></p><p>|</p> would become this: <p>|</p><p></p>
+              sibling = startContainer.previousSibling;
+              if (sibling && !sibling.hasChildNodes() && dom.isBlock(sibling)) {
+                sibling.innerHTML = '&#xFEFF;';
+              } else {
+                sibling = null;
+              }
 
-    return {
-      unknown: unknown,
-      nu: nu,
+              startContainer.innerHTML = '<span>&#xFEFF;</span><span>&#xFEFF;</span>';
+              ieRng.moveToElementText(startContainer.lastChild);
+              ieRng.select();
+              dom.doc.selection.clear();
+              startContainer.innerHTML = '';
 
-      windows: Fun.constant(windows),
-      ios: Fun.constant(ios),
-      android: Fun.constant(android),
-      linux: Fun.constant(linux),
-      osx: Fun.constant(osx),
-      solaris: Fun.constant(solaris),
-      freebsd: Fun.constant(freebsd)
-    };
-  }
-);
-define(
-  'ephox.sand.detect.DeviceType',
+              if (sibling) {
+                sibling.innerHTML = '';
+              }
+              return;
+            }
 
-  [
-    'ephox.katamari.api.Fun'
-  ],
+            startOffset = dom.nodeIndex(startContainer);
+            startContainer = startContainer.parentNode;
+          }
 
-  function (Fun) {
-    return function (os, browser, userAgent) {
-      var isiPad = os.isiOS() && /ipad/i.test(userAgent) === true;
-      var isiPhone = os.isiOS() && !isiPad;
-      var isAndroid3 = os.isAndroid() && os.version.major === 3;
-      var isAndroid4 = os.isAndroid() && os.version.major === 4;
-      var isTablet = isiPad || isAndroid3 || ( isAndroid4 && /mobile/i.test(userAgent) === true );
-      var isTouch = os.isiOS() || os.isAndroid();
-      var isPhone = isTouch && !isTablet;
+          if (startOffset == endOffset - 1) {
+            try {
+              ctrlElm = startContainer.childNodes[startOffset];
+              ctrlRng = body.createControlRange();
+              ctrlRng.addElement(ctrlElm);
+              ctrlRng.select();
 
-      var iOSwebview = browser.isSafari() && os.isiOS() && /safari/i.test(userAgent) === false;
+              // Check if the range produced is on the correct element and is a control range
+              // On IE 8 it will select the parent contentEditable container if you select an inner element see: #5398
+              nativeRng = selection.getRng();
+              if (nativeRng.item && ctrlElm === nativeRng.item(0)) {
+                return;
+              }
+            } catch (ex) {
+              // Ignore
+            }
+          }
+        }
 
-      return {
-        isiPad : Fun.constant(isiPad),
-        isiPhone: Fun.constant(isiPhone),
-        isTablet: Fun.constant(isTablet),
-        isPhone: Fun.constant(isPhone),
-        isTouch: Fun.constant(isTouch),
-        isAndroid: os.isAndroid,
-        isiOS: os.isiOS,
-        isWebView: Fun.constant(iOSwebview)
+        // Set start/end point of selection
+        setEndPoint(true);
+        setEndPoint();
+
+        // Select the new range and scroll it into view
+        ieRng.select();
       };
-    };
+
+      // Expose range method
+      this.getRangeAt = getRange;
+    }
+
+    return Selection;
   }
 );
+
 define(
-  'ephox.sand.detect.UaString',
+  'ephox.katamari.api.Type',
 
   [
-    'ephox.katamari.api.Arr',
-    'ephox.sand.detect.Version',
+    'global!Array',
     'global!String'
   ],
 
-  function (Arr, Version, String) {
-    var detect = function (candidates, userAgent) {
-      var agent = String(userAgent).toLowerCase();
-      return Arr.find(candidates, function (candidate) {
-        return candidate.search(agent);
-      });
-    };
-
-    // They (browser and os) are the same at the moment, but they might
-    // not stay that way.
-    var detectBrowser = function (browsers, userAgent) {
-      return detect(browsers, userAgent).map(function (browser) {
-        var version = Version.detect(browser.versionRegexes, userAgent);
-        return {
-          current: browser.name,
-          version: version
-        };
-      });
+  function (Array, String) {
+    var typeOf = function(x) {
+      if (x === null) return 'null';
+      var t = typeof x;
+      if (t === 'object' && Array.prototype.isPrototypeOf(x)) return 'array';
+      if (t === 'object' && String.prototype.isPrototypeOf(x)) return 'string';
+      return t;
     };
 
-    var detectOs = function (oses, userAgent) {
-      return detect(oses, userAgent).map(function (os) {
-        var version = Version.detect(os.versionRegexes, userAgent);
-        return {
-          current: os.name,
-          version: version
-        };
-      });
+    var isType = function (type) {
+      return function (value) {
+        return typeOf(value) === type;
+      };
     };
 
     return {
-      detectBrowser: detectBrowser,
-      detectOs: detectOs
+      isString: isType('string'),
+      isObject: isType('object'),
+      isArray: isType('array'),
+      isNull: isType('null'),
+      isBoolean: isType('boolean'),
+      isUndefined: isType('undefined'),
+      isFunction: isType('function'),
+      isNumber: isType('number')
     };
   }
 );
-define(
-  'ephox.katamari.str.StrAppend',
-
-  [
-
-  ],
 
-  function () {
-    var addToStart = function (str, prefix) {
-      return prefix + str;
-    };
-
-    var addToEnd = function (str, suffix) {
-      return str + suffix;
-    };
 
-    var removeFromStart = function (str, numChars) {
-      return str.substring(numChars);
-    };
-
-    var removeFromEnd = function (str, numChars) {
-      return str.substring(0, str.length - numChars);
-    };
- 
-    return {
-      addToStart: addToStart,
-      addToEnd: addToEnd,
-      removeFromStart: removeFromStart,
-      removeFromEnd: removeFromEnd
-    };
-  }
-);
 define(
-  'ephox.katamari.str.StringParts',
+  'ephox.katamari.data.Immutable',
 
   [
-    'ephox.katamari.api.Option',
+    'ephox.katamari.api.Arr',
+    'ephox.katamari.api.Fun',
+    'global!Array',
     'global!Error'
   ],
 
-  function (Option, Error) {
-    /** Return the first 'count' letters from 'str'.
--     *  e.g. first("abcde", 2) === "ab"
--     */
-    var first = function(str, count) {
-     return str.substr(0, count);
-    };
-
-    /** Return the last 'count' letters from 'str'.
-    *  e.g. last("abcde", 2) === "de"
-    */
-    var last = function(str, count) {
-     return str.substr(str.length - count, str.length);
-    };
-
-    var head = function(str) {
-      return str === '' ? Option.none() : Option.some(str.substr(0, 1));
-    };
+  function (Arr, Fun, Array, Error) {
+    return function () {
+      var fields = arguments;
+      return function(/* values */) {
+        //  Don't use array slice(arguments), makes the whole function unoptimisable on Chrome
+        var values = new Array(arguments.length);
+        for (var i = 0; i < values.length; i++) values[i] = arguments[i];
 
-    var tail = function(str) {
-      return str === '' ? Option.none() : Option.some(str.substring(1));
-    };
+        if (fields.length !== values.length)
+          throw new Error('Wrong number of arguments to struct. Expected "[' + fields.length + ']", got ' + values.length + ' arguments');
 
-    return {
-      first: first,
-      last: last,
-      head: head,
-      tail: tail
+        var struct = {};
+        Arr.each(fields, function (name, i) {
+          struct[name] = Fun.constant(values[i]);
+        });
+        return struct;
+      };
     };
   }
 );
+
 define(
-  'ephox.katamari.api.Strings',
+  'ephox.katamari.api.Obj',
 
   [
-    'ephox.katamari.str.StrAppend',
-    'ephox.katamari.str.StringParts',
-    'global!Error'
+    'ephox.katamari.api.Option',
+    'global!Object'
   ],
 
-  function (StrAppend, StringParts, Error) {
-    var checkRange = function(str, substr, start) {
-      if (substr === '') return true;
-      if (str.length < substr.length) return false;
-      var x = str.substr(start, start + substr.length);
-      return x === substr;
-    };
-
-    /** Given a string and object, perform template-replacements on the string, as specified by the object.
-     * Any template fields of the form ${name} are replaced by the string or number specified as obj["name"]
-     * Based on Douglas Crockford's 'supplant' method for template-replace of strings. Uses different template format.
-     */
-    var supplant = function(str, obj) {
-      var isStringOrNumber = function(a) {
-        var t = typeof a;
-        return t === 'string' || t === 'number';
-      };
+  function (Option, Object) {
+    // There are many variations of Object iteration that are faster than the 'for-in' style:
+    // http://jsperf.com/object-keys-iteration/107
+    //
+    // Use the native keys if it is available (IE9+), otherwise fall back to manually filtering
+    var keys = (function () {
+      var fastKeys = Object.keys;
 
-      return str.replace(/\${([^{}]*)}/g,
-        function (a, b) {
-          var value = obj[b];
-          return isStringOrNumber(value) ? value : a;
+      // This technically means that 'each' and 'find' on IE8 iterate through the object twice.
+      // This code doesn't run on IE8 much, so it's an acceptable tradeoff.
+      // If it becomes a problem we can always duplicate the feature detection inside each and find as well.
+      var slowKeys = function (o) {
+        var r = [];
+        for (var i in o) {
+          if (o.hasOwnProperty(i)) {
+            r.push(i);
+          }
         }
-      );
-    };
-
-    var removeLeading = function (str, prefix) {
-      return startsWith(str, prefix) ? StrAppend.removeFromStart(str, prefix.length) : str;
-    };
-
-    var removeTrailing = function (str, prefix) {
-      return endsWith(str, prefix) ? StrAppend.removeFromEnd(str, prefix.length) : str;
-    };
-
-    var ensureLeading = function (str, prefix) {
-      return startsWith(str, prefix) ? str : StrAppend.addToStart(str, prefix);
-    };
-
-    var ensureTrailing = function (str, prefix) {
-      return endsWith(str, prefix) ? str : StrAppend.addToEnd(str, prefix);
-    };
- 
-    var contains = function(str, substr) {
-      return str.indexOf(substr) !== -1;
-    };
-
-    var capitalize = function(str) {
-      return StringParts.head(str).bind(function (head) {
-        return StringParts.tail(str).map(function (tail) {
-          return head.toUpperCase() + tail;
-        });
-      }).getOr(str);
-    };
-
-    /** Does 'str' start with 'prefix'?
-     *  Note: all strings start with the empty string.
-     *        More formally, for all strings x, startsWith(x, "").
-     *        This is so that for all strings x and y, startsWith(y + x, y)
-     */
-    var startsWith = function(str, prefix) {
-      return checkRange(str, prefix, 0);
-    };
+        return r;
+      };
 
-    /** Does 'str' end with 'suffix'?
-     *  Note: all strings end with the empty string.
-     *        More formally, for all strings x, endsWith(x, "").
-     *        This is so that for all strings x and y, endsWith(x + y, y)
-     */
-    var endsWith = function(str, suffix) {
-      return checkRange(str, suffix, str.length - suffix.length);
-    };
+      return fastKeys === undefined ? slowKeys : fastKeys;
+    })();
 
-   
-    /** removes all leading and trailing spaces */
-    var trim = function(str) {
-      return str.replace(/^\s+|\s+$/g, '');
-    };
 
-    var lTrim = function(str) {
-      return str.replace(/^\s+/g, '');
+    var each = function (obj, f) {
+      var props = keys(obj);
+      for (var k = 0, len = props.length; k < len; k++) {
+        var i = props[k];
+        var x = obj[i];
+        f(x, i, obj);
+      }
     };
 
-    var rTrim = function(str) {
-      return str.replace(/\s+$/g, '');
+    /** objectMap :: (JsObj(k, v), (v, k, JsObj(k, v) -> x)) -> JsObj(k, x) */
+    var objectMap = function (obj, f) {
+      return tupleMap(obj, function (x, i, obj) {
+        return {
+          k: i,
+          v: f(x, i, obj)
+        };
+      });
     };
 
-    return {
-      supplant: supplant,
-      startsWith: startsWith,
-      removeLeading: removeLeading,
-      removeTrailing: removeTrailing,
-      ensureLeading: ensureLeading,
-      ensureTrailing: ensureTrailing,
-      endsWith: endsWith,
-      contains: contains,
-      trim: trim,
-      lTrim: lTrim,
-      rTrim: rTrim,
-      capitalize: capitalize
+    /** tupleMap :: (JsObj(k, v), (v, k, JsObj(k, v) -> { k: x, v: y })) -> JsObj(x, y) */
+    var tupleMap = function (obj, f) {
+      var r = {};
+      each(obj, function (x, i) {
+        var tuple = f(x, i, obj);
+        r[tuple.k] = tuple.v;
+      });
+      return r;
     };
-  }
-);
-
-define(
-  'ephox.sand.info.PlatformInfo',
-
-  [
-    'ephox.katamari.api.Fun',
-    'ephox.katamari.api.Strings'
-  ],
-
-  function (Fun, Strings) {
-    var normalVersionRegex = /.*?version\/\ ?([0-9]+)\.([0-9]+).*/;
 
-    var checkContains = function (target) {
-      return function (uastring) {
-        return Strings.contains(uastring, target);
+    /** bifilter :: (JsObj(k, v), (v, k -> Bool)) -> { t: JsObj(k, v), f: JsObj(k, v) } */
+    var bifilter = function (obj, pred) {
+      var t = {};
+      var f = {};
+      each(obj, function(x, i) {
+        var branch = pred(x, i) ? t : f;
+        branch[i] = x;
+      });
+      return {
+        t: t,
+        f: f
       };
     };
 
-    var browsers = [
-      {
-        name : 'Edge',
-        versionRegexes: [/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],
-        search: function (uastring) {
-          var monstrosity = Strings.contains(uastring, 'edge/') && Strings.contains(uastring, 'chrome') && Strings.contains(uastring, 'safari') && Strings.contains(uastring, 'applewebkit');
-          return monstrosity;
-        }
-      },
-      {
-        name : 'Chrome',
-        versionRegexes: [/.*?chrome\/([0-9]+)\.([0-9]+).*/, normalVersionRegex],
-        search : function (uastring) {
-          return Strings.contains(uastring, 'chrome') && !Strings.contains(uastring, 'chromeframe');
-        }
-      },
-      {
-        name : 'IE',
-        versionRegexes: [/.*?msie\ ?([0-9]+)\.([0-9]+).*/, /.*?rv:([0-9]+)\.([0-9]+).*/],
-        search: function (uastring) {
-          return Strings.contains(uastring, 'msie') || Strings.contains(uastring, 'trident');
-        }
-      },
-      // INVESTIGATE: Is this still the Opera user agent?
-      {
-        name : 'Opera',
-        versionRegexes: [normalVersionRegex, /.*?opera\/([0-9]+)\.([0-9]+).*/],
-        search : checkContains('opera')
-      },
-      {
-        name : 'Firefox',
-        versionRegexes: [/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],
-        search : checkContains('firefox')
-      },
-      {
-        name : 'Safari',
-        versionRegexes: [normalVersionRegex, /.*?cpu os ([0-9]+)_([0-9]+).*/],
-        search : function (uastring) {
-          return (Strings.contains(uastring, 'safari') || Strings.contains(uastring, 'mobile/')) && Strings.contains(uastring, 'applewebkit');
-        }
-      }
-    ];
-
-    var oses = [
-      {
-        name : 'Windows',
-        search : checkContains('win'),
-        versionRegexes: [/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]
-      },
-      {
-        name : 'iOS',
-        search : function (uastring) {
-          return Strings.contains(uastring, 'iphone') || Strings.contains(uastring, 'ipad');
-        },
-        versionRegexes: [/.*?version\/\ ?([0-9]+)\.([0-9]+).*/, /.*cpu os ([0-9]+)_([0-9]+).*/, /.*cpu iphone os ([0-9]+)_([0-9]+).*/]
-      },
-      {
-        name : 'Android',
-        search : checkContains('android'),
-        versionRegexes: [/.*?android\ ?([0-9]+)\.([0-9]+).*/]
-      },
-      {
-        name : 'OSX',
-        search : checkContains('os x'),
-        versionRegexes: [/.*?os\ x\ ?([0-9]+)_([0-9]+).*/]
-      },
-      {
-        name : 'Linux',
-        search : checkContains('linux'),
-        versionRegexes: [ ]
-      },
-      { name : 'Solaris',
-        search : checkContains('sunos'),
-        versionRegexes: [ ]
-      },
-      {
-       name : 'FreeBSD',
-       search : checkContains('freebsd'),
-       versionRegexes: [ ]
-      }
-    ];
-
-    return {
-      browsers: Fun.constant(browsers),
-      oses: Fun.constant(oses)
+    /** mapToArray :: (JsObj(k, v), (v, k -> a)) -> [a] */
+    var mapToArray = function (obj, f) {
+      var r = [];
+      each(obj, function(value, name) {
+        r.push(f(value, name));
+      });
+      return r;
     };
-  }
-);
-define(
-  'ephox.sand.core.PlatformDetection',
-
-  [
-    'ephox.sand.core.Browser',
-    'ephox.sand.core.OperatingSystem',
-    'ephox.sand.detect.DeviceType',
-    'ephox.sand.detect.UaString',
-    'ephox.sand.info.PlatformInfo'
-  ],
-
-  function (Browser, OperatingSystem, DeviceType, UaString, PlatformInfo) {
-    var detect = function (userAgent) {
-      var browsers = PlatformInfo.browsers();
-      var oses = PlatformInfo.oses();
-
-      var browser = UaString.detectBrowser(browsers, userAgent).fold(
-        Browser.unknown,
-        Browser.nu
-      );
-      var os = UaString.detectOs(oses, userAgent).fold(
-        OperatingSystem.unknown,
-        OperatingSystem.nu
-      );
-      var deviceType = DeviceType(os, browser, userAgent);
 
-      return {
-        browser: browser,
-        os: os,
-        deviceType: deviceType
-      };
+    /** find :: (JsObj(k, v), (v, k, JsObj(k, v) -> Bool)) -> Option v */
+    var find = function (obj, pred) {
+      var props = keys(obj);
+      for (var k = 0, len = props.length; k < len; k++) {
+        var i = props[k];
+        var x = obj[i];
+        if (pred(x, i, obj)) {
+          return Option.some(x);
+        }
+      }
+      return Option.none();
     };
 
-    return {
-      detect: detect
+    /** values :: JsObj(k, v) -> [v] */
+    var values = function (obj) {
+      return mapToArray(obj, function (v) {
+        return v;
+      });
     };
-  }
-);
-defineGlobal("global!navigator", navigator);
-define(
-  'ephox.sand.api.PlatformDetection',
-
-  [
-    'ephox.katamari.api.Thunk',
-    'ephox.sand.core.PlatformDetection',
-    'global!navigator'
-  ],
 
-  function (Thunk, PlatformDetection, navigator) {
-    var detect = Thunk.cached(function () {
-      var userAgent = navigator.userAgent;
-      return PlatformDetection.detect(userAgent);
-    });
+    var size = function (obj) {
+      return values(obj).length;
+    };
 
     return {
-      detect: detect
+      bifilter: bifilter,
+      each: each,
+      map: objectMap,
+      mapToArray: mapToArray,
+      tupleMap: tupleMap,
+      find: find,
+      keys: keys,
+      values: values,
+      size: size
     };
   }
 );
-define("global!console", [], function () { if (typeof console === "undefined") console = { log: function () {} }; return console; });
-defineGlobal("global!document", document);
 define(
-  'ephox.sugar.api.node.Element',
+  'ephox.katamari.util.BagUtils',
 
   [
-    'ephox.katamari.api.Fun',
-    'global!Error',
-    'global!console',
-    'global!document'
+    'ephox.katamari.api.Arr',
+    'ephox.katamari.api.Type',
+    'global!Error'
   ],
 
-  function (Fun, Error, console, document) {
-    var fromHtml = function (html, scope) {
-      var doc = scope || document;
-      var div = doc.createElement('div');
-      div.innerHTML = html;
-      if (!div.hasChildNodes() || div.childNodes.length > 1) {
-        console.error('HTML does not have a single root node', html);
-        throw 'HTML must have a single root node';
-      }
-      return fromDom(div.childNodes[0]);
+  function (Arr, Type, Error) {
+    var sort = function (arr) {
+      return arr.slice(0).sort();
     };
 
-    var fromTag = function (tag, scope) {
-      var doc = scope || document;
-      var node = doc.createElement(tag);
-      return fromDom(node);
+    var reqMessage = function (required, keys) {
+      throw new Error('All required keys (' + sort(required).join(', ') + ') were not specified. Specified keys were: ' + sort(keys).join(', ') + '.');
     };
 
-    var fromText = function (text, scope) {
-      var doc = scope || document;
-      var node = doc.createTextNode(text);
-      return fromDom(node);
+    var unsuppMessage = function (unsupported) {
+      throw new Error('Unsupported keys for object: ' + sort(unsupported).join(', '));
     };
 
-    var fromDom = function (node) {
-      if (node === null || node === undefined) throw new Error('Node cannot be null or undefined');
-      return {
-        dom: Fun.constant(node)
-      };
+    var validateStrArr = function (label, array) {
+      if (!Type.isArray(array)) throw new Error('The ' + label + ' fields must be an array. Was: ' + array + '.');
+      Arr.each(array, function (a) {
+        if (!Type.isString(a)) throw new Error('The value ' + a + ' in the ' + label + ' fields was not a string.');
+      });
     };
 
-    return {
-      fromHtml: fromHtml,
-      fromTag: fromTag,
-      fromText: fromText,
-      fromDom: fromDom
+    var invalidTypeMessage = function (incorrect, type) {
+      throw new Error('All values need to be of type: ' + type + '. Keys (' + sort(incorrect).join(', ') + ') were not.');
     };
-  }
-);
-
-define(
-  'ephox.sugar.api.node.NodeTypes',
 
-  [
+    var checkDupes = function (everything) {
+      var sorted = sort(everything);
+      var dupe = Arr.find(sorted, function (s, i) {
+        return i < sorted.length -1 && s === sorted[i + 1];
+      });
 
-  ],
+      dupe.each(function (d) {
+        throw new Error('The field: ' + d + ' occurs more than once in the combined fields: [' + sorted.join(', ') + '].');
+      });
+    };
 
-  function () {
     return {
-      ATTRIBUTE:              2,
-      CDATA_SECTION:          4,
-      COMMENT:                8,
-      DOCUMENT:               9,
-      DOCUMENT_TYPE:          10,
-      DOCUMENT_FRAGMENT:      11,
-      ELEMENT:                1,
-      TEXT:                   3,
-      PROCESSING_INSTRUCTION: 7,
-      ENTITY_REFERENCE:       5,
-      ENTITY:                 6,
-      NOTATION:               12
+      sort: sort,
+      reqMessage: reqMessage,
+      unsuppMessage: unsuppMessage,
+      validateStrArr: validateStrArr,
+      invalidTypeMessage: invalidTypeMessage,
+      checkDupes: checkDupes
     };
   }
 );
 define(
-  'ephox.sugar.api.search.Selectors',
+  'ephox.katamari.data.MixedBag',
 
   [
     'ephox.katamari.api.Arr',
+    'ephox.katamari.api.Fun',
+    'ephox.katamari.api.Obj',
     'ephox.katamari.api.Option',
-    'ephox.sugar.api.node.Element',
-    'ephox.sugar.api.node.NodeTypes',
+    'ephox.katamari.util.BagUtils',
     'global!Error',
-    'global!document'
+    'global!Object'
   ],
 
-  function (Arr, Option, Element, NodeTypes, Error, document) {
-    /*
-     * There's a lot of code here; the aim is to allow the browser to optimise constant comparisons,
-     * instead of doing object lookup feature detection on every call
-     */
-    var STANDARD = 0;
-    var MSSTANDARD = 1;
-    var WEBKITSTANDARD = 2;
-    var FIREFOXSTANDARD = 3;
+  function (Arr, Fun, Obj, Option, BagUtils, Error, Object) {
+    
+    return function (required, optional) {
+      var everything = required.concat(optional);
+      if (everything.length === 0) throw new Error('You must specify at least one required or optional field.');
 
-    var selectorType = (function () {
-      var test = document.createElement('span');
-      // As of Chrome 34 / Safari 7.1 / FireFox 34, everyone except IE has the unprefixed function.
-      // Still check for the others, but do it last.
-      return test.matches !== undefined ? STANDARD :
-             test.msMatchesSelector !== undefined ? MSSTANDARD :
-             test.webkitMatchesSelector !== undefined ? WEBKITSTANDARD :
-             test.mozMatchesSelector !== undefined ? FIREFOXSTANDARD :
-             -1;
-    })();
+      BagUtils.validateStrArr('required', required);
+      BagUtils.validateStrArr('optional', optional);
 
+      BagUtils.checkDupes(everything);
 
-    var ELEMENT = NodeTypes.ELEMENT;
-    var DOCUMENT = NodeTypes.DOCUMENT;
+      return function (obj) {
+        var keys = Obj.keys(obj);
 
-    var is = function (element, selector) {
-      var elem = element.dom();
-      if (elem.nodeType !== ELEMENT) return false; // documents have querySelector but not matches
+        // Ensure all required keys are present.
+        var allReqd = Arr.forall(required, function (req) {
+          return Arr.contains(keys, req);
+        });
 
-      // As of Chrome 34 / Safari 7.1 / FireFox 34, everyone except IE has the unprefixed function.
-      // Still check for the others, but do it last.
-      else if (selectorType === STANDARD) return elem.matches(selector);
-      else if (selectorType === MSSTANDARD) return elem.msMatchesSelector(selector);
-      else if (selectorType === WEBKITSTANDARD) return elem.webkitMatchesSelector(selector);
-      else if (selectorType === FIREFOXSTANDARD) return elem.mozMatchesSelector(selector);
-      else throw new Error('Browser lacks native selectors'); // unfortunately we can't throw this on startup :(
-    };
+        if (! allReqd) BagUtils.reqMessage(required, keys);
 
-    var bypassSelector = function (dom) {
-      // Only elements and documents support querySelector
-      return dom.nodeType !== ELEMENT && dom.nodeType !== DOCUMENT ||
-              // IE fix for complex queries on empty nodes: http://jsfiddle.net/spyder/fv9ptr5L/
-              dom.childElementCount === 0;
-    };
+        var unsupported = Arr.filter(keys, function (key) {
+          return !Arr.contains(everything, key);
+        });
 
-    var all = function (selector, scope) {
-      var base = scope === undefined ? document : scope.dom();
-      return bypassSelector(base) ? [] : Arr.map(base.querySelectorAll(selector), Element.fromDom);
-    };
+        if (unsupported.length > 0) BagUtils.unsuppMessage(unsupported);
 
-    var one = function (selector, scope) {
-      var base = scope === undefined ? document : scope.dom();
-      return bypassSelector(base) ? Option.none() : Option.from(base.querySelector(selector)).map(Element.fromDom);
-    };
+        var r = {};
+        Arr.each(required, function (req) {
+          r[req] = Fun.constant(obj[req]);
+        });
 
-    return {
-      all: all,
-      is: is,
-      one: one
+        Arr.each(optional, function (opt) {
+          r[opt] = Fun.constant(Object.prototype.hasOwnProperty.call(obj, opt) ? Option.some(obj[opt]): Option.none());
+        });
+
+        return r;
+      };
     };
   }
 );
-
 define(
-  'ephox.sugar.api.dom.Compare',
+  'ephox.katamari.api.Struct',
 
   [
-    'ephox.katamari.api.Arr',
-    'ephox.katamari.api.Fun',
-    'ephox.sand.api.Node',
-    'ephox.sand.api.PlatformDetection',
-    'ephox.sugar.api.search.Selectors'
+    'ephox.katamari.data.Immutable',
+    'ephox.katamari.data.MixedBag'
   ],
 
-  function (Arr, Fun, Node, PlatformDetection, Selectors) {
-
-    var eq = function (e1, e2) {
-      return e1.dom() === e2.dom();
+  function (Immutable, MixedBag) {
+    return {
+      immutable: Immutable,
+      immutableBag: MixedBag
     };
+  }
+);
 
-    var isEqualNode = function (e1, e2) {
-      return e1.dom().isEqualNode(e2.dom());
-    };
+define(
+  'ephox.sugar.alien.Recurse',
 
-    var member = function (element, elements) {
-      return Arr.exists(elements, Fun.curry(eq, element));
-    };
+  [
 
-    // DOM contains() method returns true if e1===e2, we define our contains() to return false (a node does not contain itself).
-    var regularContains = function (e1, e2) {
-      var d1 = e1.dom(), d2 = e2.dom();
-      return d1 === d2 ? false : d1.contains(d2);
-    };
+  ],
 
-    var ieContains = function (e1, e2) {
-      // IE only implements the contains() method for Element nodes.
-      // It fails for Text nodes, so implement it using compareDocumentPosition()
-      // https://connect.microsoft.com/IE/feedback/details/780874/node-contains-is-incorrect
-      // Note that compareDocumentPosition returns CONTAINED_BY if 'e2 *is_contained_by* e1':
-      // Also, compareDocumentPosition defines a node containing itself as false.
-      return Node.documentPositionContainedBy(e1.dom(), e2.dom());
-    };
+  function () {
+    /**
+     * Applies f repeatedly until it completes (by returning Option.none()).
+     *
+     * Normally would just use recursion, but JavaScript lacks tail call optimisation.
+     *
+     * This is what recursion looks like when manually unravelled :)
+     */
+    var toArray = function (target, f) {
+      var r = [];
 
-    var browser = PlatformDetection.detect().browser;
+      var recurse = function (e) {
+        r.push(e);
+        return f(e);
+      };
 
-    // Returns: true if node e1 contains e2, otherwise false.
-    // (returns false if e1===e2: A node does not contain itself).
-    var contains = browser.isIE() ? ieContains : regularContains;
+      var cur = f(target);
+      do {
+        cur = cur.bind(recurse);
+      } while (cur.isSome());
 
-    return {
-      eq: eq,
-      isEqualNode: isEqualNode,
-      member: member,
-      contains: contains,
+      return r;
+    };
 
-      // Only used by DomUniverse. Remove (or should Selectors.is move here?)
-      is: Selectors.is
+    return {
+      toArray: toArray
     };
   }
 );
-
 define(
   'ephox.sugar.api.search.Traverse',
 
@@ -20891,6 +20955,8 @@ define(
 define(
   'tinymce.core.dom.Selection',
   [
+    'ephox.sugar.api.dom.Compare',
+    'ephox.sugar.api.node.Element',
     'tinymce.core.caret.CaretPosition',
     'tinymce.core.dom.BookmarkManager',
     'tinymce.core.dom.ControlSelection',
@@ -20904,18 +20970,24 @@ define(
     'tinymce.core.text.Zwsp',
     'tinymce.core.util.Tools'
   ],
-  function (CaretPosition, BookmarkManager, ControlSelection, NodeType, RangeUtils, ScrollIntoView, TreeWalker, TridentSelection, Env, FragmentReader, Zwsp, Tools) {
+  function (
+    Compare, Element, CaretPosition, BookmarkManager, ControlSelection, NodeType, RangeUtils, ScrollIntoView, TreeWalker, TridentSelection, Env, FragmentReader,
+    Zwsp, Tools
+  ) {
     var each = Tools.each, trim = Tools.trim;
     var isIE = Env.ie;
 
+    var isAttachedToDom = function (node) {
+      return !!(node && node.ownerDocument) && Compare.contains(Element.fromDom(node.ownerDocument), Element.fromDom(node));
+    };
+
     var isValidRange = function (rng) {
       if (!rng) {
         return false;
       } else if (rng.select) { // Native IE range still produced by placeCaretAt
         return true;
       } else {
-        var sc = rng.startContainer, ec = rng.endContainer;
-        return !!(sc && sc.parentNode && ec && ec.parentNode);
+        return isAttachedToDom(rng.startContainer) && isAttachedToDom(rng.endContainer);
       }
     };
 
@@ -37950,20 +38022,20 @@ define(
  */
 
 /**
- * Contains all logic for handling of keyboard shortcuts.
+ * Contains logic for handling keyboard shortcuts.
  *
  * @class tinymce.Shortcuts
  * @example
- * editor.shortcuts.add('ctrl+a', function() {});
- * editor.shortcuts.add('meta+a', function() {}); // "meta" maps to Command on Mac and Ctrl on PC
- * editor.shortcuts.add('ctrl+alt+a', function() {});
- * editor.shortcuts.add('access+a', function() {}); // "access" maps to ctrl+alt on Mac and shift+alt on PC
+ * editor.shortcuts.add('ctrl+a', "description of the shortcut", function() {});
+ * editor.shortcuts.add('meta+a', "description of the shortcut", function() {}); // "meta" maps to Command on Mac and Ctrl on PC
+ * editor.shortcuts.add('ctrl+alt+a', "description of the shortcut", function() {});
+ * editor.shortcuts.add('access+a', "description of the shortcut", function() {}); // "access" maps to ctrl+alt on Mac and shift+alt on PC
  */
 define(
   'tinymce.core.Shortcuts',
   [
-    "tinymce.core.util.Tools",
-    "tinymce.core.Env"
+    'tinymce.core.util.Tools',
+    'tinymce.core.Env'
   ],
   function (Tools, Env) {
     var each = Tools.each, explode = Tools.explode;
@@ -38160,6 +38232,91 @@ define(
   }
 );
 
+/**
+ * DefaultSettings.js
+ *
+ * Released under LGPL License.
+ * Copyright (c) 1999-2017 Ephox Corp. All rights reserved
+ *
+ * License: http://www.tinymce.com/license
+ * Contributing: http://www.tinymce.com/contributing
+ */
+
+define(
+  'tinymce.core.EditorSettings',
+  [
+    'tinymce.core.util.Tools'
+  ],
+  function (Tools) {
+    var getEditorSettings = function (editor, id, documentBaseUrl, defaultOverrideSettings, settings) {
+      settings = Tools.extend(
+        // Default settings
+        {
+          id: id,
+          theme: 'modern',
+          delta_width: 0,
+          delta_height: 0,
+          popup_css: '',
+          plugins: '',
+          document_base_url: documentBaseUrl,
+          add_form_submit_trigger: true,
+          submit_patch: true,
+          add_unload_trigger: true,
+          convert_urls: true,
+          relative_urls: true,
+          remove_script_host: true,
+          object_resizing: true,
+          doctype: '<!DOCTYPE html>',
+          visual: true,
+          font_size_style_values: 'xx-small,x-small,small,medium,large,x-large,xx-large',
+
+          // See: http://www.w3.org/TR/CSS2/fonts.html#propdef-font-size
+          font_size_legacy_values: 'xx-small,small,medium,large,x-large,xx-large,300%',
+          forced_root_block: 'p',
+          hidden_input: true,
+          padd_empty_editor: true,
+          render_ui: true,
+          indentation: '30px',
+          inline_styles: true,
+          convert_fonts_to_spans: true,
+          indent: 'simple',
+          indent_before: 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,' +
+          'tfoot,tbody,tr,section,article,hgroup,aside,figure,figcaption,option,optgroup,datalist',
+          indent_after: 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,' +
+          'tfoot,tbody,tr,section,article,hgroup,aside,figure,figcaption,option,optgroup,datalist',
+          entity_encoding: 'named',
+          url_converter: editor.convertURL,
+          url_converter_scope: editor,
+          ie7_compat: true
+        },
+
+        // tinymce.overrideDefaults settings
+        defaultOverrideSettings,
+
+        // User settings
+        settings,
+
+        // Forced settings
+        {
+          validate: true,
+          content_editable: settings.inline
+        }
+      );
+
+      // Merge external_plugins
+      if (defaultOverrideSettings && defaultOverrideSettings.external_plugins && settings.external_plugins) {
+        settings.external_plugins = Tools.extend({}, defaultOverrideSettings.external_plugins, settings.external_plugins);
+      }
+
+      return settings;
+    };
+
+    return {
+      getEditorSettings: getEditorSettings
+    };
+  }
+);
+
 defineGlobal("global!window", window);
 /**
  * ErrorReporter.js
@@ -42053,6 +42210,280 @@ define(
   }
 );
 
+define(
+  'ephox.sugar.impl.Style',
+
+  [
+
+  ],
+
+  function () {
+    // some elements, such as mathml, don't have style attributes
+    var isSupported = function (dom) {
+      return dom.style !== undefined;
+    };
+
+    return {
+      isSupported: isSupported
+    };
+  }
+);
+define(
+  'ephox.sugar.api.properties.Css',
+
+  [
+    'ephox.katamari.api.Type',
+    'ephox.katamari.api.Arr',
+    'ephox.katamari.api.Obj',
+    'ephox.katamari.api.Option',
+    'ephox.sugar.api.properties.Attr',
+    'ephox.sugar.api.node.Body',
+    'ephox.sugar.api.node.Element',
+    'ephox.sugar.api.node.Node',
+    'ephox.sugar.impl.Style',
+    'ephox.katamari.api.Strings',
+    'global!Error',
+    'global!console',
+    'global!window'
+  ],
+
+  function (Type, Arr, Obj, Option, Attr, Body, Element, Node, Style, Strings, Error, console, window) {
+    var internalSet = function (dom, property, value) {
+      // This is going to hurt. Apologies.
+      // JQuery coerces numbers to pixels for certain property names, and other times lets numbers through.
+      // we're going to be explicit; strings only.
+      if (!Type.isString(value)) {
+        console.error('Invalid call to CSS.set. Property ', property, ':: Value ', value, ':: Element ', dom);
+        throw new Error('CSS value must be a string: ' + value);
+      }
+
+      // removed: support for dom().style[property] where prop is camel case instead of normal property name
+      if (Style.isSupported(dom)) dom.style.setProperty(property, value);
+    };
+
+    var internalRemove = function (dom, property) {
+      /*
+       * IE9 and above - MDN doesn't have details, but here's a couple of random internet claims
+       *
+       * http://help.dottoro.com/ljopsjck.php
+       * http://stackoverflow.com/a/7901886/7546
+       */
+      if (Style.isSupported(dom)) dom.style.removeProperty(property);
+    };
+
+    var set = function (element, property, value) {
+      var dom = element.dom();
+      internalSet(dom, property, value);
+    };
+
+    var setAll = function (element, css) {
+      var dom = element.dom();
+
+      Obj.each(css, function (v, k) {
+        internalSet(dom, k, v);
+      });
+    };
+
+    var setOptions = function(element, css) {
+      var dom = element.dom();
+
+      Obj.each(css, function (v, k) {
+        v.fold(function () {
+          internalRemove(dom, k);
+        }, function (value) {
+          internalSet(dom, k, value);
+        });
+      });
+    };
+
+    /*
+     * NOTE: For certain properties, this returns the "used value" which is subtly different to the "computed value" (despite calling getComputedStyle).
+     * Blame CSS 2.0.
+     *
+     * https://developer.mozilla.org/en-US/docs/Web/CSS/used_value
+     */
+    var get = function (element, property) {
+      var dom = element.dom();
+      /*
+       * IE9 and above per
+       * https://developer.mozilla.org/en/docs/Web/API/window.getComputedStyle
+       *
+       * Not in numerosity, because it doesn't memoize and looking this up dynamically in performance critical code would be horrendous.
+       *
+       * JQuery has some magic here for IE popups, but we don't really need that.
+       * It also uses element.ownerDocument.defaultView to handle iframes but that hasn't been required since FF 3.6.
+       */
+      var styles = window.getComputedStyle(dom);
+      var r = styles.getPropertyValue(property);
+
+      // jquery-ism: If r is an empty string, check that the element is not in a document. If it isn't, return the raw value.
+      // Turns out we do this a lot.
+      var v = (r === '' && !Body.inBody(element)) ? getUnsafeProperty(dom, property) : r;
+
+      // undefined is the more appropriate value for JS. JQuery coerces to an empty string, but screw that!
+      return v === null ? undefined : v;
+    };
+
+    var getUnsafeProperty = function (dom, property) {
+      // removed: support for dom().style[property] where prop is camel case instead of normal property name
+      // empty string is what the browsers (IE11 and Chrome) return when the propertyValue doesn't exists.
+      return Style.isSupported(dom) ? dom.style.getPropertyValue(property) : '';
+    };
+
+    /*
+     * Gets the raw value from the style attribute. Useful for retrieving "used values" from the DOM:
+     * https://developer.mozilla.org/en-US/docs/Web/CSS/used_value
+     *
+     * Returns NONE if the property isn't set, or the value is an empty string.
+     */
+    var getRaw = function (element, property) {
+      var dom = element.dom();
+      var raw = getUnsafeProperty(dom, property);
+
+      return Option.from(raw).filter(function (r) { return r.length > 0; });
+    };
+
+    var isValidValue = function (tag, property, value) {
+      var element = Element.fromTag(tag);
+      set(element, property, value);
+      var style = getRaw(element, property);
+      return style.isSome();
+    };
+
+    var remove = function (element, property) {
+      var dom = element.dom();
+
+      internalRemove(dom, property);
+
+      if (Attr.has(element, 'style') && Strings.trim(Attr.get(element, 'style')) === '') {
+        // No more styles left, remove the style attribute as well
+        Attr.remove(element, 'style');
+      }
+    };
+
+    var preserve = function (element, f) {
+      var oldStyles = Attr.get(element, 'style');
+      var result = f(element);
+      var restore = oldStyles === undefined ? Attr.remove : Attr.set;
+      restore(element, 'style', oldStyles);
+      return result;
+    };
+
+    var copy = function (source, target) {
+      var sourceDom = source.dom();
+      var targetDom = target.dom();
+      if (Style.isSupported(sourceDom) && Style.isSupported(targetDom)) {
+        targetDom.style.cssText = sourceDom.style.cssText;
+      }
+    };
+
+    var reflow = function (e) {
+      /* NOTE:
+       * do not rely on this return value.
+       * It's here so the closure compiler doesn't optimise the property access away.
+       */
+      return e.dom().offsetWidth;
+    };
+
+    var transferOne = function (source, destination, style) {
+      getRaw(source, style).each(function (value) {
+        // NOTE: We don't want to clobber any existing inline styles.
+        if (getRaw(destination, style).isNone()) set(destination, style, value);
+      });
+    };
+
+    var transfer = function (source, destination, styles) {
+      if (!Node.isElement(source) || !Node.isElement(destination)) return;
+      Arr.each(styles, function (style) {
+        transferOne(source, destination, style);
+      });
+    };
+
+    return {
+      copy: copy,
+      set: set,
+      preserve: preserve,
+      setAll: setAll,
+      setOptions: setOptions,
+      remove: remove,
+      get: get,
+      getRaw: getRaw,
+      isValidValue: isValidValue,
+      reflow: reflow,
+      transfer: transfer
+    };
+  }
+);
+
+/**
+ * EditorView.js
+ *
+ * Released under LGPL License.
+ * Copyright (c) 1999-2016 Ephox Corp. All rights reserved
+ *
+ * License: http://www.tinymce.com/license
+ * Contributing: http://www.tinymce.com/contributing
+ */
+
+define(
+  'tinymce.core.EditorView',
+  [
+    'ephox.katamari.api.Fun',
+    'ephox.sugar.api.node.Element',
+    'ephox.sugar.api.properties.Css',
+    'ephox.sugar.api.search.Traverse'
+  ],
+  function (Fun, Element, Css, Traverse) {
+    var getProp = function (propName, elm) {
+      var rawElm = elm.dom();
+      return rawElm[propName];
+    };
+
+    var getComputedSizeProp = function (propName, elm) {
+      return parseInt(Css.get(elm, propName), 10);
+    };
+
+    var getClientWidth = Fun.curry(getProp, 'clientWidth');
+    var getClientHeight = Fun.curry(getProp, 'clientHeight');
+    var getMarginTop = Fun.curry(getComputedSizeProp, 'margin-top');
+    var getMarginLeft = Fun.curry(getComputedSizeProp, 'margin-left');
+
+    var getBoundingClientRect = function (elm) {
+      return elm.dom().getBoundingClientRect();
+    };
+
+    var isInsideElementContentArea = function (bodyElm, clientX, clientY) {
+      var clientWidth = getClientWidth(bodyElm);
+      var clientHeight = getClientHeight(bodyElm);
+
+      return clientX >= 0 && clientY >= 0 && clientX <= clientWidth && clientY <= clientHeight;
+    };
+
+    var transpose = function (inline, elm, clientX, clientY) {
+      var clientRect = getBoundingClientRect(elm);
+      var deltaX = inline ? clientRect.left + elm.dom().clientLeft + getMarginLeft(elm) : 0;
+      var deltaY = inline ? clientRect.top + elm.dom().clientTop + getMarginTop(elm) : 0;
+      var x = clientX - deltaX;
+      var y = clientY - deltaY;
+
+      return { x: x, y: y };
+    };
+
+    // Checks if the specified coordinate is within the visual content area excluding the scrollbars
+    var isXYInContentArea = function (editor, clientX, clientY) {
+      var bodyElm = Element.fromDom(editor.getBody());
+      var targetElm = editor.inline ? bodyElm : Traverse.documentElement(bodyElm);
+      var transposedPoint = transpose(editor.inline, targetElm, clientX, clientY);
+
+      return isInsideElementContentArea(targetElm, transposedPoint.x, transposedPoint.y);
+    };
+
+    return {
+      isXYInContentArea: isXYInContentArea
+    };
+  }
+);
+
 /**
  * SelectionOverrides.js
  *
@@ -42086,16 +42517,18 @@ define(
     'tinymce.core.caret.FakeCaret',
     'tinymce.core.caret.LineUtils',
     'tinymce.core.dom.NodeType',
+    'tinymce.core.dom.RangePoint',
     'tinymce.core.DragDropOverrides',
+    'tinymce.core.EditorView',
     'tinymce.core.Env',
-    'tinymce.core.geom.ClientRect',
     'tinymce.core.keyboard.CefUtils',
-    'tinymce.core.util.Arr',
     'tinymce.core.util.Delay',
-    'tinymce.core.util.Fun',
     'tinymce.core.util.VK'
   ],
-  function (CaretContainer, CaretPosition, CaretUtils, CaretWalker, FakeCaret, LineUtils, NodeType, DragDropOverrides, Env, ClientRect, CefUtils, Arr, Delay, Fun, VK) {
+  function (
+    CaretContainer, CaretPosition, CaretUtils, CaretWalker, FakeCaret, LineUtils, NodeType, RangePoint, DragDropOverrides, EditorView, Env, CefUtils, Delay,
+    VK
+  ) {
     var isContentEditableTrue = NodeType.isContentEditableTrue,
       isContentEditableFalse = NodeType.isContentEditableFalse,
       isAfterContentEditableFalse = CaretUtils.isAfterContentEditableFalse,
@@ -42186,22 +42619,12 @@ define(
           return null;
         }
 
-        function isXYWithinRange(clientX, clientY, range) {
-          if (range.collapsed) {
-            return false;
-          }
-
-          return Arr.reduce(range.getClientRects(), function (state, rect) {
-            return state || ClientRect.containsXY(rect, clientX, clientY);
-          }, false);
-        }
-
         // Some browsers (Chrome) lets you place the caret after a cE=false
         // Make sure we render the caret container in this case
-        editor.on('mouseup', function () {
+        editor.on('mouseup', function (e) {
           var range = getRange();
 
-          if (range.collapsed) {
+          if (range.collapsed && EditorView.isXYInContentArea(editor, e.clientX, e.clientY)) {
             setRange(CefUtils.renderCaretAtRange(editor, range));
           }
         });
@@ -42288,6 +42711,10 @@ define(
         editor.on('mousedown', function (e) {
           var contentEditableRoot;
 
+          if (EditorView.isXYInContentArea(editor, e.clientX, e.clientY) === false) {
+            return;
+          }
+
           contentEditableRoot = getContentEditableRoot(e.target);
           if (contentEditableRoot) {
             if (isContentEditableFalse(contentEditableRoot)) {
@@ -42297,7 +42724,7 @@ define(
               removeContentEditableSelection();
 
               // Check that we're not attempting a shift + click select within a contenteditable='true' element
-              if (!(isContentEditableTrue(contentEditableRoot) && e.shiftKey) && !isXYWithinRange(e.clientX, e.clientY, editor.selection.getRng())) {
+              if (!(isContentEditableTrue(contentEditableRoot) && e.shiftKey) && !RangePoint.isXYWithinRange(e.clientX, e.clientY, editor.selection.getRng())) {
                 editor.selection.placeCaretAt(e.clientX, e.clientY);
               }
             }
@@ -43935,6 +44362,10 @@ define(
       autoFocus(editor);
     };
 
+    var getStyleSheetLoader = function (editor) {
+      return editor.inline ? DOM.styleSheetLoader : editor.dom.styleSheetLoader;
+    };
+
     var initContentBody = function (editor, skipWrite) {
       var settings = editor.settings, targetElm = editor.getElement(), doc = editor.getDoc(), body, contentCssText;
 
@@ -44072,7 +44503,7 @@ define(
         editor.dom.addStyle(contentCssText);
       }
 
-      editor.dom.styleSheetLoader.loadAll(
+      getStyleSheetLoader(editor).loadAll(
         editor.contentCSS,
         function (_) {
           initEditor(editor);
@@ -44793,6 +45224,7 @@ define(
     'tinymce.core.dom.DOMUtils',
     'tinymce.core.EditorCommands',
     'tinymce.core.EditorObservable',
+    'tinymce.core.EditorSettings',
     'tinymce.core.Env',
     'tinymce.core.html.Serializer',
     'tinymce.core.init.Render',
@@ -44803,10 +45235,7 @@ define(
     'tinymce.core.util.URI',
     'tinymce.core.util.Uuid'
   ],
-  function (
-    AddOnManager, DomQuery, DOMUtils, EditorCommands, EditorObservable, Env, Serializer, Render, Mode,
-    Shortcuts, Sidebar, Tools, URI, Uuid
-  ) {
+  function (AddOnManager, DomQuery, DOMUtils, EditorCommands, EditorObservable, EditorSettings, Env, Serializer, Render, Mode, Shortcuts, Sidebar, Tools, URI, Uuid) {
     // Shorten these names
     var DOM = DOMUtils.DOM;
     var extend = Tools.extend, each = Tools.each;
@@ -44829,11 +45258,10 @@ define(
      * @param {tinymce.EditorManager} editorManager EditorManager instance.
      */
     function Editor(id, settings, editorManager) {
-      var self = this, documentBaseUrl, baseUri, defaultSettings;
+      var self = this, documentBaseUrl, baseUri;
 
       documentBaseUrl = self.documentBaseUrl = editorManager.documentBaseURL;
       baseUri = editorManager.baseURI;
-      defaultSettings = editorManager.defaultSettings;
 
       /**
        * Name/value collection with editor settings.
@@ -44844,52 +45272,9 @@ define(
        * // Get the value of the theme setting
        * tinymce.activeEditor.windowManager.alert("You are using the " + tinymce.activeEditor.settings.theme + " theme");
        */
-      settings = extend({
-        id: id,
-        theme: 'modern',
-        delta_width: 0,
-        delta_height: 0,
-        popup_css: '',
-        plugins: '',
-        document_base_url: documentBaseUrl,
-        add_form_submit_trigger: true,
-        submit_patch: true,
-        add_unload_trigger: true,
-        convert_urls: true,
-        relative_urls: true,
-        remove_script_host: true,
-        object_resizing: true,
-        doctype: '<!DOCTYPE html>',
-        visual: true,
-        font_size_style_values: 'xx-small,x-small,small,medium,large,x-large,xx-large',
-
-        // See: http://www.w3.org/TR/CSS2/fonts.html#propdef-font-size
-        font_size_legacy_values: 'xx-small,small,medium,large,x-large,xx-large,300%',
-        forced_root_block: 'p',
-        hidden_input: true,
-        padd_empty_editor: true,
-        render_ui: true,
-        indentation: '30px',
-        inline_styles: true,
-        convert_fonts_to_spans: true,
-        indent: 'simple',
-        indent_before: 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,' +
-        'tfoot,tbody,tr,section,article,hgroup,aside,figure,figcaption,option,optgroup,datalist',
-        indent_after: 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,' +
-        'tfoot,tbody,tr,section,article,hgroup,aside,figure,figcaption,option,optgroup,datalist',
-        validate: true,
-        entity_encoding: 'named',
-        url_converter: self.convertURL,
-        url_converter_scope: self,
-        ie7_compat: true
-      }, defaultSettings, settings);
-
-      // Merge external_plugins
-      if (defaultSettings && defaultSettings.external_plugins && settings.external_plugins) {
-        settings.external_plugins = extend({}, defaultSettings.external_plugins, settings.external_plugins);
-      }
-
+      settings = EditorSettings.getEditorSettings(self, id, documentBaseUrl, editorManager.defaultSettings, settings);
       self.settings = settings;
+
       AddOnManager.language = settings.language || 'en';
       AddOnManager.languageLoad = settings.language_load;
       AddOnManager.baseURL = editorManager.baseURL;
@@ -44900,7 +45285,7 @@ define(
        * @property id
        * @type String
        */
-      self.id = settings.id = id;
+      self.id = id;
 
       /**
        * State to force the editor to return false on a isDirty call.
@@ -44934,7 +45319,7 @@ define(
        * // Get absolute URL from the location of document_base_url
        * tinymce.activeEditor.documentBaseURI.toAbsolute('somefile.htm');
        */
-      self.documentBaseURI = new URI(settings.document_base_url || documentBaseUrl, {
+      self.documentBaseURI = new URI(settings.document_base_url, {
         base_uri: baseUri
       });
 
@@ -44975,7 +45360,6 @@ define(
       self.suffix = editorManager.suffix;
       self.editorManager = editorManager;
       self.inline = settings.inline;
-      self.settings.content_editable = self.inline;
 
       if (settings.cache_suffix) {
         Env.cacheSuffix = settings.cache_suffix.replace(/^[\?\&]+/, '');
@@ -45077,6 +45461,9 @@ define(
                 body.focus();
               }
             } else {
+              // Restore previous selection before focus to prevent Chrome from
+              // jumping to the top of the document in long inline editors
+              self.selection.setRng(self.lastRng);
               body.focus();
             }
 
@@ -45139,16 +45526,14 @@ define(
        * @return {String} Translated string.
        */
       translate: function (text) {
-        var lang = this.settings.language || 'en', i18n = this.editorManager.i18n;
+        if (text && Tools.is(text, 'string')) {
+          var lang = this.settings.language || 'en', i18n = this.editorManager.i18n;
 
-        if (!text) {
-          return '';
+          text = i18n.data[lang + '.' + text] || text.replace(/\{\#([^\}]+)\}/g, function (a, b) {
+            return i18n.data[lang + '.' + b] || '{#' + b + '}';
+          });
         }
 
-        text = i18n.data[lang + '.' + text] || text.replace(/\{\#([^\}]+)\}/g, function (a, b) {
-          return i18n.data[lang + '.' + b] || '{#' + b + '}';
-        });
-
         return this.editorManager.translate(text);
       },
 
@@ -46838,7 +47223,7 @@ define(
        * @property minorVersion
        * @type String
        */
-      minorVersion: '6.3',
+      minorVersion: '6.4',
 
       /**
        * Release date of TinyMCE build.
@@ -46846,7 +47231,7 @@ define(
        * @property releaseDate
        * @type String
        */
-      releaseDate: '2017-05-30',
+      releaseDate: '2017-06-13',
 
       /**
        * Collection of editor instances.
@@ -49652,7 +50037,12 @@ define(
           self.panel.show();
         }
 
-        self.panel.moveRel(self.getEl(), settings.popoverAlign || (self.isRtl() ? ['bc-tr', 'bc-tc'] : ['bc-tl', 'bc-tc']));
+        var rel = self.panel.testMoveRel(self.getEl(), settings.popoverAlign || (self.isRtl() ? ['bc-tc', 'bc-tl', 'bc-tr'] : ['bc-tc', 'bc-tr', 'bc-tl']));
+
+        self.panel.classes.toggle('start', rel === 'bc-tl');
+        self.panel.classes.toggle('end', rel === 'bc-tr');
+
+        self.panel.moveRel(self.getEl(), rel);
       },
 
       /**
@@ -51525,7 +51915,7 @@ define(
             return fontFamily ? fontFamily.split(',')[0] : '';
           };
 
-          editor.on('nodeChange', function (e) {
+          editor.on('init nodeChange', function (e) {
             var fontFamily, value = null;
 
             fontFamily = FontInfo.getFontFamily(editor.getBody(), e.element);
@@ -51555,7 +51945,7 @@ define(
         return function () {
           var self = this;
 
-          editor.on('nodeChange', function (e) {
+          editor.on('init nodeChange', function (e) {
             var px, pt, value = null;
 
             px = FontInfo.getFontSize(editor.getBody(), e.element);