conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
document.getElementById("splash-screen").style.display = "block";
document.getElementById("background-screen").style.display = "none";
=======
showSplashScreen();
hideBackgroundScreen();
return new Promise(function(resolve, reject) {
if (localmsgServerCreated) {
resolve();
... |
<<<<<<<
casper.test.begin("unit tests", 10 + gfxTests.length, function(test) {
casper.start("data:text/plain,start");
casper.page.onLongRunningScript = function(message) {
casper.echo("FAIL unresponsive " + message, "ERROR");
casper.page.stopJavaScript();
};
=======
casper.test.begin("un... |
<<<<<<<
Native["com/sun/midp/lcdui/DisplayDeviceContainer.getDisplayDevicesIds0.()[I"] = function(addr) {
var ids = J2ME.newIntArray( 1);
=======
Native["com/sun/midp/lcdui/DisplayDeviceContainer.getDisplayDevicesIds0.()[I"] = function() {
var idsAddr = J2ME.newIntArray(1);
var ids = J... |
<<<<<<<
"libs/encoding.js", "util.js",
"override.js", "vm/tags.js", "native.js", "string.js", "tests/override.js",
=======
"libs/encoding.js", "util.js", "libs/jarstore.js",
"override.js", "vm/tags.js", "native.js", "tests/override.js",
>>>>>>>
"libs/encoding.js", "util.js", "libs... |
<<<<<<<
Native["com/sun/mmedia/DirectRecord.nSetLocator.(ILjava/lang/String;)I"] = function(handle, locator) {
console.warn("com/sun/mmedia/DirectRecord.nSetLocator.(I)I not implemented.");
return -1;
};
=======
Native.create("com/sun/mmedia/DirectRecord.nSetLocator.(ILjava/lang/String;)I", function(handle, l... |
<<<<<<<
Native.create("com/sun/midp/util/ResourceHandler.loadRomizedResource0.(Ljava/lang/String;)[B", function(file) {
var fileName = "assets/0/" + util.fromJavaString(file).replace("_", ".").replace("_png", ".png").replace("_raw", ".raw");
=======
Native["com/sun/midp/util/ResourceHandler.loadRomizedResource0.(... |
<<<<<<<
reserved = [ "start", "end", "timeupdate" ],
plugin = {},
pluginFn,
=======
reserved = [ "start", "end"],
plugin = {},
>>>>>>>
reserved = [ "start", "end"],
plugin = {},
pluginFn,
<<<<<<<
pluginFn = function ( options ) {
... |
<<<<<<<
test.assertTextExists("DONE: 711 pass, 1 fail", "run unit tests");
});
casper
.thenOpen("http://localhost:8000/index.html?main=tests/isolate/TestIsolate")
.waitForText("DONE", function then() {
test.assertTextExists("\
m\n\
a ma\n\
ma\n\
1 m1\n\
ma\n\
2 m2\n\
ma\n\
ma\n\
r mar\n\
m... |
<<<<<<<
function purgeStore(cb) {
store.purge(cb);
}
=======
var _creatingFile = false;
var _creatingQueue = [];
function createUniqueFile(parentDir, completeName, blob, callback) {
if (_creatingFile) {
_creatingQueue.push({
parentDir: parentDir,
completeName: completeName,
... |
<<<<<<<
casper.test.begin("unit tests", 14 + gfxTests.length, function(test) {
=======
casper.test.begin("unit tests", 12 + gfxTests.length, function(test) {
casper.start("data:text/plain,start");
casper.page.onLongRunningScript = function(message) {
casper.echo("FAIL unresponsive " + message, "ERROR... |
<<<<<<<
casper.options.waitTimeout = 45000;
casper.options.verbose = true;
casper.options.logLevel = "debug";
=======
casper.options.waitTimeout = 70000;
>>>>>>>
casper.options.waitTimeout = 70000;
casper.options.verbose = true;
casper.options.logLevel = "debug"; |
<<<<<<<
imageData.klass.classInfo.getField("I.width.I").set(imageData, width);
imageData.klass.classInfo.getField("I.height.I").set(imageData, height);
imageData.nativeImageData = data;
=======
imageData.class.getField("I.width.I").set(imageData, width);
imageData.class.getFiel... |
<<<<<<<
Native["java/lang/Object.getClass.()Ljava/lang/Class;"] = function(addr) {
return $.getRuntimeKlass(this.klass).classObject;
=======
Native["java/lang/Object.getClass.()Ljava/lang/Class;"] = function() {
return $.getRuntimeKlass(this.klass).classObject._address;
>>>>>>>
Native["java/lang/Object.getCl... |
<<<<<<<
});
navigator.mozAlarms.add(new Date(Date.now()+10000), 'ignoreTimezone', {});
navigator.mozSetMessageHandler('alarm', function() {
// this is called both while the app is not running and while the app is running!!!
var request = navigator.mozApps.getSelf();
request.onsuccess = function() {
request.... |
<<<<<<<
J2ME.getLinkedMethod(methodInfo).call(o);
if (U) {
$.nativeBailout(J2ME.Kind.Void, J2ME.Bytecode.Bytecodes.INVOKESPECIAL);
}
=======
J2ME.getLinkedMethod(methodInfo)(oAddr);
>>>>>>>
J2ME.getLinkedMethod(methodInfo)(oAddr);
if (U) {
$.nativeBailout(J2ME.Kind.Void, J2ME.Bytecode.Bytecod... |
<<<<<<<
Native["com/nokia/mid/ui/CanvasItem.detachNativeImpl.()V"] = function() {
this.caretPosition = this.textEditor.getSelectionStart();
=======
Native.create("com/nokia/mid/ui/CanvasItem.detachNativeImpl.()V", function() {
this.caretPosition = this.textEditor.getSelectionStart().index;
>>... |
<<<<<<<
if (g.clipped) {
=======
var clipped = g.klass.classInfo.getField("I.clipped.Z").get(g),
transX = g.klass.classInfo.getField("I.transX.I").get(g),
transY = g.klass.classInfo.getField("I.transY.I").get(g);
if (clipped) {
var clipX1 = g.klass.classInf... |
<<<<<<<
PlayerContainer.prototype.getDuration = function() {
return this.player.getDuration();
}
=======
PlayerContainer.prototype.startSnapshot = function(imageType) {
this.player.startSnapshot(imageType);
}
PlayerContainer.prototype.getSnapshotData = function() {
return this.player.getSnapshotData();
... |
<<<<<<<
Native["com/sun/midp/lcdui/DisplayDeviceContainer.getDisplayDevicesIds0.()[I"] = function() {
var idsAddr = J2ME.newIntArray(1);
var ids = J2ME.getArrayFromAddr(idsAddr);
=======
Native["com/sun/midp/lcdui/DisplayDeviceContainer.getDisplayDevicesIds0.()[I"] = function(addr) {
v... |
<<<<<<<
break;
=======
} else {
var classInfo = resolve(exception_table[i].catch_type);
if (ex.class.isAssignableTo(classInfo)) {
handler_pc = exception_table[i].handler_pc;
... |
<<<<<<<
Native["java/lang/System.arraycopy.(Ljava/lang/Object;ILjava/lang/Object;II)V"] = function(addr, src, srcOffset, dst, dstOffset, length) {
if (!src || !dst)
=======
Native["java/lang/System.arraycopy.(Ljava/lang/Object;ILjava/lang/Object;II)V"] = function(src, srcOffset, dst, dstOffset, length) {
if (... |
<<<<<<<
utils.startSpinner(`Promoting ${version}`);
return utils.callAPI(url, {
method: 'PUT',
body
});
=======
utils.printStarting(`Verifying and promoting ${version}`);
return utils.callAPI(
url,
{
method: 'PUT',
body
},
... |
<<<<<<<
const authData = renderAuthData(authType);
const inputData = renderDefaultInputData(definition);
=======
const authData = renderAuthData(legacyApp);
>>>>>>>
const authData = renderAuthData(legacyApp);
const inputData = renderDefaultInputData(definition); |
<<<<<<<
<% if (excludeFieldKeys) { %>
// Exclude create fields that uncheck "Send to Action Endpoint URL in JSON body"
// https://zapier.com/developer/documentation/v2/action-fields/#send-to-action-endpoint-url-in-json-body
<% excludeFieldKeys.forEach(fieldKey => { %>
delete bundle.inputData['<%= fieldKey %>'... |
<<<<<<<
* Presents a set of small dots to show list item count and select list items in
* a wrapped child such as a carousel. There will be one dot for each item, and
* the dot for the currently selected item will be shown selected.
=======
* @class PageDots
* @classdesc Presents a set of small dots to show list... |
<<<<<<<
//默认过滤规则相关配置项目
//,disabledTableInTable:true //禁止表格嵌套
//,allowDivTransToP:true //允许进入编辑器的div标签自动变成p标签
//,rgb2Hex:true //默认产出的数据中的color自动从rgb格式变成16进制格式
=======
>>>>>>>
//默认过滤规则相关配置项目
//,disabledTableInTable:true //禁止表格嵌套
//,allowDi... |
<<<<<<<
const fs = require('fs-extra');
=======
const jhipsterUtils = require('generator-jhipster/generators/utils');
>>>>>>>
const fs = require('fs-extra');
const jhipsterUtils = require('generator-jhipster/generators/utils');
<<<<<<<
this.readFiles = function (orig, updated, file) {
this.old =... |
<<<<<<<
// read app config from .yo-rc.json
for(property in this.jhipsterAppConfig){
this[property] = this.jhipsterAppConfig[property];
}
//set primary key type
if (this.databaseType === 'cassandra' || this.databaseType === 'mongodb') {
this.pkType = 'Stri... |
<<<<<<<
export const parseProp = (propName, value) =>
new nearley.Parser(grammar.ParserRules, propName).feed(value).results[0];
export const getStylesForProperty = (propName, inputValue) => {
=======
export const getStylesForProperty = (propName, inputValue, allowShorthand) => {
>>>>>>>
export const parseProp = (... |
<<<<<<<
return new Promise((resolve, reject) => {
if (!query) {
resolve()
} else {
try {
validateQuery(query)
api.get('/api/v2/sys_md_EntityType?sort=label&num=1000&q=(label=q="' + encodeURIComponent(query) + '",description=q="' + encodeURIComponent(query) + '");isAbs... |
<<<<<<<
var restApi = new molgenis.RestClient();
var genomeBrowser;
=======
>>>>>>>
var restApi = new molgenis.RestClient();
var genomeBrowser; |
<<<<<<<
$('.attribute-dropdown').on('change', function() {
updateAggregatesTable($('#x-aggr-attribute').val(), $('#y-aggr-attribute').val());
});
=======
if (attributeSelect.val()) {
updateAggregatesTable(attributeSelect.val());
attributeSelect.select2({ width: 'resolve' });
attribute... |
<<<<<<<
commitHooks: [
setId,
setClass,
Articulation.easyScoreHook,
],
=======
throwOnError: false,
>>>>>>>
commitHooks: [
setId,
setClass,
Articulation.easyScoreHook,
],
throwOnError: false,
<<<<<<<
this.options.commitHooks.for... |
<<<<<<<
import './glyph';
=======
import { Glyph } from './glyph';
export var Accidental = (function(){
function Accidental(type) {
if (arguments.length > 0) this.init(type);
}
Accidental.CATEGORY = "accidentals";
>>>>>>>
import { Glyph } from './glyph';
<<<<<<<
}
=======
};
// ## Prototype Meth... |
<<<<<<<
export class Glyph {
=======
/**
* @constructor
*/
export var Glyph = (function() {
function Glyph(code, point, options) {
this.code = code;
this.point = point;
this.context = null;
this.options = {
cache: true,
font: Font
};
this.metrics = null;
this.x_shift = 0;
... |
<<<<<<<
=======
expandBubble(data, i) {
let videoID = data.v_id;
if (this.expanded === false) {
if (typeof InstallTrigger !== 'undefined') {
//expand bubble in firefox
this.expandBubbleFirefox(data, i, videoID);
} e... |
<<<<<<<
this.tab1 = Schedules;
this.tab2 = Speakers;
this.tab3 = Map;
this.tab4 = About;
=======
this.tab1Root = SchedulePage;
this.tab2Root = Speakers;
this.tab3Root = Map;
this.tab4Root = About;
>>>>>>>
this.tab1Root = Schedules;
this.tab2Root = Speakers;
this.tab3Root =... |
<<<<<<<
=======
ModalOverlay,
ModalContent,
ModalHeader,
>>>>>>>
<<<<<<<
import VisuallyHidden from '@reach/visually-hidden';
import { Link as GatsbyLink } from 'gatsby';
import React, { forwardRef, useLayoutEffect, useState } from 'react';
import Button from '../components/Button';
import Image from './Image... |
<<<<<<<
import { verifyHttpUrl } from '../../utils/urlUtils';
=======
import RegistrationPromo from '../Promos/RegistrationPromo';
>>>>>>>
import { verifyHttpUrl } from '../../utils/urlUtils';
import RegistrationPromo from '../Promos/RegistrationPromo'; |
<<<<<<<
import ErrorBoundary from './ErrorBoundary';
=======
import { SkipNavLink, SkipNavContent } from '@reach/skip-nav';
>>>>>>>
import ErrorBoundary from './ErrorBoundary';
import { SkipNavLink, SkipNavContent } from '@reach/skip-nav';
<<<<<<<
<ErrorBoundary>
<StaticQuery
query={MenuLinks}
... |
<<<<<<<
=======
import React, { forwardRef, useRef } from 'react';
import { graphql, StaticQuery } from 'gatsby';
import PropTypes from 'prop-types';
>>>>>>>
<<<<<<<
import {
CardButton,
CardButtonGroup,
CardContent,
CardHeading,
CardText,
CardWrapper,
} from '../Card';
import Link from '../Link';
====... |
<<<<<<<
icons: {
...theme.icons,
arrowRight: {
path: (
<>
<title id="arrowRight">Go to next page</title>
<path
d="M8.2349 10.6045L8.97417 9.93105L8.26707 9.22395L2.92231 3.87919C2.56865 3.52553 2.54466 2.99821 2.91508 2.49572C3.28168 1.99842 3.87736 1.76239 4.474... |
<<<<<<<
import { PageHero, BusinessFeed, Pagination } from '../components';
=======
import { PageHero, Layout, BusinessFeed } from '../components';
>>>>>>>
import { PageHero, BusinessFeed } from '../components';
<<<<<<<
<Pagination
location={props.location}
currentPage={parseInt(page)}
... |
<<<<<<<
<>
<Box
maxW={theme.containers.main}
paddingX={[null, theme.spacing.base, theme.spacing.lg]}
>
{allies.length > 0 ? (
<SimpleGrid columns={[null, 1, 2, 4]} spacing={theme.spacing.med}>
{allies.map((allies, index) => {
if (index === 4)
... |
<<<<<<<
<Image cloudName="rebuild-black-business" publicId={publicId} />
=======
<Image objectFit="cover" src={imageUrl} alt={imageAlt} />
>>>>>>>
<Image cloudName="rebuild-black-business" publicId={publicId} />
<<<<<<<
const ModalCard = ({
publicId,
cloudName,
modalTitle,
title,
blurb,
marg... |
<<<<<<<
airTableId: PropTypes.string,
category: PropTypes.string,
=======
category: PropTypes.object,
>>>>>>>
airTableId: PropTypes.string,
category: PropTypes.object, |
<<<<<<<
Plugin.prototype.setPosition = function(pos, callCb) {
var value, newPos;
=======
Plugin.prototype.setPosition = function(pos, triggerSlide) {
var value, left;
>>>>>>>
Plugin.prototype.setPosition = function(pos, triggerSlide) {
var value, newPos;
<<<<<<<
if (this... |
<<<<<<<
this.value = parseFloat(this.$element[0].value) || 0;
this.min = parseFloat(this.$element[0].getAttribute('min')) || 0;
this.max = parseFloat(this.$element[0].getAttribute('max')) || 0;
this.step = parseFloat(this.$element[0].getAttribute('step')) || 1;
... |
<<<<<<<
// This section is used to create the globals that were originally defined in the
=======
// This logic is used to create the globals that were originally defined in the
>>>>>>>
// This logic is used to create the global that were originally defined in the
// This logic is used to create the globals that ... |
<<<<<<<
width: 100%;
min-height: 100vh;
=======
width: 93%;
float: right;
height: 100vh;
>>>>>>>
width: 100%;
min-height: 100vh;
<<<<<<<
=======
@media (max-width: 768px) {
padding-top: 75px;
}
>>>>>>> |
<<<<<<<
const screenY = function screenY(event) {
if (_shared.supportsPointerEvents) {
return event.screenY;
}
return event.touches[0].screenY;
};
=======
const screenY = function screenY(event) {
if (_shared.pointerEventsEnabled && _shared.supportsPointerEvents) {
return event.screenY;
}
return ... |
<<<<<<<
this.setPass(MaterialPass.DIR_LIGHT_PASS, new DirectionalLightingPass(vertex, fragment, this._lightingModel, false));
this.setPass(MaterialPass.DIR_LIGHT_SHADOW_PASS, new DirectionalLightingPass(vertex, fragment, this._lightingModel, true));
this.setPass(MaterialPass.POINT_LI... |
<<<<<<<
this.worldMatrix = null;
this.prevWorldMatrix = null;
this.proxyMatrix = new Matrix4x4(); // assigned if worldMatrix = null
=======
this.entity = null;
>>>>>>>
this.worldMatrix = null;
this.prevWorldMatrix = null; |
<<<<<<<
import {BasicMaterial} from "../material/BasicMaterial";
import {LightingModel} from "./LightingModel";
import {Float4} from "../math/Float4";
import {Matrix4x4} from "../math/Matrix4x4";
=======
import {ShadowAtlas} from "./ShadowAtlas";
import {CascadeShadowMapRenderer} from "./CascadeShadowMapRenderer";
im... |
<<<<<<<
grunt.registerTask("docs", [ 'exec:api_styles', 'exec:api_docs', 'exec:docco' ]);
=======
grunt.registerTask('release', ['jshint','jasmine','concat:dist','uglify:dist','shell:gzip','s3-copy']);
>>>>>>>
grunt.registerTask("docs", [ 'exec:api_styles', 'exec:api_docs', 'exec:docco' ]);
grunt.registerT... |
<<<<<<<
if(memLife){
cacheKey = cacheKey.replace(/\s+/g, '|')
}
let r;
=======
let rendered;
>>>>>>>
if(memLife){
cacheKey = cacheKey.replace(/\s+/g, '|')
}
let rendered;
<<<<<<<
const reply = await getAsync(cacheKey);
... |
<<<<<<<
// Cache component by slicing 'out'
const cachedComponent = out.slice(componentStart, tagEnd);
if (typeof start[component] === 'object') {
if (!saveTemplates) saveTemplates = [];
saveTemplates.push(start[component]);
start[component].endIndex = tagEnd;
}
cac... |
<<<<<<<
function focusCompEditor(selector){
var editor = $(selector + ' textarea');
editor.focus();
}
// auto focus component editors
$('#components div.compdivlist a').on('click', function(ev){
focusCompEditor($(this).attr('href'));
});
$(".delconfirmcomp").on("click", function ($e) {
=======
... |
<<<<<<<
else {
module.error(errors.state);
return false;
}
=======
>>>>>>> |
<<<<<<<
=======
// TODO: implement annotations in a more generic way
if (link) {
const rectWidth = this._cursor.width - freeSpace
const annot = new PDF.Dictionary({
Type: 'Annot',
Subtype: 'Link',
Rect: new PDF.Array([left, this._cursor.y, left +... |
<<<<<<<
import { actionTypes } from '../constants'
import { getLoginMethodAndParams } from '../utils/auth'
import { promisesForPopulate } from '../utils/populate'
=======
import jwtDecode from 'jwt-decode'
import { actionTypes, defaultJWTProps } from '../constants'
import { getLoginMethodAndParams } from '../utils/au... |
<<<<<<<
import { firebaseConnect, isLoaded, isEmpty } from 'react-redux-firebase'
import Paper from 'material-ui/Paper'
import Snackbar from 'material-ui/Snackbar'
import { LOGIN_PATH, LIST_PATH } from 'constants'
// import { UserIsNotAuthenticated } from 'utils/router'
=======
import {
firebaseConnect,
isLoaded,... |
<<<<<<<
const SignupForm = ({ pristine, submitting, handleSubmit }) =>
<form className={classes.container} onSubmit={handleSubmit}>
<Field
name='username'
component={TextField}
floatingLabelText='Username'
validate={required}
/>
<Field
name='email'
component={TextField}... |
<<<<<<<
* @property {String} ERROR - `@@reactReduxFirebase/UNAUTHORIZED_ERROR`
* @property {String} SET_LISTENER - `@@reactReduxFirebase/SET_LISTENER`
=======
* @property {String} ERROR - `@@reactReduxFirebase/ERROR`
>>>>>>>
* @property {String} ERROR - `@@reactReduxFirebase/ERROR`
* @property {String} SET_LIST... |
<<<<<<<
=======
let spy
>>>>>>>
<<<<<<<
on: () => ({ val: () => ({ some: 'obj' }) }),
off: () => Promise.resolve({ val: () => ({ some: 'obj' }) }),
once: () => Promise.resolve({ val: () => ({ some: 'obj' }) })
=======
on: () => Promise.resolve({ val: () => ({ some: 'obj' }) }),
... |
<<<<<<<
import React, { PropTypes } from 'react'
import { Field, reduxForm } from 'redux-form'
=======
import React from 'react'
import PropTypes from 'prop-types'
import { Field, reduxForm } from 'redux-form'
>>>>>>>
import React from 'react'
import PropTypes from 'prop-types'
import { Field, reduxForm } from 'redu... |
<<<<<<<
chromeOnly: true, //https://github.com/angular/protractor/issues/187
capabilities: {
"browserName": "chrome"
=======
//chromeOnly: true, //https://github.com/angular/protractor/issues/187
capabilities: {
'browserName': 'chrome'
>>>>>>>
//chromeOnly: true, //https://github.com/angular/protractor/iss... |
<<<<<<<
case 'PATCH_TASK_PENDING':
return state;
case 'PATCH_TASK_FULFILLED':
const patchedTask = action.payload;
patchedTask.subtask_gids = state.taskMap[action.payload.gid];
return Object.assign({}, state, {
taskMap: Object.assign({}, state.taskMap, {
[action.payload... |
<<<<<<<
import autoComplete from './autoCompleteReducer';
=======
import showSuccessToast from './showSuccessToastReducer';
>>>>>>>
import autoComplete from './autoCompleteReducer';
import showSuccessToast from './showSuccessToastReducer';
<<<<<<<
createPursuance,
autoComplete
=======
createPursuance,
sho... |
<<<<<<<
import AssignerSuggestions from '../../TaskManager/TaskForm/Suggestions/AssignerSuggestions';
import AssignerInput from '../../TaskManager/TaskForm/AssignerInput/AssignerInput';
import { filterSuggestion } from '../../../../utils/suggestions';
import { startSuggestions } from '../../../../actions';
=======
im... |
<<<<<<<
if(task) {
=======
if (task.subtask_gids.length < 1) {
>>>>>>>
if (task.subtask_gids.length < 1) {
<<<<<<<
{showTaskForm &&
<TaskForm
gid={task.gid}
taskData={task}
/>}
=======
>>>>>>> |
<<<<<<<
import RolesHierarchyView from './views/RolesHierarchyView';
=======
import InviteView from './views/InviteView';
>>>>>>>
import RolesHierarchyView from './views/RolesHierarchyView';
import InviteView from './views/InviteView'; |
<<<<<<<
fireReadyEvent();
}
function fireReadyEvent() {
debug('context ready, current locale is ', self.getLocale());
var event = document.createEvent('Event');
event.initEvent('LocalizationReady', false, false);
event.ctx = self;
document.dispatchEvent(event);
=======
... |
<<<<<<<
cumulative.ftlEntriesParseStart = process.hrtime(start);
var entries = L20n.FTLEntriesParser.parse(null, ftlCode);
cumulative.ftlEntriesParseEnd = process.hrtime(start);
/*
=======
var entries = L20n.createEntriesFromAST(ast);
>>>>>>>
cumulative.ftlEntriesParseStart = process.hrtime(start);
var entries ... |
<<<<<<<
import FTLParser from '../../lib/format/ftl/ast/parser';
import {default as FTLEntriesParser } from '../../lib/format/ftl/entries/parser';
=======
import FTLASTParser from '../../lib/format/ftl/ast/parser';
>>>>>>>
import FTLASTParser from '../../lib/format/ftl/ast/parser';
import {default as FTLEntriesParse... |
<<<<<<<
var assert = require('assert') || window.assert;
var path = function(basedir, leaf) {
return basedir + '/' + leaf;
};
=======
>>>>>>>
var path = function(basedir, leaf) {
return basedir + '/' + leaf;
};
<<<<<<<
var Env = process.env.L20N_COV ?
require('../../../build/cov/lib/l20n/env').Env
:... |
<<<<<<<
var type = won ? "game-won" : "game-over";
this.gameContainer.classList.add(type);
if (ga) ga("send", "event", "game", "end", type, this.score);
=======
var type = won ? "game-won" : "game-over";
var message = won ? "You win!" : "Game over!"
this.messageContainer.classList.add(type);
this.me... |
<<<<<<<
=======
// ID string matching
var rIdExp = /^(#([\w\-\_\.]+))$/;
var audioExtensions = [
"ogg",
"aac",
"mp3",
"wav"
];
var videoExtensions = [
"ogv",
"webm",
"mp4",
"mov",
"avi"
];
var audioExtensionRegexp = new RegExp( "^.*\\.(" + audioExtensions.join( "... |
<<<<<<<
=======
rdd3.count().then(function(val) {
console.log("count = " + val);
});
/*
>>>>>>> |
<<<<<<<
// {
// name: 'OneTouchUltra2 (In development!)',
// key: 'onetouchultra2',
// source: {type: 'device', driverId: 'OneTouchUltra2'}
// }
=======
{
name: 'Tandem t:slim',
key: 'tandemtslim',
source: {type: 'device', driverId: 'TandemTslim'}
}
... |
<<<<<<<
import Footer from '../components/Footer';
import Header from '../components/Header';
=======
import UpdateModal from '../components/UpdateModal';
>>>>>>>
import Footer from '../components/Footer';
import Header from '../components/Header';
import UpdateModal from '../components/UpdateModal';
<<<<<<<
=====... |
<<<<<<<
postrecords = buildSuspendRecords(data, postrecords);
postrecords = buildResumeRecords(data, postrecords);
=======
postrecords = buildAlarmRecords(data, postrecords);
>>>>>>>
postrecords = buildSuspendRecords(data, postrecords);
postrecords = buildResumeRecords(data, p... |
<<<<<<<
onMedtronicSerialNumberInputChange() {
const { refs } = this;
let serial_number = refs.medtronic_serial_number;
if (serial_number && serial_number.value) {
if (serial_number.value.length === 6) {
this.setState({
medtronicFormIncomplete: false,
medtronicSerialNumb... |
<<<<<<<
/*var BASE_DATE_DEVICE = moment.utc('1970-01-01').valueOf();
var BASE_DATE_UTC = moment.tz('1970-01-01', cfg.timezone).valueOf();
var TZOFFSET = (BASE_DATE_DEVICE - BASE_DATE_UTC)/1000;
console.log('timezone=' + cfg.timezone + ' Device=' + BASE_DATE_DEVICE + ' UTC=' + BASE_DATE_UTC);
console.log('tzo... |
<<<<<<<
name: 'Abbott FreeStyle Lite',
key: 'abbottfreestylelite',
source: {type: 'device', driverId: 'AbbottFreeStyleLite'}
},
{
name: 'Abbott FreeStyle Freedom Lite',
key: 'abbottfreestylefreedomlite',
source: {type: 'device', driverId: 'AbbottFreeStyleFreedomLite'}
},
... |
<<<<<<<
// this is required for comparing device time against server time
var currentTime = {};
addTimestamp(currentTime,result.payload.timestamp);
common.checkDeviceTime(currentTime.deviceTime, cfg.timezone, function(err) {
return cb(err, data);
});
=======
... |
<<<<<<<
if (payload.theData[i]['Raw-Type'].search('Current') === -1) {
if (uploads[payload.theData[i]['Raw-Upload ID']] != null) {
uploads[payload.theData[i]['Raw-Upload ID']].end = payload.theData[i].index;
=======
if (payload.theData[i][RAW_TYPE].search('Current') === -1) {
if (uploads[p... |
<<<<<<<
import * as hid from 'node-hid';
var debug = require('./bows')('HidDevice');
=======
import * as hid from 'node-hid';
var debug = require('bows')('HidDevice');
>>>>>>>
import * as hid from 'node-hid';
var debug = require('bows')('HidDevice');
<<<<<<<
=======
debug('in HIDDevice.connect, info ', ... |
<<<<<<<
var abbottFreeStyle = require('../drivers/abbottFreeStyle');
var tandemTslimDriver = require('../drivers/tandemTslimDriver');
=======
var abbottPrecisionXtra = require('../drivers/abbottPrecisionXtra');
>>>>>>>
var abbottPrecisionXtra = require('../drivers/abbottPrecisionXtra');
var tandemTslimDriver = requi... |
<<<<<<<
{i18n.t('Are you in {{timezone}}? Double-check',{ timezone: timezone })}<br/>
{i18n.t('selected time zone and current device time.')}
=======
Are you in {timezone}? Double-check<br/>
selected time zone and current device time.
{reminder}
>>>>>>>
{i18n.t('Are you in {{timez... |
<<<<<<<
'BayerContourNext': bayerContourNext,
'BayerContourNextLink': bayerContourNext
=======
'BayerContourNext': bayerContourNext,
'BayerContourNextUsb': bayerContourNext
>>>>>>>
'BayerContourNext': bayerContourNext,
'BayerContourNextLink': bayerContourNext,
'BayerContourNextUsb': bayerContourNext
<... |
<<<<<<<
'OneTouchVerioIQ': oneTouchVerioIQ,
'BayerContourNext': bayerContourNext
=======
'BayerContourNext': bayerContourNext,
'BayerContourNextUsb': bayerContourNext,
'BayerContourUsb': bayerContourNext
>>>>>>>
'OneTouchVerioIQ': oneTouchVerioIQ,
'BayerContourNext': bayerContourNext,
'BayerContourNe... |
<<<<<<<
cfg.deviceInfo.model = data.deviceModel;
=======
softwareNumber = firmwareHeader.attrs.SoftwareNumber;
>>>>>>>
cfg.deviceInfo.model = data.deviceModel;
softwareNumber = firmwareHeader.attrs.SoftwareNumber; |
<<<<<<<
{
name: 'Abbott FreeStyle Lite',
key: 'abbottfreestylelite',
source: {type: 'device', driverId: 'AbbottFreeStyleLite'}
},
{
name: 'Bayer Contour Next',
key: 'bayercontournext',
source: {type: 'device', driverId: 'BayerContourNext'}
}
=======
{
name... |
<<<<<<<
var medtronic600Driver = require('../drivers/medtronic600/medtronic600Driver');
=======
var TrueMetrixDriver = require('../drivers/trividia/trueMetrix');
>>>>>>>
var medtronic600Driver = require('../drivers/medtronic600/medtronic600Driver');
var TrueMetrixDriver = require('../drivers/trividia/trueMetrix');
... |
<<<<<<<
'BayerContourUsb': infoBuilder('Bayer Contour USB', 'Blood glucose meter'),
'AnimasPing': infoBuilder('Animas OneTouch Ping', 'Insulin pump')
=======
'BayerContourUsb': infoBuilder('Bayer Contour USB', 'Blood glucose meter'),
'BayerContourNextLink': infoBuilder('Bayer Contour Next LINK', 'Blood glucos... |
<<<<<<<
data.deviceInfo.deviceId = data.deviceInfo.driverId + '-' + data.deviceInfo.serialNumber;
cfg.builder.setDefaults({ deviceId: data.deviceInfo.deviceId});
data.post_records = dataParser.processAapPackets(data.aapPackets);
=======
data.post_records = dataParser.processAapPackets(data.aa... |
<<<<<<<
if(struct.extractInt(payload,4) === 0) {// empty datum
datum.empty = true;
if(request.recordType.value === RECORD_TYPES.CGM_GLUCOSE.value) {
//only allowed to return early with CGM glucose readings (as it's last)
... |
<<<<<<<
},
{
name: 'Bayer Contour Next LINK',
key: 'bayercontournextlink',
source: {type: 'device', driverId: 'BayerContourNextLink'}
=======
},
{
name: 'Bayer Contour Next USB',
key: 'bayercontournextusb',
source: {type: 'device', driverId: 'BayerContourNextUsb'... |
<<<<<<<
units: REQUIRED,
subType: OPTIONAL
=======
units: REQUIRED,
annotation: OPTIONAL
>>>>>>>
units: REQUIRED,
subType: OPTIONAL
<<<<<<<
makeDeviceMetaAlarm: makeDeviceMetaAlarm,
=======
makeDeviceMetaCalibration: makeDeviceMetaCalibration,
>>>>>>>
makeDeviceMet... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.