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();
return;
}
localmsgServerWait = resolve;
});
>>>>>>>
showSplashScreen();
hideBackgroundScreen(); |
<<<<<<<
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("unit tests", 12 + 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.page.stopJavaScript();
}; |
<<<<<<<
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 = J2ME.getArrayFromAddr(idsAddr);
>>>>>>>
Native["com/sun/midp/lcdui/DisplayDeviceContainer.getDisplayDevicesIds0.()[I"] = function(addr) {
var idsAddr = J2ME.newIntArray(1);
var ids = J2ME.getArrayFromAddr(idsAddr);
<<<<<<<
function(addr, pixels, offset, scanlength, x, y, width, height, format) {
if (pixels === null) {
=======
function(pixels, offset, scanlength, x, y, width, height, format) {
if (!pixels) {
>>>>>>>
function(addr, pixels, offset, scanlength, x, y, width, height, format) {
if (!pixels) {
<<<<<<<
function(addr, pixels, transparency, offset, scanlength, x, y, width, height, manipulation, format) {
if (pixels === null) {
=======
function(pixels, transparency, offset, scanlength, x, y, width, height, manipulation, format) {
if (!pixels) {
>>>>>>>
function(addr, pixels, transparency, offset, scanlength, x, y, width, height, manipulation, format) {
if (!pixels) { |
<<<<<<<
"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/jarstore.js",
"override.js", "vm/tags.js", "native.js", "string.js", "tests/override.js", |
<<<<<<<
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, locator) {
// Let the DirectRecord class handle writing to files / uploading via HTTP
return 0;
});
>>>>>>>
Native["com/sun/mmedia/DirectRecord.nSetLocator.(ILjava/lang/String;)I"] = function(handle, locator) {
// Let the DirectRecord class handle writing to files / uploading via HTTP
return 0;
}); |
<<<<<<<
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.(Ljava/lang/String;)[B"] = function(file) {
var fileName = "assets/0/" + util.fromJavaString(file).replace("_", ".").replace("_png", ".png");
>>>>>>>
Native["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");
<<<<<<<
console.warn("ResourceHandler::loadRomizedResource0: file " + fileName + " not found");
return null;
=======
console.error("ResourceHandler::loadRomizedResource0: file " + fileName + " not found");
throw $.newIOException();
>>>>>>>
console.error("ResourceHandler::loadRomizedResource0: file " + fileName + " not found");
throw $.newIOException(); |
<<<<<<<
reserved = [ "start", "end", "timeupdate" ],
plugin = {},
pluginFn,
=======
reserved = [ "start", "end"],
plugin = {},
>>>>>>>
reserved = [ "start", "end"],
plugin = {},
pluginFn,
<<<<<<<
pluginFn = function ( options ) {
var self = this,
fired = {
start: 0,
end: 0
};
=======
definition = function ( options ) {
>>>>>>>
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\
mar\n\
c marc\n\
marc\n\
");
});
casper
=======
test.assertTextExists("DONE: 712 pass", "run unit tests");
})
>>>>>>>
test.assertTextExists("DONE: 712 pass", "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\
mar\n\
c marc\n\
marc\n\
");
});
casper |
<<<<<<<
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,
blob: blob,
callback: callback
});
return;
}
_creatingFile = true;
var name = completeName;
var ext = "";
var extIndex = name.lastIndexOf(".");
if (extIndex !== -1) {
ext = name.substring(extIndex);
name = name.substring(0, extIndex);
}
var i = 0;
function tryFile(fileName) {
exists(parentDir + "/" + fileName, function(exists) {
if (exists) {
i++;
tryFile(name + "-" + i + ext);
} else {
mkdir(parentDir, function() {
create(parentDir + "/" + fileName, blob, function() {
callback(fileName);
_creatingFile = false;
if (_creatingQueue.length > 0) {
var tmp = _creatingQueue.shift();
createUniqueFile(tmp.parentDir, tmp.completeName, tmp.blob, tmp.callback);
}
});
});
}
});
}
tryFile(completeName);
}
>>>>>>>
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,
blob: blob,
callback: callback
});
return;
}
_creatingFile = true;
var name = completeName;
var ext = "";
var extIndex = name.lastIndexOf(".");
if (extIndex !== -1) {
ext = name.substring(extIndex);
name = name.substring(0, extIndex);
}
var i = 0;
function tryFile(fileName) {
exists(parentDir + "/" + fileName, function(exists) {
if (exists) {
i++;
tryFile(name + "-" + i + ext);
} else {
mkdir(parentDir, function() {
create(parentDir + "/" + fileName, blob, function() {
callback(fileName);
_creatingFile = false;
if (_creatingQueue.length > 0) {
var tmp = _creatingQueue.shift();
createUniqueFile(tmp.parentDir, tmp.completeName, tmp.blob, tmp.callback);
}
});
});
}
});
}
tryFile(completeName);
}
<<<<<<<
syncStore: syncStore,
purgeStore: purgeStore,
=======
storeSync: storeSync,
createUniqueFile: createUniqueFile,
>>>>>>>
syncStore: syncStore,
purgeStore: purgeStore,
createUniqueFile: createUniqueFile, |
<<<<<<<
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.page.stopJavaScript();
};
>>>>>>>
casper.test.begin("unit tests", 14 + 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.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.getField("I.height.I").set(imageData, height);
imageData.context = data;
>>>>>>>
imageData.klass.classInfo.getField("I.width.I").set(imageData, width);
imageData.klass.classInfo.getField("I.height.I").set(imageData, height);
imageData.context = data;
<<<<<<<
Native["javax/microedition/lcdui/ImageData.getRGB.([IIIIIII)V"] = function(rgbData, offset, scanlength, x, y, width, height) {
var context = this.nativeImageData;
var abgrData = new Int32Array(context.getImageData(x, y, width, height).data.buffer);
=======
Native.create("javax/microedition/lcdui/ImageData.getRGB.([IIIIIII)V", function(rgbData, offset, scanlength, x, y, width, height) {
var abgrData = new Int32Array(this.context.getImageData(x, y, width, height).data.buffer);
>>>>>>>
Native["javax/microedition/lcdui/ImageData.getRGB.([IIIIIII)V"] = function(rgbData, offset, scanlength, x, y, width, height) {
var abgrData = new Int32Array(this.context.getImageData(x, y, width, height).data.buffer);
<<<<<<<
var imgData = img.klass.classInfo.getField("I.imageData.Ljavax/microedition/lcdui/ImageData;").get(img),
c = imgData.nativeImageData;
=======
var imgData = img.class.getField("I.imageData.Ljavax/microedition/lcdui/ImageData;").get(img),
c = imgData.context;
>>>>>>>
var imgData = img.klass.classInfo.getField("I.imageData.Ljavax/microedition/lcdui/ImageData;").get(img),
c = imgData.context;
<<<<<<<
var texture = image.klass.classInfo.getField("I.imageData.Ljavax/microedition/lcdui/ImageData;").get(image).nativeImageData;
if (!texture) {
console.warn("Graphics.render: image missing native data");
return;
}
if (texture instanceof CanvasRenderingContext2D) {
texture = texture.canvas; // Render the canvas, not the context.
}
=======
var texture = image.class.getField("I.imageData.Ljavax/microedition/lcdui/ImageData;").get(image)
.context.canvas;
>>>>>>>
var texture = image.klass.classInfo.getField("I.imageData.Ljavax/microedition/lcdui/ImageData;").get(image)
.context.canvas;
<<<<<<<
var imgData = image.klass.classInfo.getField("I.imageData.Ljavax/microedition/lcdui/ImageData;").get(image),
texture = imgData.nativeImageData;
if (texture instanceof CanvasRenderingContext2D) {
texture = texture.canvas; // Render the canvas, not the context.
}
=======
var imgData = image.class.getField("I.imageData.Ljavax/microedition/lcdui/ImageData;").get(image),
texture = imgData.context.canvas;
>>>>>>>
var imgData = image.klass.classInfo.getField("I.imageData.Ljavax/microedition/lcdui/ImageData;").get(image),
texture = imgData.context.canvas; |
<<<<<<<
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.getClass.()Ljava/lang/Class;"] = function(addr) {
return $.getRuntimeKlass(this.klass).classObject._address;
<<<<<<<
Native["java/lang/Thread.currentThread.()Ljava/lang/Thread;"] = function(addr) {
return getHandle($.ctx.threadAddress);
=======
Native["java/lang/Thread.currentThread.()Ljava/lang/Thread;"] = function() {
return $.ctx.threadAddress;
>>>>>>>
Native["java/lang/Thread.currentThread.()Ljava/lang/Thread;"] = function(addr) {
return $.ctx.threadAddress;
<<<<<<<
Native["com/sun/cldc/isolate/Isolate.currentIsolate0.()Lcom/sun/cldc/isolate/Isolate;"] = function(addr) {
return getHandle($.ctx.runtime.isolateAddress);
=======
Native["com/sun/cldc/isolate/Isolate.currentIsolate0.()Lcom/sun/cldc/isolate/Isolate;"] = function() {
return $.ctx.runtime.isolateAddress;
>>>>>>>
Native["com/sun/cldc/isolate/Isolate.currentIsolate0.()Lcom/sun/cldc/isolate/Isolate;"] = function(addr) {
return $.ctx.runtime.isolateAddress; |
<<<<<<<
});
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.result.launch("index.html?background=1");
};
alert("woke up from alarm");
});
var request = navigator.mozAlarms.getAll();
request.onsuccess = function () {
this.result.forEach(function (alarm) {
alert('Id: ' + alarm.id + ", date: " + alarm.date + ", " + alarm.data);
});
};
request.onerror = function () {
console.log("An error occurred: " + this.error.name);
};
=======
});
DumbPipe.registerOpener("exit", function(message, sender) {
window.close();
});
>>>>>>>
});
DumbPipe.registerOpener("exit", function(message, sender) {
window.close();
});
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.result.launch("index.html?background=1");
};
alert("woke up from alarm");
});
var request = navigator.mozAlarms.getAll();
request.onsuccess = function () {
this.result.forEach(function (alarm) {
alert('Id: ' + alarm.id + ", date: " + alarm.date + ", " + alarm.data);
});
};
request.onerror = function () {
console.log("An error occurred: " + this.error.name);
}; |
<<<<<<<
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.Bytecodes.INVOKESPECIAL);
} |
<<<<<<<
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;
>>>>>>>
Native["com/nokia/mid/ui/CanvasItem.detachNativeImpl.()V"] = function() {
this.caretPosition = this.textEditor.getSelectionStart().index;
<<<<<<<
Native["com/nokia/mid/ui/CanvasItem.setVisible.(Z)V"] = function(visible) {
if (visible && !this.visible) {
this.textEditor.setVisible(true);
} else if (!visible && this.visible) {
this.textEditor.setVisible(false);
}
=======
Native.create("com/nokia/mid/ui/CanvasItem.setVisible.(Z)V", function(visible) {
this.textEditor.setVisible(visible ? true : false);
>>>>>>>
Native["com/nokia/mid/ui/CanvasItem.setVisible.(Z)V"] = function(visible) {
this.textEditor.setVisible(visible ? true : false);
<<<<<<<
Native["com/nokia/mid/ui/TextEditor.setCaret.(I)V"] = function(index) {
=======
Native.create("com/nokia/mid/ui/TextEditor.setCaret.(I)V", function(index) {
if (index < 0 || index > this.textEditor.getSize()) {
throw new JavaException("java/lang/StringIndexOutOfBoundsException");
}
>>>>>>>
Native["com/nokia/mid/ui/TextEditor.setCaret.(I)V"] = function(index) {
if (index < 0 || index > this.textEditor.getSize()) {
throw $.newStringIndexOutOfBoundsException();
}
<<<<<<<
if (offset < 0 || offset > old.length || length < 0 || offset + length > old.length) {
throw $.newStringIndexOutOfBoundsException("offset/length invalid");
=======
var size = this.textEditor.getSize();
if (offset < 0 || offset > size || length < 0 || offset + length > size) {
throw new JavaException("java.lang.StringIndexOutOfBoundsException", "offset/length invalid");
>>>>>>>
var size = this.textEditor.getSize();
if (offset < 0 || offset > size || length < 0 || offset + length > size) {
throw $.newStringIndexOutOfBoundsException("offset/length invalid");
<<<<<<<
Native["com/nokia/mid/ui/TextEditor.setMaxSize.(I)I"] = function(maxSize) {
if (this.textEditor.getContent().length > maxSize) {
this.textEditor.setContent(this.textEditor.getContent().substring(0, maxSize));
if (this.getCaretPosition() > maxSize) {
=======
Native.create("com/nokia/mid/ui/TextEditor.setMaxSize.(I)I", function(maxSize) {
if (this.textEditor.getSize() > maxSize) {
var oldCaretPosition = this.getCaretPosition();
this.textEditor.setContent(this.textEditor.getSlice(0, maxSize));
if (oldCaretPosition > maxSize) {
>>>>>>>
Native["com/nokia/mid/ui/TextEditor.setMaxSize.(I)I"] = function(maxSize) {
if (this.textEditor.getSize() > maxSize) {
var oldCaretPosition = this.getCaretPosition();
this.textEditor.setContent(this.textEditor.getSlice(0, maxSize));
if (oldCaretPosition > maxSize) {
<<<<<<<
Native["com/nokia/mid/ui/TextEditor.size.()I"] = function() {
return this.textEditor.getContent().length;
};
=======
Native.create("com/nokia/mid/ui/TextEditor.size.()I", function() {
return this.textEditor.getSize();
});
Native.create("com/nokia/mid/ui/TextEditor.setFont.(Ljavax/microedition/lcdui/Font;)V", function(font) {
this.class.getField("I.font.Ljavax/microedition/lcdui/Font;").set(this, font);
this.textEditor.setFont(font);
});
>>>>>>>
Native["com/nokia/mid/ui/TextEditor.size.()I"] = function() {
return this.textEditor.getSize();
};
Native["com/nokia/mid/ui/TextEditor.setFont.(Ljavax/microedition/lcdui/Font;)V"] = function(font) {
this.klass.classInfo.getField("I.font.Ljavax/microedition/lcdui/Font;").set(this, font);
this.textEditor.setFont(font);
}; |
<<<<<<<
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.classInfo.getField("I.clipX1.S").get(g),
clipY1 = g.klass.classInfo.getField("I.clipY1.S").get(g),
clipX2 = g.klass.classInfo.getField("I.clipX2.S").get(g),
clipY2 = g.klass.classInfo.getField("I.clipY2.S").get(g);
>>>>>>>
if (g.clipped) {
<<<<<<<
var w = withFont(g.currentFont, c, str);
=======
withFont(g.klass.classInfo.getField("I.currentFont.Ljavax/microedition/lcdui/Font;").get(g), c);
>>>>>>>
withFont(g.currentFont, c);
<<<<<<<
asyncImpl("V", new Promise(function(resolve, reject) {
var font = g.currentFont;
var parts = parseEmojiString(str);
withGraphics(g, function(c) {
withClip(g, c, x, y, function(curX, y) {
(function drawNext() {
if (parts.length === 0) {
resolve();
return;
}
var part = parts.shift();
if (part.text) {
withTextAnchor(g, c, anchor, curX, y, part.text, function(x, y, w) {
var withPixelFunc = isOpaque ? withOpaquePixel : withPixel;
withPixelFunc(g, c, function() {
c.fillText(part.text, x, y);
curX += w;
});
=======
var font = g.klass.classInfo.getField("I.currentFont.Ljavax/microedition/lcdui/Font;").get(g);
withGraphics(g, function(c) {
withClip(g, c, x, y, function(curX, y) {
parseEmojiString(str).forEach(function(part) {
if (part.text) {
withTextAnchor(g, c, anchor, curX, y, part.text, function(x, y) {
var withPixelFunc = isOpaque ? withOpaquePixel : withPixel;
withPixelFunc(g, c, function() {
c.fillText(part.text, x, y);
// If there are emojis in the string that we need to draw,
// we need to calculate the string width
if (part.emoji) {
curX += measureWidth(c, part.text)
}
>>>>>>>
withGraphics(g, function(c) {
withClip(g, c, x, y, function(curX, y) {
parseEmojiString(str).forEach(function(part) {
if (part.text) {
withTextAnchor(g, c, anchor, curX, y, part.text, function(x, y) {
var withPixelFunc = isOpaque ? withOpaquePixel : withPixel;
withPixelFunc(g, c, function() {
c.fillText(part.text, x, y);
// If there are emojis in the string that we need to draw,
// we need to calculate the string width
if (part.emoji) {
curX += measureWidth(c, part.text)
} |
<<<<<<<
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();
}
>>>>>>>
PlayerContainer.prototype.startSnapshot = function(imageType) {
this.player.startSnapshot(imageType);
}
PlayerContainer.prototype.getSnapshotData = function() {
return this.player.getSnapshotData();
}
PlayerContainer.prototype.getDuration = function() {
return this.player.getDuration();
} |
<<<<<<<
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) {
var ids = J2ME.newIntArray( 1);
>>>>>>>
Native["com/sun/midp/lcdui/DisplayDeviceContainer.getDisplayDevicesIds0.()[I"] = function(addr) {
var idsAddr = J2ME.newIntArray(1);
var ids = J2ME.getArrayFromAddr(idsAddr);
<<<<<<<
function(pixels, offset, scanlength, x, y, width, height, format) {
if (!pixels) {
=======
function(addr, pixels, offset, scanlength, x, y, width, height, format) {
if (pixels === null) {
>>>>>>>
function(addr, pixels, offset, scanlength, x, y, width, height, format) {
if (!pixels) {
<<<<<<<
function(pixels, transparency, offset, scanlength, x, y, width, height, manipulation, format) {
if (!pixels) {
=======
function(addr, pixels, transparency, offset, scanlength, x, y, width, height, manipulation, format) {
if (pixels === null) {
>>>>>>>
function(addr, pixels, transparency, offset, scanlength, x, y, width, height, manipulation, format) {
if (!pixels) { |
<<<<<<<
break;
=======
} else {
var classInfo = resolve(exception_table[i].catch_type);
if (ex.class.isAssignableTo(classInfo)) {
handler_pc = exception_table[i].handler_pc;
break;
}
>>>>>>>
break;
<<<<<<<
if (!frame) {
return;
=======
function resolve(idx, isStatic) {
var constant = cp[idx];
if (!constant.tag)
return constant;
switch(constant.tag) {
case 3: // TAGS.CONSTANT_Integer
constant = constant.integer;
break;
case 4: // TAGS.CONSTANT_Float
constant = constant.float;
break;
case 8: // TAGS.CONSTANT_String
constant = ctx.newString(cp[constant.string_index].bytes);
break;
case 5: // TAGS.CONSTANT_Long
constant = Long.fromBits(constant.lowBits, constant.highBits);
break;
case 6: // TAGS.CONSTANT_Double
constant = constant.double;
break;
case 7: // TAGS.CONSTANT_Class
constant = CLASSES.getClass(cp[constant.name_index].bytes);
break;
case 9: // TAGS.CONSTANT_Fieldref
var classInfo = resolve(constant.class_index, isStatic);
var fieldName = cp[cp[constant.name_and_type_index].name_index].bytes;
var signature = cp[cp[constant.name_and_type_index].signature_index].bytes;
constant = CLASSES.getField(classInfo, (isStatic ? "S" : "I") + "." + fieldName + "." + signature);
if (!constant)
ctx.raiseExceptionAndYield("java/lang/RuntimeException",
classInfo.className + "." + fieldName + "." + signature + " not found");
break;
case 10: // TAGS.CONSTANT_Methodref
case 11: // TAGS.CONSTANT_InterfaceMethodref
var classInfo = resolve(constant.class_index, isStatic);
var methodName = cp[cp[constant.name_and_type_index].name_index].bytes;
var signature = cp[cp[constant.name_and_type_index].signature_index].bytes;
constant = CLASSES.getMethod(classInfo, (isStatic ? "S" : "I") + "." + methodName + "." + signature);
if (!constant)
ctx.raiseExceptionAndYield("java/lang/RuntimeException",
classInfo.className + "." + methodName + "." + signature + " not found");
break;
default:
throw new Error("not support constant type");
}
return cp[idx] = constant;
>>>>>>>
if (!frame) {
return;
<<<<<<<
constant = resolve(ctx, cp, op, idx);
=======
constant = resolve(idx);
>>>>>>>
constant = resolve(ctx, cp, idx);
<<<<<<<
constant = resolve(ctx, cp, op, idx);
=======
constant = resolve(idx);
>>>>>>>
constant = resolve(ctx, cp, idx);
<<<<<<<
classInfo = resolve(ctx, cp, op, idx);
=======
classInfo = resolve(idx);
>>>>>>>
classInfo = resolve(ctx, cp, idx);
<<<<<<<
classInfo = resolve(ctx, cp, op, idx);
=======
classInfo = resolve(idx);
>>>>>>>
classInfo = resolve(ctx, cp, idx);
<<<<<<<
field = resolve(ctx, cp, op, idx);
=======
field = resolve(idx, false);
>>>>>>>
field = resolve(ctx, cp, idx, false);
<<<<<<<
field = resolve(ctx, cp, op, idx);
=======
field = resolve(idx, false);
>>>>>>>
field = resolve(ctx, cp, idx, false);
<<<<<<<
field = resolve(ctx, cp, op, idx);
classInitCheck(ctx, frame, field.classInfo, frame.ip-3);
=======
field = resolve(idx, true);
classInitCheck(field.classInfo, frame.ip-3);
>>>>>>>
field = resolve(ctx, cp, idx, true);
classInitCheck(ctx, frame, field.classInfo, frame.ip-3);
<<<<<<<
field = resolve(ctx, cp, op, idx);
classInitCheck(ctx, frame, field.classInfo, frame.ip-3);
=======
field = resolve(idx, true);
classInitCheck(field.classInfo, frame.ip-3);
>>>>>>>
field = resolve(ctx, cp, idx, true);
classInitCheck(ctx, frame, field.classInfo, frame.ip-3);
<<<<<<<
classInfo = resolve(ctx, cp, op, idx);
classInitCheck(ctx, frame, classInfo, frame.ip-3);
=======
classInfo = resolve(idx);
classInitCheck(classInfo, frame.ip-3);
>>>>>>>
classInfo = resolve(ctx, cp, idx);
classInitCheck(ctx, frame, classInfo, frame.ip-3);
<<<<<<<
classInfo = resolve(ctx, cp, op, idx);
=======
classInfo = resolve(idx);
>>>>>>>
classInfo = resolve(ctx, cp, idx);
<<<<<<<
classInfo = resolve(ctx, cp, op, idx);
=======
classInfo = resolve(idx);
>>>>>>>
classInfo = resolve(ctx, cp, idx);
<<<<<<<
methodInfo = resolve(ctx, cp, op, idx);
=======
methodInfo = resolve(idx, isStatic);
>>>>>>>
methodInfo = resolve(ctx, cp, idx, isStatic); |
<<<<<<<
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 (!src || !dst) {
>>>>>>>
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/Throwable.obtainBackTrace.()Ljava/lang/Object;"] = function(addr) {
var result = null;
=======
Native["java/lang/Throwable.obtainBackTrace.()Ljava/lang/Object;"] = function() {
var resultAddr = J2ME.Constants.NULL;
// XXX: Untested.
>>>>>>>
Native["java/lang/Throwable.obtainBackTrace.()Ljava/lang/Object;"] = function(addr) {
var resultAddr = J2ME.Constants.NULL;
// XXX: Untested.
<<<<<<<
Native["com/sun/cldc/isolate/Isolate.getIsolates0.()[Lcom/sun/cldc/isolate/Isolate;"] = function(addr) {
var isolates = J2ME.newObjectArray(Runtime.all.keys().length);
=======
Native["com/sun/cldc/isolate/Isolate.getIsolates0.()[Lcom/sun/cldc/isolate/Isolate;"] = function() {
var isolatesAddr = J2ME.newObjectArray(Runtime.all.size);
var isolates = J2ME.getArrayFromAddr(isolatesAddr);
>>>>>>>
Native["com/sun/cldc/isolate/Isolate.getIsolates0.()[Lcom/sun/cldc/isolate/Isolate;"] = function(addr) {
var isolatesAddr = J2ME.newObjectArray(Runtime.all.size);
var isolates = J2ME.getArrayFromAddr(isolatesAddr);
<<<<<<<
Native["java/lang/String.intern.()Ljava/lang/String;"] = function(addr) {
=======
Native["java/lang/String.intern.()Ljava/lang/String;"] = function() {
var value = J2ME.getArrayFromAddr(this.value);
>>>>>>>
Native["java/lang/String.intern.()Ljava/lang/String;"] = function(addr) {
var value = J2ME.getArrayFromAddr(this.value); |
<<<<<<<
utils.startSpinner(`Promoting ${version}`);
return utils.callAPI(url, {
method: 'PUT',
body
});
=======
utils.printStarting(`Verifying and promoting ${version}`);
return utils.callAPI(
url,
{
method: 'PUT',
body
},
false,
true
);
>>>>>>>
utils.startSpinner(`Verifying and promoting ${version}`);
return utils.callAPI(
url,
{
method: 'PUT',
body
},
true
);
<<<<<<<
.catch(error => {
// The server 403's when the app hasn't been approved yet
if (
error.message.indexOf(
'You cannot promote until we have approved your app.'
) !== -1
) {
utils.endSpinner();
=======
.catch(response => {
// we probalby have a raw response, might have a thrown error
// The server 403s when the app hasn't been approved yet
if (_.get(response, 'json.activationInfo')) {
utils.printDone();
>>>>>>>
.catch(response => {
// we probalby have a raw response, might have a thrown error
// The server 403s when the app hasn't been approved yet
if (_.get(response, 'json.activationInfo')) {
utils.endSpinner(); |
<<<<<<<
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 %>'];
<% }); %>
<% } %>
=======
let url = '<%= URL %>';
url = replaceVars(url, bundle);
>>>>>>>
let url = '<%= URL %>';
url = replaceVars(url, bundle);
<% 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 item count and select list items.
* 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 item count and select
* list items
*
* There will be one dot for each item, and the dot for the currently selected
* item will be shown selected.
<<<<<<<
* @class PageDots
* @mixes ChildrenContent
* @mixes CollectiveMember
* @mixes ContentFirstChildTarget
* @mixes Keyboard
* @mixes TargetSelection
=======
>>>>>>>
* @mixes ChildrenContent
* @mixes CollectiveMember
* @mixes ContentFirstChildTarget
* @mixes Keyboard
* @mixes TargetSelection |
<<<<<<<
//默认过滤规则相关配置项目
//,disabledTableInTable:true //禁止表格嵌套
//,allowDivTransToP:true //允许进入编辑器的div标签自动变成p标签
//,rgb2Hex:true //默认产出的数据中的color自动从rgb格式变成16进制格式
=======
>>>>>>>
//默认过滤规则相关配置项目
//,disabledTableInTable:true //禁止表格嵌套
//,allowDivTransToP:true //允许进入编辑器的div标签自动变成p标签
//,rgb2Hex:true //默认产出的数据中的color自动从rgb格式变成16进制格式 |
<<<<<<<
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 = fs.readFileSync(this.templatePath(orig), 'utf8');
this.update = fs.readFileSync(this.templatePath(updated), 'utf8');
var re = new RegExp("<%= tenantNameUpperFirst %>", 'g');
this.update = this.update.replace(re,this.tenantNameUpperFirst);
var re = new RegExp("<%= tenantNameUpperCase %>", 'g');
this.update = this.update.replace(re,this.tenantNameUpperCase);
this.replaceContent(file,this.old,this.update,false);
}
// 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 = 'String';
} else {
this.pkType = 'Long';
}
=======
// read config from .yo-rc.json
this.baseName = _.upperFirst(this.jhipsterAppConfig.baseName);
this.packageName = this.jhipsterAppConfig.packageName;
this.packageFolder = this.jhipsterAppConfig.packageFolder;
this.enableTranslation = this.jhipsterAppConfig.enableTranslation;
>>>>>>>
this.readFiles = function (orig, updated, file) {
this.old = fs.readFileSync(this.templatePath(orig), 'utf8');
this.update = fs.readFileSync(this.templatePath(updated), 'utf8');
var re = new RegExp("<%= tenantNameUpperFirst %>", 'g');
this.update = this.update.replace(re,this.tenantNameUpperFirst);
var re = new RegExp("<%= tenantNameUpperCase %>", 'g');
this.update = this.update.replace(re,this.tenantNameUpperCase);
this.replaceContent(file,this.old,this.update,false);
}
// 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 = 'String';
} else {
this.pkType = 'Long';
}
this.enableTranslation = this.jhipsterAppConfig.enableTranslation;
<<<<<<<
this.mainClass = this.getMainClassName();
=======
this.tenantNamePlural = pluralize(this.tenantNameLowerFirst);
>>>>>>>
this.mainClass = this.getMainClassName();
this.tenantNamePlural = pluralize(this.tenantNameLowerFirst);
<<<<<<<
=======
//user management UI
this.rewriteFile(`${webappDir}app/admin/user-management/user-management-detail.component.html`,
'<dt><span jhiTranslate="userManagement.createdBy">Created By</span></dt>',
`<dt><span jhiTranslate="userManagement${this.tenantNameUpperFirst}">${this.tenantNameUpperFirst}</span></dt>
<dd>{{user.${this.tenantNameLowerFirst}?.name}}</dd>`);
this.rewriteFile(`${webappDir}app/admin/user-management/user-management-dialog.component.html`,
'<div class="form-group" *ngIf="languages && languages.length > 0">',
`<div class="form-group" *ngIf="${this.tenantNamePlural} && ${this.tenantNamePlural}.length > 0">
<label jhiTranslate="userManagement${this.tenantNameUpperFirst}">${this.tenantNameUpperFirst}</label>
<select class="form-control" id="${this.tenantNameLowerFirst}" name="${this.tenantNameLowerFirst}" [(ngModel)]="user.${this.tenantNameLowerFirst}" (change)="on${this.tenantNameUpperFirst}Change()">
<option [ngValue]="null"></option>
<option [ngValue]="${this.tenantNameLowerFirst}.id === user.${this.tenantNameLowerFirst}?.id ? user.${this.tenantNameLowerFirst} : ${this.tenantNameLowerFirst}" *ngFor="let ${this.tenantNameLowerFirst} of ${this.tenantNamePlural}">{{${this.tenantNameLowerFirst}.name}}</option>
</select>
</div>`);
this.template('src/main/webapp/user-management/_user-management-dialog.component.ts', `${webappDir}app/admin/user-management/user-management-dialog.component.ts`);
this.template('src/main/webapp/user-management/_user-management.component.html', `${webappDir}app/admin/user-management/user-management.component.html`);
this.template('src/main/webapp/user-management/_user.model.ts', `${webappDir}app/shared/user/user.model.ts`);
this.addTranslationKeyToAllLanguages(`userManagement${this.tenantNameUpperFirst}`,`${this.tenantNameUpperFirst}`,'addGlobalTranslationKey', this.enableTranslation);
>>>>>>>
//user management UI
this.rewriteFile(`${webappDir}app/admin/user-management/user-management-detail.component.html`,
'<dt><span jhiTranslate="userManagement.createdBy">Created By</span></dt>',
`<dt><span jhiTranslate="userManagement${this.tenantNameUpperFirst}">${this.tenantNameUpperFirst}</span></dt>
<dd>{{user.${this.tenantNameLowerFirst}?.name}}</dd>`);
this.rewriteFile(`${webappDir}app/admin/user-management/user-management-dialog.component.html`,
'<div class="form-group" *ngIf="languages && languages.length > 0">',
`<div class="form-group" *ngIf="${this.tenantNamePlural} && ${this.tenantNamePlural}.length > 0">
<label jhiTranslate="userManagement${this.tenantNameUpperFirst}">${this.tenantNameUpperFirst}</label>
<select class="form-control" id="${this.tenantNameLowerFirst}" name="${this.tenantNameLowerFirst}" [(ngModel)]="user.${this.tenantNameLowerFirst}" (change)="on${this.tenantNameUpperFirst}Change()">
<option [ngValue]="null"></option>
<option [ngValue]="${this.tenantNameLowerFirst}.id === user.${this.tenantNameLowerFirst}?.id ? user.${this.tenantNameLowerFirst} : ${this.tenantNameLowerFirst}" *ngFor="let ${this.tenantNameLowerFirst} of ${this.tenantNamePlural}">{{${this.tenantNameLowerFirst}.name}}</option>
</select>
</div>`);
this.template('src/main/webapp/user-management/_user-management-dialog.component.ts', `${webappDir}app/admin/user-management/user-management-dialog.component.ts`);
this.template('src/main/webapp/user-management/_user-management.component.html', `${webappDir}app/admin/user-management/user-management.component.html`);
this.template('src/main/webapp/user-management/_user.model.ts', `${webappDir}app/shared/user/user.model.ts`);
this.addTranslationKeyToAllLanguages(`userManagement${this.tenantNameUpperFirst}`,`${this.tenantNameUpperFirst}`,'addGlobalTranslationKey', this.enableTranslation); |
<<<<<<<
// 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 = 'String';
} else {
this.pkType = 'Long';
}
this.enableTranslation = this.jhipsterAppConfig.enableTranslation;
this.angularXAppName = this.getAngularXAppName();
this.skipUserManagement = this.options['skip-user-management'] || this.config.get('skipUserManagement');
this.jhiPrefixCapitalized = _.upperFirst(this.jhiPrefix);
// use function in generator-base.js from generator-jhipster
this.angularAppName = this.getAngularAppName();
=======
this.readFiles = function (orig, updated, file) {
this.old = fs.readFileSync(this.templatePath(orig), 'utf8');
this.update = fs.readFileSync(this.templatePath(updated), 'utf8');
var re = new RegExp("<%= tenantNameUpperFirst %>", 'g');
this.update = this.update.replace(re,this.tenantNameUpperFirst);
var re = new RegExp("<%= tenantNameUpperCase %>", 'g');
this.update = this.update.replace(re,this.tenantNameUpperCase);
this.replaceContent(file,this.old,this.update,false);
}
>>>>>>>
<<<<<<<
this.template('src/main/java/package/aop/_tenant/RequestParam.java', `${javaDir}aop/${this.tenantNameLowerFirst}/RequestParam.java`);
//user management UI
this.rewriteFile(`${webappDir}app/admin/user-management/user-management-detail.component.html`,
'<dt><span jhiTranslate="userManagement.createdBy">Created By</span></dt>',
`<dt><span jhiTranslate="userManagement${this.tenantNameUpperFirst}">${this.tenantNameUpperFirst}</span></dt>
<dd>{{user.${this.tenantNameLowerFirst}?.name}}</dd>`);
this.rewriteFile(`${webappDir}app/admin/user-management/user-management-dialog.component.html`,
'<div class="form-group" *ngIf="languages && languages.length > 0">',
`<div class="form-group" *ngIf="${this.tenantNamePluralLowerFirst} && ${this.tenantNamePluralLowerFirst}.length > 0">
<label jhiTranslate="userManagement${this.tenantNameUpperFirst}">${this.tenantNameUpperFirst}</label>
<select class="form-control" id="${this.tenantNameLowerFirst}" name="${this.tenantNameLowerFirst}" [(ngModel)]="user.${this.tenantNameLowerFirst}" (change)="on${this.tenantNameUpperFirst}Change()">
<option [ngValue]="null"></option>
<option [ngValue]="${this.tenantNameLowerFirst}.id === user.${this.tenantNameLowerFirst}?.id ? user.${this.tenantNameLowerFirst} : ${this.tenantNameLowerFirst}" *ngFor="let ${this.tenantNameLowerFirst} of ${this.tenantNamePluralLowerFirst}">{{${this.tenantNameLowerFirst}.name}}</option>
</select>
</div>`);
this.template('src/main/webapp/user-management/_user-management-dialog.component.ts', `${webappDir}app/admin/user-management/user-management-dialog.component.ts`);
this.template('src/main/webapp/user-management/_user-management.component.html', `${webappDir}app/admin/user-management/user-management.component.html`);
this.template('src/main/webapp/user-management/_user.model.ts', `${webappDir}app/shared/user/user.model.ts`);
this.addTranslationKeyToAllLanguages(`userManagement${this.tenantNameUpperFirst}`,`${this.tenantNameUpperFirst}`,'addGlobalTranslationKey', this.enableTranslation);
=======
/** ===========================
--- UI Changes ---
=========================== **/
// User Management Admin
this.template('src/main/webapp/user-management/_user-management-detail.component.html', `${webappDir}app/admin/user-management/user-management-detail.component.html`);
this.template('src/main/webapp/user-management/_user-management-dialog.component.html', `${webappDir}app/admin/user-management/user-management-dialog.component.html`);
this.template('src/main/webapp/user-management/_user-management-dialog.component.ts', `${webappDir}app/admin/user-management/user-management-dialog.component.ts`);
this.template('src/main/webapp/user-management/_user-management.component.html', `${webappDir}app/admin/user-management/user-management.component.html`);
// Shared Files
this.template('src/main/webapp/user/_user.model.ts', `${webappDir}app/shared/user/user.model.ts`);
/** ===========================
--- I18N Changes ---
=========================== **/
this.addTranslationKeyToAllLanguages(`userManagement${this.tenantNameUpperFirst}`, `${this.tenantNameUpperFirst}`, 'addGlobalTranslationKey', this.enableTranslation);
>>>>>>>
this.template('src/main/java/package/aop/_tenant/RequestParam.java', `${javaDir}aop/${this.tenantNameLowerFirst}/RequestParam.java`);
/** ===========================
--- UI Changes ---
=========================== **/
// User Management Admin
this.template('src/main/webapp/user-management/_user-management-detail.component.html', `${webappDir}app/admin/user-management/user-management-detail.component.html`);
this.template('src/main/webapp/user-management/_user-management-dialog.component.html', `${webappDir}app/admin/user-management/user-management-dialog.component.html`);
this.template('src/main/webapp/user-management/_user-management-dialog.component.ts', `${webappDir}app/admin/user-management/user-management-dialog.component.ts`);
this.template('src/main/webapp/user-management/_user-management.component.html', `${webappDir}app/admin/user-management/user-management.component.html`);
// Shared Files
this.template('src/main/webapp/user/_user.model.ts', `${webappDir}app/shared/user/user.model.ts`);
/** ===========================
--- I18N Changes ---
=========================== **/
this.addTranslationKeyToAllLanguages(`userManagement${this.tenantNameUpperFirst}`, `${this.tenantNameUpperFirst}`, 'addGlobalTranslationKey', this.enableTranslation);
this.template('src/main/webapp/user-management/_user-management-dialog.component.ts', `${webappDir}app/admin/user-management/user-management-dialog.component.ts`);
this.template('src/main/webapp/user-management/_user-management.component.html', `${webappDir}app/admin/user-management/user-management.component.html`);
this.template('src/main/webapp/user-management/_user.model.ts', `${webappDir}app/shared/user/user.model.ts`);
this.addTranslationKeyToAllLanguages(`userManagement${this.tenantNameUpperFirst}`,`${this.tenantNameUpperFirst}`,'addGlobalTranslationKey', this.enableTranslation); |
<<<<<<<
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 = (propName, value) =>
new nearley.Parser(grammar.ParserRules, propName).feed(value).results[0];
export const getStylesForProperty = (propName, inputValue, allowShorthand) => {
<<<<<<<
const propValue = (transforms.indexOf(propName) !== -1)
? parseProp(propName, value)
=======
const propValue = (allowShorthand && transforms.indexOf(propName) !== -1)
? (new nearley.Parser(grammar.ParserRules, propName).feed(value).results[0])
>>>>>>>
const propValue = (allowShorthand && transforms.indexOf(propName) !== -1)
? parseProp(propName, value) |
<<<<<<<
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) + '");isAbstract==false').then((response) => {
const entities = response.items.map(toEntity)
commit(SET_ENTITIES, filterNonVisibleEntities(entities))
resolve()
}).catch((error) => {
commit(SET_ERROR, error)
reject()
})
} catch (err) {
commit(SET_ERROR, err.message)
reject()
}
=======
if (query) {
try {
validateQuery(query)
api.get(getEntityTypeQuery(query)).then(response => {
const entities = response.items.map(toEntity)
commit(SET_ENTITIES, entities)
}, error => {
commit(SET_ERROR, error)
})
} catch (error) {
commit(SET_ERROR, error.message)
>>>>>>>
if (query) {
try {
validateQuery(query)
api.get(getEntityTypeQuery(query)).then(response => {
const entities = response.items.map(toEntity)
commit(SET_ENTITIES, filterNonVisibleEntities(entities))
}, error => {
commit(SET_ERROR, error)
})
} catch (error) {
commit(SET_ERROR, error.message) |
<<<<<<<
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' });
attributeSelect.change(function() {
updateAggregatesTable($(this).val());
});
}
>>>>>>>
$('.attribute-dropdown').on('change', function() {
updateAggregatesTable($('#x-aggr-attribute').val(), $('#y-aggr-attribute').val());
});
if (attributeSelect.val()) {
updateAggregatesTable(attributeSelect.val());
attributeSelect.select2({ width: 'resolve' });
attributeSelect.change(function() {
updateAggregatesTable($(this).val());
});
} |
<<<<<<<
commitHooks: [
setId,
setClass,
Articulation.easyScoreHook,
],
=======
throwOnError: false,
>>>>>>>
commitHooks: [
setId,
setClass,
Articulation.easyScoreHook,
],
throwOnError: false,
<<<<<<<
this.options.commitHooks.forEach(commitHook => this.addCommitHook(commitHook));
=======
return this;
>>>>>>>
this.options.commitHooks.forEach(commitHook => this.addCommitHook(commitHook));
return this; |
<<<<<<<
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 Methods
//
// An `Accidental` inherits from `Modifier`, and is formatted within a
// `ModifierContext`.
Vex.Inherit(Accidental, Modifier, {
// Create accidental. `type` can be a value from the
// `Vex.Flow.accidentalCodes.accidentals` table in `tables.js`. For
// example: `#`, `##`, `b`, `n`, etc.
init: function(type) {
Accidental.superclass.init.call(this);
L("New accidental: ", type);
this.note = null;
// The `index` points to a specific note in a chord.
this.index = null;
this.type = type;
this.position = Modifier.Position.LEFT;
this.render_options = {
// Font size for glyphs
font_scale: 38,
// Length of stroke across heads above or below the stave.
stroke_px: 3
};
this.accidental = Flow.accidentalCodes(this.type);
if (!this.accidental) throw new Vex.RERR("ArgumentError", "Unknown accidental type: " + type);
// Cautionary accidentals have parentheses around them
this.cautionary = false;
this.paren_left = null;
this.paren_right = null;
// Initial width is set from table.
this.setWidth(this.accidental.width);
},
// Attach this accidental to `note`, which must be a `StaveNote`.
setNote: function(note){
if (!note) throw new Vex.RERR("ArgumentError", "Bad note value: " + note);
this.note = note;
// Accidentals attached to grace notes are rendered smaller.
if (this.note.getCategory() === 'gracenotes') {
this.render_options.font_scale = 25;
this.setWidth(this.accidental.gracenote_width);
}
},
// If called, draws parenthesis around accidental.
setAsCautionary: function() {
this.cautionary = true;
this.render_options.font_scale = 28;
this.paren_left = Flow.accidentalCodes("{");
this.paren_right = Flow.accidentalCodes("}");
var width_adjust = (this.type == "##" || this.type == "bb") ? 6 : 4;
// Make sure `width` accomodates for parentheses.
this.setWidth(this.paren_left.width + this.accidental.width + this.paren_right.width - width_adjust);
return this;
},
// Render accidental onto canvas.
draw: function() {
if (!this.context) throw new Vex.RERR("NoContext",
"Can't draw accidental without a context.");
if (!(this.note && (this.index != null))) throw new Vex.RERR("NoAttachedNote",
"Can't draw accidental without a note and index.");
// Figure out the start `x` and `y` coordinates for this note and index.
var start = this.note.getModifierStartXY(this.position, this.index);
var acc_x = ((start.x + this.x_shift) - this.width);
var acc_y = start.y + this.y_shift;
L("Rendering: ", this.type, acc_x, acc_y);
if (!this.cautionary) {
// Render the accidental alone.
Glyph.renderGlyph(this.context, acc_x, acc_y,
this.render_options.font_scale, this.accidental.code);
} else {
// Render the accidental in parentheses.
acc_x += 3;
Glyph.renderGlyph(this.context, acc_x, acc_y,
this.render_options.font_scale, this.paren_left.code);
acc_x += 2;
Glyph.renderGlyph(this.context, acc_x, acc_y,
this.render_options.font_scale, this.accidental.code);
acc_x += this.accidental.width - 2;
if (this.type == "##" || this.type == "bb") acc_x -= 2;
Glyph.renderGlyph(this.context, acc_x, acc_y,
this.render_options.font_scale, this.paren_right.code);
}
}
});
>>>>>>>
} |
<<<<<<<
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;
this.y_shift = 0;
if (options) {
this.setOptions(options);
} else {
this.reset();
}
}
Glyph.prototype = {
setOptions: function(options) {
Vex.Merge(this.options, options);
this.reset();
},
setPoint: function(point) { this.point = point; return this; },
setStave: function(stave) { this.stave = stave; return this; },
setXShift: function(x_shift) { this.x_shift = x_shift; return this; },
setYShift: function(y_shift) { this.y_shift = y_shift; return this; },
setContext: function(context) { this.context = context; return this; },
getContext: function() { return this.context; },
reset: function() {
this.scale = this.point * 72 / (this.options.font.resolution * 100);
this.metrics = Glyph.loadMetrics(
this.options.font,
this.code,
this.options.cache
);
this.bbox = Glyph.getOutlineBoundingBox(
this.metrics.outline,
this.scale,
0,
0
);
},
getMetrics: function() {
if (!this.metrics) throw new Vex.RuntimeError("BadGlyph", "Glyph " +
this.code + " is not initialized.");
return {
x_min: this.metrics.x_min * this.scale,
x_max: this.metrics.x_max * this.scale,
width: this.bbox.getW(),
height: this.bbox.getH()
};
},
render: function(ctx, x_pos, y_pos) {
if (!this.metrics) throw new Vex.RuntimeError("BadGlyph", "Glyph " +
this.code + " is not initialized.");
var outline = this.metrics.outline;
var scale = this.scale;
Glyph.renderOutline(ctx, outline, scale, x_pos, y_pos);
},
renderToStave: function(x) {
if (!this.metrics) throw new Vex.RuntimeError("BadGlyph", "Glyph " +
this.code + " is not initialized.");
if (!this.stave) throw new Vex.RuntimeError("GlyphError", "No valid stave");
if (!this.context) throw new Vex.RERR("GlyphError", "No valid context");
var outline = this.metrics.outline;
var scale = this.scale;
Glyph.renderOutline(this.context, outline, scale,
x + this.x_shift, this.stave.getYForGlyphs() + this.y_shift);
}
};
>>>>>>>
function processOutline(outline, originX, originY, scaleX, scaleY, outlineFns) {
var command;
var x;
var y;
var i = 0;
function nextX() { return originX + outline[i++] * scaleX; }
function nextY() { return originY + outline[i++] * scaleY; }
while (i < outline.length) {
command = outline[i++];
switch (command) {
case 'm':
case 'l':
outlineFns[command](nextX(), nextY());
break;
case 'q':
x = nextX();
y = nextY();
outlineFns.q(nextX(), nextY(), x, y);
break;
case 'b':
x = nextX();
y = nextY();
outlineFns.b(nextX(), nextY(), nextX(), nextY(), x, y);
break;
}
}
}
export class Glyph {
<<<<<<<
}
static renderOutline(ctx, outline, scale, x_pos, y_pos) {
var outlineLength = outline.length;
ctx.beginPath();
ctx.moveTo(x_pos, y_pos);
for (var i = 0; i < outlineLength; ) {
var action = outline[i++];
switch(action) {
case 'm':
ctx.moveTo(x_pos + outline[i++] * scale,
y_pos + outline[i++] * -scale);
break;
case 'l':
ctx.lineTo(x_pos + outline[i++] * scale,
y_pos + outline[i++] * -scale);
break;
case 'q':
var cpx = x_pos + outline[i++] * scale;
var cpy = y_pos + outline[i++] * -scale;
ctx.quadraticCurveTo(
x_pos + outline[i++] * scale,
y_pos + outline[i++] * -scale, cpx, cpy);
break;
case 'b':
var x = x_pos + outline[i++] * scale;
var y = y_pos + outline[i++] * -scale;
ctx.bezierCurveTo(
x_pos + outline[i++] * scale, y_pos + outline[i++] * -scale,
x_pos + outline[i++] * scale, y_pos + outline[i++] * -scale,
x, y);
break;
}
}
ctx.fill();
}
=======
};
>>>>>>>
}
<<<<<<<
if (options) this.setOptions(options); else this.reset();
}
setOptions(options) {
Vex.Merge(this.options, options);
this.reset();
}
setPoint(point) { this.point = point; return this; }
setStave(stave) { this.stave = stave; return this; }
setXShift(x_shift) { this.x_shift = x_shift; return this; }
setYShift(y_shift) { this.y_shift = y_shift; return this; }
setContext(context) { this.context = context; return this; }
getContext() { return this.context; }
reset() {
this.metrics = Glyph.loadMetrics(this.options.font, this.code,
this.options.cache);
this.scale = this.point * 72 / (this.options.font.resolution * 100);
}
setWidth(width) {
this.width = width;
return this;
}
getMetrics() {
if (!this.metrics) throw new Vex.RuntimeError("BadGlyph", "Glyph " +
this.code + " is not initialized.");
return {
x_min: this.metrics.x_min * this.scale,
x_max: this.metrics.x_max * this.scale,
width: this.width || (this.metrics.x_max - this.metrics.x_min) * this.scale,
height: this.metrics.ha * this.scale
};
}
render(ctx, x_pos, y_pos) {
if (!this.metrics) throw new Vex.RuntimeError("BadGlyph", "Glyph " +
this.code + " is not initialized.");
var outline = this.metrics.outline;
var scale = this.scale;
Glyph.renderOutline(ctx, outline, scale, x_pos, y_pos);
}
renderToStave(x) {
if (!this.metrics) throw new Vex.RuntimeError("BadGlyph", "Glyph " +
this.code + " is not initialized.");
if (!this.stave) throw new Vex.RuntimeError("GlyphError", "No valid stave");
if (!this.context) throw new Vex.RERR("GlyphError", "No valid context");
var outline = this.metrics.outline;
var scale = this.scale;
Glyph.renderOutline(this.context, outline, scale,
x + this.x_shift, this.stave.getYForGlyphs() + this.y_shift);
}
}
=======
Glyph.renderOutline = function(ctx, outline, scale, x_pos, y_pos) {
ctx.beginPath();
ctx.moveTo(x_pos, y_pos);
processOutline(outline, x_pos, y_pos, scale, -scale, {
m: ctx.moveTo.bind(ctx),
l: ctx.lineTo.bind(ctx),
q: ctx.quadraticCurveTo.bind(ctx),
b: ctx.bezierCurveTo.bind(ctx)
});
ctx.fill();
};
Glyph.getOutlineBoundingBox = function(outline, scale, x_pos, y_pos) {
var bboxComp = new BoundingBoxComputation(x_pos, y_pos);
processOutline(outline, x_pos, y_pos, scale, -scale, {
m: bboxComp.addPoint.bind(bboxComp),
l: bboxComp.addPoint.bind(bboxComp),
q: bboxComp.addQuadraticCurve.bind(bboxComp),
b: bboxComp.addBezierCurve.bind(bboxComp)
});
return new Vex.Flow.BoundingBox(
bboxComp.x1,
bboxComp.y1,
bboxComp.width(),
bboxComp.height()
);
};
function processOutline(outline, originX, originY, scaleX, scaleY, outlineFns) {
var command;
var x;
var y;
var i = 0;
function nextX() { return originX + outline[i++] * scaleX; }
function nextY() { return originY + outline[i++] * scaleY; }
while (i < outline.length) {
command = outline[i++];
switch (command) {
case 'm':
case 'l':
outlineFns[command](nextX(), nextY());
break;
case 'q':
x = nextX();
y = nextY();
outlineFns.q(nextX(), nextY(), x, y);
break;
case 'b':
x = nextX();
y = nextY();
outlineFns.b(nextX(), nextY(), nextX(), nextY(), x, y);
break;
}
}
}
return Glyph;
}());
>>>>>>>
if (options) {
this.setOptions(options);
} else {
this.reset();
}
}
setOptions(options) {
Vex.Merge(this.options, options);
this.reset();
}
setPoint(point) { this.point = point; return this; }
setStave(stave) { this.stave = stave; return this; }
setXShift(x_shift) { this.x_shift = x_shift; return this; }
setYShift(y_shift) { this.y_shift = y_shift; return this; }
setContext(context) { this.context = context; return this; }
getContext() { return this.context; }
reset() {
this.scale = this.point * 72 / (this.options.font.resolution * 100);
this.metrics = Glyph.loadMetrics(
this.options.font,
this.code,
this.options.cache
);
this.bbox = Glyph.getOutlineBoundingBox(
this.metrics.outline,
this.scale,
0,
0
);
}
getMetrics() {
if (!this.metrics) throw new Vex.RuntimeError("BadGlyph", "Glyph " +
this.code + " is not initialized.");
return {
x_min: this.metrics.x_min * this.scale,
x_max: this.metrics.x_max * this.scale,
width: this.bbox.getW(),
height: this.bbox.getH()
};
}
render(ctx, x_pos, y_pos) {
if (!this.metrics) throw new Vex.RuntimeError("BadGlyph", "Glyph " +
this.code + " is not initialized.");
var outline = this.metrics.outline;
var scale = this.scale;
Glyph.renderOutline(ctx, outline, scale, x_pos, y_pos);
}
renderToStave(x) {
if (!this.metrics) throw new Vex.RuntimeError("BadGlyph", "Glyph " +
this.code + " is not initialized.");
if (!this.stave) throw new Vex.RuntimeError("GlyphError", "No valid stave");
if (!this.context) throw new Vex.RERR("GlyphError", "No valid context");
var outline = this.metrics.outline;
var scale = this.scale;
Glyph.renderOutline(this.context, outline, scale,
x + this.x_shift, this.stave.getYForGlyphs() + this.y_shift);
}
} |
<<<<<<<
=======
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);
} else {
//expand bubble in chrome
this.expandBubbleChrome(data, i, videoID);
}
this.pauseAll();
this.playSolo(data);
this.expanded = true;
} else {
if (typeof InstallTrigger !== 'undefined') {
//reduce bubble in firefox
this.reduceBubbleFirefox(data, i, videoID);
} else {
//reduce bubble in chrome
this.reduceBubbleChrome(data, i, videoID);
}
this.playAll();
this.expanded = false;
}
}
>>>>>>>
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);
} else {
//expand bubble in chrome
this.expandBubbleChrome(data, i, videoID);
}
this.pauseAll();
this.playSolo(data);
this.expanded = true;
} else {
if (typeof InstallTrigger !== 'undefined') {
//reduce bubble in firefox
this.reduceBubbleFirefox(data, i, videoID);
} else {
//reduce bubble in chrome
this.reduceBubbleChrome(data, i, videoID);
}
this.playAll();
this.expanded = false;
}
} |
<<<<<<<
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 = Map;
this.tab4Root = About; |
<<<<<<<
=======
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 { Nav, NavItem, NavLink, NavMenu } from './Nav';
=======
import SubscribeForm from '../components/SubscribeForm';
>>>>>>>
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 SubscribeForm from '../components/SubscribeForm';
import Image from './Image';
import { Nav, NavItem, NavLink, NavMenu } from './Nav'; |
<<<<<<<
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}
render={data => (
<>
<SEO />
<Nav menuLinks={data.site.siteMetadata.menuLinks} />
<main id="primary-content">{children}</main>
</>
)}
/>
</ErrorBoundary>
=======
<StaticQuery
query={MenuLinks}
render={data => (
<>
<SEO />
<SkipNavLink />
<PrimaryNav menuLinks={data.site.siteMetadata.menuLinks} />
<SkipNavContent />
<main id="primary-content">{children}</main>
</>
)}
/>
>>>>>>>
<ErrorBoundary>
<StaticQuery
query={MenuLinks}
render={data => (
<>
<SEO />
<SkipNavLink />
<PrimaryNav menuLinks={data.site.siteMetadata.menuLinks} />
<SkipNavContent />
<main id="primary-content">{children}</main>
</>
)}
/>
</ErrorBoundary> |
<<<<<<<
=======
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';
=======
import ErrorBoundary from '../ErrorBoundary';
>>>>>>>
import {
CardButton,
CardButtonGroup,
CardContent,
CardHeading,
CardText,
CardWrapper,
} from '../Card';
import ErrorBoundary from '../ErrorBoundary';
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.47425 1.9621C4.47488 1.96232 4.47551 1.96253 4.47615 1.96274L23.7319 8.52887C24.0772 8.66884 24.3 9.01292 24.2659 9.50808C24.2314 10.0075 23.9329 10.4704 23.4412 10.6735L3.22559 17.9589C3.22505 17.9591 3.22451 17.9593 3.22397 17.9595C2.52829 18.2066 2.06643 17.9442 1.84646 17.587C1.61515 17.2115 1.60259 16.6458 2.139 16.1572L8.2349 10.6045Z"
fill="currentColor"
stroke="black"
stroke-width="2"
/>
</>
),
viewBox: '0 0 26 20',
height: '20',
width: '26',
},
arrowLeft: {
path: (
<>
<title id="arrowLeft">Go to previous page</title>
<path
d="M17.5393 9.3823L16.8 10.0557L17.5071 10.7628L22.8519 16.1076C23.2055 16.4612 23.2295 16.9885 22.8591 17.491C22.4925 17.9883 21.8968 18.2244 21.2999 18.0247C21.2993 18.0244 21.2987 18.0242 21.298 18.024L2.04232 11.4579C1.69701 11.3179 1.47417 10.9738 1.5083 10.4787C1.54273 9.97932 1.84124 9.51639 2.33294 9.3133L22.5486 2.02782C22.5491 2.02763 22.5497 2.02744 22.5502 2.02725C23.2459 1.78021 23.7077 2.04256 23.9277 2.39971C24.159 2.77528 24.1716 3.34096 23.6352 3.82957L17.5393 9.3823Z"
fill="currentColor"
stroke="black"
stroke-width="2"
/>
</>
),
viewBox: '0 0 26 20',
height: '20',
width: '26',
},
},
=======
icons: {
...theme.icons,
flag: {
path: (
<path
d="M10.877 2.88c-1.505 0-2.858-1.034-4.96-1.034-.96 0-1.786.21-2.473.49.068-.215.09-.444.065-.67C3.43.929 2.85.348 2.147.3 1.29.241.578.956.578 1.846c0 .574.296 1.074.735 1.342v13.127c0 .286.22.517.49.517h.49c.271 0 .49-.231.49-.517V13.62c1.161-.557 2.184-.922 3.917-.922 1.505 0 2.859 1.034 4.96 1.034 1.792 0 3.124-.73 3.939-1.292.415-.286.665-.774.665-1.297V3.394c0-1.113-1.08-1.865-2.05-1.424-1.1.5-2.25.91-3.337.91zm3.916 8.268c-.667.498-1.863 1.033-3.132 1.033-1.837 0-3.126-1.033-4.961-1.033-1.328 0-2.953.304-3.916.775V4.43c.667-.498 1.863-1.034 3.133-1.034 1.836 0 3.125 1.034 4.96 1.034 1.326 0 2.951-.56 3.916-1.034v7.752z"
fill="currentcolor"
/>
),
viewBox: '0 0 17 17',
height: '17',
width: '17',
},
},
>>>>>>>
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.47425 1.9621C4.47488 1.96232 4.47551 1.96253 4.47615 1.96274L23.7319 8.52887C24.0772 8.66884 24.3 9.01292 24.2659 9.50808C24.2314 10.0075 23.9329 10.4704 23.4412 10.6735L3.22559 17.9589C3.22505 17.9591 3.22451 17.9593 3.22397 17.9595C2.52829 18.2066 2.06643 17.9442 1.84646 17.587C1.61515 17.2115 1.60259 16.6458 2.139 16.1572L8.2349 10.6045Z"
fill="currentColor"
stroke="black"
stroke-width="2"
/>
</>
),
viewBox: '0 0 26 20',
height: '20',
width: '26',
},
arrowLeft: {
path: (
<>
<title id="arrowLeft">Go to previous page</title>
<path
d="M17.5393 9.3823L16.8 10.0557L17.5071 10.7628L22.8519 16.1076C23.2055 16.4612 23.2295 16.9885 22.8591 17.491C22.4925 17.9883 21.8968 18.2244 21.2999 18.0247C21.2993 18.0244 21.2987 18.0242 21.298 18.024L2.04232 11.4579C1.69701 11.3179 1.47417 10.9738 1.5083 10.4787C1.54273 9.97932 1.84124 9.51639 2.33294 9.3133L22.5486 2.02782C22.5491 2.02763 22.5497 2.02744 22.5502 2.02725C23.2459 1.78021 23.7077 2.04256 23.9277 2.39971C24.159 2.77528 24.1716 3.34096 23.6352 3.82957L17.5393 9.3823Z"
fill="currentColor"
stroke="black"
stroke-width="2"
/>
</>
),
viewBox: '0 0 26 20',
height: '20',
width: '26',
flag: {
path: (
<path
d="M10.877 2.88c-1.505 0-2.858-1.034-4.96-1.034-.96 0-1.786.21-2.473.49.068-.215.09-.444.065-.67C3.43.929 2.85.348 2.147.3 1.29.241.578.956.578 1.846c0 .574.296 1.074.735 1.342v13.127c0 .286.22.517.49.517h.49c.271 0 .49-.231.49-.517V13.62c1.161-.557 2.184-.922 3.917-.922 1.505 0 2.859 1.034 4.96 1.034 1.792 0 3.124-.73 3.939-1.292.415-.286.665-.774.665-1.297V3.394c0-1.113-1.08-1.865-2.05-1.424-1.1.5-2.25.91-3.337.91zm3.916 8.268c-.667.498-1.863 1.033-3.132 1.033-1.837 0-3.126-1.033-4.961-1.033-1.328 0-2.953.304-3.916.775V4.43c.667-.498 1.863-1.034 3.133-1.034 1.836 0 3.125 1.034 4.96 1.034 1.326 0 2.951-.56 3.916-1.034v7.752z"
fill="currentcolor"
/>
),
viewBox: '0 0 17 17',
height: '17',
width: '17',
},
}, |
<<<<<<<
import { PageHero, BusinessFeed, Pagination } from '../components';
=======
import { PageHero, Layout, BusinessFeed } from '../components';
>>>>>>>
import { PageHero, BusinessFeed } from '../components';
<<<<<<<
<Pagination
location={props.location}
currentPage={parseInt(page)}
totalPages={parseInt(totalPages) - 1}
/>
=======
>>>>>>>
<Pagination
location={props.location}
currentPage={parseInt(page)}
totalPages={parseInt(totalPages) - 1}
/> |
<<<<<<<
<>
<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)
return (
<React.Fragment key={index}>
<CardWrapper
gridColumn={[null, null, 'span 2']}
pr={theme.spacing.lg}
pos="relative"
=======
<Box
maxW={theme.containers.main}
paddingX={[null, theme.spacing.base, theme.spacing.lg]}
>
{loaded && allies.length > 0 ? (
<SimpleGrid columns={[null, 1, 3, 4]} spacing={theme.spacing.med}>
{allies.map((allies, index) => {
if (index === 4)
return (
<React.Fragment key={index}>
<CardWrapper
gridColumn={[null, null, 'span 2']}
pr={theme.spacing.lg}
pos="relative"
>
<Image
publicId="assets/ally-sign-up"
objectFit="cover"
pos="absolute"
zIndex="-1"
w="100%"
h="100%"
top="0"
left="0"
/>
<CardContent
color={theme.colors['rbb-white']}
display="flex"
flexDirection="column"
>>>>>>>
<>
<Box
maxW={theme.containers.main}
paddingX={[null, theme.spacing.base, theme.spacing.lg]}
>
{loaded && allies.length > 0 ? (
<SimpleGrid columns={[null, 1, 3, 4]} spacing={theme.spacing.med}>
{allies.map((allies, index) => {
if (index === 4)
return (
<React.Fragment key={index}>
<CardWrapper
gridColumn={[null, null, 'span 2']}
pr={theme.spacing.lg}
pos="relative"
>
<Image
publicId="assets/ally-sign-up"
objectFit="cover"
pos="absolute"
zIndex="-1"
w="100%"
h="100%"
top="0"
left="0"
/>
<CardContent
color={theme.colors['rbb-white']}
display="flex"
flexDirection="column" |
<<<<<<<
<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,
margin,
}) => {
=======
const ModalCard = ({
imageUrl,
imageAlt,
modalTitle,
title,
blurb,
margin,
}) => {
>>>>>>>
const ModalCard = ({
publicId,
modalTitle,
title,
blurb,
margin,
}) => { |
<<<<<<<
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.onSlide && typeof this.onSlide === 'function' && typeof callCb === 'undefined') {
this.onSlide(newPos, value);
=======
if (triggerSlide && this.onSlide && typeof this.onSlide === 'function') {
this.onSlide(left, value);
>>>>>>>
if (triggerSlide && this.onSlide && typeof this.onSlide === 'function') {
this.onSlide(newPos, value); |
<<<<<<<
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.$range = $('<div class="' + this.options.rangeClass + '" />');
=======
this.value = parseInt(this.$element[0].value) || 0;
this.min = parseInt(this.$element[0].getAttribute('min')) || 0;
this.max = parseInt(this.$element[0].getAttribute('max')) || 0;
this.step = parseInt(this.$element[0].getAttribute('step')) || 1;
>>>>>>>
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;
<<<<<<<
if (this.step !== 1) {
value = Math.ceil((value) / this.step ) * this.step;
left = this.getPositionFromValue(value);
}
=======
value = (this.getValueFromPosition(left) / this.step) * this.step;
left = this.getPositionFromValue(value);
>>>>>>>
value = (this.getValueFromPosition(left) / this.step) * this.step;
left = this.getPositionFromValue(value);
<<<<<<<
percentage = ((pos) / (this.maxHandleX)) * 100;
value = this.step * Math.ceil((((percentage/100) * (this.max - this.min)) + this.min) / this.step);
=======
percentage = (pos) / (this.maxHandleX);
value = Math.ceil(((percentage) * (this.max - this.min)) + this.min);
>>>>>>>
percentage = (pos) / (this.maxHandleX);
//value = Math.ceil(((percentage) * (this.max - this.min)) + this.min);
value = this.step * Math.ceil((((percentage) * (this.max - this.min)) + this.min) / this.step); |
<<<<<<<
// 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 were originally defined in the
<<<<<<<
=======
// iterate over the object and explicitly make each property a new global variable. Because
// we are doing the operation in the global context the 'this' is the same as 'window' and
>>>>>>>
<<<<<<<
// setup checkout form and make sure visibility of form elements is what it should be
wpsc_setup_region_dropdowns();
wpsc_adjust_checkout_form_element_visibility();
wpsc_update_location_elements_visibility();
jQuery( "#shippingSameBilling" ).on( 'change', wpsc_adjust_checkout_form_element_visibility );
=======
wpsc_update_state_edit_text_visibility();
if ( $( 'body' ).hasClass( 'wpsc-shopping-cart' ) ) {
// make sure visibility of form elements is what it should be
wpsc_adjust_checkout_form_element_visibility();
jQuery( "#shippingSameBilling" ).on( 'change', wpsc_adjust_checkout_form_element_visibility );
}
>>>>>>>
// setup checkout form and make sure visibility of form elements is what it should be
wpsc_setup_region_dropdowns();
if ( $( 'body' ).hasClass( 'wpsc-shopping-cart' ) ) {
wpsc_adjust_checkout_form_element_visibility();
wpsc_update_location_elements_visibility();
jQuery( "#shippingSameBilling" ).on( 'change', wpsc_adjust_checkout_form_element_visibility ); |
<<<<<<<
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 event.touches[0].screenY;
};
>>>>>>>
const screenY = function screenY(event) {
if (_shared.pointerEventsEnabled && _shared.supportsPointerEvents) {
return event.screenY;
}
return event.touches[0].screenY;
};
<<<<<<<
const _passiveSettings = _shared.supportsPassive
? { passive: _shared.passive || false }
: undefined;
if (_shared.supportsPointerEvents) {
window.addEventListener('pointerup', _onTouchEnd);
window.addEventListener('pointerdown', _onTouchStart);
window.addEventListener('pointermove', _onTouchMove, _passiveSettings);
} else {
window.addEventListener('touchend', _onTouchEnd);
window.addEventListener('touchstart', _onTouchStart);
window.addEventListener('touchmove', _onTouchMove, _passiveSettings);
}
=======
if (_shared.pointerEventsEnabled && _shared.supportsPointerEvents) {
window.addEventListener('pointerup', _onTouchEnd);
window.addEventListener('pointerdown', _onTouchStart);
window.addEventListener('pointermove', _onTouchMove, _passiveSettings);
} else {
window.addEventListener('touchend', _onTouchEnd);
window.addEventListener('touchstart', _onTouchStart);
window.addEventListener('touchmove', _onTouchMove, _passiveSettings);
}
>>>>>>>
const _passiveSettings = _shared.supportsPassive
? { passive: _shared.passive || false }
: undefined;
if (_shared.pointerEventsEnabled && _shared.supportsPointerEvents) {
window.addEventListener('pointerup', _onTouchEnd);
window.addEventListener('pointerdown', _onTouchStart);
window.addEventListener('pointermove', _onTouchMove, _passiveSettings);
} else {
window.addEventListener('touchend', _onTouchEnd);
window.addEventListener('touchstart', _onTouchStart);
window.addEventListener('touchmove', _onTouchMove, _passiveSettings);
}
<<<<<<<
// Teardown event listeners
if (_shared.supportsPointerEvents) {
window.removeEventListener('pointerdown', _onTouchStart);
window.removeEventListener('pointerup', _onTouchEnd);
window.removeEventListener('pointermove', _onTouchMove, _passiveSettings);
} else {
window.removeEventListener('touchstart', _onTouchStart);
window.removeEventListener('touchend', _onTouchEnd);
window.removeEventListener('touchmove', _onTouchMove, _passiveSettings);
}
=======
if (_shared.pointerEventsEnabled && _shared.supportsPointerEvents) {
window.removeEventListener('pointerdown', _onTouchStart);
window.removeEventListener('pointerup', _onTouchEnd);
window.removeEventListener('pointermove', _onTouchMove, _passiveSettings);
} else {
window.removeEventListener('touchstart', _onTouchStart);
window.removeEventListener('touchend', _onTouchEnd);
window.removeEventListener('touchmove', _onTouchMove, _passiveSettings);
}
>>>>>>>
if (_shared.pointerEventsEnabled && _shared.supportsPointerEvents) {
window.removeEventListener('pointerdown', _onTouchStart);
window.removeEventListener('pointerup', _onTouchEnd);
window.removeEventListener('pointermove', _onTouchMove, _passiveSettings);
} else {
window.removeEventListener('touchstart', _onTouchStart);
window.removeEventListener('touchend', _onTouchEnd);
window.removeEventListener('touchmove', _onTouchMove, _passiveSettings);
} |
<<<<<<<
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_LIGHT_PASS, new PointLightingPass(vertex, fragment, this._lightingModel, false));
this.setPass(MaterialPass.POINT_LIGHT_SHADOW_PASS, new PointLightingPass(vertex, fragment, this._lightingModel, true));
this.setPass(MaterialPass.SPOT_LIGHT_PASS, new SpotLightingPass(vertex, fragment, this._lightingModel, false));
this.setPass(MaterialPass.SPOT_LIGHT_SHADOW_PASS, new SpotLightingPass(vertex, fragment, this._lightingModel, true));
this.setPass(MaterialPass.LIGHT_PROBE_PASS, new ProbeLightingPass(vertex, fragment, this._lightingModel));
=======
this.setPass(MaterialPass.DIR_LIGHT_PASS, new ForwardLitDirPass(vertex, fragment, this._lightingModel));
this.setPass(MaterialPass.POINT_LIGHT_PASS, new ForwardLitPointPass(vertex, fragment, this._lightingModel));
this.setPass(MaterialPass.SPOT_LIGHT_PASS, new ForwardLitSpotPass(vertex, fragment, this._lightingModel));
this.setPass(MaterialPass.LIGHT_PROBE_PASS, new ForwardLitProbePass(vertex, fragment, this._lightingModel));
>>>>>>>
this.setPass(MaterialPass.DIR_LIGHT_PASS, new DirectionalLightingPass(vertex, fragment, this._lightingModel));
this.setPass(MaterialPass.POINT_LIGHT_PASS, new PointLightingPass(vertex, fragment, this._lightingModel));
this.setPass(MaterialPass.SPOT_LIGHT_PASS, new SpotLightingPass(vertex, fragment, this._lightingModel));
this.setPass(MaterialPass.LIGHT_PROBE_PASS, new ProbeLightingPass(vertex, fragment, this._lightingModel)); |
<<<<<<<
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";
import {OmniShadowMapRenderer} from "./OmniShadowMapRenderer";
import {SpotShadowMapRenderer} from "./SpotShadowMapRenderer";
>>>>>>>
import {ShadowAtlas} from "./ShadowAtlas";
import {CascadeShadowMapRenderer} from "./CascadeShadowMapRenderer";
import {OmniShadowMapRenderer} from "./OmniShadowMapRenderer";
import {SpotShadowMapRenderer} from "./SpotShadowMapRenderer";
import {BasicMaterial} from "../material/BasicMaterial";
import {LightingModel} from "./LightingModel";
import {Float4} from "../math/Float4";
import {Matrix4x4} from "../math/Matrix4x4";
<<<<<<<
if (capabilities.WEBGL_2) {
// TODO: This needs to come from a dummy material
var material = new BasicMaterial({ lightingModel: LightingModel.GGX });
var pass = material.getPass(MaterialPass.BASE_PASS);
this._lightingUniformBuffer = pass.createUniformBufferFromShader("hx_lights");
console.log(this._lightingUniformBuffer);
}
=======
this._cascadeShadowRenderer = new CascadeShadowMapRenderer();
this._omniShadowRenderer = new OmniShadowMapRenderer();
this._spotShadowRenderer = new SpotShadowMapRenderer();
this._shadowAtlas = new ShadowAtlas(!!META.OPTIONS.shadowFilter.blurShader);
this._shadowAtlas.resize(2048, 2048);
>>>>>>>
this._cascadeShadowRenderer = new CascadeShadowMapRenderer();
this._omniShadowRenderer = new OmniShadowMapRenderer();
this._spotShadowRenderer = new SpotShadowMapRenderer();
this._shadowAtlas = new ShadowAtlas(!!META.OPTIONS.shadowFilter.blurShader);
this._shadowAtlas.resize(2048, 2048);
if (capabilities.WEBGL_2) {
// TODO: This needs to come from a dummy material
var material = new BasicMaterial({ lightingModel: LightingModel.GGX });
var pass = material.getPass(MaterialPass.BASE_PASS);
this._lightingUniformBuffer = pass.createUniformBufferFromShader("hx_lights");
console.log(this._lightingUniformBuffer);
}
<<<<<<<
for (var i = 0; i < len; ++i)
casters[i].render(this._camera, this._scene);
=======
GL.setRenderTarget(this._shadowAtlas.fbo);
GL.setClearColor(Color.WHITE);
GL.clear();
for (var i = 0; i < len; ++i) {
var light = casters[i];
// TODO: Reintroduce light types, use lookup
if (light instanceof DirectionalLight) {
this._cascadeShadowRenderer.render(light, this._shadowAtlas, this._camera, this._scene);
}
else if (light instanceof PointLight) {
this._omniShadowRenderer.render(light, this._shadowAtlas, this._camera, this._scene);
}
else if (light instanceof SpotLight) {
this._spotShadowRenderer.render(light, this._shadowAtlas, this._camera, this._scene);
}
}
this._shadowAtlas.blur();
>>>>>>>
GL.setRenderTarget(this._shadowAtlas.fbo);
GL.setClearColor(Color.WHITE);
GL.clear();
for (var i = 0; i < len; ++i) {
var light = casters[i];
// TODO: Reintroduce light types, use lookup
if (light instanceof DirectionalLight) {
this._cascadeShadowRenderer.render(light, this._shadowAtlas, this._camera, this._scene);
}
else if (light instanceof PointLight) {
this._omniShadowRenderer.render(light, this._shadowAtlas, this._camera, this._scene);
}
else if (light instanceof SpotLight) {
this._spotShadowRenderer.render(light, this._shadowAtlas, this._camera, this._scene);
}
}
this._shadowAtlas.blur(); |
<<<<<<<
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.registerTask('release', ['jshint','jasmine','concat:dist','uglify:dist','exec:gzip','s3-copy']);
<<<<<<<
grunt.loadNpmTasks('grunt-exec');
=======
grunt.loadNpmTasks('grunt-shell');
grunt.loadNpmTasks('grunt-docco');
>>>>>>>
grunt.loadNpmTasks('grunt-exec');
grunt.loadNpmTasks('grunt-shell'); |
<<<<<<<
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);
if (!reply) { // Component not found in cache
=======
rendered = cache.get(cacheKey);
if (!rendered) { // Component not found in cache
>>>>>>>
rendered = await getAsync(cacheKey);
if (!rendered) { // Component not found in cache |
<<<<<<<
// 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;
}
cache.storage.set(component, cachedComponent);
}
// After caching all cacheable components, restore props to templates
if (saveTemplates) {
let outCopy = out;
out = '';
let bookmark = 0;
saveTemplates.sort((a, b) => a.startIndex - b.startIndex);
// Rebuild output string with actual props
saveTemplates.forEach(savedTemplate => {
out += outCopy.substring(bookmark, savedTemplate.startIndex)
bookmark = savedTemplate.endIndex;
out += restoreProps(outCopy.slice(savedTemplate.startIndex, savedTemplate.endIndex),
savedTemplate.realProps, savedTemplate.lookup);
});
out += outCopy.substring(bookmark, outCopy.length);
=======
// cache component by slicing 'out'
cache.set(component, out.slice(start[component], tagEnd));
>>>>>>>
// 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;
}
cache.set(component, cachedComponent);
}
// After caching all cacheable components, restore props to templates
if (saveTemplates) {
let outCopy = out;
out = '';
let bookmark = 0;
saveTemplates.sort((a, b) => a.startIndex - b.startIndex);
// Rebuild output string with actual props
saveTemplates.forEach(savedTemplate => {
out += outCopy.substring(bookmark, savedTemplate.startIndex)
bookmark = savedTemplate.endIndex;
out += restoreProps(outCopy.slice(savedTemplate.startIndex, savedTemplate.endIndex),
savedTemplate.realProps, savedTemplate.lookup);
});
out += outCopy.substring(bookmark, outCopy.length); |
<<<<<<<
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) {
=======
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").live("click", function ($e) {
>>>>>>>
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) {
<<<<<<<
=======
function scrollsidebar(){
var elem = $('body.sbfixed #sidebar');
elem.scrollToFixed({
marginTop: 15,
limit: function(){ return $('#footer').offset().top - elem.outerHeight(true) - 15},
postUnfixed: function(){$(this).addClass('fixed')},
postFixed: function(){$(this).removeClass('fixed')},
postAbsolute: function(){$(this).removeClass('fixed')},
});
}
scrollsidebar();
>>>>>>>
function scrollsidebar(){
var elem = $('body.sbfixed #sidebar');
elem.scrollToFixed({
marginTop: 15,
limit: function(){ return $('#footer').offset().top - elem.outerHeight(true) - 15},
postUnfixed: function(){$(this).addClass('fixed')},
postFixed: function(){$(this).removeClass('fixed')},
postAbsolute: function(){$(this).removeClass('fixed')},
});
}
scrollsidebar(); |
<<<<<<<
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 + rectWidth, this._cursor.y + height]),
Border: new PDF.Array([0, 0, 0]),
A: new PDF.Dictionary({
Type: 'Action',
S: 'URI',
URI: new PDF.String(link),
}),
})
this._doc._annotations.push(annot)
}
if (goTo) {
const rectWidth = this._cursor.width - freeSpace
const annot = new PDF.Dictionary({
Type: 'Annot',
Subtype: 'Link',
Rect: new PDF.Array([left, this._cursor.y, left + rectWidth, this._cursor.y + height]),
Border: new PDF.Array([0, 0, 0]),
A: new PDF.Dictionary({
// Type: 'Action',
S: 'GoTo',
D: new PDF.String(goTo),
}),
})
this._doc._annotations.push(annot)
}
if (destination) {
this._doc._destinations.set(destination, new PDF.Array([
this._doc._currentPage.toReference(),
new PDF.Name('XYZ'),
left,
this._cursor.y,
null,
]))
}
>>>>>>>
if (goTo) {
const rectWidth = this._cursor.width - freeSpace
const annot = new PDF.Dictionary({
Type: 'Annot',
Subtype: 'Link',
Rect: new PDF.Array([left, this._cursor.y, left + rectWidth, this._cursor.y + height]),
Border: new PDF.Array([0, 0, 0]),
A: new PDF.Dictionary({
// Type: 'Action',
S: 'GoTo',
D: new PDF.String(goTo),
}),
})
this._doc._annotations.push(annot)
}
if (destination) {
this._doc._destinations.set(destination, new PDF.Array([
this._doc._currentPage.toReference(),
new PDF.Name('XYZ'),
left,
this._cursor.y,
null,
]))
} |
<<<<<<<
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/auth'
import {
promisesForPopulate,
getPopulateObjs,
getChildType
} from '../utils/populate'
const {
SET,
SET_PROFILE,
LOGIN,
LOGOUT,
LOGIN_ERROR,
UNAUTHORIZED_ERROR,
AUTHENTICATION_INIT_STARTED,
AUTHENTICATION_INIT_FINISHED
} = actionTypes
/**
* @description Dispatch login error action
* @param {Function} dispatch - Action dispatch function
* @param {Object} authError - Error object
* @private
*/
export const dispatchLoginError = (dispatch, authError) =>
dispatch({
type: LOGIN_ERROR,
authError
})
>>>>>>>
import { actionTypes } from '../constants'
import { getLoginMethodAndParams } from '../utils/auth'
import { promisesForPopulate } from '../utils/populate'
<<<<<<<
// Run onAuthStateChanged if it exists in config and enableEmptyAuthChanges is set to true
if (isFunction(firebase._.config.onAuthStateChanged) && firebase._.config.enableEmptyAuthChanges) {
firebase._.config.onAuthStateChanged(authData, firebase, dispatch)
}
return dispatch({ type: actionTypes.LOGOUT })
=======
// Run onAuthStateChanged if it exists in config and enableEmptyAuthChanges is set to true
if (isFunction(firebase._.config.onAuthStateChanged) && firebase._.config.enableEmptyAuthChanges) {
firebase._.config.onAuthStateChanged(authData, firebase, dispatch)
}
return dispatch({ type: LOGOUT })
>>>>>>>
// Run onAuthStateChanged if it exists in config and enableEmptyAuthChanges is set to true
if (isFunction(firebase._.config.onAuthStateChanged) && firebase._.config.enableEmptyAuthChanges) {
firebase._.config.onAuthStateChanged(authData, firebase, dispatch)
}
return dispatch({ type: actionTypes.LOGOUT })
<<<<<<<
// set redirect result callback if enableRedirectHandling set to true
if (firebase._.config.enableRedirectHandling && (
typeof window !== 'undefined' &&
window.location &&
window.location.protocol &&
window.location.protocol.indexOf('http') !== -1
)) {
=======
// set redirect result callback if enableRedirectHandling set to true
if (firebase._.config.enableRedirectHandling) {
>>>>>>>
// set redirect result callback if enableRedirectHandling set to true
if (firebase._.config.enableRedirectHandling && (
typeof window !== 'undefined' &&
window.location &&
window.location.protocol &&
window.location.protocol.indexOf('http') !== -1
)) {
<<<<<<<
if (firebase._.config.resetBeforeLogin) {
dispatchLoginError(dispatch, null)
}
const { method, params } = getLoginMethodAndParams(firebase, credentials)
=======
if (firebase._.config.resetBeforeLogin) {
dispatchLoginError(dispatch, null)
}
let { method, params } = getLoginMethodAndParams(firebase, credentials)
>>>>>>>
if (firebase._.config.resetBeforeLogin) {
dispatchLoginError(dispatch, null)
}
const { method, params } = getLoginMethodAndParams(firebase, credentials)
<<<<<<<
// For email auth return uid (createUser is used for creating a profile)
if (method === 'signInWithEmailAndPassword') {
return { user: userData }
}
=======
// For email auth return authData (createUser is used for creating a profile)
if (userData.email) return userData
>>>>>>>
// For email auth return uid (createUser is used for creating a profile)
if (method === 'signInWithEmailAndPassword') {
return { user: userData }
}
<<<<<<<
export const logout = (dispatch, firebase) =>
firebase.auth()
.signOut()
.then(() => {
dispatch({
type: actionTypes.LOGOUT,
preserve: firebase._.config.preserveOnLogout
})
firebase._.authUid = null
unWatchUserProfile(firebase)
return firebase
})
=======
export const logout = (dispatch, firebase) => {
return firebase.auth().signOut()
.then(() => {
dispatch({ type: LOGOUT })
firebase._.authUid = null
unWatchUserProfile(firebase)
return firebase
})
}
>>>>>>>
export const logout = (dispatch, firebase) =>
firebase.auth()
.signOut()
.then(() => {
dispatch({
type: actionTypes.LOGOUT,
preserve: firebase._.config.preserveOnLogout
})
firebase._.authUid = null
unWatchUserProfile(firebase)
return firebase
})
<<<<<<<
/**
* @description Update user profile
* @param {Function} dispatch - Action dispatch function
* @param {Object} firebase - Internal firebase object
* @param {Object} userData - User data object (response from authenticating)
* @param {Object} profile - Profile data to place in new profile
* @return {Promise}
* @private
*/
export const updateProfile = (dispatch, firebase, profileUpdate) => {
dispatch({ type: actionTypes.PROFILE_UPDATE_START, payload: profileUpdate })
const { database, _: { config, authUid } } = firebase
const profileRef = database().ref(`${config.userProfile}/${authUid}`)
return profileRef
.update(profileUpdate)
.then(() =>
profileRef
.once('value')
.then((snap) => {
dispatch({
type: actionTypes.PROFILE_UPDATE_SUCCESS,
payload: snap.val()
})
return snap
})
)
.catch((payload) => {
dispatch({ type: actionTypes.PROFILE_UPDATE_ERROR, payload })
return Promise.reject(payload)
})
}
/**
* @description Update Auth Object. Internally calls
* `firebase.auth().currentUser.updateProfile` as seen [in the firebase docs](https://firebase.google.com/docs/auth/web/manage-users#update_a_users_profile).
* @param {Function} dispatch - Action dispatch function
* @param {Object} firebase - Internal firebase object
* @param {Object} profileUpdate - Update to be auth object
* @return {Promise}
* @private
*/
export const updateAuth = (dispatch, firebase, authUpdate, updateInProfile) => {
dispatch({ type: actionTypes.AUTH_UPDATE_START, payload: authUpdate })
if (!firebase.auth().currentUser) {
const msg = 'User must be logged in to update auth.'
dispatch({ type: actionTypes.AUTH_UPDATE_ERROR, payload: msg })
return Promise.reject(msg)
}
return firebase.auth().currentUser
.updateProfile(authUpdate)
.then((payload) => {
dispatch({
type: actionTypes.AUTH_UPDATE_SUCCESS,
payload: firebase.auth().currentUser
})
if (updateInProfile) {
return updateProfile(dispatch, firebase, authUpdate)
}
return payload
})
.catch((payload) => {
dispatch({ type: actionTypes.AUTH_UPDATE_ERROR, payload })
return Promise.reject(payload)
})
}
/**
* @description Update user's email. Internally calls
* `firebase.auth().currentUser.updateEmail` as seen [in the firebase docs](https://firebase.google.com/docs/auth/web/manage-users#update_a_users_profile).
* @param {Function} dispatch - Action dispatch function
* @param {Object} firebase - Internal firebase object
* @param {String} newEmail - Update to be auth object
* @return {Promise}
* @private
*/
export const updateEmail = (dispatch, firebase, newEmail, updateInProfile) => {
dispatch({ type: actionTypes.EMAIL_UPDATE_START, payload: newEmail })
if (!firebase.auth().currentUser) {
const msg = 'User must be logged in to update email.'
dispatch({ type: actionTypes.EMAIL_UPDATE_ERROR, payload: msg })
return Promise.reject(msg)
}
return firebase.auth().currentUser
.updateEmail(newEmail)
.then((payload) => {
dispatch({ type: actionTypes.EMAIL_UPDATE_SUCCESS, payload: newEmail })
if (updateInProfile) {
return updateProfile(dispatch, firebase, { email: newEmail })
}
return payload
})
.catch((payload) => {
dispatch({ type: actionTypes.EMAIL_UPDATE_ERROR, payload })
return Promise.reject(payload)
})
=======
/**
* @description Update user profile
* @param {Function} dispatch - Action dispatch function
* @param {Object} firebase - Internal firebase object
* @param {Object} userData - User data object (response from authenticating)
* @param {Object} profile - Profile data to place in new profile
* @return {Promise}
* @private
*/
export const updateProfile = (dispatch, firebase, profileUpdate) => {
const { database, _: { config, authUid } } = firebase
dispatch({
type: actionTypes.PROFILE_UPDATE_START,
payload: profileUpdate
})
const profileRef = database().ref(`${config.userProfile}/${authUid}`)
return profileRef
.update(profileUpdate)
.then(() =>
profileRef
.once('value')
.then((snap) => {
dispatch({
type: actionTypes.PROFILE_UPDATE_SUCCESS,
payload: snap.val()
})
return snap.val()
})
)
.catch((payload) => {
dispatch({
type: actionTypes.PROFILE_UPDATE_ERROR,
payload
})
})
}
/**
* @description Update Auth Object. Internally calls
* `firebase.auth().currentUser.updateProfile` as seen [in the firebase docs](https://firebase.google.com/docs/auth/web/manage-users#update_a_users_profile).
* @param {Function} dispatch - Action dispatch function
* @param {Object} firebase - Internal firebase object
* @param {Object} profileUpdate - Update to be auth object
* @return {Promise}
* @private
*/
export const updateAuth = (dispatch, firebase, authUpdate, updateInProfile) => {
dispatch({
type: actionTypes.AUTH_UPDATE_START,
payload: authUpdate
})
if (!firebase.auth().currentUser) {
const msg = 'User must be logged in to update auth.'
dispatch({
type: actionTypes.AUTH_UPDATE_ERROR,
payload: msg
})
return Promise.reject(msg)
}
return firebase.auth().currentUser
.updateProfile(authUpdate)
.then((payload) => {
dispatch({
type: actionTypes.AUTH_UPDATE_SUCCESS,
payload: firebase.auth().currentUser
})
if (updateInProfile) {
return updateProfile(dispatch, firebase, authUpdate)
}
return payload
})
.catch((payload) => {
dispatch({
type: actionTypes.AUTH_UPDATE_ERROR,
payload
})
})
}
/**
* @description Update user's email. Internally calls
* `firebase.auth().currentUser.updateEmail` as seen [in the firebase docs](https://firebase.google.com/docs/auth/web/manage-users#update_a_users_profile).
* @param {Function} dispatch - Action dispatch function
* @param {Object} firebase - Internal firebase object
* @param {String} newEmail - Update to be auth object
* @return {Promise}
* @private
*/
export const updateEmail = (dispatch, firebase, newEmail, updateInProfile) => {
dispatch({
type: actionTypes.EMAIL_UPDATE_START,
payload: newEmail
})
if (!firebase.auth().currentUser) {
const msg = 'User must be logged in to update email.'
dispatch({
type: actionTypes.EMAIL_UPDATE_ERROR,
payload: msg
})
return Promise.reject(msg)
}
return firebase.auth().currentUser
.updateEmail(newEmail)
.then((payload) => {
dispatch({
type: actionTypes.EMAIL_UPDATE_SUCCESS,
payload: newEmail
})
if (updateInProfile) {
return updateProfile(dispatch, firebase, { email: newEmail })
}
return payload
})
.catch((payload) => {
dispatch({
type: actionTypes.EMAIL_UPDATE_ERROR,
payload
})
})
}
export default {
dispatchLoginError,
dispatchUnauthorizedError,
dispatchLogin,
unWatchUserProfile,
watchUserProfile,
init,
createUserProfile,
login,
logout,
createUser,
resetPassword,
confirmPasswordReset,
verifyPasswordResetCode,
updateAuth,
updateProfile,
updateEmail
>>>>>>>
/**
* @description Update user profile
* @param {Function} dispatch - Action dispatch function
* @param {Object} firebase - Internal firebase object
* @param {Object} userData - User data object (response from authenticating)
* @param {Object} profile - Profile data to place in new profile
* @return {Promise}
* @private
*/
export const updateProfile = (dispatch, firebase, profileUpdate) => {
const { database, _: { config, authUid } } = firebase
dispatch({
type: actionTypes.PROFILE_UPDATE_START,
payload: profileUpdate
})
const profileRef = database().ref(`${config.userProfile}/${authUid}`)
return profileRef
.update(profileUpdate)
.then(() =>
profileRef
.once('value')
.then((snap) => {
dispatch({
type: actionTypes.PROFILE_UPDATE_SUCCESS,
payload: snap.val()
})
return snap
})
)
.catch((payload) => {
dispatch({ type: actionTypes.PROFILE_UPDATE_ERROR, payload })
return Promise.reject(payload)
})
}
/**
* @description Update Auth Object. Internally calls
* `firebase.auth().currentUser.updateProfile` as seen [in the firebase docs](https://firebase.google.com/docs/auth/web/manage-users#update_a_users_profile).
* @param {Function} dispatch - Action dispatch function
* @param {Object} firebase - Internal firebase object
* @param {Object} profileUpdate - Update to be auth object
* @return {Promise}
* @private
*/
export const updateAuth = (dispatch, firebase, authUpdate, updateInProfile) => {
dispatch({ type: actionTypes.AUTH_UPDATE_START, payload: authUpdate })
if (!firebase.auth().currentUser) {
const msg = 'User must be logged in to update auth.'
dispatch({ type: actionTypes.AUTH_UPDATE_ERROR, payload: msg })
return Promise.reject(msg)
}
return firebase.auth().currentUser
.updateProfile(authUpdate)
.then((payload) => {
dispatch({
type: actionTypes.AUTH_UPDATE_SUCCESS,
payload: firebase.auth().currentUser
})
if (updateInProfile) {
return updateProfile(dispatch, firebase, authUpdate)
}
return payload
})
.catch((payload) => {
dispatch({ type: actionTypes.AUTH_UPDATE_ERROR, payload })
return Promise.reject(payload)
})
}
/**
* @description Update user's email. Internally calls
* `firebase.auth().currentUser.updateEmail` as seen [in the firebase docs](https://firebase.google.com/docs/auth/web/manage-users#update_a_users_profile).
* @param {Function} dispatch - Action dispatch function
* @param {Object} firebase - Internal firebase object
* @param {String} newEmail - Update to be auth object
* @return {Promise}
* @private
*/
export const updateEmail = (dispatch, firebase, newEmail, updateInProfile) => {
dispatch({ type: actionTypes.EMAIL_UPDATE_START, payload: newEmail })
if (!firebase.auth().currentUser) {
const msg = 'User must be logged in to update email.'
dispatch({ type: actionTypes.EMAIL_UPDATE_ERROR, payload: msg })
return Promise.reject(msg)
}
return firebase.auth().currentUser
.updateEmail(newEmail)
.then((payload) => {
dispatch({ type: actionTypes.EMAIL_UPDATE_SUCCESS, payload: newEmail })
if (updateInProfile) {
return updateProfile(dispatch, firebase, { email: newEmail })
}
return payload
})
.catch((payload) => {
dispatch({ type: actionTypes.EMAIL_UPDATE_ERROR, payload })
return Promise.reject(payload)
})
}
export default {
dispatchLoginError,
unWatchUserProfile,
watchUserProfile,
init,
createUserProfile,
login,
logout,
createUser,
resetPassword,
confirmPasswordReset,
verifyPasswordResetCode,
updateAuth,
updateProfile,
updateEmail |
<<<<<<<
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,
isEmpty,
pathToJS
} from 'react-redux-firebase'
import { UserIsNotAuthenticated } from 'utils/router'
import { LIST_PATH, LOGIN_PATH } from 'constants'
>>>>>>>
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'
<<<<<<<
// TODO: Uncomment redirect decorator v2.0.0 router util still requires update
// @UserIsNotAuthenticated // redirect to list page if logged in
@firebaseConnect() // add this.props.firebase
@connect(({ firebase: { authError } }) => ({
authError
}))
export default class Signup extends Component {
static contextTypes = {
router: PropTypes.object.isRequired
}
=======
@UserIsNotAuthenticated // redirect to list page if logged in
@firebaseConnect()
@connect(({ firebase }) => ({
authError: pathToJS(firebase, 'authError')
}))
export default class Signup extends Component {
>>>>>>>
// TODO: Uncomment redirect decorator v2.0.0 router util still requires update
// @UserIsNotAuthenticated // redirect to list page if logged in
@firebaseConnect() // add this.props.firebase
@connect(({ firebase: { authError } }) => ({
authError
}))
export default class Signup extends Component {
static contextTypes = {
router: PropTypes.object.isRequired
}
<<<<<<<
const { email, username } = creds
this.setState({ snackCanOpen: true })
// create new user then login (redirect handled by decorator)
return createUser(creds, { email, username })
.then(() => login(creds))
.then(() => {
return this.context.router.push(LIST_PATH) // v2.0.0 router util still requires update
})
=======
createUser(creds, {
email: creds.email,
username: creds.username
}).then(() => {
login(creds)
})
>>>>>>>
const { email, username } = creds
this.setState({ snackCanOpen: true })
// create new user then login (redirect handled by decorator)
return createUser(creds, { email, username }).then(() => {
this.context.router.push(LIST_PATH) // v2.0.0 router util still requires update
}) |
<<<<<<<
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}
floatingLabelText='Email'
validate={[required, validateEmail]}
/>
<Field
name='password'
component={TextField}
floatingLabelText='Password'
type='password'
validate={required}
/>
<div className={classes.submit}>
<RaisedButton
label='Signup'
primary
type='submit'
disabled={pristine || submitting}
=======
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}
floatingLabelText="Email"
validate={[required, validateEmail]}
/>
<Field
name="password"
component={TextField}
floatingLabelText="Password"
type="password"
validate={required}
/>
<div className={classes.submit}>
<RaisedButton
label="Signup"
primary
type="submit"
disabled={pristine || submitting}
>>>>>>>
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}
floatingLabelText="Email"
validate={[required, validateEmail]}
/>
<Field
name="password"
component={TextField}
floatingLabelText="Password"
type="password"
validate={required}
/>
<div className={classes.submit}>
<RaisedButton
label="Signup"
primary
type="submit"
disabled={pristine || submitting}
<<<<<<<
</div>
</form>
=======
</div>
</form>
)
>>>>>>>
</div>
</form>
) |
<<<<<<<
* @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_LISTENER - `@@reactReduxFirebase/SET_LISTENER`
<<<<<<<
* @property {Boolean} enableEmptyAuthChanges - `false` Whether or not to enable
* empty auth changes. When set to true, `onAuthStateChanged` will be fired with,
* empty auth changes such as `undefined` on initialization
* (see [#137](https://github.com/prescottprue/react-redux-firebase/issues/137)).
* Requires `v1.5.0-alpha` or higher.
* @property {Boolean} autoPopulateProfile - `false` REMOVED FROM v2.0.0. Whether or not to
=======
* @property {Boolean} enableEmptyAuthChanges - `false` Whether or not to enable
* empty auth changes. When set to true, `onAuthStateChanged` will be fired with,
* empty auth changes such as `undefined` on initialization
* (see [#137](https://github.com/prescottprue/react-redux-firebase/issues/137)).
* Requires `v1.5.0-alpha` or higher.
* @property {Boolean} autoPopulateProfile - `true` Whether or not to
>>>>>>>
* @property {Boolean} enableEmptyAuthChanges - `false` Whether or not to enable
* empty auth changes. When set to true, `onAuthStateChanged` will be fired with,
* empty auth changes such as `undefined` on initialization
* (see [#137](https://github.com/prescottprue/react-redux-firebase/issues/137)).
* Requires `v1.5.0-alpha` or higher.
* @property {Boolean} autoPopulateProfile - `false` REMOVED FROM v2.0.0. Whether or not to
<<<<<<<
dispatchOnUnsetListener: true,
enableEmptyAuthChanges: false
=======
dispatchOnUnsetListener: false,
enableEmptyAuthChanges: false
>>>>>>>
dispatchOnUnsetListener: true,
enableEmptyAuthChanges: false
<<<<<<<
actionTypes,
defaultConfig
=======
defaultJWTProps,
actionTypes,
defaultConfig,
supportedAuthProviders,
defaultInitProps,
metaParams,
paramSplitChar
>>>>>>>
actionTypes,
defaultConfig |
<<<<<<<
=======
let spy
>>>>>>>
<<<<<<<
on: () => ({ val: () => ({ some: 'obj' }) }),
off: () => Promise.resolve({ val: () => ({ some: 'obj' }) }),
once: () => Promise.resolve({ val: () => ({ some: 'obj' }) })
=======
on: () => Promise.resolve({ val: () => ({ some: 'obj' }) }),
off: () => Promise.resolve({ val: () => ({ some: 'obj' }) }),
once: () => Promise.resolve({ val: () => ({ some: 'obj' }) })
>>>>>>>
on: () => ({ val: () => ({ some: 'obj' }) }),
off: () => Promise.resolve({ val: () => ({ some: 'obj' }) }),
once: () => Promise.resolve({ val: () => ({ some: 'obj' }) })
<<<<<<<
=======
>>>>>>>
<<<<<<<
it('handes dispatch on unset listener config', () => {
Firebase._.config.dispatchOnUnsetListener = true
unsetWatcher(Firebase, dispatch, 'value', '/todos')
expect(Firebase._.watchers['value:/todos']).to.be.undefined
})
=======
it('handes dispatch on unset listener config', () => {
Firebase._.config.dispatchOnUnsetListener = true
unsetWatcher(Firebase, dispatch, 'value', '/todos')
expect(Firebase._.watchers['value:/todos']).to.be.undefined
})
it('warns for deprecated method name', () => {
Firebase._.config.distpatchOnUnsetListener = true
// TODO: confirm that console.warn is called with correct message
unsetWatcher(Firebase, dispatch, 'value', '/todos')
expect(Firebase._.watchers['value:/todos']).to.be.undefined
expect(spy).to.have.been.calledWith('config.distpatchOnUnsetListener is Depreceated and will be removed in future versions. Please use config.dispatchOnUnsetListener (dispatch spelled correctly).')
})
>>>>>>>
it('handes dispatch on unset listener config', () => {
Firebase._.config.dispatchOnUnsetListener = true
unsetWatcher(Firebase, dispatch, 'value', '/todos')
expect(Firebase._.watchers['value:/todos']).to.be.undefined
}) |
<<<<<<<
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 'redux-form'
<<<<<<<
import { required } from 'utils/forms'
=======
>>>>>>>
import { required } from 'utils/forms' |
<<<<<<<
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/issues/187
capabilities: {
"browserName": "chrome" |
<<<<<<<
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.gid]: patchedTask
})
});
=======
case 'TASK_FORM_SET_PARENT_GID': {
const { formId, newParentGid, oldParentGid } = action;
const newParent = state.taskMap[newParentGid];
const oldParent = state.taskMap[oldParentGid];
return Object.assign({}, state, {
taskMap: Object.assign({}, state.taskMap, {
[newParentGid]: Object.assign({}, newParent, {
subtaskform_id: formId
}),
[oldParentGid]: Object.assign({}, oldParent, {
subtaskform_id: null
}),
})
});
}
case 'TASK_FORM_ADD_TO_HIERARCHY': {
const { parentTaskGid, taskFormId } = action;
const parentTask = state.taskMap[parentTaskGid];
return Object.assign({}, state, {
taskMap: Object.assign({}, state.taskMap, {
[parentTaskGid]: Object.assign({}, parentTask, {
subtaskform_id: taskFormId
})
})
});
}
case 'TASK_FORM_REMOVE_FROM_HIERARCHY': {
const { parentTaskGid } = action;
const parentTask = state.taskMap[parentTaskGid];
return Object.assign({}, state, {
taskMap: Object.assign({}, state.taskMap, {
[parentTaskGid]: Object.assign({}, parentTask, {
subtaskform_id: null
})
})
});
}
>>>>>>>
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.gid]: patchedTask
})
});
case 'TASK_FORM_SET_PARENT_GID': {
const { formId, newParentGid, oldParentGid } = action;
const newParent = state.taskMap[newParentGid];
const oldParent = state.taskMap[oldParentGid];
return Object.assign({}, state, {
taskMap: Object.assign({}, state.taskMap, {
[newParentGid]: Object.assign({}, newParent, {
subtaskform_id: formId
}),
[oldParentGid]: Object.assign({}, oldParent, {
subtaskform_id: null
}),
})
});
}
case 'TASK_FORM_ADD_TO_HIERARCHY': {
const { parentTaskGid, taskFormId } = action;
const parentTask = state.taskMap[parentTaskGid];
return Object.assign({}, state, {
taskMap: Object.assign({}, state.taskMap, {
[parentTaskGid]: Object.assign({}, parentTask, {
subtaskform_id: taskFormId
})
})
});
}
case 'TASK_FORM_REMOVE_FROM_HIERARCHY': {
const { parentTaskGid } = action;
const parentTask = state.taskMap[parentTaskGid];
return Object.assign({}, state, {
taskMap: Object.assign({}, state.taskMap, {
[parentTaskGid]: Object.assign({}, parentTask, {
subtaskform_id: null
})
})
});
} |
<<<<<<<
import autoComplete from './autoCompleteReducer';
=======
import showSuccessToast from './showSuccessToastReducer';
>>>>>>>
import autoComplete from './autoCompleteReducer';
import showSuccessToast from './showSuccessToastReducer';
<<<<<<<
createPursuance,
autoComplete
=======
createPursuance,
showSuccessToast
>>>>>>>
createPursuance,
autoComplete,
showSuccessToast |
<<<<<<<
import AssignerSuggestions from '../../TaskManager/TaskForm/Suggestions/AssignerSuggestions';
import AssignerInput from '../../TaskManager/TaskForm/AssignerInput/AssignerInput';
import { filterSuggestion } from '../../../../utils/suggestions';
import { startSuggestions } from '../../../../actions';
=======
import TaskStatus from '../../TaskStatus/TaskStatus';
import {
addTaskFormToHierarchy,
removeTaskFormFromHierarchy
} from '../../../../actions';
>>>>>>>
import AssignerSuggestions from '../../TaskManager/TaskForm/Suggestions/AssignerSuggestions';
import AssignerInput from '../../TaskManager/TaskForm/AssignerInput/AssignerInput';
import TaskStatus from '../../TaskStatus/TaskStatus';
import { filterSuggestion } from '../../../../utils/suggestions';
<<<<<<<
showChildren: true,
showTaskForm: false,
showAssigneeInput: false,
assignedTo: props.taskData.assigned_to_pursuance_id || props.taskData.assigned_to
=======
showChildren: true
>>>>>>>
showChildren: true,
showTaskForm: false,
showAssigneeInput: false,
assignedTo: props.taskData.assigned_to_pursuance_id || props.taskData.assigned_to
<<<<<<<
=======
redirectToDiscuss = () => {
const { history, taskData, match: { params: { pursuanceId } } } = this.props;
history.push({
pathname: `/pursuance/${pursuanceId}/discuss/task/${taskData.gid}`
});
}
>>>>>>>
redirectToDiscuss = () => {
const { history, taskData, match: { params: { pursuanceId } } } = this.props;
history.push({
pathname: `/pursuance/${pursuanceId}/discuss/task/${taskData.gid}`
});
}
<<<<<<<
const { pursuances, autoComplete, taskMap } = this.props;
=======
const { taskMap, taskForm } = this.props;
>>>>>>>
const { pursuances, autoComplete, taskMap, taskForm } = this.props;
<<<<<<<
taskData={taskMap[gid]}
taskMap={taskMap}
pursuances={pursuances}
autoComplete={autoComplete} />;
=======
taskData={taskMap[gid]}
taskMap={taskMap}
taskForm={taskForm} />;
>>>>>>>
taskData={taskMap[gid]}
taskMap={taskMap}
pursuances={pursuances}
autoComplete={autoComplete}
taskForm={taskForm} />;
<<<<<<<
showAssigneeInput = () => {
this.setState({
showAssigneeInput: true
});
}
hideEditAssignee = () => {
this.setState({
showAssigneeInput: false
});
}
onFocus = (e) => {
const { users, pursuances, startSuggestions, currentPursuanceId, taskData } = this.props;
const suggestions = Object.assign({}, pursuances, users);
delete suggestions[currentPursuanceId];
startSuggestions(e.target.value, filterSuggestion, suggestions, taskData.gid);
}
=======
getStatusClassName = (task) => {
const status = task.status || "New";
return ("task-title-status-" + status);
}
showTitle = (task) => {
const statusClassName = this.getStatusClassName(task);
if (task.parent_task_gid) {
return (
<div className={statusClassName}>{task.title}</div>
);
}
// Bold top-level tasks
return (
<div className={statusClassName}>
<strong>{task.title}</strong>
</div>
);
}
getTooltip = (icon) => {
if (icon === 'hands-down') {
return (
<Tooltip id="tooltip-hands-down">
<strong>Create Subtask</strong>
</Tooltip>
);
} else if (icon === 'chat') {
return (
<Tooltip id="tooltip-chat">
<strong>Discuss Task</strong>
</Tooltip>
);
}
}
>>>>>>>
showAssigneeInput = () => {
this.setState({
showAssigneeInput: true
});
}
hideEditAssignee = () => {
this.setState({
showAssigneeInput: false
});
}
onFocus = (e) => {
const { users, pursuances, startSuggestions, currentPursuanceId, taskData } = this.props;
const suggestions = Object.assign({}, pursuances, users);
delete suggestions[currentPursuanceId];
startSuggestions(e.target.value, filterSuggestion, suggestions, taskData.gid);
}
getStatusClassName = (task) => {
const status = task.status || "New";
return ("task-title-status-" + status);
}
showTitle = (task) => {
const statusClassName = this.getStatusClassName(task);
if (task.parent_task_gid) {
return (
<div className={statusClassName}>{task.title}</div>
);
}
// Bold top-level tasks
return (
<div className={statusClassName}>
<strong>{task.title}</strong>
</div>
);
}
getTooltip = (icon) => {
if (icon === 'hands-down') {
return (
<Tooltip id="tooltip-hands-down">
<strong>Create Subtask</strong>
</Tooltip>
);
} else if (icon === 'chat') {
return (
<Tooltip id="tooltip-chat">
<strong>Discuss Task</strong>
</Tooltip>
);
}
}
<<<<<<<
const { pursuances, taskData, autoComplete } = this.props;
=======
const { pursuances, taskData, match: { params: { pursuanceId } } } = this.props;
>>>>>>>
const { pursuances, taskData, autoComplete, currentPursuanceId } = this.props;
const { showChildren, showTaskForm, assignedTo, showAssigneeInput } = this.state;
<<<<<<<
const { showChildren, showTaskForm, assignedTo, showAssigneeInput } = this.state;
let placeholder = assignedTo;
if (Number.isInteger(assignedTo)) {
placeholder = pursuances[assignedTo].suggestionName;
}
=======
const assignedByThisPursuance = assignedPursuanceId === Number(pursuanceId);
let assignedTo = "";
if (assignedPursuanceId && !assignedByThisPursuance && pursuances[assignedPursuanceId]) {
assignedTo = pursuances[assignedPursuanceId].suggestionName;
}
else if (task.assigned_to) {
assignedTo = '@' + task.assigned_to;
}
const { showChildren } = this.state;
>>>>>>>
const assignedByThisPursuance = assignedPursuanceId === currentPursuanceId;
let assignedToName = "";
if (assignedPursuanceId && !assignedByThisPursuance && pursuances[assignedPursuanceId]) {
assignedToName = pursuances[assignedPursuanceId].suggestionName;
}
else if (task.assigned_to) {
assignedToName = '@' + task.assigned_to;
}
const placeholder = assignedToName;
<<<<<<<
{
showAssigneeInput &&
<div className="assign-autocomplete-ctn">
{
autoComplete.suggestions
&&
task.gid === autoComplete.suggestionForm
&&
<AssignerSuggestions
suggestionForm={task.gid}
editMode={true}
hideEditAssignee={this.hideEditAssignee}
/>
}
<AssignerInput
formId={task.gid}
editMode={true}
hideEditAssignee={this.hideEditAssignee}
placeholder={placeholder}
/>
</div>
||
(assignedPursuanceId && pursuances[assignedPursuanceId].suggestionName)
&&
<button onClick={this.showAssigneeInput} className="assignee-button">{pursuances[assignedPursuanceId].suggestionName}</button>
||
(task.assigned_to && '@' + task.assigned_to)
&&
<button onClick={this.showAssigneeInput} className="assignee-button">{'@' + task.assigned_to}</button>
||
<button className="edit-assignee-button" onClick={this.showAssigneeInput}>Assign</button>
}
=======
<span>
{assignedTo}
</span>
>>>>>>>
{
showAssigneeInput &&
<div className="assign-autocomplete-ctn">
{
autoComplete.suggestions
&&
task.gid === autoComplete.suggestionForm
&&
<AssignerSuggestions
suggestionForm={task.gid}
editMode={true}
hideEditAssignee={this.hideEditAssignee}
/>
}
<AssignerInput
formId={task.gid}
editMode={true}
hideEditAssignee={this.hideEditAssignee}
placeholder={placeholder}
/>
</div>
||
(assignedPursuanceId && pursuances[assignedPursuanceId].suggestionName)
&&
<button onClick={this.showAssigneeInput} className="assignee-button">{pursuances[assignedPursuanceId].suggestionName}</button>
||
(task.assigned_to && '@' + task.assigned_to)
&&
<button onClick={this.showAssigneeInput} className="assignee-button">{'@' + task.assigned_to}</button>
||
<button className="edit-assignee-button" onClick={this.showAssigneeInput}>Assign</button>
}
<<<<<<<
export default withRouter(connect(({ pursuances, users, currentPursuanceId, autoComplete }) =>
({ pursuances, users, currentPursuanceId, autoComplete }), {
startSuggestions
})(Task));
=======
const Task = withRouter(connect(
({ pursuances }) => ({ pursuances }), {
addTaskFormToHierarchy,
removeTaskFormFromHierarchy
})(RawTask));
// Why RawTask _and_ Task? Because Task.mapSubTasks() recursively
// renders Task components which weren't wrapped in a Redux connect()
// call (until calling the original component 'RawTask' and the
// wrapped component 'Task'), and thus `this.props` wasn't being
// populated by Redux within mapSubTasks(). More info:
// https://stackoverflow.com/a/37081592/197160
export default Task;
>>>>>>>
const Task = withRouter(connect(
({ pursuances, users, currentPursuanceId, autoComplete }) =>
({ pursuances, users, currentPursuanceId, autoComplete }), {
addTaskFormToHierarchy,
removeTaskFormFromHierarchy,
startSuggestions
})(RawTask));
// Why RawTask _and_ Task? Because Task.mapSubTasks() recursively
// renders Task components which weren't wrapped in a Redux connect()
// call (until calling the original component 'RawTask' and the
// wrapped component 'Task'), and thus `this.props` wasn't being
// populated by Redux within mapSubTasks(). More info:
// https://stackoverflow.com/a/37081592/197160
export default Task; |
<<<<<<<
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);
=======
emitter.emit('ready');
>>>>>>>
debug('context ready, current locale is ', self.getLocale());
emitter.emit('ready'); |
<<<<<<<
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 = L20n.FTLEntriesParser.parse(null, ftlCode);
cumulative.ftlEntriesParseEnd = process.hrtime(start);
var entries = L20n.createEntriesFromAST(ast);
<<<<<<<
ftlEntriesParse: micro(cumulative.ftlEntriesParseEnd) - micro(cumulative.ftlEntriesParseStart),
//format: micro(cumulative.formatEnd) - micro(cumulative.format),
//getEntity: micro(cumulative.getEntityEnd) - micro(cumulative.getEntity)
=======
format: micro(cumulative.formatEnd) - micro(cumulative.format),
>>>>>>>
ftlEntriesParse: micro(cumulative.ftlEntriesParseEnd) - micro(cumulative.ftlEntriesParseStart),
format: micro(cumulative.formatEnd) - micro(cumulative.format), |
<<<<<<<
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 FTLEntriesParser } from '../../lib/format/ftl/entries/parser';
<<<<<<<
export default {
=======
this.L20n = {
createEntriesFromAST,
>>>>>>>
export default {
createEntriesFromAST,
<<<<<<<
FTLParser,
FTLEntriesParser,
=======
FTLASTParser,
>>>>>>>
FTLASTParser,
FTLEntriesParser, |
<<<<<<<
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
: require('../../../lib/l20n/env').Env;
var path = path.bind(null, __dirname);
=======
var assert = require('assert');
var Context = process.env.L20N_COV ?
require('../../../build/cov/lib/l20n/context').Context
: require('../../../lib/l20n/context').Context;
var path = __dirname;
>>>>>>>
var assert = require('assert');
var Env = process.env.L20N_COV ?
require('../../../build/cov/lib/l20n/env').Env
: require('../../../lib/l20n/env').Env;
path = path.bind(null, __dirname); |
<<<<<<<
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.messageContainer.getElementsByTagName("p")[0].textContent = message;
};
HTMLActuator.prototype.clearMessage = function () {
this.messageContainer.classList.remove("game-won", "game-over");
>>>>>>>
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.messageContainer.getElementsByTagName("p")[0].textContent = message;
};
HTMLActuator.prototype.clearMessage = function () {
this.messageContainer.classList.remove("game-won", "game-over"); |
<<<<<<<
=======
// 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( "|" ) + ")$" );
var allExtensionRegexp = new RegExp( "^.*\\.(" + audioExtensions.join( "|" ) + "|" + videoExtensions.join( "|" ) + ")$" );
>>>>>>>
// 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( "|" ) + ")$" );
var allExtensionRegexp = new RegExp( "^.*\\.(" + audioExtensions.join( "|" ) + "|" + videoExtensions.join( "|" ) + ")$" );
<<<<<<<
node = Popcorn.dom.find( target );
if ( !node ) {
Popcorn.error( "Specified target " + target + " was not found." );
return;
}
=======
sourceNode,
targetType,
firstSrc,
node = nodeId && nodeId.length && nodeId[ 2 ] ?
document.getElementById( nodeId[ 2 ] ) :
target;
>>>>>>>
sourceNode,
targetType,
firstSrc,
node = Popcorn.dom.find( target );
if ( !node ) {
Popcorn.error( "Specified target " + target + " was not found." );
return;
} |
<<<<<<<
=======
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'}
}
>>>>>>>
// {
// 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';
<<<<<<<
=======
loggedInUser: state.loggedInUser,
targetUsersForUpload: state.targetUsersForUpload,
>>>>>>> |
<<<<<<<
postrecords = buildSuspendRecords(data, postrecords);
postrecords = buildResumeRecords(data, postrecords);
=======
postrecords = buildAlarmRecords(data, postrecords);
>>>>>>>
postrecords = buildSuspendRecords(data, postrecords);
postrecords = buildResumeRecords(data, postrecords);
postrecords = buildAlarmRecords(data, postrecords);
<<<<<<<
else if (datum.subType === 'status') {
if(datum.status === 'suspended') {
simulator.suspend(datum);
}
else if (datum.status === 'resumed') {
simulator.resume(datum);
}
}
=======
else if (datum.subType === 'alarm'){
simulator.alarm(datum);
}
>>>>>>>
else if (datum.subType === 'status') {
if(datum.status === 'suspended') {
simulator.suspend(datum);
}
else if (datum.status === 'resumed') {
simulator.resume(datum);
}
}
else if (datum.subType === 'alarm'){
simulator.alarm(datum);
} |
<<<<<<<
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,
medtronicSerialNumberValue: serial_number.value
});
}
else if (serial_number.value.length < 6) {
this.setState({
medtronicSerialNumberValue: serial_number.value,
medtronicFormIncomplete: true
});
}
}
else {
this.setState({
medtronicSerialNumberValue: '',
medtronicFormIncomplete: true
});
}
}
=======
getDebugLinks(data) {
let post_link = null;
if(Array.isArray(data) || Array.isArray(data.post_records)) {
let filename = 'uploader-processed-records.json';
let jsonData = null;
if (Array.isArray(data)) {
jsonData = JSON.stringify(data, undefined, 4);
} else {
jsonData = JSON.stringify(data.post_records, undefined, 4);
}
let blob = new Blob([jsonData], {type: 'text/json'});
let dataHref = URL.createObjectURL(blob);
post_link = (
<a href={dataHref}
className={styles.dataDownloadLink}
download={filename}
data-downloadurl={['text/json', filename, dataHref].join(':')}>
POST data
</a>
);
}
let binary_link = null;
if(Array.isArray(data.pages)) {
let filenameBinary = 'binary-blob.json';
let blob = { settings:data.settings, pages:data.pages };
let jsonDataBinary = JSON.stringify(blob, undefined, 4);
let blobBinary = new Blob([jsonDataBinary], {type: 'text/json'});
let dataHrefBinary = URL.createObjectURL(blobBinary);
binary_link = (
<a href={dataHrefBinary}
className={styles.dataDownloadLink}
download={filenameBinary}
data-downloadurl={['text/json', filenameBinary, dataHrefBinary].join(':')}>
Binary blob
</a>
);
}
if(post_link || binary_link) {
return (
<div>
{post_link} {binary_link}
</div>
);
}
return null;
}
>>>>>>>
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,
medtronicSerialNumberValue: serial_number.value
});
}
else if (serial_number.value.length < 6) {
this.setState({
medtronicSerialNumberValue: serial_number.value,
medtronicFormIncomplete: true
});
}
}
else {
this.setState({
medtronicSerialNumberValue: '',
medtronicFormIncomplete: true
});
}
}
getDebugLinks(data) {
let post_link = null;
if(Array.isArray(data) || Array.isArray(data.post_records)) {
let filename = 'uploader-processed-records.json';
let jsonData = null;
if (Array.isArray(data)) {
jsonData = JSON.stringify(data, undefined, 4);
} else {
jsonData = JSON.stringify(data.post_records, undefined, 4);
}
let blob = new Blob([jsonData], {type: 'text/json'});
let dataHref = URL.createObjectURL(blob);
post_link = (
<a href={dataHref}
className={styles.dataDownloadLink}
download={filename}
data-downloadurl={['text/json', filename, dataHref].join(':')}>
POST data
</a>
);
}
let binary_link = null;
if(Array.isArray(data.pages)) {
let filenameBinary = 'binary-blob.json';
let blob = { settings:data.settings, pages:data.pages };
let jsonDataBinary = JSON.stringify(blob, undefined, 4);
let blobBinary = new Blob([jsonDataBinary], {type: 'text/json'});
let dataHrefBinary = URL.createObjectURL(blobBinary);
binary_link = (
<a href={dataHrefBinary}
className={styles.dataDownloadLink}
download={filenameBinary}
data-downloadurl={['text/json', filenameBinary, dataHrefBinary].join(':')}>
Binary blob
</a>
);
}
if(post_link || binary_link) {
return (
<div>
{post_link} {binary_link}
</div>
);
}
return null;
} |
<<<<<<<
/*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('tzoffset = ', TZOFFSET);
console.log(new Date(BASE_DATE_DEVICE));
console.log(new Date(BASE_DATE_UTC));
*/
=======
>>>>>>>
<<<<<<<
readings[index].displayTime = sundial.formatDeviceTime(moment.unix(reading.timestamp).toISOString());
readings[index].displayUtc = sundial.applyTimezone(readings[index].displayTime, cfg.timezone).toISOString();
readings[index].displayOffset = sundial.getOffsetFromZone(readings[index].displayUtc, cfg.timezone);
=======
readings[index].displayTime = moment.unix(reading.timestamp).toISOString().slice(0, -5);
readings[index].displayUtc = sundial.applyTimezone(readings[index].displayTime, cfg.timezone).toISOString();
readings[index].displayOffset = sundial.getOffsetFromZone(readings[index].displayUtc, cfg.timezone);
>>>>>>>
readings[index].displayTime = sundial.formatDeviceTime(moment.unix(reading.timestamp).toISOString());
readings[index].displayUtc = sundial.applyTimezone(readings[index].displayTime, cfg.timezone).toISOString();
readings[index].displayOffset = sundial.getOffsetFromZone(readings[index].displayUtc, cfg.timezone);
<<<<<<<
var sessionInfo = {
deviceTags: ['bgm'],
deviceManufacturers: ['LifeScan'],
deviceModel: 'OneTouch UltraMini',
deviceSerialNumber: data.serialNumber,
deviceId: data.id,
start: sundial.utcDateString(),
tzName : cfg.timezone,
version: cfg.version
};
cfg.api.upload.toPlatform(data.post_records, sessionInfo, progress, cfg.groupId, function (err, result) {
=======
var sessionInfo = {
deviceTags: ['bgm'],
deviceManufacturers: ['LifeScan'],
deviceModel: 'OneTouchultraMini',
deviceSerialNumber: data.serialNumber,
deviceId: data.id,
start: sundial.utcDateString(),
tzName : cfg.timezone,
version: cfg.version
};
cfg.api.upload.toPlatform(data.post_records, sessionInfo, progress, cfg.groupId, function (err, result) {
>>>>>>>
var sessionInfo = {
deviceTags: ['bgm'],
deviceManufacturers: ['LifeScan'],
deviceModel: 'OneTouch UltraMini',
deviceSerialNumber: data.serialNumber,
deviceId: data.id,
start: sundial.utcDateString(),
tzName : cfg.timezone,
version: cfg.version
};
cfg.api.upload.toPlatform(data.post_records, sessionInfo, progress, cfg.groupId, function (err, result) { |
<<<<<<<
name: 'Abbott FreeStyle Lite',
key: 'abbottfreestylelite',
source: {type: 'device', driverId: 'AbbottFreeStyleLite'}
},
{
name: 'Abbott FreeStyle Freedom Lite',
key: 'abbottfreestylefreedomlite',
source: {type: 'device', driverId: 'AbbottFreeStyleFreedomLite'}
},
{
=======
name: 'Bayer Contour',
key: 'bayercontour',
source: {type: 'device', driverId: 'BayerContour'}
},
{
>>>>>>>
name: 'Abbott FreeStyle Lite',
key: 'abbottfreestylelite',
source: {type: 'device', driverId: 'AbbottFreeStyleLite'}
},
{
name: 'Abbott FreeStyle Freedom Lite',
key: 'abbottfreestylefreedomlite',
source: {type: 'device', driverId: 'AbbottFreeStyleFreedomLite'}
},
{
name: 'Bayer Contour',
key: 'bayercontour',
source: {type: 'device', driverId: 'BayerContour'}
},
{ |
<<<<<<<
// 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);
});
=======
data.deviceInfo.deviceId = 'tandem' + data.model_no + data.pump_sn;
cfg.builder.setDefaults({ deviceId: data.deviceInfo.deviceId });
cb(null, data);
>>>>>>>
data.deviceInfo.deviceId = 'tandem' + data.model_no + data.pump_sn;
cfg.builder.setDefaults({ deviceId: data.deviceInfo.deviceId });
// 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[payload.theData[i][RAW_UPLOAD_ID]] != null) {
uploads[payload.theData[i][RAW_UPLOAD_ID]].end = payload.theData[i].deviceTime;
>>>>>>>
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;
<<<<<<<
uploadIdsInOrder.push(payload.theData[i]['Raw-Upload ID']);
uploads[payload.theData[i]['Raw-Upload ID']] = {
start: payload.theData[i].index,
device: payload.theData[i]['Raw-Device Type']
=======
uploadIdsInOrder.push(payload.theData[i][RAW_UPLOAD_ID]);
uploads[payload.theData[i][RAW_UPLOAD_ID]] = {
start: payload.theData[i].deviceTime,
device: payload.theData[i][RAW_DEVICE_TYPE]
>>>>>>>
uploadIdsInOrder.push(payload.theData[i][RAW_UPLOAD_ID]);
uploads[payload.theData[i][RAW_UPLOAD_ID]] = {
start: payload.theData[i].index,
device: payload.theData[i][RAW_DEVICE_TYPE] |
<<<<<<<
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 ', deviceInfo);
connection = new hid.HID(deviceInfo.vendorId, deviceInfo.productId);
if (connection) {
// Set up data listener
connection.on('data', function(rawdata) {
portListener(rawdata);
});
// Set up error listener
connection.on('error', function(error) {
debug('Error:', error);
cb(error);
});
cb();
} else {
cb(new Error('Unable to connect to device'));
}
}
function removeListeners() {
connection.removeAllListeners('data');
connection.removeAllListeners('error');
>>>>>>>
}
function removeListeners() {
connection.removeAllListeners('error');
<<<<<<<
connection.read(function(err, data) {
if(err) {
debug('Error:', err);
}
cb(data);
});
=======
if(rawdata) {
cb(rawdata);
rawdata = null;
} else {
return cb(null);
}
>>>>>>>
connection.read(function(err, data) {
if(err) {
debug('Error:', err);
}
cb(data);
});
<<<<<<<
=======
removeListeners: removeListeners,
discardBytes: discardBytes,
>>>>>>>
removeListeners: removeListeners, |
<<<<<<<
var abbottFreeStyle = require('../drivers/abbottFreeStyle');
var tandemTslimDriver = require('../drivers/tandemTslimDriver');
=======
var abbottPrecisionXtra = require('../drivers/abbottPrecisionXtra');
>>>>>>>
var abbottPrecisionXtra = require('../drivers/abbottPrecisionXtra');
var tandemTslimDriver = require('../drivers/tandemTslimDriver');
<<<<<<<
'AbbottFreeStyle': serialDevice,
'TandemTslim': serialDevice,
=======
'AbbottPrecisionXtra': serialDevice,
>>>>>>>
'AbbottPrecisionXtra': serialDevice, |
<<<<<<<
{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 {{timezone}}? Double-check',{ timezone: timezone })}<br/>
{i18n.t('selected time zone and current device time.')}
{reminder}
<<<<<<<
{i18n.t('Did you remember to tap Export on the PDM before clicking Upload?')}
=======
Remember to tap "Export" on the PDM before clicking "Upload".
>>>>>>>
{i18n.t('Remember to tap "Export" on the PDM before clicking "Upload".')} |
<<<<<<<
'BayerContourNext': bayerContourNext,
'BayerContourNextLink': bayerContourNext
=======
'BayerContourNext': bayerContourNext,
'BayerContourNextUsb': bayerContourNext
>>>>>>>
'BayerContourNext': bayerContourNext,
'BayerContourNextLink': bayerContourNext,
'BayerContourNextUsb': bayerContourNext
<<<<<<<
'BayerContourNext': hidDevice,
'BayerContourNextLink': hidDevice
=======
'BayerContourNext': hidDevice,
'BayerContourNextUsb': hidDevice
>>>>>>>
'BayerContourNext': hidDevice,
'BayerContourNextLink': hidDevice,
'BayerContourNextUsb': hidDevice |
<<<<<<<
'OneTouchVerioIQ': oneTouchVerioIQ,
'BayerContourNext': bayerContourNext
=======
'BayerContourNext': bayerContourNext,
'BayerContourNextUsb': bayerContourNext,
'BayerContourUsb': bayerContourNext
>>>>>>>
'OneTouchVerioIQ': oneTouchVerioIQ,
'BayerContourNext': bayerContourNext,
'BayerContourNextUsb': bayerContourNext,
'BayerContourUsb': bayerContourNext
<<<<<<<
'OneTouchVerioIQ': serialDevice,
'BayerContourNext': hidDevice
=======
'BayerContourNext': hidDevice,
'BayerContourNextUsb': hidDevice,
'BayerContourUsb': hidDevice
>>>>>>>
'OneTouchVerioIQ': serialDevice,
'BayerContourNext': hidDevice,
'BayerContourNextUsb': hidDevice,
'BayerContourUsb': hidDevice |
<<<<<<<
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: 'Bayer Contour Next',
key: 'bayercontournext',
source: {type: 'device', driverId: 'BayerContourNext'}
},
{
name: 'Bayer Contour Next USB',
key: 'bayercontournextusb',
source: {type: 'device', driverId: 'BayerContourNextUsb'}
},
{
name: 'Bayer Contour USB',
key: 'bayercontourusb',
source: {type: 'device', driverId: 'BayerContourUsb'}
}
>>>>>>>
{
name: 'Abbott FreeStyle Lite',
key: 'abbottfreestylelite',
source: {type: 'device', driverId: 'AbbottFreeStyleLite'}
},
{
name: 'Bayer Contour Next',
key: 'bayercontournext',
source: {type: 'device', driverId: 'BayerContourNext'}
},
{
name: 'Bayer Contour Next USB',
key: 'bayercontournextusb',
source: {type: 'device', driverId: 'BayerContourNextUsb'}
},
{
name: 'Bayer Contour USB',
key: 'bayercontourusb',
source: {type: 'device', driverId: 'BayerContourUsb'}
} |
<<<<<<<
var medtronic600Driver = require('../drivers/medtronic600/medtronic600Driver');
=======
var TrueMetrixDriver = require('../drivers/trividia/trueMetrix');
>>>>>>>
var medtronic600Driver = require('../drivers/medtronic600/medtronic600Driver');
var TrueMetrixDriver = require('../drivers/trividia/trueMetrix');
<<<<<<<
'Medtronic': medtronicDriver,
'Medtronic600': medtronic600Driver
=======
'Medtronic': medtronicDriver,
'TrueMetrix': TrueMetrixDriver,
>>>>>>>
'Medtronic': medtronicDriver,
'Medtronic600': medtronic600Driver,
'TrueMetrix': TrueMetrixDriver,
<<<<<<<
'Medtronic': hidDevice,
'Medtronic600': hidDevice
=======
'Medtronic': hidDevice,
'TrueMetrix': hidDevice,
>>>>>>>
'Medtronic': hidDevice,
'Medtronic600': hidDevice,
'TrueMetrix': hidDevice, |
<<<<<<<
'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 glucose meter')
>>>>>>>
'BayerContourUsb': infoBuilder('Bayer Contour USB', 'Blood glucose meter'),
'BayerContourNextLink': infoBuilder('Bayer Contour Next LINK', 'Blood glucose meter'),
'AnimasPing': infoBuilder('Animas OneTouch Ping', 'Insulin pump') |
<<<<<<<
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.aapPackets, data.deviceInfo.dbRecordNumber);
>>>>>>>
data.deviceInfo.deviceId = data.deviceInfo.driverId + '-' + data.deviceInfo.serialNumber;
cfg.builder.setDefaults({ deviceId: data.deviceInfo.deviceId});
data.post_records = dataParser.processAapPackets(data.aapPackets, data.deviceInfo.dbRecordNumber); |
<<<<<<<
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)
returningEarly = true;
}
} else {
datum.empty = false;
}
=======
datum.empty = checkEmpty(payload);
>>>>>>>
datum.empty = checkEmpty(payload);
if(datum.empty && request.recordType.value === RECORD_TYPES.CGM_GLUCOSE.value) {
//only allowed to return early with CGM glucose readings (as it's last)
returningEarly = true;
}
<<<<<<<
// are used to build the wizard records. Linked BG records also
// need to occur before manual BG events (in wizard records)
if (modelNumber === 'IR1285') {
postrecords = buildBGRecords(data, postrecords);
}
else {
postrecords = buildCBGRecords(data, postrecords);
}
=======
// are used to build the wizard records.
postrecords = buildBGRecords(data, postrecords);
>>>>>>>
// are used to build the wizard records.
if (modelNumber === 'IR1285') {
postrecords = buildBGRecords(data, postrecords);
}
else {
postrecords = buildCBGRecords(data, postrecords);
} |
<<<<<<<
},
{
name: 'Bayer Contour Next LINK',
key: 'bayercontournextlink',
source: {type: 'device', driverId: 'BayerContourNextLink'}
=======
},
{
name: 'Bayer Contour Next USB',
key: 'bayercontournextusb',
source: {type: 'device', driverId: 'BayerContourNextUsb'}
>>>>>>>
},
{
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,
>>>>>>>
makeDeviceMetaAlarm: makeDeviceMetaAlarm,
<<<<<<<
makeDeviceMetaCalibration: makeDeviceMetaCalibration,
makeDeviceMetaReservoirChange: makeDeviceMetaReservoirChange,
makeDeviceMetaTimeChange: makeDeviceMetaTimeChange,
=======
>>>>>>>
makeDeviceMetaCalibration: makeDeviceMetaCalibration,
makeDeviceMetaReservoirChange: makeDeviceMetaReservoirChange,
makeDeviceMetaTimeChange: makeDeviceMetaTimeChange, |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.