conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
root: {
'&&': {
display: 'block'
=======
select: {
...isolateMixin,
position: 'relative',
backgroundColor: theme.field.colors.default.background,
'&:hover:not($disabled) $arrow': {
color: theme.field.colors.default.text
>>>>>>>
root: {
'&&': {
display: 'block'
<<<<<<<
=======
...middleMixin,
position: 'absolute',
top: '50%',
transform: 'translateY(-50%)',
fontSize: 0,
border: 0,
outline: 0,
margin: 0,
padding: 0,
>>>>>>>
<<<<<<<
=======
background: 'transparent',
color: theme.field.colors.default.arrow,
>>>>>>>
<<<<<<<
color: theme.field.colors.default.arrow,
'$input:hover &': {
color: theme.field.colors.hover.arrow
},
'$isDisabled &': {
color: theme.field.colors.disabled.arrow + '!important'
},
'$isOpened &': {
transform: 'scaleY(-1)'
},
'&:after': {
position: 'absolute',
top: 4,
left: 6,
borderStyle: 'solid',
borderWidth: '0 0 1px 1px',
height: 8,
width: 8,
content: '""',
pointerEvents: 'none',
transform: 'rotate(-45deg)'
}
=======
textAlign: 'center',
lineHeight: 0
},
arrowIcon: {
display: 'inline-block',
borderStyle: 'solid',
borderColor: 'currentColor',
borderWidth: '0 0 1px 1px',
height: 9,
width: 9,
outline: 0,
pointerEvents: 'none',
transform: 'translateY(-2px) rotate(-45deg)'
>>>>>>>
color: theme.field.colors.default.arrow,
textAlign: 'center',
lineHeight: 0,
'$input:hover &': {
color: theme.field.colors.hover.arrow
},
'$isDisabled &': {
color: theme.field.colors.disabled.arrow + '!important'
},
'&:empty:after': {
position: 'absolute',
top: 4,
left: 6,
borderStyle: 'solid',
borderWidth: '0 0 1px 1px',
height: 8,
width: 8,
content: '""',
pointerEvents: 'none',
transform: 'rotate(-45deg)'
},
'$isOpened &:empty': {
transform: 'scaleY(-1)'
},
'& svg': {
margin: 'auto',
top: 0,
left: 0,
right: 0,
bottom: 0,
position: 'absolute',
maxWidth: '100%',
maxHeight: '100%'
}
<<<<<<<
* Множественный выбор
*/
multiple: PropTypes.bool,
/**
=======
* Дополнительный CSS-класс кнопки со стрелкой
*/
arrowClassName: PropTypes.string,
/**
* Inline-стили кнопки со стрелкой
*/
arrowStyle: PropTypes.object,
/**
>>>>>>>
* Множественный выбор
*/
multiple: PropTypes.bool,
/**
* Дополнительный CSS-класс кнопки со стрелкой
*/
arrowClassName: PropTypes.string,
/**
* Inline-стили кнопки со стрелкой
*/
arrowStyle: PropTypes.object,
/**
<<<<<<<
multiple,
=======
arrowIcon,
size,
status,
>>>>>>>
multiple,
<<<<<<<
<Input
{...inputProps}
inputClassName={classnames(className, !onSearch && this.css.readonly)}
autoFocus={autoFocus}
placeholder={resultPlaceholder}
readOnly={!onSearch}
value={resultInputValue}
onChange={this.requestItems}
inputRef={this.savaInputRef}
/>
=======
<div className={classnames(this.css.select, this.css[size], disabled && this.css.disabled, focuseInput && this.css.focused)}>
<Input
{...other}
inputRef={(el) => { this.input = el }}
inputStyle={style}
className={this.css.input}
inputClassName={classnames(!onSearch && this.css.readonly, this.showArrow && this.css.withArrow, className)}
size={size}
status={status}
iconLeft={icon}
autoFocus={autoFocus}
disabled={disabled}
placeholder={resultPlaceholder}
readOnly={!onSearch}
value={onSearch && focuseInput && isOpened ? searchText : (this.isValueEmpty(inputValue) ? '' : inputValue)}
onFocus={this.focusInput}
onClick={this.open}
onTouchStart={onSearch ? null : this.open}
onTouchEnd={onSearch ? null : this.preventSelect}
onBlur={this.blurInput}
onChange={this.requestItems}
onKeyDown={this.keyDown} />
{this.showArrow &&
<button
type="button"
tabIndex="-1"
style={arrowStyle}
className={classnames(this.css.arrow, arrowClassName)}
onMouseDown={this.preventBlurInput}
onClick={this.open}>
{arrowIcon || <span className={this.css.arrowIcon} />}
</button>
}
</div>
>>>>>>>
<Input
{...inputProps}
inputClassName={classnames(className, !onSearch && this.css.readonly)}
autoFocus={autoFocus}
placeholder={resultPlaceholder}
readOnly={!onSearch}
value={resultInputValue}
onChange={this.requestItems}
inputRef={this.savaInputRef}
/> |
<<<<<<<
if(o == null)
o = cc.TRANSITION_ORIENTATION_UP_OVER;
=======
if(o == null)
o = cc.TRANSITION_ORIENTATION_UP_OVER;
>>>>>>>
if(o == null)
o = cc.TRANSITION_ORIENTATION_UP_OVER;
if(o == null)
o = cc.TRANSITION_ORIENTATION_UP_OVER; |
<<<<<<<
_highlight: false,
_touchEventCallback: null,
=======
_focusEnabled: false,
>>>>>>>
_focusEnabled: false,
_highlight: false,
_touchEventCallback: null,
<<<<<<<
_updateContentSizeWithTextureSize: function(size){
},
_isAncestorsEnabled: function(){
},
_getAncensterWidget: function(node){
},
_isAncestorsVisible: function(node){
},
_cleanupWidget: function(){
},
=======
setFocusEnabled: function(enable){
this._focusEnabled = enable;
},
isFocusEnabled: function(){
return this._focusEnabled;
},
>>>>>>>
setFocusEnabled: function(enable){
this._focusEnabled = enable;
},
isFocusEnabled: function(){
return this._focusEnabled;
},
_updateContentSizeWithTextureSize: function(size){
},
_isAncestorsEnabled: function(){
},
_getAncensterWidget: function(node){
},
_isAncestorsVisible: function(node){
},
_cleanupWidget: function(){
}, |
<<<<<<<
var glProgramState = cmd._glProgramState;
if (_batchedInfo.texture !== texture ||
=======
var shader = cmd._shaderProgram;
if (_batchBroken ||
_batchedInfo.texture !== texture ||
>>>>>>>
var glProgramState = cmd._glProgramState;
if (_batchBroken ||
_batchedInfo.texture !== texture ||
<<<<<<<
_batchedInfo.glProgramState = glProgramState;
=======
_batchedInfo.shader = shader;
_batchBroken = false;
>>>>>>>
_batchedInfo.glProgramState = glProgramState;
_batchBroken = false;
<<<<<<<
var glProgramState = _batchedInfo.glProgramState;
var count = _batchingSize / 4;
=======
var shader = _batchedInfo.shader;
var uploadAll = _batchingSize > _maxVertexSize * 0.5;
>>>>>>>
var glProgramState = _batchedInfo.glProgramState;
var uploadAll = _batchingSize > _maxVertexSize * 0.5; |
<<<<<<<
/* if (this._isAccelerometerEnabled){
director.getAccelerometer().setDelegate(this);
}*/
=======
if (this._isAccelerometerEnabled) {
director.getAccelerometer().setDelegate(this);
}
>>>>>>>
if (this._isAccelerometerEnabled) {
director.getAccelerometer().setDelegate(this);
}
<<<<<<<
//TODO not supported
/* if (this._isAccelerometerEnabled) {
director.getAccelerometer().setDelegate(null);
}*/
=======
if (this._isAccelerometerEnabled) {
director.getAccelerometer().setDelegate(null);
}
>>>>>>>
if (this._isAccelerometerEnabled) {
director.getAccelerometer().setDelegate(null);
}
<<<<<<<
//TODO not supported
/*if (this._isAccelerometerEnabled) {
cc.Director.getInstance().getAccelerometer().setDelegate(this);
}*/
=======
if (this._isAccelerometerEnabled) {
cc.Director.getInstance().getAccelerometer().setDelegate(this);
}
>>>>>>>
if (this._isAccelerometerEnabled) {
cc.Director.getInstance().getAccelerometer().setDelegate(this);
}
<<<<<<<
context.fillRect(-apip.x, apip.y, tWidth, -tHeight);
=======
context.fillRect(0, 0, tWidth, -tHeight);
cc.INCREMENT_GL_DRAWS(1);
>>>>>>>
context.fillRect(0, 0, tWidth, -tHeight); |
<<<<<<<
that.button.className = "paused";
that.synth.stop();
=======
that.synth.pause();
>>>>>>>
that.button.className = "paused";
that.synth.pause(); |
<<<<<<<
var col = cc.LayerColor.layerWithColor(cc.ccc4(128, 128, 128, 255));
=======
this.time = 0;
var col = cc.LayerColor.create(cc.ccc4(128, 128, 128, 255));
>>>>>>>
var col = cc.LayerColor.create(cc.ccc4(128, 128, 128, 255));
<<<<<<<
ctor:function () {
var label = cc.LabelBMFont.labelWithString("abcdefg", "Resources/fonts/bitmapFontTest4.fnt");
=======
cotr:function () {
var label = cc.LabelBMFont.create("abcdefg", "Resources/fonts/bitmapFontTest4.fnt");
>>>>>>>
ctor:function () {
var label = cc.LabelBMFont.create("abcdefg", "Resources/fonts/bitmapFontTest4.fnt"); |
<<<<<<<
_backGroundImageColor:null,
=======
_className:"Layout",
>>>>>>>
_className:"Layout",
_backGroundImageColor:null, |
<<<<<<<
cc.ParticleBatchNodeRenderCmdWebGL = function(node){
this._node = node;
};
cc.ParticleBatchNodeRenderCmdWebGL.prototype.rendering = function(ctx){
var _t = this._node;
if (_t.textureAtlas.totalQuads == 0)
return;
_t._shaderProgram.use();
_t._shaderProgram._setUniformForMVPMatrixWithMat4(_t._stackMatrix);
cc.glBlendFuncForParticle(_t._blendFunc.src, _t._blendFunc.dst);
_t.textureAtlas.drawQuads();
};
=======
//RenderTexture render command
cc.RenderTextureRenderCmdWebGL = function(node){
this._node = node;
};
cc.RenderTextureRenderCmdWebGL.prototype.rendering = function(ctx){
var gl = ctx || cc._renderContext;
var node = this._node;
if (node.autoDraw) {
node.begin();
var locClearFlags = this.clearFlags;
if (locClearFlags) {
var oldClearColor = [0.0, 0.0, 0.0, 0.0];
var oldDepthClearValue = 0.0;
var oldStencilClearValue = 0;
// backup and set
if (locClearFlags & gl.COLOR_BUFFER_BIT) {
oldClearColor = gl.getParameter(gl.COLOR_CLEAR_VALUE);
gl.clearColor(node._clearColor.r/255, node._clearColor.g/255, node._clearColor.b/255, node._clearColor.a/255);
}
if (locClearFlags & gl.DEPTH_BUFFER_BIT) {
oldDepthClearValue = gl.getParameter(gl.DEPTH_CLEAR_VALUE);
gl.clearDepth(node.clearDepthVal);
}
if (locClearFlags & gl.STENCIL_BUFFER_BIT) {
oldStencilClearValue = gl.getParameter(gl.STENCIL_CLEAR_VALUE);
gl.clearStencil(node.clearStencilVal);
}
// clear
gl.clear(locClearFlags);
// restore
if (locClearFlags & gl.COLOR_BUFFER_BIT)
gl.clearColor(oldClearColor[0], oldClearColor[1], oldClearColor[2], oldClearColor[3]);
if (locClearFlags & gl.DEPTH_BUFFER_BIT)
gl.clearDepth(oldDepthClearValue);
if (locClearFlags & gl.STENCIL_BUFFER_BIT)
gl.clearStencil(oldStencilClearValue);
}
//! make sure all children are drawn
node.sortAllChildren();
var locChildren = node._children;
for (var i = 0; i < locChildren.length; i++) {
var getChild = locChildren[i];
if (getChild != node.sprite)
getChild.visit();
}
node.end();
}
};
cc.SpriteBatchNodeRenderCmdWebGL = function(node){
this._node = node;
};
cc.SpriteBatchNodeRenderCmdWebGL.prototype.rendering = function(ctx){
var node = this._node;
if (node.textureAtlas.totalQuads === 0)
return;
//cc.nodeDrawSetup(this);
node._shaderProgram.use();
node._shaderProgram._setUniformForMVPMatrixWithMat4(node._stackMatrix);
node._arrayMakeObjectsPerformSelector(node._children, cc.Node._StateCallbackType.updateTransform);
cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
node.textureAtlas.drawQuads();
};
cc.AtlasNodeRenderCmdWebGL = function(node){
this._node = node;
};
cc.AtlasNodeRenderCmdWebGL.prototype.rendering = function(ctx){
var context = ctx || cc._renderContext, node = this._node;
node._shaderProgram.use();
node._shaderProgram._setUniformForMVPMatrixWithMat4(node._stackMatrix);
cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
if(node._uniformColor && node._colorF32Array){
context.uniform4fv(node._uniformColor, node._colorF32Array);
node.textureAtlas.drawNumberOfQuads(node.quadsToDraw, 0);
}
};
cc.CustomRenderCmdWebGL = function(node, func){
this._node = node;
this._callback = func;
};
cc.CustomRenderCmdWebGL.prototype.rendering = function(ctx){
if(!this._callback)
return;
this._callback.call(this.node, ctx);
};
>>>>>>>
cc.ParticleBatchNodeRenderCmdWebGL = function(node){
this._node = node;
};
cc.ParticleBatchNodeRenderCmdWebGL.prototype.rendering = function(ctx){
var _t = this._node;
if (_t.textureAtlas.totalQuads == 0)
return;
_t._shaderProgram.use();
_t._shaderProgram._setUniformForMVPMatrixWithMat4(_t._stackMatrix);
cc.glBlendFuncForParticle(_t._blendFunc.src, _t._blendFunc.dst);
_t.textureAtlas.drawQuads();
};
//RenderTexture render command
cc.RenderTextureRenderCmdWebGL = function(node){
this._node = node;
};
cc.RenderTextureRenderCmdWebGL.prototype.rendering = function(ctx){
var gl = ctx || cc._renderContext;
var node = this._node;
if (node.autoDraw) {
node.begin();
var locClearFlags = this.clearFlags;
if (locClearFlags) {
var oldClearColor = [0.0, 0.0, 0.0, 0.0];
var oldDepthClearValue = 0.0;
var oldStencilClearValue = 0;
// backup and set
if (locClearFlags & gl.COLOR_BUFFER_BIT) {
oldClearColor = gl.getParameter(gl.COLOR_CLEAR_VALUE);
gl.clearColor(node._clearColor.r/255, node._clearColor.g/255, node._clearColor.b/255, node._clearColor.a/255);
}
if (locClearFlags & gl.DEPTH_BUFFER_BIT) {
oldDepthClearValue = gl.getParameter(gl.DEPTH_CLEAR_VALUE);
gl.clearDepth(node.clearDepthVal);
}
if (locClearFlags & gl.STENCIL_BUFFER_BIT) {
oldStencilClearValue = gl.getParameter(gl.STENCIL_CLEAR_VALUE);
gl.clearStencil(node.clearStencilVal);
}
// clear
gl.clear(locClearFlags);
// restore
if (locClearFlags & gl.COLOR_BUFFER_BIT)
gl.clearColor(oldClearColor[0], oldClearColor[1], oldClearColor[2], oldClearColor[3]);
if (locClearFlags & gl.DEPTH_BUFFER_BIT)
gl.clearDepth(oldDepthClearValue);
if (locClearFlags & gl.STENCIL_BUFFER_BIT)
gl.clearStencil(oldStencilClearValue);
}
//! make sure all children are drawn
node.sortAllChildren();
var locChildren = node._children;
for (var i = 0; i < locChildren.length; i++) {
var getChild = locChildren[i];
if (getChild != node.sprite)
getChild.visit();
}
node.end();
}
};
cc.SpriteBatchNodeRenderCmdWebGL = function(node){
this._node = node;
};
cc.SpriteBatchNodeRenderCmdWebGL.prototype.rendering = function(ctx){
var node = this._node;
if (node.textureAtlas.totalQuads === 0)
return;
//cc.nodeDrawSetup(this);
node._shaderProgram.use();
node._shaderProgram._setUniformForMVPMatrixWithMat4(node._stackMatrix);
node._arrayMakeObjectsPerformSelector(node._children, cc.Node._StateCallbackType.updateTransform);
cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
node.textureAtlas.drawQuads();
};
cc.AtlasNodeRenderCmdWebGL = function(node){
this._node = node;
};
cc.AtlasNodeRenderCmdWebGL.prototype.rendering = function(ctx){
var context = ctx || cc._renderContext, node = this._node;
node._shaderProgram.use();
node._shaderProgram._setUniformForMVPMatrixWithMat4(node._stackMatrix);
cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
if(node._uniformColor && node._colorF32Array){
context.uniform4fv(node._uniformColor, node._colorF32Array);
node.textureAtlas.drawNumberOfQuads(node.quadsToDraw, 0);
}
};
cc.CustomRenderCmdWebGL = function(node, func){
this._node = node;
this._callback = func;
};
cc.CustomRenderCmdWebGL.prototype.rendering = function(ctx){
if(!this._callback)
return;
this._callback.call(this.node, ctx);
}; |
<<<<<<<
cc.loadjs('../tests/Classes/tests/MenuTest/MenuTest.js');
cc.loadjs('../tests/Classes/tests/ActionsTest/ActionsTest.js');
=======
cc.loadjs('../tests/Classes/tests/SchedulerTest/SchedulerTest.js');
cc.loadjs('../tests/Classes/tests/ClickAndMoveTest/ClickAndMoveTest.js');
cc.loadjs('../tests/Classes/tests/MenuTest/MenuTest.js');
>>>>>>>
cc.loadjs('../tests/Classes/tests/SchedulerTest/SchedulerTest.js');
cc.loadjs('../tests/Classes/tests/ClickAndMoveTest/ClickAndMoveTest.js');
cc.loadjs('../tests/Classes/tests/MenuTest/MenuTest.js');
cc.loadjs('../tests/Classes/tests/ActionsTest/ActionsTest.js'); |
<<<<<<<
if (!this.isVisible() || !this._isAncestorsVisible(this)) {
return;
}
this._renderCmd.show();
=======
this._renderCmd._beginEditing();
>>>>>>>
if (!this.isVisible() || !this._isAncestorsVisible(this)) {
return;
}
this._renderCmd._beginEditing();
<<<<<<<
thisPointer._updateEditBoxContentStyle();
thisPointer.hidden();
if (editBox._delegate && editBox._delegate.editBoxReturn) {
editBox._delegate.editBoxReturn(editBox);
=======
thisPointer._updateDomTextCases();
thisPointer._endEditing();
if (editBox._delegate && editBox._delegate.editBoxEditingReturn) {
editBox._delegate.editBoxEditingReturn(editBox);
>>>>>>>
thisPointer._updateDomTextCases();
thisPointer._endEditing();
if (editBox._delegate && editBox._delegate.editBoxReturn) {
editBox._delegate.editBoxReturn(editBox);
<<<<<<<
this.__autoResize = cc.view.__resizeWithBrowserSize;
cc.view.resizeWithBrowserSize(false);
if (cc.sys.isMobile) {
scrollWindowUp(editBox);
}
=======
>>>>>>>
<<<<<<<
thisPointer._updateEditBoxContentStyle();
if (thisPointer.__fullscreen) {
cc.view.enableAutoFullScreen(true);
}
if (this.__autoResize) {
cc.view.resizeWithBrowserSize(true);
}
window.scrollY = 0;
if (editBox._delegate && editBox._delegate.editBoxEditingDidEnd) {
editBox._delegate.editBoxEditingDidEnd(editBox);
=======
thisPointer._updateDomTextCases();
if (editBox._delegate && editBox._delegate.editBoxEditingDidEnded) {
editBox._delegate.editBoxEditingDidEnded(editBox);
>>>>>>>
thisPointer._updateDomTextCases();
if (editBox._delegate && editBox._delegate.editBoxEditingDidEnd) {
editBox._delegate.editBoxEditingDidEnd(editBox);
<<<<<<<
if (cc.sys.isMobile) {
scrollWindowUp(editBox);
}
=======
if (cc.sys.isMobile) {
thisPointer._onFocusOnMobile(editBox);
}
>>>>>>>
if (cc.sys.isMobile) {
thisPointer._onFocusOnMobile(editBox);
} |
<<<<<<<
* Point Sprite component
* @Class
* @Construct
* @param {cc.Vertex2F} pos1
* @param {cc.Color} color1
* @param {Number} size1
*/
cc.PointSprite = function (pos1, color1, size1) {
this.pos = pos1 || new cc.Vertex2F(0, 0);
this.color = color1 || cc.color(0, 0, 0, 0);
this.size = size1 || 0;
};
/**
=======
>>>>>>>
* Point Sprite component
* @Class
* @Construct
* @param {cc.Vertex2F} pos1
* @param {cc.Color4B} color1
* @param {Number} size1
*/
cc.PointSprite = function (pos1, color1, size1) {
this.pos = pos1 || new cc.Vertex2F(0, 0);
this.color = color1 || new cc.Color4B(0, 0, 0, 0);
this.size = size1 || 0;
};
/**
<<<<<<<
};
/**
* White color (255, 255, 255, 255)
* @returns {cc.Color}
* @private
*/
cc.color._getWhite = function(){
return cc.color(255, 255, 255, 255);
};
/**
* Yellow color (255, 255, 0, 255)
* @returns {cc.Color}
* @private
*/
cc.color._getYellow = function () {
return cc.color(255, 255, 0, 255);
};
/**
* Blue color (0, 0, 255, 255)
* @type {cc.Color}
* @private
*/
cc.color._getBlue = function () {
return cc.color(0, 0, 255, 255);
};
/**
* Green Color (0, 255, 0, 255)
* @type {cc.Color}
* @private
*/
cc.color._getGreen = function () {
return cc.color(0, 255, 0, 255);
};
/**
* Red Color (255, 0, 0, 255)
* @type {cc.Color}
* @private
*/
cc.color._getRed = function () {
return cc.color(255, 0, 0, 255);
};
/**
* Magenta Color (255, 0, 255, 255)
* @type {cc.Color}
* @private
*/
cc.color._getMagenta = function () {
return cc.color(255, 0, 255, 255);
};
/**
* Black Color (0, 0, 0, 255)
* @type {cc.Color}
* @private
*/
cc.color._getBlack = function () {
return cc.color(0, 0, 0, 255);
};
/**
* Orange Color (255, 127, 0, 255)
* @type {cc.Color}
* @private
*/
cc.color._getOrange = function () {
return cc.color(255, 127, 0, 255);
};
/**
* Gray Color (166, 166, 166, 255)
* @type {cc.Color}
* @private
*/
cc.color._getGray = function () {
return cc.color(166, 166, 166, 255);
};
window._proto = cc.color;
/** @expose */
_proto.white;
cc.defineGetterSetter(_proto, "white", _proto._getWhite);
/** @expose */
_proto.yellow;
cc.defineGetterSetter(_proto, "yellow", _proto._getYellow);
/** @expose */
_proto.blue;
cc.defineGetterSetter(_proto, "blue", _proto._getBlue);
/** @expose */
_proto.green;
cc.defineGetterSetter(_proto, "green", _proto._getGreen);
/** @expose */
_proto.red;
cc.defineGetterSetter(_proto, "red", _proto._getRed);
/** @expose */
_proto.magenta;
cc.defineGetterSetter(_proto, "magenta", _proto._getMagenta);
/** @expose */
_proto.black;
cc.defineGetterSetter(_proto, "black", _proto._getBlack);
/** @expose */
_proto.orange;
cc.defineGetterSetter(_proto, "orange", _proto._getOrange);
/** @expose */
_proto.gray;
cc.defineGetterSetter(_proto, "gray", _proto._getGray);
delete window._proto;
=======
};
/**
* The device accelerometer reports values for each axis in units of g-force
* @constructor
*/
cc.Acceleration = function(){
this.x = 0;
this.y = 0;
this.z = 0;
this.timestamp = 0;
};
>>>>>>>
};
/**
* The device accelerometer reports values for each axis in units of g-force
* @constructor
*/
cc.Acceleration = function(){
this.x = 0;
this.y = 0;
this.z = 0;
this.timestamp = 0;
};
/**
* White color (255, 255, 255, 255)
* @returns {cc.Color}
* @private
*/
cc.color._getWhite = function(){
return cc.color(255, 255, 255, 255);
};
/**
* Yellow color (255, 255, 0, 255)
* @returns {cc.Color}
* @private
*/
cc.color._getYellow = function () {
return cc.color(255, 255, 0, 255);
};
/**
* Blue color (0, 0, 255, 255)
* @type {cc.Color}
* @private
*/
cc.color._getBlue = function () {
return cc.color(0, 0, 255, 255);
};
/**
* Green Color (0, 255, 0, 255)
* @type {cc.Color}
* @private
*/
cc.color._getGreen = function () {
return cc.color(0, 255, 0, 255);
};
/**
* Red Color (255, 0, 0, 255)
* @type {cc.Color}
* @private
*/
cc.color._getRed = function () {
return cc.color(255, 0, 0, 255);
};
/**
* Magenta Color (255, 0, 255, 255)
* @type {cc.Color}
* @private
*/
cc.color._getMagenta = function () {
return cc.color(255, 0, 255, 255);
};
/**
* Black Color (0, 0, 0, 255)
* @type {cc.Color}
* @private
*/
cc.color._getBlack = function () {
return cc.color(0, 0, 0, 255);
};
/**
* Orange Color (255, 127, 0, 255)
* @type {cc.Color}
* @private
*/
cc.color._getOrange = function () {
return cc.color(255, 127, 0, 255);
};
/**
* Gray Color (166, 166, 166, 255)
* @type {cc.Color}
* @private
*/
cc.color._getGray = function () {
return cc.color(166, 166, 166, 255);
};
window._proto = cc.color;
/** @expose */
_proto.white;
cc.defineGetterSetter(_proto, "white", _proto._getWhite);
/** @expose */
_proto.yellow;
cc.defineGetterSetter(_proto, "yellow", _proto._getYellow);
/** @expose */
_proto.blue;
cc.defineGetterSetter(_proto, "blue", _proto._getBlue);
/** @expose */
_proto.green;
cc.defineGetterSetter(_proto, "green", _proto._getGreen);
/** @expose */
_proto.red;
cc.defineGetterSetter(_proto, "red", _proto._getRed);
/** @expose */
_proto.magenta;
cc.defineGetterSetter(_proto, "magenta", _proto._getMagenta);
/** @expose */
_proto.black;
cc.defineGetterSetter(_proto, "black", _proto._getBlack);
/** @expose */
_proto.orange;
cc.defineGetterSetter(_proto, "orange", _proto._getOrange);
/** @expose */
_proto.gray;
cc.defineGetterSetter(_proto, "gray", _proto._getGray);
delete window._proto; |
<<<<<<<
playState: {
written: 0,
total: Infinity
},
=======
>>>>>>>
<<<<<<<
audioSettings: "{enviro}.audioSettings",
model: {
playState: "{enviro}.model.playState"
}
=======
audioSettings: "{enviro}.options.audioSettings"
>>>>>>>
audioSettings: "{enviro}.audioSettings",
model: {
playState: "{enviro}.model.playState"
}
<<<<<<<
events: {
onStart: null,
onStop: null
},
=======
that.writeSamples = function (e) {
var m = that.model,
hasInput = m.hasInput,
krPeriods = m.krPeriods,
evaluator = that.nodeEvaluator,
buses = evaluator.buses,
audioSettings = that.options.audioSettings,
blockSize = audioSettings.blockSize,
chans = audioSettings.chans,
inBufs = e.inputBuffer,
inChans = e.inputBuffer.numberOfChannels,
outBufs = e.outputBuffer,
chan,
i,
samp;
>>>>>>>
events: {
onStart: null,
onStop: null
},
<<<<<<<
flock.audioStrategy.web.initIOS = function (model, applier, context, jsNode) {
// Work around a bug in iOS Safari where it now requires a noteOn()
// message to be invoked before sound will work at all. Just connecting a
// ScriptProcessorNode inside a user event handler isn't sufficient.
if (model.shouldInitIOS) {
var s = context.createBufferSource();
s.connect(jsNode);
s.start(0);
s.stop(0);
s.disconnect(0);
applier.change("shouldInitIOS", false);
}
};
flock.audioStrategy.web.start = function (applier, context, jsNode, preNode, postNode, onStart) {
if (preNode) {
preNode.connect(jsNode);
}
=======
// And output each sample.
for (samp = 0; samp < blockSize; samp++) {
outBuf[samp + offset] = sourceBuf[samp];
}
}
}
};
>>>>>>>
flock.audioStrategy.web.initIOS = function (model, applier, context, jsNode) {
// Work around a bug in iOS Safari where it now requires a noteOn()
// message to be invoked before sound will work at all. Just connecting a
// ScriptProcessorNode inside a user event handler isn't sufficient.
if (model.shouldInitIOS) {
var s = context.createBufferSource();
s.connect(jsNode);
s.start(0);
s.stop(0);
s.disconnect(0);
applier.change("shouldInitIOS", false);
}
};
flock.audioStrategy.web.start = function (applier, context, jsNode, preNode, postNode, onStart) {
if (preNode) {
preNode.connect(jsNode);
} |
<<<<<<<
flock.parse.bufferForDef(bufferDefs[i], bufferTarget, flock.environment);
=======
// TODO: Hardcoded reference to the shared environment.
flock.parse.bufferForDef(bufferDefs[i], bufferTarget, flock.enviro.shared);
>>>>>>>
// TODO: Hardcoded reference to the shared environment.
flock.parse.bufferForDef(bufferDefs[i], bufferTarget, flock.environment); |
<<<<<<<
_currTimeValue:null,
=======
_watcherFun:null,
_watcherSender:null,
>>>>>>>
<<<<<<<
this._currTimeValue = new cc.timeval();
this._lastUpdate = new cc.timeval();
if (!cc.isAddedHiddenEvent) {
=======
this._lastUpdate = Date.now();
if(!cc.isAddedHiddenEvent){
>>>>>>>
this._lastUpdate = Date.now();
if (!cc.isAddedHiddenEvent) {
<<<<<<<
window.addEventListener("focus", function () {
selfPointer._lastUpdate = cc.Time.gettimeofdayCocos2d(selfPointer._lastUpdate);
=======
window.addEventListener("focus",function(){
selfPointer._lastUpdate = Date.now();
>>>>>>>
window.addEventListener("focus", function () {
selfPointer._lastUpdate = Date.now();
<<<<<<<
_resetLastUpdate:function () {
this._lastUpdate = cc.Time.gettimeofdayCocos2d(this._lastUpdate);
=======
_resetLastUpdate:function(){
this._lastUpdate = Date.now();
>>>>>>>
_resetLastUpdate:function () {
this._lastUpdate = Date.now();
<<<<<<<
if ((cc.COCOS2D_DEBUG > 0) && (this._deltaTime > 0.2))
this._deltaTime = 1 / 60.0;
this._lastUpdate.tv_sec = now.tv_sec;
this._lastUpdate.tv_usec = now.tv_usec;
=======
if (cc.DEBUG) {
if (this._deltaTime > 0.2) {
this._deltaTime = 1 / 60.0;
}
}
this._lastUpdate = now;
>>>>>>>
if ((cc.COCOS2D_DEBUG > 0) && (this._deltaTime > 0.2))
this._deltaTime = 1 / 60.0;
this._lastUpdate = now;
<<<<<<<
var now = cc.Time.gettimeofdayCocos2d();
this._secondsPerFrame = (now.tv_sec - this._lastUpdate.tv_sec) + (now.tv_usec - this._lastUpdate.tv_usec) / 1000000.0;
=======
var now = Date.now();
this._secondsPerFrame = (now-this._lastUpdate)/1000;
>>>>>>>
var now = Date.now();
this._secondsPerFrame = (now-this._lastUpdate)/1000; |
<<<<<<<
'platform/zlib.min.js',
'platform/CCEGLViewProtocol.js',
'platform/CCEGLView.js',
=======
'platform/CCAccelerometer.js',
'platform/zlib.min.js',
>>>>>>>
'platform/CCAccelerometer.js',
'platform/zlib.min.js',
'platform/CCEGLViewProtocol.js',
'platform/CCEGLView.js',
<<<<<<<
'../System/Sys.js',
=======
'platform/Sys.js',
>>>>>>>
'platform/Sys.js', |
<<<<<<<
cc.loadjs('../tests/Classes/tests/ProgressActionsTest/ProgressActionsTest.js');
cc.loadjs('../tests/Classes/tests/LayerTest/LayerTest.js');
=======
cc.loadjs('../tests/Classes/tests/ProgressActionsTest/ProgressActionsTest.js');
cc.loadjs('../tests/Classes/tests/SceneTest/SceneTest.js');
>>>>>>>
cc.loadjs('../tests/Classes/tests/ProgressActionsTest/ProgressActionsTest.js');
cc.loadjs('../tests/Classes/tests/LayerTest/LayerTest.js');
cc.loadjs('../tests/Classes/tests/SceneTest/SceneTest.js'); |
<<<<<<<
=======
/*
var move1 = cc.MoveBy.actionWithDuration(0.5, cc.ccp(0, 160));
var rotate1 = cc.RotateBy.actionWithDuration(2, 360);
var scale1 = cc.ScaleBy.actionWithDuration(2, 5);
var opacity1 = cc.FadeOut.actionWithDuration(2);
var fadein1 = cc.FadeIn.actionWithDuration(2);
var scaleback1 = cc.ScaleTo.actionWithDuration(1, 1);
var finish1 = cc.CallFunc.actionWithTarget(this, this.removeSprite);
var move2 = cc.MoveBy.actionWithDuration(0.5, cc.ccp(0, 160));
var rotate2 = cc.RotateBy.actionWithDuration(2, 360);
var scale2 = cc.ScaleBy.actionWithDuration(2, 5);
var opacity2 = cc.FadeOut.actionWithDuration(2);
var fadein2 = cc.FadeIn.actionWithDuration(2);
var scaleback2 = cc.ScaleTo.actionWithDuration(1, 1);
var finish2 = cc.CallFunc.actionWithTarget(this, this.removeSprite);
var move3 = cc.MoveBy.actionWithDuration(0.5, cc.ccp(0, 160));
var rotate3 = cc.RotateBy.actionWithDuration(2, 360);
var scale3 = cc.ScaleBy.actionWithDuration(2, 5);
var opacity3 = cc.FadeOut.actionWithDuration(2);
var fadein3 = cc.FadeIn.actionWithDuration(2);
var scaleback3 = cc.ScaleTo.actionWithDuration(1, 1);
var finish3 = cc.CallFunc.actionWithTarget(this, this.removeSprite);
*/
>>>>>>>
<<<<<<<
=======
//var seq1 = cc.Sequence.actions(move1, rotate1, scale1, opacity1, fadein1, scaleback1, finish1, null);
//var seq2 = cc.Sequence.actions(move2, rotate2, scale2, opacity2, fadein2, scaleback2, finish2, null);
//var seq3 = cc.Sequence.actions(move3, rotate3, scale3, opacity3, fadein3, scaleback3, finish3, null);
>>>>>>>
<<<<<<<
var dict;
for (var i = 0, len = objects.length; i < len; i++) {
dict = objects[i];
=======
for (var i = 0 ; i < objects.length; i++) {
var dict = objects[i];
>>>>>>>
for (var i = 0 ; i < objects.length; i++) {
var dict = objects[i]; |
<<<<<<<
=======
/**
* Changes from the <code>initial</code> input to the <code>target</code> input
* at the specified <code>time</code>. An optional <code>crossfade</code> duration
* may be specified to linearly crossfade between the two inputs.
*
* Can be used to schedule sample-accurate changes.
* Note that the <code>target</code> input will be evaluated from the beginning,
* even if its value isn't yet output.
*
*/
flock.ugen.change = function (inputs, output, options) {
var that = flock.ugen(inputs, output, options);
that.gen = function (numSamps) {
var m = that.model,
initial = that.inputs.initial.output,
initialInc = m.strides.initial,
target = that.inputs.target.output,
targetInc = m.strides.target,
out = that.output,
samplesLeft = m.samplesLeft,
crossfadeLevel = m.crossfadeLevel,
val;
for (var i = 0, j = 0, k = 0; i < numSamps; i++, j += initialInc, k += targetInc) {
if (samplesLeft > 0) {
// We haven't hit the scheduled time yet.
val = initial[j];
samplesLeft--;
} else if (crossfadeLevel > 0.0) {
// We've hit the scheduled time, but we still need to peform the crossfade.
val = (initial[j] * crossfadeLevel) + (target[k] * (1.0 - crossfadeLevel));
crossfadeLevel -= m.crossfadeStepSize;
} else {
// We're done.
val = target[k];
}
out[i] = val;
}
m.samplesLeft = samplesLeft;
m.crossfadeLevel = crossfadeLevel;
};
that.onInputChanged = function (inputName) {
var m = that.model,
inputs = that.inputs;
if (inputName === "time" || !inputName) {
m.samplesLeft = Math.round(inputs.time.output[0] * m.sampleRate);
}
if (inputName === "crossfade" || !inputName) {
m.crossfadeStepSize = 1.0 / Math.round(inputs.crossfade.output[0] * m.sampleRate);
m.crossfadeLevel = inputs.crossfade.output[0] > 0.0 ? 1.0 : 0.0;
}
that.calculateStrides();
};
that.onInputChanged();
return that;
};
fluid.defaults("flock.ugen.change", {
rate: "audio",
inputs: {
/**
* An input unit generator to output initially.
* Can be audio, control, or constant rate.
*/
initial: 0.0,
/**
* The unit generator to output after the specified time.
* Can be audio, control, or constant rate.
*/
target: 0.0,
/**
* The sample-accurate time (in seconds) at which the
* the change should occur.
*/
time: 0.0,
/**
* The duration of the optional linear crossfade between
* the two values.
*/
crossfade: 0.0
},
ugenOptions: {
model: {
samplesLeft: 0.0,
crossfadeStepSize: 0,
crossfadeLevel: 0.0
},
strideInputs: ["initial", "target"]
}
});
>>>>>>>
/**
* Changes from the <code>initial</code> input to the <code>target</code> input
* at the specified <code>time</code>. An optional <code>crossfade</code> duration
* may be specified to linearly crossfade between the two inputs.
*
* Can be used to schedule sample-accurate changes.
* Note that the <code>target</code> input will be evaluated from the beginning,
* even if its value isn't yet output.
*
*/
flock.ugen.change = function (inputs, output, options) {
var that = flock.ugen(inputs, output, options);
that.gen = function (numSamps) {
var m = that.model,
initial = that.inputs.initial.output,
initialInc = m.strides.initial,
target = that.inputs.target.output,
targetInc = m.strides.target,
out = that.output,
samplesLeft = m.samplesLeft,
crossfadeLevel = m.crossfadeLevel,
val;
for (var i = 0, j = 0, k = 0; i < numSamps; i++, j += initialInc, k += targetInc) {
if (samplesLeft > 0) {
// We haven't hit the scheduled time yet.
val = initial[j];
samplesLeft--;
} else if (crossfadeLevel > 0.0) {
// We've hit the scheduled time, but we still need to peform the crossfade.
val = (initial[j] * crossfadeLevel) + (target[k] * (1.0 - crossfadeLevel));
crossfadeLevel -= m.crossfadeStepSize;
} else {
// We're done.
val = target[k];
}
out[i] = val;
}
m.samplesLeft = samplesLeft;
m.crossfadeLevel = crossfadeLevel;
};
that.onInputChanged = function (inputName) {
var m = that.model,
inputs = that.inputs;
if (inputName === "time" || !inputName) {
m.samplesLeft = Math.round(inputs.time.output[0] * m.sampleRate);
}
if (inputName === "crossfade" || !inputName) {
m.crossfadeStepSize = 1.0 / Math.round(inputs.crossfade.output[0] * m.sampleRate);
m.crossfadeLevel = inputs.crossfade.output[0] > 0.0 ? 1.0 : 0.0;
}
that.calculateStrides();
};
that.onInputChanged();
return that;
};
fluid.defaults("flock.ugen.change", {
rate: "audio",
inputs: {
/**
* An input unit generator to output initially.
* Can be audio, control, or constant rate.
*/
initial: 0.0,
/**
* The unit generator to output after the specified time.
* Can be audio, control, or constant rate.
*/
target: 0.0,
/**
* The sample-accurate time (in seconds) at which the
* the change should occur.
*/
time: 0.0,
/**
* The duration of the optional linear crossfade between
* the two values.
*/
crossfade: 0.0
},
ugenOptions: {
model: {
samplesLeft: 0.0,
crossfadeStepSize: 0,
crossfadeLevel: 0.0
},
strideInputs: ["initial", "target"]
}
}); |
<<<<<<<
cc.loadjs('menu_nodes/CCdomMenu.js');
cc.loadjs('menu_nodes/CCdomMenuItem.js');
=======
cc.loadjs('menu_nodes/CCMenu.js');
cc.loadjs('../CocosDenshion/SimpleAudioEngine.js');
//cc.loadjs('menu_nodes/ccMenuItem.js');
>>>>>>>
cc.loadjs('menu_nodes/CCdomMenu.js');
cc.loadjs('../CocosDenshion/SimpleAudioEngine.js');
cc.loadjs('menu_nodes/CCdomMenuItem.js'); |
<<<<<<<
uplift: 0,
=======
supplementalDamageBuff: 0,
//enemyBuffCount: 0,
enemyDebuffCount: 0,
>>>>>>>
uplift: 0,
supplementalDamageBuff: 0,
//enemyBuffCount: 0,
enemyDebuffCount: 0,
<<<<<<<
personalOugiDamageLimitBuff: 0.0,
personalUplift: 0.0,
=======
personalOugiDamageLimitBuff: 0.0,
personalSupplementalDamageBuff: 0,
>>>>>>>
personalOugiDamageLimitBuff: 0.0,
personalUplift: 0.0,
personalSupplementalDamageBuff: 0,
<<<<<<<
uplift: 0,
=======
supplementalDamageBuff: 0
>>>>>>>
uplift: 0,
supplementalDamageBuff: 0
<<<<<<<
//totals[key]["uplift"] = 0;
=======
totals[key]['covenant'] = null;
>>>>>>>
totals[key]['covenant'] = null; |
<<<<<<<
"通常攻撃を行わないが木之本桜の残りHPが多いほど味方全体の攻撃が大きくUP": {
"en": "15% boost to all allies ATK based on how high character HP is (various)",
"ja": "通常攻撃を行わないが木之本桜の残りHPが多いほど味方全体の攻撃が大きくUP",
"zh": "通常攻撃を行わないが木之本桜の残りHPが多いほど味方全体の攻撃が大きくUP",
},
"最大HPが15%減少 防御力が低いがイシュミールの残りHPが多いほど味方全体の攻撃が大きくUP": {
"en": "Has 15% less HP. %15 boost to all allies' ATK based on how high character HP is (various)",
"ja": "最大HPが15%減少 防御力が低いがイシュミールの残りHPが多いほど味方全体の攻撃が大きくUP",
"zh": "最大HPが15%減少 防御力が低いがイシュミールの残りHPが多いほど味方全体の攻撃が大きくUP",
},
=======
"トリプルアタック発動時に3回目の攻撃の5万与ダメージ上昇(ハレゼナ)": {
"en": "50,000 Supplemental DMG to the third hit of triple attacks. (Hallessena)",
"ja": "トリプルアタック発動時に3回目の攻撃の5万与ダメージ上昇(ハレゼナ)",
"zh": "トリプルアタック発動時に3回目の攻撃の5万与ダメージ上昇(ハレゼナ)",
},
>>>>>>>
"通常攻撃を行わないが木之本桜の残りHPが多いほど味方全体の攻撃が大きくUP": {
"en": "15% boost to all allies ATK based on how high character HP is (various)",
"ja": "通常攻撃を行わないが木之本桜の残りHPが多いほど味方全体の攻撃が大きくUP",
"zh": "通常攻撃を行わないが木之本桜の残りHPが多いほど味方全体の攻撃が大きくUP",
},
"最大HPが15%減少 防御力が低いがイシュミールの残りHPが多いほど味方全体の攻撃が大きくUP": {
"en": "Has 15% less HP. %15 boost to all allies' ATK based on how high character HP is (various)",
"ja": "最大HPが15%減少 防御力が低いがイシュミールの残りHPが多いほど味方全体の攻撃が大きくUP",
"zh": "最大HPが15%減少 防御力が低いがイシュミールの残りHPが多いほど味方全体の攻撃が大きくUP",
},
"トリプルアタック発動時に3回目の攻撃の5万与ダメージ上昇(ハレゼナ)": {
"en": "50,000 Supplemental DMG to the third hit of triple attacks. (Hallessena)",
"ja": "トリプルアタック発動時に3回目の攻撃の5万与ダメージ上昇(ハレゼナ)",
"zh": "トリプルアタック発動時に3回目の攻撃の5万与ダメージ上昇(ハレゼナ)",
}, |
<<<<<<<
var ougiDamage = module.exports.calcOugiDamage(summedAttack, totalSkillCoeff, criticalRatio, prof.enemyDefense, prof.defenseDebuff, enemyResistance, totals[key]["ougiRatio"], ougiDamageUP, damageUP, ougiDamageLimit);
=======
var ougiDamage = module.exports.calcOugiDamage(summedAttack, totalSkillCoeff, criticalRatio, prof.enemyDefense, prof.defenseDebuff, totals[key]["ougiRatio"], ougiDamageUP, damageUP, ougiDamageLimit);
var chainBurstSupplemental = 0;
//Supplemental Damage is a "static" damage that is added after damage cap/defense/etc is calculated.
var supplementalDamageArray = {};
var supplementalDamageBuff = Math.ceil(Math.max(totals[key]["supplementalDamageBuff"], buff["supplementalDamageBuff"]) * (1 + damageUP));
if (supplementalDamageBuff > 0) {
supplementalDamageArray["バフ"] = {
damage: supplementalDamageBuff,
damageWithoutCritical: supplementalDamageBuff,
ougiDamage: supplementalDamageBuff,
chainBurst: supplementalDamageBuff,
type: "other",
};
}
if (totals[key]["supplementalThirdHit"].length > 0) {
for (let key2 in totals[key]["supplementalThirdHit"]) {
let value = Math.ceil(taRate * totals[key]["supplementalThirdHit"][key2].value * (1 + damageUP));
supplementalDamageArray[totals[key]["supplementalThirdHit"][key2].source] = {
damage: value,
type: "third_hit",
//extraValue: taRate,
};
}
}
if (totals[key]['covenant'] === "impervious") {
let value = Math.ceil(30000 * (1 + damageUP));
supplementalDamageArray["不壊の誓約"] = {
damage: value,
damageWithoutCritical: value,
ougiDamage: value,
chainBurst: value,
threshold: 0.80,
type: "hp_based",
//extraValue: totals[key].remainHP,
};
} else if (totals[key]['covenant'] === 'victorious' && totals['Djeeta']['buffCount'] > 0) {
let djeetaBuffCount = Math.min(10, totals['Djeeta']['buffCount']);
let value = Math.ceil(djeetaBuffCount * 3000 * (1 + damageUP));
supplementalDamageArray["凱歌の誓約"] = {
damage: value,
damageWithoutCritical: value,
ougiDamage: value,
chainBurst: value,
type: "djeeta_buff_based",
extraValue: djeetaBuffCount,
};
} else if (totals[key]['covenant'] === 'contentious' && taRate > 0) {
let value = Math.ceil(taRate * 100000 * (1 + damageUP));
supplementalDamageArray["修羅の誓約"] = {
damage: value,
type: "third_hit",
//extraValue: taRate,
};
} else if (totals[key]['covenant'] === 'deleterious' && Object.keys(criticalArray).length > 0) {
let critRate = 1.0 - (isNaN(criticalArray[1.0]) ? 0 : Math.max(0, Math.min(1, criticalArray[1.0])));
let value = Math.ceil(critRate * 30000 * (1 + damageUP));
supplementalDamageArray["致命の誓約"] = {
damage: value,
damageWithoutCritical: 0,
ougiDamage: value,
chainBurst: 0,
type: "on_critical",
extraValue: (100 * critRate).toFixed(2),
};
} else if (totals[key]['covenant'] === 'calamitous') {
let enemyDebuffCount = Math.min(10, buff['enemyDebuffCount']);
let value = Math.ceil(enemyDebuffCount * 3000 * (1 + damageUP));
supplementalDamageArray["災禍の誓約"] = {
damage: value,
damageWithoutCritical: value,
ougiDamage: value,
chainBurst: value,
type: "boss_debuff_based",
extraValue: enemyDebuffCount,
};
}
>>>>>>>
var ougiDamage = module.exports.calcOugiDamage(summedAttack, totalSkillCoeff, criticalRatio, prof.enemyDefense, prof.defenseDebuff, enemyResistance, totals[key]["ougiRatio"], ougiDamageUP, damageUP, ougiDamageLimit);
var chainBurstSupplemental = 0;
//Supplemental Damage is a "static" damage that is added after damage cap/defense/etc is calculated.
var supplementalDamageArray = {};
var supplementalDamageBuff = Math.ceil(Math.max(totals[key]["supplementalDamageBuff"], buff["supplementalDamageBuff"]) * (1 + damageUP));
if (supplementalDamageBuff > 0) {
supplementalDamageArray["バフ"] = {
damage: supplementalDamageBuff,
damageWithoutCritical: supplementalDamageBuff,
ougiDamage: supplementalDamageBuff,
chainBurst: supplementalDamageBuff,
type: "other",
};
}
if (totals[key]["supplementalThirdHit"].length > 0) {
for (let key2 in totals[key]["supplementalThirdHit"]) {
let value = Math.ceil(taRate * totals[key]["supplementalThirdHit"][key2].value * (1 + damageUP));
supplementalDamageArray[totals[key]["supplementalThirdHit"][key2].source] = {
damage: value,
type: "third_hit",
//extraValue: taRate,
};
}
}
if (totals[key]['covenant'] === "impervious") {
let value = Math.ceil(30000 * (1 + damageUP));
supplementalDamageArray["不壊の誓約"] = {
damage: value,
damageWithoutCritical: value,
ougiDamage: value,
chainBurst: value,
threshold: 0.80,
type: "hp_based",
//extraValue: totals[key].remainHP,
};
} else if (totals[key]['covenant'] === 'victorious' && totals['Djeeta']['buffCount'] > 0) {
let djeetaBuffCount = Math.min(10, totals['Djeeta']['buffCount']);
let value = Math.ceil(djeetaBuffCount * 3000 * (1 + damageUP));
supplementalDamageArray["凱歌の誓約"] = {
damage: value,
damageWithoutCritical: value,
ougiDamage: value,
chainBurst: value,
type: "djeeta_buff_based",
extraValue: djeetaBuffCount,
};
} else if (totals[key]['covenant'] === 'contentious' && taRate > 0) {
let value = Math.ceil(taRate * 100000 * (1 + damageUP));
supplementalDamageArray["修羅の誓約"] = {
damage: value,
type: "third_hit",
//extraValue: taRate,
};
} else if (totals[key]['covenant'] === 'deleterious' && Object.keys(criticalArray).length > 0) {
let critRate = 1.0 - (isNaN(criticalArray[1.0]) ? 0 : Math.max(0, Math.min(1, criticalArray[1.0])));
let value = Math.ceil(critRate * 30000 * (1 + damageUP));
supplementalDamageArray["致命の誓約"] = {
damage: value,
damageWithoutCritical: 0,
ougiDamage: value,
chainBurst: 0,
type: "on_critical",
extraValue: (100 * critRate).toFixed(2),
};
} else if (totals[key]['covenant'] === 'calamitous') {
let enemyDebuffCount = Math.min(10, buff['enemyDebuffCount']);
let value = Math.ceil(enemyDebuffCount * 3000 * (1 + damageUP));
supplementalDamageArray["災禍の誓約"] = {
damage: value,
damageWithoutCritical: value,
ougiDamage: value,
chainBurst: value,
type: "boss_debuff_based",
extraValue: enemyDebuffCount,
};
}
<<<<<<<
var chainBurst = module.exports.calcChainBurst(buff["chainNumber"] * ougiDamage, buff["chainNumber"], module.exports.getTypeBonus(totals[key].element, prof.enemyElement), enemyResistance, chainDamageUP, chainDamageLimit);
// Normal attack * n times
var expectedCycleDamage = expectedTurn * expectedAttack * damage;
// Ougi + chain burst (buff ["chainNumber"] is 1 or more so division OK)
expectedCycleDamage += ougiDamage + chainBurst / buff["chainNumber"];
var expectedCycleDamagePerTurn = expectedCycleDamage / (expectedTurn + 1.0);
=======
var chainBurst = chainBurstSupplemental + module.exports.calcChainBurst(buff["chainNumber"] * ougiDamage, buff["chainNumber"], module.exports.getTypeBonus(totals[key].element, prof.enemyElement), chainDamageUP, chainDamageLimit);
>>>>>>>
var chainBurst = chainBurstSupplemental + module.exports.calcChainBurst(buff["chainNumber"] * ougiDamage, buff["chainNumber"], module.exports.getTypeBonus(totals[key].element, prof.enemyElement), enemyResistance, chainDamageUP, chainDamageLimit);
<<<<<<<
coeffs["enemyResistance"] = enemyResistance;
=======
coeffs["supplementalDamageArray"] = supplementalDamageArray;
>>>>>>>
coeffs["enemyResistance"] = enemyResistance;
coeffs["supplementalDamageArray"] = supplementalDamageArray;
<<<<<<<
var newDamage = module.exports.calcDamage(summedAttack, newTotalSkillCoeff, onedata[key].criticalRatio, prof.enemyDefense, prof.defenseDebuff, onedata[key].skilldata.enemyResistance, onedata[key].skilldata.additionalDamage, onedata[key].skilldata.damageUP, onedata[key].skilldata.damageLimit)
var newOugiDamage = module.exports.calcOugiDamage(summedAttack, newTotalSkillCoeff, onedata[key].criticalRatio, prof.enemyDefense, prof.defenseDebuff, onedata[key].skilldata.enemyResistance, onedata[key].ougiRatio, onedata[key].skilldata.ougiDamageUP, onedata[key].skilldata.damageUP, onedata[key].skilldata.ougiDamageLimit)
=======
var newDamage = module.exports.calcDamage(summedAttack, newTotalSkillCoeff, onedata[key].criticalRatio, prof.enemyDefense, prof.defenseDebuff, onedata[key].skilldata.additionalDamage, onedata[key].skilldata.damageUP, onedata[key].skilldata.damageLimit)
var newOugiDamage = module.exports.calcOugiDamage(summedAttack, newTotalSkillCoeff, onedata[key].criticalRatio, prof.enemyDefense, prof.defenseDebuff, onedata[key].ougiRatio, onedata[key].skilldata.ougiDamageUP, onedata[key].skilldata.damageUP, onedata[key].skilldata.ougiDamageLimit)
var chainBurstSupplemental = 0;
var newDamageWithoutCritical = 0; //just a placeholder. not to be used in any calculation.
[newDamage, newDamageWithoutCritical, newOugiDamage, chainBurstSupplemental] = supplemental.calcOthersDamage(onedata[key].skilldata.supplementalDamageArray, [newDamage, newDamageWithoutCritical, newOugiDamage, chainBurstSupplemental], {remainHP: (k+1)/100});
>>>>>>>
var newDamage = module.exports.calcDamage(summedAttack, newTotalSkillCoeff, onedata[key].criticalRatio, prof.enemyDefense, prof.defenseDebuff, onedata[key].skilldata.enemyResistance, onedata[key].skilldata.additionalDamage, onedata[key].skilldata.damageUP, onedata[key].skilldata.damageLimit)
var newOugiDamage = module.exports.calcOugiDamage(summedAttack, newTotalSkillCoeff, onedata[key].criticalRatio, prof.enemyDefense, prof.defenseDebuff, onedata[key].skilldata.enemyResistance, onedata[key].ougiRatio, onedata[key].skilldata.ougiDamageUP, onedata[key].skilldata.damageUP, onedata[key].skilldata.ougiDamageLimit)
var chainBurstSupplemental = 0;
var newDamageWithoutCritical = 0; //just a placeholder. not to be used in any calculation.
[newDamage, newDamageWithoutCritical, newOugiDamage, chainBurstSupplemental] = supplemental.calcOthersDamage(onedata[key].skilldata.supplementalDamageArray, [newDamage, newDamageWithoutCritical, newOugiDamage, chainBurstSupplemental], {remainHP: (k+1)/100});
<<<<<<<
var newChainBurst = module.exports.calcChainBurst(chainNumber * newOugiDamage, chainNumber, module.exports.getTypeBonus(onedata[key].element, prof.enemyElement), onedata[key].skilldata.enemyResistance, onedata[key].skilldata.chainDamageUP, onedata[key].skilldata.chainDamageLimit) / chainNumber;
var newExpectedCycleDamagePerTurn = (onedata[key].expectedTurn === Infinity)
? (onedata[key].expectedAttack * newDamage)
: (newChainBurst + newOugiDamage + onedata[key].expectedTurn * onedata[key].expectedAttack * newDamage) / (onedata[key].expectedTurn + 1);
=======
var newChainBurst = chainBurstSupplemental + module.exports.calcChainBurst(chainNumber * newOugiDamage, chainNumber, module.exports.getTypeBonus(onedata[key].element, prof.enemyElement), onedata[key].skilldata.chainDamageUP, onedata[key].skilldata.chainDamageLimit) / chainNumber;
>>>>>>>
var newChainBurst = chainBurstSupplemental + module.exports.calcChainBurst(chainNumber * newOugiDamage, chainNumber, module.exports.getTypeBonus(onedata[key].element, prof.enemyElement), onedata[key].skilldata.enemyResistance, onedata[key].skilldata.chainDamageUP, onedata[key].skilldata.chainDamageLimit) / chainNumber; |
<<<<<<<
<li className="list-group-item list-group-item-info">2016/10/01: PC版レイアウトの調整 (縦分割レイアウトの撤廃)</li>
=======
<li className="list-group-item list-group-item-info">2016/10/14: 武器テンプレートにマルメターノを追加/ブラックアックス解放に対応/召喚石加護量に66%を追加(蘭子用)</li>
>>>>>>>
<li className="list-group-item list-group-item-info">2016/10/14: 武器テンプレートにマルメターノを追加/ブラックアックス解放に対応/召喚石加護量に66%を追加(蘭子用)</li>
<li className="list-group-item list-group-item-info">2016/10/01: PC版レイアウトの調整 (縦分割レイアウトの撤廃)</li> |
<<<<<<<
<title>GitCodeShare</title>
<link rel="shortcut icon" href="/static/gchFavicon.ico" />
<link rel="stylesheet" href="/_next/static/style.css" />
=======
<link rel="shortcut icon" href="/static/favicon.ico" />
>>>>>>>
<title>GitCodeShare</title>
<link rel="shortcut icon" href="/static/gchFavicon.ico" /> |
<<<<<<<
const describe = (unit, cb) => tape(unit, assert => {
const end = assert.end.bind(assert);
const result = cb(description => ({
assert: ({ actual, expected, given, should = description }) =>
assert.same(
actual, expected,
`Given ${ given }: should ${ should }`
),
// We can probably use async/await to deal with most async tests,
// but we should probably still supply `end()` so users can do
// whatever they like
end
}));
if (result && result.then) result.then(end).catch(end);
=======
const describe = (unit = '', TestFunction = noop) => tape(unit, test => {
const end = () => test.end();
const assert = ({
// initialize values to undefined so TypeScript doesn't complain
given = undefined,
should = '',
actual = undefined,
expected = undefined
} = {}) => {
test.same(
actual, expected,
`Given ${given}: should ${should}`
);
};
const result = TestFunction(assert);
if (result && result.then) return result.then(end);
>>>>>>>
const describe = (unit = '', TestFunction = noop) => tape(unit, test => {
const end = () => test.end();
const assert = ({
// initialize values to undefined so TypeScript doesn't complain
given = undefined,
should = '',
actual = undefined,
expected = undefined
} = {}) => {
test.same(
actual, expected,
`Given ${given}: should ${should}`
);
};
const result = TestFunction(assert);
if (result && result.then) return result.then(end).catch(end); |
<<<<<<<
const TOGGLE_INFO_WINDOW = 'TOGGLE_INFO_WINDOW';
const SERVICES_FETCH = 'bananas';
const PODS_FETCH = 'apples';
=======
const DISPLAY_NODE_INFO = 'DISPLAY_NODE_INFO';
const HIDE_NODE_INFO = 'HIDE_NODE_INFO';
>>>>>>>
const DISPLAY_NODE_INFO = 'DISPLAY_NODE_INFO';
const HIDE_NODE_INFO = 'HIDE_NODE_INFO';
const SERVICES_FETCH = 'bananas';
const PODS_FETCH = 'apples';
<<<<<<<
TOGGLE_INFO_WINDOW,
SERVICES_FETCH,
PODS_FETCH
=======
DISPLAY_NODE_INFO,
HIDE_NODE_INFO
>>>>>>>
DISPLAY_NODE_INFO,
HIDE_NODE_INFO,
SERVICES_FETCH,
PODS_FETCH |
<<<<<<<
handleInput: function() {\n\
=======
handleChange: React.autoBind(function() {\n\
>>>>>>>
handleChange: function() {\n\ |
<<<<<<<
self.sendSliceCommand(newFilename, group);
}
=======
self.sendSliceCommand(newFilename);
},
error: function(jqXHR, textStatus) {
new PNotify({title: "Slicing failed", text: textStatus, type: "error", hide: false});
}
>>>>>>>
self.sendSliceCommand(newFilename, group);
},
error: function(jqXHR, textStatus) {
new PNotify({title: "Slicing failed", text: textStatus, type: "error", hide: false});
} |
<<<<<<<
, "you finished a hard problem and learned something new. doesn't it feel great?"
, "\"Nothing is impossible, the word itself says \'I\'m possible!\'\" - Audrey Hepburn"
, "Never leave house without your towel."
, "If 42 doesn't answer your question, try a prime number."
, "i'm pretty new to this."
, "You've got 99 problems but node ain't one"
, "Hakuna Matata!"
, "Reboot your life, everyday"
, "\"May the force be with you, Node\"-JavaScript"
, "Alright!! Way to go!!"
, “The expert at anything, was once a beginner.”
, "les petit ruisseaux font les grandes rivieres"
, "It's never too late!"
, "Who's awesome? YOU'RE AWESOME!!!"
, "did you ever know that you're my hero? you're everything i would like to be."
, "charge forward!"
, "one more step. you're almost there!"
, "what lovely code you have!"
=======
, "Meow, you're paw-some"
, "You totally did the thing!"
>>>>>>>
, "you finished a hard problem and learned something new. doesn't it feel great?"
, "\"Nothing is impossible, the word itself says \'I\'m possible!\'\" - Audrey Hepburn"
, "Never leave house without your towel."
, "If 42 doesn't answer your question, try a prime number."
, "i'm pretty new to this."
, "You've got 99 problems but node ain't one"
, "Hakuna Matata!"
, "Reboot your life, everyday"
, "\"May the force be with you, Node\"-JavaScript"
, "Alright!! Way to go!!"
, “The expert at anything, was once a beginner.”
, "les petit ruisseaux font les grandes rivieres"
, "It's never too late!"
, "Who's awesome? YOU'RE AWESOME!!!"
, "did you ever know that you're my hero? you're everything i would like to be."
, "charge forward!"
, "one more step. you're almost there!"
, "what lovely code you have!"
, "Meow, you're paw-some"
, "You totally did the thing!" |
<<<<<<<
, "you finished a hard problem and learned something new. doesn't it feel great?"
, "\"Nothing is impossible, the word itself says \'I\'m possible!\'\" - Audrey Hepburn"
, "Never leave house without your towel."
, "If 42 doesn't answer your question, try a prime number."
, "i'm pretty new to this."
, "You've got 99 problems but node ain't one"
, "Hakuna Matata!"
, "Reboot your life, everyday"
, "\"May the force be with you, Node\"-JavaScript"
, "Alright!! Way to go!!"
=======
, “The expert at anything, was once a beginner.”
>>>>>>>
, "you finished a hard problem and learned something new. doesn't it feel great?"
, "\"Nothing is impossible, the word itself says \'I\'m possible!\'\" - Audrey Hepburn"
, "Never leave house without your towel."
, "If 42 doesn't answer your question, try a prime number."
, "i'm pretty new to this."
, "You've got 99 problems but node ain't one"
, "Hakuna Matata!"
, "Reboot your life, everyday"
, "\"May the force be with you, Node\"-JavaScript"
, "Alright!! Way to go!!"
, “The expert at anything, was once a beginner.” |
<<<<<<<
, "you finished a hard problem and learned something new. doesn't it feel great?"
, "\"Nothing is impossible, the word itself says \'I\'m possible!\'\" - Audrey Hepburn"
, "Never leave house without your towel."
, "If 42 doesn't answer your question, try a prime number."
, "i'm pretty new to this."
, "You've got 99 problems but node ain't one"
, "Hakuna Matata!"
, "Reboot your life, everyday"
=======
, "\"May the force be with you, Node\"-JavaScript"
>>>>>>>
, "you finished a hard problem and learned something new. doesn't it feel great?"
, "\"Nothing is impossible, the word itself says \'I\'m possible!\'\" - Audrey Hepburn"
, "Never leave house without your towel."
, "If 42 doesn't answer your question, try a prime number."
, "i'm pretty new to this."
, "You've got 99 problems but node ain't one"
, "Hakuna Matata!"
, "Reboot your life, everyday"
, "\"May the force be with you, Node\"-JavaScript" |
<<<<<<<
, "If you can see this message it means you got it working and that's something to celebrate! ['hip','hip']!"
, "you are the best around."
, "computers are super hard, but you can defeat them!"
, "it's okay to need a break, everyone needs one!"
, "you got this."
, "whoah you're pretty good at this."
, "all the cats in the land bow down to your cool computer skills."
=======
, "getting started is hard, you did it, congratulations!"
, "all the cats in the land bow down to your cool computer skills"
, "If you can see this message it means you got it working and that's something to celebrate! ['hip','hip']!"
, "you are the best around."
, "computers are super hard, but you can defeat them!"
, "it's okay to need a break, everyone needs one!"
, "you got this."
, "whoah you're pretty good at this."
, "all the cats in the land bow down to your cool computer skills."
>>>>>>>
, "getting started is hard, you did it, congratulations!"
, "If you can see this message it means you got it working and that's something to celebrate! ['hip','hip']!"
, "you are the best around."
, "computers are super hard, but you can defeat them!"
, "it's okay to need a break, everyone needs one!"
, "you got this."
, "whoah you're pretty good at this."
, "all the cats in the land bow down to your cool computer skills." |
<<<<<<<
var changeEvent = $.Event('change')
changeEvent.initiator = 'tokenfield'
this.$element.val( this.getTokensList() ).trigger( changeEvent )
=======
if (triggerChange) {
this.$element.val( this.getTokensList() ).trigger('change')
}
>>>>>>>
var changeEvent = $.Event('change')
changeEvent.initiator = 'tokenfield'
if (triggerChange) {
this.$element.val( this.getTokensList() ).trigger( changeEvent )
} |
<<<<<<<
copy: {
main: {
files: [
{expand: true, src: ['app/package.manifest'], dest: '<%= dest %>', flatten: true},
{expand: true, src: ['app/views/archetype.html'], dest: '<%= dest %>/views', flatten: true}
]
},
nuget_prepare: {
files: [
{expand: true, cwd: '<%= dest %>/', src: ['**'], dest: '<%= package_temp_dir %>/nuget/content/', flatten: false},
]
}
},
=======
>>>>>>>
<<<<<<<
nugetpack: {
dist: {
src: '<%= package_temp_dir %>/nuget/package.nuspec',
dest: '<%= package_dir %>'
}
},
template: {
'nuget_manifest': {
'options': {
'data': {
version: '<%= version %>',
files: [{ path: '..\\..\\..\\<%= dest %>\\**', target: 'content\\App_Plugins\\Archetype'}]
}
},
'files': {
'<%= package_temp_dir %>/nuget/package.nuspec': ['<%= package_dir %>/nuget/package.nuspec']
}
}
},
clean: {
build: ['<%= dest %>'],
package_temp: ['<%= package_temp_dir %>']
}
=======
copy: {
build: {
files: [
{expand: true, cwd: 'app/', src: ['package.manifest'], dest: '<%= dest %>', flatten: true},
{expand: true, cwd: 'app/config/', src: ['config.views.js'], dest: '<%= dest %>/js', flatten: true},
{expand: true, cwd: 'app/views/', src: ['archetype.html', 'archetype.config.html'], dest: '<%= dest %>/views', flatten: true}
]
},
deploy: {
files: [
{expand: true, cwd: '<%= dest %>/', src: ['**'], dest: '<%= grunt.option("target") %>\\App_Plugins\\Archetype', flatten: false},
]
}
},
touch: {
options: {},
webconfig: {
src: ['<%= grunt.option("target") %>\\Web.config']
}
},
clean: ['<%= dest %>']
>>>>>>>
nugetpack: {
dist: {
src: '<%= package_temp_dir %>/nuget/package.nuspec',
dest: '<%= package_dir %>'
}
},
template: {
'nuget_manifest': {
'options': {
'data': {
version: '<%= version %>',
files: [{ path: '..\\..\\..\\<%= dest %>\\**', target: 'content\\App_Plugins\\Archetype'}]
}
},
'files': {
'<%= package_temp_dir %>/nuget/package.nuspec': ['<%= package_dir %>/nuget/package.nuspec']
}
}
},
clean: {
build: ['<%= dest %>'],
package_temp: ['<%= package_temp_dir %>']
},
copy: {
build: {
files: [
{expand: true, cwd: 'app/', src: ['package.manifest'], dest: '<%= dest %>', flatten: true},
{expand: true, cwd: 'app/config/', src: ['config.views.js'], dest: '<%= dest %>/js', flatten: true},
{expand: true, cwd: 'app/views/', src: ['archetype.html', 'archetype.config.html'], dest: '<%= dest %>/views', flatten: true}
]
},
deploy: {
files: [
{expand: true, cwd: '<%= dest %>/', src: ['**'], dest: '<%= grunt.option("target") %>\\App_Plugins\\Archetype', flatten: false},
]
},
nuget_prepare: {
files: [
{expand: true, cwd: '<%= dest %>/', src: ['**'], dest: '<%= package_temp_dir %>/nuget/content/', flatten: false},
]
}
},
touch: {
options: {},
webconfig: {
src: ['<%= grunt.option("target") %>\\Web.config']
}
} |
<<<<<<<
import Radio from '../packages/Radio/index.js'
import RadioGroup from '../packages/RadioGroup/index.js'
import Checkbox from '../packages/Checkbox/index.js'
import CheckboxGroup from '../packages/CheckboxGroup/index.js'
import ImagePreview from '../packages/ImagePreview/index.js'
=======
import Tooltip from '../packages/Tooltip/index.js'
>>>>>>>
import Radio from '../packages/Radio/index.js'
import RadioGroup from '../packages/RadioGroup/index.js'
import Checkbox from '../packages/Checkbox/index.js'
import CheckboxGroup from '../packages/CheckboxGroup/index.js'
import ImagePreview from '../packages/ImagePreview/index.js'
import Tooltip from '../packages/Tooltip/index.js'
<<<<<<<
Popup,
Radio,
RadioGroup,
Checkbox,
CheckboxGroup,
ImagePreview
=======
Popup,
Tooltip
>>>>>>>
Popup,
Radio,
RadioGroup,
Checkbox,
CheckboxGroup,
ImagePreview,
Tooltip |
<<<<<<<
Vue.component(Popup.name, Popup)
=======
Vue.component(Swipe.name, Swipe)
Vue.component(SwipeItem.name, SwipeItem)
Vue.component(Switch.name, Switch)
>>>>>>>
Vue.component(Popup.name, Popup)
Vue.component(Swipe.name, Swipe)
Vue.component(SwipeItem.name, SwipeItem)
Vue.component(Switch.name, Switch) |
<<<<<<<
import { getIn, setDifference } from '../../common/util'
=======
import { getIn, promiseReduce, promiseFirst } from '../../common/util'
>>>>>>>
import { getIn, setDifference, promiseReduce, promiseFirst } from '../../common/util'
<<<<<<<
describe('setDifference', () => {
it('should calculate the difference of two sets', () => {
const set1 = new Set([1, 2, 3, 4, 5])
const set2 = new Set([3, 4, 5, 6, 7])
const diff = setDifference(set1, set2)
expect(diff.size).to.equal(2)
expect([...diff]).to.deep.equal([1, 2])
})
it('should return the first set if there is no second', () => {
const set1 = new Set(["foo", "bar"])
const diff = setDifference(set1)
expect(diff).to.equal(set1)
})
it('should return an empty set if nothing is provided', () => {
const diff = setDifference()
expect(diff instanceof Set).to.be.true
expect(diff.size).to.equal(0)
})
})
=======
describe('promiseReduce', () => {
it('should async build a sum over an array', done => {
const numbers = [1, 2, 3, 4, 5]
const reducer = (sum, item) => new Promise(resolve => setTimeout(() => resolve(sum + item), 50))
promiseReduce(numbers, reducer, 5)
.then(sum => {
expect(sum).to.equal(20)
done()
})
.catch(done)
})
it('should reject when a reduce iteration throws', done => {
function reducer() {
throw new Error("boo")
}
const numbers = [1, 2, 3, 4, 5]
promiseReduce(numbers, reducer, 0).then(done).catch(() => done())
})
})
describe('promiseFirst', () => {
it('should reject if all reject', done => {
const promises = [Promise.reject(1), Promise.reject(2)]
promiseFirst(promises)
.then(() => {
done(1)
})
.catch(e => {
done()
})
})
it('should return the first resolving promise', done => {
const promises = [Promise.reject(1), Promise.resolve(2)]
promiseFirst(promises)
.then(x => {
expect(x).to.equal(2)
done()
})
.catch(done)
})
})
>>>>>>>
describe('setDifference', () => {
it('should calculate the difference of two sets', () => {
const set1 = new Set([1, 2, 3, 4, 5])
const set2 = new Set([3, 4, 5, 6, 7])
const diff = setDifference(set1, set2)
expect(diff.size).to.equal(2)
expect([...diff]).to.deep.equal([1, 2])
})
it('should return the first set if there is no second', () => {
const set1 = new Set(["foo", "bar"])
const diff = setDifference(set1)
expect(diff).to.equal(set1)
})
it('should return an empty set if nothing is provided', () => {
const diff = setDifference()
expect(diff instanceof Set).to.be.true
expect(diff.size).to.equal(0)
})
})
describe('promiseReduce', () => {
it('should async build a sum over an array', done => {
const numbers = [1, 2, 3, 4, 5]
const reducer = (sum, item) => new Promise(resolve => setTimeout(() => resolve(sum + item), 50))
promiseReduce(numbers, reducer, 5)
.then(sum => {
expect(sum).to.equal(20)
done()
})
.catch(done)
})
it('should reject when a reduce iteration throws', done => {
function reducer() {
throw new Error("boo")
}
const numbers = [1, 2, 3, 4, 5]
promiseReduce(numbers, reducer, 0).then(done).catch(() => done())
})
})
describe('promiseFirst', () => {
it('should reject if all reject', done => {
const promises = [Promise.reject(1), Promise.reject(2)]
promiseFirst(promises)
.then(() => {
done(1)
})
.catch(e => {
done()
})
})
it('should return the first resolving promise', done => {
const promises = [Promise.reject(1), Promise.resolve(2)]
promiseFirst(promises)
.then(x => {
expect(x).to.equal(2)
done()
})
.catch(done)
})
}) |
<<<<<<<
if (this.isOpen()) {
// check if modal is bigger than screen height
this.checkOverflow();
}
=======
return this;
>>>>>>>
if (this.isOpen()) {
// check if modal is bigger than screen height
this.checkOverflow();
}
return this; |
<<<<<<<
this.pool = this.mysql.createPool(this.config);
this.pool.getConnection((err) => {
if (err) {
this.logger.emergency('Failed to open mysql connection', this.config);
}
return cb(err);
});
=======
// Create one connection
this.pool.getConnection((err) => {
return cb(err);
});
>>>>>>>
// Create one connection
this.pool.getConnection((err) => {
if (err) {
this.logger.emergency('Failed to open mysql connection', this.config);
}
return cb(err);
}); |
<<<<<<<
await sr.deposit({ value: deposit });
let known_deposit = await rhub.balances(sr.address);
assert.equal(deposit, known_deposit);
=======
await sr.deposit({value: deposit});
// let known_deposit = await rhub.balances(sr.address);
// assert.ok(known_deposit>= deposit, "deposited "+deposit+" but found only "+known_deposit);
>>>>>>>
await sr.deposit({value: deposit});
// let known_deposit = await rhub.balances(sr.address);
// assert.ok(known_deposit>= deposit, "deposited "+deposit+" but found only "+known_deposit);
<<<<<<<
=======
>>>>>>> |
<<<<<<<
if(errorCode instanceof Error) {
debug("Error occurred with trace:", errorCode.stack);
}
if (typeof this.options.errorCallback == 'function') {
=======
if (notification && typeof notification.errorCallback == 'function' ) {
notification.errorCallback(errorCode);
} else if (typeof this.options.errorCallback == 'function') {
>>>>>>>
if(errorCode instanceof Error) {
debug("Error occurred with trace:", errorCode.stack);
}
if (notification && typeof notification.errorCallback == 'function' ) {
notification.errorCallback(errorCode);
} else if (typeof this.options.errorCallback == 'function') { |
<<<<<<<
invariant(component != null, "Cannot load component: %s", componentPath);
render(React.createElement(component, props), callback);
=======
invariant(
component != null,
'Cannot load component: %s',
componentPath
)
render(
React.createElement(component, props),
function (err, html) {
callback(err, html, component.context)
}
)
>>>>>>>
invariant(component != null, "Cannot load component: %s", componentPath);
render(React.createElement(component, props), function(err, html) {
callback(err, html, component.context);
});
<<<<<<<
handleRequest(workingDir, request, function(error, html) {
=======
handleRequest(workingDir, request, function (error, html, context) {
>>>>>>>
handleRequest(workingDir, request, function(error, html, context) {
<<<<<<<
callback(null, JSON.stringify({ html: html }));
=======
callback(null, JSON.stringify({ html: html, context: context }))
>>>>>>>
callback(null, JSON.stringify({ html: html, context: context })); |
<<<<<<<
case "url":
if(context.options && context.options.rewriteUrl) {
=======
case 'url':
if(context.options.rewriteUrl) {
>>>>>>>
case 'url':
if(context.options && context.options.rewriteUrl) {
<<<<<<<
css.walkRules(function(rule) {
if(rule.parent.type === "atrule" && /keyframes$/.test(rule.parent.name)) {
=======
css.eachRule(function(rule) {
if(rule.parent.type === 'atrule' && /keyframes$/.test(rule.parent.name)) {
>>>>>>>
css.walkRules(function(rule) {
if(rule.parent.type === 'atrule' && /keyframes$/.test(rule.parent.name)) { |
<<<<<<<
export const LOGIN_ERROR = "LOGIN_ERROR";
export const LOGOUT_ERROR = "LOGOUT_ERROR";
export const PROGRESS = "LOGOUT_ERROR";
export const ACTION_REPOSITORIES_LIST = "ACTION_REPOSITORIES_LIST";
export const ACTION_LIST_ERROR = "ACTION_LIST_ERROR";
export const ACTION_LIST_SUCCESS = "ACTION_LIST_SUCCESS";
=======
export const LOGIN_ERROR= "LOGIN_ERROR";
export const LOGOUT_ERROR= "LOGOUT_ERROR";
export const PROGRESS= "PROGRESS";
>>>>>>>
export const LOGIN_ERROR = "LOGIN_ERROR";
export const LOGOUT_ERROR = "LOGOUT_ERROR";
export const PROGRESS = "PROGRESS";
export const ACTION_REPOSITORIES_LIST = "ACTION_REPOSITORIES_LIST";
export const ACTION_LIST_ERROR = "ACTION_LIST_ERROR";
export const ACTION_LIST_SUCCESS = "ACTION_LIST_SUCCESS"; |
<<<<<<<
export const ACTION_LIST_SUCCESS = "ACTION_LIST_ERROR";
export const ACTION_README = "ACTION_README";
export const ACTION_README_SUCCESS = "ACTION_README_SUCCESS";
export const ACTION_README_ERROR = "ACTION_README_ERROR";
=======
export const ACTION_LIST_SUCCESS = "ACTION_LIST_SUCCESS";
>>>>>>>
export const ACTION_LIST_SUCCESS = "ACTION_LIST_SUCCESS";
export const ACTION_README = "ACTION_README";
export const ACTION_README_SUCCESS = "ACTION_README_SUCCESS";
export const ACTION_README_ERROR = "ACTION_README_ERROR"; |
<<<<<<<
persistStore(store, {storage: AsyncStorage, blacklist: []});
return {...store, runSaga: [sagaMiddleware.run(loginSaga.loginFlow), sagaMiddleware.run(listSaga.listFlow)]};
=======
persistStore(store, {storage: AsyncStorage, blacklist: ['root']});
return {...store, runSaga: sagaMiddleware.run(loginSaga.loginFlow)};
>>>>>>>
persistStore(store, {storage: AsyncStorage, blacklist: ['root']});
return {...store, runSaga: [sagaMiddleware.run(loginSaga.loginFlow), sagaMiddleware.run(listSaga.listFlow)]}; |
<<<<<<<
...Strong.propTypes,
appearance: PropTypes.oneOf(Object.keys(FillAppearances.default))
.isRequired,
=======
...Text.propTypes,
appearance: PropTypes.oneOf(Object.keys(FillAppearances.default)).isRequired
>>>>>>>
...Strong.propTypes,
appearance: PropTypes.oneOf(Object.keys(FillAppearances.default)).isRequired |
<<<<<<<
<h1>Comparaison des différents régimes de cotisation</h1>
<p>
Calcul du{' '}
<strong>
revenu du travailleur indépendant ou dirigeant d'entreprise
</strong>
, en fonction de son choix de régime social. Nous faisons les hypothèses
suivantes : tout le chiffre d'affaires sert à payer le dirigeant. L'impôt
est calculé pour un célibataire sans enfants et sans autre revenu. Version
beta, beaucoup d'améliorations à venir !
</p>
<SimpleSimulation>
<ComparativeTargets />
</SimpleSimulation>
=======
<h1>
Comparaison des régimes <small id="betaTag">alpha</small>
</h1>
<header>{createMarkdownDiv(ComparaisonConfig.titre)}</header>
<ComparativeSimulation />
>>>>>>>
<h1>
Comparaison des régimes <small id="betaTag">alpha</small>
</h1>
<header>{createMarkdownDiv(ComparaisonConfig.titre)}</header>
<SimpleSimulation>
<ComparativeTargets />
</SimpleSimulation> |
<<<<<<<
var _ = require('underscore'),
Config = require('root/config'),
App = require('core/app'),
RegionManager = require( 'core/region-manager' ),
Stats = require('core/stats'),
ThemeApp = require('core/theme-app'),
Hooks = require('core/lib/hooks');
=======
var _ = require('underscore'),
Config = require('root/config'),
App = require('core/app'),
Stats = require('core/stats'),
Addons = require( 'core/addons-internal' ),
ThemeApp = require('core/theme-app');
>>>>>>>
var _ = require('underscore'),
Config = require('root/config'),
App = require('core/app'),
RegionManager = require( 'core/region-manager' ),
Stats = require('core/stats'),
Addons = require('core/addons-internal'),
ThemeApp = require('core/theme-app'),
Hooks = require('core/lib/hooks');
<<<<<<<
/**
* Retrieves the path to the current theme
* @returns string Path to the current theme
*/
themeTplTags.getThemePath = function() {
return 'themes/'+ Config.theme;
};
/**
* Retrieves menu items, in the same format as in the menu.html template
* @returns {Array of JSON objects} Menu items
*/
themeTplTags.getMenuItems = function() {
var menu_items = [];
var menu_view = RegionManager.getMenuView();
if ( menu_view ) {
menu_items = menu_view.menu.toJSON();
}
return menu_items;
};
=======
/**********************************************
* Addons
*/
/**
* Checks if an addon is active
* @param string addon_slug
* @returns Boolean True if the addon is active
*/
themeTplTags.addonIsActive = function( addon_slug ) {
return Addons.isActive( addon_slug );
};
>>>>>>>
/**
* Retrieves the path to the current theme
* @returns string Path to the current theme
*/
themeTplTags.getThemePath = function() {
return 'themes/'+ Config.theme;
};
/**
* Retrieves menu items, in the same format as in the menu.html template
* @returns {Array of JSON objects} Menu items
*/
themeTplTags.getMenuItems = function() {
var menu_items = [];
var menu_view = RegionManager.getMenuView();
if ( menu_view ) {
menu_items = menu_view.menu.toJSON();
}
return menu_items;
};
/**********************************************
* Addons
*/
/**
* Checks if an addon is active
* @param string addon_slug
* @returns Boolean True if the addon is active
*/
themeTplTags.addonIsActive = function( addon_slug ) {
return Addons.isActive( addon_slug );
}; |
<<<<<<<
export Upload from './Upload';
export Tab from './Tab';
=======
export Upload from './Upload';
export Message from './Message';
>>>>>>>
export Upload from './Upload';
export Tab from './Tab';
export Message from './Message'; |
<<<<<<<
// {
// key: 'popover',
// name: '气泡卡片',
// module: () => import('@/components/popover/popover.md'),
// style: false,
// },
{
key: 'popconfirm',
name: '气泡确认框',
module: () => import('@/components/popconfirm/demo.md'),
style: true,
},
=======
{
key: 'popover',
name: '气泡卡片',
module: () => import('@/components/popover/demo.md'),
style: true,
},
// {
// key: 'popconfirm',
// name: '气泡确认框',
// module: () => import('@/components/popconfirm/popconfirm.md'),
// style: false,
// },
>>>>>>>
{
key: 'popover',
name: '气泡卡片',
module: () => import('@/components/popover/demo.md'),
style: true,
},
{
key: 'popconfirm',
name: '气泡确认框',
module: () => import('@/components/popconfirm/demo.md'),
style: true,
}, |
<<<<<<<
const iter = require('iter-tools/iter')
const asyncIter = require('iter-tools/async-iter')
const tee = require('iter-tools/tee')
const asyncTee = require('iter-tools/async-tee')
iter.silence()
asyncIter.silence()
tee.silence()
asyncTee.silence()
=======
>>>>>>>
const tee = require('iter-tools/tee')
const asyncTee = require('iter-tools/async-tee')
tee.silence()
asyncTee.silence() |
<<<<<<<
mod.Stack = Sk.misceval.buildClass(mod, function($gbl, $loc) {
$loc.__init__ = new Sk.builtin.func(function(self) {
self.stack = [];
// Make a new attribute named 'int_value'
Sk.abstr.sattr(self, 'int_value', Sk.ffi.remapToPy(5), true);
var aChild = Sk.misceval.callsimOrSuspend(mod.ChildStack);
Sk.abstr.sattr(self, 'child', aChild, true);
=======
//Enhanced feedback functions and objects starts here
//variable used for easy reidentification of nodes so we don't have to recreate every node type
var flatTree = [];
//variable used for accumulating interrupting feedback AS A LIST OF PYTHON OBJECTS
var accInterruptFeedback = [];
//variable used for accumulating complementary feedback AS A LIST OF PYTHON OBJECTS
var accCompFeedback = [];
/**
* Given source code as a string, generate a flatTree and store it in the local variable.
* This function is meant to be used to avoid extra coding by recreating every AST node type
*
* @param {String} source - Python source code.
*/
function generateFlatTree(source){
if (!(source in parses)) {
var parse = Sk.parse("__main__", source);
parses[source] = Sk.astFromParse(parse.cst, "__main__", parse.flags);
}
//Tree's already been built, don't do anything else
if(flatTree.length > 0){
return;
}
var ast = parses[source];
var visitor = new NodeVisitor();
visitor.visit = function(node){
flatTree.push(node);
/** Visit a node. **/
var method_name = 'visit_' + node._astname;
console.log(flatTree.length - 1 + ": " + node._astname)
if (method_name in this) {
return this[method_name](node);
} else {
return this.generic_visit(node);
}
}
visitor.visit(ast);
}
function isSkBuiltin(obj){
return (obj instanceof Sk.builtin.dict) ||
(obj instanceof Sk.builtin.list) ||
(obj instanceof Sk.builtin.tuple) ||
(obj instanceof Sk.builtin.bool) ||
(obj instanceof Sk.builtin.int_) ||
(obj instanceof Sk.builtin.float_) ||
(obj instanceof Sk.builtin.lng);
}
/**
* Should theoretically belong in Sk.ffi, but I put it here instead to not mess up the skulpt files
* like the normal Sk.ffi.remapToPy, it doesn't work for functions or more complex objects, but it handles
* cases where the types in obj ore a mix of python SIMPLE objects and SIMPLE normal javascript objects
* @param {object} obj - the object to be converted
* @return {Sk.builtin.???} - returns the corresponding python object, dropping all functions and things it can't convert
**/
function mixedRemapToPy(obj){
var k;
var kvs;
var i;
var arr;
if(isSkBuiltin(obj)){
return obj;
}else if (Object.prototype.toString.call(obj) === "[object Array]") {
arr = [];
for (i = 0; i < obj.length; ++i) {
var subval = obj[i];
if(!isSkBuiltin(subval)){
arr.push(Sk.ffi.mixedRemapToPy(subval));
}else{
arr.push(subval)
}
}
return new Sk.builtin.list(arr);
} else if (obj === null) {
return Sk.builtin.none.none$;
} else if (typeof obj === "object") {
if(!isSkBuiltin(obj)){
kvs = [];
for (k in obj) {
if(!isSkBuiltin(k)){
kvs.push(Sk.ffi.mixedRemapToPy(k));
}else{
kvs.push(k);
}
kvs.push(Sk.ffi.mixedRemapToPy(obj[k]));
}
return new Sk.builtin.dict(kvs);
}else{
return obj;
}
} else if (typeof obj === "string") {
return new Sk.builtin.str(obj);
} else if (typeof obj === "number") {
return Sk.builtin.assk$(obj);
} else if (typeof obj === "boolean") {
return new Sk.builtin.bool(obj);
}
}
/**
* Given source code as a string, generates the mock AST nodes the instructor will be using
* note that this function doesn't return anything.
* @param {String} source - Python source code.
* @param {mod.AstNode} - returns the python version of the root node
**/
mod.parse_program = new Sk.builtin.func(function(source) {
Sk.builtin.pyCheckArgs("parse_program", arguments, 1, 1);
Sk.builtin.pyCheckType("source", "string", Sk.builtin.checkString(source));
source = source.v;
generateFlatTree(source);
return Sk.misceval.callsimOrSuspend(mod.AstNode, 0);
});
/**@TODO: make this function affect the UI
* Given a feedback string, records the corrective feedback string for later printing
* @param {string} feedback - the piece of feedback to save
**/
mod.add_interrupt_feedback = new Sk.builtin.func(function(feedback) {
Sk.builtin.pyCheckArgs("add_iterupt_feedback", arguments, 1, 1);
Sk.builtin.pyCheckType("feedback", "string", Sk.builtin.checkString(feedback));
accInterruptFeedback.push(feedback);
});
/**@TODO: make this function affect the UI
* Given a feedback string, records the complementary feedback string for later printing
* @param {string} feedback - the piece of feedback to save
**/
mod.add_comp_feedback = new Sk.builtin.func(function(feedback) {
Sk.builtin.pyCheckArgs("add_comp_feedback", arguments, 1, 1);
Sk.builtin.pyCheckType("feedback", "string", Sk.builtin.checkString(feedback));
accCompFeedback.push(feedback);
});
/**
* This resolves all of the feedback and posts it to the appropriate places
* @TODO: actually implement this functionality
**/
mod.post_feedback = new Sk.builtin.func(function() {
var allFeedback = accInterruptFeedback.concat(accCompFeedback);
completePythonAll = Sk.builtin.list(allFeedback);
jsPureFeedback = Sk.ffi.remapToJs(completePythonAll);
console.log("" + jsPureFeedback);
});
/**
* Python representation of the AST nodes w/o recreating the entire thing. This class assumes that parse_program
* is called first
* @property {number} self.id - the javascript id number of this object
* @property {string} self.type - the javascript string representing the type of the node (_astname)
* @property {Sk.abstr.(s/g)attr} id - the python version of self.id
* @property {Sk.abstr.(s/g)attr} type - the python version of self.type
**/
mod.AstNode = Sk.misceval.buildClass(mod, function($gbl, $loc) {
$loc.__init__ = new Sk.builtin.func(function(self, id) {
self.id = Sk.ffi.remapToJs(id);//note that id is passed from PYTHON as a default type already
self.type = flatTree[self.id]._astname;
Sk.abstr.sattr(self, 'type', Sk.ffi.remapToPy(self.type), true);
var thisNode = flatTree[self.id];
>>>>>>>
/**@TODO: make this function affect the UI
* Given a feedback string, records the corrective feedback string for later printing
* @param {string} feedback - the piece of feedback to save
**/
mod.add_interrupt_feedback = new Sk.builtin.func(function(feedback) {
Sk.builtin.pyCheckArgs("add_iterupt_feedback", arguments, 1, 1);
Sk.builtin.pyCheckType("feedback", "string", Sk.builtin.checkString(feedback));
accInterruptFeedback.push(feedback);
});
/**@TODO: make this function affect the UI
* Given a feedback string, records the complementary feedback string for later printing
* @param {string} feedback - the piece of feedback to save
**/
mod.add_comp_feedback = new Sk.builtin.func(function(feedback) {
Sk.builtin.pyCheckArgs("add_comp_feedback", arguments, 1, 1);
Sk.builtin.pyCheckType("feedback", "string", Sk.builtin.checkString(feedback));
accCompFeedback.push(feedback);
});
/**
* This resolves all of the feedback and posts it to the appropriate places
* @TODO: actually implement this functionality
**/
mod.post_feedback = new Sk.builtin.func(function() {
var allFeedback = accInterruptFeedback.concat(accCompFeedback);
completePythonAll = Sk.builtin.list(allFeedback);
jsPureFeedback = Sk.ffi.remapToJs(completePythonAll);
console.log("" + jsPureFeedback);
});
/**
* Python representation of the AST nodes w/o recreating the entire thing. This class assumes that parse_program
* is called first
* @property {number} self.id - the javascript id number of this object
* @property {string} self.type - the javascript string representing the type of the node (_astname)
* @property {Sk.abstr.(s/g)attr} id - the python version of self.id
* @property {Sk.abstr.(s/g)attr} type - the python version of self.type
**/
mod.AstNode = Sk.misceval.buildClass(mod, function($gbl, $loc) {
$loc.__init__ = new Sk.builtin.func(function(self, id) {
self.id = Sk.ffi.remapToJs(id);//note that id is passed from PYTHON as a default type already
self.type = flatTree[self.id]._astname;
Sk.abstr.sattr(self, 'type', Sk.ffi.remapToPy(self.type), true);
var thisNode = flatTree[self.id]; |
<<<<<<<
<div>
<AutoSizer disableHeight>
<FlexTable
ref='Table'
headerClassName={styles.headerColumn}
headerHeight={headerHeight}
height={height}
noRowsRenderer={this._noRowsRenderer}
rowClassName={::this._rowClassName}
rowHeight={useDynamicRowHeight ? this._getRowHeight : rowHeight}
rowGetter={rowGetter}
rowsCount={rowsCount}
scrollToIndex={scrollToIndex}
sort={this._sort}
sortBy={sortBy}
sortDirection={sortDirection}
width={0}
>
<FlexColumn
label='Index'
cellDataGetter={
(dataKey, rowData, columnData) => rowData.index
}
dataKey='index'
width={50}
/>
<FlexColumn
label='Name'
dataKey='name'
width={90}
/>
<FlexColumn
width={210}
disableSort
label='The description label is really long so that it will be truncated'
dataKey='random'
cellClassName={styles.exampleColumn}
cellRenderer={
(cellData, cellDataKey, rowData, rowIndex, columnData) => cellData
}
flexGrow={1}
/>
</FlexTable>
</AutoSizer>
</div>
=======
<FlexTable
ref='Table'
className={styles.FlexTable}
headerClassName={styles.headerColumn}
headerHeight={headerHeight}
height={height}
noRowsRenderer={this._noRowsRenderer}
rowClassName={::this._rowClassName}
rowHeight={useDynamicRowHeight ? this._getRowHeight : rowHeight}
rowGetter={rowGetter}
rowsCount={rowsCount}
scrollToIndex={scrollToIndex}
sort={this._sort}
sortBy={sortBy}
sortDirection={sortDirection}
width={430}
>
<FlexColumn
label='ID'
cellDataGetter={
(dataKey, rowData, columnData) => rowData.index
}
dataKey='index'
disableSort={!this._isSortEnabled()}
width={50}
/>
<FlexColumn
label='Name'
dataKey='name'
disableSort={!this._isSortEnabled()}
width={90}
/>
<FlexColumn
width={210}
disableSort
label='The description label is really long so that it will be truncated'
dataKey='random'
cellClassName={styles.exampleColumn}
cellRenderer={
(cellData, cellDataKey, rowData, rowIndex, columnData) => cellData
}
flexGrow={1}
/>
</FlexTable>
>>>>>>>
<div>
<AutoSizer disableHeight>
<FlexTable
ref='Table'
headerClassName={styles.headerColumn}
headerHeight={headerHeight}
height={height}
noRowsRenderer={this._noRowsRenderer}
rowClassName={::this._rowClassName}
rowHeight={useDynamicRowHeight ? this._getRowHeight : rowHeight}
rowGetter={rowGetter}
rowsCount={rowsCount}
scrollToIndex={scrollToIndex}
sort={this._sort}
sortBy={sortBy}
sortDirection={sortDirection}
width={0}
>
<FlexColumn
label='Index'
cellDataGetter={
(dataKey, rowData, columnData) => rowData.index
}
dataKey='index'
disableSort={!this._isSortEnabled()}
width={50}
/>
<FlexColumn
label='Name'
dataKey='name'
disableSort={!this._isSortEnabled()}
width={90}
/>
<FlexColumn
width={210}
disableSort
label='The description label is really long so that it will be truncated'
dataKey='random'
cellClassName={styles.exampleColumn}
cellRenderer={
(cellData, cellDataKey, rowData, rowIndex, columnData) => cellData
}
flexGrow={1}
/>
</FlexTable>
</AutoSizer>
</div> |
<<<<<<<
getOverscanIndices,
=======
computeCellMetadataAndUpdateScrollOffsetHelper,
createCallbackMemoizer,
>>>>>>>
computeCellMetadataAndUpdateScrollOffsetHelper,
createCallbackMemoizer,
getOverscanIndices, |
<<<<<<<
import Grid from '../Grid'
=======
import {
computeCellMetadataAndUpdateScrollOffsetHelper,
createCallbackMemoizer,
getOverscanIndices,
getUpdatedOffsetForIndex,
getVisibleCellIndices,
initCellMetadata,
updateScrollIndexHelper
} from '../utils'
import cn from 'classnames'
import raf from 'raf'
>>>>>>>
import Grid from '../Grid'
<<<<<<<
=======
constructor (props, context) {
super(props, context)
this.state = {
computeCellMetadataOnNextUpdate: false,
isScrolling: false,
scrollTop: 0
}
// Invokes onRowsRendered callback only when start/stop row indices change
this._onRowsRenderedMemoizer = createCallbackMemoizer()
this._onScrollMemoizer = createCallbackMemoizer(false)
// Bind functions to instance so they don't lose context when passed around
this._computeCellMetadata = this._computeCellMetadata.bind(this)
this._invokeOnRowsRenderedHelper = this._invokeOnRowsRenderedHelper.bind(this)
this._onKeyPress = this._onKeyPress.bind(this)
this._onScroll = this._onScroll.bind(this)
this._updateScrollTopForScrollToIndex = this._updateScrollTopForScrollToIndex.bind(this)
}
>>>>>>>
<<<<<<<
onRowsRendered,
onScroll,
rowHeight,
rowRenderer,
=======
overscanRowsCount,
>>>>>>>
onRowsRendered,
onScroll,
rowHeight,
rowRenderer,
overscanRowsCount,
<<<<<<<
const classNames = cn('VirtualScroll', className)
=======
const {
isScrolling,
scrollTop
} = this.state
let childrenToDisplay = []
// Render only enough rows to cover the visible (vertical) area of the table.
if (height > 0) {
let {
start,
stop
} = getVisibleCellIndices({
cellsCount: rowsCount,
cellMetadata: this._cellMetadata,
containerSize: height,
currentOffset: scrollTop
})
// Store for onRowsRendered callback in componentDidUpdate
this._renderedStartIndex = start
this._renderedStopIndex = stop
const {
overscanStartIndex,
overscanStopIndex
} = getOverscanIndices({
cellsCount: rowsCount,
overscanCellsCount: overscanRowsCount,
startIndex: start,
stopIndex: stop
})
start = overscanStartIndex
stop = overscanStopIndex
for (let i = start; i <= stop; i++) {
let datum = this._cellMetadata[i]
let child = rowRenderer(i)
child = (
<div
key={i}
className='VirtualScroll__row'
style={{
top: datum.offset,
width: '100%',
height: this._getRowHeight(i)
}}
>
{child}
</div>
)
childrenToDisplay.push(child)
}
}
>>>>>>>
const classNames = cn('VirtualScroll', className)
<<<<<<<
<Grid
ref='Grid'
className={classNames}
columnWidth={width}
columnsCount={1}
height={height}
noContentRenderer={noRowsRenderer}
onScroll={({ scrollTop }) => onScroll({ scrollTop })}
onSectionRendered={({ rowStartIndex, rowStopIndex }) => onRowsRendered({
startIndex: rowStartIndex,
stopIndex: rowStopIndex
})}
renderCell={({ columnIndex, rowIndex }) => rowRenderer(rowIndex)}
rowHeight={rowHeight}
rowsCount={rowsCount}
scrollToRow={scrollToIndex}
width={width}
/>
=======
<div
ref='scrollingContainer'
className={cn('VirtualScroll', className)}
onKeyDown={this._onKeyPress}
onScroll={this._onScroll}
tabIndex={0}
style={{
height: height
}}
>
{rowsCount > 0 &&
<div
className='VirtualScroll__innerScrollContainer'
style={{
height: this._getTotalRowsHeight(),
maxHeight: this._getTotalRowsHeight(),
pointerEvents: isScrolling ? 'none' : 'auto'
}}
>
{childrenToDisplay}
</div>
}
{rowsCount === 0 &&
noRowsRenderer()
}
</div>
>>>>>>>
<Grid
ref='Grid'
className={classNames}
columnWidth={width}
columnsCount={1}
height={height}
noContentRenderer={noRowsRenderer}
onScroll={({ scrollTop }) => onScroll({ scrollTop })}
onSectionRendered={({ rowOverscanStartIndex, rowOverscanStopIndex, rowStartIndex, rowStopIndex }) => onRowsRendered({
overscanStartIndex: rowOverscanStartIndex,
overscanStopIndex: rowOverscanStopIndex,
startIndex: rowStartIndex,
stopIndex: rowStopIndex
})}
overscanRowsCount={overscanRowsCount}
renderCell={({ columnIndex, rowIndex }) => rowRenderer(rowIndex)}
rowHeight={rowHeight}
rowsCount={rowsCount}
scrollToRow={scrollToIndex}
width={width}
/>
<<<<<<<
=======
/* ---------------------------- Helper methods ---------------------------- */
_computeCellMetadata (props) {
const { rowHeight, rowsCount } = props
this._cellMetadata = initCellMetadata({
cellsCount: rowsCount,
size: rowHeight
})
}
_getRowHeight (index) {
const { rowHeight } = this.props
return rowHeight instanceof Function
? rowHeight(index)
: rowHeight
}
_getTotalRowsHeight () {
if (this._cellMetadata.length === 0) {
return 0
}
const datum = this._cellMetadata[this._cellMetadata.length - 1]
return datum.offset + datum.size
}
_invokeOnRowsRenderedHelper () {
const { onRowsRendered, overscanRowsCount, rowsCount } = this.props
const startIndex = this._renderedStartIndex
const stopIndex = this._renderedStopIndex
const {
overscanStartIndex,
overscanStopIndex
} = getOverscanIndices({
cellsCount: rowsCount,
overscanCellsCount: overscanRowsCount,
startIndex,
stopIndex
})
this._onRowsRenderedMemoizer({
callback: onRowsRendered,
indices: {
overscanStartIndex,
overscanStopIndex,
startIndex,
stopIndex
}
})
}
/**
* Updates the state during the next animation frame.
* Use this method to avoid multiple renders in a small span of time.
* This helps performance for bursty events (like onScroll).
*/
_setNextState (state) {
if (this._setNextStateAnimationFrameId) {
raf.cancel(this._setNextStateAnimationFrameId)
}
this._setNextStateAnimationFrameId = raf(() => {
this._setNextStateAnimationFrameId = null
this.setState(state)
})
}
_setNextStateForScrollHelper ({ scrollTop }) {
// Certain devices (like Apple touchpad) rapid-fire duplicate events.
// Don't force a re-render if this is the case.
if (this.state.scrollTop === scrollTop) {
return
}
// Prevent pointer events from interrupting a smooth scroll
this._temporarilyDisablePointerEvents()
// The mouse may move faster then the animation frame does.
// Use requestAnimationFrame to avoid over-updating.
this._setNextState({
isScrolling: true,
scrollTop
})
}
_stopEvent (event) {
event.preventDefault()
}
/**
* Sets an :isScrolling flag for a small window of time.
* This flag is used to disable pointer events on the scrollable portion of the table (the rows).
* This prevents jerky/stuttery mouse-wheel scrolling.
*/
_temporarilyDisablePointerEvents () {
if (this._disablePointerEventsTimeoutId) {
clearTimeout(this._disablePointerEventsTimeoutId)
}
this._disablePointerEventsTimeoutId = setTimeout(() => {
this._disablePointerEventsTimeoutId = null
this.setState({
isScrolling: false
})
}, IS_SCROLLING_TIMEOUT)
}
/**
* Calculates and adjusts scrollTop if necessary to ensure that the row at the specified index is visible.
*/
_updateScrollTopForScrollToIndex (scrollToIndexOverride) {
const scrollToIndex = scrollToIndexOverride !== undefined
? scrollToIndexOverride
: this.props.scrollToIndex
const { height } = this.props
const { scrollTop } = this.state
if (scrollToIndex >= 0) {
const calculatedScrollTop = getUpdatedOffsetForIndex({
cellMetadata: this._cellMetadata,
containerSize: height,
currentOffset: scrollTop,
targetIndex: scrollToIndex
})
if (scrollTop !== calculatedScrollTop) {
this.setState({ scrollTop: calculatedScrollTop })
}
}
}
/* ---------------------------- Event Handlers ---------------------------- */
_onKeyPress (event) {
const { height, rowsCount } = this.props
const { scrollTop } = this.state
let start, datum, newScrollTop
if (rowsCount === 0) {
return
}
switch (event.key) {
case 'ArrowDown':
this._stopEvent(event) // Prevent key from also scrolling surrounding window
start = getVisibleCellIndices({
cellsCount: rowsCount,
cellMetadata: this._cellMetadata,
containerSize: height,
currentOffset: scrollTop
}).start
datum = this._cellMetadata[start]
newScrollTop = Math.min(
this._getTotalRowsHeight() - height,
scrollTop + datum.size
)
this.setState({
scrollTop: newScrollTop
})
break
case 'ArrowUp':
this._stopEvent(event) // Prevent key from also scrolling surrounding window
start = getVisibleCellIndices({
cellsCount: rowsCount,
cellMetadata: this._cellMetadata,
containerSize: height,
currentOffset: scrollTop
}).start
this.scrollToRow(Math.max(0, start - 1))
break
}
}
_onScroll (event) {
// In certain edge-cases React dispatches an onScroll event with an invalid target.scrollTop.
// This invalid event can be detected by comparing event.target to this component's scrollable DOM element.
// See issue #404 for more information.
if (event.target !== this.refs.scrollingContainer) {
return
}
// When this component is shrunk drastically, React dispatches a series of back-to-back scroll events,
// Gradually converging on a scrollTop that is within the bounds of the new, smaller height.
// This causes a series of rapid renders that is slow for long lists.
// We can avoid that by doing some simple bounds checking to ensure that scrollTop never exceeds the total height.
const { height, onScroll } = this.props
const totalRowsHeight = this._getTotalRowsHeight()
const scrollTop = Math.min(totalRowsHeight - height, event.target.scrollTop)
this._setNextStateForScrollHelper({ scrollTop })
this._onScrollMemoizer({
callback: onScroll,
indices: {
scrollTop
}
})
}
>>>>>>> |
<<<<<<<
getOverscanIndices,
=======
computeCellMetadataAndUpdateScrollOffsetHelper,
createCallbackMemoizer,
>>>>>>>
computeCellMetadataAndUpdateScrollOffsetHelper,
createCallbackMemoizer,
getOverscanIndices,
<<<<<<<
onRowsRendered: PropTypes.func,
/**
* Number of rows to render above/below the visible bounds of the list.
* These rows can help for smoother scrolling on touch devices.
*/
overscanRowsCount: PropTypes.number,
/** Either a fixed row height (number) or a function that returns the height of a row given its index. */
=======
onRowsRendered: PropTypes.func.isRequired,
/**
* Callback invoked whenever the scroll offset changes within the inner scrollable region.
* This callback can be used to sync scrolling between lists, tables, or grids.
* ({ scrollTop }): void
*/
onScroll: PropTypes.func.isRequired,
/**
* Either a fixed row height (number) or a function that returns the height of a row given its index.
* (index: number): number
*/
>>>>>>>
onRowsRendered: PropTypes.func.isRequired,
/**
* Number of rows to render above/below the visible bounds of the list.
* These rows can help for smoother scrolling on touch devices.
*/
overscanRowsCount: PropTypes.number,
/**
* Callback invoked whenever the scroll offset changes within the inner scrollable region.
* This callback can be used to sync scrolling between lists, tables, or grids.
* ({ scrollTop }): void
*/
onScroll: PropTypes.func.isRequired,
/**
* Either a fixed row height (number) or a function that returns the height of a row given its index.
* (index: number): number
*/
<<<<<<<
onRowsRendered: () => null,
overscanRowsCount: 0
=======
onRowsRendered: () => null,
onScroll: () => null
>>>>>>>
onRowsRendered: () => null,
onScroll: () => null,
overscanRowsCount: 0
<<<<<<<
const { onRowsRendered, overscanRowsCount, rowsCount, scrollToIndex } = this.props
=======
const { scrollToIndex } = this.props
>>>>>>>
const { scrollToIndex } = this.props
<<<<<<<
this._OnRowsRenderedHelper({
onRowsRendered,
overscanRowsCount,
rowsCount,
startIndex: this._renderedStartIndex,
stopIndex: this._renderedStopIndex
})
=======
this._invokeOnRowsRenderedHelper()
>>>>>>>
this._invokeOnRowsRenderedHelper()
<<<<<<<
const { height, onRowsRendered, overscanRowsCount, rowsCount, rowHeight, scrollToIndex } = this.props
=======
const { height, rowsCount, rowHeight, scrollToIndex } = this.props
>>>>>>>
const { height, rowsCount, rowHeight, scrollToIndex } = this.props
<<<<<<<
this._OnRowsRenderedHelper({
onRowsRendered,
overscanRowsCount,
rowsCount,
startIndex: this._renderedStartIndex,
stopIndex: this._renderedStopIndex
})
=======
this._invokeOnRowsRenderedHelper()
>>>>>>>
this._invokeOnRowsRenderedHelper() |
<<<<<<<
// Tracking web-analytics
// this records data about users hitting cocalc and cocalc-related websites
// this table is 100% back-end only
schema.analytics = {
primary_key: ["token"],
pg_indexes: ["token", "time"],
durability: "soft",
fields: {
token: {
type: "uuid"
},
time: {
type: "timestamp",
desc: "when the token&data fields were set"
},
data: {
type: "map",
desc: "referrer, landing page, utm, etc."
},
account_id: {
type: "uuid",
desc: "set only once, when the user eventually signed in"
},
time_account_id: {
type: "timestamp",
desc: "when the account id was recorded"
}
}
};
=======
// what software environments there are available
schema.compute_images = {
primary_key: ["id"],
anonymous: true,
fields: {
id: {
type: "string",
desc: "docker image 'name:tag', where tag defaults to 'latest'"
},
src: {
type: "string",
desc: "source of the image (likely https://github [...] .git)"
},
type: {
type: "string",
desc: "for now, this is either 'legacy' or 'custom'"
},
display: {
type: "string",
desc: "(optional) user-visible name (defaults to id)"
},
url: {
type: "string",
desc: "(optional) where the user can learn more about it"
},
desc: {
type: "string",
desc: "(optional) markdown text to talk more about this"
},
path: {
type: "string",
desc:
"(optional) point user to either a filename like index.ipynb or a directory/"
},
disabled: {
type: "boolean",
desc: "(optional) if set and true, do not offer as a selection"
}
},
user_query: {
get: {
throttle_changes: 30000,
pg_where: [],
fields: {
id: null,
src: null,
type: null,
display: null,
url: null,
desc: null,
path: null,
disabled: null
}
}
}
};
>>>>>>>
// Tracking web-analytics
// this records data about users hitting cocalc and cocalc-related websites
// this table is 100% back-end only
schema.analytics = {
primary_key: ["token"],
pg_indexes: ["token", "time"],
durability: "soft",
fields: {
token: {
type: "uuid"
},
time: {
type: "timestamp",
desc: "when the token&data fields were set"
},
data: {
type: "map",
desc: "referrer, landing page, utm, etc."
},
account_id: {
type: "uuid",
desc: "set only once, when the user eventually signed in"
},
time_account_id: {
type: "timestamp",
desc: "when the account id was recorded"
}
}
};
// what software environments there are available
schema.compute_images = {
primary_key: ["id"],
anonymous: true,
fields: {
id: {
type: "string",
desc: "docker image 'name:tag', where tag defaults to 'latest'"
},
src: {
type: "string",
desc: "source of the image (likely https://github [...] .git)"
},
type: {
type: "string",
desc: "for now, this is either 'legacy' or 'custom'"
},
display: {
type: "string",
desc: "(optional) user-visible name (defaults to id)"
},
url: {
type: "string",
desc: "(optional) where the user can learn more about it"
},
desc: {
type: "string",
desc: "(optional) markdown text to talk more about this"
},
path: {
type: "string",
desc:
"(optional) point user to either a filename like index.ipynb or a directory/"
},
disabled: {
type: "boolean",
desc: "(optional) if set and true, do not offer as a selection"
}
},
user_query: {
get: {
throttle_changes: 30000,
pg_where: [],
fields: {
id: null,
src: null,
type: null,
display: null,
url: null,
desc: null,
path: null,
disabled: null
}
}
}
}; |
<<<<<<<
* Fluid Infusion v2.0
=======
* Fluid Infusion v3.0.0
>>>>>>>
* Fluid Infusion v3.0.0
<<<<<<<
fluid.log("Clearing cache for component " + defaultName + " with gradeNames ", searchGrades);
=======
if (fluid.passLogLevel(fluid.logLevel.TRACE)) {
fluid.log(fluid.logLevel.TRACE, "Clearing cache for component " + defaultName + " with gradeNames ", searchGrades);
}
>>>>>>>
if (fluid.passLogLevel(fluid.logLevel.TRACE)) {
fluid.log(fluid.logLevel.TRACE, "Clearing cache for component " + defaultName + " with gradeNames ", searchGrades);
}
<<<<<<<
for (var i = 0; i < mergeBlocks.length; ++ i) {
fluid.destroyValue(mergeBlocks[i].target, segs);
=======
for (var i = 0; i < mergeBlocks.length; ++i) {
if (!mergeBlocks[i].immutableTarget) {
fluid.destroyValue(mergeBlocks[i].target, segs);
}
>>>>>>>
for (var i = 0; i < mergeBlocks.length; ++i) {
if (!mergeBlocks[i].immutableTarget) {
fluid.destroyValue(mergeBlocks[i].target, segs);
}
<<<<<<<
targetComp = targetComp || fluid.resolveContext(context, that);
if (!targetComp) {
fluid.fail("Error in options distribution record ", record, " - could not resolve context {"+context+"} to a root component");
=======
targetHead = targetHead || fluid.resolveContext(context, that);
if (!targetHead) {
fluid.fail("Error in options distribution record ", record, " - could not resolve context {" + context + "} to a head component");
>>>>>>>
targetHead = targetHead || fluid.resolveContext(context, that);
if (!targetHead) {
fluid.fail("Error in options distribution record ", record, " - could not resolve context {" + context + "} to a head component");
<<<<<<<
=======
Copyright 2012-2014 Raising the Floor - US
Copyright 2014-2017 Raising the Floor - International
>>>>>>>
Copyright 2012-2014 Raising the Floor - US
Copyright 2014-2017 Raising the Floor - International
<<<<<<<
for (var j = 0; j < spec.segsArray.length; ++ j) {
var invalidPaths = fluid.matchChanges(changeMap, spec.segsArray[j], newHolder);
=======
for (var j = 0; j < spec.segsArray.length; ++j) {
var invalidPaths = fluid.matchChanges(changeMap, spec.segsArray[j], newHolder, oldHolder);
>>>>>>>
for (var j = 0; j < spec.segsArray.length; ++j) {
var invalidPaths = fluid.matchChanges(changeMap, spec.segsArray[j], newHolder, oldHolder);
<<<<<<<
Copyright 2010-2011 OCAD University
=======
Copyright 2010-2014 OCAD University
Copyright 2012-2014 Raising the Floor - US
Copyright 2014-2017 Raising the Floor - International
>>>>>>>
Copyright 2010-2014 OCAD University
Copyright 2012-2014 Raising the Floor - US
Copyright 2014-2017 Raising the Floor - International
<<<<<<<
Copyright 2010-2011 OCAD University
Copyright 2013, 2016 Raising the Floor - International
=======
Copyright 2010-2015 OCAD University
Copyright 2013-2014 Raising the Floor - US
Copyright 2013-2017 Raising the Floor - International
>>>>>>>
Copyright 2010-2015 OCAD University
Copyright 2013-2014 Raising the Floor - US
Copyright 2013-2017 Raising the Floor - International
<<<<<<<
})(jQuery, fluid_2_0_0);
=======
// Context awareness for the reported browser platform name (operating system)
fluid.registerNamespace("fluid.contextAware.browser");
fluid.contextAware.browser.getPlatformName = function () {
return typeof(navigator) !== "undefined" && navigator.platform ? navigator.platform : undefined;
};
// Context awareness for the reported user agent name
fluid.contextAware.browser.getUserAgent = function () {
return typeof(navigator) !== "undefined" && navigator.userAgent ? navigator.userAgent : undefined;
};
fluid.contextAware.makeChecks({
"fluid.browser.platformName": {
funcName: "fluid.contextAware.browser.getPlatformName"
},
"fluid.browser.userAgent": {
funcName: "fluid.contextAware.browser.getUserAgent"
}
});
})(jQuery, fluid_3_0_0);
>>>>>>>
// Context awareness for the reported browser platform name (operating system)
fluid.registerNamespace("fluid.contextAware.browser");
fluid.contextAware.browser.getPlatformName = function () {
return typeof(navigator) !== "undefined" && navigator.platform ? navigator.platform : undefined;
};
// Context awareness for the reported user agent name
fluid.contextAware.browser.getUserAgent = function () {
return typeof(navigator) !== "undefined" && navigator.userAgent ? navigator.userAgent : undefined;
};
fluid.contextAware.makeChecks({
"fluid.browser.platformName": {
funcName: "fluid.contextAware.browser.getPlatformName"
},
"fluid.browser.userAgent": {
funcName: "fluid.contextAware.browser.getUserAgent"
}
});
})(jQuery, fluid_3_0_0); |
<<<<<<<
=======
>>>>>>>
<<<<<<<
var currentExpressionDataSet;
=======
var pcaMsg;
var highlightIndex = [];
>>>>>>>
var currentExpressionDataSet;
var pcaMsg;
var highlightIndex = [];
<<<<<<<
requestExpressionDataSetNames();
}else{
=======
}else
>>>>>>>
requestExpressionDataSetNames();
}else{
<<<<<<<
function runTests()
{
// the test does not currently depend upon any other tabs, but we want to add some
// real world complexity to the situation, so we use tabs, including cpa (of course)
// and the usual introcutory "Datasets" tab. make sure it is there.
// tests depend upon the presence of 2 tabs in addition to the present one.
var datasetsTabPresent = $("#datasetsDiv").length > 0;
if(!datasetsTabPresent){
alert("Datasets tab needed for QUnit testing");
return;
} // check for other needed tabs
testResultsOutputDiv.css({display: "block"});
testLoadDataset();
} // runTests
//--------------------------------------------------------------------------------------------
=======
>>>>>>>
function runTests()
{
// the test does not currently depend upon any other tabs, but we want to add some
// real world complexity to the situation, so we use tabs, including cpa (of course)
// and the usual introcutory "Datasets" tab. make sure it is there.
// tests depend upon the presence of 2 tabs in addition to the present one.
var datasetsTabPresent = $("#datasetsDiv").length > 0;
if(!datasetsTabPresent){
alert("Datasets tab needed for QUnit testing");
return;
} // check for other needed tabs
testResultsOutputDiv.css({display: "block"});
testLoadDataset();
} // runTests
//--------------------------------------------------------------------------------------------
<<<<<<<
hub.addMessageHandler("pcaAssessUserIdForTesting", assessUserIdForTesting);
//hub.addSocketConnectedFunction(runAutomatedTestsIfAppropriate);
=======
//hub.addMessageHandler("pcaAssessUserIdForTesting", assessUserIdForTesting);
//hub.addSocketConnectedFunction(runAutomatedTestsIfAppropriate);
>>>>>>>
hub.addMessageHandler("pcaAssessUserIdForTesting", assessUserIdForTesting);
//hub.addSocketConnectedFunction(runAutomatedTestsIfAppropriate); |
<<<<<<<
Client.prototype.sendStat = function (stat, value, type, sampleRate, tags, callback) {
var message = this.prefix + stat + this.suffix + ':' + value + '|' + type;
=======
Client.prototype.send = function (stat, value, type, sampleRate, tags, callback) {
var message = this.prefix + stat + this.suffix + ':' + value + '|' + type,
merged_tags = [];
>>>>>>>
Client.prototype.sendStat = function (stat, value, type, sampleRate, tags, callback) {
var message = this.prefix + stat + this.suffix + ':' + value + '|' + type,
buf;
<<<<<<<
this.socket.close();
};
=======
if(this.intervalHandle) {
clearInterval(this.intervalHandle);
}
this.socket.close();
}
>>>>>>>
if(this.intervalHandle) {
clearInterval(this.intervalHandle);
}
this.socket.close();
}; |
<<<<<<<
assert.equal(metrics, `test:42|${statFunction.unit}|#gtag:gvalue1,gtag:gvalue2,foo,bar${metricsEnd}`);
=======
assert.strictEqual(metrics, `test:42|${statFunction.unit}|#foo,bar${metricsEnd}`);
>>>>>>>
assert.strictEqual(metrics, `test:42|${statFunction.unit}|#gtag:gvalue1,gtag:gvalue2,foo,bar${metricsEnd}`);
<<<<<<<
assert.equal(metrics, `test:42|c|#gtag:gvalue1,gtag:gvalue2,foo,bar${metricsEnd}`);
=======
assert.strictEqual(metrics, `test:42|c|#foo,bar${metricsEnd}`);
>>>>>>>
assert.strictEqual(metrics, `test:42|c|#gtag:gvalue1,gtag:gvalue2,foo,bar${metricsEnd}`);
<<<<<<<
assert.equal(metrics, `test:1|c|#gtag:gvalue1,gtag:gvalue2,foo,bar${metricsEnd}`);
=======
assert.strictEqual(metrics, `test:1|c|#foo,bar${metricsEnd}`);
>>>>>>>
assert.strictEqual(metrics, `test:1|c|#gtag:gvalue1,gtag:gvalue2,foo,bar${metricsEnd}`);
<<<<<<<
assert.equal(metrics, `test:23|c|#gtag:gvalue1,gtag:gvalue2,foo,bar${metricsEnd}`);
=======
assert.strictEqual(metrics, `test:23|c|#foo,bar${metricsEnd}`);
>>>>>>>
assert.strictEqual(metrics, `test:23|c|#gtag:gvalue1,gtag:gvalue2,foo,bar${metricsEnd}`);
<<<<<<<
assert.equal(metrics, `test:-1|c|#gtag:gvalue1,gtag:gvalue2,foo,bar${metricsEnd}`);
=======
assert.strictEqual(metrics, `test:-1|c|#foo,bar${metricsEnd}`);
>>>>>>>
assert.strictEqual(metrics, `test:-1|c|#gtag:gvalue1,gtag:gvalue2,foo,bar${metricsEnd}`);
<<<<<<<
assert.equal(metrics, `test:-23|c|#gtag:gvalue1,gtag:gvalue2,foo,bar${metricsEnd}`);
=======
assert.strictEqual(metrics, `test:-23|c|#foo,bar${metricsEnd}`);
>>>>>>>
assert.strictEqual(metrics, `test:-23|c|#gtag:gvalue1,gtag:gvalue2,foo,bar${metricsEnd}`);
<<<<<<<
assert.equal(metrics, `test:-42|c|#gtag:gvalue1,gtag:gvalue2,foo,bar${metricsEnd}`);
=======
assert.strictEqual(metrics, `test:-42|c|#foo,bar${metricsEnd}`);
>>>>>>>
assert.strictEqual(metrics, `test:-42|c|#gtag:gvalue1,gtag:gvalue2,foo,bar${metricsEnd}`); |
<<<<<<<
children: PropTypes.object.isRequired,
isDisabled: PropTypes.bool,
hideArrows: PropTypes.bool
=======
children: PropTypes.object.isRequired,
isDisabled: PropTypes.bool,
hideArrows: PropTypes.bool
};
const defaultMenuStyle = {
display: 'flex',
alignItems: 'center',
userSelect: 'none'
};
const defaultWrapperStyle = {
overflow: 'hidden',
userSelect: 'none'
>>>>>>>
children: PropTypes.object.isRequired,
isDisabled: PropTypes.bool,
hideArrows: PropTypes.bool
<<<<<<<
const passiveEvents = testPassiveEventSupport();
const optionsCapture = passiveEvents ? { passive: true, capture: true } : true;
const optionsNoCapture = passiveEvents ? { passive: true, capture: false } : false;
// if styles loaded before js bundle need wait for it
window.addEventListener('load', this.onLoad, optionsNoCapture);
window.addEventListener('resize', this.setInitial, optionsNoCapture);
document.addEventListener('mousemove', this.handleDrag, optionsCapture);
document.addEventListener('mouseup', this.handleDragStop, optionsCapture);
=======
const passiveEvents = testPassiveEventSupport();
const optionsCapture = passiveEvents ? { passive: true, capture: true } : true;
const optionsNoCapture = passiveEvents ? { passive: true, capture: false } : false;
>>>>>>>
const passiveEvents = testPassiveEventSupport();
const optionsCapture = passiveEvents ? { passive: true, capture: true } : true;
const optionsNoCapture = passiveEvents ? { passive: true, capture: false } : false;
<<<<<<<
const arrowsVisible = this.isArrowsVisible();
=======
const arrowsVisible = mounted ? this.isArrowsVisible() : true;
>>>>>>>
const arrowsVisible = mounted ? this.isArrowsVisible() : true;
<<<<<<<
isDisabled={!arrowsVisible}
hideArrows={hideArrows}
=======
isDisabled={!arrowsVisible || !leftArrowVisible}
hideArrows={hideArrows}
>>>>>>>
isDisabled={!arrowsVisible || !leftArrowVisible}
hideArrows={hideArrows}
<<<<<<<
isDisabled={!arrowsVisible}
hideArrows={hideArrows}
=======
isDisabled={!arrowsVisible || !rightArrowVisible}
hideArrows={hideArrows}
>>>>>>>
isDisabled={!arrowsVisible || !rightArrowVisible}
hideArrows={hideArrows}
<<<<<<<
=======
export const defaultProps = {
alignCenter: defaultSetting.alignCenter,
arrowClass: defaultSetting.arrowClass,
innerWrapperClass: defaultSetting.innerWrapperClass,
itemClass: defaultSetting.itemClass,
itemClassActive: defaultSetting.itemClassActive,
hideArrows: defaultSetting.hideArrows,
hideSingleArrow: defaultSetting.hideSingleArrow,
clickWhenDrag: defaultSetting.clickWhenDrag,
data: defaultSetting.data,
dragging: defaultSetting.dragging,
selected: defaultSetting.selected,
transition: defaultSetting.transition,
translate: defaultSetting.translate,
menuClass: defaultSetting.menuClass,
wheel: defaultSetting.wheel,
wrapperClass: defaultSetting.wrapperClass
};
>>>>>>>
<<<<<<<
hideArrows: PropTypes.bool,
onSelect: PropTypes.func,
onClick: PropTypes.func,
selected: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
translate: PropTypes.number,
transition: PropTypes.number,
onUpdate: PropTypes.func,
=======
hideArrows: PropTypes.bool,
hideSingleArrow: PropTypes.bool,
onSelect: PropTypes.func,
onClick: PropTypes.func,
selected: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
translate: PropTypes.number,
transition: PropTypes.number,
onUpdate: PropTypes.func,
>>>>>>>
hideArrows: PropTypes.bool,
hideSingleArrow: PropTypes.bool,
onSelect: PropTypes.func,
onClick: PropTypes.func,
selected: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
translate: PropTypes.number,
transition: PropTypes.number,
onUpdate: PropTypes.func, |
<<<<<<<
const {route_args, common_args} = require('../common.arguments');
const {CONFIG_KEYS, VERSIONS} = require('../../../constants');
const resource_args = require('./careplan.arguments');
=======
const { route_args, common_args, write_args } = require('../common.arguments');
const { read_scopes, write_scopes } = require('../common.scopes');
const { CONFIG_KEYS, VERSIONS } = require('../../../constants');
const careplan_args = require('./careplan.arguments');
>>>>>>>
const { route_args, common_args, write_args } = require('../common.arguments');
const { read_scopes, write_scopes } = require('../common.scopes');
const { CONFIG_KEYS, VERSIONS } = require('../../../constants');
const resource_args = require('./careplan.arguments');
<<<<<<<
corsOptions: {methods: ['GET']},
args: resourceAllArguments,
scopes: scopes,
=======
args: [
route_args.VERSION,
common_args._FORMAT,
common_args._CONTENT,
common_args._ID,
common_args._LASTUPDATED,
common_args._PROFILE,
common_args._QUERY,
common_args._SECURITY,
common_args._TAG,
Object.assign({versions: VERSIONS.STU3}, careplan_args.ACTIVITY_CODE),
Object.assign({versions: VERSIONS.STU3}, careplan_args.ACTIVITY_DATE),
Object.assign({versions: VERSIONS.STU3}, careplan_args.ACTIVITY_REFERENCE),
Object.assign({versions: VERSIONS.STU3}, careplan_args.BASED_ON),
Object.assign({versions: VERSIONS.STU3}, careplan_args.CARE_TEAM),
Object.assign({versions: VERSIONS.STU3}, careplan_args.CATEGORY),
Object.assign({versions: VERSIONS.STU3}, careplan_args.CONDITION),
Object.assign({versions: VERSIONS.STU3}, careplan_args.CONTEXT),
Object.assign({versions: VERSIONS.STU3}, careplan_args.DATE),
Object.assign({versions: VERSIONS.STU3}, careplan_args.DEFINITION),
Object.assign({versions: VERSIONS.STU3}, careplan_args.ENCOUNTER),
Object.assign({versions: VERSIONS.STU3}, careplan_args.GOAL),
Object.assign({versions: VERSIONS.STU3}, careplan_args.IDENTIFIER),
Object.assign({versions: VERSIONS.STU3}, careplan_args.INTENT),
Object.assign({versions: VERSIONS.STU3}, careplan_args.PART_OF),
Object.assign({versions: VERSIONS.STU3}, careplan_args.PATIENT),
Object.assign({versions: VERSIONS.STU3}, careplan_args.PERFORMER),
Object.assign({versions: VERSIONS.STU3}, careplan_args.REPLACES),
Object.assign({versions: VERSIONS.STU3}, careplan_args.STATUS),
Object.assign({versions: VERSIONS.STU3}, careplan_args.SUBJECT)
],
scopes: read_only_scopes,
>>>>>>>
args: resourceAllArguments,
scopes: read_only_scopes,
<<<<<<<
corsOptions: {methods: ['POST']},
args: resourceAllArguments,
scopes: scopes,
=======
args: [
route_args.VERSION,
common_args._FORMAT,
common_args._CONTENT,
common_args._ID,
common_args._LASTUPDATED,
common_args._PROFILE,
common_args._QUERY,
common_args._SECURITY,
common_args._TAG,
Object.assign({versions: VERSIONS.STU3}, careplan_args.ACTIVITY_CODE),
Object.assign({versions: VERSIONS.STU3}, careplan_args.ACTIVITY_DATE),
Object.assign({versions: VERSIONS.STU3}, careplan_args.ACTIVITY_REFERENCE),
Object.assign({versions: VERSIONS.STU3}, careplan_args.BASED_ON),
Object.assign({versions: VERSIONS.STU3}, careplan_args.CARE_TEAM),
Object.assign({versions: VERSIONS.STU3}, careplan_args.CATEGORY),
Object.assign({versions: VERSIONS.STU3}, careplan_args.CONDITION),
Object.assign({versions: VERSIONS.STU3}, careplan_args.CONTEXT),
Object.assign({versions: VERSIONS.STU3}, careplan_args.DATE),
Object.assign({versions: VERSIONS.STU3}, careplan_args.DEFINITION),
Object.assign({versions: VERSIONS.STU3}, careplan_args.ENCOUNTER),
Object.assign({versions: VERSIONS.STU3}, careplan_args.GOAL),
Object.assign({versions: VERSIONS.STU3}, careplan_args.IDENTIFIER),
Object.assign({versions: VERSIONS.STU3}, careplan_args.INTENT),
Object.assign({versions: VERSIONS.STU3}, careplan_args.PART_OF),
Object.assign({versions: VERSIONS.STU3}, careplan_args.PATIENT),
Object.assign({versions: VERSIONS.STU3}, careplan_args.PERFORMER),
Object.assign({versions: VERSIONS.STU3}, careplan_args.REPLACES),
Object.assign({versions: VERSIONS.STU3}, careplan_args.STATUS),
Object.assign({versions: VERSIONS.STU3}, careplan_args.SUBJECT)
],
scopes: read_only_scopes,
>>>>>>>
args: resourceAllArguments,
scopes: read_only_scopes, |
<<<<<<<
const {route_args, common_args} = require('../common.arguments');
const {CONFIG_KEYS, VERSIONS} = require('../../../constants');
const resource_args = require('./goal.arguments');
=======
const { route_args, common_args, write_args } = require('../common.arguments');
const { read_scopes, write_scopes } = require('../common.scopes');
const { CONFIG_KEYS, VERSIONS } = require('../../../constants');
const goal_args = require('./goal.arguments');
>>>>>>>
const { route_args, common_args, write_args } = require('../common.arguments');
const { read_scopes, write_scopes } = require('../common.scopes');
const { CONFIG_KEYS, VERSIONS } = require('../../../constants');
const resource_args = require('./goal.arguments');
<<<<<<<
corsOptions: {methods: ['GET']},
args: resourceAllArguments,
scopes: scopes,
=======
args: [
route_args.VERSION,
common_args._FORMAT,
common_args._CONTENT,
common_args._ID,
common_args._LASTUPDATED,
common_args._PROFILE,
common_args._QUERY,
common_args._SECURITY,
common_args._TAG,
Object.assign({versions: VERSIONS.STU3}, goal_args.CATEGORY),
Object.assign({versions: VERSIONS.STU3}, goal_args.IDENTIFIER),
Object.assign({versions: VERSIONS.STU3}, goal_args.PATIENT),
Object.assign({versions: VERSIONS.STU3}, goal_args.START_DATE),
Object.assign({versions: VERSIONS.STU3}, goal_args.STATUS),
Object.assign({versions: VERSIONS.STU3}, goal_args.SUBJECT),
Object.assign({versions: VERSIONS.STU3}, goal_args.TARGET_DATE)
],
scopes: read_only_scopes,
>>>>>>>
args: resourceAllArguments,
scopes: scopes,
<<<<<<<
corsOptions: {methods: ['POST']},
args: resourceAllArguments,
scopes: scopes,
=======
args: [
route_args.VERSION,
common_args._FORMAT,
common_args._CONTENT,
common_args._ID,
common_args._LASTUPDATED,
common_args._PROFILE,
common_args._QUERY,
common_args._SECURITY,
common_args._TAG,
Object.assign({versions: VERSIONS.STU3}, goal_args.CATEGORY),
Object.assign({versions: VERSIONS.STU3}, goal_args.IDENTIFIER),
Object.assign({versions: VERSIONS.STU3}, goal_args.PATIENT),
Object.assign({versions: VERSIONS.STU3}, goal_args.START_DATE),
Object.assign({versions: VERSIONS.STU3}, goal_args.STATUS),
Object.assign({versions: VERSIONS.STU3}, goal_args.SUBJECT),
Object.assign({versions: VERSIONS.STU3}, goal_args.TARGET_DATE)
],
scopes: read_only_scopes,
>>>>>>>
args: resourceAllArguments,
scopes: scopes, |
<<<<<<<
/*! Flocking 0.1.0 (November 12, 2014), Copyright 2014 Colin Clark | flockingjs.org */
=======
/*! Flocking 0.1.0 (November 26, 2014), Copyright 2014 Colin Clark | flockingjs.org */
>>>>>>>
/*! Flocking 0.1.0 (November 26, 2014), Copyright 2014 Colin Clark | flockingjs.org */
<<<<<<<
=======
/**
* Changes from the <code>initial</code> input to the <code>target</code> input
* at the specified <code>time</code>. An optional <code>crossfade</code> duration
* may be specified to linearly crossfade between the two inputs.
*
* Can be used to schedule sample-accurate changes.
* Note that the <code>target</code> input will be evaluated from the beginning,
* even if its value isn't yet output.
*
*/
flock.ugen.change = function (inputs, output, options) {
var that = flock.ugen(inputs, output, options);
that.gen = function (numSamps) {
var m = that.model,
initial = that.inputs.initial.output,
initialInc = m.strides.initial,
target = that.inputs.target.output,
targetInc = m.strides.target,
out = that.output,
samplesLeft = m.samplesLeft,
crossfadeLevel = m.crossfadeLevel,
val;
for (var i = 0, j = 0, k = 0; i < numSamps; i++, j += initialInc, k += targetInc) {
if (samplesLeft > 0) {
// We haven't hit the scheduled time yet.
val = initial[j];
samplesLeft--;
} else if (crossfadeLevel > 0.0) {
// We've hit the scheduled time, but we still need to peform the crossfade.
val = (initial[j] * crossfadeLevel) + (target[k] * (1.0 - crossfadeLevel));
crossfadeLevel -= m.crossfadeStepSize;
} else {
// We're done.
val = target[k];
}
out[i] = val;
}
m.samplesLeft = samplesLeft;
m.crossfadeLevel = crossfadeLevel;
};
that.onInputChanged = function (inputName) {
var m = that.model,
inputs = that.inputs;
if (inputName === "time" || !inputName) {
m.samplesLeft = Math.round(inputs.time.output[0] * m.sampleRate);
}
if (inputName === "crossfade" || !inputName) {
m.crossfadeStepSize = 1.0 / Math.round(inputs.crossfade.output[0] * m.sampleRate);
m.crossfadeLevel = inputs.crossfade.output[0] > 0.0 ? 1.0 : 0.0;
}
that.calculateStrides();
};
that.onInputChanged();
return that;
};
fluid.defaults("flock.ugen.change", {
rate: "audio",
inputs: {
/**
* An input unit generator to output initially.
* Can be audio, control, or constant rate.
*/
initial: 0.0,
/**
* The unit generator to output after the specified time.
* Can be audio, control, or constant rate.
*/
target: 0.0,
/**
* The sample-accurate time (in seconds) at which the
* the change should occur.
*/
time: 0.0,
/**
* The duration of the optional linear crossfade between
* the two values.
*/
crossfade: 0.0
},
ugenOptions: {
model: {
samplesLeft: 0.0,
crossfadeStepSize: 0,
crossfadeLevel: 0.0
},
strideInputs: ["initial", "target"]
}
});
>>>>>>>
/**
* Changes from the <code>initial</code> input to the <code>target</code> input
* at the specified <code>time</code>. An optional <code>crossfade</code> duration
* may be specified to linearly crossfade between the two inputs.
*
* Can be used to schedule sample-accurate changes.
* Note that the <code>target</code> input will be evaluated from the beginning,
* even if its value isn't yet output.
*
*/
flock.ugen.change = function (inputs, output, options) {
var that = flock.ugen(inputs, output, options);
that.gen = function (numSamps) {
var m = that.model,
initial = that.inputs.initial.output,
initialInc = m.strides.initial,
target = that.inputs.target.output,
targetInc = m.strides.target,
out = that.output,
samplesLeft = m.samplesLeft,
crossfadeLevel = m.crossfadeLevel,
val;
for (var i = 0, j = 0, k = 0; i < numSamps; i++, j += initialInc, k += targetInc) {
if (samplesLeft > 0) {
// We haven't hit the scheduled time yet.
val = initial[j];
samplesLeft--;
} else if (crossfadeLevel > 0.0) {
// We've hit the scheduled time, but we still need to peform the crossfade.
val = (initial[j] * crossfadeLevel) + (target[k] * (1.0 - crossfadeLevel));
crossfadeLevel -= m.crossfadeStepSize;
} else {
// We're done.
val = target[k];
}
out[i] = val;
}
m.samplesLeft = samplesLeft;
m.crossfadeLevel = crossfadeLevel;
};
that.onInputChanged = function (inputName) {
var m = that.model,
inputs = that.inputs;
if (inputName === "time" || !inputName) {
m.samplesLeft = Math.round(inputs.time.output[0] * m.sampleRate);
}
if (inputName === "crossfade" || !inputName) {
m.crossfadeStepSize = 1.0 / Math.round(inputs.crossfade.output[0] * m.sampleRate);
m.crossfadeLevel = inputs.crossfade.output[0] > 0.0 ? 1.0 : 0.0;
}
that.calculateStrides();
};
that.onInputChanged();
return that;
};
fluid.defaults("flock.ugen.change", {
rate: "audio",
inputs: {
/**
* An input unit generator to output initially.
* Can be audio, control, or constant rate.
*/
initial: 0.0,
/**
* The unit generator to output after the specified time.
* Can be audio, control, or constant rate.
*/
target: 0.0,
/**
* The sample-accurate time (in seconds) at which the
* the change should occur.
*/
time: 0.0,
/**
* The duration of the optional linear crossfade between
* the two values.
*/
crossfade: 0.0
},
ugenOptions: {
model: {
samplesLeft: 0.0,
crossfadeStepSize: 0,
crossfadeLevel: 0.0
},
strideInputs: ["initial", "target"]
}
}); |
<<<<<<<
const {route_args, common_args} = require('../common.arguments');
const {CONFIG_KEYS, VERSIONS} = require('../../../constants');
const resource_args = require('./condition.arguments');
=======
const { route_args, common_args, write_args } = require('../common.arguments');
const { read_scopes, write_scopes } = require('../common.scopes');
const { CONFIG_KEYS, VERSIONS } = require('../../../constants');
const condition_args = require('./condition.arguments');
>>>>>>>
const { route_args, common_args, write_args } = require('../common.arguments');
const { read_scopes, write_scopes } = require('../common.scopes');
const { CONFIG_KEYS, VERSIONS } = require('../../../constants');
const resource_args = require('./condition.arguments');
<<<<<<<
corsOptions: {methods: ['GET']},
args: resourceAllArguments,
scopes: scopes,
=======
args: [
route_args.VERSION,
common_args._FORMAT,
common_args._CONTENT,
common_args._ID,
common_args._LASTUPDATED,
common_args._PROFILE,
common_args._QUERY,
common_args._SECURITY,
common_args._TAG,
Object.assign({versions: VERSIONS.STU3}, condition_args.ABATEMENT_AGE),
Object.assign({versions: VERSIONS.STU3}, condition_args.ABATEMENT_BOOLEAN),
Object.assign({versions: VERSIONS.STU3}, condition_args.ABATEMENT_DATE),
Object.assign({versions: VERSIONS.STU3}, condition_args.ABATEMENT_STRING),
Object.assign({versions: VERSIONS.STU3}, condition_args.ASSERTED_DATE),
Object.assign({versions: VERSIONS.STU3}, condition_args.ASSERTER),
Object.assign({versions: VERSIONS.STU3}, condition_args.BODY_SITE),
Object.assign({versions: VERSIONS.STU3}, condition_args.CATEGORY),
Object.assign({versions: VERSIONS.STU3}, condition_args.CLINICAL_STATUS),
Object.assign({versions: VERSIONS.STU3}, condition_args.CODE),
Object.assign({versions: VERSIONS.STU3}, condition_args.CONTEXT),
Object.assign({versions: VERSIONS.STU3}, condition_args.ENCOUNTER),
Object.assign({versions: VERSIONS.STU3}, condition_args.EVIDENCE),
Object.assign({versions: VERSIONS.STU3}, condition_args.EVIDENCE_DETAIL),
Object.assign({versions: VERSIONS.STU3}, condition_args.IDENTIFIER),
Object.assign({versions: VERSIONS.STU3}, condition_args.ONSET_AGE),
Object.assign({versions: VERSIONS.STU3}, condition_args.ONSET_DATE),
Object.assign({versions: VERSIONS.STU3}, condition_args.ONSET_INFO),
Object.assign({versions: VERSIONS.STU3}, condition_args.PATIENT),
Object.assign({versions: VERSIONS.STU3}, condition_args.SEVERITY),
Object.assign({versions: VERSIONS.STU3}, condition_args.STAGE),
Object.assign({versions: VERSIONS.STU3}, condition_args.SUBJECT),
Object.assign({versions: VERSIONS.STU3}, condition_args.VERIFICATION_STATUS)
],
scopes: read_only_scopes,
>>>>>>>
args: resourceAllArguments,
scopes: read_only_scopes,
<<<<<<<
corsOptions: {methods: ['POST']},
args: resourceAllArguments,
scopes: scopes,
=======
args: [
route_args.VERSION,
common_args._FORMAT,
common_args._CONTENT,
common_args._ID,
common_args._LASTUPDATED,
common_args._PROFILE,
common_args._QUERY,
common_args._SECURITY,
common_args._TAG,
Object.assign({versions: VERSIONS.STU3}, condition_args.ABATEMENT_AGE),
Object.assign({versions: VERSIONS.STU3}, condition_args.ABATEMENT_BOOLEAN),
Object.assign({versions: VERSIONS.STU3}, condition_args.ABATEMENT_DATE),
Object.assign({versions: VERSIONS.STU3}, condition_args.ABATEMENT_STRING),
Object.assign({versions: VERSIONS.STU3}, condition_args.ASSERTED_DATE),
Object.assign({versions: VERSIONS.STU3}, condition_args.ASSERTER),
Object.assign({versions: VERSIONS.STU3}, condition_args.BODY_SITE),
Object.assign({versions: VERSIONS.STU3}, condition_args.CATEGORY),
Object.assign({versions: VERSIONS.STU3}, condition_args.CLINICAL_STATUS),
Object.assign({versions: VERSIONS.STU3}, condition_args.CODE),
Object.assign({versions: VERSIONS.STU3}, condition_args.CONTEXT),
Object.assign({versions: VERSIONS.STU3}, condition_args.ENCOUNTER),
Object.assign({versions: VERSIONS.STU3}, condition_args.EVIDENCE),
Object.assign({versions: VERSIONS.STU3}, condition_args.EVIDENCE_DETAIL),
Object.assign({versions: VERSIONS.STU3}, condition_args.IDENTIFIER),
Object.assign({versions: VERSIONS.STU3}, condition_args.ONSET_AGE),
Object.assign({versions: VERSIONS.STU3}, condition_args.ONSET_DATE),
Object.assign({versions: VERSIONS.STU3}, condition_args.ONSET_INFO),
Object.assign({versions: VERSIONS.STU3}, condition_args.PATIENT),
Object.assign({versions: VERSIONS.STU3}, condition_args.SEVERITY),
Object.assign({versions: VERSIONS.STU3}, condition_args.STAGE),
Object.assign({versions: VERSIONS.STU3}, condition_args.SUBJECT),
Object.assign({versions: VERSIONS.STU3}, condition_args.VERIFICATION_STATUS)
],
scopes: read_only_scopes,
>>>>>>>
args: resourceAllArguments,
scopes: read_only_scopes, |
<<<<<<<
const {route_args, common_args} = require('../common.arguments');
const {CONFIG_KEYS, VERSIONS} = require('../../../constants');
const resource_args = require('./allergyintolerance.arguments');
=======
const { route_args, common_args, write_args } = require('../common.arguments');
const { read_scopes, write_scopes } = require('../common.scopes');
const { CONFIG_KEYS, VERSIONS } = require('../../../constants');
const allergyintolerance_args = require('./allergyintolerance.arguments');
>>>>>>>
const { route_args, common_args, write_args } = require('../common.arguments');
const { read_scopes, write_scopes } = require('../common.scopes');
const { CONFIG_KEYS, VERSIONS } = require('../../../constants');
const resource_args = require('./allergyintolerance.arguments');
<<<<<<<
corsOptions: {methods: ['GET']},
args: resourceAllArguments,
scopes: scopes,
=======
args: [
route_args.VERSION,
common_args._FORMAT,
common_args._CONTENT,
common_args._ID,
common_args._LASTUPDATED,
common_args._PROFILE,
common_args._QUERY,
common_args._SECURITY,
common_args._TAG,
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.ASSERTER),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.CATEGORY),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.CLINICAL_STATUS),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.CODE),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.CRITICALITY),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.DATE),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.IDENTIFIER),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.LAST_DATE),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.MANIFESTATION),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.ONSET),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.PATIENT),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.RECORDER),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.ROUTE),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.SEVERITY),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.TYPE),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.VERIFICATION_STATUS)
],
scopes: read_only_scopes,
>>>>>>>
args: resourceAllArguments,
scopes: read_only_scopes,
<<<<<<<
corsOptions: {methods: ['POST']},
args: resourceAllArguments,
scopes: scopes,
=======
args: [
route_args.VERSION,
common_args._FORMAT,
common_args._CONTENT,
common_args._ID,
common_args._LASTUPDATED,
common_args._PROFILE,
common_args._QUERY,
common_args._SECURITY,
common_args._TAG,
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.ASSERTER),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.CATEGORY),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.CLINICAL_STATUS),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.CODE),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.CRITICALITY),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.DATE),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.IDENTIFIER),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.LAST_DATE),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.MANIFESTATION),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.ONSET),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.PATIENT),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.RECORDER),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.ROUTE),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.SEVERITY),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.TYPE),
Object.assign({versions: VERSIONS.STU3}, allergyintolerance_args.VERIFICATION_STATUS)
],
scopes: read_only_scopes,
>>>>>>>
args: resourceAllArguments,
scopes: read_only_scopes, |
<<<<<<<
numInputBuses: 2,
numBuses: 6, // By default, two output buses, two input buses, and two interconnect buses.
=======
numBuses: 8,
>>>>>>>
numInputBuses: 2,
numBuses: 8,
<<<<<<<
that.play = function (dur) {
dur = dur === undefined ? Infinity : dur;
var playState = that.model.playState,
sps = dur * that.audioSettings.rates.audio * that.audioSettings.chans;
playState.total = playState.written + sps;
that.audioStrategy.start();
=======
that.play = function () {
that.audioStrategy.startGeneratingSamples();
>>>>>>>
that.play = function () {
that.audioStrategy.start();
<<<<<<<
that.audioStrategy.reset();
// Clear the environment's node list.
while (that.nodes.length > 0) {
that.nodes.pop();
}
=======
that.clearAll();
>>>>>>>
that.audioStrategy.reset();
that.clearAll(); |
<<<<<<<
const {route_args, common_args} = require('../common.arguments');
const {CONFIG_KEYS, VERSIONS} = require('../../../constants');
const resource_args = require('./observation.arguments');
=======
const { route_args, common_args, write_args } = require('../common.arguments');
const { read_scopes, write_scopes } = require('../common.scopes');
const { CONFIG_KEYS, VERSIONS } = require('../../../constants');
const observation_args = require('./observation.arguments');
>>>>>>>
const { route_args, common_args, write_args } = require('../common.arguments');
const { read_scopes, write_scopes } = require('../common.scopes');
const { CONFIG_KEYS, VERSIONS } = require('../../../constants');
const resource_args = require('./observation.arguments');
<<<<<<<
corsOptions: {methods: ['GET']},
args: resourceAllArguments,
scopes: scopes,
=======
args: [
route_args.VERSION,
common_args._FORMAT,
common_args._CONTENT,
common_args._ID,
common_args._LASTUPDATED,
common_args._PROFILE,
common_args._QUERY,
common_args._SECURITY,
common_args._TAG,
Object.assign({versions: VERSIONS.STU3}, observation_args.BASED_ON),
Object.assign({versions: VERSIONS.STU3}, observation_args.CATEGORY),
Object.assign({versions: VERSIONS.STU3}, observation_args.CODE),
Object.assign({versions: VERSIONS.STU3}, observation_args.CODE_VALUE_CONCEPT),
Object.assign({versions: VERSIONS.STU3}, observation_args.CODE_VALUE_DATE),
Object.assign({versions: VERSIONS.STU3}, observation_args.CODE_VALUE_QUANTITY),
Object.assign({versions: VERSIONS.STU3}, observation_args.CODE_VALUE_STRING),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMBO_CODE),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMBO_CODE_VALUE_CONCEPT),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMBO_CODE_VALUE_QUANTITY),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMBO_DATA_ABSENT_REASON),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMBO_VALUE_CONCEPT),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMBO_VALUE_QUANTITY),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMPONENT_CODE),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMPONENT_CODE_VALUE_CONCEPT),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMPONENT_CODE_VALUE_QUANTITY),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMPONENT_DATA_ABSENT_REASON),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMPONENT_VALUE_CONCEPT),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMPONENT_VALUE_QUANTITY),
Object.assign({versions: VERSIONS.STU3}, observation_args.CONTEXT),
Object.assign({versions: VERSIONS.STU3}, observation_args.DATA_ABSENT_REASON),
Object.assign({versions: VERSIONS.STU3}, observation_args.DATE),
Object.assign({versions: VERSIONS.STU3}, observation_args.DEVICE),
Object.assign({versions: VERSIONS.STU3}, observation_args.ENCOUNTER),
Object.assign({versions: VERSIONS.STU3}, observation_args.IDENTIFIER),
Object.assign({versions: VERSIONS.STU3}, observation_args.METHOD),
Object.assign({versions: VERSIONS.STU3}, observation_args.PATIENT),
Object.assign({versions: VERSIONS.STU3}, observation_args.PERFORMER),
Object.assign({versions: VERSIONS.STU3}, observation_args.RELATED),
Object.assign({versions: VERSIONS.STU3}, observation_args.RELATED_TARGET),
Object.assign({versions: VERSIONS.STU3}, observation_args.RELATED_TYPE),
Object.assign({versions: VERSIONS.STU3}, observation_args.SPECIMEN),
Object.assign({versions: VERSIONS.STU3}, observation_args.STATUS),
Object.assign({versions: VERSIONS.STU3}, observation_args.SUBJECT),
Object.assign({versions: VERSIONS.STU3}, observation_args.VALUE_CONCEPT),
Object.assign({versions: VERSIONS.STU3}, observation_args.VALUE_DATE),
Object.assign({versions: VERSIONS.STU3}, observation_args.VALUE_QUANTITY),
Object.assign({versions: VERSIONS.STU3}, observation_args.VALUE_STRING)
],
scopes: read_only_scopes,
>>>>>>>
args: resourceAllArguments,
scopes: read_only_scopes,
<<<<<<<
corsOptions: {methods: ['POST']},
args: resourceAllArguments,
scopes: scopes,
=======
args: [
route_args.VERSION,
common_args._FORMAT,
common_args._CONTENT,
common_args._ID,
common_args._LASTUPDATED,
common_args._PROFILE,
common_args._QUERY,
common_args._SECURITY,
common_args._TAG,
Object.assign({versions: VERSIONS.STU3}, observation_args.BASED_ON),
Object.assign({versions: VERSIONS.STU3}, observation_args.CATEGORY),
Object.assign({versions: VERSIONS.STU3}, observation_args.CODE),
Object.assign({versions: VERSIONS.STU3}, observation_args.CODE_VALUE_CONCEPT),
Object.assign({versions: VERSIONS.STU3}, observation_args.CODE_VALUE_DATE),
Object.assign({versions: VERSIONS.STU3}, observation_args.CODE_VALUE_QUANTITY),
Object.assign({versions: VERSIONS.STU3}, observation_args.CODE_VALUE_STRING),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMBO_CODE),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMBO_CODE_VALUE_CONCEPT),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMBO_CODE_VALUE_QUANTITY),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMBO_DATA_ABSENT_REASON),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMBO_VALUE_CONCEPT),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMBO_VALUE_QUANTITY),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMPONENT_CODE),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMPONENT_CODE_VALUE_CONCEPT),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMPONENT_CODE_VALUE_QUANTITY),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMPONENT_DATA_ABSENT_REASON),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMPONENT_VALUE_CONCEPT),
Object.assign({versions: VERSIONS.STU3}, observation_args.COMPONENT_VALUE_QUANTITY),
Object.assign({versions: VERSIONS.STU3}, observation_args.CONTEXT),
Object.assign({versions: VERSIONS.STU3}, observation_args.DATA_ABSENT_REASON),
Object.assign({versions: VERSIONS.STU3}, observation_args.DATE),
Object.assign({versions: VERSIONS.STU3}, observation_args.DEVICE),
Object.assign({versions: VERSIONS.STU3}, observation_args.ENCOUNTER),
Object.assign({versions: VERSIONS.STU3}, observation_args.IDENTIFIER),
Object.assign({versions: VERSIONS.STU3}, observation_args.METHOD),
Object.assign({versions: VERSIONS.STU3}, observation_args.PATIENT),
Object.assign({versions: VERSIONS.STU3}, observation_args.PERFORMER),
Object.assign({versions: VERSIONS.STU3}, observation_args.RELATED),
Object.assign({versions: VERSIONS.STU3}, observation_args.RELATED_TARGET),
Object.assign({versions: VERSIONS.STU3}, observation_args.RELATED_TYPE),
Object.assign({versions: VERSIONS.STU3}, observation_args.SPECIMEN),
Object.assign({versions: VERSIONS.STU3}, observation_args.STATUS),
Object.assign({versions: VERSIONS.STU3}, observation_args.SUBJECT),
Object.assign({versions: VERSIONS.STU3}, observation_args.VALUE_CONCEPT),
Object.assign({versions: VERSIONS.STU3}, observation_args.VALUE_DATE),
Object.assign({versions: VERSIONS.STU3}, observation_args.VALUE_QUANTITY),
Object.assign({versions: VERSIONS.STU3}, observation_args.VALUE_STRING)
],
scopes: read_only_scopes,
>>>>>>>
args: resourceAllArguments,
scopes: read_only_scopes, |
<<<<<<<
// Validate auth validator
config.auth = loadAuthValidator('auth', config.auth);
// Validate profiles
let profileKeys = Object.keys(config.profiles);
let hasValidProfileConfiguration = profileKeys.every(profileKey => {
return loadProfile(profileKey, config.profiles[profileKey]);
=======
// Validate profiles for any spec provided
let dstu2ProfileKeys = config.profiles.dstu2 ? Object.keys(config.profiles.dstu2) : [];
let stu3ProfileKeys = config.profiles.stu3 ? Object.keys(config.profiles.stu3) : [];
let hasValidDSTU2ProfileConfiguration = dstu2ProfileKeys.every(profileKey => {
return loadProfile(profileKey, config.profiles.dstu2[profileKey]);
});
let hasValidSTU3ProfileConfiguration = stu3ProfileKeys.every(profileKey => {
return loadProfile(profileKey, config.profiles.stu3[profileKey]);
>>>>>>>
// Validate auth validator
config.auth = loadAuthValidator('auth', config.auth);
// Validate profiles for any spec provided
let dstu2ProfileKeys = config.profiles.dstu2 ? Object.keys(config.profiles.dstu2) : [];
let stu3ProfileKeys = config.profiles.stu3 ? Object.keys(config.profiles.stu3) : [];
let hasValidDSTU2ProfileConfiguration = dstu2ProfileKeys.every(profileKey => {
return loadProfile(profileKey, config.profiles.dstu2[profileKey]);
});
let hasValidSTU3ProfileConfiguration = stu3ProfileKeys.every(profileKey => {
return loadProfile(profileKey, config.profiles.stu3[profileKey]); |
<<<<<<<
module.exports = new Rule('Do not use u element', 'Please remove the u element', function(dom) {
'use strict';
dom.$('u').each(function(index, item){
throw dom.$(item).parent().html();
});
=======
exports.uElement = new Rule({
name: 'Do not use u element',
message: 'Please remove the u element',
ruleUrl: 'http://oaa-accessibility.org/rule/71/',
callback: function(dom) {
'use strict';
dom.$('u').each(function(index, item){
throw dom.$(item).parent().html();
});
}
>>>>>>>
module.exports = new Rule({
name: 'Do not use u element',
message: 'Please remove the u element',
ruleUrl: 'http://oaa-accessibility.org/rule/71/',
callback: function(dom) {
'use strict';
dom.$('u').each(function(index, item){
throw dom.$(item).parent().html();
});
} |
<<<<<<<
module.exports = new Rule('No blink or marquee elements', 'You cant use blink or marquee elements', function(dom) {
'use strict';
=======
exports.blinkElement = new Rule({
name: 'No blink or marquee elements',
message: 'You cant use blink or marquee elements',
ruleUrl: 'http://oaa-accessibility.org/rule/68/',
callback: function(dom) {
'use strict';
>>>>>>>
module.exports = new Rule({
name: 'No blink or marquee elements',
message: 'You cant use blink or marquee elements',
ruleUrl: 'http://oaa-accessibility.org/rule/68/',
callback: function(dom) {
'use strict'; |
<<<<<<<
module.exports = new Rule('Do not use i element', 'Please remove the i element', function(dom) {
'use strict';
dom.$('i').each(function(index, item){
throw dom.$(item).parent().html();
});
=======
exports.iElement = new Rule({
name: 'Do not use i element',
message: 'Please remove the i element',
ruleUrl: 'http://oaa-accessibility.org/rule/70/',
callback: function(dom) {
'use strict';
dom.$('i').each(function(index, item){
throw dom.$(item).parent().html();
});
}
>>>>>>>
module.exports = new Rule({
name: 'Do not use i element',
message: 'Please remove the i element',
ruleUrl: 'http://oaa-accessibility.org/rule/70/',
callback: function(dom) {
'use strict';
dom.$('i').each(function(index, item){
throw dom.$(item).parent().html();
});
} |
<<<<<<<
module.exports = new Rule(
'All pages should have lang attr in html tag',
'Please add the lang attribute to the html tag',
function(dom) {
=======
exports.htmlLang = new Rule({
name: 'All pages should have lang attr in html tag',
message: 'Please add the lang attribute to the html tag',
ruleUrl: 'http://oaa-accessibility.org/rule/34/',
callback: function(dom) {
>>>>>>>
module.exports = new Rule({
name: 'All pages should have lang attr in html tag',
message: 'Please add the lang attribute to the html tag',
ruleUrl: 'http://oaa-accessibility.org/rule/34/',
callback: function(dom) { |
<<<<<<<
module.exports = new Rule('Frame must have title attr', 'Please add title attribute to this frame', function(dom) {
'use strict';
=======
exports.frameTitle = new Rule({
name: 'Frame must have title attr',
message: 'Please add title attribute to this frame',
ruleurl: 'http://oaa-accessibility.org/rule/10/',
callback: function(dom) {
'use strict';
>>>>>>>
module.exports = new Rule({
name: 'Frame must have title attr',
message: 'Please add title attribute to this frame',
ruleurl: 'http://oaa-accessibility.org/rule/10/',
callback: function(dom) {
'use strict'; |
<<<<<<<
'input-github-webhook': '../lib/plugins/input/webhooks/github.js',
=======
'azure-event-hub': '../lib/plugins/input/azure-event-hub.js',
>>>>>>>
'input-github-webhook': '../lib/plugins/input/webhooks/github.js',
'azure-event-hub': '../lib/plugins/input/azure-event-hub.js', |
<<<<<<<
let externalHelpersWhitelist = null;
if ( options.externalHelpersWhitelist ) externalHelpersWhitelist = options.externalHelpersWhitelist;
delete options.externalHelpersWhitelist;
=======
let warn = msg => console.warn(msg); // eslint-disable-line no-console
>>>>>>>
let externalHelpersWhitelist = null;
if ( options.externalHelpersWhitelist ) externalHelpersWhitelist = options.externalHelpersWhitelist;
delete options.externalHelpersWhitelist;
let warn = msg => console.warn(msg); // eslint-disable-line no-console |
<<<<<<<
<ColoredChange direction={ direction }>
{ formatNumber(this.store.totalChange, 'USD', { directionSymbol: true }) }
</ColoredChange>
=======
<PriceChange direction={ direction } trigger={ this.store.totalChange }>
{ formatNumber(this.store.totalChange, 'USD', { directionSymbol: true,
minPrecision: true }) }
</PriceChange>
>>>>>>>
<ColoredChange direction={ direction }>
{ formatNumber(this.store.totalChange, 'USD', { directionSymbol: true,
minPrecision: true }) }
</ColoredChange> |
<<<<<<<
const BaseProcess = require('../../lib/mapper').Process;
=======
const bpmnModdle = new BpmnModdle({
camunda: require('camunda-bpmn-moddle/resources/camunda')
});
const ServiceTask = mapper('bpmn:ServiceTask');
>>>>>>>
const BaseProcess = require('../../lib/mapper').Process;
const bpmnModdle = new BpmnModdle({
camunda: require('camunda-bpmn-moddle/resources/camunda')
});
const ServiceTask = mapper('bpmn:ServiceTask'); |
<<<<<<<
expect(instance.variables.taskInput.recurring.taskInput.recurringChild.result[0]).to.equal(10);
testHelpers.expectNoLingeringListenersOnDefinition(instance);
=======
expect(instance.variables.taskInput.recurring.taskInput.recurringChild[0]).to.equal(10);
testHelpers.expectNoLingeringListeners(instance);
>>>>>>>
expect(instance.variables.taskInput.recurring.taskInput.recurringChild[0]).to.equal(10);
testHelpers.expectNoLingeringListenersOnDefinition(instance);
<<<<<<<
expect(instance.variables.taskInput.recurring.result).to.equal([13]);
testHelpers.expectNoLingeringListenersOnDefinition(instance);
=======
expect(instance.variables.sum).to.equal(13);
testHelpers.expectNoLingeringListeners(instance);
>>>>>>>
expect(instance.variables.sum).to.equal(13);
testHelpers.expectNoLingeringListenersOnDefinition(instance); |
<<<<<<<
it("can retrieve spreadsheet row which conforms to query", function(done) {
GoogleSpreadsheets({
key: "0ApDvWFF4RPZBdEFucnJya1hxVG9wZzhJQWZUWkpfekE"
}, function(err, spreadsheet) {
if(err) return done(err);
spreadsheet.worksheets[0].rows({
sq: "hello>1"
}, function(err, result) {
result[0]["hello"].should.equal("2");
result[0]["world"].should.equal("10");
done();
});
});
});
it("can retrieve no rows with query", function(done) {
GoogleSpreadsheets({
key: "0ApDvWFF4RPZBdEFucnJya1hxVG9wZzhJQWZUWkpfekE"
}, function(err, spreadsheet) {
if(err) return done(err);
spreadsheet.worksheets[0].rows({
sq: "hello>2"
}, function(err, result) {
result.length.should.equal(0);
done();
});
});
});
=======
it("fails gracefully on nonexistent spreadsheets", function(done) {
GoogleSpreadsheets({
key: "BACON"
}, function(err) {
err.message.should.equal("HTTP error 400: Bad Request");
done();
});
});
>>>>>>>
it("can retrieve spreadsheet row which conforms to query", function(done) {
GoogleSpreadsheets({
key: "0ApDvWFF4RPZBdEFucnJya1hxVG9wZzhJQWZUWkpfekE"
}, function(err, spreadsheet) {
if(err) return done(err);
spreadsheet.worksheets[0].rows({
sq: "hello>1"
}, function(err, result) {
result[0]["world"].should.equal("10");
result[0]["hello"].should.equal("2");
done();
});
});
});
it("can retrieve no rows with query", function(done) {
GoogleSpreadsheets({
key: "0ApDvWFF4RPZBdEFucnJya1hxVG9wZzhJQWZUWkpfekE"
}, function(err, spreadsheet) {
if(err) return done(err);
spreadsheet.worksheets[0].rows({
sq: "hello>2"
}, function(err, result) {
result.length.should.equal(0);
done();
});
});
});
it("fails gracefully on nonexistent spreadsheets", function(done) {
GoogleSpreadsheets({
key: "BACON"
}, function(err) {
err.message.should.equal("HTTP error 400: Bad Request");
done();
});
}); |
<<<<<<<
=======
/**
* Gets the value of the ugen at the specified path.
*
* @param {String} path the ugen's path within the synth graph
* @return {Number|UGen} a scalar value in the case of a value ugen, otherwise the ugen itself
*/
that.get = function (path) {
return flock.input.get(that.namedNodes, path);
};
>>>>>>>
<<<<<<<
=======
* @param {String} path the ugen's path within the synth graph
* @param {Number || UGenDef} val a scalar value (for Value ugens) or a UGenDef object
* @return {UGen} the newly created UGen that was set at the specified path
*/
that.set = function (path, val, swap) {
return flock.input.set(that.namedNodes, path, val, undefined, function (ugenDef, path, target, prev) {
return flock.synth.ugenValueParser(that, ugenDef, prev, swap);
});
};
/**
>>>>>>>
<<<<<<<
// TODO: At the moment, flock.synth.group attempts to act as a proxy for
// a collection of synths, allowing users to address it as if it were
// a single synth. However, it does nothing to ensure that its contained synths
// are managed properly with the environment. As a result, it will double-generate
// output from each synth unless the user has manually specified their synths with the
// "addToEnvironment: false" option.
// It's also not IoC-enabled, which makes it very diffult to use it in IoC-based
// contexts.
// At very least, it should override the essential flock.nodeList methods and ensure
// that synths added to the group are actively removed from the environment's node list.
=======
>>>>>>>
// TODO: At the moment, flock.synth.group attempts to act as a proxy for
// a collection of synths, allowing users to address it as if it were
// a single synth. However, it does nothing to ensure that its contained synths
// are managed properly with the environment. As a result, it will double-generate
// output from each synth unless the user has manually specified their synths with the
// "addToEnvironment: false" option.
// It's also not IoC-enabled, which makes it very diffult to use it in IoC-based
// contexts.
// At very least, it should override the essential flock.nodeList methods and ensure
// that synths added to the group are actively removed from the environment's node list.
<<<<<<<
=======
>>>>>>>
<<<<<<<
/**
* flock.band provides an IoC-friendly interface for a collection of named synths.
*/
// TODO: Unit tests.
fluid.defaults("flock.band", {
gradeNames: ["fluid.eventedComponent", "autoInit"],
invokers: {
play: {
func: "{that}.events.onPlay.fire"
},
pause: {
func: "{that}.events.onPause.fire"
},
set: {
func: "{that}.events.onSet.fire"
}
},
events: {
onPlay: null,
onPause: null,
onSet: null
},
distributeOptions: {
source: "{that}.options.synthListeners",
removeSource: true,
target: "{that flock.synth}.options.listeners"
},
synthListeners: {
"{band}.events.onPlay": {
func: "{that}.play"
},
"{band}.events.onPause": {
func: "{that}.pause"
},
"{band}.events.onSet": {
func: "{that}.set"
}
}
});
=======
/**
* flock.band provides an IoC-friendly interface for a collection of named synths.
*/
// TODO: Unit tests.
fluid.defaults("flock.band", {
gradeNames: ["fluid.eventedComponent", "autoInit"],
invokers: {
play: {
func: "{that}.events.onPlay.fire"
},
pause: {
func: "{that}.events.onPause.fire"
},
set: {
func: "{that}.events.onSet.fire"
}
},
events: {
onPlay: null,
onPause: null,
onSet: null
},
distributeOptions: {
source: "{that}.options.synthListeners",
removeSource: true,
target: "{that flock.synth}.options.listeners"
},
synthListeners: {
"{band}.events.onPlay": {
func: "{that}.play"
},
"{band}.events.onPause": {
func: "{that}.pause"
}
}
});
>>>>>>>
/**
* flock.band provides an IoC-friendly interface for a collection of named synths.
*/
// TODO: Unit tests.
fluid.defaults("flock.band", {
gradeNames: ["fluid.eventedComponent", "autoInit"],
invokers: {
play: {
func: "{that}.events.onPlay.fire"
},
pause: {
func: "{that}.events.onPause.fire"
},
set: {
func: "{that}.events.onSet.fire"
}
},
events: {
onPlay: null,
onPause: null,
onSet: null
},
distributeOptions: {
source: "{that}.options.synthListeners",
removeSource: true,
target: "{that flock.synth}.options.listeners"
},
synthListeners: {
"{band}.events.onPlay": {
func: "{that}.play"
},
"{band}.events.onPause": {
func: "{that}.pause"
},
"{band}.events.onSet": {
func: "{that}.set"
}
}
}); |
<<<<<<<
chans = settings.chans,
chan,
i,
samp;
// If there are no nodes providing samples, write out silence.
if (evaluator.nodes.length < 1) {
for (chan = 0; chan < chans; chan++) {
flock.generate.silence(e.getChannelData(chan));
}
return;
}
for (i = 0; i < krPeriods; i++) {
var offset = i * blockSize;
evaluator.clearBuses();
evaluator.gen();
// Output the environment's signal
// to this node's output channels.
for (chan = 0; chan < chans; chan++) {
var sourceBuf = buses[chan],
outBuf = e.getChannelData(chan);
// And output each sample.
for (samp = 0; samp < blockSize; samp++) {
outBuf[samp + offset] = sourceBuf[samp];
}
=======
bytesPerSample = m.bytesPerSample,
blockSize = settings.blockSize,
chans = settings.chans,
krPeriods = numBytes / m.bytesPerBlock,
evaluator = that.nodeEvaluator,
outputStream = that.outputStream,
out = new Buffer(numBytes);
if (numBytes < m.bytesPerBlock) {
return;
}
if (evaluator.nodes.length < 1) {
// If there are no nodes providing samples, write out silence.
flock.generate.silence(out);
} else {
for (var i = 0, offset = 0; i < krPeriods; i++, offset += m.bytesPerBlock) {
evaluator.clearBuses();
evaluator.gen();
// Interleave each output channel.
for (var chan = 0; chan < chans; chan++) {
var bus = evaluator.buses[chan];
for (var sampIdx = 0; sampIdx < blockSize; sampIdx++) {
var frameIdx = (sampIdx * chans + chan) * bytesPerSample;
out.writeFloatLE(bus[sampIdx], offset + frameIdx);
}
}
>>>>>>>
bytesPerSample = m.bytesPerSample,
blockSize = settings.blockSize,
chans = settings.chans,
krPeriods = numBytes / m.bytesPerBlock,
evaluator = that.nodeEvaluator,
outputStream = that.outputStream,
out = new Buffer(numBytes);
if (numBytes < m.bytesPerBlock) {
return;
}
if (evaluator.nodes.length < 1) {
// If there are no nodes providing samples, write out silence.
flock.generate.silence(out);
} else {
for (var i = 0, offset = 0; i < krPeriods; i++, offset += m.bytesPerBlock) {
evaluator.clearBuses();
evaluator.gen();
// Interleave each output channel.
for (var chan = 0; chan < chans; chan++) {
var bus = evaluator.buses[chan];
for (var sampIdx = 0; sampIdx < blockSize; sampIdx++) {
var frameIdx = (sampIdx * chans + chan) * bytesPerSample;
out.writeFloatLE(bus[sampIdx], offset + frameIdx);
}
}
<<<<<<<
playState.written += settings.bufferSize * chans;
=======
outputStream.push(out);
playState.written += settings.bufferSize * chans;
>>>>>>>
outputStream.push(out);
playState.written += settings.bufferSize * chans;
<<<<<<<
m.krPeriods = bufSize / settings.blockSize;
that.node = new macaudio.JavaScriptOutputNode(bufSize);
that.node.onaudioprocess = that.writeSamples;
=======
m.bytesPerSample = 4;// Flocking uses Float32s, hence 4 bytes.
m.bytesPerBlock = settings.blockSize * settings.chans * m.bytesPerSample;
m.pushRate = (bufSize / rates.audio) * 1000;
that.speaker = new Speaker({
sampleRate: settings.rates.audio,
float: true,
bitDepth: 32,
signed: true,
endianness: "LE",
samplesPerFrame: settings.blockSize
});
that.outputStream = flock.enviro.nodejs.setupOutputStream(settings);
>>>>>>>
m.bytesPerSample = 4;// Flocking uses Float32s, hence 4 bytes.
m.bytesPerBlock = settings.blockSize * settings.chans * m.bytesPerSample;
m.pushRate = (bufSize / rates.audio) * 1000;
that.speaker = new Speaker({
sampleRate: settings.rates.audio,
float: true,
bitDepth: 32,
signed: true,
endianness: "LE",
samplesPerFrame: settings.blockSize
});
that.outputStream = flock.enviro.nodejs.setupOutputStream(settings);
<<<<<<<
=======
flock.enviro.nodejs.setupOutputStream = function (settings) {
var outputStream = new Readable({
highWaterMark: settings.bufferSize * settings.chans * 4
});
outputStream.bitDepth = 32;
outputStream.float = true
outputStream.signed = true;
outputStream.channels = settings.chans;
outputStream.sampleRate = settings.rates.audio;
outputStream.samplesPerFrame = settings.bufferSize;
return outputStream;
};
>>>>>>>
flock.enviro.nodejs.setupOutputStream = function (settings) {
var outputStream = new Readable({
highWaterMark: settings.bufferSize * settings.chans * 4
});
outputStream.bitDepth = 32;
outputStream.float = true
outputStream.signed = true;
outputStream.channels = settings.chans;
outputStream.sampleRate = settings.rates.audio;
outputStream.samplesPerFrame = settings.bufferSize;
return outputStream;
}; |
<<<<<<<
}, "undefined" == typeof window && "undefined" != typeof module && module.exports && (module.exports = a);
var V = (m = m || require("infusion")).registerNamespace("flock");
=======
}, "undefined" == typeof window && "undefined" != typeof module && module.exports && (module.exports = r);
var D = (m = m || require("infusion")).registerNamespace("flock");
>>>>>>>
}, "undefined" == typeof window && "undefined" != typeof module && module.exports && (module.exports = r);
var V = (m = m || require("infusion")).registerNamespace("flock"); |
<<<<<<<
all: [
"flocking/*.js",
"demos/**/*.js",
"tests/**/*.js",
"!**/third-party/**",
// TODO: Temporary until all playground files are ready for linting.
"!demos/interactive/demos/*.js"
],
=======
all: ["flocking/*.js", "demos/**/*.js", "tests/**/*.js", "nodejs/**/*.js", "!**/third-party/**"],
>>>>>>>
all: [
"flocking/*.js",
"demos/**/*.js",
"tests/**/*.js",
"nodejs/**/*.js",
"!**/third-party/**",
// TODO: Temporary until all playground files are ready for linting.
"!demos/interactive/demos/*.js"
], |
<<<<<<<
'use strict';
import {Rx} from '@cycle/core';
=======
import Cycle from 'cyclejs';
>>>>>>>
import {Rx} from '@cycle/core'; |
<<<<<<<
scope.lazyImage.removeImage();
=======
lazyImage.removeImage();
if(!!$rootScope.lazyImgRefreshEvents) {
for (var i=0; i< $rootScope.lazyImgRefreshEvents.length; i++) {
$rootScope.lazyImgRefreshEvents[i]();
}
$rootScope.lazyImgRefreshEvents = [];
}
>>>>>>>
scope.lazyImage.removeImage();
if(!!$rootScope.lazyImgRefreshEvents) {
for (var i=0; i< $rootScope.lazyImgRefreshEvents.length; i++) {
$rootScope.lazyImgRefreshEvents[i]();
}
$rootScope.lazyImgRefreshEvents = [];
}
<<<<<<<
$rootScope.$on('lazyImg:refresh', function () {
scope.lazyImage.checkImages();
});
}
return {
link: link,
restrict: 'A'
};
}
])
.directive('lazyImgError', [
function () {
'use strict';
function link(scope, element, attributes) {
var deregister = scope.$watch('lazyImage', function(lazyImage) {
lazyImage.setErrorSource(attributes.lazyImgError);
deregister();
});
=======
if(!$rootScope.lazyImgRefreshEvents) {
$rootScope.lazyImgRefreshEvents = [];
}
$rootScope.lazyImgRefreshEvents.push($rootScope.$on('lazyImg:refresh', function () {
lazyImage.checkImages();
}));
>>>>>>>
$rootScope.$on('lazyImg:refresh', function () {
scope.lazyImage.checkImages();
});
}
return {
link: link,
restrict: 'A'
};
}
])
.directive('lazyImgError', [
function () {
'use strict';
function link(scope, element, attributes) {
var deregister = scope.$watch('lazyImage', function(lazyImage) {
lazyImage.setErrorSource(attributes.lazyImgError);
deregister();
});
if(!$rootScope.lazyImgRefreshEvents) {
$rootScope.lazyImgRefreshEvents = [];
}
$rootScope.lazyImgRefreshEvents.push($rootScope.$on('lazyImg:refresh', function () {
lazyImage.checkImages();
})); |
<<<<<<<
=======
jQuery.fn.numberInput = function(increment) {
this.each(function() {
var $self = $(this);
$self.addClass("number-combo-input");
var height = $self.outerHeight() / 2;
var $dom = $('<span>').attr({ 'class': 'number-combo' })
.append($('<a>').attr({ 'class': 'number-combo-button-down',
'href': '#' })
.text('↓'))
.append($('<a>').attr({ 'class': 'number-combo-button-up',
'href': '#' })
.text('↑'));
var $up = $dom.find('.number-combo-button-up').click(_pd(function(event, count) {
count = count || (event.ctrlKey ? increment : 1) || 1;
$self.val(Number($self.val()) + count);
$self.change();
}));
var $down = $dom.find('.number-combo-button-down').click(_pd(function(event, count) {
count = count || (event.ctrlKey ? increment : 1) || 1;
$self.val(Math.max(Number($self.val()) - count, 0));
$self.change();
}));
$.each(['change', 'keypress', 'input'], function(i, event) {
$self.bind(event, function() {
$self.val($self.val().replace(/\D+/, ""));
});
});
$self.keypress(function(event) {
if (event.keyCode == KeyEvent.DOM_VK_UP) {
$up.click();
} else if (event.keyCode == KeyEvent.DOM_VK_DOWN) {
$down.click();
} else if (event.keyCode == KeyEvent.DOM_VK_PAGE_UP) {
$up.trigger('click', increment);
} else if (event.keyCode == KeyEvent.DOM_VK_PAGE_DOWN) {
$down.trigger('click', increment);
}
});
$self.after($dom);
$dom.prepend(this);
});
return this;
};
>>>>>>>
jQuery.fn.numberInput = function(increment) {
this.each(function() {
var $self = $(this);
$self.addClass("number-combo-input");
var height = $self.outerHeight() / 2;
var $dom = $('<span>').attr({ 'class': 'number-combo' })
.append($('<a>').attr({ 'class': 'number-combo-button-down',
'href': '#' })
.text('↓'))
.append($('<a>').attr({ 'class': 'number-combo-button-up',
'href': '#' })
.text('↑'));
var $up = $dom.find('.number-combo-button-up').click(_pd(function(event, count) {
count = count || (event.ctrlKey ? increment : 1) || 1;
$self.val(Number($self.val()) + count);
$self.change();
}));
var $down = $dom.find('.number-combo-button-down').click(_pd(function(event, count) {
count = count || (event.ctrlKey ? increment : 1) || 1;
$self.val(Math.max(Number($self.val()) - count, 0));
$self.change();
}));
$.each(['change', 'keypress', 'input'], function(i, event) {
$self.bind(event, function() {
$self.val($self.val().replace(/\D+/, ""));
});
});
$self.keypress(function(event) {
if (event.keyCode == KeyEvent.DOM_VK_UP) {
$up.click();
} else if (event.keyCode == KeyEvent.DOM_VK_DOWN) {
$down.click();
} else if (event.keyCode == KeyEvent.DOM_VK_PAGE_UP) {
$up.trigger('click', increment);
} else if (event.keyCode == KeyEvent.DOM_VK_PAGE_DOWN) {
$down.trigger('click', increment);
}
});
$self.after($dom);
$dom.prepend(this);
});
return this;
}; |
<<<<<<<
=======
// TODO: what happens if this function is called while
// the site is already being built?
>>>>>>>
<<<<<<<
if (err)
return callback('Error: Default template missing');
registerTemplates(site, function (err) {
var newRoot = new Page(site, null, '', null, function(err) {
site.modified = Date.now();
site.root = newRoot;
callback(err);
});
=======
if (err) {
return callback('Error: Default template missing');
}
registerTemplates(site, function (err) {
site.root = new Page(site, null, '', null, function(err) {
site.modified = Date.now();
if (site.availableLangs.length > 1) {
relinkParents(site.root);
}
callback(err);
});
>>>>>>>
if (err)
return callback('Error: Default template missing');
registerTemplates(site, function (err) {
var newRoot = new Page(site, null, '', null, function(err) {
site.modified = Date.now();
if (site.availableLangs.length > 1) {
relinkParents(newRoot);
}
site.root = newRoot;
callback(err);
});
<<<<<<<
function registerTemplates(site, callback) {
var uri = getTemplateDirectory(site);
fsUtil.listDirectories(uri, function(err, files) {
if (err || !files)
return callback(err);
async.each(files, function (file, cb) {
site._addType(file, cb);
}, callback);
});
}
=======
function relinkParents(page) {
page.children.each(function(child, i) {
// Link to correct parent
for (var lang in page.translatedCopies) {
if (child.hasLang(lang)) {
var parent = page.getLang(lang);
child.getLang(lang).parent = parent;
parent.children[i] = parent.children[child.slug] = child.getLang(lang);
}
}
// Recursive
if (child.hasChildren()) {
relinkParents(child);
}
});
}
function registerTemplates(site, callback) {
var uri = getTemplateDirectory(site);
fsUtil.listDirectories(uri, function(err, files) {
if (err || !files)
return callback(err);
async.each(files, function (file, cb) {
site._addType(file, cb);
}, callback);
});
}
>>>>>>>
function relinkParents(page) {
page.children.each(function(child, i) {
// Link to correct parent
for (var lang in page.translatedCopies) {
if (child.hasLang(lang)) {
var parent = page.getLang(lang);
child.getLang(lang).parent = parent;
parent.children[i] = parent.children[child.slug] = child.getLang(lang);
}
}
// Recursive
if (child.hasChildren()) {
relinkParents(child);
}
});
}
function registerTemplates(site, callback) {
var uri = getTemplateDirectory(site);
fsUtil.listDirectories(uri, function(err, files) {
if (err || !files)
return callback(err);
async.each(files, function (file, cb) {
site._addType(file, cb);
}, callback);
});
}
<<<<<<<
var then = new Date(),
page = site.root.get(req.params[0]);
if (page) {
res.setHeader('Content-Type', 'text/html; charset=utf-8');
res.end(page.template('html', {
_activePage: page,
request: req,
query: req.query,
number: req.params[1] && +req.params[1]
}));
=======
if (site.availableLangs) {
handleLanguage(req, res, next, site);
>>>>>>>
if (site.availableLangs) {
handleLanguage(req, res, next, site); |
<<<<<<<
Ideogram.prototype.rotateAndToggleDisplay = function(chromosome) {
/*
* Do nothing if taxId not defined. But it should be defined.
* To fix that bug we should have a way to find chromosome set number.
*/
if (! this.config.taxid) {
return;
=======
Ideogram.prototype.rotateAndToggleDisplay = function(chromosomeID) {
var id, chr, chrModel, chrIndex, chrMargin, chrWidth,
chrHeight, ideoBox, ideoWidth, ideoHeight, scaleX, scaleY,
initOrientation, currentOrientation,
cx, cy, cy2,
ideo = this;
id = chromosomeID;
chr = d3.select("#" + id);
chrModel = ideo.chromosomes[ideo.config.taxid][id.split("-")[0].split("chr")[1]];
chrIndex = chrModel["chrIndex"];
otherChrs = d3.selectAll("g.chromosome").filter(function(d, i) { return this.id !== id; });
initOrientation = ideo.config.orientation;
currentOrientation = chr.attr("data-orientation");
chrMargin = this.config.chrMargin * chrIndex;
chrWidth = this.config.chrWidth;
ideoBox = d3.select("#_ideogram").nodes()[0].getBoundingClientRect();
ideoHeight = ideoBox.height;
ideoWidth = ideoBox.width;
if (initOrientation == "vertical") {
chrLength = chr.nodes()[0].getBoundingClientRect().height;
scaleX = (ideoWidth/chrLength)*0.97;
scaleY = 1.5;
scale = "scale(" + scaleX + ", " + scaleY + ")";
inverseScaleX = 2/scaleX;
inverseScaleY = 1;
if (!this.config.showBandLabels) {
chrIndex += 2;
}
cx = chrMargin + (chrWidth-4)*(chrIndex - 1) - 30;
cy = cx + 30;
verticalTransform = "rotate(90, " + cx + ", " + cy + ")";
cy2 = -1*(chrMargin - this.config.annotTracksHeight)*scaleY;
if (this.config.showBandLabels) {
cy2 += 25;
}
horizontalTransform =
"rotate(0)" +
"translate(20, " + cy2 + ")" +
scale;
} else {
chrLength = chr.nodes()[0].getBoundingClientRect().width;
scaleX = (ideoHeight/chrLength)*0.97;
scaleY = 1.5;
scale = "scale(" + scaleX + ", " + scaleY + ")";
inverseScaleX = 2/scaleX;
inverseScaleY = 1;
var bandPad = 20;
if (!this.config.showBandLabels) {
chrIndex += 2;
bandPad = 15;
}
cx = chrMargin + (chrWidth-bandPad)*(chrIndex - 2);
cy = cx + 5;
if (!this.config.showBandLabels) {
cx += bandPad;
cy += bandPad;
}
verticalTransform = (
"rotate(90, " + cx + ", " + cy + ")" +
scale
);
horizontalTransform = "";
}
inverseScale = "scale(" + inverseScaleX + "," + inverseScaleY + ")";
if (currentOrientation != "vertical") {
if (initOrientation == "horizontal") {
otherChrs.style("display", "none");
}
chr.selectAll(".annot>path")
.attr("transform", (initOrientation == "vertical" ? "" : inverseScale));
chr
.attr("data-orientation", "vertical")
.transition()
.attr("transform", verticalTransform)
.on("end", function() {
if (initOrientation == "vertical") {
scale = "";
} else {
scale = {"x": inverseScaleY, "y": inverseScaleX};
}
ideo.rotateBandLabels(chr, chrIndex, scale);
ideo.rotateChromosomeLabels(chr, chrIndex, "horizontal", scale);
if (initOrientation == "vertical") {
otherChrs.style("display", "");
}
});
} else {
chr.attr("data-orientation", "");
if (initOrientation == "vertical") {
otherChrs.style("display", "none");
}
chr.selectAll(".annot>path")
.transition()
.attr("transform", (initOrientation == "vertical" ? inverseScale : ""));
chr
.transition()
.attr("transform", horizontalTransform)
.on("end", function() {
if (initOrientation == "horizontal") {
if (currentOrientation == "vertical") {
inverseScale = {"x": 1, "y": 1};
} else {
inverseScale = "";
}
} else {
inverseScale = {"x": inverseScaleX, "y": inverseScaleY};
}
ideo.rotateBandLabels(chr, chrIndex, inverseScale);
ideo.rotateChromosomeLabels(chr, chrIndex, "", inverseScale);
if (initOrientation == "horizontal") {
otherChrs.style("display", "");
}
});
>>>>>>>
Ideogram.prototype.rotateAndToggleDisplay = function(chromosome) {
/*
* Do nothing if taxId not defined. But it should be defined.
* To fix that bug we should have a way to find chromosome set number.
*/
if (! this.config.taxid) {
return;
<<<<<<<
=======
Ideogram.prototype.putChromosomesInRows = function() {
var ideo = this,
rows = ideo.config.rows,
chrs,
chrsPerRow,
rowIndex, rowIndexStop, range,
riCorrection,
rowHeight, chrIndex, chrWidth, chrMargin;
chrsPerRow = Math.floor(ideo.numChromosomes/rows);
riCorrection = 0;
if (d3.select("svg > *").nodes()[0].tagName !== "g") {
// Accounts for cross-browser differences in handling of nth-child
riCorrection = 2;
}
for (var i = 1; i < rows; i++) {
rowIndex = (chrsPerRow * i) + 1 + riCorrection;
rowIndexStop = rowIndex + chrsPerRow;
range = "nth-child(n+" + rowIndex + "):nth-child(-n+" + rowIndexStop + ")";
rowHeight = ideo.config.chrHeight + 20;
chrIndex = rowIndex + 1 - riCorrection;
chrWidth = ideo.config.chrWidth;
chrMargin = ideo.config.chrMargin * chrIndex;
if (!ideo.config.showBandLabels) {
chrIndex += 2;
}
if (ideo.config.showChromosomeLabels) {
rowHeight += 12; // TODO: Account for variable font size
}
// Similar to "tPadding" in other contexts
rowWidth = ((chrWidth-4)*chrIndex) + 8 + chrMargin;
//rowWidth = 6*chrIndex - 57.24 + rowWidth;
d3.selectAll("#_ideogram .chromosome:" + range)
.attr("transform", function(d, j) {
var currentTransform, translation;
currentTransform = d3.select(this).attr("transform");
translation = "translate(" + rowHeight + ", " + rowWidth + ")";
return currentTransform + translation;
});
}
};
>>>>>>>
<<<<<<<
chrSetNumber = 0,
i, j, chrs, chromosome, chromosomeModel;
=======
i, j, chrs, chromosome, chromosomeModel
tmpChrs = [];
>>>>>>>
chrSetNumber = 0,
i, j, chrs, chromosome, chromosomeModel;
<<<<<<<
/*
* Append cromosome set container.
*/
var container = d3.select("svg")
.append("g")
.attr("class", "chromosome-set-container")
.attr("transform", ideo._layout.getChromosomeSetTranslate(chrSetNumber ++))
.attr("id", chromosomeModel.id + "-chromosome-set");
var shape;
for (var k = 0; k < this._ploidy.getChromosomesNumber(j); k ++) {
shape = ideo.drawChromosome(chromosomeModel, chrIndex - 1, container, k);
}
defs.append("clipPath")
.attr("id", chromosomeModel.id + "-chromosome-set-clippath")
.selectAll('path')
.data(shape)
.enter()
.append('path')
.attr('d', function(d) {
return d.path;
}).attr('class', function(d) {
return d['class'];
});
=======
ideo.drawChromosome(chromosomeModel, chrIndex);
if (typeof bands === "undefined") {
ideo.chromosomes[taxid][chromosome.name] = chromosomeModel;
tmpChrs[j] = chromosomeModel.name;
}
}
if (typeof bands === "undefined") {
ideo.config.chromosomes[taxid] = tmpChrs;
>>>>>>>
/*
* Append cromosome set container.
*/
var container = d3.select("svg")
.append("g")
.attr("class", "chromosome-set-container")
.attr("data-set-number", j)
.attr("transform", ideo._layout.getChromosomeSetTranslate(chrSetNumber ++))
.attr("id", chromosomeModel.id + "-chromosome-set");
var shape;
for (var k = 0; k < this._ploidy.getChromosomesNumber(j); k ++) {
shape = ideo.drawChromosome(chromosomeModel, chrIndex - 1, container, k);
}
defs.append("clipPath")
.attr("id", chromosomeModel.id + "-chromosome-set-clippath")
.selectAll('path')
.data(shape)
.enter()
.append('path')
.attr('d', function(d) {
return d.path;
}).attr('class', function(d) {
return d['class'];
});
<<<<<<<
=======
var ideoHeight;
if (ideo.config.orientation === "vertical") {
ideoHeight = ideo.config.chrHeight + 40;
if (ideo.config.rows > 1) {
ideoHeight = ideo.config.rows * (ideoHeight - 30);
}
} else {
ideoHeight = ideo.config.chrMargin * ideo.numChromosomes + 30;
}
>>>>>>> |
<<<<<<<
var chokidar = require('chokidar');
=======
var jsYaml = require('js-yaml');
>>>>>>>
var jsYaml = require('js-yaml');
var chokidar = require('chokidar');
<<<<<<<
=======
// Aggregate information about APIs.
var apis = [];
program.args.forEach(function(argument) {
// Try to resolve the argument:
var result = fs.lstatSync(path.resolve(argument));
if (result) {
if (result.isFile()) {
apis.push(argument);
}
}
});
// Options for the swagger docs
var options = {
// Import swaggerDefinitions
swaggerDefinition: swaggerDefinition,
// Path to the API docs
apis: apis,
};
// Initialize swagger-jsdoc -> returns validated JSON or YAML swagger spec
var swaggerSpec;
// Create the output file with swagger specification.
var ext = path.extname(output);
if (ext === '.yml' || ext === '.yaml') {
swaggerSpec = jsYaml.dump(swaggerJSDoc(options));
} else {
swaggerSpec = JSON.stringify(swaggerJSDoc(options), null, 2);
}
fs.writeFile(output, swaggerSpec, function(err) {
if (err) {
throw err;
}
console.log('Swagger specification created successfully.');
});
>>>>>>> |
<<<<<<<
adblocker.isReady().then(() => adblocker.action('addWhiteListCheck', url => isWhitelisted({ sourceUrl: url })));
=======
adblocker.isReady().then(() =>
Promise.all([
adblocker.action('removePipelineStep', 'checkWhitelist'),
adblocker.action('addPipelineStep', {
name: 'checkGhosteryWhitelist',
spec: 'break',
fn: state => !isWhitelisted(state),
before: ['checkBlocklist']
}),
adblocker.action('addWhiteListCheck',
url => isWhitelisted({ tabUrl: url }))
])
);
>>>>>>>
adblocker.isReady().then(() => adblocker.action('addWhiteListCheck', url => isWhitelisted({ tabUrl: url }))); |
<<<<<<<
checkForRelativePaths: state.settings.getIn(['mjml', 'checkForRelativePaths']),
=======
preventAutoSave: state.settings.getIn(['editor', 'preventAutoSave']),
>>>>>>>
checkForRelativePaths: state.settings.getIn(['mjml', 'checkForRelativePaths']),
preventAutoSave: state.settings.getIn(['editor', 'preventAutoSave']), |
<<<<<<<
const checkForRelativePaths = settings.getIn(['mjml', 'checkForRelativePaths'], false)
=======
const preventAutoSave = settings.getIn(['editor', 'preventAutoSave'], false)
>>>>>>>
const checkForRelativePaths = settings.getIn(['mjml', 'checkForRelativePaths'], false)
const preventAutoSave = settings.getIn(['editor', 'preventAutoSave'], false)
<<<<<<<
<CheckBox
className="tooltip-trigger"
value={checkForRelativePaths}
onChange={this.changeMJMLSetting('checkForRelativePaths')}
>
{'Warn for relative paths on HTML export'}
<small className="tooltip tooltip-up">
Relative Paths like /image.jpg are usually not supported in Email Clients. This
setting warns you if such are found in the code.
</small>
</CheckBox>
=======
<MjmlConfigPath />
>>>>>>>
<CheckBox
className="tooltip-trigger"
value={checkForRelativePaths}
onChange={this.changeMJMLSetting('checkForRelativePaths')}
>
{'Warn for relative paths on HTML export'}
<small className="tooltip tooltip-up">
Relative Paths like /image.jpg are usually not supported in Email Clients. This
setting warns you if such are found in the code.
</small>
</CheckBox>
<MjmlConfigPath /> |
<<<<<<<
appState: [],
toggleTool: false,
clickData: [],
schema: ''
=======
appState: []
>>>>>>>
appState: [],
schema: ''
<<<<<<<
fetchSchemaFromGraphQLServer() {
fetch("http://localhost:4000/graphql", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ query: introspectionQuery })
})
.then(res => res.json())
.then(json =>
this.setState({
schema: JSON.stringify(json.data)
})
);
}
componentDidMount() {
this.fetchSchemaFromGraphQLServer();
}
handleNodeClick(data, event) {
//toggles true and false
this.setState({ toggleTool: !this.state.toggleTool, clickData: data });
// console.log(this.state.clickData, 'this is clickData after setState') //grabs entire node data
console.log(this.state.toggleTool, "after setState");
}
=======
>>>>>>>
fetchSchemaFromGraphQLServer() {
fetch("http://localhost:4000/graphql", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ query: introspectionQuery })
})
.then(res => res.json())
.then(json =>
this.setState({
schema: JSON.stringify(json.data)
})
);
}
componentDidMount() {
this.fetchSchemaFromGraphQLServer();
}
handleNodeClick(data, event) {
//toggles true and false
this.setState({ toggleTool: !this.state.toggleTool, clickData: data });
// console.log(this.state.clickData, 'this is clickData after setState') //grabs entire node data
console.log(this.state.toggleTool, "after setState");
} |
<<<<<<<
=======
// Map the settings to the renderConfig object.
// @see: main.js settings init default for explanations and default values.
function setRenderSettings() {
renderConfig.flattenResolution = app.settings.v.flatten;
renderConfig.lineEndPreShutoff = app.settings.v.shutoff;
renderConfig.startWait = app.settings.v.startwait;
renderConfig.endWait = app.settings.v.endwait;
renderConfig.shadeChangeWait = app.settings.v.changewait;
renderConfig.useLineFill = app.settings.v.uselinefill;
renderConfig.useShortest = app.settings.v.useshortest;
renderConfig.fillSpacing = app.settings.v.fillspacing;
renderConfig.fillAngle = app.settings.v.fillangle;
renderConfig.fillGroupThreshold = app.settings.v.fillthresh;
renderConfig.shapeFillWidth = app.settings.v.shapefillwidth;
renderConfig.botSpeed = parseInt(
(app.settings.v.botspeed / 100) * botSpeedMax,
10
);
renderConfig.useColorSpeed = app.settings.v.usecolorspeed;
renderConfig.botColorSpeed = [
parseInt((app.settings.v.botspeedcolor1 / 100) * botSpeedMax, 10),
parseInt((app.settings.v.botspeedcolor2 / 100) * botSpeedMax, 10),
parseInt((app.settings.v.botspeedcolor3 / 100) * botSpeedMax, 10),
parseInt((app.settings.v.botspeedcolor4 / 100) * botSpeedMax, 10)
];
}
>>>>>>>
<<<<<<<
mainWindow.overlay.windows.export.filePath = filePath;
mainWindow.overlay.toggleWindow('export', true);
=======
// Verify file extension
if (filePath.split('.').pop().toLowerCase() !== 'gcode') {
filePath += '.gcode';
}
// Throw up the overlay and activate the exporting note.
toggleOverlay(true, function(){
$('#exporting').fadeIn('slow', function(){
// Run in a timeout to allow the previous code to run first.
setTimeout(function() {
try {
fs.writeFileSync(
filePath,
gcRender(menu === 'file.exportmirrored')
); // Write file!
} catch(e) {
console.error(e);
// Catch errors in export.
toggleOverlay(false);
$('#exporting').fadeOut('slow',function(){
// Notify user
toastr.error(
i18n.t('export.err', {file: path.parse(filePath).base})
);
});
}
toggleOverlay(false);
$('#exporting').fadeOut('slow',function(){
// Notify user
toastr.success(
i18n.t('export.note', {file: path.parse(filePath).base})
);
});
}, 200);
});
});
>>>>>>>
mainWindow.overlay.windows.export.filePath = filePath;
mainWindow.overlay.toggleWindow('export', true); |
<<<<<<<
segment = path = addselect = null;
=======
segment = path = selectChange = null;
console.log('shift?', event.modifiers.shift);
>>>>>>>
segment = path = selectChange = null;
<<<<<<<
if (paper.selectRect !== null) paper.selectRect.remove();
=======
console.log('INIT Selection');
if (paper.selectRect !== null) paper.deselect();
>>>>>>>
if (paper.selectRect !== null) paper.deselect(); |
<<<<<<<
// window.addEventListener('run-traverser', () => {
// console.log('run the traverser!')
// setHook();
// reactGlobalHook.onCommitFiberRoot();
// })
=======
window.addEventListener('run-traverser', () => {
console.log('run the traverser!')
setHook();
reactGlobalHook.onCommitFiberRoot();
})
>>>>>>>
// window.addEventListener('run-traverser', () => {
// console.log('run the traverser!')
// setHook();
// reactGlobalHook.onCommitFiberRoot();
// })
<<<<<<<
=======
>>>>>>> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.