Merge remote-tracking branch 'upstream/master' into iframe-compatibility

src/component/base/DraftEditor.react.js

@@ -333,8 +333,11 @@ class DraftEditor extends React.Component<DraftEditorProps, State> {
      * ie9-beta-minor-change-list.aspx
      */
     if (isIE) {
-      ReactDOM.findDOMNode(this.refs.editor)
-        .ownerDocument.execCommand('AutoUrlDetect', false, false);
+      ReactDOM.findDOMNode(this.refs.editor).ownerDocument.execCommand(
+        'AutoUrlDetect',
+        false,
+        false,
+      );
     }
   }
 
@@ -378,10 +381,7 @@ class DraftEditor extends React.Component<DraftEditorProps, State> {
     const scrollParent = Style.getScrollParent(editorNode);
     const {x, y} = scrollPosition || getScrollPosition(scrollParent);
 
-    invariant(
-      editorNode.nodeType === 1,
-      'editorNode is not an Element',
-    );
+    invariant(editorNode.nodeType === 1, 'editorNode is not an Element');
     editorNode.focus();
 
     // Restore scroll position
@@ -405,10 +405,7 @@ class DraftEditor extends React.Component<DraftEditorProps, State> {
 
   _blur(): void {
     const editorNode = ReactDOM.findDOMNode(this.editor);
-    invariant(
-      editorNode.nodeType === 1,
-      'editorNode is not an Element',
-    );
+    invariant(editorNode.nodeType === 1, 'editorNode is not an Element');
     editorNode.blur();
   }
 

src/model/encoding/convertFromHTMLToContentBlocks.js

@@ -217,10 +217,11 @@ function processInlineTag(
     currentStyle = currentStyle.add(styleToCheck).toOrderedSet();
   } else if (node.nodeType === 1) {
     const htmlElement: HTMLElement = (node: any);
-    currentStyle = currentStyle.withMutations(style => {
-      const fontWeight = htmlElement.style.fontWeight;
-      const fontStyle = htmlElement.style.fontStyle;
-      const textDecoration = htmlElement.style.textDecoration;
+    currentStyle = currentStyle
+      .withMutations(style => {
+        const fontWeight = htmlElement.style.fontWeight;
+        const fontStyle = htmlElement.style.fontStyle;
+        const textDecoration = htmlElement.style.textDecoration;
 
         if (boldValues.indexOf(fontWeight) >= 0) {
           style.add('BOLD');
@@ -295,10 +296,7 @@ function containsSemanticBlockMarkup(
 }
 
 function hasValidLinkText(link: Node): boolean {
-  invariant(
-    link.nodeName === 'A',
-    'Link must be an HTMLAnchorElement.',
-  );
+  invariant(link.nodeName === 'A', 'Link must be an HTMLAnchorElement.');
 
   const element: HTMLAnchorElement = (link: any);
   return (
@@ -374,7 +372,7 @@ function genFragment(
     ) {
       const entityConfig = {};
 
-      imgAttr.forEach((attr) => {
+      imgAttr.forEach(attr => {
         const imageAttribute = image.getAttribute(attr);
         if (imageAttribute) {
           entityConfig[attr] = imageAttribute;
@@ -388,11 +386,7 @@ function genFragment(
       node.textContent = '\ud83d\udcf7';
 
       // TODO: update this when we remove DraftEntity entirely
-      inEntity = DraftEntity.__create(
-        'IMAGE',
-        'MUTABLE',
-        entityConfig || {},
-      );
+      inEntity = DraftEntity.__create('IMAGE', 'MUTABLE', entityConfig || {});
     }
   }
 
@@ -441,13 +435,10 @@ function genFragment(
     entityId = null;
     if (nodeName === 'a') {
       const anchor: HTMLAnchorElement = (child: any);
-      if (
-        anchor.href &&
-        hasValidLinkText(anchor)
-      ) {
+      if (anchor.href && hasValidLinkText(anchor)) {
         const entityConfig = {};
 
-        anchorAttr.forEach((attr) => {
+        anchorAttr.forEach(attr => {
           const anchorAttribute = anchor.getAttribute(attr);
           if (anchorAttribute) {
             entityConfig[attr] = anchorAttribute;
@@ -456,11 +447,7 @@ function genFragment(
 
         entityConfig.url = new URI(anchor.href).toString();
         // TODO: update this when we remove DraftEntity completely
-        entityId = DraftEntity.__create(
-          'LINK',
-          'MUTABLE',
-          entityConfig || {},
-        );
+        entityId = DraftEntity.__create('LINK', 'MUTABLE', entityConfig || {});
       }
     }