Adding .eslintignore again

slidewiki · Sep 28, 2016 · b089dd8 · b089dd8
1 parent 47bb986
commit b089dd8
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 35 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+custom_modules/*
diff --git a/bower.json b/bower.json
@@ -11,6 +11,7 @@
     "jquery": "^3.0.0",
     "es6-shim": "^0.35.1",
     "es5-shim": "^4.5.9",
-    "json3": "^3.3.2"
+    "json3": "^3.3.2",
+    "headjs": "^1.0.3"
   }
 }
diff --git a/components/Deck/ContentPanel/SlideModes/SlideEditPanel/SlideContentEditor.js b/components/Deck/ContentPanel/SlideModes/SlideEditPanel/SlideContentEditor.js
@@ -286,42 +286,31 @@ class SlideContentEditor extends React.Component {
                     */
 
         return (
-<<<<<<< HEAD
-                <ResizeAware ref='container' id='container' style={{position: 'relative'}}>
-                    <button tabIndex="0" ref="submitbutton" className="ui button blue" onClick={this.handleSaveButton.bind(this)} onChange={this.handleSaveButton.bind(this)}>
-                     <i className="save icon"></i>
-                     Save
-                    </button>
-                    <div class="ui" style={compStyle}>
-                        <div className="reveal">
-                            <div className="slides">
-                                    <div style={contentStyle} contentEditable='true' name='inlineContent' ref='inlineContent' id='inlineContent' dangerouslySetInnerHTML={{__html:this.props.content}}></div>
-                            </div>
-                        </div>
-=======
+
             <ResizeAware ref='container' id='container' style={{position: 'relative'}}>
-            <button tabIndex="0" ref="submitbutton" className="ui button blue" onClick={this.handleSaveButton.bind(this)} onChange={this.handleSaveButton.bind(this)}>
-             <i className="save icon"></i>
-             Save
-            </button>
-            <button tabIndex="0" ref="submitbutton" className="ui button red" onClick={this.addAbsoluteDiv.bind(this)} onChange={this.addAbsoluteDiv.bind(this)}>
-             <i className="square outline icon"></i>
-             Add input box
-            </button>
-            <div style={headerStyle} contentEditable='true' name='inlineHeader' ref='inlineHeader' id='inlineHeader' dangerouslySetInnerHTML={{__html:this.props.title}}></div>
-            <hr />
-                <div className="reveal">
-                    <div className="slides" style={revealSlideStyle}>
-                            <div style={contentStyle} contentEditable='true' name='inlineContent' ref='inlineContent' id='inlineContent' dangerouslySetInnerHTML={{__html:this.props.content}}></div>
->>>>>>> master
+                <button tabIndex="0" ref="submitbutton" className="ui button blue" onClick={this.handleSaveButton.bind(this)} onChange={this.handleSaveButton.bind(this)}>
+                 <i className="save icon"></i>
+                 Save
+                </button>
+                <button tabIndex="0" ref="submitbutton" className="ui button red" onClick={this.addAbsoluteDiv.bind(this)} onChange={this.addAbsoluteDiv.bind(this)}>
+                 <i className="square outline icon"></i>
+                 Add input box
+                </button>
+                <div style={headerStyle} contentEditable='true' name='inlineHeader' ref='inlineHeader' id='inlineHeader' dangerouslySetInnerHTML={{__html:this.props.title}}></div>
+                <hr />
+                <div class="ui" style={compStyle}>
+                    <div className="reveal">
+                        <div className="slides">
+                                <div style={contentStyle} contentEditable='true' name='inlineContent' ref='inlineContent' id='inlineContent' dangerouslySetInnerHTML={{__html:this.props.content}}></div>
+                        </div>
                     </div>
-                    <br />
-                    <hr />
-                    <br />
-
-                    <b>Speaker notes:</b><br />
-                    <div style={speakernotesStyle} contentEditable='true' name='inlineSpeakerNotes' ref='inlineSpeakerNotes' id='inlineSpeakerNotes' dangerouslySetInnerHTML={{__html:this.props.speakernotes}}></div>
-                </ResizeAware>
+                </div>
+                <br />
+                <hr />
+                <br />
+                <b>Speaker notes:</b><br />
+                <div style={speakernotesStyle} contentEditable='true' name='inlineSpeakerNotes' ref='inlineSpeakerNotes' id='inlineSpeakerNotes' dangerouslySetInnerHTML={{__html:this.props.speakernotes}}></div>
+            </ResizeAware>
 
         );
     }