conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
// Process the reports and store them in Ion
const simplifiedReports = [];
=======
// Process the reports and store them in Onyx
>>>>>>>
// Process the reports and store them in Onyx
const simplifiedReports = [];
<<<<<<<
* Update the lastReadActionID in local memory
=======
* Update the lastReadActionID in Onyx and local memory.
>>>>>>>
* Update the lastReadActionID in local memory
<<<<<<<
// Update the report optimistically
Ion.merge(`${IONKEYS.COLLECTION.REPORT}${reportID}`, {
=======
// Update the lastReadActionID on the report optimistically
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {
>>>>>>>
// Update the report optimistically
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, { |
<<<<<<<
var strings = require('../../resources/index');
var wrapCliCallback = require('../wrap-cli-callback');
=======
const colors = require('colors/safe');
const strings = require('../../resources/index');
const wrapCliCallback = require('../wrap-cli-callback');
>>>>>>>
const strings = require('../../resources/index');
const wrapCliCallback = require('../wrap-cli-callback');
<<<<<<<
=======
const log = {
err: function(msg){ return logger.log(colors.red(msg)); },
ok: function(msg){ return logger.log(colors.green(msg)); },
warn: function(msg){ return logger.log(colors.yellow(msg)); }
};
>>>>>>> |
<<<<<<<
var expect = require('chai').expect;
var path = require('path');
var sinon = require('sinon');
=======
const colors = require('colors/safe');
const expect = require('chai').expect;
const path = require('path');
const sinon = require('sinon');
>>>>>>>
const expect = require('chai').expect;
const path = require('path');
const sinon = require('sinon');
<<<<<<<
var execute = function(compress, cb){
logSpy.err = sinon.stub();
logSpy.ok = sinon.stub();
logSpy.warn = sinon.stub();
=======
const execute = function(compress, cb){
logSpy.log = sinon.stub();
>>>>>>>
const execute = function(compress, cb){
logSpy.err = sinon.stub();
logSpy.ok = sinon.stub();
logSpy.warn = sinon.stub();
<<<<<<<
var message = logSpy.warn.args[0][0],
=======
const message = logSpy.log.args[0][0],
>>>>>>>
const message = logSpy.warn.args[0][0],
<<<<<<<
var warnMessage = logSpy.warn.args[0][0],
okMessage = logSpy.ok.args[0][0],
=======
const warnMessage = logSpy.log.args[0][0],
okMessage = logSpy.log.args[1][0],
>>>>>>>
const warnMessage = logSpy.warn.args[0][0],
okMessage = logSpy.ok.args[0][0], |
<<<<<<<
var expect = require('chai').expect;
var sinon = require('sinon');
=======
const colors = require('colors/safe');
const expect = require('chai').expect;
const sinon = require('sinon');
>>>>>>>
const expect = require('chai').expect;
const sinon = require('sinon');
<<<<<<<
var execute = function(){
logSpy.err = sinon.spy();
logSpy.ok = sinon.spy();
registryFacade({}, function(){});
=======
const execute = function(){
logSpy.log = sinon.spy();
registryFacade({ }, function(){});
>>>>>>>
const execute = function(){
logSpy.err = sinon.spy();
logSpy.ok = sinon.spy();
registryFacade({}, function(){}); |
<<<<<<<
export function checkValidFile(value) {
=======
export default function checkValidInt(value) {
>>>>>>>
export default function checkValidFile(value) { |
<<<<<<<
var strings = require('../../resources/index');
var wrapCliCallback = require('../wrap-cli-callback');
=======
const colors = require('colors/safe');
const strings = require('../../resources/index');
const wrapCliCallback = require('../wrap-cli-callback');
>>>>>>>
const strings = require('../../resources/index');
const wrapCliCallback = require('../wrap-cli-callback');
<<<<<<<
=======
const log = {
err: function(msg){ return logger.log(colors.red(msg)); },
ok: function(msg){ return logger.log(colors.green(msg)); },
warn: function(msg){ return logger.log(colors.yellow(msg)); }
};
>>>>>>> |
<<<<<<<
var expect = require('chai').expect;
var sinon = require('sinon');
=======
const colors = require('colors/safe');
const expect = require('chai').expect;
const sinon = require('sinon');
>>>>>>>
const expect = require('chai').expect;
const sinon = require('sinon');
<<<<<<<
var execute = function(){
logSpy.err = sinon.spy();
logSpy.ok = sinon.spy();
=======
const execute = function(){
logSpy.log = sinon.spy();
>>>>>>>
const execute = function(){
logSpy.err = sinon.spy();
logSpy.ok = sinon.spy(); |
<<<<<<<
var expect = require('chai').expect;
var sinon = require('sinon');
=======
const colors = require('colors/safe');
const expect = require('chai').expect;
const sinon = require('sinon');
>>>>>>>
const expect = require('chai').expect;
const sinon = require('sinon');
<<<<<<<
var execute = function(dirName, port){
logSpy.err = sinon.spy();
logSpy.warn = () => {};
=======
const execute = function(dirName, port){
logSpy.logNoNewLine = sinon.spy();
logSpy.log = sinon.spy();
>>>>>>>
const execute = function(dirName, port){
logSpy.err = sinon.spy();
logSpy.warn = () => {}; |
<<<<<<<
var expect = require('chai').expect;
var sinon = require('sinon');
=======
const colors = require('colors/safe');
const expect = require('chai').expect;
const sinon = require('sinon');
>>>>>>>
const expect = require('chai').expect;
const sinon = require('sinon');
<<<<<<<
var execute = function(componentName, templateType){
logSpy.err = sinon.spy();
logSpy.ok = sinon.spy();
=======
const execute = function(componentName, templateType){
logSpy.log = sinon.spy();
>>>>>>>
const execute = function(componentName, templateType){
logSpy.err = sinon.spy();
logSpy.ok = sinon.spy();
<<<<<<<
var expected = 'An error happened when initialising the component: the name is not valid. Allowed characters are alphanumeric, _, -';
expect(logSpy.err.args[0][0]).to.equal(expected);
=======
const expected = 'An error happened when initialising the component: the name is not valid. Allowed characters are alphanumeric, _, -';
expect(logSpy.log.args[0][0]).to.equal(colors.red(expected));
>>>>>>>
const expected = 'An error happened when initialising the component: the name is not valid. Allowed characters are alphanumeric, _, -';
expect(logSpy.err.args[0][0]).to.equal(expected);
<<<<<<<
var expected = 'An error happened when initialising the component: the name is not valid. Allowed characters are alphanumeric, _, -';
expect(logSpy.err.args[0][0]).to.equal(expected);
=======
const expected = 'An error happened when initialising the component: the name is not valid. Allowed characters are alphanumeric, _, -';
expect(logSpy.log.args[0][0]).to.equal(colors.red(expected));
>>>>>>>
const expected = 'An error happened when initialising the component: the name is not valid. Allowed characters are alphanumeric, _, -';
expect(logSpy.err.args[0][0]).to.equal(expected);
<<<<<<<
var expected = 'An error happened when initialising the component: the template is not valid. Allowed values are handlebars and jade';
expect(logSpy.err.args[0][0]).to.equal(expected);
=======
const expected = 'An error happened when initialising the component: the template is not valid. Allowed values are handlebars and jade';
expect(logSpy.log.args[0][0]).to.equal(colors.red(expected));
>>>>>>>
const expected = 'An error happened when initialising the component: the template is not valid. Allowed values are handlebars and jade';
expect(logSpy.err.args[0][0]).to.equal(expected); |
<<<<<<<
if (typeof customResponses[lang] !== 'undefined') {
t.equal(body, customResponses[lang], 'got correct response from ' + lang);
=======
var doCRLF = ["python", "python3"];
var crlf = (process.platform == 'win32')?'\r\n':'\n';
if (noCarriageReturn.indexOf(lang) !== -1) {
t.equal(body, 'hello world', 'got correct response from ' + lang);
} else if (doCRLF.indexOf(lang) !== -1) {
t.equal(body, 'hello world'+crlf, 'got correct response from ' + lang);
>>>>>>>
if (typeof customResponses[lang] !== 'undefined') {
t.equal(body, customResponses[lang], 'got correct response from ' + lang);
}
var doCRLF = ["python", "python3"];
var crlf = (process.platform == 'win32')?'\r\n':'\n';
if (noCarriageReturn.indexOf(lang) !== -1) {
t.equal(body, 'hello world', 'got correct response from ' + lang);
} else if (doCRLF.indexOf(lang) !== -1) {
t.equal(body, 'hello world'+crlf, 'got correct response from ' + lang); |
<<<<<<<
var logger = { err: sinon.stub(), warn: () => {} };
=======
const logger = { log: sinon.stub() };
>>>>>>>
const logger = { err: sinon.stub(), warn: () => {} };
<<<<<<<
var logger = { err: sinon.stub(), warn: () => {} };
=======
const logger = { log: sinon.stub() };
>>>>>>>
const logger = { err: sinon.stub(), warn: () => {} }; |
<<<<<<<
=======
const log = {
err: function(msg){ return logger.log(colors.red(msg)); },
ok: function(msg){ return logger.log(colors.green(msg)); },
warn: function(msg, noNewLine){ return logger[noNewLine ? 'logNoNewLine' : 'log'](colors.yellow(msg)); }
};
>>>>>>>
<<<<<<<
if(!!err){
logger.err(err.toString());
=======
if(err){
log.err(err.toString());
>>>>>>>
if(err){
logger.err(err.toString());
<<<<<<<
if(!!err){
logger.err(format(strings.errors.generic, err));
=======
if(err){
log.err(format(strings.errors.generic, err));
>>>>>>>
if(err){
logger.err(format(strings.errors.generic, err));
<<<<<<<
if(!!error){
var errorDescription = ((error instanceof SyntaxError) || !!error.message) ? error.message : error;
logger.err(format(strings.errors.cli.PACKAGING_FAIL, componentsDirs[i], errorDescription));
logger.warn(strings.messages.cli.RETRYING_10_SECONDS);
=======
if(error){
const errorDescription = ((error instanceof SyntaxError) || !!error.message) ? error.message : error;
log.err(format(strings.errors.cli.PACKAGING_FAIL, componentsDirs[i], errorDescription));
log.warn(strings.messages.cli.RETRYING_10_SECONDS);
>>>>>>>
if(error){
const errorDescription = ((error instanceof SyntaxError) || !!error.message) ? error.message : error;
logger.err(format(strings.errors.cli.PACKAGING_FAIL, componentsDirs[i], errorDescription));
logger.warn(strings.messages.cli.RETRYING_10_SECONDS);
<<<<<<<
var loadDependencies = function(components, cb){
logger.warn(strings.messages.cli.CHECKING_DEPENDENCIES, true);
=======
const loadDependencies = function(components, cb){
log.warn(strings.messages.cli.CHECKING_DEPENDENCIES, true);
>>>>>>>
const loadDependencies = function(components, cb){
logger.warn(strings.messages.cli.CHECKING_DEPENDENCIES, true); |
<<<<<<<
this.canvas = options.canvas;
this.context = this.canvas.getContext('2d');
=======
this.context = options.canvas;
this.context.imageSmoothingEnabled = false;
this.context.mozImageSmoothingEnabled = false;
this.context.oImageSmoothingEnabled = false;
this.context.webkitImageSmoothingEnabled = false;
>>>>>>>
this.canvas = options.canvas;
this.context = this.canvas.getContext('2d');
this.context.imageSmoothingEnabled = false;
this.context.mozImageSmoothingEnabled = false;
this.context.oImageSmoothingEnabled = false;
this.context.webkitImageSmoothingEnabled = false; |
<<<<<<<
node = ((renderer.getNativeFromInternal(id): any): HTMLElement);
=======
nodes = ((renderer.findNativeByFiberID(id): any): ?Array<HTMLElement>);
>>>>>>>
nodes = ((renderer.getNativeFromInternal(id): any): ?Array<HTMLElement>); |
<<<<<<<
=======
findNativeByFiberID: (id: number) => ?Array<NativeType>,
>>>>>>>
<<<<<<<
getCommitDetails: (rootID: number, commitIndex: number) => CommitDetails,
getFiberCommits: (rootID: number, fiberID: number) => FiberCommits,
getInteractions: (rootID: number) => Interactions,
getInternalIDFromNative: GetInternalIDFromNative,
getNativeFromInternal: GetNativeFromInternal,
getProfilingDataForDownload: (rootID: number) => Object,
getProfilingSummary: (rootID: number) => ProfilingSummary,
handleCommitFiberRoot: (fiber: Object) => void,
=======
getBestMatchForTrackedPath: () => PathMatch | null,
getFiberIDFromNative: (
component: NativeType,
findNearestUnfilteredAncestor?: boolean
) => number | null,
getProfilingData(): ProfilingDataBackend,
getOwnersList: (id: number) => Array<Owner> | null,
getPathForElement: (id: number) => Array<PathFrame> | null,
handleCommitFiberRoot: (fiber: Object, commitPriority?: number) => void,
>>>>>>>
getBestMatchForTrackedPath: () => PathMatch | null,
getInternalIDFromNative: GetInternalIDFromNative,
getNativeFromInternal: GetNativeFromInternal,
getProfilingData(): ProfilingDataBackend,
getOwnersList: (id: number) => Array<Owner> | null,
getPathForElement: (id: number) => Array<PathFrame> | null,
handleCommitFiberRoot: (fiber: Object, commitPriority?: number) => void,
<<<<<<<
=======
setInProps: (id: number, path: Array<string | number>, value: any) => void,
setInState: (id: number, path: Array<string | number>, value: any) => void,
setTrackedPath: (path: Array<PathFrame> | null) => void,
>>>>>>>
setInProps: (id: number, path: Array<string | number>, value: any) => void,
setInState: (id: number, path: Array<string | number>, value: any) => void,
setTrackedPath: (path: Array<PathFrame> | null) => void, |
<<<<<<<
=======
>>>>>>>
<<<<<<<
assert.notOk(_pickerMenu.is(':visible'), '#StartYearDemo responded to a button click event by closing the menu.');
=======
assert.equal(_pickerMenu.css('display'), 'none', '#StartYearDemo responded to a button click event by closing the menu.');
>>>>>>>
assert.notOk(_pickerMenu.is(':visible'), '#StartYearDemo responded to a button click event by closing the menu.');
<<<<<<<
_picker.MonthPicker('Open');
=======
_picker.trigger($.Event('click'));
>>>>>>>
_picker.MonthPicker('Open');
<<<<<<<
assert.equal(field.val(), _today.getMonth()+1 + '/' + _today.getFullYear(), 'Pressing enter selected todays month');
=======
assert.equal(field.val(), zeroFill(_today.getMonth() + 1) + '/' + _today.getFullYear(), 'Pressing enter selected todays month');
>>>>>>>
assert.equal(field.val(), zeroFill(_today.getMonth() + 1) + '/' + _today.getFullYear(), 'Pressing enter selected todays month');
<<<<<<<
assert.ok(menu.width() <= 200, 'The menu is visible and has the expected width');
=======
assert.ok(menu.is(':visible'), 'The menu is visible without having to call the Open method');
>>>>>>>
assert.ok(menu.width() <= 200, 'The menu is visible and has the expected width');
<<<<<<<
=======
//var buttons = menu.find('.month-picker-month-table button');
>>>>>>>
<<<<<<<
var nextYearButton = menu.find('.next-year>a');
=======
var nextYearButton = menu.find('.next-year>button');
>>>>>>>
var nextYearButton = menu.find('.next-year>a');
<<<<<<<
var previousYearButton = menu.find('.previous-year>a');
=======
var previousYearButton = menu.find('.previous-year>button');
>>>>>>>
var previousYearButton = menu.find('.previous-year>a');
<<<<<<<
var showYearsButton = menu.find('.jump-years a');
=======
var showYearsButton = menu.find('.year-container-all');
>>>>>>>
var showYearsButton = menu.find('.jump-years a');
<<<<<<<
var nextYearButton = menu.find('.next-year>a');
var previousYearButton = menu.find('.previous-year>a');
=======
var nextYearButton = menu.find('.next-year>button');
var previousYearButton = menu.find('.previous-year>button');
>>>>>>>
var nextYearButton = menu.find('.next-year>a');
var previousYearButton = menu.find('.previous-year>a');
<<<<<<<
//alert(field.position().left - menu.position().left);
var opendToTheRight = (field.position().left - menu.position().left) > 5;
assert.ok(opendToTheRight, 'The menu opened to the right of the field');
//field.MonthPicker('Close');
=======
var opendToTheRight = (field.position().left - menu.position().left) > 100;
assert.ok(opendToTheRight, 'The menu opened to the right of rhe field');
field.MonthPicker('Close');
>>>>>>>
var opendToTheRight = (field.position().left - menu.position().left) > 5;
assert.ok(opendToTheRight, 'The menu opened to the right of the field');
field.MonthPicker('Close');
<<<<<<<
var previousYearButton = menu.find('.previous-year>a');
var nextYearButton = menu.find('.next-year>a');
=======
var previousYearButton = menu.find('.previous-year>button');
var nextYearButton = menu.find('.next-year>button');
>>>>>>>
var previousYearButton = menu.find('.previous-year>a');
var nextYearButton = menu.find('.next-year>a');
<<<<<<<
$(buttons.slice(0, 8)).trigger('click');
=======
$(buttons.slice(0, 8)).trigger('click');
>>>>>>>
$(buttons.slice(0, 8)).trigger('click');
<<<<<<<
var pickerYear = _getPickerYear(menu);
=======
var pickerYear = parseInt(menu.find('.year').text(), 10);
>>>>>>>
var pickerYear = _getPickerYear(menu);
<<<<<<<
assert.equal(_getPickerYear(menu), 2013, 'The menu opend at the minimum year (2013) and not 2010' );
=======
assert.equal(menu.find('.year').text(), 2013, 'The menu opend at the minimum year (2013) and not 2010' );
>>>>>>>
assert.equal(_getPickerYear(menu), 2013, 'The menu opend at the minimum year (2013) and not 2010' );
<<<<<<<
assert.equal(_getPickerYear(menu), 2016, 'The menu opend at the maximum year (2016) and not 2020' );
=======
assert.equal(menu.find('.year').text(), 2016, 'The menu opend at the maximum year (2016) and not 2020' );
>>>>>>>
assert.equal(_getPickerYear(menu), 2016, 'The menu opend at the maximum year (2016) and not 2020' );
<<<<<<<
assert.equal(_getPickerYear(menu), 2018, 'The menu opend at the year 2018 after changing the MaxMonth option' );
=======
assert.equal(menu.find('.year').text(), 2018, 'The menu opend at the year 2018 after changing the MaxMonth option' );
>>>>>>>
assert.equal(_getPickerYear(menu), 2018, 'The menu opend at the year 2018 after changing the MaxMonth option' );
<<<<<<<
assert.equal(_getPickerYear(menu), 2020, 'The menu opend at the the selected year 2020 after' );
=======
assert.equal(menu.find('.year').text(), 2020, 'The menu opend at the the selected year 2020 after' );
>>>>>>>
assert.equal(_getPickerYear(menu), 2020, 'The menu opend at the the selected year 2020 after' );
<<<<<<<
assert.equal(_getPickerYear(menu), 2010, 'The menu opend at the year 2010 after chagnig the MinMonth option' );
=======
assert.equal(menu.find('.year').text(), 2010, 'The menu opend at the year 2010 after chagnig the MinMonth option' );
>>>>>>>
assert.equal(_getPickerYear(menu), 2010, 'The menu opend at the year 2010 after chagnig the MinMonth option' );
<<<<<<<
assert.equal(_getPickerYear(menu), 2009, 'The menu opend at the selected year after changing the MinMonth option again' );
=======
assert.equal(menu.find('.year').text(), 2009, 'The menu opend at the selected year after changing the MinMonth option again' );
>>>>>>>
assert.equal(_getPickerYear(menu), 2009, 'The menu opend at the selected year after changing the MinMonth option again' );
<<<<<<<
var nextYearButton = menu.find('.next-year>a');
var previousYearButton = menu.find('.previous-year>a');
=======
var nextYearButton = menu.find('.next-year>button');
var previousYearButton = menu.find('.previous-year>button');
>>>>>>>
var nextYearButton = menu.find('.next-year>a');
var previousYearButton = menu.find('.previous-year>a');
<<<<<<<
menu.find('.jump-years a').trigger('click');
=======
menu.find('.year').trigger('click');
>>>>>>>
menu.find('.jump-years a').trigger('click');
<<<<<<<
field.MonthPicker({MinMonth: 1});
=======
var _plusMonths = _today.getMonth() < 5 ? (5 - _today.getMonth()) : 1;
field.MonthPicker({ MinMonth: _plusMonths });
>>>>>>>
var _plusMonths = _today.getMonth() < 5 ? (5 - _today.getMonth()) : 1;
field.MonthPicker({ MinMonth: _plusMonths });
<<<<<<<
var nextYearButton = menu.find('.next-year>a');
var previousYearButton = menu.find('.previous-year>a');
=======
var nextYearButton = menu.find('.next-year>button');
var previousYearButton = menu.find('.previous-year>button');
>>>>>>>
var nextYearButton = menu.find('.next-year>a');
var previousYearButton = menu.find('.previous-year>a'); |
<<<<<<<
Version 3.0-alpha5
=======
Version 2.8.3
>>>>>>>
Version 3.0-alpha6
<<<<<<<
=======
// Creates an alias to jQuery UI's .button() that dosen't
// conflict with Bootstrap.js button (#35)
$.widget.bridge('jqueryUIButton', $.ui.button);
>>>>>>>
// Creates an alias to jQuery UI's .button() that dosen't
// conflict with Bootstrap.js button (#35)
$.widget.bridge('jqueryUIButton', $.ui.button);
<<<<<<<
VERSION: '3.0-alpha5', // Added in version 2.4;
=======
VERSION: '2.8.3', // Added in version 2.4;
>>>>>>>
VERSION: '3.0-alpha6', // Added in version 2.4;
<<<<<<<
var jumpYears =
$('.jump-years', _menu)
=======
$('.year-title', _menu).text(this._i18n('year'));
this._yearContainerAll =
$('.year-container-all', _menu)
>>>>>>>
var jumpYears =
$('.jump-years', _menu)
<<<<<<<
this._prevButton = $('.previous-year a', _menu);
this._prevButton.button({ text: false }).removeClass('ui-state-default').css('cursor', 'default');
this._nextButton = $('.next-year a', _menu).button({ text: false }).removeClass('ui-state-default').css('cursor', 'default');
=======
this._yearContainer = $('.year', _menu);
this._prevButton = $('.previous-year button', _menu).jqueryUIButton({ text: false });
this._nextButton = $('.next-year button', _menu).jqueryUIButton({ text: false });
>>>>>>>
this._prevButton = $('.previous-year a', _menu);
this._prevButton.jqueryUIButton({ text: false }).removeClass('ui-state-default').css('cursor', 'default');
this._nextButton = $('.next-year a', _menu).jqueryUIButton({ text: false }).removeClass('ui-state-default').css('cursor', 'default');
<<<<<<<
this._buttons = $('button', $table).button();
=======
this._buttons = $('button', $table).jqueryUIButton();
>>>>>>>
this._buttons = $('button', $table).jqueryUIButton();
<<<<<<<
this._jumpYearsButton.button({label: 'Year ' + _year});
=======
>>>>>>>
this._jumpYearsButton.jqueryUIButton({label: 'Year ' + _year});
<<<<<<<
=======
this._yearContainerAll.css('cursor', 'pointer');
>>>>>>>
<<<<<<<
var _btn = $( this._buttons[_counter] ).button({
=======
var _btn = $( this._buttons[_counter] ).jqueryUIButton({
>>>>>>>
var _btn = $( this._buttons[_counter] ).jqueryUIButton({
<<<<<<<
var me = this;
setTimeout(function() {
var _btn = amount > 0 ? me._nextButton : me._prevButton;
_btn.addClass('ui-state-hover');
}, 1);
=======
>>>>>>>
var me = this;
setTimeout(function() {
var _btn = amount > 0 ? me._nextButton : me._prevButton;
_btn.addClass('ui-state-hover');
}, 1);
<<<<<<<
this._prevButton.button('option', 'disabled', _minDate && _curYear == _toYear(_minDate));
this._nextButton.button('option', 'disabled', _maxDate && _curYear == _toYear(_maxDate));
=======
this._prevButton.jqueryUIButton('option', 'disabled', _minDate && _curYear == _toYear(_minDate));
this._nextButton.jqueryUIButton('option', 'disabled', _maxDate && _curYear == _toYear(_maxDate));
>>>>>>>
this._prevButton.jqueryUIButton('option', 'disabled', _minDate && _curYear == _toYear(_minDate));
this._nextButton.jqueryUIButton('option', 'disabled', _maxDate && _curYear == _toYear(_maxDate)); |
<<<<<<<
var request = require('request'),
=======
'use strict';
var http = require('http'),
https = require('https'),
request = require('request'),
>>>>>>>
'use strict';
var request = require('request'), |
<<<<<<<
import { clamp, getDataContents, getBoundingClientRect, getViewportRect, setPosAndSize } from "../utils";
=======
import { clamp, getDataContents, getBoundingClientRect, getViewportRect } from "../utils";
import marked from "marked";
>>>>>>>
import { clamp, getDataContents, getBoundingClientRect, getViewportRect, setPosAndSize } from "../utils";
import marked from "marked"; |
<<<<<<<
=======
>>>>>>>
<<<<<<<
var onBehalf;
if (this.state.ageSelected === this.props.ages.WITH_CONSENT.value) {
onBehalf = (
<label htmlFor='agreedOnBehalf'>
<input
id='agreedOnBehalf'
type='checkbox'
className='js-terms-checkbox'
checked={this.state.agreedOnBehalf}
onChange={this.handleOnBehalfAgreementChange} />
{this.props.messages.ACCEPT_ON_BEHALF}
</label>
);
}
=======
renderCheckbox: function() {
>>>>>>>
var onBehalf;
if (this.state.ageSelected === this.props.ages.WITH_CONSENT.value) {
onBehalf = (
<label htmlFor='agreedOnBehalf'>
<input
id='agreedOnBehalf'
type='checkbox'
className='js-terms-checkbox'
checked={this.state.agreedOnBehalf}
onChange={this.handleOnBehalfAgreementChange} />
{this.props.messages.ACCEPT_ON_BEHALF}
</label>
);
} |
<<<<<<<
const { values } = useFormikContext();
const bgUnits = get(values, 'initialSettings.bloodGlucoseUnits');
=======
const formikContext = useFormikContext();
const { values } = formikContext;
const bgUnits = values.initialSettings.bloodGlucoseUnits;
>>>>>>>
const formikContext = useFormikContext();
const { values } = formikContext;
const bgUnits = get(values, 'initialSettings.bloodGlucoseUnits');
<<<<<<<
value: (() => {
if (!values.training) return emptyValueText;
return values.training === 'inModule' ? t('Not required') : t('Required');
})(),
},
{
id: 'glucose-safety-limit',
label: t('Glucose Safety Limit'),
value: (() => {
if (!get(values, 'initialSettings.glucoseSafetyLimit')) return emptyValueText;
return `${values.initialSettings.glucoseSafetyLimit} ${bgUnits}`;
})(),
warning: getThresholdWarning(get(values, 'initialSettings.glucoseSafetyLimit'), thresholds.glucoseSafetyLimit)
=======
value: values.training === 'inModule' ? t('Not required') : t('Required'),
error: getFieldError('training', formikContext),
},
{
id: 'glucose-safety-limit',
label: t('Glucose Safety Limit'),
value: `${values.initialSettings.glucoseSafetyLimit} ${bgUnits}`,
warning: getThresholdWarning(values.initialSettings.glucoseSafetyLimit, thresholds.glucoseSafetyLimit),
error: getFieldError('initialSettings.glucoseSafetyLimit', formikContext),
>>>>>>>
value: (() => {
if (!values.training) return emptyValueText;
return values.training === 'inModule' ? t('Not required') : t('Required');
})(),
error: getFieldError('training', formikContext),
},
{
id: 'glucose-safety-limit',
label: t('Glucose Safety Limit'),
value: (() => {
if (!get(values, 'initialSettings.glucoseSafetyLimit')) return emptyValueText;
return `${values.initialSettings.glucoseSafetyLimit} ${bgUnits}`;
})(),
warning: getThresholdWarning(get(values, 'initialSettings.glucoseSafetyLimit'), thresholds.glucoseSafetyLimit),
error: getFieldError('initialSettings.glucoseSafetyLimit', formikContext),
<<<<<<<
id: 'premeal-range',
label: t('Pre-meal Correction Range'),
value: (() => {
const lowValue = get(values, 'initialSettings.bloodGlucoseTargetPreprandial.low');
const highValue = get(values, 'initialSettings.bloodGlucoseTargetPreprandial.high');
return (lowValue && highValue) ? `${lowValue} - ${highValue} ${bgUnits}` : emptyValueText;
})(),
warning: (() => {
const warnings = [];
const lowWarning = getThresholdWarning(get(values,'initialSettings.bloodGlucoseTargetPreprandial.low'), thresholds.bloodGlucoseTargetPreprandial);
const highWarning = getThresholdWarning(get(values,'initialSettings.bloodGlucoseTargetPreprandial.high'), thresholds.bloodGlucoseTargetPreprandial);
if (lowWarning) warnings.push(t('Lower Target: {{lowWarning}}', { lowWarning }));
if (highWarning) warnings.push(t('Upper Target: {{highWarning}}', { highWarning }));
return warnings.length ? warnings : null;
})(),
},
{
id: 'workout-range',
label: t('Workout Correction Range'),
value: (() => {
const lowValue = get(values, 'initialSettings.bloodGlucoseTargetPhysicalActivity.low');
const highValue = get(values, 'initialSettings.bloodGlucoseTargetPhysicalActivity.high');
return (lowValue && highValue) ? `${lowValue} - ${highValue} ${bgUnits}` : emptyValueText;
})(),
warning: (() => {
const warnings = [];
const lowWarning = getThresholdWarning(get(values,'initialSettings.bloodGlucoseTargetPhysicalActivity.low'), thresholds.bloodGlucoseTargetPhysicalActivity);
const highWarning = getThresholdWarning(get(values,'initialSettings.bloodGlucoseTargetPhysicalActivity.high'), thresholds.bloodGlucoseTargetPhysicalActivity);
if (lowWarning) warnings.push(t('Lower Target: {{lowWarning}}', { lowWarning }));
if (highWarning) warnings.push(t('Upper Target: {{highWarning}}', { highWarning }));
return warnings.length ? warnings : null;
})(),
},
{
id: 'carb-ratio-schedule',
label: t('Insulin to Carbohydrate Ratios'),
value: map(
get(values, 'initialSettings.carbohydrateRatioSchedule'),
({ amount, start }) => `${convertMsPer24ToTimeString(start)}: ${amount} g/U`
),
warning: map(
get(values, 'initialSettings.carbohydrateRatioSchedule'),
(val) => getThresholdWarning(val.amount, thresholds.carbRatio)
),
=======
id: 'carb-ratio-schedule',
label: t('Insulin to Carbohydrate Ratios'),
value: map(
values.initialSettings.carbohydrateRatioSchedule,
({ amount, start }) => `${convertMsPer24ToTimeString(start)}: ${amount} g/U`
),
warning: map(
values.initialSettings.carbohydrateRatioSchedule,
(val) => getThresholdWarning(val.amount, thresholds.carbRatio)
),
error: map(
values.initialSettings.carbohydrateRatioSchedule,
(val, index) => getFieldError(`initialSettings.carbohydrateRatioSchedule.${index}.amount`, formikContext)
),
>>>>>>>
id: 'premeal-range',
label: t('Pre-meal Correction Range'),
value: (() => {
const lowValue = get(values, 'initialSettings.bloodGlucoseTargetPreprandial.low');
const highValue = get(values, 'initialSettings.bloodGlucoseTargetPreprandial.high');
return (lowValue && highValue) ? `${lowValue} - ${highValue} ${bgUnits}` : emptyValueText;
})(),
warning: (() => {
const warnings = [];
const lowWarning = getThresholdWarning(get(values,'initialSettings.bloodGlucoseTargetPreprandial.low'), thresholds.bloodGlucoseTargetPreprandial);
const highWarning = getThresholdWarning(get(values,'initialSettings.bloodGlucoseTargetPreprandial.high'), thresholds.bloodGlucoseTargetPreprandial);
if (lowWarning) warnings.push(t('Lower Target: {{lowWarning}}', { lowWarning }));
if (highWarning) warnings.push(t('Upper Target: {{highWarning}}', { highWarning }));
return warnings.length ? warnings : null;
})(),
error: (() => {
const errors = [];
const lowError = getFieldError('initialSettings.bloodGlucoseTargetPreprandial.low', formikContext);
const highError = getFieldError('initialSettings.bloodGlucoseTargetPreprandial.high', formikContext);
if (lowError) errors.push(t('Lower Target: {{lowError}}', { lowError }));
if (highError) errors.push(t('Upper Target: {{highError}}', { highError }));
return errors.length ? errors : null;
})(),
},
{
id: 'workout-range',
label: t('Workout Correction Range'),
value: (() => {
const lowValue = get(values, 'initialSettings.bloodGlucoseTargetPhysicalActivity.low');
const highValue = get(values, 'initialSettings.bloodGlucoseTargetPhysicalActivity.high');
return (lowValue && highValue) ? `${lowValue} - ${highValue} ${bgUnits}` : emptyValueText;
})(),
warning: (() => {
const warnings = [];
const lowWarning = getThresholdWarning(get(values,'initialSettings.bloodGlucoseTargetPhysicalActivity.low'), thresholds.bloodGlucoseTargetPhysicalActivity);
const highWarning = getThresholdWarning(get(values,'initialSettings.bloodGlucoseTargetPhysicalActivity.high'), thresholds.bloodGlucoseTargetPhysicalActivity);
if (lowWarning) warnings.push(t('Lower Target: {{lowWarning}}', { lowWarning }));
if (highWarning) warnings.push(t('Upper Target: {{highWarning}}', { highWarning }));
return warnings.length ? warnings : null;
})(),
error: (() => {
const errors = [];
const lowError = getFieldError('initialSettings.bloodGlucoseTargetPhysicalActivity.low', formikContext);
const highError = getFieldError('initialSettings.bloodGlucoseTargetPhysicalActivity.high', formikContext);
if (lowError) errors.push(t('Lower Target: {{lowError}}', { lowError }));
if (highError) errors.push(t('Upper Target: {{highError}}', { highError }));
return errors.length ? errors : null;
})(),
},
{
id: 'carb-ratio-schedule',
label: t('Insulin to Carbohydrate Ratios'),
value: map(
get(values, 'initialSettings.carbohydrateRatioSchedule'),
({ amount, start }) => `${convertMsPer24ToTimeString(start)}: ${amount} g/U`
),
warning: map(
get(values, 'initialSettings.carbohydrateRatioSchedule'),
(val) => getThresholdWarning(val.amount, thresholds.carbRatio)
),
error: map(
get(values, 'initialSettings.carbohydrateRatioSchedule'),
(val, index) => getFieldError(`initialSettings.carbohydrateRatioSchedule.${index}.amount`, formikContext)
),
<<<<<<<
},
=======
error: map(
values.initialSettings.insulinSensitivitySchedule,
(val, index) => getFieldError(`initialSettings.insulinSensitivitySchedule.${index}.amount`, formikContext)
),
},
>>>>>>>
error: map(
get(values, 'initialSettings.insulinSensitivitySchedule'),
(val, index) => getFieldError(`initialSettings.insulinSensitivitySchedule.${index}.amount`, formikContext)
),
}, |
<<<<<<<
describe('translateBg', () => {
it('should translate a BG value to the desired target unit', () => {
expect(utils.translateBg(180, MMOLL_UNITS)).to.equal(10);
expect(utils.translateBg(10, MGDL_UNITS)).to.equal(180);
});
});
describe('roundBgTarget', () => {
it('should round a target BG value as appropriate', () => {
// to the nearest 5 for mg/dL
expect(utils.roundBgTarget(178.15, MGDL_UNITS)).to.equal(180);
expect(utils.roundBgTarget(172, MGDL_UNITS)).to.equal(170);
// to the nearest .1 for mmol/L
expect(utils.roundBgTarget(3.91, MMOLL_UNITS)).to.equal(3.9);
expect(utils.roundBgTarget(3.96, MMOLL_UNITS)).to.equal(4);
});
});
=======
describe('stripTrailingSlash', function() {
it('should strip a trailing forward slash from a string', function() {
const url = '/my-path/sub-path/';
expect(utils.stripTrailingSlash(url)).to.equal('/my-path/sub-path');
});
});
>>>>>>>
describe('translateBg', () => {
it('should translate a BG value to the desired target unit', () => {
expect(utils.translateBg(180, MMOLL_UNITS)).to.equal(10);
expect(utils.translateBg(10, MGDL_UNITS)).to.equal(180);
});
});
describe('roundBgTarget', () => {
it('should round a target BG value as appropriate', () => {
// to the nearest 5 for mg/dL
expect(utils.roundBgTarget(178.15, MGDL_UNITS)).to.equal(180);
expect(utils.roundBgTarget(172, MGDL_UNITS)).to.equal(170);
// to the nearest .1 for mmol/L
expect(utils.roundBgTarget(3.91, MMOLL_UNITS)).to.equal(3.9);
expect(utils.roundBgTarget(3.96, MMOLL_UNITS)).to.equal(4);
});
});
describe('stripTrailingSlash', function() {
it('should strip a trailing forward slash from a string', function() {
const url = '/my-path/sub-path/';
expect(utils.stripTrailingSlash(url)).to.equal('/my-path/sub-path');
});
}); |
<<<<<<<
/* jshint ignore:start */
<div className='container-nav-outer footer'>
<div className='container-nav-inner'>
<div className='footer-section footer-section-top'>
<NotesLink />
<div className="footer-subtext">{"Record notes on the go"}</div>
</div>
<div className='footer-section'>
<MailTo
linkTitle={title}
emailAddress={'[email protected]'}
emailSubject={subject}
onLinkClicked={this.logSupportContact} />
{this.renderVersion()}
</div>
=======
<div className='container-small-outer footer'>
<div className='container-small-inner'>
<MailTo
linkTitle={title}
emailAddress={'[email protected]'}
emailSubject={subject}
onLinkClicked={this.logSupportContact} />
>>>>>>>
<div className='container-nav-outer footer'>
<div className='container-nav-inner'>
<div className='footer-section footer-section-top'>
<NotesLink />
<div className="footer-subtext">{"Record notes on the go"}</div>
</div>
<div className='footer-section'>
<MailTo
linkTitle={title}
emailAddress={'[email protected]'}
emailSubject={subject}
onLinkClicked={this.logSupportContact} />
{this.renderVersion()}
</div>
<<<<<<<
/* jshint ignore:start */
<div className="footer-subtext footer-version" ref="version">{version}</div>
/* jshint ignore:end */
=======
<div className="Navbar-version" ref="version">{version}</div>
>>>>>>>
<div className="footer-subtext footer-version" ref="version">{version}</div> |
<<<<<<<
=======
console.log('handleApiError ', error);
var utcTime = usrMessages.MSG_UTC + new Date().toISOString();//sundial.utcDateString();
>>>>>>>
var utcTime = usrMessages.MSG_UTC + new Date().toISOString();
<<<<<<<
handleActionableError: function(error, message, link) {
var utcTime = usrMessages.MSG_UTC + new Date().toISOString();
message = message || '';
//send it quick
app.api.errors.log(this.stringifyErrorData(error), message, '');
var body = (
<div>
<p>{message}</p>
{link}
</div>
);
this.setState({
notification: {
type: 'alert',
body: body,
isDismissable: true
}
});
},
=======
>>>>>>>
handleActionableError: function(error, message, link) {
var utcTime = usrMessages.MSG_UTC + new Date().toISOString();
message = message || '';
//send it quick
app.api.errors.log(this.stringifyErrorData(error), message, '');
var body = (
<div>
<p>{message}</p>
{link}
</div>
);
this.setState({
notification: {
type: 'alert',
body: body,
isDismissable: true
}
});
}, |
<<<<<<<
<p>Please click the link in the email we just sent you at <strong>{{sent}}</strong> to verify and activate your account.</p>
=======
<p>
Please click the link in the email we just sent you at
<br/>
<strong>{this.props.sent}</strong>
<br/>
to verify and activate your account.
</p>
>>>>>>>
<p>
Please click the link in the email we just sent you at
<br/>
<strong>{{sent}}</strong>
<br/>
to verify and activate your account.
</p> |
<<<<<<<
dataSources={this.props.dataSources}
fetchDataSources={this.props.fetchDataSources}
connectDataSource={this.props.connectDataSource}
disconnectDataSource={this.props.disconnectDataSource}
authorizedDataSource={this.props.authorizedDataSource}
=======
updatingPatientBgUnits={this.props.updatingPatientBgUnits}
>>>>>>>
updatingPatientBgUnits={this.props.updatingPatientBgUnits}
dataSources={this.props.dataSources}
fetchDataSources={this.props.fetchDataSources}
connectDataSource={this.props.connectDataSource}
disconnectDataSource={this.props.disconnectDataSource}
authorizedDataSource={this.props.authorizedDataSource} |
<<<<<<<
start: 'react-app start',
build: 'react-app build',
test: 'react-app test --env=jsdom',
=======
start: 'react-scripts start',
build: 'react-scripts build',
test: 'react-scripts test',
eject: 'react-scripts eject',
>>>>>>>
start: 'react-app start',
build: 'react-app build',
test: 'react-app test', |
<<<<<<<
var autoFocus = input.autoFocus;
=======
var defaultChecked = input.defaultChecked;
>>>>>>>
var autoFocus = input.autoFocus;
var defaultChecked = input.defaultChecked;
<<<<<<<
autoFocus={autoFocus}
=======
defaultChecked={defaultChecked}
>>>>>>>
autoFocus={autoFocus}
defaultChecked={defaultChecked} |
<<<<<<<
=======
elem.setState({page: '/patients/454/data'});
>>>>>>>
<<<<<<<
});
=======
*/
describe('acceptance', () => {
it('should set the state for termsAccepted ', () => {
>>>>>>>
<<<<<<<
=======
/*
it('should allow user to use blip', () => {
>>>>>>>
<<<<<<<
it('should return null for patient', () => {
expect(result.patient).to.be.null;
});
});
=======
//check we aren't seeing the terms
var termsElems = TestUtils.scryRenderedDOMComponentsWithClass(elem, 'terms');
expect(termsElems.length).to.equal(0);
>>>>>>>
<<<<<<<
it('should return the logged-in user as user', () => {
expect(result.user).to.equal(loggedIn.allUsersMap.a1b2c3);
});
=======
//check we aren't seeing the terms
var termsElems = TestUtils.scryRenderedDOMComponentsWithClass(elem, 'terms');
expect(termsElems.length).to.not.equal(0);
>>>>>>> |
<<<<<<<
var plugins = [ defineEnvPlugin, new ExtractTextPlugin('style.[contenthash].css') ];
var appEntry = (process.env.MOCK === 'true') ? './app/main.mock.js' : './app/main.js';
=======
var plugins = [ defineEnvPlugin, new ExtractTextPlugin('style.css') ];
var appEntry = './app/main.js';
>>>>>>>
var plugins = [ defineEnvPlugin, new ExtractTextPlugin('style.[contenthash].css') ];
var appEntry = './app/main.js'; |
<<<<<<<
},
renderLogo: function() {
return (
<a
href="http://tidepool.org/"
target="_blank"
className="login-nav-tidepool-logo" >
<img src={logoSrc} alt="Tidepool"/>
</a>
);
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>> |
<<<<<<<
=======
var WeeklyChart = React.createClass({
chartOpts: ['bgClasses', 'bgUnits', 'timePrefs'],
log: bows('Weekly Chart'),
propTypes: {
bgClasses: React.PropTypes.object.isRequired,
bgUnits: React.PropTypes.string.isRequired,
initialDatetimeLocation: React.PropTypes.string,
patientData: React.PropTypes.object.isRequired,
timePrefs: React.PropTypes.object.isRequired,
// handlers
onDatetimeLocationChange: React.PropTypes.func.isRequired,
onMostRecent: React.PropTypes.func.isRequired,
onClickValues: React.PropTypes.func.isRequired,
onSelectSMBG: React.PropTypes.func.isRequired,
onTransition: React.PropTypes.func.isRequired
},
componentDidMount: function() {
this.mountChart(this.getDOMNode());
this.initializeChart(this.props.patientData, this.props.initialDatetimeLocation);
},
componentWillUnmount: function() {
this.unmountChart();
},
mountChart: function(node, chartOpts) {
this.log('Mounting...');
chartOpts = chartOpts || {};
this.chart = chartWeeklyFactory(node, _.assign(chartOpts, _.pick(this.props, this.chartOpts)));
this.bindEvents();
},
unmountChart: function() {
this.log('Unmounting...');
this.chart.destroy();
},
bindEvents: function() {
this.chart.emitter.on('inTransition', this.props.onTransition);
this.chart.emitter.on('navigated', this.handleDatetimeLocationChange);
this.chart.emitter.on('mostRecent', this.props.onMostRecent);
this.chart.emitter.on('selectSMBG', this.props.onSelectSMBG);
},
initializeChart: function(data, datetimeLocation) {
this.log('Initializing...');
if (_.isEmpty(data)) {
throw new Error('Cannot create new chart with no data');
}
if (datetimeLocation) {
this.chart.load(data, datetimeLocation);
}
else {
this.chart.load(data);
}
},
render: function() {
/* jshint ignore:start */
return (
<div id="tidelineContainer" className="patient-data-chart"></div>
);
/* jshint ignore:end */
},
// handlers
handleDatetimeLocationChange: function(datetimeLocationEndpoints) {
this.setState({
datetimeLocation: datetimeLocationEndpoints[1]
});
this.props.onDatetimeLocationChange(datetimeLocationEndpoints);
},
getCurrentDay: function(timePrefs) {
return this.chart.getCurrentDay(timePrefs).toISOString();
},
goToMostRecent: function() {
this.chart.clear();
this.bindEvents();
this.chart.load(this.props.patientData);
},
hideValues: function() {
this.chart.hideValues();
},
panBack: function() {
this.chart.panBack();
},
panForward: function() {
this.chart.panForward();
},
showValues: function() {
this.chart.showValues();
}
});
>>>>>>> |
<<<<<<<
`;
export const TextLink = Styled(Link)`
color: ${colors.text.link};
text-decoration: none;
line-height: ${lineHeights[0]};
font-family: ${fonts.default};
&:hover {
color: ${colors.text.link};
text-decoration: none;
}
`;
export const CheckboxGroupTitle = Styled(Text)`
font-size: ${fontSizes[0]}px;
line-height: ${lineHeights[4]};
font-weight: ${fontWeights.medium};
font-family: ${fonts.default};
padding: 0;
color: ${props => (props.color ? props.color : colors.text.primary)};
=======
>>>>>>>
`;
export const CheckboxGroupTitle = Styled(Text)`
font-size: ${fontSizes[0]}px;
line-height: ${lineHeights[4]};
font-weight: ${fontWeights.medium};
font-family: ${fonts.default};
padding: 0;
color: ${props => (props.color ? props.color : colors.text.primary)}; |
<<<<<<<
dataSources: state.blip.dataSources || [],
authorizedDataSource: state.blip.authorizedDataSource,
=======
updatingPatientBgUnits: state.blip.working.updatingPatientBgUnits.inProgress,
>>>>>>>
updatingPatientBgUnits: state.blip.working.updatingPatientBgUnits.inProgress,
dataSources: state.blip.dataSources || [],
authorizedDataSource: state.blip.authorizedDataSource, |
<<<<<<<
=======
const bfj = require('bfj');
const config = require('../config/webpack.config.prod');
>>>>>>>
const bfj = require('bfj');
<<<<<<<
return resolve({
stats: stats.stats[0],
=======
const resolveArgs = {
stats,
>>>>>>>
const resolveArgs = {
stats: stats.stats[0], |
<<<<<<<
=======
// Generates an `index.html` file with the <script> injected.
new HtmlWebpackPlugin({
inject: true,
template: paths.appHtml,
minify: {
removeComments: true,
collapseWhitespace: true,
removeRedundantAttributes: true,
useShortDoctype: true,
removeEmptyAttributes: true,
removeStyleLinkTypeAttributes: true,
keepClosingSlash: true,
minifyJS: true,
minifyCSS: true,
minifyURLs: true,
},
}),
// Makes some environment variables available in index.html.
// The public URL is available as %PUBLIC_URL% in index.html, e.g.:
// <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
// In production, it will be an empty string unless you specify "homepage"
// in `package.json`, in which case it will be the pathname of that URL.
new InterpolateHtmlPlugin(env.raw),
>>>>>>>
<<<<<<<
// Minify the code.
new UglifyJsPlugin({
uglifyOptions: {
parse: {
// we want uglify-js to parse ecma 8 code. However, we don't want it
// to apply any minfication steps that turns valid ecma 5 code
// into invalid ecma 5 code. This is why the 'compress' and 'output'
// sections only apply transformations that are ecma 5 safe
// https://github.com/facebook/create-react-app/pull/4234
// ecma: 8,
},
compress: {
// ecma: 5,
warnings: false,
// Disabled because of an issue with Uglify breaking seemingly valid code:
// https://github.com/facebook/create-react-app/issues/2376
// Pending further investigation:
// https://github.com/mishoo/UglifyJS2/issues/2011
comparisons: false,
},
mangle: {
safari10: true,
},
output: {
ecma: 5,
comments: false,
// Turned on because emoji and regex is not minified properly using default
// https://github.com/facebook/create-react-app/issues/2488
ascii_only: true,
},
},
// Use multi-process parallel running to improve the build speed
// Default number of concurrent runs: os.cpus().length - 1
parallel: true,
// Enable file caching
cache: true,
sourceMap: shouldUseSourceMap,
}),
// Note: this won't work without ExtractTextPlugin.extract(..) in `loaders`.
new ExtractTextPlugin({
filename: cssFilename,
=======
new MiniCssExtractPlugin({
// Options similar to the same options in webpackOptions.output
// both options are optional
filename: 'static/css/[name].[contenthash:8].css',
chunkFilename: 'static/css/[name].[contenthash:8].chunk.css',
>>>>>>>
new MiniCssExtractPlugin({
// Options similar to the same options in webpackOptions.output
// both options are optional
filename: 'static/css/[name].[contenthash:8].css',
chunkFilename: 'static/css/[name].[contenthash:8].chunk.css', |
<<<<<<<
if (!utils.isChrome() && !this.state.dismissedBrowserWarning) {
=======
if (!utils.isChrome()) {
/* jshint ignore:start */
>>>>>>>
if (!utils.isChrome()) { |
<<<<<<<
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
=======
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
>>>>>>>
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; };
<<<<<<<
for (var _iterator5 = this._nodes[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
var node = _step5.value;
var type = node.type,
expr = node.expr,
para = node.para;
=======
for (var _iterator3 = this._nodes[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
var node = _step3.value;
var type = node.type,
expr = node.expr,
para = node.para;
>>>>>>>
for (var _iterator3 = this._nodes[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
var node = _step3.value;
var type = node.type;
var expr = node.expr;
var para = node.para;
<<<<<<<
for (var _iterator6 = this._cases[Symbol.iterator](), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
var _step6$value = _step6.value,
expression = _step6$value.expression,
_values = _step6$value.values,
result = _step6$value.result;
=======
for (var _iterator4 = this._cases[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
var _step4$value = _step4.value,
expression = _step4$value.expression,
values = _step4$value.values,
result = _step4$value.result;
>>>>>>>
for (var _iterator4 = this._cases[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
var _step4$value = _step4.value;
var expression = _step4$value.expression;
var _values = _step4$value.values;
var result = _step4$value.result;
<<<<<<<
for (var _iterator7 = this._tables[Symbol.iterator](), _step7; !(_iteratorNormalCompletion7 = (_step7 = _iterator7.next()).done); _iteratorNormalCompletion7 = true) {
var _step7$value = _step7.value,
table = _step7$value.table,
alias = _step7$value.alias;
=======
for (var _iterator5 = this._tables[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
var _step5$value = _step5.value,
table = _step5$value.table,
alias = _step5$value.alias;
>>>>>>>
for (var _iterator5 = this._tables[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
var _step5$value = _step5.value;
var table = _step5$value.table;
var alias = _step5$value.alias;
<<<<<<<
condition = this._sanitizeExpression(condition);
for (var _len7 = arguments.length, values = Array(_len7 > 1 ? _len7 - 1 : 0), _key7 = 1; _key7 < _len7; _key7++) {
values[_key7 - 1] = arguments[_key7];
=======
for (var _len6 = arguments.length, values = Array(_len6 > 1 ? _len6 - 1 : 0), _key6 = 1; _key6 < _len6; _key6++) {
values[_key6 - 1] = arguments[_key6];
>>>>>>>
condition = this._sanitizeExpression(condition);
for (var _len6 = arguments.length, values = Array(_len6 > 1 ? _len6 - 1 : 0), _key6 = 1; _key6 < _len6; _key6++) {
values[_key6 - 1] = arguments[_key6];
<<<<<<<
for (var _iterator10 = this._conditions[Symbol.iterator](), _step10; !(_iteratorNormalCompletion10 = (_step10 = _iterator10.next()).done); _iteratorNormalCompletion10 = true) {
var _step10$value = _step10.value,
expr = _step10$value.expr,
_values2 = _step10$value.values;
=======
for (var _iterator8 = this._conditions[Symbol.iterator](), _step8; !(_iteratorNormalCompletion8 = (_step8 = _iterator8.next()).done); _iteratorNormalCompletion8 = true) {
var _step8$value = _step8.value,
expr = _step8$value.expr,
values = _step8$value.values;
>>>>>>>
for (var _iterator8 = this._conditions[Symbol.iterator](), _step8; !(_iteratorNormalCompletion8 = (_step8 = _iterator8.next()).done); _iteratorNormalCompletion8 = true) {
var _step8$value = _step8.value;
var expr = _step8$value.expr;
var _values2 = _step8$value.values;
<<<<<<<
=======
for (var _len9 = arguments.length, values = Array(_len9 > 2 ? _len9 - 2 : 0), _key9 = 2; _key9 < _len9; _key9++) {
values[_key9 - 2] = arguments[_key9];
}
>>>>>>>
<<<<<<<
dir = dir ? 'ASC' : 'DESC'; // Convert truthy to asc
}
}
for (var _len10 = arguments.length, values = Array(_len10 > 2 ? _len10 - 2 : 0), _key10 = 2; _key10 < _len10; _key10++) {
values[_key10 - 2] = arguments[_key10];
=======
dir = dir ? 'ASC' : 'DESC'; // Convert truthy to asc
}
>>>>>>>
dir = dir ? 'ASC' : 'DESC'; // Convert truthy to asc
}
}
for (var _len9 = arguments.length, values = Array(_len9 > 2 ? _len9 - 2 : 0), _key9 = 2; _key9 < _len9; _key9++) {
values[_key9 - 2] = arguments[_key9];
<<<<<<<
for (var _iterator11 = this._orders[Symbol.iterator](), _step11; !(_iteratorNormalCompletion11 = (_step11 = _iterator11.next()).done); _iteratorNormalCompletion11 = true) {
var _step11$value = _step11.value,
field = _step11$value.field,
dir = _step11$value.dir,
_values3 = _step11$value.values;
=======
for (var _iterator9 = this._orders[Symbol.iterator](), _step9; !(_iteratorNormalCompletion9 = (_step9 = _iterator9.next()).done); _iteratorNormalCompletion9 = true) {
var _step9$value = _step9.value,
field = _step9$value.field,
dir = _step9$value.dir,
values = _step9$value.values;
>>>>>>>
for (var _iterator9 = this._orders[Symbol.iterator](), _step9; !(_iteratorNormalCompletion9 = (_step9 = _iterator9.next()).done); _iteratorNormalCompletion9 = true) {
var _step9$value = _step9.value;
var field = _step9$value.field;
var dir = _step9$value.dir;
var _values3 = _step9$value.values;
<<<<<<<
for (var _iterator12 = this._joins[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
var _step12$value = _step12.value,
type = _step12$value.type,
table = _step12$value.table,
alias = _step12$value.alias,
condition = _step12$value.condition;
=======
for (var _iterator10 = this._joins[Symbol.iterator](), _step10; !(_iteratorNormalCompletion10 = (_step10 = _iterator10.next()).done); _iteratorNormalCompletion10 = true) {
var _step10$value = _step10.value,
type = _step10$value.type,
table = _step10$value.table,
alias = _step10$value.alias,
condition = _step10$value.condition;
>>>>>>>
for (var _iterator10 = this._joins[Symbol.iterator](), _step10; !(_iteratorNormalCompletion10 = (_step10 = _iterator10.next()).done); _iteratorNormalCompletion10 = true) {
var _step10$value = _step10.value;
var type = _step10$value.type;
var table = _step10$value.table;
var alias = _step10$value.alias;
var condition = _step10$value.condition;
<<<<<<<
totalStr += this._applyNestingFormatting(_ret2.text);
_ret2.values.forEach(function (value) {
return totalValues.push(value);
});
=======
totalStr += this._applyNestingFormatting(_ret2.text);
totalValues.push.apply(totalValues, _toConsumableArray(_ret2.values));
>>>>>>>
totalStr += this._applyNestingFormatting(_ret4.text);
_ret4.values.forEach(function (value) {
return totalValues.push(value);
});
<<<<<<<
for (var _iterator13 = this._unions[Symbol.iterator](), _step13; !(_iteratorNormalCompletion13 = (_step13 = _iterator13.next()).done); _iteratorNormalCompletion13 = true) {
var _step13$value = _step13.value,
type = _step13$value.type,
table = _step13$value.table;
=======
for (var _iterator11 = this._unions[Symbol.iterator](), _step11; !(_iteratorNormalCompletion11 = (_step11 = _iterator11.next()).done); _iteratorNormalCompletion11 = true) {
var _step11$value = _step11.value,
type = _step11$value.type,
table = _step11$value.table;
>>>>>>>
for (var _iterator11 = this._unions[Symbol.iterator](), _step11; !(_iteratorNormalCompletion11 = (_step11 = _iterator11.next()).done); _iteratorNormalCompletion11 = true) {
var _step11$value = _step11.value;
var type = _step11$value.type;
var table = _step11$value.table;
<<<<<<<
for (var _iterator14 = _this32.blocks[Symbol.iterator](), _step14; !(_iteratorNormalCompletion14 = (_step14 = _iterator14.next()).done); _iteratorNormalCompletion14 = true) {
var block = _step14.value;
=======
for (var _iterator12 = _this32.blocks[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
var block = _step12.value;
>>>>>>>
for (var _iterator12 = _this33.blocks[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
var block = _step12.value;
<<<<<<<
_this32[name] = function () {
for (var _len11 = arguments.length, args = Array(_len11), _key11 = 0; _key11 < _len11; _key11++) {
args[_key11] = arguments[_key11];
=======
_this32[name] = function () {
for (var _len10 = arguments.length, args = Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
args[_key10] = arguments[_key10];
>>>>>>>
_this33[name] = function () {
for (var _len10 = arguments.length, args = Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
args[_key10] = arguments[_key10];
<<<<<<<
for (var _iterator19 = this._tables[Symbol.iterator](), _step19; !(_iteratorNormalCompletion19 = (_step19 = _iterator19.next()).done); _iteratorNormalCompletion19 = true) {
var _step19$value = _step19.value,
alias = _step19$value.alias,
table = _step19$value.table;
=======
for (var _iterator17 = this._tables[Symbol.iterator](), _step17; !(_iteratorNormalCompletion17 = (_step17 = _iterator17.next()).done); _iteratorNormalCompletion17 = true) {
var _step17$value = _step17.value,
alias = _step17$value.alias,
table = _step17$value.table;
>>>>>>>
for (var _iterator17 = this._tables[Symbol.iterator](), _step17; !(_iteratorNormalCompletion17 = (_step17 = _iterator17.next()).done); _iteratorNormalCompletion17 = true) {
var _step17$value = _step17.value;
var alias = _step17$value.alias;
var table = _step17$value.table; |
<<<<<<<
<div id="app-no-print" className="grid patient-data-subnav">
<div className="grid-item one-whole large-one-third">
<a href="" className={basicsLinkClass} onClick={this.props.onClickBasics}>{t('Basics')}</a>
<a href="" className={dayLinkClass} onClick={this.props.onClickOneDay}>{t('Daily')}</a>
<a href="" className={weekLinkClass} onClick={this.props.onClickTwoWeeks}>{t('Weekly')}</a>
<a href="" className={trendsLinkClass} onClick={this.props.onClickTrends}>{t('Trends')}</a>
=======
<div className="grid patient-data-subnav">
<div className="app-no-print grid-item one-whole large-one-third">
<a href="" className={basicsLinkClass} onClick={this.props.onClickBasics}>Basics</a>
<a href="" className={dayLinkClass} onClick={this.props.onClickOneDay}>Daily</a>
<a href="" className={weekLinkClass} onClick={this.props.onClickTwoWeeks}>Weekly</a>
<a href="" className={trendsLinkClass} onClick={this.props.onClickTrends}>Trends</a>
>>>>>>>
<div className="grid patient-data-subnav">
<div className="app-no-print grid-item one-whole large-one-third">
<a href="" className={basicsLinkClass} onClick={this.props.onClickBasics}>{t('Basics')}</a>
<a href="" className={dayLinkClass} onClick={this.props.onClickOneDay}>{t('Daily')}</a>
<a href="" className={weekLinkClass} onClick={this.props.onClickTwoWeeks}>{t('Weekly')}</a>
<a href="" className={trendsLinkClass} onClick={this.props.onClickTrends}>{t('Trends')}</a>
<<<<<<<
<div className="grid-item one-whole large-one-third">
<a href="" className={settingsLinkClass} onClick={this.props.onClickSettings}>{t('Device settings')}</a>
=======
<div className="app-no-print grid-item one-whole large-one-third">
<a href="" className={settingsLinkClass} onClick={this.props.onClickSettings}>Device settings</a>
>>>>>>>
<div className="app-no-print grid-item one-whole large-one-third">
<a href="" className={settingsLinkClass} onClick={this.props.onClickSettings}>{t('Device settings')}</a> |
<<<<<<<
if (typeof dat.temp === 'undefined') {
dat.temp = dat.temp || true // store dats in memory only
}
=======
dat.temp = dat.temp || true // store dats in memory only
log('Creating new gateway with options: %j', { dir, dat, max, net, period, ttl })
>>>>>>>
if (typeof dat.temp === 'undefined') {
dat.temp = dat.temp || true // store dats in memory only
}
log('Creating new gateway with options: %j', { dir, dat, max, net, period, ttl }) |
<<<<<<<
name:'MissionControl',
imageSrc:'https://i.imgur.com/nSRLFas.gif',
githubLink: 'https://github.com/DAVFoundation/missioncontrol/issues',
description:'Controls and orchestrates missions between autonomous vehicles and DAV users',
tags: ['Javascript','Docker','Thrift','Good First Issue']
=======
name: 'MissionControl',
imageSrc: 'https://i.imgur.com/nSRLFas.gif',
githubLink: 'https://github.com/DAVFoundation/missioncontrol',
description: 'Controls and orchestrates missions between autonomous vehicles and DAV users',
tags: ['Javascript', 'Docker', 'Thrift', 'Good First Issue'],
>>>>>>>
name:'MissionControl',
imageSrc:'https://i.imgur.com/nSRLFas.gif',
githubLink: 'https://github.com/DAVFoundation/missioncontrol/issues',
description:'Controls and orchestrates missions between autonomous vehicles and DAV users',
tags: ['Javascript','Docker','Thrift','Good First Issue'],
<<<<<<<
{
name:'atom',
imageSrc:'https://upload.wikimedia.org/wikipedia/commons/e/e2/Atom_1.0_icon.png',
githubLink:
'https://github.com/atom/atom/issues',
description:'A customizable text editor built on electron',
tags: ['atom', 'editor', 'javascript', 'electron', 'windows', 'linux', 'macos']
=======
{
name: 'atom',
imageSrc: 'https://upload.wikimedia.org/wikipedia/commons/e/e2/Atom_1.0_icon.png',
githubLink: 'https://github.com/atom/atom',
description: 'A customizable text editor built on electron',
tags: ['atom', 'editor', 'javascript', 'electron', 'windows', 'linux', 'macos'],
>>>>>>>
{
name: 'atom',
imageSrc: 'https://upload.wikimedia.org/wikipedia/commons/e/e2/Atom_1.0_icon.png',
githubLink: 'https://github.com/atom/atom/issues',
description: 'A customizable text editor built on electron',
tags: ['atom', 'editor', 'javascript', 'electron', 'windows', 'linux', 'macos'], |
<<<<<<<
description: 'Modern applications with built-in automation.',
tags: ['Docs','Front-End','Rust','MultiOS'],
=======
description: 'Modern applications with built-in automation',
tags: ['Docs', 'Front-End', 'Rust', 'MultiOS'],
>>>>>>>
description: 'Modern applications with built-in automation.',
tags: ['Docs','Front-End','Rust','MultiOS'],
<<<<<<<
description: 'The Futuristic JavaScript test runner!',
tags: ['JavaScript','Tests', 'Docs', 'Babel'],
=======
description: 'Futuristic JavaScript test runner',
tags: ['JavaScript', 'Tests', 'Docs', 'Babel'],
>>>>>>>
description: 'The Futuristic JavaScript test runner!',
tags: ['JavaScript','Tests', 'Docs', 'Babel'],
<<<<<<<
description: 'A pocket-sized database.',
tags: ['JavaScript','Node.js','CouchDB'],
=======
description: 'Pocket-sized database',
tags: ['JavaScript', 'Node.js', 'CouchDB'],
>>>>>>>
description: 'A pocket-sized database.',
tags: ['JavaScript','Node.js','CouchDB'],
<<<<<<<
description: 'The Offline First JavaScript Backend.',
tags: ['JavaScript','Node.js'],
=======
description: 'The Offline First JavaScript Backend',
tags: ['JavaScript', 'Node.js'],
>>>>>>>
description: 'The Offline First JavaScript Backend.',
tags: ['JavaScript','Node.js'],
<<<<<<<
githubLink: 'https://github.com/danthareja/contribute-to-open-source/issues',
description: 'Learn GitHub\'s pull request process by contributing code in a fun simulation project.',
=======
githubLink: 'https://github.com/danthareja/contribute-to-open-source/issues',
description: 'Learn GitHub\'s pull request process by contributing code in a fun simulation project ',
>>>>>>>
githubLink: 'https://github.com/danthareja/contribute-to-open-source/issues',
description: 'Learn GitHub\'s pull request process by contributing code in a fun simulation project.',
<<<<<<<
githubLink: 'https://github.com/freeCodeCamp/mail-for-good/issues',
description: 'An open source email campaign management tool.',
tags: ['Nodejs', 'JavaScript', 'Email-Campaigns']
=======
githubLink: 'https://github.com/freeCodeCamp/mail-for-good/issues',
description: 'An open source email campaign management tool',
tags: ['Nodejs', 'JavaScript', 'Email-Campaigns'],
>>>>>>>
githubLink: 'https://github.com/freeCodeCamp/mail-for-good/issues',
description: 'An open source email campaign management tool.',
tags: ['Nodejs', 'JavaScript', 'Email-Campaigns'],
<<<<<<<
githubLink: 'https://github.com/electron/electron/issues',
description: 'Build cross platform desktop apps with JavaScript, HTML, and CSS!',
tags: ['JavaScript', 'Electron', 'Css', 'Html', 'Chrome', 'Nodejs', 'V8']
=======
githubLink: 'https://github.com/electron/electron/issues',
description: 'Build cross platform desktop apps with JavaScript, HTML, and CSS',
tags: ['JavaScript', 'Electron', 'Css', 'Html', 'Chrome', 'Nodejs', 'V8'],
>>>>>>>
githubLink: 'https://github.com/electron/electron/issues',
description: 'Build cross platform desktop apps with JavaScript, HTML, and CSS!',
tags: ['JavaScript', 'Electron', 'Css', 'Html', 'Chrome', 'Nodejs', 'V8']
<<<<<<<
githubLink: 'https://github.com/oppia/oppia/issues',
=======
githubLink: 'https://github.com/oppia/oppia/issues',
>>>>>>>
githubLink: 'https://github.com/oppia/oppia/issues', |
<<<<<<<
},
{
name: 'Bitcoin',
imageSrc: 'https://img.rawpixel.com/s3fs-private/rawpixel_images/website_content/v211-mint-aum-currency-13.jpg?auto=format&bg=F4F4F3&con=3&cs=srgb&dpr=1&fm=jpg&ixlib=php-1.1.0&mark=rawpixel-watermark.png&markalpha=90&markpad=13&markscale=10&markx=25&q=75&usm=15&vib=3&w=1000&s=435abda621bceebc1362c7e657e06c79',
githubLink: 'https://github.com/bitcoin/bitcoin',
description: 'Bitcoin is an experimental digital currency that enables instant payments to anyone, anywhere in the world.',
tags: ['C++', 'Python', 'Cryptocurrency','Blockchain', 'Peer-to-peer']
=======
},
{
name: 'Tensorflow',
imageSrc: 'https://camo.githubusercontent.com/0905c7d634421f8aa4ab3ddf19a582572df568e1/68747470733a2f2f7777772e74656e736f72666c6f772e6f72672f696d616765732f74665f6c6f676f5f736f6369616c2e706e67',
githubLink: 'https://github.com/tensorflow/tensorflow',
description: 'A Machine Learning library in Python for implementing Machine Learning and Deep Learning models',
tags: ['python', 'c++', 'machine learning', 'math', 'deep learning', 'neural network']
>>>>>>>
},
{
name: 'Bitcoin',
imageSrc: 'https://img.rawpixel.com/s3fs-private/rawpixel_images/website_content/v211-mint-aum-currency-13.jpg?auto=format&bg=F4F4F3&con=3&cs=srgb&dpr=1&fm=jpg&ixlib=php-1.1.0&mark=rawpixel-watermark.png&markalpha=90&markpad=13&markscale=10&markx=25&q=75&usm=15&vib=3&w=1000&s=435abda621bceebc1362c7e657e06c79',
githubLink: 'https://github.com/bitcoin/bitcoin',
description: 'Bitcoin is an experimental digital currency that enables instant payments to anyone, anywhere in the world.',
tags: ['C++', 'Python', 'Cryptocurrency','Blockchain', 'Peer-to-peer']
},
{
name: 'Tensorflow',
imageSrc: 'https://camo.githubusercontent.com/0905c7d634421f8aa4ab3ddf19a582572df568e1/68747470733a2f2f7777772e74656e736f72666c6f772e6f72672f696d616765732f74665f6c6f676f5f736f6369616c2e706e67',
githubLink: 'https://github.com/tensorflow/tensorflow',
description: 'A Machine Learning library in Python for implementing Machine Learning and Deep Learning models',
tags: ['python', 'c++', 'machine learning', 'math', 'deep learning', 'neural network'] |
<<<<<<<
var BUTTONS_STYLE = STYLES.concat([
'link',
'text-link'
=======
var BUTTONS_STYLES = STYLES.concat([
'link'
>>>>>>>
var BUTTONS_STYLES = STYLES.concat([
'link',
'text-link' |
<<<<<<<
setup(app) {
app.get('/', (req, res, next) => {
global.appPromise
.then(() => {
const app = require(paths.nodeBuildAppJs).default;
app.handle(req, res);
})
.catch(next);
});
},
before(app) {
=======
before(app, server) {
if (fs.existsSync(paths.proxySetup)) {
// This registers user provided middleware for proxy reasons
require(paths.proxySetup)(app);
}
// This lets us fetch source contents from webpack for the error overlay
app.use(evalSourceMapMiddleware(server));
>>>>>>>
setup(app) {
app.get('/', (req, res, next) => {
global.appPromise
.then(() => {
const app = require(paths.nodeBuildAppJs).default;
app.handle(req, res);
})
.catch(next);
});
},
before(app, server) {
if (fs.existsSync(paths.proxySetup)) {
// This registers user provided middleware for proxy reasons
require(paths.proxySetup)(app);
}
// This lets us fetch source contents from webpack for the error overlay
app.use(evalSourceMapMiddleware(server)); |
<<<<<<<
Ember.Handlebars.helper('motd', function(messages) {
var str = '',
network = this.get('parentController.parentController.content');
messages.forEach(function(text) {
str += App.Parser.exec(text, network) + '<br />';
});
return new Ember.Handlebars.SafeString(str);
});
var generateUserLink = function(show, user) {
=======
Ember.Handlebars.helper('userLink', function(show, user) {
console.log(user);
>>>>>>>
Ember.Handlebars.helper('motd', function(messages) {
var str = '',
network = this.get('parentController.parentController.content');
messages.forEach(function(text) {
str += App.Parser.exec(text, network) + '<br />';
});
return new Ember.Handlebars.SafeString(str);
});
Ember.Handlebars.helper('userLink', function(show, user) { |
<<<<<<<
it('verifies that message', () => {
waitsForPromise(() =>
lint(editor).then((messages) => {
const expected = `'foo' is not defined. (no-undef)`
const expectedUrl = 'http://eslint.org/docs/rules/no-undef'
expect(messages[0].severity).toBe('error')
expect(messages[0].text).not.toBeDefined()
expect(messages[0].excerpt).toBe(expected)
expect(messages[0].url).toBe(expectedUrl)
expect(messages[0].location.file).toBe(badPath)
expect(messages[0].location.position).toEqual([[0, 0], [0, 3]])
expect(Object.hasOwnProperty.call(messages[0], 'fix')).toBeFalsy()
})
)
=======
it('verifies the messages', async () => {
const messages = await lint(editor)
expect(messages.length).toBe(2)
const expected0 = ''foo' is not defined. ' +
'(<a href="http://eslint.org/docs/rules/no-undef">no-undef</a>)'
const expected1 = 'Extra semicolon. ' +
'(<a href="http://eslint.org/docs/rules/semi">semi</a>)'
expect(messages[0].type).toBe('Error')
expect(messages[0].text).not.toBeDefined()
expect(messages[0].html).toBe(expected0)
expect(messages[0].filePath).toBe(badPath)
expect(messages[0].range).toEqual([[0, 0], [0, 3]])
expect(messages[0].fix).not.toBeDefined()
expect(messages[1].type).toBe('Error')
expect(messages[1].text).not.toBeDefined()
expect(messages[1].html).toBe(expected1)
expect(messages[1].filePath).toBe(badPath)
expect(messages[1].range).toEqual([[0, 8], [0, 9]])
expect(messages[1].fix).toBeDefined()
expect(messages[1].fix.range).toEqual([[0, 6], [0, 9]])
expect(messages[1].fix.newText).toBe('42')
>>>>>>>
it('verifies the messages', async () => {
const messages = await lint(editor)
expect(messages.length).toBe(2)
const expected0 = `'foo' is not defined. (no-undef)`
const expected0Url = 'http://eslint.org/docs/rules/no-undef'
const expected1 = 'Extra semicolon. ' +
'(<a href="http://eslint.org/docs/rules/semi">semi</a>)'
expect(messages[0].severity).toBe('error')
expect(messages[0].text).not.toBeDefined()
expect(messages[0].excerpt).toBe(expected0)
expect(messages[0].url).toBe(expected0Url)
expect(messages[0].location.file).toBe(badPath)
expect(messages[0].location.position).toEqual([[0, 0], [0, 3]])
expect(messages[0].solutions).not.toBeDefined()
expect(messages[1].type).toBe('Error')
expect(messages[1].text).not.toBeDefined()
expect(messages[1].html).toBe(expected1)
expect(messages[1].filePath).toBe(badPath)
expect(messages[1].range).toEqual([[0, 8], [0, 9]])
expect(messages[1].fix).toBeDefined()
expect(messages[1].fix.range).toEqual([[0, 6], [0, 9]])
expect(messages[1].fix.newText).toBe('42')
<<<<<<<
it('reports the fixes for fixable errors', () => {
waitsForPromise(() =>
atom.workspace.open(fixPath).then(editor =>
lint(editor)
).then((messages) => {
expect(messages[0].solutions[0].position).toEqual([[0, 10], [1, 8]])
expect(messages[0].solutions[0].replaceWith).toBe('6\nfunction')
expect(messages[1].solutions[0].position).toEqual([[2, 0], [2, 1]])
expect(messages[1].solutions[0].replaceWith).toBe(' ')
})
)
=======
it('reports the fixes for fixable errors', async () => {
const editor = await atom.workspace.open(fixPath)
const messages = await lint(editor)
expect(messages[0].fix.range).toEqual([[0, 10], [1, 8]])
expect(messages[0].fix.newText).toBe('6\nfunction')
expect(messages[1].fix.range).toEqual([[2, 0], [2, 1]])
expect(messages[1].fix.newText).toBe(' ')
>>>>>>>
it('reports the fixes for fixable errors', async () => {
const editor = await atom.workspace.open(fixPath)
const messages = await lint(editor)
expect(messages[0].solutions[0].position).toEqual([[0, 10], [1, 8]])
expect(messages[0].solutions[0].replaceWith).toBe('6\nfunction')
expect(messages[1].solutions[0].position).toEqual([[2, 0], [2, 1]])
expect(messages[1].solutions[0].replaceWith).toBe(' ')
<<<<<<<
it('shows a message for an invalid import', () => {
waitsForPromise(() =>
atom.workspace.open(badImportPath).then(editor =>
lint(editor).then((messages) => {
const expected = `Unable to resolve path to module '../nonexistent'. ` +
'(import/no-unresolved)'
const expectedUrl = 'https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-unresolved.md'
expect(messages.length).toBeGreaterThan(0)
expect(messages[0].severity).toBe('error')
expect(messages[0].text).not.toBeDefined()
expect(messages[0].excerpt).toBe(expected)
expect(messages[0].url).toBe(expectedUrl)
expect(messages[0].location.file).toBe(badImportPath)
expect(messages[0].location.position).toEqual([[0, 24], [0, 39]])
expect(Object.hasOwnProperty.call(messages[0], 'solutions')).toBeFalsy()
})
)
)
=======
it('shows a message for an invalid import', async () => {
const editor = await atom.workspace.open(badImportPath)
const messages = await lint(editor)
const expected = 'Unable to resolve path to module '../nonexistent'. ' +
'(<a href="https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-unresolved.md">' +
'import/no-unresolved</a>)'
expect(messages.length).toBe(1)
expect(messages[0].type).toBe('Error')
expect(messages[0].text).not.toBeDefined()
expect(messages[0].html).toBe(expected)
expect(messages[0].filePath).toBe(badImportPath)
expect(messages[0].range).toEqual([[0, 24], [0, 39]])
expect(messages[0].fix).not.toBeDefined()
>>>>>>>
it('shows a message for an invalid import', async () => {
const editor = await atom.workspace.open(badImportPath)
const messages = await lint(editor)
const expected = `Unable to resolve path to module '../nonexistent'. ` +
'(import/no-unresolved)'
const expectedUrl = 'https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-unresolved.md'
expect(messages.length).toBe(1)
expect(messages[0].severity).toBe('error')
expect(messages[0].text).not.toBeDefined()
expect(messages[0].excerpt).toBe(expected)
expect(messages[0].url).toBe(expectedUrl)
expect(messages[0].location.file).toBe(badImportPath)
expect(messages[0].location.position).toEqual([[0, 24], [0, 39]])
expect(messages[0].solutions).not.toBeDefined()
<<<<<<<
// Create a subscription to watch when the editor changes (from the fix)
editor.onDidChange(() => {
lint(editor)
.then((messagesAfterFixing) => {
// Note: this fires several times, with only the final time resulting in
// a non-null messagesAfterFixing. This is the reason for the check here
// and for the `waitsFor` which makes sure the expectation is tested.
if (messagesAfterFixing) {
// There is still one linting error, `semi` which was disabled during fixing
expect(messagesAfterFixing.length).toBe(1)
expect(messagesAfterFixing[0].html).toBe('Extra semicolon. ([semi](http://eslint.org/docs/rules/semi))')
doneCheckingFixes = true
}
})
})
waitsForPromise(() =>
firstLint(editor)
.then(makeFixes)
)
waitsFor(
() => doneCheckingFixes,
'Messages should be checked after fixing'
)
=======
expect(checkCachefileExists).not.toThrow()
await makeFixes(editor)
expect(checkCachefileExists).not.toThrow()
>>>>>>>
expect(checkCachefileExists).not.toThrow()
await makeFixes(editor)
expect(checkCachefileExists).not.toThrow()
<<<<<<<
it('handles ranges in messages', () =>
waitsForPromise(() =>
atom.workspace.open(endRangePath).then(editor =>
lint(editor).then((messages) => {
const expected = 'Unreachable code. (no-unreachable)'
const expectedUrl = 'http://eslint.org/docs/rules/no-unreachable'
expect(messages[0].severity).toBe('error')
expect(messages[0].text).not.toBeDefined()
expect(messages[0].excerpt).toBe(expected)
expect(messages[0].url).toBe(expectedUrl)
expect(messages[0].location.file).toBe(endRangePath)
expect(messages[0].location.position).toEqual([[5, 2], [6, 15]])
})
)
)
)
=======
it('handles ranges in messages', async () => {
const editor = await atom.workspace.open(endRangePath)
const messages = await lint(editor)
const expected = 'Unreachable code. ' +
'(<a href="http://eslint.org/docs/rules/no-unreachable">no-unreachable</a>)'
expect(messages[0].type).toBe('Error')
expect(messages[0].text).not.toBeDefined()
expect(messages[0].html).toBe(expected)
expect(messages[0].filePath).toBe(endRangePath)
expect(messages[0].range).toEqual([[5, 2], [6, 15]])
})
>>>>>>>
it('handles ranges in messages', async () => {
const editor = await atom.workspace.open(endRangePath)
const messages = await lint(editor)
const expected = 'Unreachable code. (no-unreachable)'
const expectedUrl = 'http://eslint.org/docs/rules/no-unreachable'
expect(messages[0].severity).toBe('error')
expect(messages[0].text).not.toBeDefined()
expect(messages[0].excerpt).toBe(expected)
expect(messages[0].url).toBe(expectedUrl)
expect(messages[0].location.file).toBe(endRangePath)
expect(messages[0].location.position).toEqual([[5, 2], [6, 15]])
})
<<<<<<<
it('errors when no config file is found', () => {
lint(editor)
.then((messages) => {
// Older versions of ESLint will report an error
// (or if current user running tests has a config in their home directory)
const expected = `'foo' is not defined. (no-undef)`
const expectedUrl = 'http://eslint.org/docs/rules/no-undef'
expect(messages.length).toBe(1)
expect(messages[0].excerpt).toBe(expected)
expect(messages[0].url).toBe(expectedUrl)
gotLintingErrors = true
})
.catch((err) => {
// Newer versions of ESLint will throw an exception
expect(err.message).toBe('No ESLint configuration found.')
didError = true
})
waitsFor(
() => didError || gotLintingErrors,
'An error should have been thrown or linting performed'
)
=======
it('errors when no config file is found', async () => {
let didError
let gotLintingErrors
try {
const messages = await lint(editor)
// Older versions of ESLint will report an error
// (or if current user running tests has a config in their home directory)
const expectedHtml = ''foo' is not defined. ' +
'(<a href="http://eslint.org/docs/rules/no-undef">no-undef</a>)'
expect(messages.length).toBe(1)
expect(messages[0].html).toBe(expectedHtml)
gotLintingErrors = true
} catch (err) {
// Newer versions of ESLint will throw an exception
expect(err.message).toBe('No ESLint configuration found.')
didError = true
}
expect(didError || gotLintingErrors).toBe(true)
>>>>>>>
it('errors when no config file is found', async () => {
let didError
let gotLintingErrors
try {
const messages = await lint(editor)
// Older versions of ESLint will report an error
// (or if current user running tests has a config in their home directory)
const expected = `'foo' is not defined. (no-undef)`
const expectedUrl = 'http://eslint.org/docs/rules/no-undef'
expect(messages.length).toBe(1)
expect(messages[0].excerpt).toBe(expected)
expect(messages[0].url).toBe(expectedUrl)
gotLintingErrors = true
} catch (err) {
// Newer versions of ESLint will throw an exception
expect(err.message).toBe('No ESLint configuration found.')
didError = true
}
expect(didError || gotLintingErrors).toBe(true) |
<<<<<<<
return helpers.processJobResponse(response, textEditor, showRule, this.worker)
=======
>>>>>>> |
<<<<<<<
let Passphrase;
=======
let testPassphrase;
>>>>>>>
let Passphrase;
let testPassphrase;
<<<<<<<
=======
describe('$scope.constructor()', () => {
it.skip('sets $watch on $ctrl.input_passphrase to keep validating it', () => {
// Skipped because it doesn't work
const spy = sinon.spy(controller.$scope, '$watch');
controller.constructor();
expect(spy).to.have.been.calledWith('$ctrl.input_passphrase', controller.isValidPassphrase);
});
it.skip('sets $watch that sets customFullscreen on small screens', () => {
});
});
describe('$scope.simulateMousemove()', () => {
it('calls this.$document.mousemove()', () => {
const spy = sinon.spy(controller.$document, 'mousemove');
controller.simulateMousemove();
expect(spy).to.have.been.calledWith();
});
});
describe('$scope.setNewPassphrase()', () => {
it('opens a material design dialog', () => {
const seed = ['23', '34', '34', '34', '34', '34', '34', '34'];
const dialogSpy = sinon.spy(controller.$mdDialog, 'show');
controller.setNewPassphrase(seed);
expect(dialogSpy).to.have.been.calledWith();
});
});
describe('$scope.devTestAccount()', () => {
it('sets input_passphrase from cookie called passphrase if present', () => {
const mock = sinon.mock(controller.$cookies);
mock.expects('get').returns(testPassphrase);
controller.devTestAccount();
expect(controller.input_passphrase).to.equal(testPassphrase);
});
it('does nothing if cooke called passphrase not present', () => {
controller.input_passphrase = testPassphrase;
const mock = sinon.mock(controller.$cookies);
mock.expects('get').returns(undefined);
controller.devTestAccount();
expect(controller.input_passphrase).to.equal(testPassphrase);
});
});
describe('$scope.isValidPassphrase(value)', () => {
it('sets $scope.valid = 2 if value is empty', () => {
controller.isValidPassphrase('');
expect(controller.valid).to.equal(2);
});
it('sets $scope.valid = 1 if value is valid', () => {
controller.isValidPassphrase('ability theme abandon abandon abandon abandon abandon abandon abandon abandon abandon absorb');
expect(controller.valid).to.equal(1);
});
it('sets $scope.valid = 0 if value is invalid', () => {
controller.isValidPassphrase('INVALID VALUE');
expect(controller.valid).to.equal(0);
});
});
});
describe('save $mdDialog controller', () => {
describe('constructor()', () => {
it.skip('sets $watch on $ctrl.missing_input', () => {
});
});
describe('next()', () => {
it.skip('sets this.enter=true', () => {
});
it.skip('sets this.missing_word to a random word of passphrase', () => {
});
it.skip('sets this.pre to part of the passphrase before this.missing_word', () => {
});
it.skip('sets this.pos to part of the passphrase after this.missing_word', () => {
});
});
describe('ok()', () => {
it.skip('calls ok()', () => {
});
it.skip('calls this.close()', () => {
});
});
describe('close()', () => {
it.skip('calls this.$mdDialog.hide()', () => {
});
});
>>>>>>> |
<<<<<<<
clearVotes: 'CLEAR_VOTES',
penddingVotes: 'PENDDING_VOTES',
=======
transactionAdded: 'TRANSACTION_ADDED',
transactionsUpdated: 'TRANSACTIONS_UPDATED',
transactionsLoaded: 'TRANSACTIONS_LOADED',
>>>>>>>
clearVotes: 'CLEAR_VOTES',
penddingVotes: 'PENDDING_VOTES',
transactionAdded: 'TRANSACTION_ADDED',
transactionsUpdated: 'TRANSACTIONS_UPDATED',
transactionsLoaded: 'TRANSACTIONS_LOADED', |
<<<<<<<
require('./services/sign-verify.spec');
=======
require('./services/lsk.spec');
>>>>>>>
require('./services/sign-verify.spec');
require('./services/lsk.spec'); |
<<<<<<<
let limit = (this.transactions.length || 10) + (more ? 10 : 0);
if (limit < 10) {
limit = 10;
}
return this.accountApi.transactions.get(this.account.get().address, limit)
=======
loadTransactions(limit) {
return this.account.listTransactions(this.account.get().address, limit)
>>>>>>>
loadTransactions(limit) {
return this.accountApi.transactions.get(this.account.get().address, limit) |
<<<<<<<
<Button label='LOGIN' primary raised onClick={this.onLoginSubmission.bind(this)}
className='login-button'
=======
<Button label='LOGIN' primary raised
onClick={this.onLoginSubmission.bind(this, this.state.passphrase)}
>>>>>>>
<Button label='LOGIN' primary raised
onClick={this.onLoginSubmission.bind(this, this.state.passphrase)}
className='login-button' |
<<<<<<<
$state = _$state_;
Passphrase = _Passphrase_;
account = _Account_;
=======
Passphrase = _Passphrase_;
$cookies = _$cookies_;
/* eslint-disable no-unused-vars */
$timeout = _$timeout_;
/* eslint-enable no-unused-vars */
>>>>>>>
$state = _$state_;
Passphrase = _Passphrase_;
account = _Account_;
$cookies = _$cookies_;
/* eslint-disable no-unused-vars */
$timeout = _$timeout_;
/* eslint-enable no-unused-vars */
<<<<<<<
describe('componentController.passConfirmSubmit()', () => {
it('sets account.phassphrase as this.input_passphrase processed by normalizer', () => {
controller.input_passphrase = '\tTEST PassPHrASe ';
controller.passConfirmSubmit();
expect(account.get().passphrase).to.equal('test passphrase');
=======
describe('passConfirmSubmit()', () => {
it('sets this.phassphrase as this.input_passphrase processed by normalizer', () => {
controller.input_passphrase = '\tTEST PassPHrASe ';
controller.passConfirmSubmit();
expect(controller.passphrase).to.equal('test passphrase');
>>>>>>>
describe('passConfirmSubmit()', () => {
it('sets account.phassphrase as this.input_passphrase processed by normalizer', () => {
controller.input_passphrase = '\tTEST PassPHrASe ';
controller.passConfirmSubmit();
expect(account.get().passphrase).to.equal('test passphrase');
<<<<<<<
const spy = sinon.spy($state, 'go');
controller.passConfirmSubmit();
expect(spy).to.have.been.calledWith('main');
=======
const spy = sinon.spy(controller, '$timeout');
controller.passConfirmSubmit();
expect(spy).to.have.been.calledWith(controller.onLogin);
});
});
describe('devTestAccount()', () => {
it('calls passConfirmSubmit with timeout if a passphrase is set in the cookies', () => {
$cookies.put('passphrase', testPassphrase);
const spy = sinon.spy(controller, '$timeout');
controller.devTestAccount();
expect(spy).to.have.been.calledWith();
>>>>>>>
const spy = sinon.spy($state, 'go');
controller.passConfirmSubmit();
expect(spy).to.have.been.calledWith('main');
});
});
describe('devTestAccount()', () => {
it('calls passConfirmSubmit with timeout if a passphrase is set in the cookies', () => {
$cookies.put('passphrase', testPassphrase);
const spy = sinon.spy(controller, '$timeout');
controller.devTestAccount();
expect(spy).to.have.been.calledWith(); |
<<<<<<<
this.promptSecondPassphrase()
.then((secondPassphrase) => {
this.accountApi.transactions.create(
this.recipient.value,
this.amount.raw,
this.account.get().passphrase,
secondPassphrase,
)
.then(
(data) => {
const transaction = {
id: data.transactionId,
senderPublicKey: this.account.get().publicKey,
senderId: this.account.get().address,
recipientId: this.recipient.value,
amount: this.amount.raw,
fee: 10000000,
};
this.$rootScope.$broadcast('transaction-sent', transaction);
return this.dialog.successAlert({ text: `${this.amount.value} sent to ${this.recipient.value}` })
.then(() => {
this.reset();
});
},
(res) => {
this.dialog.errorAlert({ text: res && res.message ? res.message : 'An error occurred while sending the transaction.' });
},
)
.finally(() => {
this.loading = false;
});
}, () => {
this.loading = false;
});
=======
this.account.sendLSK(
this.recipient.value,
this.amount.raw,
this.account.get().passphrase,
this.secondPassphrase,
).then((data) => {
const transaction = {
id: data.transactionId,
senderPublicKey: this.account.get().publicKey,
senderId: this.account.get().address,
recipientId: this.recipient.value,
amount: this.amount.raw,
fee: 10000000,
};
this.$rootScope.$broadcast('transaction-sent', transaction);
return this.dialog.successAlert({ text: `${this.amount.value} sent to ${this.recipient.value}` })
.then(() => {
this.reset();
});
}).catch((res) => {
this.dialog.errorAlert({ text: res && res.message ? res.message : 'An error occurred while sending the transaction.' });
}).finally(() => {
this.loading = false;
});
>>>>>>>
this.accountApi.transactions.create(
this.recipient.value,
this.amount.raw,
this.account.get().passphrase,
this.secondPassphrase,
).then((data) => {
const transaction = {
id: data.transactionId,
senderPublicKey: this.account.get().publicKey,
senderId: this.account.get().address,
recipientId: this.recipient.value,
amount: this.amount.raw,
fee: 10000000,
};
this.$rootScope.$broadcast('transaction-sent', transaction);
return this.dialog.successAlert({ text: `${this.amount.value} sent to ${this.recipient.value}` })
.then(() => {
this.reset();
});
}).catch((res) => {
this.dialog.errorAlert({ text: res && res.message ? res.message : 'An error occurred while sending the transaction.' });
}).finally(() => {
this.loading = false;
}); |
<<<<<<<
import SecondPassphraseInput from '../secondPassphraseInput';
=======
import ActionBar from '../actionBar';
>>>>>>>
import SecondPassphraseInput from '../secondPassphraseInput';
import ActionBar from '../actionBar';
<<<<<<<
<section className={`${grid.row} ${grid['between-xs']}`}>
<Button label='Cancel' className='cancel-button' onClick={this.props.closeDialog} />
<Button label='Send'
className='submit-button'
primary={true} raised={true}
disabled={!!this.state.recipient.error || !!this.state.amount.error ||
!!this.state.secondPassphrase.error || this.state.secondPassphrase.value === '' ||
!this.state.recipient.value || !this.state.amount.value}
onClick={this.send.bind(this)}/>
</section>
=======
<ActionBar
secondaryButton={{
onClick: this.props.closeDialog,
}}
primaryButton={{
label: 'Send',
disabled: (
!!this.state.recipient.error ||
!!this.state.amount.error ||
!this.state.recipient.value ||
!this.state.amount.value),
onClick: this.send.bind(this),
}} />
>>>>>>>
<ActionBar
secondaryButton={{
onClick: this.props.closeDialog,
}}
primaryButton={{
label: 'Send',
disabled: (
!!this.state.recipient.error ||
!!this.state.amount.error ||
!!this.state.secondPassphrase.error ||
this.state.secondPassphrase.value === '' ||
!this.state.recipient.value ||
!this.state.amount.value),
onClick: this.send.bind(this),
}} /> |
<<<<<<<
import { getAccount, setSecondPassphrase, send, transactions } from './account';
=======
import { getAccount, setSecondSecret, send, transactions,
extractPublicKey, extractAddress } from './account';
>>>>>>>
import { getAccount, setSecondPassphrase, send, transactions,
extractPublicKey, extractAddress } from './account'; |
<<<<<<<
dialog, Account, AccountApi) {
=======
dialog, SendModal, Account, AccountApi, Notification) {
>>>>>>>
dialog, Account, AccountApi, Notification) { |
<<<<<<<
import history from '../../history';
=======
import i18n from '../../i18n';
>>>>>>>
import history from '../../history';
import i18n from '../../i18n';
<<<<<<<
context: { store, history },
childContextTypes: {
store: PropTypes.object.isRequired,
history: PropTypes.object.isRequired,
},
=======
context: { store, i18n },
childContextTypes: {
store: PropTypes.object.isRequired,
i18n: PropTypes.object.isRequired,
},
>>>>>>>
context: { store, history, i18n },
childContextTypes: {
store: PropTypes.object.isRequired,
history: PropTypes.object.isRequired,
i18n: PropTypes.object.isRequired,
}, |
<<<<<<<
import sinonStubPromise from 'sinon-stub-promise';
import PropTypes from 'prop-types';
=======
>>>>>>>
import PropTypes from 'prop-types'; |
<<<<<<<
import { expect } from 'chai';
import sinon from 'sinon';
=======
import chai, { expect } from 'chai';
import sinonChai from 'sinon-chai';
>>>>>>>
import { expect } from 'chai'; |
<<<<<<<
addToVoteList: 'ADD_TO_VOTE_LIST',
removeFromVoteList: 'REMOVE_FROM_VOTE_LIST',
=======
toastDisplayed: 'TOAST_DISPLAYED',
toastHidden: 'TOAST_HIDDEN',
loadingStarted: 'LOADING_STARTED',
loadingFinished: 'LOADING_FINISHED',
>>>>>>>
addToVoteList: 'ADD_TO_VOTE_LIST',
removeFromVoteList: 'REMOVE_FROM_VOTE_LIST',
toastDisplayed: 'TOAST_DISPLAYED',
toastHidden: 'TOAST_HIDDEN',
loadingStarted: 'LOADING_STARTED',
loadingFinished: 'LOADING_FINISHED', |
<<<<<<<
import i18n from '../../i18n';
import * as dialogActions from '../../actions/dialog';
import ClickToSendHOC from './index';
import store from '../../store';
=======
import ClickToSend from './index';
import RelativeLink from '../relativeLink';
>>>>>>>
import i18n from '../../i18n';
import ClickToSend from './index';
import RelativeLink from '../relativeLink';
<<<<<<<
wrapper = mount(<Provider store={store}><ClickToSendHOC i18n={i18n} /></Provider>);
=======
setActiveDialog = sinon.spy();
>>>>>>>
setActiveDialog = sinon.spy(); |
<<<<<<<
import { expect } from 'chai';
import sinon from 'sinon';
=======
import chai, { expect } from 'chai';
import sinonChai from 'sinon-chai';
>>>>>>>
import { expect } from 'chai';
<<<<<<<
describe('Forging', () => {
=======
chai.use(sinonChai);
describe('Forging HOC', () => {
>>>>>>>
describe('Forging HOC', () => { |
<<<<<<<
import { IconMenu, MenuItem, MenuDivider } from 'react-toolbox/lib/menu';
=======
import { IconMenu, MenuItem } from 'react-toolbox/lib/menu';
import React from 'react';
>>>>>>>
import { IconMenu, MenuItem, MenuDivider } from 'react-toolbox/lib/menu';
import React from 'react';
<<<<<<<
import SaveAccountButton from '../saveAccountButton';
=======
import styles from './header.css';
>>>>>>>
import SaveAccountButton from '../saveAccountButton';
import styles from './header.css'; |
<<<<<<<
import { shallow } from 'enzyme';
import configureMockStore from 'redux-mock-store';
=======
import { mount } from 'enzyme';
import PropTypes from 'prop-types';
>>>>>>>
import configureMockStore from 'redux-mock-store';
import { shallow } from 'enzyme';
import PropTypes from 'prop-types'; |
<<<<<<<
import votingMiddleware from './voting';
=======
import savedAccountsMiddleware from './savedAccounts';
>>>>>>>
import votingMiddleware from './voting';
import savedAccountsMiddleware from './savedAccounts';
<<<<<<<
votingMiddleware,
=======
savedAccountsMiddleware,
>>>>>>>
votingMiddleware,
savedAccountsMiddleware, |
<<<<<<<
import offlineMiddleware from './offline';
=======
import notificationMiddleware from './notification';
>>>>>>>
import offlineMiddleware from './offline';
import notificationMiddleware from './notification';
<<<<<<<
offlineMiddleware,
=======
notificationMiddleware,
>>>>>>>
offlineMiddleware,
notificationMiddleware, |
<<<<<<<
require('../src/components/toaster/stories');
=======
require('../src/components/send/stories');
>>>>>>>
require('../src/components/toaster/stories');
require('../src/components/send/stories'); |
<<<<<<<
=======
import Passphrase from '../passphrase';
import PassphraseInput from '../passphraseInput';
>>>>>>>
import PassphraseInput from '../passphraseInput';
<<<<<<<
=======
autologin() {
const savedAccounts = localStorage.getItem('accounts');
if (savedAccounts && !this.props.account.afterLogout) {
const account = JSON.parse(savedAccounts)[0];
const network = Object.assign({}, networksRaw[account.network]);
if (account.network === 2) {
network.address = account.address;
}
// set active peer
this.props.activePeerSet({
publicKey: account.publicKey,
network,
});
}
}
onLoginSubmission(passphrase) {
const network = Object.assign({}, networksRaw[this.state.network]);
if (this.state.network === 2) {
network.address = this.state.address;
}
// set active peer
this.props.activePeerSet({
passphrase,
network,
});
}
>>>>>>>
autologin() {
const savedAccounts = localStorage.getItem('accounts');
if (savedAccounts && !this.props.account.afterLogout) {
const account = JSON.parse(savedAccounts)[0];
const network = Object.assign({}, networksRaw[account.network]);
if (account.network === 2) {
network.address = account.address;
}
// set active peer
this.props.activePeerSet({
publicKey: account.publicKey,
network,
});
}
} |
<<<<<<<
const I18nScannerPlugin = require('../src/i18n-scanner');
=======
const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
>>>>>>>
const I18nScannerPlugin = require('../src/i18n-scanner');
const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
<<<<<<<
new I18nScannerPlugin({
translationFunctionNames: ['i18next.t', 'props.t', 'this.props.t', 't'],
outputFilePath: './i18n/locales/en/common.json',
files: [
'./src/**/*.js',
'./app/src/**/*.js',
],
}),
=======
new HardSourceWebpackPlugin(),
>>>>>>>
new I18nScannerPlugin({
translationFunctionNames: ['i18next.t', 'props.t', 'this.props.t', 't'],
outputFilePath: './i18n/locales/en/common.json',
files: [
'./src/**/*.js',
'./app/src/**/*.js',
],
}),
new HardSourceWebpackPlugin(), |
<<<<<<<
'/src/mipmain.js',
'/src/builtins/video/**'
=======
'/src/mipmain.js'
],
test: [
'/src/**',
'/test/**'
>>>>>>>
'/src/mipmain.js',
'/src/builtins/video/**'
],
test: [
'/src/**',
'/test/**' |
<<<<<<<
var getExtensionUrl = chromeRuntime.getURL;
=======
var getExtensionUrl = chrome.extension.getURL;
var chromeNotifications = chrome.notifications;
var chromeContextMenus = chrome.contextMenus;
var chromeIdle = chrome.idle;
var chromeOmnibox = chrome.omnibox;
>>>>>>>
var getExtensionUrl = chromeRuntime.getURL;
var chromeNotifications = chrome.notifications;
var chromeContextMenus = chrome.contextMenus;
var chromeIdle = chrome.idle;
var chromeOmnibox = chrome.omnibox;
<<<<<<<
/** ID of the last.fm login tab */
var lastfmAuthTabId;
=======
//} private variables
>>>>>>>
/** ID of the last.fm login tab */
var lastfmAuthTabId;
//} private variables
<<<<<<<
var lastfmLogin = exports.lastfmLogin = function() {
var url = lastfm.getLoginUrl(getExtensionUrl("lastfmCallback.html"));
chromeTabs.create({ url: url }, function(tab) { lastfmAuthTabId = tab.id; });
=======
function lastfmLogin() {
var url = lastfm.getLoginUrl(getExtensionUrl("options.html"));
if (optionsTabId) {
chromeTabs.update(optionsTabId, { url: url, active: true });
} else {
chromeTabs.create({ url: url });
}
>>>>>>>
function lastfmLogin() {
var url = lastfm.getLoginUrl(getExtensionUrl("lastfmCallback.html"));
chromeTabs.create({ url: url }, function(tab) { lastfmAuthTabId = tab.id; });
<<<<<<<
if (song.info) fetchLyrics(song.info, function(result) {
//we cannot send jQuery objects with a post, so send plain html
if (result.lyrics) result.lyrics = result.lyrics.html();
if (result.credits) result.credits = result.credits.html();
if (result.title) result.title = result.title.text().trim();
postToGooglemusic({type: "lyrics", result: result});
});
} else if (type == "rated") {
if (settings.linkRatings && settings.linkRatingsGpm && val.rating >= settings.linkRatingsMin) {
if (songsEqual(song.info, val.song)) loveTrack();
else love(val.song, $.noop);
}
}
}
/** Tell the connected Google Music port about changes in the lyrics settings. */
function postLyricsState() {
postToGooglemusic({type: "lyricsState",
enabled: localSettings.lyrics && settings.lyricsInGpm,
fontSize: localSettings.lyricsFontSize,
width: localSettings.lyricsWidth,
autoReload: settings.lyricsAutoReload
});
}
var loadNavlistLink;
var loadNavlistSearch;
function loadNavlistIfConnected() {
if (!loadNavlistLink) return;
if (player.connected) {
postToGooglemusic({type: "getNavigationList", link: loadNavlistLink, search: loadNavlistSearch, omitUnknownAlbums: loadNavlistLink == "albums" && settings.omitUnknownAlbums});
loadNavlistLink = null;
loadNavlistSearch = null;
} else openGoogleMusicTab(loadNavlistLink);//when connected, we get triggered again
}
/** Load a navigation list in Google Music and wait for message from there (player.navigationList will be updated). If not connected, open a Google Music tab and try again. */
exports.loadNavigationList = function(link, search) {
loadNavlistLink = link;
loadNavlistSearch = search;
loadNavlistIfConnected();
};
/** Select a link in the Google Music tab or open it when not connected. */
exports.selectLink = function(link) {
postToGooglemusic({type: "selectLink", link: link});
openGoogleMusicTab(link, true);//if already opened focus the tab, else open & focus a new one
};
/** Start a playlist in Google Music. */
exports.startPlaylist = function(link) {
postToGooglemusic({type: "startPlaylist", link: link});
};
var feelingLucky = false;
function executeFeelingLuckyIfConnected() {
if (!feelingLucky) return;
if (player.connected) {
executeInGoogleMusic("feelingLucky");
feelingLucky = false;
} else openGoogleMusicTab();//when connected, we get triggered again
}
/** Execute "feeling lucky" in Google Music. If not connected, open a Google Music tab and try again. */
var executeFeelingLucky = exports.executeFeelingLucky = function() {
feelingLucky = true;
executeFeelingLuckyIfConnected();
};
function resumeLastSongIfConnected() {
if (!lastSongToResume) return;
if (player.connected) {
postToGooglemusic({type: "resumeLastSong",
albumLink: lastSongToResume.info.albumLink,
artist: lastSongToResume.info.artist,
title: lastSongToResume.info.title,
duration: lastSongToResume.info.duration,
position: lastSongToResume.positionSec / lastSongToResume.info.durationSec
});
} else openGoogleMusicTab();//when connected, we get triggered again
}
/** Resume the saved last song in Google Music. If not connected, open a Google Music tab and try again. */
var resumeLastSong = exports.resumeLastSong = function(lastSong) {
lastSongToResume = lastSong;
resumeLastSongIfConnected();
};
/** Shortcut to call the play/pause command in Google Music. */
var executePlayPause = exports.executePlayPause = function() {
executeInGoogleMusic("playPause");
};
/** Calculate and set the song position in seconds (song.scrobbleTime) when the song will be scrobbled or -1 if disabled */
function calcScrobbleTime() {
if (song.scrobbled) return;
if (song.info &&
song.info.durationSec > 0 &&
isScrobblingEnabled() &&
!(song.ff && settings.disableScrobbleOnFf) &&
!(settings.scrobbleMaxDuration > 0 && song.info.durationSec > (settings.scrobbleMaxDuration * 60))) {
var scrobbleTime = song.info.durationSec * (settings.scrobblePercent / 100);
if (settings.scrobbleTime > 0 && scrobbleTime > settings.scrobbleTime) {
scrobbleTime = settings.scrobbleTime;
}
//leave 3s at the beginning and end to be sure the correct song will be scrobbled
scrobbleTime = Math.min(song.info.durationSec - 3, Math.max(3, scrobbleTime));
song.scrobbleTime = scrobbleTime;
} else {
song.scrobbleTime = -1;
}
}
/** Write a song to local storage for a later try to scrobble it. */
function cacheForLaterScrobbling(songInfo) {
var scrobbleCache = localStorage.scrobbleCache;
scrobbleCache = scrobbleCache ? JSON.parse(scrobbleCache) : {};
if (scrobbleCache.user != localSettings.lastfmSessionName) {
scrobbleCache.songs = [];
scrobbleCache.user = localSettings.lastfmSessionName;
}
while (scrobbleCache.songs.length >= 50) {
scrobbleCache.songs.shift();
}
scrobbleCache.songs.push(songInfo);
localStorage.scrobbleCache = JSON.stringify(scrobbleCache);
}
/** @return true, if the last.fm error code allows for a new try to scrobble. */
function isScrobbleRetriable(code) {
return code == 16 || code == 11 || code == 9 || code == -1;
}
/** Scrobble all songs that have been cached fro scrobble retry. */
function scrobbleCachedSongs() {
var scrobbleCache = localStorage.scrobbleCache;
if (scrobbleCache) {
scrobbleCache = JSON.parse(scrobbleCache);
if (scrobbleCache.user != localSettings.lastfmSessionName) {
localStorage.removeItem("scrobbleCache");
return;
}
var params = {};
scrobbleCache.songs.forEach(function(curSong, i) {
for (var prop in curSong) params[prop + "[" + i + "]"] = curSong[prop];
});
lastfm.track.scrobble(params, {
success: function() {
localStorage.removeItem("scrobbleCache");
gaEvent("LastFM", "ScrobbleCachedOK");
},
error: function(code) {
console.warn("Error on cached scrobbling: " + code);
if (!isScrobbleRetriable(code)) localStorage.removeItem("scrobbleCache");
gaEvent("LastFM", "ScrobbleCachedError-" + code);
}
});
}
}
/** Scrobble the current song. */
function scrobble() {
var params = {
track: song.info.title,
timestamp: song.timestamp,
artist: song.info.artist,
album: song.info.album,
duration: song.info.durationSec
};
var cloned = $.extend({}, params);//clone now, lastfm API will enrich params with additional values we don't need
lastfm.track.scrobble(params, {
success: function() {
gaEvent("LastFM", "ScrobbleOK");
scrobbleCachedSongs();//try cached songs again now that the service seems to work again
},
error: function(code) {
console.warn("Error on scrobbling '" + params.track + "': " + code);
if (isScrobbleRetriable(code)) cacheForLaterScrobbling(cloned);
gaEvent("LastFM", "ScrobbleError-" + code);
}
});
}
/** Send updateNowPlaying for the current song. */
function sendNowPlaying() {
lastfm.track.updateNowPlaying({
track: song.info.title,
artist: song.info.artist,
album: song.info.album,
duration: song.info.durationSec
}, {
success: function() { gaEvent("LastFM", "NowPlayingOK"); },
error: function(code) {
console.warn("Error on now playing '" + song.info.title + "': " + code);
gaEvent("LastFM", "NowPlayingError-" + code);
}
});
}
/** Logout from last.fm and show a notification to login again. */
lastfm.sessionTimeoutCallback = function() {
lastfmLogout();
createNotification(RELOGIN, {
type: "basic",
title: i18n("lastfmSessionTimeout"),
message: i18n("lastfmRelogin"),
iconUrl: getExtensionUrl("img/icon-48x48.png"),
priority: 1,
isClickable: true
}, function(nid) {
addNotificationListener("click", nid, function() {
clearNotification(nid);
lastfmLogin();
=======
if (song.info) fetchLyrics(song.info, function(providers, src, result) {
//we cannot send jQuery objects with a post, so send plain html
if (result.lyrics) result.lyrics = result.lyrics.html();
if (result.credits) result.credits = result.credits.html();
if (result.title) result.title = result.title.text().trim();
postToGooglemusic({ type: "lyrics", result: result, providers: providers, src: src });
>>>>>>>
if (song.info) fetchLyrics(song.info, function(providers, src, result) {
//we cannot send jQuery objects with a post, so send plain html
if (result.lyrics) result.lyrics = result.lyrics.html();
if (result.credits) result.credits = result.credits.html();
if (result.title) result.title = result.title.text().trim();
postToGooglemusic({ type: "lyrics", result: result, providers: providers, src: src }); |
<<<<<<<
js_single: ["src/js/cs.js", "src/js/cs-*.js", "src/js/injected.js", "src/js/lastfmCallback.js", "src/js/options.js", "src/js/player.js", "src/js/updateNotifier.js"],
=======
js_single: ["src/js/cs.js", "src/js/cs-*.js", "src/js/ga.js", "src/js/injected.js", "src/js/options.js", "src/js/player.js", "src/js/updateNotifier.js"],
>>>>>>>
js_single: ["src/js/cs.js", "src/js/cs-*.js", "src/js/ga.js", "src/js/injected.js", "src/js/lastfmCallback.js", "src/js/options.js", "src/js/player.js", "src/js/updateNotifier.js"], |
<<<<<<<
var urlRegex = frag.indexOf('\'') != -1 ? /'([\s\S]*)'/ : /"([\s\S]*)"/;
=======
var urlRegex = frag.indexOf('\'') !== -1 ? /'(.*)'/ : /"(.*)"/;
>>>>>>>
var urlRegex = frag.indexOf('\'') !== -1 ? /'([\s\S]*)'/ : /"([\s\S]*)"/;
<<<<<<<
if (hasMultiline && hasMultiline.lastIndexOf(",") != -1) {
=======
if (hasMultiline && hasMultiline.lastIndexOf(",") !== -1) {
>>>>>>>
if (hasMultiline && hasMultiline.lastIndexOf(",") !== -1) {
<<<<<<<
cb(null, assetFiles);
=======
// One liner.
if (start_line_idx === end_line_idx) {
lines[start_line_idx] = line.replace(opts.oneliner_pattern, assetFiles);
}
// One or more lines.
if (start_line_idx < end_line_idx) {
if ('module_id' !== opts.type && /,$/.test(lines[end_line_idx])) {
assetFiles += ',';
}
if (/}\)$/.test(lines[end_line_idx])) {
assetFiles += '})';
}
lines[start_line_idx] = line.replace(opts.start_pattern, assetFiles);
lines.splice(start_line_idx + 1, end_line_idx - start_line_idx);
}
if (/^\s*$/.test(lines[start_line_idx])) {
lines.splice(start_line_idx, 1);
}
cb(null);
>>>>>>>
cb(null, assetFiles); |
<<<<<<<
it('query with pipe and back pressure', (done) => TESTS['query with pipe and back pressure'](done))
=======
it('query with duplicate output column names', done => TESTS['query with duplicate output column names'](done))
>>>>>>>
it('query with pipe and back pressure', (done) => TESTS['query with pipe and back pressure'](done))
it('query with duplicate output column names', done => TESTS['query with duplicate output column names'](done)) |
<<<<<<<
it.skip('query with pipe and back pressure', (done) => TESTS['query with pipe and back pressure'](done))
=======
it('query with duplicate output column names', done => TESTS['query with duplicate output column names'](done))
>>>>>>>
it.skip('query with pipe and back pressure', (done) => TESTS['query with pipe and back pressure'](done))
<<<<<<<
it('streaming pause', done => TESTS['streaming pause'](done))
it('streaming resume', done => TESTS['streaming resume'](done))
it('streaming trailing rows', done => TESTS['streaming trailing rows'](done))
it('a cancelled stream emits done event', done => TESTS['a cancelled stream emits done event'](done))
it('a cancelled paused stream emits done event', done => TESTS['a cancelled paused stream emits done event'](done))
=======
itNode10('streaming pause', done => TESTS['streaming pause'](done))
itNode10('streaming resume', done => TESTS['streaming resume'](done))
itNode10('streaming trailing rows', done => TESTS['streaming trailing rows'](done))
itNode10('streaming with duplicate output column names', done => TESTS['streaming with duplicate output column names'](done))
itNode10('a cancelled stream emits done event', done => TESTS['a cancelled stream emits done event'](done))
itNode10('a cancelled paused stream emits done event', done => TESTS['a cancelled paused stream emits done event'](done))
>>>>>>>
it('streaming pause', done => TESTS['streaming pause'](done))
it('streaming resume', done => TESTS['streaming resume'](done))
it('streaming trailing rows', done => TESTS['streaming trailing rows'](done))
it('streaming with duplicate output column names', done => TESTS['streaming with duplicate output column names'](done))
it('a cancelled stream emits done event', done => TESTS['a cancelled stream emits done event'](done))
it('a cancelled paused stream emits done event', done => TESTS['a cancelled paused stream emits done event'](done)) |
<<<<<<<
'copy-eula',
'electron:' + electronBuild,
=======
'electron:' + (process.platform === 'darwin' ? 'osxBuild' : 'winBuild'),
'copy-license-docs',
>>>>>>>
'electron:' + electronBuild,
'copy-license-docs',
<<<<<<<
'copy-eula',
'electron:' + electronBuild,
=======
'electron:' + (process.platform === 'darwin' ? 'osxBuild' : 'winBuild'),
'copy-license-docs',
>>>>>>>
'electron:' + electronBuild,
'copy-license-docs', |
<<<<<<<
pushMany(manyComponentObjects: ComponentObjects[]): Promise<ComponentObjects[]> {
// This ComponentObjects.manyToString will handle all the base64 stuff so we won't send this payload
// to the pack command (to prevent duplicate base64)
=======
pushMany(manyComponentObjects: ComponentObjects[]): Promise<string[]> {
>>>>>>>
pushMany(manyComponentObjects: ComponentObjects[]): Promise<string[]> {
// This ComponentObjects.manyToString will handle all the base64 stuff so we won't send this payload
// to the pack command (to prevent duplicate base64)
<<<<<<<
=======
return payload.ids;
>>>>>>>
return payload.ids; |
<<<<<<<
const components = await consumer.commit(
[id],
message,
exactVersion,
releaseType,
force,
verbose,
ignoreMissingDependencies
);
return R.head(components);
=======
return consumer.commit([id], message, force, verbose, ignoreMissingDependencies);
>>>>>>>
return consumer.commit([id], message, exactVersion, releaseType, force, verbose, ignoreMissingDependencies); |
<<<<<<<
=======
// todo: make sure mainFileName and testsFileNames are available
// TODO: Make sure to add the component origin arg
>>>>>>>
// TODO: Make sure to add the component origin arg
<<<<<<<
if (bitDir && !componentMap && !fs.existsSync(bitDir)) return Promise.reject(new ComponentNotFoundInline(bitDir));
const bitJson = await BitJson.load(bitDir, consumerBitJson);
if (!componentMap) { // todo: get rid of this part
return new Component({
name: path.basename(bitDir),
box: path.basename(path.dirname(bitDir)),
lang: bitJson.lang,
implFile: bitJson.getImplBasename(),
specsFile: bitJson.getSpecBasename(),
compilerId: BitId.parse(bitJson.compilerId),
testerId: BitId.parse(bitJson.testerId),
dependencies: BitIds.fromObject(bitJson.dependencies),
packageDependencies: bitJson.packageDependencies,
impl: path.join(bitDir, bitJson.getImplBasename()),
specs: path.join(bitDir, bitJson.getSpecBasename()),
});
} else { // use componentMap
const files = componentMap.files;
const absoluteFiles = {};
Object.keys(files).forEach(file => {
absoluteFiles[file] = path.join(consumerPath, files[file]);
});
return new Component({
name: id.name,
box: id.box,
lang: bitJson.lang,
// filesNames // todo: is it needed?
compilerId: BitId.parse(bitJson.compilerId),
testerId: BitId.parse(bitJson.testerId),
dependencies: BitIds.fromObject(bitJson.dependencies),
packageDependencies: bitJson.packageDependencies,
mainFileName: componentMap.mainFile,
testsFileNames: componentMap.testsFiles,
files: absoluteFiles || {},
});
}
=======
let dependencies, packageDependencies;
let implFile, specsFile, impl, specs;
let bitJson = consumerBitJson;
if (componentMap.origin === COMPONENT_ORIGINS.IMPORTED || componentMap.origin === COMPONENT_ORIGINS.NESTED){
if (bitDir && !fs.existsSync(bitDir)) return Promise.reject(new ComponentNotFoundInPath(bitDir));
// In case it's imported component we will have bit.json in the dir
bitJson = BitJson.loadSync(bitDir, consumerBitJson);
// Load the dependencies from bit.json
dependencies = BitIds.fromObject(bitJson.dependencies);
packageDependencies = bitJson.packageDependencies;
// We only create those attribute in case of imported component because
// Adding new component shouldn't generate those any more
// It's mainly for backward compatability
// TODO: put this inside files / test files
implFile = bitJson.getImplBasename();
specsFile = bitJson.getSpecBasename();
impl = path.join(bitDir, bitJson.getImplBasename());
specs = path.join(bitDir, bitJson.getSpecBasename());
}
const files = componentMap.files;
const absoluteFiles = {};
Object.keys(files).forEach(file => {
absoluteFiles[file] = path.join(consumerPath, files[file]);
});
const absoluteTestFiles = componentMap.testsFiles.map((testFile) => path.join(consumerPath, testFile));
return new Component({
name: id.name,
box: id.box,
lang: bitJson.lang,
compilerId: BitId.parse(bitJson.compilerId),
testerId: BitId.parse(bitJson.testerId),
mainFileName: componentMap.mainFile,
files: absoluteFiles || {},
testsFiles: absoluteTestFiles,
dependencies,
packageDependencies,
implFile,
specsFile,
impl,
specs
});
>>>>>>>
let dependencies, packageDependencies;
let implFile, specsFile, impl, specs;
let bitJson = consumerBitJson;
if (componentMap.origin === COMPONENT_ORIGINS.IMPORTED || componentMap.origin === COMPONENT_ORIGINS.NESTED){
if (bitDir && !fs.existsSync(bitDir)) return Promise.reject(new ComponentNotFoundInPath(bitDir));
// In case it's imported component we will have bit.json in the dir
bitJson = BitJson.loadSync(bitDir, consumerBitJson);
// Load the dependencies from bit.json
dependencies = BitIds.fromObject(bitJson.dependencies);
packageDependencies = bitJson.packageDependencies;
// We only create those attribute in case of imported component because
// Adding new component shouldn't generate those any more
// It's mainly for backward compatability
// TODO: put this inside files / test files
implFile = bitJson.getImplBasename();
specsFile = bitJson.getSpecBasename();
impl = path.join(bitDir, bitJson.getImplBasename());
specs = path.join(bitDir, bitJson.getSpecBasename());
}
const files = componentMap.files;
const absoluteFiles = {};
Object.keys(files).forEach(file => {
absoluteFiles[file] = path.join(consumerPath, files[file]);
});
const absoluteTestFiles = componentMap.testsFiles.map((testFile) => path.join(consumerPath, testFile));
return new Component({
name: id.name,
box: id.box,
lang: bitJson.lang,
compilerId: BitId.parse(bitJson.compilerId),
testerId: BitId.parse(bitJson.testerId),
mainFileName: componentMap.mainFile,
files: absoluteFiles || {},
testsFiles: absoluteTestFiles,
dependencies,
packageDependencies,
implFile,
specsFile,
impl,
specs
}); |
<<<<<<<
import * as globalConfig from '../api/consumer/lib/global-config';
=======
import npmClient from '../npm-client';
>>>>>>>
import * as globalConfig from '../api/consumer/lib/global-config';
import npmClient from '../npm-client'; |
<<<<<<<
componentsDirStructure() {
// TODO: Change this according to the user configuration
return `${BITS_DIRNAME}/{namespace}/{name}`;
}
_getComponentStructurePart(componentStructure, componentPart) {
switch (componentPart) {
case 'name':
return 'name';
case 'namespace':
return 'box';
case 'scope':
return 'scope';
case 'version':
return 'version';
default:
throw new Error(`the ${componentPart} part of the component structure
${componentStructure} is invalid, it must be one of the following: "name", "namespace", "scope" or "version" `);
}
}
composeBitPath(bitId: BitId): string {
const componentStructure = this.componentsDirStructure();
const componentStructureParts = componentStructure.split('/');
const addToPath = [this.getPath()];
componentStructureParts.forEach((dir) => {
if (dir.startsWith('{') && dir.endsWith('}')) { // this is variable
const dirStripped = dir.replace(/[{}]/g, '');
const componentPart = this._getComponentStructurePart(componentStructure, dirStripped);
addToPath.push(bitId[componentPart]);
} else {
addToPath.push(dir);
}
});
// todo: logger.debug(`component dir path: ${addToPath.join('/')}`)
return path.join(...addToPath);
}
runComponentSpecs(id: BitInlineId): Promise<?any> {
=======
runComponentSpecs(id: BitInlineId, verbose: boolean = false): Promise<?any> {
>>>>>>>
componentsDirStructure() {
// TODO: Change this according to the user configuration
return `${BITS_DIRNAME}/{namespace}/{name}`;
}
_getComponentStructurePart(componentStructure, componentPart) {
switch (componentPart) {
case 'name':
return 'name';
case 'namespace':
return 'box';
case 'scope':
return 'scope';
case 'version':
return 'version';
default:
throw new Error(`the ${componentPart} part of the component structure
${componentStructure} is invalid, it must be one of the following: "name", "namespace", "scope" or "version" `);
}
}
composeBitPath(bitId: BitId): string {
const componentStructure = this.componentsDirStructure();
const componentStructureParts = componentStructure.split('/');
const addToPath = [this.getPath()];
componentStructureParts.forEach((dir) => {
if (dir.startsWith('{') && dir.endsWith('}')) { // this is variable
const dirStripped = dir.replace(/[{}]/g, '');
const componentPart = this._getComponentStructurePart(componentStructure, dirStripped);
addToPath.push(bitId[componentPart]);
} else {
addToPath.push(dir);
}
});
// todo: logger.debug(`component dir path: ${addToPath.join('/')}`)
return path.join(...addToPath);
}
runComponentSpecs(id: BitInlineId, verbose: boolean = false): Promise<?any> { |
<<<<<<<
write(writePath?: string, force?: boolean = true): Promise<any> {
const filePath = writePath || this.path;
=======
write(path?: string, force?: boolean = true): Promise<any> {
const filePath = path || this.path;
logger.debug(`writing a file to the file-system at ${filePath}`);
>>>>>>>
write(writePath?: string, force?: boolean = true): Promise<any> {
const filePath = writePath || this.path;
logger.debug(`writing a file to the file-system at ${filePath}`); |
<<<<<<<
async isolateComponent(rawId: string | BitId, opts: IsolateOptions): Promise<ComponentWithDependencies> {
const bitId = typeof rawId === 'string' ? BitId.parse(rawId) : rawId;
const componentsWithDependencies = await this.scope.getMany([bitId]);
const concreteOpts = {
componentsWithDependencies,
writeToPath: opts.writeToPath || this.path,
force: opts.override,
withPackageJson: !opts.noPackageJson,
withBitJson: opts.conf,
writeBitDependencies: opts.writeBitDependencies,
createNpmLinkFiles: opts.createNpmLinkFiles,
dist: opts.dist
};
await this.consumer.writeToComponentsDir(concreteOpts);
const componentWithDependencies: ComponentWithDependencies = R.head(componentsWithDependencies);
if (opts.installPackages) await this.consumer.installNpmPackages([componentWithDependencies], opts.verbose);
=======
async importE2E(
rawId: string,
verbose: boolean,
installDependencies: boolean = true,
writeBitDependencies?: boolean = false,
createNpmLinkFiles?: boolean = false
): Promise<ComponentWithDependencies> {
const bitId = BitId.parse(rawId);
const componentDependenciesArr = await this.scope.getMany([bitId]);
await this.consumer.writeToComponentsDir({
componentsWithDependencies: componentDependenciesArr,
writeBitDependencies,
createNpmLinkFiles,
saveDependenciesAsComponents: true
});
const componentWithDependencies: ComponentWithDependencies = R.head(componentDependenciesArr);
if (installDependencies) await this.consumer.installNpmPackages([componentWithDependencies], verbose);
>>>>>>>
async isolateComponent(rawId: string | BitId, opts: IsolateOptions): Promise<ComponentWithDependencies> {
const bitId = typeof rawId === 'string' ? BitId.parse(rawId) : rawId;
const componentsWithDependencies = await this.scope.getMany([bitId]);
const concreteOpts = {
componentsWithDependencies,
writeToPath: opts.writeToPath || this.path,
force: opts.override,
withPackageJson: !opts.noPackageJson,
withBitJson: opts.conf,
writeBitDependencies: opts.writeBitDependencies,
createNpmLinkFiles: opts.createNpmLinkFiles,
saveDependenciesAsComponents: true,
dist: opts.dist
};
await this.consumer.writeToComponentsDir(concreteOpts);
const componentWithDependencies: ComponentWithDependencies = R.head(componentsWithDependencies);
if (opts.installPackages) await this.consumer.installNpmPackages([componentWithDependencies], opts.verbose); |
<<<<<<<
import ScopeSearch from './commands/private-cmds/_search-cmd';
=======
import ScopeShow from './commands/private-cmds/_show-cmd';
>>>>>>>
import ScopeSearch from './commands/private-cmds/_search-cmd';
import ScopeShow from './commands/private-cmds/_show-cmd';
<<<<<<<
new ScopeSearch(),
=======
new ScopeShow(),
>>>>>>>
new ScopeSearch(),
new ScopeShow(), |
<<<<<<<
search(): Promise<[]> {
throw new Error('not implemented yet');
}
=======
show(bitId: BitId): Promise<> {
return this.getScope()
.loadComponent(bitId);
}
>>>>>>>
search(): Promise<[]> {
throw new Error('not implemented yet');
}
show(bitId: BitId): Promise<> {
return this.getScope()
.loadComponent(bitId);
} |
<<<<<<<
import flattenDependencies from '../scope/flatten-dependencies';
=======
import R from 'ramda';
>>>>>>>
import flattenDependencies from '../scope/flatten-dependencies';
import R from 'ramda';
<<<<<<<
import type { BitDependencies } from '../scope/scope';
=======
import npmInstall from '../npm';
>>>>>>>
import type { BitDependencies } from '../scope/scope';
import npmInstall from '../npm';
<<<<<<<
path.join(bitsDir, box, name, remote, version);
=======
path.join(bitsDir, box, name, scope, version);
>>>>>>>
path.join(bitsDir, box, name, scope, version);
<<<<<<<
writeToBitsDir(bitDependencies: BitDependencies[]): Promise<Bit[]> {
const bitsDir = this.getBitsPath();
const bits = flattenDependencies(bitDependencies);
const cdAndWrite = (bit: Bit): Promise<Bit> => {
const bitDirForConsumerImport = getBitDirForConsumerImport({
bitsDir,
name: bit.name,
box: bit.getBox(),
version: bit.getVersion(),
remote: bit.scope
});
=======
ensureEnvBits(bitJson: AbstractBitJson): Promise<any> {
const testerId = bitJson.hasTester() ? BitId.parse(bitJson.getTesterName()) : undefined;
const compilerId = bitJson.hasCompiler() ? BitId.parse(bitJson.getCompilerName()) : undefined;
const rejectNils = R.reject(R.isNil);
const envs = rejectNils([ testerId, compilerId ]);
const ensureEnv = (env: BitId): Promise<any> => {
if (this.scope.hasEnvBit(env)) return Promise.resolve();
return this.scope.get(env)
.then(bits => this.writeToEnvBitsDir(bits));
};
>>>>>>>
ensureEnvBits(bitJson: AbstractBitJson): Promise<any> {
const testerId = bitJson.hasTester() ? BitId.parse(bitJson.getTesterName()) : undefined;
const compilerId = bitJson.hasCompiler() ? BitId.parse(bitJson.getCompilerName()) : undefined;
const rejectNils = R.reject(R.isNil);
const envs = rejectNils([ testerId, compilerId ]);
const ensureEnv = (env: BitId): Promise<any> => {
if (this.scope.hasEnvBit(env)) return Promise.resolve();
return this.scope.get(env)
.then(bits => this.writeToEnvBitsDir(bits));
}; |
<<<<<<<
InsertFieldValueBlock.prototype._buildVals = function() {
=======
InsertFieldValueBlock.prototype.set = function(field, value, options) {
if (options == null) {
options = {};
}
return this._set(field, value, options);
};
InsertFieldValueBlock.prototype.setFields = function(fields, options) {
return this._setFields(fields, options);
};
InsertFieldValueBlock.prototype.setFieldsRows = function(fieldsRows, options) {
return this._setFieldsRows(fieldsRows, options);
};
InsertFieldValueBlock.prototype.buildStr = function(queryBuilder) {
>>>>>>>
InsertFieldValueBlock.prototype.set = function(field, value, options) {
if (options == null) {
options = {};
}
return this._set(field, value, options);
};
InsertFieldValueBlock.prototype.setFields = function(fields, options) {
return this._setFields(fields, options);
};
InsertFieldValueBlock.prototype.setFieldsRows = function(fieldsRows, options) {
return this._setFieldsRows(fieldsRows, options);
};
InsertFieldValueBlock.prototype._buildVals = function() { |
<<<<<<<
grunt.loadTasks('build/tasks');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-jasmine');
grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-mocha');
grunt.loadNpmTasks('grunt-curl');
=======
>>>>>>>
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-jasmine');
grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-mocha');
grunt.loadNpmTasks('grunt-curl');
<<<<<<<
watch: {
files: ['bower_components/rule-engine/dist/dqre.js', 'test/**/*'],
tasks: ['jasmine:test:build']
},
npminstall: {
'rule-engine': {
src: 'bower_components/rule-engine/'
},
'ks-rules': {
src: 'bower_components/ks-rules/'
}
},
rungrunt: {
'rule-engine': {
src: 'bower_components/rule-engine/'
},
'ks-rules': {
src: 'bower_components/ks-rules/'
}
},
qunit: {
all: ['test/examples/qunit/**/*.html']
},
jasmine: {
test: {
src: ['test/examples/felib.js',
'bower_components/rule-engine/dist/dqre.js',
'bower_components/ks-rules/dist/rules.full.js'],
options: {
specs: 'test/examples/jasmine/*spec.js'
}
}
},
mocha: {
test: {
src: ['test/examples/mocha/**/*.html'],
options: {
run: true
},
},
},
curl: {
'test/examples/selenium/selenium-server-standalone-2.41.0.jar': 'http://selenium-release.storage.googleapis.com/2.41/selenium-server-standalone-2.41.0.jar'
},
connect: {
test: {
options: {
hostname: '0.0.0.0',
port: 9876,
base: ['.']
}
}
},
=======
>>>>>>>
watch: {
files: ['bower_components/rule-engine/dist/dqre.js', 'test/**/*'],
tasks: ['jasmine:test:build']
},
npminstall: {
'rule-engine': {
src: 'bower_components/rule-engine/'
},
'ks-rules': {
src: 'bower_components/ks-rules/'
}
},
rungrunt: {
'rule-engine': {
src: 'bower_components/rule-engine/'
},
'ks-rules': {
src: 'bower_components/ks-rules/'
}
},
qunit: {
all: ['test/examples/qunit/**/*.html']
},
jasmine: {
test: {
src: ['test/examples/felib.js',
'bower_components/rule-engine/dist/dqre.js',
'bower_components/ks-rules/dist/rules.full.js'],
options: {
specs: 'test/examples/jasmine/*spec.js'
}
}
},
mocha: {
test: {
src: ['test/examples/mocha/**/*.html'],
options: {
run: true
},
},
},
curl: {
'test/examples/selenium/selenium-server-standalone-2.41.0.jar': 'http://selenium-release.storage.googleapis.com/2.41/selenium-server-standalone-2.41.0.jar'
},
connect: {
test: {
options: {
hostname: '0.0.0.0',
port: 9876,
base: ['.']
}
}
},
<<<<<<<
grunt.registerTask('build', ['npminstall', 'rungrunt']);
grunt.registerTask('default', ['build']);
grunt.registerTask('sample', ['jasmine']);
=======
>>>>>>>
grunt.registerTask('build', ['npminstall', 'rungrunt']);
grunt.registerTask('default', ['build']);
grunt.registerTask('sample', ['jasmine', 'mocha', 'qunit']); |
<<<<<<<
it('overrides the default value of audit.tagExclude', function () {
axe._load({});
assert.deepEqual(axe._audit.tagExclude, ['experimental']);
axe.configure({
tagExclude: ['ninjas']
});
assert.deepEqual(axe._audit.tagExclude, ['ninjas']);
});
it('should throw if visible frames and no resolve', function (done) {
if (window.PHANTOMJS) {
assert.ok('PhantomJS is a liar');
done();
return;
}
createFrames(function () {
axe._load({});
try {
configureChecksRulesAndBranding({});
} catch (err) {
assert.equal(err.toString().match(/there are visble frames on the page, please pass in a resolve function/).length, 1);
done();
}
});
});
it('should send command to frames to configure', function (done) {
if (window.PHANTOMJS) {
assert.ok('PhantomJS is a liar');
done();
return;
}
createFrames(function () {
axe._load({});
var orig = axe.utils.sendCommandToFrame;
axe.utils.sendCommandToFrame = function (node, opts, resolve) {
assert.deepEqual(opts, {
command: 'configure',
spec: {}
});
axe.utils.sendCommandToFrame = orig;
resolve();
done();
};
configureChecksRulesAndBranding({}, function () {
});
});
});
it('should not send command to display:none frames to configure', function (done) {
if (window.PHANTOMJS) {
assert.ok('PhantomJS is a liar');
done();
return;
}
createHiddenFrames(function () {
axe._load({});
var orig = axe.utils.sendCommandToFrame;
axe.utils.sendCommandToFrame = function (node, opts, resolve) {
assert.ok(false);
resolve();
};
configureChecksRulesAndBranding({}, function () {
axe.utils.sendCommandToFrame = orig;
done();
});
}, 'display:none;');
});
it('should not send command to display:none parent frames to configure', function (done) {
if (window.PHANTOMJS) {
assert.ok('PhantomJS is a liar');
done();
return;
}
createHiddenParentFrames(function () {
axe._load({});
var orig = axe.utils.sendCommandToFrame;
axe.utils.sendCommandToFrame = function (node, opts, resolve) {
assert.ok(false);
resolve();
};
configureChecksRulesAndBranding({}, function () {
axe.utils.sendCommandToFrame = orig;
done();
});
}, 'display:none;');
});
it('should not send command to visibility:hidden frames to configure', function (done) {
if (window.PHANTOMJS) {
assert.ok('PhantomJS is a liar');
done();
return;
}
createHiddenFrames(function () {
axe._load({});
var orig = axe.utils.sendCommandToFrame;
axe.utils.sendCommandToFrame = function (node, opts, resolve) {
assert.ok(false);
resolve();
};
configureChecksRulesAndBranding({}, function () {
axe.utils.sendCommandToFrame = orig;
done();
});
}, 'visibility:hidden;');
});
it('should not send command to visibility:hidden parent frames to configure', function (done) {
if (window.PHANTOMJS) {
assert.ok('PhantomJS is a liar');
done();
return;
}
createHiddenParentFrames(function () {
axe._load({});
var orig = axe.utils.sendCommandToFrame;
axe.utils.sendCommandToFrame = function (node, opts, resolve) {
assert.ok(false);
resolve();
};
configureChecksRulesAndBranding({}, function () {
axe.utils.sendCommandToFrame = orig;
done();
});
}, 'visibility:hidden;');
});
it('should call the resolve function if passed one', function (done) {
axe._load({});
configureChecksRulesAndBranding({}, function () {
assert.ok(true);
done();
}, assertNotCalled);
});
it('should call resolve when there are iframes', function (done) {
if (window.PHANTOMJS) {
assert.ok('PhantomJS is a liar');
done();
return;
}
createFrames(function () {
axe._load({});
configureChecksRulesAndBranding({}, function () {
done();
});
});
});
=======
>>>>>>>
it('overrides the default value of audit.tagExclude', function () {
axe._load({});
assert.deepEqual(axe._audit.tagExclude, ['experimental']);
axe.configure({
tagExclude: ['ninjas']
});
assert.deepEqual(axe._audit.tagExclude, ['ninjas']);
}); |
<<<<<<<
value: true,
error: null,
relatedNodes: []
=======
error: null
>>>>>>>
error: null,
relatedNodes: []
<<<<<<<
value: true,
error: null,
relatedNodes: []
=======
error: null
>>>>>>>
error: null,
relatedNodes: []
<<<<<<<
value: true,
error: null,
relatedNodes: []
=======
error: null
>>>>>>>
error: null,
relatedNodes: []
<<<<<<<
value: false,
error: null,
relatedNodes: []
=======
error: null
>>>>>>>
error: null,
relatedNodes: []
<<<<<<<
value: true,
error: null,
relatedNodes: []
=======
error: null
>>>>>>>
error: null,
relatedNodes: [] |
<<<<<<<
axe.a11yCheck(document, {}, function(results) {
assert.isNotOk(results.violations[0].helpUrl);
=======
axe.run(noPassOpt, function (err, results) {
assert.isNull(err);
assert.isNull(results.violations[0].helpUrl);
>>>>>>>
axe.run(noPassOpt, function (err, results) {
assert.isNull(err);
assert.isNotOk(results.violations[0].helpUrl);
<<<<<<<
=======
it('should remove result', function(done) {
axe.run(noPassOpt, function (err, results) {
assert.isNull(err);
assert.isUndefined(results.violations[0].nodes[0].all[0].result);
done();
});
});
>>>>>>> |
<<<<<<<
=======
apiMocker.express.use(bodyParser.urlencoded({extended: true}));
apiMocker.express.use(bodyParser.json());
apiMocker.express.use(xmlparser());
apiMocker.express.use(apiMocker.corsMiddleware);
>>>>>>> |
<<<<<<<
function mapToUrl(files, port) {
return grunt.file.expand(files).map(function (file) {
return 'http://localhost:' + port + '/' + file;
});
}
grunt.loadNpmTasks("grunt-browserify");
=======
>>>>>>>
grunt.loadNpmTasks("grunt-browserify");
<<<<<<<
babelify: {
dist: {
options: {
transform: [
["babelify"]
]
},
files: {
"./dist/axe.js": [
"./dist/axe.js"
]
}
}
},
=======
'update-help': {
options: {
version: '<%=pkg.version%>'
},
rules: {
src: ['lib/rules/**/*.json']
}
},
>>>>>>>
babelify: {
dist: {
options: {
transform: [
["babelify"]
]
},
files: {
"./dist/axe.js": [
"./dist/axe.js"
]
}
},
},
'update-help': {
options: {
version: '<%=pkg.version%>'
},
rules: {
src: ['lib/rules/**/*.json']
}
},
<<<<<<<
'concat:engine', 'copy', 'browserify', 'uglify']);
=======
'concat:engine', 'copy', 'uglify', 'nodeify']);
>>>>>>>
'concat:engine', 'copy', 'browserify', 'uglify', 'nodeify']); |
<<<<<<<
function extender(shouldBeTrue) {
return function (check) {
var sourceData = checksData[check.id] || {};
var messages = sourceData.messages || {};
var data = Object.assign({}, sourceData);
delete data.messages;
data.message = check.result === shouldBeTrue ? messages.pass : messages.fail;
axe.utils.extendMetaData(check, data);
};
}
=======
>>>>>>> |
<<<<<<<
if (!elm.id) {
return;
}
let doc = (elm.getRootNode && elm.getRootNode()) || document;
const id = '#' + escapeSelector(elm.id || '');
=======
if (!elm.getAttribute('id')) {
return;
}
const id = '#' + escapeSelector(elm.getAttribute('id') || '');
>>>>>>>
if (!elm.getAttribute('id')) {
return;
}
let doc = (elm.getRootNode && elm.getRootNode()) || document;
const id = '#' + escapeSelector(elm.getAttribute('id') || ''); |
<<<<<<<
componentWillMount: function() {
// Apple stock data from Mike Bostock's chart at
// http://bl.ocks.org/mbostock/3883195
var parseDate = d3.time.format("%d-%b-%y").parse;
d3.tsv("data/applestock.tsv", function(error, data) {
data.forEach(function(d) {
d.date = parseDate(d.date);
d.value = +d.value;
});
this.setState({areaData: data});
}.bind(this))
d3.tsv("data/AAPL_ohlc.tsv", function(error, data) {
var series = { name: "AAPL", values: [] };
data.map(function(d) {
d.date = new Date(+d.date);
d.open = +d.open;
d.high = +d.high;
d.low = +d.low;
d.close = +d.close;
series.values.push({ x: d.date, open: d.open, high: d.high, low: d.low, close: d.close});
});
this.setState({ ohlcData: [series] });
console.log(series);
}.bind(this))
=======
componentDidMount: function() {
>>>>>>>
componentWillMount: function() {
<<<<<<<
<CandleStickChart legend={true} data={this.state.ohlcData} width={500} height={300} title="Candlestick Chart" />
</div>
<div className="col-md-6">
<pre ref='block'>
<code className='js'>
{'var lineData = {\n series1: [ { x: 0, y: 20 }, ... , { x: 6, y: 10 } ],\n series2: [ { x: 0, y: 8 }, ..., { x: 6, y: 2 } ],\n series3: [ { x: 0, y: 0 }, ..., { x: 6, y: 2 } ]\n};'}
</code>
</pre>
<pre ref='block'>
<code className='html'>
{'<CandleStickChart\n legend={true}\n data={lineData}\n width={500}\n height={300}\n title="Candlestick Chart"\n/>'}
</code>
</pre>
</div>
</div>
<div className="row">
<hr/>
</div>
<div className="row">
<div className="col-md-6">
<ScatterChart data={scatterData} width={500} height={400} yHideOrigin={true} title="Scatter Chart" />
=======
<BarChart data={barData} width={500} height={200} title="Bar Chart"/>
>>>>>>>
<BarChart data={barData} width={500} height={200} title="Bar Chart"/> |
<<<<<<<
// update progress bar
document
.querySelector('#progress-bar')
.style.setProperty('--progress', percentComplete + '%');
$('#progress-text').html(`${percentComplete}%`);
=======
progress.innerText = `Progress: ${percentComplete}%`;
if (percentComplete === 100) {
notify('Your upload has finished.');
}
>>>>>>>
// update progress bar
document
.querySelector('#progress-bar')
.style.setProperty('--progress', percentComplete + '%');
$('#progress-text').html(`${percentComplete}%`);
if (percentComplete === 100) {
notify('Your upload has finished.');
} |
<<<<<<<
const { notify, gcmCompliant, findMetric, sendEvent, ONE_DAY_IN_MS } = require('./utils');
const Storage = require('./storage');
const storage = new Storage(localStorage);
=======
const { notify, gcmCompliant } = require('./utils');
const bytes = require('bytes');
>>>>>>>
const { notify, gcmCompliant, findMetric, sendEvent, ONE_DAY_IN_MS } = require('./utils');
const bytes = require('bytes');
const Storage = require('./storage');
const storage = new Storage(localStorage); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.