Updating build

Author: JedWatson

dist/react-codemirror.js

@@ -40,7 +40,7 @@
 module.exports=classNames;
 }elseif(typeofdefine==='function'&&typeofdefine.amd==='object'&&define.amd){
 // register as 'classnames', consistent with npm package name
-define('classnames',function(){
+define('classnames',[],function(){
 returnclassNames;
 });
 }else{
@@ -461,7 +461,7 @@
 if(horiz.clientWidth)scroll(horiz.scrollLeft,"horizontal");
 });
 
-this.checkedOverlay=false;
+this.checkedZeroWidth=false;
 // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
 if(ie&&ie_version<8)this.horiz.style.minHeight=this.vert.style.minWidth="18px";
 }
@@ -496,29 +496,43 @@
 this.horiz.firstChild.style.width="0";
 }
 
-if(!this.checkedOverlay&&measure.clientHeight>0){
-if(sWidth==0)this.overlayHack();
-this.checkedOverlay=true;
+if(!this.checkedZeroWidth&&measure.clientHeight>0){
+if(sWidth==0)this.zeroWidthHack();
+this.checkedZeroWidth=true;
 }
 
 return{right: needsV ? sWidth : 0,bottom: needsH ? sWidth : 0};
 },
 setScrollLeft: function(pos){
 if(this.horiz.scrollLeft!=pos)this.horiz.scrollLeft=pos;
+if(this.disableHoriz)this.enableZeroWidthBar(this.horiz,this.disableHoriz);
 },
 setScrollTop: function(pos){
 if(this.vert.scrollTop!=pos)this.vert.scrollTop=pos;
+if(this.disableVert)this.enableZeroWidthBar(this.vert,this.disableVert);
 },
-overlayHack: function(){
+zeroWidthHack: function(){
 varw=mac&&!mac_geMountainLion ? "12px" : "18px";
-this.horiz.style.minHeight=this.vert.style.minWidth=w;
-varself=this;
-varbarMouseDown=function(e){
-if(e_target(e)!=self.vert&&e_target(e)!=self.horiz)
-operation(self.cm,onMouseDown)(e);
-};
-on(this.vert,"mousedown",barMouseDown);
-on(this.horiz,"mousedown",barMouseDown);
+this.horiz.style.height=this.vert.style.width=w;
+this.horiz.style.pointerEvents=this.vert.style.pointerEvents="none";
+this.disableHoriz=newDelayed;
+this.disableVert=newDelayed;
+},
+enableZeroWidthBar: function(bar,delay){
+bar.style.pointerEvents="auto";
+functionmaybeDisable(){
+// To find out whether the scrollbar is still visible, we
+// check whether the element under the pixel in the bottom
+// left corner of the scrollbar box is the scrollbar box
+// itself (when the bar is still visible) or its filler child
+// (when the bar is hidden). If it is still visible, we keep
+// it enabled, if it's hidden, we disable pointer events.
+varbox=bar.getBoundingClientRect();
+varelt=document.elementFromPoint(box.left+1,box.bottom-1);
+if(elt!=bar)bar.style.pointerEvents="none";
+elsedelay.set(1000,maybeDisable);
+}
+delay.set(1000,maybeDisable);
 },
 clear: function(){
 varparent=this.horiz.parentNode;
@@ -3144,7 +3158,8 @@
 
 if(cm.state.focused&&op.updateInput)
 cm.display.input.reset(op.typing);
-if(op.focus&&op.focus==activeElt())ensureFocus(op.cm);
+if(op.focus&&op.focus==activeElt()&&(!document.hasFocus||document.hasFocus()))
+ensureFocus(op.cm);
 }
 
 functionendOperation_finish(op){
@@ -3829,7 +3844,7 @@
 
 // Determines whether an event happened in the gutter, and fires the
 // handlers for the corresponding event.
-functiongutterEvent(cm,e,type,prevent,signalfn){
+functiongutterEvent(cm,e,type,prevent){
 try{varmX=e.clientX,mY=e.clientY;}
 catch(e){returnfalse;}
 if(mX>=Math.floor(cm.display.gutters.getBoundingClientRect().right))returnfalse;
@@ -3846,14 +3861,14 @@
 if(g&&g.getBoundingClientRect().right>=mX){
 varline=lineAtHeight(cm.doc,mY);
 vargutter=cm.options.gutters[i];
-signalfn(cm,type,cm,line,gutter,e);
+signal(cm,type,cm,line,gutter,e);
 returne_defaultPrevented(e);
 }
 }
 }
 
 functionclickInGutter(cm,e){
-returngutterEvent(cm,e,"gutterClick",true,signalLater);
+returngutterEvent(cm,e,"gutterClick",true);
 }
 
 // Kludge to work around strange IE behavior where it'll sometimes
@@ -4292,7 +4307,7 @@
 
 functioncontextMenuInGutter(cm,e){
 if(!hasHandler(cm,"gutterContextMenu"))returnfalse;
-returngutterEvent(cm,e,"gutterContextMenu",false,signal);
+returngutterEvent(cm,e,"gutterContextMenu",false);
 }
 
 // UPDATING
@@ -7125,7 +7140,7 @@
 spanEndStyle="";
 }
 if(m.className)spanStyle+=" "+m.className;
-if(m.css)css=m.css;
+if(m.css)css=(css ? css+";" : "")+m.css;
 if(m.startStyle&&sp.from==pos)spanStartStyle+=" "+m.startStyle;
 if(m.endStyle&&sp.to==nextChange)spanEndStyle+=" "+m.endStyle;
 if(m.title&&!title)title=m.title;
@@ -7394,6 +7409,7 @@
 this.id=++nextDocId;
 this.modeOption=mode;
 this.lineSep=lineSep;
+this.extend=false;
 
 if(typeoftext=="string")text=this.splitLines(text);
 updateDoc(this,{from: start,to: start,text: text});
@@ -8901,7 +8917,7 @@
 
 // THE END
 
-CodeMirror.version="5.8.0";
+CodeMirror.version="5.9.0";
 
 returnCodeMirror;
 });
@@ -8938,8 +8954,8 @@ var CodeMirror = React.createClass({
 this.codeMirror.on('change',this.codemirrorValueChanged);
 this.codeMirror.on('focus',this.focusChanged.bind(this,true));
 this.codeMirror.on('blur',this.focusChanged.bind(this,false));
-this._currentCodemirrorValue=this.props.value;
-this.codeMirror.setValue(this.props.value);
+this._currentCodemirrorValue=this.props.defaultValue||this.props.value||'';
+this.codeMirror.setValue(this._currentCodemirrorValue);
 },
 
 componentWillUnmount: functioncomponentWillUnmount(){
@@ -8950,7 +8966,7 @@ var CodeMirror = React.createClass({
 },
 
 componentWillReceiveProps: functioncomponentWillReceiveProps(nextProps){
-if(this.codeMirror&&this._currentCodemirrorValue!==nextProps.value){
+if(this.codeMirror&&nextProps.value!==undefined&&this._currentCodemirrorValue!==nextProps.value){
 this.codeMirror.setValue(nextProps.value);
 }
 if(typeofnextProps.options==='object'){