conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
this.onUpdate();
=======
this.initialized = true;
this.triggerOnUpdate();
>>>>>>>
this.initialized = true;
this.onUpdate();
<<<<<<<
this.onUpdate();
=======
this.initialized = true;
this.triggerOnUpdate();
>>>>>>>
this.initialized = true;
this.onUpdate(); |
<<<<<<<
// Empty the selector of any existing content
d3.select(selector).html("");
// If state was passed as a fourth argument then merge it with layout (for backward compatibility)
if (typeof state != "undefined"){
var stateful_layout = { state: state };
var base_layout = layout || {};
layout = LocusZoom.mergeLayouts(stateful_layout, base_layout);
}
=======
// Empty the selector of any existing content
d3.select(selector).html("");
>>>>>>>
// Empty the selector of any existing content
d3.select(selector).html("");
// If state was passed as a fourth argument then merge it with layout (for backward compatibility)
if (typeof state != "undefined"){
var stateful_layout = { state: state };
var base_layout = layout || {};
layout = LocusZoom.mergeLayouts(stateful_layout, base_layout);
}
<<<<<<<
instance = new LocusZoom.Instance(this.node().id, datasource, layout);
// Detect data-region and fill in state values if present
if (typeof this.node().dataset !== "undefined" && typeof this.node().dataset.region !== "undefined"){
var parsed_state = LocusZoom.parsePositionQuery(this.node().dataset.region);
Object.keys(parsed_state).forEach(function(key){
instance.state[key] = parsed_state[key];
});
}
=======
instance = new LocusZoom.Instance(this.node().id, datasource, layout);
>>>>>>>
instance = new LocusZoom.Instance(this.node().id, datasource, layout);
// Detect data-region and fill in state values if present
if (typeof this.node().dataset !== "undefined" && typeof this.node().dataset.region !== "undefined"){
var parsed_state = LocusZoom.parsePositionQuery(this.node().dataset.region);
Object.keys(parsed_state).forEach(function(key){
instance.state[key] = parsed_state[key];
});
}
<<<<<<<
=======
// Detect data-region and fill in state values if present
if (typeof this.node().dataset !== "undefined" && typeof this.node().dataset.region !== "undefined"){
instance.layout.state = LocusZoom.mergeLayouts(LocusZoom.parsePositionQuery(this.node().dataset.region), instance.layout.state);
}
>>>>>>>
<<<<<<<
state: {},
width: 1,
height: 1,
min_width: 1,
min_height: 1,
resizable: false,
aspect_ratio: 1,
panels: {}
};
// Standard Layout
LocusZoom.StandardLayout = {
state: {},
=======
state: {},
width: 1,
height: 1,
min_width: 1,
min_height: 1,
resizable: false,
aspect_ratio: 1,
panels: {}
};
// Standard Layout
LocusZoom.StandardLayout = {
state: {
chr: 0,
start: 0,
end: 0
},
>>>>>>>
state: {},
width: 1,
height: 1,
min_width: 1,
min_height: 1,
resizable: false,
aspect_ratio: 1,
panels: {}
};
// Standard Layout
LocusZoom.StandardLayout = {
state: {},
<<<<<<<
// If no layout was passed, use the Standard Layout
// Otherwise merge whatever was passed with the Default Layout
if (typeof layout == "undefined"){
this.layout = LocusZoom.mergeLayouts(LocusZoom.StandardLayout, LocusZoom.DefaultLayout);
} else {
this.layout = LocusZoom.mergeLayouts(layout, LocusZoom.DefaultLayout);
}
// Create a shortcut to the state in the layout on the instance
this.state = this.layout.state;
=======
// If no layout was passed, use the Standard Layout
// Otherwise merge whatever was passed with the Default Layout
if (typeof layout == "undefined"){
this.layout = LocusZoom.mergeLayouts(LocusZoom.StandardLayout, LocusZoom.DefaultLayout);
} else {
this.layout = LocusZoom.mergeLayouts(layout, LocusZoom.DefaultLayout);
}
>>>>>>>
// If no layout was passed, use the Standard Layout
// Otherwise merge whatever was passed with the Default Layout
if (typeof layout == "undefined"){
this.layout = LocusZoom.mergeLayouts(LocusZoom.StandardLayout, LocusZoom.DefaultLayout);
} else {
this.layout = LocusZoom.mergeLayouts(layout, LocusZoom.DefaultLayout);
}
// Create a shortcut to the state in the layout on the instance
this.state = this.layout.state;
<<<<<<<
var panel = new LocusZoom.Panel(id, layout, this);
=======
var panel = new LocusZoom.Panel(id, layout, state);
panel.parent = this;
>>>>>>>
var panel = new LocusZoom.Panel(id, layout, this);
<<<<<<<
// Define state parameters specific to this panel
if (this.parent){
this.state = this.parent.state;
this.state_id = this.id;
this.state[this.state_id] = this.state[this.state_id] || {};
} else {
this.state = null;
this.state_id = null;
}
=======
>>>>>>>
// Define state parameters specific to this panel
if (this.parent){
this.state = this.parent.state;
this.state_id = this.id;
this.state[this.state_id] = this.state[this.state_id] || {};
} else {
this.state = null;
this.state_id = null;
}
<<<<<<<
// Create the Data Layer
var data_layer = LocusZoom.DataLayers.get(layout.type, id, layout, this);
=======
// Create the Data Layer and set its parent
var data_layer = LocusZoom.DataLayers.get(layout.type, id, layout);
data_layer.parent = this;
>>>>>>>
// Create the Data Layer
var data_layer = LocusZoom.DataLayers.get(layout.type, id, layout, this);
<<<<<<<
return d3.extent([this.state.start, this.state.end]);
=======
return d3.extent([this.parent.layout.state.start, this.parent.layout.state.end]);
>>>>>>>
return d3.extent([this.state.start, this.state.end]);
<<<<<<<
LocusZoom.DataLayer = function(id, layout, parent) {
=======
LocusZoom.DataLayer = function(id, layout) {
>>>>>>>
LocusZoom.DataLayer = function(id, layout, parent) {
<<<<<<<
// Define state parameters specific to this data layer
if (this.parent){
this.state = this.parent.state;
this.state_id = this.parent.id + "." + this.id;
this.state[this.state_id] = this.state[this.state_id] || {};
if (this.layout.selectable){
this.state[this.state_id].selected = this.state[this.state_id].selected || null;
}
} else {
this.state = null;
this.state_id = null;
}
=======
>>>>>>>
// Define state parameters specific to this data layer
if (this.parent){
this.state = this.parent.state;
this.state_id = this.parent.id + "." + this.id;
this.state[this.state_id] = this.state[this.state_id] || {};
if (this.layout.selectable){
this.state[this.state_id].selected = this.state[this.state_id].selected || null;
}
} else {
this.state = null;
this.state_id = null;
}
<<<<<<<
var promise = this.parent.parent.lzd.getData(this.state, this.layout.fields); //,"ld:best"
=======
var promise = this.parent.parent.lzd.getData(this.parent.parent.layout.state, this.layout.fields); //,"ld:best"
>>>>>>>
var promise = this.parent.parent.lzd.getData(this.state, this.layout.fields); //,"ld:best"
<<<<<<<
obj.get = function(name, id, layout, parent) {
=======
obj.get = function(name, id, layout) {
>>>>>>>
obj.get = function(name, id, layout, parent) {
<<<<<<<
return new datalayers[name](id, layout, parent);
=======
return new datalayers[name](id, layout);
>>>>>>>
return new datalayers[name](id, layout, parent);
<<<<<<<
LocusZoom.DataLayers.add("scatter", function(id, layout, parent){
// Define a default layout for this DataLayer type and merge it with the passed argument
=======
LocusZoom.DataLayers.add("scatter", function(id, layout){
LocusZoom.DataLayer.apply(this, arguments);
>>>>>>>
LocusZoom.DataLayers.add("scatter", function(id, layout, parent){
// Define a default layout for this DataLayer type and merge it with the passed argument
<<<<<<<
// Apply the arguments to set LocusZoom.DataLayer as the prototype
LocusZoom.DataLayer.apply(this, arguments);
=======
this.layout = LocusZoom.mergeLayouts(layout, this.DefaultLayout);
>>>>>>>
// Apply the arguments to set LocusZoom.DataLayer as the prototype
LocusZoom.DataLayer.apply(this, arguments);
<<<<<<<
if (this.state[this.state_id].selected != id){
=======
if (this.layout.state.selected_id != id){
>>>>>>>
if (this.state[this.state_id].selected != id){
<<<<<<<
if (this.state[this.state_id].selected != id){
=======
if (this.layout.state.selected_id != id){
>>>>>>>
if (this.state[this.state_id].selected != id){
<<<<<<<
if (this.state[this.state_id].selected == id){
this.state[this.state_id].selected = null;
=======
if (this.layout.state.selected_id == id){
this.layout.state.selected_id = null;
>>>>>>>
if (this.state[this.state_id].selected == id){
this.state[this.state_id].selected = null;
<<<<<<<
console.log(this.state[this.state_id]);
if (this.state[this.state_id].selected != null){
var selected_id = this.state[this.state_id].selected;
this.state[this.state_id].selected = null;
var d = d3.select("#" + selected_id).datum();
d3.select("#" + selected_id).on("mouseover")(d);
d3.select("#" + selected_id).on("click")(d);
=======
if (this.layout.state.selected_id != null){
var selected_id = this.layout.state.selected_id;
this.layout.state.selected_id = null;
var d = d3.select("#" + selected_id).datum();
d3.select("#" + selected_id).on("mouseover")(d);
d3.select("#" + selected_id).on("click")(d);
>>>>>>>
if (this.state[this.state_id].selected != null){
var selected_id = this.state[this.state_id].selected;
this.state[this.state_id].selected = null;
var d = d3.select("#" + selected_id).datum();
d3.select("#" + selected_id).on("mouseover")(d);
d3.select("#" + selected_id).on("click")(d);
<<<<<<<
LocusZoom.DataLayers.add("genes", function(id, layout, parent){
// Define a default layout for this DataLayer type and merge it with the passed argument
=======
LocusZoom.DataLayers.add("genes", function(id, layout){
LocusZoom.DataLayer.apply(this, arguments);
>>>>>>>
LocusZoom.DataLayers.add("genes", function(id, layout, parent){
// Define a default layout for this DataLayer type and merge it with the passed argument
<<<<<<<
// Apply the arguments to set LocusZoom.DataLayer as the prototype
LocusZoom.DataLayer.apply(this, arguments);
=======
this.layout = LocusZoom.mergeLayouts(layout, this.DefaultLayout);
>>>>>>>
// Apply the arguments to set LocusZoom.DataLayer as the prototype
LocusZoom.DataLayer.apply(this, arguments);
<<<<<<<
if (this.state[this.state_id].selected != id){
=======
if (this.layout.state.selected_id != id){
>>>>>>>
if (this.state[this.state_id].selected != id){
<<<<<<<
if (this.state[this.state_id].selected != id){
=======
if (this.layout.state.selected_id != id){
>>>>>>>
if (this.state[this.state_id].selected != id){
<<<<<<<
if (this.state[this.state_id].selected == id){
this.state[this.state_id].selected = null;
=======
if (this.layout.state.selected_id == id){
this.layout.state.selected_id = null;
>>>>>>>
if (this.state[this.state_id].selected == id){
this.state[this.state_id].selected = null;
<<<<<<<
if (this.state[this.state_id].selected != null){
d3.select("#" + this.state[this.state_id].selected + "_bounding_box").attr("class", "lz-data_layer-gene lz-bounding_box");
if (this.layout.tooltip){ this.destroyTooltip(this.state[this.state_id].selected); }
=======
if (this.layout.state.selected_id != null){
d3.select("#" + this.layout.state.selected_id + "_bounding_box").attr("class", "lz-data_layer-gene lz-bounding_box");
if (this.layout.tooltip){ this.destroyTooltip(this.layout.state.selected_id); }
>>>>>>>
if (this.state[this.state_id].selected != null){
d3.select("#" + this.state[this.state_id].selected + "_bounding_box").attr("class", "lz-data_layer-gene lz-bounding_box");
if (this.layout.tooltip){ this.destroyTooltip(this.state[this.state_id].selected); }
<<<<<<<
this.state[this.state_id].selected = id;
=======
this.layout.state.selected_id = id;
>>>>>>>
this.state[this.state_id].selected = id;
<<<<<<<
if (gene.parent.state[gene.parent.state_id].selected != null){
var selected_id = gene.parent.state[gene.parent.state_id].selected + "_clickarea";
gene.parent.state[gene.parent.state_id].selected = null;
var d = d3.select("#" + selected_id).datum();
d3.select("#" + selected_id).on("mouseover")(d);
d3.select("#" + selected_id).on("click")(d);
=======
if (gene.parent.layout.state.selected_id != null){
var selected_id = gene.parent.layout.state.selected_id + "_clickarea";
gene.parent.layout.state.selected_id = null;
var d = d3.select("#" + selected_id).datum();
d3.select("#" + selected_id).on("mouseover")(d);
d3.select("#" + selected_id).on("click")(d);
>>>>>>>
if (gene.parent.state[gene.parent.state_id].selected != null){
var selected_id = gene.parent.state[gene.parent.state_id].selected + "_clickarea";
gene.parent.state[gene.parent.state_id].selected = null;
var d = d3.select("#" + selected_id).datum();
d3.select("#" + selected_id).on("mouseover")(d);
d3.select("#" + selected_id).on("click")(d); |
<<<<<<<
tutao.locator.mailFolderListViewModel.selectedFolder().move(folder, mails).then(function() {
tutao.locator.mailListViewModel.disableMobileMultiSelect();
});
}, null, false, "moveAction" + folder.getName(), folder.getIconId()));
=======
tutao.locator.mailFolderListViewModel.selectedFolder().move(folder, mails);
}, null, false, "moveAction" + folder.getName(), folder.getIconId(), folder.getTooltipTextId()));
>>>>>>>
tutao.locator.mailFolderListViewModel.selectedFolder().move(folder, mails).then(function() {
tutao.locator.mailListViewModel.disableMobileMultiSelect();
});
}, null, false, "moveAction" + folder.getName(), folder.getIconId(), folder.getTooltipTextId())); |
<<<<<<<
exec(resolve, function (error) {
reject(new tutao.crypto.CryptoError(error));
},"Crypto", "generateRsaKey", [keyLength]);
=======
var seed = tutao.util.EncodingConverter.hexToBase64(tutao.locator.randomizer.generateRandomData(512));
exec(resolve, reject,"Crypto", "generateRsaKey", [keyLength, seed]);
>>>>>>>
var seed = tutao.util.EncodingConverter.hexToBase64(tutao.locator.randomizer.generateRandomData(512));
exec(resolve, reject,"Crypto", "generateRsaKey", [keyLength, seed]);
},"Crypto", "generateRsaKey", [keyLength]); |
<<<<<<<
| "certificateType_label"
| "indexedMails_label"
=======
| "certificateType_label"
| "showAll_action"
>>>>>>>
| "certificateType_label"
| "indexedMails_label"
| "showAll_action" |
<<<<<<<
* Provides the sub folder list id of this folder.
* @return {string} The list id.
*/
tutao.tutanota.ctrl.MailFolderViewModel.prototype.getSubFolderListId = function() {
return this._mailFolder.getSubFolders();
};
/**
* Provides the id of this folder.
* @return {Array.<string>} The id of this MailFolder.
*/
tutao.tutanota.ctrl.MailFolderViewModel.prototype.getId = function() {
return this._mailFolder.getId();
};
/**
=======
* Provides the mail folder id.
* @return {Array.<string, string>} The mail folder id.
*/
tutao.tutanota.ctrl.MailFolderViewModel.prototype.getMailFolderId = function() {
return this._mailFolder.getId();
};
/**
>>>>>>>
* Provides the mail folder id.
* @return {Array.<string, string>} The mail folder id.
*/
tutao.tutanota.ctrl.MailFolderViewModel.prototype.getMailFolderId = function() {
return this._mailFolder.getId();
};
/**
* Provides the sub folder list id of this folder.
* @return {string} The list id.
*/
tutao.tutanota.ctrl.MailFolderViewModel.prototype.getSubFolderListId = function() {
return this._mailFolder.getSubFolders();
};
/** |
<<<<<<<
return {
"name": "tutanota-desktop" + nameSuffix,
"main": "./src/desktop/DesktopMain.js",
"version": version,
"author": "Tutao GmbH",
"description": "The desktop client for Tutanota, the secure e-mail service.",
"scripts": {
"start": "electron ."
},
"tutao-config": {
"pubKeyUrl": "https://raw.githubusercontent.com/tutao/tutanota/electron-client/tutao-pub.pem",
"pubKeys": [
"-----BEGIN PUBLIC KEY-----\n"
+ "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1eQA3vZyVSSMUbFZrSxB\n"
+ "va/OErAiT7HrVKF1m8ZLpsTu652SFLKelrFlUWz+ZcWx7yxNzpj8hpB4SDwJxQeO\n"
+ "9UD5q6IozwhNSV10h6G19lls3+3x3rzuQTOPXzNLv7SG1mdQUwfsf91gzv3Yg2Qd\n"
+ "Wd8gpKYLmG8rKo95FFAAXiafISs/3Xi8B+9dBp8cjgO4Nq/oTdLeYGBWfe+oDzPv\n"
+ "JPL4IDQa+SR5eI6jEMoVBRC7LihkP+fCwdhrlyOD+ei7s1YVoNU+qpWeLZ6wCYLP\n"
+ "Xbt7N3L2t3TiXEWmz+pjCz/HG3m/PuGamlGHDy/P8WlnvsbIEI6doDU8gAHUkpNS\n"
+ "HwIDAQAB\n"
+ "-----END PUBLIC KEY-----"
],
"pollingInterval": 1000 * 60 * 60 * 3, // 3 hours
"preloadjs": "./src/desktop/preload.js",
"desktophtml": "./desktop.html",
"iconName": "logo-solo-red.png",
"fileManagerTimeout": 30000,
// true if this version checks its updates. use to prevent local builds from checking sigs.
"checkUpdateSignature": sign || !!process.env.JENKINS,
"appUserModelId": "de.tutao.tutanota" + nameSuffix,
"initialSseConnectTimeoutInSeconds": 60,
"maxSseConnectTimeoutInSeconds": 2400,
"defaultDesktopConfig": {
"heartbeatTimeoutInSeconds": 30,
"defaultDownloadPath": null,
"enableAutoUpdate": true,
"runAsTrayApp": true,
}
},
"dependencies": {
"electron-updater": "4.1.2",
"chalk": "2.4.2",
"electron-localshortcut": "3.1.0",
"fs-extra": "7.0.1",
"bluebird": "3.5.2",
"node-forge": "0.8.5",
"winreg": "1.2.4",
"keytar": "4.13.0"
},
"build": {
"afterAllArtifactBuild": "./buildSrc/afterAllArtifactBuild.js",
"electronVersion": "4.1.4",
"icon": iconPath,
"appId": "de.tutao.tutanota" + nameSuffix,
"productName": nameSuffix.length > 0
? nameSuffix.slice(1) + " Tutanota Desktop"
: "Tutanota Desktop",
"artifactName": "${name}-${os}.${ext}",
"protocols": [
{
"name": "Mailto Links",
"schemes": [
"mailto"
],
"role": "Editor"
}
],
"publish": {
"provider": "generic",
"url": targetUrl,
"channel": "latest",
"publishAutoUpdate": true
},
"directories": {
"output": "installers"
},
"extraResources": {
"from": path.dirname(iconPath),
"to": "./icons/"
},
"win": {
"publisherName": "Tutao GmbH",
"sign": sign
? "./buildSrc/winsigner.js"
: undefined,
"signingHashAlgorithms": [
"sha256"
],
"target": [
{
"target": "nsis",
"arch": "x64"
}
]
},
"nsis": {
"oneClick": false, "perMachine": false,
"createStartMenuShortcut": true,
"allowElevation": true,
"allowToChangeInstallationDirectory": true
},
"mac": {
"icon": path.join(path.dirname(iconPath), "logo-solo-red.png.icns"),
"extendInfo": {
"LSUIElement": 1 //hide dock icon on startup
},
"target": [
{
"target": "zip",
"arch": "x64"
}
]
},
"linux": {
"icon": path.join(path.dirname(iconPath), "icon/"),
"synopsis": "Tutanota Desktop Client",
"category": "Network",
"desktop": {
"StartupWMClass": "tutanota-desktop" + nameSuffix
},
"target": [
{
"target": "AppImage",
"arch": "x64"
}
]
}
}
}
=======
return {
"name": "tutanota-desktop" + nameSuffix,
"main": "./src/desktop/DesktopMain.js",
"version": version,
"author": "Tutao GmbH",
"description": "The desktop client for Tutanota, the secure e-mail service.",
"scripts": {
"start": "electron ."
},
"tutao-config": {
"pubKeyUrl": "https://raw.githubusercontent.com/tutao/tutanota/electron-client/tutao-pub.pem",
"pubKeys": [
"-----BEGIN PUBLIC KEY-----\n"
+ "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1eQA3vZyVSSMUbFZrSxB\n"
+ "va/OErAiT7HrVKF1m8ZLpsTu652SFLKelrFlUWz+ZcWx7yxNzpj8hpB4SDwJxQeO\n"
+ "9UD5q6IozwhNSV10h6G19lls3+3x3rzuQTOPXzNLv7SG1mdQUwfsf91gzv3Yg2Qd\n"
+ "Wd8gpKYLmG8rKo95FFAAXiafISs/3Xi8B+9dBp8cjgO4Nq/oTdLeYGBWfe+oDzPv\n"
+ "JPL4IDQa+SR5eI6jEMoVBRC7LihkP+fCwdhrlyOD+ei7s1YVoNU+qpWeLZ6wCYLP\n"
+ "Xbt7N3L2t3TiXEWmz+pjCz/HG3m/PuGamlGHDy/P8WlnvsbIEI6doDU8gAHUkpNS\n"
+ "HwIDAQAB\n"
+ "-----END PUBLIC KEY-----"
],
"pollingInterval": 1000 * 60 * 60 * 3, // 3 hours
"preloadjs": "./src/desktop/preload.js",
"desktophtml": "./desktop.html",
"iconName": "logo-solo-red.png",
"fileManagerTimeout": 30000,
// true if this version checks its updates. use to prevent local builds from checking sigs.
"checkUpdateSignature": sign || !!process.env.JENKINS,
"appUserModelId": "de.tutao.tutanota" + nameSuffix,
"initialSseConnectTimeoutInSeconds": 60,
"maxSseConnectTimeoutInSeconds": 2400,
"defaultDesktopConfig": {
"heartbeatTimeoutInSeconds": 30,
"defaultDownloadPath": null,
"enableAutoUpdate": true,
"runAsTrayApp": true,
}
},
"dependencies": {
"electron-updater": "4.1.2",
"chalk": "2.4.2",
"electron-localshortcut": "3.1.0",
"fs-extra": "7.0.1",
"bluebird": "3.5.2",
"node-forge": "0.8.3",
"winreg": "1.2.4"
},
"build": {
"afterAllArtifactBuild": "./buildSrc/afterAllArtifactBuild.js",
"electronVersion": "4.1.4",
"icon": iconPath,
"appId": "de.tutao.tutanota" + nameSuffix,
"productName": nameSuffix.length > 0
? nameSuffix.slice(1) + " Tutanota Desktop"
: "Tutanota Desktop",
"artifactName": "${name}-${os}.${ext}",
"protocols": [
{
"name": "Mailto Links",
"schemes": [
"mailto"
],
"role": "Editor"
}
],
"publish": {
"provider": "generic",
"url": targetUrl,
"channel": "latest",
"publishAutoUpdate": true
},
"directories": {
"output": "installers"
},
"extraResources": {
"from": path.dirname(iconPath),
"to": "./icons/"
},
"win": {
"publisherName": "Tutao GmbH",
"sign": sign
? "./buildSrc/winsigner.js"
: undefined,
"signingHashAlgorithms": [
"sha256"
],
"target": [
{
"target": "nsis",
"arch": "x64"
}
]
},
"nsis": {
"oneClick": false, "perMachine": false,
"createStartMenuShortcut": true,
"allowElevation": true,
"allowToChangeInstallationDirectory": true
},
"mac": {
"icon": path.join(path.dirname(iconPath), "logo-solo-red.png.icns"),
"extendInfo": {
"LSUIElement": 1 //hide dock icon on startup
},
"target": [
{
"target": process.platform === "darwin" ? "dmg" : "zip",
"arch": "x64"
}
]
},
"linux": {
"icon": path.join(path.dirname(iconPath), "icon/"),
"synopsis": "Tutanota Desktop Client",
"category": "Network",
"desktop": {
"StartupWMClass": "tutanota-desktop" + nameSuffix
},
"target": [
{
"target": "AppImage",
"arch": "x64"
}
]
}
}
}
>>>>>>>
return {
"name": "tutanota-desktop" + nameSuffix,
"main": "./src/desktop/DesktopMain.js",
"version": version,
"author": "Tutao GmbH",
"description": "The desktop client for Tutanota, the secure e-mail service.",
"scripts": {
"start": "electron ."
},
"tutao-config": {
"pubKeyUrl": "https://raw.githubusercontent.com/tutao/tutanota/electron-client/tutao-pub.pem",
"pubKeys": [
"-----BEGIN PUBLIC KEY-----\n"
+ "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1eQA3vZyVSSMUbFZrSxB\n"
+ "va/OErAiT7HrVKF1m8ZLpsTu652SFLKelrFlUWz+ZcWx7yxNzpj8hpB4SDwJxQeO\n"
+ "9UD5q6IozwhNSV10h6G19lls3+3x3rzuQTOPXzNLv7SG1mdQUwfsf91gzv3Yg2Qd\n"
+ "Wd8gpKYLmG8rKo95FFAAXiafISs/3Xi8B+9dBp8cjgO4Nq/oTdLeYGBWfe+oDzPv\n"
+ "JPL4IDQa+SR5eI6jEMoVBRC7LihkP+fCwdhrlyOD+ei7s1YVoNU+qpWeLZ6wCYLP\n"
+ "Xbt7N3L2t3TiXEWmz+pjCz/HG3m/PuGamlGHDy/P8WlnvsbIEI6doDU8gAHUkpNS\n"
+ "HwIDAQAB\n"
+ "-----END PUBLIC KEY-----"
],
"pollingInterval": 1000 * 60 * 60 * 3, // 3 hours
"preloadjs": "./src/desktop/preload.js",
"desktophtml": "./desktop.html",
"iconName": "logo-solo-red.png",
"fileManagerTimeout": 30000,
// true if this version checks its updates. use to prevent local builds from checking sigs.
"checkUpdateSignature": sign || !!process.env.JENKINS,
"appUserModelId": "de.tutao.tutanota" + nameSuffix,
"initialSseConnectTimeoutInSeconds": 60,
"maxSseConnectTimeoutInSeconds": 2400,
"defaultDesktopConfig": {
"heartbeatTimeoutInSeconds": 30,
"defaultDownloadPath": null,
"enableAutoUpdate": true,
"runAsTrayApp": true,
}
},
"dependencies": {
"electron-updater": "4.1.2",
"chalk": "2.4.2",
"electron-localshortcut": "3.1.0",
"fs-extra": "7.0.1",
"bluebird": "3.5.2",
"node-forge": "0.8.5",
"winreg": "1.2.4",
"keytar": "4.13.0"
},
"build": {
"afterAllArtifactBuild": "./buildSrc/afterAllArtifactBuild.js",
"electronVersion": "4.1.4",
"icon": iconPath,
"appId": "de.tutao.tutanota" + nameSuffix,
"productName": nameSuffix.length > 0
? nameSuffix.slice(1) + " Tutanota Desktop"
: "Tutanota Desktop",
"artifactName": "${name}-${os}.${ext}",
"protocols": [
{
"name": "Mailto Links",
"schemes": [
"mailto"
],
"role": "Editor"
}
],
"publish": {
"provider": "generic",
"url": targetUrl,
"channel": "latest",
"publishAutoUpdate": true
},
"directories": {
"output": "installers"
},
"extraResources": {
"from": path.dirname(iconPath),
"to": "./icons/"
},
"win": {
"publisherName": "Tutao GmbH",
"sign": sign
? "./buildSrc/winsigner.js"
: undefined,
"signingHashAlgorithms": [
"sha256"
],
"target": [
{
"target": "nsis",
"arch": "x64"
}
]
},
"nsis": {
"oneClick": false, "perMachine": false,
"createStartMenuShortcut": true,
"allowElevation": true,
"allowToChangeInstallationDirectory": true
},
"mac": {
"icon": path.join(path.dirname(iconPath), "logo-solo-red.png.icns"),
"extendInfo": {
"LSUIElement": 1 //hide dock icon on startup
},
"target": [
{
"target": process.platform === "darwin" ? "dmg" : "zip",
"arch": "x64"
}
]
},
"linux": {
"icon": path.join(path.dirname(iconPath), "icon/"),
"synopsis": "Tutanota Desktop Client",
"category": "Network",
"desktop": {
"StartupWMClass": "tutanota-desktop" + nameSuffix
},
"target": [
{
"target": "AppImage",
"arch": "x64"
}
]
}
}
} |
<<<<<<<
lastDistance: number;
lastScale: number;
=======
mailHeaderDialog: Dialog;
mailHeaderInfo: string;
>>>>>>>
mailHeaderDialog: Dialog;
mailHeaderInfo: string;
lastDistance: number;
lastScale: number;
<<<<<<<
m(".rel.scroll-x" + (client.isMobileDevice() ? "" : ".scroll"),
m("#mail-body.selectable.touch-callout" + (client.isMobileDevice() ? "" : ".scroll"), {
oncreate: vnode => {
this._domBody = vnode.dom
this._updateLineHeight()
const width = this._domBody.getBoundingClientRect().width
const containerWidth = this._domMailViewer ? this._domMailViewer.getBoundingClientRect().width : -1
console.log(`body width: ${width}, container width: ${containerWidth}`)
this._rescale(vnode)
},
onupdate: (vnode) => this._rescale(vnode),
onclick: (event: Event) => this._handleMailto(event),
onsubmit: (event: Event) => this._confirmSubmit(event),
style: {'line-height': this._bodyLineHeight, 'transform-origin': 'top left'},
ontouchmove: (e) => {
if (e.touches.length === 2) {
const dist = Math.hypot(
e.touches[0].pageX - e.touches[1].pageX,
e.touches[0].pageY - e.touches[1].pageY);
const factor = dist / this.lastDistance
if (this.lastDistance != null) {
this.lastScale = this.lastScale * factor
// if (!updateRequested) {
// requestAnimationFrame(() => {
this._domBody.style.transform = `scale(${this.lastScale})`
// updateRequested = false
// })
// updateRequested = true
// }
}
this.lastDistance = dist
e.redraw = false
}
},
}, (this._mailBody == null && !this._errorOccurred)
? m(".progress-panel.flex-v-center.items-center", {
style: {
height: '200px'
}
}, [
progressIcon(),
m("small", lang.get("loading_msg"))
])
: ((this._errorOccurred || this.mail._errors || neverNull(this._mailBody)._errors)
? m(errorMessageBox)
: m.trust(this._htmlBody))) // this._htmlBody is always sanitized
)
=======
m("#mail-body.body.rel.plr-l.scroll-x.pt-s.pb-floating.selectable.touch-callout.break-word-links"
+ (client.isMobileDevice() ? "" : ".scroll"), {
oncreate: vnode => {
this._domBody = vnode.dom
this._updateLineHeight()
},
onclick: (event: Event) => this._handleAnchorClick(event),
onsubmit: (event: Event) => this._confirmSubmit(event),
style: {'line-height': this._bodyLineHeight}
}, (this._mailBody == null
&& !this._errorOccurred) ? m(".progress-panel.flex-v-center.items-center", {
style: {
height: '200px'
}
}, [
progressIcon(),
m("small", lang.get("loading_msg"))
]) : ((this._errorOccurred || this.mail._errors
|| neverNull(this._mailBody)._errors) ? m(errorMessageBox) : m.trust(this._htmlBody))) // this._htmlBody is always sanitized
>>>>>>>
m(".rel.scroll-x" + (client.isMobileDevice() ? "" : ".scroll"),
m("#mail-body.selectable.touch-callout.break-word-links" + (client.isMobileDevice() ? "" : ".scroll"), {
oncreate: vnode => {
this._domBody = vnode.dom
this._updateLineHeight()
const width = this._domBody.getBoundingClientRect().width
const containerWidth = this._domMailViewer ? this._domMailViewer.getBoundingClientRect().width : -1
console.log(`body width: ${width}, container width: ${containerWidth}`)
this._rescale(vnode)
},
onupdate: (vnode) => this._rescale(vnode),
onclick: (event: Event) => this._handleAnchorClick(event),
onsubmit: (event: Event) => this._confirmSubmit(event),
style: {'line-height': this._bodyLineHeight, 'transform-origin': 'top left'},
ontouchmove: (e) => {
if (e.touches.length === 2) {
const dist = Math.hypot(
e.touches[0].pageX - e.touches[1].pageX,
e.touches[0].pageY - e.touches[1].pageY);
const factor = dist / this.lastDistance
if (this.lastDistance != null) {
this.lastScale = this.lastScale * factor
// if (!updateRequested) {
// requestAnimationFrame(() => {
this._domBody.style.transform = `scale(${this.lastScale})`
// updateRequested = false
// })
// updateRequested = true
// }
}
this.lastDistance = dist
e.redraw = false
}
},
}, (this._mailBody == null && !this._errorOccurred)
? m(".progress-panel.flex-v-center.items-center", {
style: {
height: '200px'
}
}, [
progressIcon(),
m("small", lang.get("loading_msg"))
])
: ((this._errorOccurred || this.mail._errors || neverNull(this._mailBody)._errors)
? m(errorMessageBox)
: m.trust(this._htmlBody))) // this._htmlBody is always sanitized
)
<<<<<<<
_rescale(vnode: Vnode<any>) {
// const child = Array.from(vnode.dom.children).reduce((acc, ch) => {
// const scrollWidth = ch.scrollWidth
// return acc == null || scrollWidth > acc ? ch : acc
// }, null)
// if (!child) return
const child = vnode.dom
const width = child.scrollWidth
const containerWidth = this._domMailViewer ? this._domMailViewer.scrollWidth : -1
console.log(`body width onupdate: ${width}, container width: ${containerWidth}`)
const scale = containerWidth / width
const scrollHeight = child.scrollHeight
const scrollHeigthScale = child.scrollHeight * scale
const heightDiff = child.scrollHeight - child.scrollHeight * scale
const heightDiffHalf = heightDiff / 2
console.log(`scale ${scale}, height: ${scrollHeight}, height * scale: ${scrollHeigthScale} diff: ${heightDiff}, diffHalf: ${heightDiffHalf}`)
// child.style.transform = `scale(${scale}) translate(-${(child.scrollWidth - child.scrollWidth * scale) / 2}px, -${heightDiffHalf}px)`
child.style.transform = `scale(${scale})`
this.lastScale = scale
}
=======
_tutaoBadge(): Vnode<*> | null {
return isTutanotaTeamMail(this.mail) ? m(Badge, {classes: ".mr-s"}, "Tutanota Team") : null
}
_isAnnouncement(): boolean {
return isExcludedMailAddress(this.mail.sender.address)
}
>>>>>>>
_tutaoBadge(): Vnode<*> | null {
return isTutanotaTeamMail(this.mail) ? m(Badge, {classes: ".mr-s"}, "Tutanota Team") : null
}
_isAnnouncement(): boolean {
return isExcludedMailAddress(this.mail.sender.address)
}
_rescale(vnode: Vnode<any>) {
// const child = Array.from(vnode.dom.children).reduce((acc, ch) => {
// const scrollWidth = ch.scrollWidth
// return acc == null || scrollWidth > acc ? ch : acc
// }, null)
// if (!child) return
const child = vnode.dom
const width = child.scrollWidth
const containerWidth = this._domMailViewer ? this._domMailViewer.scrollWidth : -1
console.log(`body width onupdate: ${width}, container width: ${containerWidth}`)
const scale = containerWidth / width
const scrollHeight = child.scrollHeight
const scrollHeigthScale = child.scrollHeight * scale
const heightDiff = child.scrollHeight - child.scrollHeight * scale
const heightDiffHalf = heightDiff / 2
console.log(`scale ${scale}, height: ${scrollHeight}, height * scale: ${scrollHeigthScale} diff: ${heightDiff}, diffHalf: ${heightDiffHalf}`)
// child.style.transform = `scale(${scale}) translate(-${(child.scrollWidth - child.scrollWidth * scale) / 2}px, -${heightDiffHalf}px)`
child.style.transform = `scale(${scale})`
this.lastScale = scale
} |
<<<<<<<
tutao.entity.tutanota.TutanotaConstants.CUSTOM_DOMAIN_STATUS_OK = 0;
tutao.entity.tutanota.TutanotaConstants.CUSTOM_DOMAIN_STATUS_DNS_LOOKUP_FAILED = 1;
tutao.entity.tutanota.TutanotaConstants.CUSTOM_DOMAIN_STATUS_MISSING_MX_RECORD = 2;
tutao.entity.tutanota.TutanotaConstants.CUSTOM_DOMAIN_STATUS_MISSING_SPF_RECORD = 3;
tutao.entity.tutanota.TutanotaConstants.CUSTOM_DOMAIN_STATUS_INVALID_DNS_RECORD = 4;
tutao.entity.tutanota.TutanotaConstants.CUSTOM_DOMAIN_STATUS_DOMAIN_NOT_AVAILABLE = 5;
=======
tutao.entity.tutanota.TutanotaConstants.PREVENT_EXTERNAL_IMAGE_LOADING_ICON = "graphics/ion-alert-circled.svg";
>>>>>>>
tutao.entity.tutanota.TutanotaConstants.PREVENT_EXTERNAL_IMAGE_LOADING_ICON = "graphics/ion-alert-circled.svg";
tutao.entity.tutanota.TutanotaConstants.CUSTOM_DOMAIN_STATUS_OK = 0;
tutao.entity.tutanota.TutanotaConstants.CUSTOM_DOMAIN_STATUS_DNS_LOOKUP_FAILED = 1;
tutao.entity.tutanota.TutanotaConstants.CUSTOM_DOMAIN_STATUS_MISSING_MX_RECORD = 2;
tutao.entity.tutanota.TutanotaConstants.CUSTOM_DOMAIN_STATUS_MISSING_SPF_RECORD = 3;
tutao.entity.tutanota.TutanotaConstants.CUSTOM_DOMAIN_STATUS_INVALID_DNS_RECORD = 4;
tutao.entity.tutanota.TutanotaConstants.CUSTOM_DOMAIN_STATUS_DOMAIN_NOT_AVAILABLE = 5; |
<<<<<<<
tutao.rest.EntityRestCache.prototype.getElement = function(type, path, id, listId, parameters, headers, callback) {
var self = this;
var cacheListId = (listId) ? listId : "0";
var versionRequest = (parameters && parameters.version) ? true : false;
if (versionRequest || !this._db[path] || !this._db[path][cacheListId] || !this._db[path][cacheListId]['entities'][id] || tutao.util.ArrayUtils.contains(this._ignoredPaths, path)) {
// the element is not in the cache, so get it from target
this._target.getElement(type, path, id, listId, parameters, headers, function(element, exception) {
if (exception) {
callback(null, exception);
return;
}
// cache the received element
if (!versionRequest) {
self._addToCache(path, element);
}
callback(element);
});
} else {
callback(this._db[path][cacheListId]['entities'][id]);
}
=======
tutao.rest.EntityRestCache.prototype.getElement = function(type, path, id, listId, parameters, headers) {
var self = this;
var cacheListId = (listId) ? listId : "0";
var versionRequest = (parameters && parameters.version) ? true : false;
if (versionRequest || !this._db[path] || !this._db[path][cacheListId] || !this._db[path][cacheListId][id] || tutao.util.ArrayUtils.contains(this._ignoredPaths, path)) {
// the element is not in the cache, so get it from target
return this._target.getElement(type, path, id, listId, parameters, headers).then(function(element) {
// cache the received element
if (!versionRequest) {
self._addToCache(path, element);
self._tryAddToRange(path, element);
}
return element;
});
} else {
return Promise.resolve(self._db[path][cacheListId][id]);
}
>>>>>>>
tutao.rest.EntityRestCache.prototype.getElement = function(type, path, id, listId, parameters, headers) {
var self = this;
var cacheListId = (listId) ? listId : "0";
var versionRequest = (parameters && parameters.version) ? true : false;
if (versionRequest || !this._db[path] || !this._db[path][cacheListId] || !this._db[path][cacheListId]['entities'][id] || tutao.util.ArrayUtils.contains(this._ignoredPaths, path)) {
// the element is not in the cache, so get it from target
return this._target.getElement(type, path, id, listId, parameters, headers).then(function(element) {
// cache the received element
if (!versionRequest) {
self._addToCache(path, element);
}
return element;
});
} else {
return Promise.resolve(self._db[path][cacheListId]['entities'][id]);
}
<<<<<<<
}
callback(elements);
=======
}
return elements;
>>>>>>>
}
return elements;
<<<<<<<
this._target.postElement(path, element, listId, parameters, headers, function(returnEntity, exception) {
if (!exception) {
var cacheListId = undefined;
var id = undefined;
if (element.__id instanceof Array) {
cacheListId = element.__id[0];
id = element.__id[1];
} else {
cacheListId = "0";
id = element.__id;
}
if (self._db[path] && self._db[path][cacheListId] && self._db[path][cacheListId]['entities'][id]) {
// this should not happen
console.log("cache out of sync for post: " + path);
}
self._addToCache(path, element);
}
callback(returnEntity, exception);
=======
return this._target.postElement(path, element, listId, parameters, headers).then(function(returnEntity) {
var cacheListId = undefined;
var id = undefined;
if (element.__id instanceof Array) {
cacheListId = element.__id[0];
id = element.__id[1];
} else {
cacheListId = "0";
id = element.__id;
}
if (self._db[path] && self._db[path][cacheListId] && self._db[path][cacheListId][id]) {
// this should not happen
console.log("cache out of sync for post: " + path);
}
self._addToCache(path, element);
self._tryAddToRange(path, element);
return returnEntity;
>>>>>>>
return this._target.postElement(path, element, listId, parameters, headers, function(returnEntity, exception) {
var cacheListId = undefined;
var id = undefined;
if (element.__id instanceof Array) {
cacheListId = element.__id[0];
id = element.__id[1];
} else {
cacheListId = "0";
id = element.__id;
}
if (self._db[path] && self._db[path][cacheListId] && self._db[path][cacheListId]['entities'][id]) {
// this should not happen
console.log("cache out of sync for post: " + path);
}
self._addToCache(path, element);
return returnEntity;
<<<<<<<
var cacheListId = tutao.rest.EntityRestCache.getListId(element);
var id = tutao.rest.EntityRestInterface.getElementId(element);
this._getListData(path, cacheListId)['entities'][id] = element;
=======
var cacheListId = undefined;
var id = undefined;
if (element.__id instanceof Array) { // LET
cacheListId = element.__id[0];
id = element.__id[1];
} else { // ET
cacheListId = "0";
id = element.__id;
}
this._db[path] = this._db[path] || {};
this._db[path][cacheListId] = this._db[path][cacheListId] || {};
this._db[path][cacheListId][id] = element;
>>>>>>>
var cacheListId = tutao.rest.EntityRestCache.getListId(element);
var id = tutao.rest.EntityRestInterface.getElementId(element);
this._getListData(path, cacheListId)['entities'][id] = element;
<<<<<<<
this._target.putElement(path, element, parameters, headers, function(exception) {
if (!exception) {
var cacheListId = tutao.rest.EntityRestCache.getListId(element);
var id = tutao.rest.EntityRestInterface.getElementId(element);
if (!self._db[path] || !self._db[path][cacheListId] || !self._db[path][cacheListId]['entities'][id]) {
// this should not happen. it means that the target and this cache are out of sync.
// put on the target worked fine, so the element was existing on the target.
// it must habe been received from the target or posted first, otherwise it would not have been possible to put it.
// we somehow must have missed receiving the element and putting it into the cache.
console.log("cache out of sync for " + path);
}
self._addToCache(path, element);
}
callback(exception);
=======
return this._target.putElement(path, element, parameters, headers).then(function() {
var cacheListId = undefined;
var id = undefined;
if (element.__id instanceof Array) {
cacheListId = element.__id[0];
id = element.__id[1];
} else {
cacheListId = "0";
id = element.__id;
}
if (!self._db[path] || !self._db[path][cacheListId] || !self._db[path][cacheListId][id]) {
// this should not happen. it means that the target and this cache are out of sync.
// put on the target worked fine, so the element was existing on the target.
// it must habe been received from the target or posted first, otherwise it would not have been possible to put it.
// we somehow must have missed receiving the element and putting it into the cache.
console.log("cache out of sync for " + path);
}
self._addToCache(path, element);
>>>>>>>
return this._target.putElement(path, element, parameters, headers, function(exception) {
var cacheListId = tutao.rest.EntityRestCache.getListId(element);
var id = tutao.rest.EntityRestInterface.getElementId(element);
if (!self._db[path] || !self._db[path][cacheListId] || !self._db[path][cacheListId]['entities'][id]) {
// this should not happen. it means that the target and this cache are out of sync.
// put on the target worked fine, so the element was existing on the target.
// it must habe been received from the target or posted first, otherwise it would not have been possible to put it.
// we somehow must have missed receiving the element and putting it into the cache.
console.log("cache out of sync for " + path);
}
self._addToCache(path, element); |
<<<<<<<
let dialog = new Dialog(DialogType.EditSmall, {
view: () => [
=======
let dialog = new Dialog(type, {
view: () => m("", [
>>>>>>>
let dialog = new Dialog(type, {
view: () => [ |
<<<<<<<
export const ContactComparisonResult = {
Unique: "unique",
Similar: "similar",
Equal: "equal",
}
export type ContactComparisonResultEnum = $Values<typeof ContactComparisonResult>;
export const IndifferentContactComparisonResult = {
OneEmpty: "oneEmpty",
BothEmpty: "bothEmpty",
}
export type IndifferentContactComparisonResultEnum = $Values<typeof IndifferentContactComparisonResult>;
export const ContactMergeAction = {
DeleteFirst: "deleteFirst",
DeleteSecond: "deleteSecond",
Merge: "merge",
Skip: "skip",
Cancel: "cancel"
}
export type ContactMergeActionEnum = $Values<typeof ContactMergeAction>;
=======
export const PaymentDataResultType = {
OK: "0",
COUNTRY_MISMATCH: "1",
INVALID_VATID_NUMBER: "2",
CREDIT_CARD_DECLINED: "3",
CREDIT_CARD_CVV_INVALID: "4",
PAYMENT_PROVIDER_NOT_AVAILABLE: "5",
OTHER_PAYMENT_PROVIDER_ERROR: "6",
OTHER_PAYMENT_ACCOUNT_REJECTED: "7"
}
>>>>>>>
export const PaymentDataResultType = {
OK: "0",
COUNTRY_MISMATCH: "1",
INVALID_VATID_NUMBER: "2",
CREDIT_CARD_DECLINED: "3",
CREDIT_CARD_CVV_INVALID: "4",
PAYMENT_PROVIDER_NOT_AVAILABLE: "5",
OTHER_PAYMENT_PROVIDER_ERROR: "6",
OTHER_PAYMENT_ACCOUNT_REJECTED: "7"
}
export const ContactComparisonResult = {
Unique: "unique",
Similar: "similar",
Equal: "equal",
}
export type ContactComparisonResultEnum = $Values<typeof ContactComparisonResult>;
export const IndifferentContactComparisonResult = {
OneEmpty: "oneEmpty",
BothEmpty: "bothEmpty",
}
export type IndifferentContactComparisonResultEnum = $Values<typeof IndifferentContactComparisonResult>;
export const ContactMergeAction = {
DeleteFirst: "deleteFirst",
DeleteSecond: "deleteSecond",
Merge: "merge",
Skip: "skip",
Cancel: "cancel"
}
export type ContactMergeActionEnum = $Values<typeof ContactMergeAction>; |
<<<<<<<
import {MailEditor} from "../mail/MailEditor"
import {mailModel} from "../mail/MailModel"
=======
import {SentGroupInvitationTypeRef} from "../api/entities/sys/SentGroupInvitation"
import {PreconditionFailedError} from "../api/common/error/RestError"
import {showSharingBuyDialog} from "../subscription/WhitelabelAndSharingBuyDialog"
import {logins} from "../api/main/LoginController"
>>>>>>>
import {SentGroupInvitationTypeRef} from "../api/entities/sys/SentGroupInvitation"
import {PreconditionFailedError} from "../api/common/error/RestError"
import {showSharingBuyDialog} from "../subscription/WhitelabelAndSharingBuyDialog"
import {logins} from "../api/main/LoginController"
import {MailEditor} from "../mail/MailEditor"
import {mailModel} from "../mail/MailModel"
<<<<<<<
showProgressDialog("calendarInvitationProgress_msg",
worker.sendGroupInvitation(groupInfo.group, recipients, capability)
.then(() => sendShareNotificationEmail(groupInfo, recipients)))
.then(() => dialog.close())
=======
showProgressDialog("calendarInvitationProgress_msg",
worker.sendGroupInvitation(groupInfo, getCalendarName(groupInfo.name), recipients, capability)
).then(() => dialog.close())
.catch(PreconditionFailedError, e => {
if (logins.getUserController().isGlobalAdmin()) {
Dialog.confirm("sharingFeatureNotOrderedAdmin_msg")
.then(confirmed => {
if (confirmed) {
showSharingBuyDialog(true)
}
})
} else {
Dialog.error("sharingFeatureNotOrderedUser_msg")
}
})
>>>>>>>
showProgressDialog("calendarInvitationProgress_msg",
worker.sendGroupInvitation(groupInfo, getCalendarName(groupInfo.name), recipients, capability)
).then(() => dialog.close())
.then(() => sendShareNotificationEmail(groupInfo, recipients))
.catch(PreconditionFailedError, e => {
if (logins.getUserController().isGlobalAdmin()) {
Dialog.confirm("sharingFeatureNotOrderedAdmin_msg")
.then(confirmed => {
if (confirmed) {
showSharingBuyDialog(true)
}
})
} else {
Dialog.error("sharingFeatureNotOrderedUser_msg")
}
}) |
<<<<<<<
"yourMessage_label": "Deine Nachricht",
"goPremium_msg": "Als Premium-Nutzer kannst du links im Menü deine Suchfilter anpassen.",
"changeTimeFrame_msg": "Mit Premium kannst du deinen Suchzeitraum erweitern!",
"stillReferencedFromContactForm_msg": "Diese Instanz kann nicht deaktiviert werden, da sie noch von einem Kontaktformular referenziert wird.",
"secondFactorConfirmLoginNoIp_msg": "Möchtest du die Anmeldung von dem Client \"{clientIdentifier}\" erlauben?",
=======
"yourMessage_label": "Deine Nachricht",
"recoverCode_msg": "Bitte nimm dir etwas Zeit um den Wiederherstellungs-Code aufzuschreiben. Dieser kann dazu verwendet werden den Zugang zu deinen Account wiederherzustellen, falls du das Passwort oder den zweiten Faktor verloren hast.",
"recoverCode_label": "Wiederherstellungs-Code",
"recover_label": "Wiederherstellen",
"recoverAccountAccess_action": "Zugansdaten verloren",
"recoverCodeEmpty_msg": "Bitte gib deinen Wiederherstellungs-Code ein.",
"recoverCodeReminder_msg": "Richte jetzt deinen Wiederherstellungs-Code ein um den Zugang zu deinem Account wiederherstellen zu können.",
"newFeature_msg": "Neues Feature",
"recoverSetNewPassword_action": "Neues Passwort festlegen",
"recoverResetFactors_action": "Zweiten Faktor zurücksetzen",
"postpone_action": "Später",
"setUp_action": "Einrichten"
>>>>>>>
"yourMessage_label": "Deine Nachricht",
"goPremium_msg": "Als Premium-Nutzer kannst du links im Menü deine Suchfilter anpassen.",
"changeTimeFrame_msg": "Mit Premium kannst du deinen Suchzeitraum erweitern!",
"stillReferencedFromContactForm_msg": "Diese Instanz kann nicht deaktiviert werden, da sie noch von einem Kontaktformular referenziert wird.",
"secondFactorConfirmLoginNoIp_msg": "Möchtest du die Anmeldung von dem Client \"{clientIdentifier}\" erlauben?",
"yourMessage_label": "Deine Nachricht",
"recoverCode_msg": "Bitte nimm dir etwas Zeit um den Wiederherstellungs-Code aufzuschreiben. Dieser kann dazu verwendet werden den Zugang zu deinen Account wiederherzustellen, falls du das Passwort oder den zweiten Faktor verloren hast.",
"recoverCode_label": "Wiederherstellungs-Code",
"recover_label": "Wiederherstellen",
"recoverAccountAccess_action": "Zugansdaten verloren",
"recoverCodeEmpty_msg": "Bitte gib deinen Wiederherstellungs-Code ein.",
"recoverCodeReminder_msg": "Richte jetzt deinen Wiederherstellungs-Code ein um den Zugang zu deinem Account wiederherstellen zu können.",
"newFeature_msg": "Neues Feature",
"recoverSetNewPassword_action": "Neues Passwort festlegen",
"recoverResetFactors_action": "Zweiten Faktor zurücksetzen",
"postpone_action": "Später",
"setUp_action": "Einrichten" |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
"yourMessage_label": "Deine Nachricht",
"privacyPolicyUrl_label": "Link zur Datenschutzerklärung",
"acceptPrivacyPolicyReminder_msg": "Bitte erkenne die Datenschutzerklärung an, indem du das Häkchen setzt.",
"acceptPrivacyPolicy_msg": "Ich habe die {privacyPolicy} gelesen und erkenne sie an.",
"allowPushNotification_msg": "Bitte deaktiviere die Akkuoptimierung für Tutanota, damit Benachrichtigungen für neue E-Mails zuverlässig angezeigt werden können. Du kannst dies auch später in den Einstellungen ändern.",
"permanentAliasWarning_msg": "Dies ist ein Tutanota-Alias. Diese können im Gegensatz zu Aliassen von eigenen Domains nur deaktiviert, aber nicht gelöscht werden. Sie zählen permanent zur Zahl der registrierten Aliasse.",
"errorDuringUpdate_msg": "Der Update-Prozess ist fehlgeschlagen. Wir versuchen es später noch ein mal."
=======
"yourMessage_label": "Deine Nachricht"
>>>>>>>
"yourMessage_label": "Deine Nachricht",
"errorDuringUpdate_msg": "Der Update-Prozess ist fehlgeschlagen. Wir versuchen es später noch ein mal." |
<<<<<<<
"yourMessage_label": "Ihre Nachricht",
"allowPushNotification_msg": "Bitte deaktivieren Sie die Akkuoptimierung für Tutanota, damit Benachrichtigungen für neue E-Mails zuverlässig angezeigt werden können. Sie können dies auch später in den Einstellungen ändern.",
"permanentAliasWarning_msg": "Dies ist ein Tutanota-Alias. Diese können im Gegensatz zu Aliassen von eigenen Domains nur deaktiviert, aber nicht gelöscht werden. Sie zählen permanent zur Zahl der registrierten Aliasse.",
"errorDuringUpdate_msg": "Der Update-Prozess ist fehlgeschlagen. Wir versuchen es später noch ein mal."
=======
"yourMessage_label": "Ihre Nachricht"
>>>>>>>
"yourMessage_label": "Ihre Nachricht",
"errorDuringUpdate_msg": "Der Update-Prozess ist fehlgeschlagen. Wir versuchen es später noch ein mal." |
<<<<<<<
// console.log('action in reducer', action);
// console.log('REDUCER CALLED!, check the width',action.payload);
=======
>>>>>>> |
<<<<<<<
var path = __webpack_require__(235);
var fs = __webpack_require__(234);
=======
var path = __webpack_require__(95);
var LiveRender = function (_Component) {
_inherits(LiveRender, _Component);
function LiveRender() {
_classCallCheck(this, LiveRender);
return _possibleConstructorReturn(this, (LiveRender.__proto__ || Object.getPrototypeOf(LiveRender)).apply(this, arguments));
}
_createClass(LiveRender, [{
key: 'render',
value: function render() {
var url = path.resolve(__dirname, '../ID3-React/app/components/temp/temp.html');
console.log(url);
return _react2.default.createElement('webview', { src: '/Users/eveafeline/Documents/Codesmith/senior/ID3-React/app/components/temp/temp.html' });
}
}]);
return LiveRender;
}(_react.Component);
exports.default = LiveRender;
/***/ }),
/* 99 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
var _react = __webpack_require__(16);
var _react2 = _interopRequireDefault(_react);
var _electron = __webpack_require__(94);
var _path2 = __webpack_require__(95);
var _path3 = _interopRequireDefault(_path2);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
>>>>>>>
var path = __webpack_require__(95);
var LiveRender = function (_Component) {
_inherits(LiveRender, _Component);
function LiveRender() {
_classCallCheck(this, LiveRender);
return _possibleConstructorReturn(this, (LiveRender.__proto__ || Object.getPrototypeOf(LiveRender)).apply(this, arguments));
}
_createClass(LiveRender, [{
key: 'render',
value: function render() {
var url = path.resolve(__dirname, '../ID3-React/app/components/temp/temp.html');
console.log(url);
return _react2.default.createElement('webview', { src: '/Users/eveafeline/Documents/Codesmith/senior/ID3-React/app/components/temp/temp.html' });
}
}]);
return LiveRender;
}(_react.Component);
exports.default = LiveRender;
/***/ }),
/* 99 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
var _react = __webpack_require__(16);
var _react2 = _interopRequireDefault(_react);
var _electron = __webpack_require__(94);
var _path2 = __webpack_require__(95);
var _path3 = _interopRequireDefault(_path2);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
<<<<<<<
url: path.resolve(__dirname, 'app/components/temp/temp.html')
=======
url: _path3.default.resolve(__dirname, 'app/components/temp/temp.html')
>>>>>>>
url: path.resolve(__dirname, 'app/components/temp/temp.html')
<<<<<<<
=======
// var path = require('path');
var fs = __webpack_require__(226);
>>>>>>>
// var path = require('path');
var fs = __webpack_require__(226);
<<<<<<<
// console.log('inside amdRequire');
editor = monaco.editor.create(document.getElementById('editor'), {
=======
editor = monaco.editor.create(document.getElementById('one'), {
>>>>>>>
// console.log('inside amdRequire');
editor = monaco.editor.create(document.getElementById('editor'), {
<<<<<<<
document.getElementById("editor").onkeyup = function () {
fs.writeFile(path.resolve(__dirname, 'app/components/temp/temp.html'), editor.getValue(), function (err) {
=======
setInterval(function () {
fs.writeFile(_path3.default.resolve(__dirname, 'app/components/temp/temp.html'), editor.getValue(), function (err) {
>>>>>>>
setInterval(function () {
fs.writeFile(_path3.default.resolve(__dirname, 'app/components/temp/temp.html'), editor.getValue(), function (err) {
<<<<<<<
// document.getElementById("editor").onkeyup = () => {
// fs.writeFile(path.resolve(__dirname, 'app/components/temp/temp.html'), editor.getValue(), (err) => {
// if (err) throw err;
// // console.log('The file has been saved!');
// })
// // const webview = document.querySelector('webview')
// // webview.reload();
// }
document.getElementById("editor").addEventListener('keypress', function (event) {
// console.log(event.ctrlKey);
// console.log(event.which);
if (event.ctrlKey && event.which === 19) {
// console.log('webview reloaded!')
var webview = document.querySelector('webview');
webview.reload();
}
});
=======
setInterval(function () {
var webview = document.querySelector('webview');
webview.reload();
}, 300);
>>>>>>>
setInterval(function () {
var webview = document.querySelector('webview');
webview.reload();
}, 300); |
<<<<<<<
let mainWindow;
=======
// set up local express server for python data processing
var server = require('./server/express');
>>>>>>>
// set up local express server for python data processing
var server = require('./server/express');
<<<<<<<
// Dereference the window object, usually you would store windows
// in an array if your app supports multi windows, this is the time
// when you should delete the corresponding element.
fs.writeFile(path.resolve(__dirname, 'src/components/temp/temp.html'), '//code here', (err) => {
if (err) throw err;
// console.log('The file has been emptied!');
})
=======
>>>>>>>
// Dereference the window object, usually you would store windows
// in an array if your app supports multi windows, this is the time
// when you should delete the corresponding element.
fs.writeFile(path.resolve(__dirname, 'src/components/temp/temp.html'), '//code here', (err) => {
if (err) throw err;
// console.log('The file has been emptied!');
})
<<<<<<<
setTimeout(() => {
newEditor.webContents.send('editorMsg', arg);
}, 1000);
newEditor.on('close', (event) => {
newEditor.webContents.send('editorClose');
});
newEditor.on('closed', (event) => {
if (mainWindow) {
mainWindow.webContents.send('updateMain');
global.newEditor = null;
}
=======
newEditor.on('closed', () => {
global.newEditor = null;
>>>>>>>
setTimeout(() => {
newEditor.webContents.send('editorMsg', arg);
}, 1000);
newEditor.on('close', (event) => {
newEditor.webContents.send('editorClose');
});
newEditor.on('closed', (event) => {
if (mainWindow) {
mainWindow.webContents.send('updateMain');
global.newEditor = null;
}
<<<<<<<
ipcMain.on('fileUpload', (event, arg) => {
if (global.newEditor) {
global.newEditor.webContents.send('editorMsg', arg);
}
});
ipcMain.on('updateMain', (event) => {
mainWindow.webContents.send('updateMain');
});
ipcMain.on('updateAttr', (event) => {
mainWindow.webContents.send('updateAttr');
});
=======
ipcMain.on('openDataWin', (event, arg) => {
if (!global.dataWin) {
let dataWin = new BrowserWindow({ width: 800, height: 600 });
dataWin.loadURL('file://' + path.join(__dirname, 'src/dataWindow/app/index.html'))
global.dataWin = dataWin;
dataWin.on('closed', () => {
global.dataWin = null;
})
}
});
// pop out live render window
ipcMain.on('popRender', (event, arg) => {
if (!global.newWebView) {
let newWebView = new BrowserWindow({ width: 800, height: 600 });
newWebView.loadURL('file://' + path.resolve(__dirname, 'src/components/temp/temp.html'))
global.newWebView = newWebView;
newWebView.on('closed', function () {
global.newWebView = null;
})
}
});
>>>>>>>
ipcMain.on('fileUpload', (event, arg) => {
if (global.newEditor) {
global.newEditor.webContents.send('editorMsg', arg);
}
});
ipcMain.on('updateMain', (event) => {
mainWindow.webContents.send('updateMain');
});
ipcMain.on('updateAttr', (event) => {
mainWindow.webContents.send('updateAttr');
});
ipcMain.on('openDataWin', (event, arg) => {
if (!global.dataWin) {
let dataWin = new BrowserWindow({ width: 800, height: 600 });
dataWin.loadURL('file://' + path.join(__dirname, 'src/dataWindow/app/index.html'))
global.dataWin = dataWin;
dataWin.on('closed', () => {
global.dataWin = null;
})
}
});
// pop out live render window
ipcMain.on('popRender', (event, arg) => {
if (!global.newWebView) {
let newWebView = new BrowserWindow({ width: 800, height: 600 });
newWebView.loadURL('file://' + path.resolve(__dirname, 'src/components/temp/temp.html'))
global.newWebView = newWebView;
newWebView.on('closed', function () {
global.newWebView = null;
})
}
}); |
<<<<<<<
url: path.resolve(__dirname, 'app/components/temp/temp.html' )
=======
url: path.resolve(__dirname, 'app/components/temp/temp.html'),
>>>>>>>
url: path.resolve(__dirname, 'app/components/temp/temp.html'),
<<<<<<<
const amdRequire = global.require('monaco-editor/min/vs/loader.js').require;
=======
let amdRequire = global.require('monaco-editor/min/vs/loader.js').require;
// var path = require('path');
const fs = require('fs');
>>>>>>>
let amdRequire = global.require('monaco-editor/min/vs/loader.js').require;
// var path = require('path');
const fs = require('fs');
<<<<<<<
// console.log('inside amdRequire');
editor = monaco.editor.create(document.getElementById('editor'), {
=======
editor = monaco.editor.create(document.getElementById('one'), {
>>>>>>>
editor = monaco.editor.create(document.getElementById('editor'), {
<<<<<<<
document.getElementById("editor").onkeyup = () => {
fs.writeFile(path.resolve(__dirname, 'app/components/temp/temp.html'), editor.getValue(), (err) => {
=======
setInterval(function(){
fs.writeFile(path.resolve(__dirname, 'app/components/temp/temp.html'), editor.getValue(), (err) => {
>>>>>>>
setInterval(function(){
fs.writeFile(path.resolve(__dirname, 'app/components/temp/temp.html'), editor.getValue(), (err) => { |
<<<<<<<
=======
// AccountProfileInfo
const accountProfileInfo = {
rui_accountProfileInfoSpacingAfterEmail: "4px",
rui_accountProfileInfoSpacingAfterName: "4px",
rui_accountProfileInfoSpacingBetweenImageAndContent: "16px"
};
// ProfileImage
const profileImage = {
rui_profileImageBackgroundColor: colors.teal,
rui_profileImageInitialsColor: colors.white
};
const cartSummary = {
rui_cartSummaryBackgroundColor: colors.black02,
rui_cartSummaryBorderColor: colors.black10,
rui_cartSummaryBorderWidth: "1px",
rui_cartSummaryDenseBackgroundColor: "transparent",
rui_cartSummaryPaddingLeft: "16px",
rui_cartSummaryPaddingRight: "16px",
rui_cartSummaryPaddingTop: "16px",
rui_cartSummaryPaddingBottom: 0,
rui_cartSummaryLeftColumnColor: colors.coolGrey500,
rui_cartSummaryLeftColumnHeaderColor: colors.coolGrey500,
rui_cartSummaryRightColumnColor: colors.coolGrey500,
rui_cartSummaryRightColumnHeaderColor: colors.black30,
rui_cartSummaryRowDensePaddingBottom: "0.5rem",
rui_cartSummaryRowDensePaddingTop: "0.5rem",
rui_cartSummaryRowPaddingBottom: "16px",
rui_cartSummaryRowPaddingTop: "16px",
rui_cartSummaryTitleColor: colors.coolGrey500,
rui_cartSummaryDiscountColor: colors.forestGreen300,
rui_cartSummaryTotalColor: colors.coolGrey500
};
>>>>>>>
// AccountProfileInfo
const accountProfileInfo = {
rui_accountProfileInfoSpacingAfterEmail: "4px",
rui_accountProfileInfoSpacingAfterName: "4px",
rui_accountProfileInfoSpacingBetweenImageAndContent: "16px"
};
// ProfileImage
const profileImage = {
rui_profileImageBackgroundColor: colors.teal,
rui_profileImageInitialsColor: colors.white
};
<<<<<<<
ProgressiveImage: {
backgroundColor: colors.white
},
=======
ProfileImageInitials: {
typography: {
color: colors.white
}
},
>>>>>>>
ProfileImageInitials: {
typography: {
color: colors.white
}
},
ProgressiveImage: {
backgroundColor: colors.white
}, |
<<<<<<<
componentNames: ["Select", "TextInput"],
content: "styleguide/src/sections/Forms.md",
=======
componentNames: ["ErrorsBlock", "Field", "Select", "TextInput"],
content: "src/styleguide/sections/Forms.md",
>>>>>>>
componentNames: ["ErrorsBlock", "Field", "Select", "TextInput"],
content: "styleguide/src/sections/Forms.md", |
<<<<<<<
const defaultClearIcon = <svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 14" style={{ height: "100%", maxHeight: "100%", verticalAlign: "middle" }}><path d="M9.926 9.105l-2.105-2.105 2.105-2.105-0.82-0.82-2.105 2.105-2.105-2.105-0.82 0.82 2.105 2.105-2.105 2.105 0.82 0.82 2.105-2.105 2.105 2.105zM7 1.176c3.227 0 5.824 2.598 5.824 5.824s-2.598 5.824-5.824 5.824-5.824-2.598-5.824-5.824 2.598-5.824 5.824-5.824z" /></svg>;
// check-circle regular, FontAwesome v5
// https://fontawesome.com/icons/check-circle?style=regular
const defaultValidIcon = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style={{ height: "0.875em", verticalAlign: "middle" }}><path fill="currentColor" d="M256 8C119.033 8 8 119.033 8 256s111.033 248 248 248 248-111.033 248-248S392.967 8 256 8zm0 48c110.532 0 200 89.451 200 200 0 110.532-89.451 200-200 200-110.532 0-200-89.451-200-200 0-110.532 89.451-200 200-200m140.204 130.267l-22.536-22.718c-4.667-4.705-12.265-4.736-16.97-.068L215.346 303.697l-59.792-60.277c-4.667-4.705-12.265-4.736-16.97-.069l-22.719 22.536c-4.705 4.667-4.736 12.265-.068 16.971l90.781 91.516c4.667 4.705 12.265 4.736 16.97.068l172.589-171.204c4.704-4.668 4.734-12.266.067-16.971z"
/>
</svg>;
// exclamation-triangle, FontAwesome v5
// from https://fontawesome.com/icons/exclamation-triangle?style=solid
const defaultInvalidIcon = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512" style={{ height: "0.875em", verticalAlign: "middle" }}>
<path fill="currentColor" d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"
/>
</svg>
const stringDefaultEquals = (value1, value2) => ((value1 || "") === (value2 || ""));
=======
/* eslint-disable max-len */
const defaultClearIcon = (
<svg
version="1.1"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 14 14"
style={{ height: "100%", maxHeight: "100%", verticalAlign: "middle" }}
>
<path d="M9.926 9.105l-2.105-2.105 2.105-2.105-0.82-0.82-2.105 2.105-2.105-2.105-0.82 0.82 2.105 2.105-2.105 2.105 0.82 0.82 2.105-2.105 2.105 2.105zM7 1.176c3.227 0 5.824 2.598 5.824 5.824s-2.598 5.824-5.824 5.824-5.824-2.598-5.824-5.824 2.598-5.824 5.824-5.824z" />
</svg>
);
/* eslint-enable max-len */
const stringDefaultEquals = (value1, value2) => (value1 || "") === (value2 || "");
>>>>>>>
/* eslint-disable max-len */
const defaultClearIcon = (
<svg
version="1.1"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 14 14"
style={{ height: "100%", maxHeight: "100%", verticalAlign: "middle" }}
>
<path d="M9.926 9.105l-2.105-2.105 2.105-2.105-0.82-0.82-2.105 2.105-2.105-2.105-0.82 0.82 2.105 2.105-2.105 2.105 0.82 0.82 2.105-2.105 2.105 2.105zM7 1.176c3.227 0 5.824 2.598 5.824 5.824s-2.598 5.824-5.824 5.824-5.824-2.598-5.824-5.824 2.598-5.824 5.824-5.824z" />
</svg>
);
const defaultValidIcon = (
// check-circle regular, FontAwesome v5
// https://fontawesome.com/icons/check-circle?style=regular
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 512 512"
style={{ height: "0.875em", verticalAlign: "middle" }}
>
<path
fill="currentColor"
d="M256 8C119.033 8 8 119.033 8 256s111.033 248 248 248 248-111.033 248-248S392.967 8 256 8zm0 48c110.532 0 200 89.451 200 200 0 110.532-89.451 200-200 200-110.532 0-200-89.451-200-200 0-110.532 89.451-200 200-200m140.204 130.267l-22.536-22.718c-4.667-4.705-12.265-4.736-16.97-.068L215.346 303.697l-59.792-60.277c-4.667-4.705-12.265-4.736-16.97-.069l-22.719 22.536c-4.705 4.667-4.736 12.265-.068 16.971l90.781 91.516c4.667 4.705 12.265 4.736 16.97.068l172.589-171.204c4.704-4.668 4.734-12.266.067-16.971z" />
</svg>
);
const defaultInvalidIcon = (
// exclamation-triangle, FontAwesome v5
// from https://fontawesome.com/icons/exclamation-triangle?style=solid
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 576 512"
style={{ height: "0.875em", verticalAlign: "middle" }}
>
<path
fill="currentColor"
d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z" />
</svg>
);
/* eslint-enable max-len */
const stringDefaultEquals = (value1, value2) => (value1 || "") === (value2 || "");
<<<<<<<
iconError: defaultInvalidIcon,
iconValid: defaultValidIcon,
=======
iconError: <FontIcon className="fas fa-exclamation-triangle" />,
iconValid: <FontIcon className="far fa-check-circle" />,
>>>>>>>
iconError: defaultInvalidIcon,
iconValid: defaultValidIcon, |
<<<<<<<
"BadgeOverlay",
=======
"AddressForm",
"CheckoutAction",
"CheckoutActionComplete",
"CheckoutActionIncomplete",
>>>>>>>
"AddressForm",
"BadgeOverlay",
"CheckoutAction",
"CheckoutActionComplete",
"CheckoutActionIncomplete", |
<<<<<<<
import {
postIdentification,
fetchCurrentObservation,
loadingDiscussionItem,
fetchObservationsStats,
fetchIdentifiers,
stopLoadingDiscussionItem,
showAlert,
addIdentification
} from "../actions";
import { showDisagreementAlert } from "../ducks/disagreement_alert";
=======
import { submitIdentificationWithConfirmation } from "../actions";
>>>>>>>
import { submitIdentificationWithConfirmation } from "../actions";
import {
postIdentification,
fetchCurrentObservation,
loadingDiscussionItem,
fetchObservationsStats,
fetchIdentifiers,
stopLoadingDiscussionItem,
showAlert,
addIdentification
} from "../actions";
import { showDisagreementAlert } from "../ducks/disagreement_alert";
<<<<<<<
dispatch( loadingDiscussionItem( identification ) );
const boundPostIdentification = ( disagreement ) => {
const params = Object.assign( { }, identification );
if ( _.isNil( identification.disagreement ) ) {
params.disagreement = disagreement;
}
dispatch( postIdentification( params ) )
.catch( ( ) => {
dispatch( stopLoadingDiscussionItem( identification ) );
} )
.then( ( ) => {
dispatch( fetchCurrentObservation( ownProps.observation ) ).then( ( ) => {
$( ".ObservationModal:first" ).find( ".sidebar" ).scrollTop( $( window ).height( ) );
} );
dispatch( fetchObservationsStats( ) );
dispatch( fetchIdentifiers( ) );
} );
};
if ( options.confirmationText ) {
dispatch( showAlert( options.confirmationText, {
title: I18n.t( "heads_up" ),
onConfirm: boundPostIdentification,
onCancel: ( ) => {
dispatch( stopLoadingDiscussionItem( identification ) );
dispatch( addIdentification( ) );
}
} ) );
} else if ( options.potentialDisagreement ) {
dispatch( showDisagreementAlert( {
onDisagree: ( ) => {
boundPostIdentification( true );
},
onBestGuess: boundPostIdentification,
onCancel: ( ) => {
dispatch( stopLoadingDiscussionItem( identification ) );
dispatch( addIdentification( ) );
},
oldTaxon: options.observation.taxon
} ) );
} else {
boundPostIdentification( );
}
=======
const ident = Object.assign( { }, identification, {
observation: ownProps.observation
} );
dispatch( submitIdentificationWithConfirmation( ident, {
confirmationText: options.confirmationText
} ) );
>>>>>>>
const ident = Object.assign( { }, identification, {
observation: ownProps.observation
} );
// dispatch( submitIdentificationWithConfirmation( ident, {
// confirmationText: options.confirmationText
// } ) );
dispatch( loadingDiscussionItem( ident ) );
const boundPostIdentification = ( disagreement ) => {
const params = Object.assign( { }, ident );
if ( _.isNil( ident.disagreement ) ) {
params.disagreement = disagreement;
}
dispatch( postIdentification( params ) )
.catch( ( ) => {
dispatch( stopLoadingDiscussionItem( ident ) );
} )
.then( ( ) => {
dispatch( fetchCurrentObservation( ownProps.observation ) ).then( ( ) => {
$( ".ObservationModal:first" ).find( ".sidebar" ).scrollTop( $( window ).height( ) );
} );
dispatch( fetchObservationsStats( ) );
dispatch( fetchIdentifiers( ) );
} );
};
if ( options.confirmationText ) {
dispatch( showAlert( options.confirmationText, {
title: I18n.t( "heads_up" ),
onConfirm: boundPostIdentification,
onCancel: ( ) => {
dispatch( stopLoadingDiscussionItem( ident ) );
dispatch( addIdentification( ) );
}
} ) );
} else if ( options.potentialDisagreement ) {
dispatch( showDisagreementAlert( {
onDisagree: ( ) => {
boundPostIdentification( true );
},
onBestGuess: boundPostIdentification,
onCancel: ( ) => {
dispatch( stopLoadingDiscussionItem( ident ) );
dispatch( addIdentification( ) );
},
oldTaxon: options.observation.taxon
} ) );
} else {
boundPostIdentification( );
} |
<<<<<<<
=======
"identify_observations": "Разпознай наблюдения",
>>>>>>>
"identify_observations": "Разпознай наблюдения",
<<<<<<<
=======
"identify_observations": "Identifiqueu observacions",
>>>>>>>
"identify_observations": "Identifiqueu observacions",
<<<<<<<
=======
"identify_observations": "Identify observations",
>>>>>>>
"identify_observations": "Identify observations",
<<<<<<<
"of_identifiers": "identifiers",
"of_observations": "observations",
"of_observers": "observers",
"of_places": "places",
"of_species": "species",
=======
"of_identifiers": "identifiers",
"of_observations": "observations",
"of_observers": "observers",
"of_places": "places",
"of_species": "species",
"of_this_taxon": "Of this taxon",
>>>>>>>
"of_identifiers": "identifiers",
"of_observations": "observations",
"of_observers": "observers",
"of_places": "places",
"of_species": "species",
"of_this_taxon": "Of this taxon",
<<<<<<<
=======
"identify_observations": "Identificar observaciones",
>>>>>>>
"identify_observations": "Identificar observaciones",
<<<<<<<
=======
"identify_observations": "Identifier les observations",
>>>>>>>
"identify_observations": "Identifier les observations",
<<<<<<<
=======
"identify_observations": "Mengidentifikasi pengamatan",
>>>>>>>
"identify_observations": "Mengidentifikasi pengamatan",
<<<<<<<
=======
"identify_observations": "Identifica osservazioni",
>>>>>>>
"identify_observations": "Identifica osservazioni",
<<<<<<<
=======
"identify_observations": "観察記録をID判定",
>>>>>>>
"identify_observations": "観察記録をID判定",
<<<<<<<
=======
"identify_observations": "Identificar las observacions",
>>>>>>>
"identify_observations": "Identificar las observacions",
<<<<<<<
=======
"identify_observations": "Identifique observações",
>>>>>>>
"identify_observations": "Identifique observações",
<<<<<<<
=======
"identify_observations": "对观察记录进行鉴定",
>>>>>>>
"identify_observations": "对观察记录进行鉴定",
<<<<<<<
=======
"identify_observations": "鑑定觀察",
>>>>>>>
"identify_observations": "鑑定觀察", |
<<<<<<<
"location_private": "Location Private",
=======
"location_private": "Location private",
>>>>>>>
"location_private": "Location Private",
<<<<<<<
"checklist": "Lista de comprobación",
=======
"choose_a_field": "Elige un campo",
>>>>>>>
"choose_a_field": "Elige un campo",
<<<<<<<
"comprehensive_list": "Lista completa",
=======
"compare": "Comparar",
>>>>>>>
"comprehensive_list": "Lista completa",
"compare": "Comparar",
<<<<<<<
"checklist": "Liste de contrôle",
=======
"choose_a_field": "Choisir un champ",
>>>>>>>
"checklist": "Liste de contrôle",
"choose_a_field": "Choisir un champ",
<<<<<<<
"comprehensive_list": "Liste complète",
=======
"community_id_at_species_level_or_lower": "ID de communauté au niveau espèce ou inférieur",
"community_id_heading": "ID de communauté",
"compare": "Comparer",
>>>>>>>
"comprehensive_list": "Liste complète",
"community_id_at_species_level_or_lower": "ID de communauté au niveau espèce ou inférieur",
"community_id_heading": "ID de communauté",
"compare": "Comparer",
<<<<<<<
"observations_map": "Observations/carte",
=======
"observations_annotated_with_annotation": "Observations annotées avec %{annotation}",
>>>>>>>
"observations_map": "Observations/carte",
"observations_annotated_with_annotation": "Observations annotées avec %{annotation}",
<<<<<<<
"checklist": "Checklist",
=======
"choose_a_field": "Scegli un campo",
>>>>>>>
"checklist": "Checklist",
"choose_a_field": "Scegli un campo",
<<<<<<<
"comprehensive_list": "Elenco completo",
=======
"community_id_at_species_level_or_lower": "ID della Comunità a livello di specie o inferiore",
"community_id_heading": "ID della Comunità",
"compare": "Confronta",
>>>>>>>
"comprehensive_list": "Elenco completo",
"community_id_at_species_level_or_lower": "ID della Comunità a livello di specie o inferiore",
"community_id_heading": "ID della Comunità",
"compare": "Confronta",
<<<<<<<
"observations_map": "Osservazioni / Mappa",
=======
"observations_annotated_with_annotation": "Osservazione annotata con %{annotation}",
>>>>>>>
"observations_map": "Osservazioni / Mappa",
"observations_annotated_with_annotation": "Osservazione annotata con %{annotation}",
<<<<<<<
"checklist": "체크리스트",
=======
"choose_a_field": "필드 선택",
>>>>>>>
"checklist": "체크리스트",
"choose_a_field": "필드 선택",
<<<<<<<
"comprehensive_list": "포괄적 목록",
=======
"community_id_heading": "공동체 ID",
"compare": "비교하기",
>>>>>>>
"community_id_heading": "공동체 ID",
"compare": "비교하기",
<<<<<<<
"checklist": "检查表",
=======
"choose_a_field": "选择字段",
>>>>>>>
"choose_a_field": "选择字段",
<<<<<<<
"comprehensive_list": "综合分析列表",
=======
"community_id_heading": "社群ID",
"compare": "比较",
>>>>>>>
"community_id_heading": "社群ID",
"compare": "比较", |
<<<<<<<
mode={this.props.mode}
size={this.props.size}
=======
key="datetime"
>>>>>>>
key="datetime"
mode={this.props.mode}
size={this.props.size}
<<<<<<<
defaultText={ this.props.defaultText || "" }
inputFormat={ this.props.inputFormat || "MM/DD/YY h:mm A ZZ" }
inputProps={ {
onClick: () => {
if ( this.refs.datetime ) {
this.refs.datetime.onClick( );
const domNode = ReactDOM.findDOMNode( this.refs.datetime );
$( "input", domNode ).focus( );
}
}
}}
onChange={ e => {
const domNode = ReactDOM.findDOMNode( this.refs.datetime );
let inputValue = $( "input", domNode ).val( );
const eInt = parseInt( e, 10 );
if ( e && eInt ) {
const pickedDate = new Date( eInt );
if ( pickedDate ) {
inputValue = moment( pickedDate ).format(
this.props.inputFormat || "MM/DD/YY h:mm A ZZ"
);
}
}
this.props.onChange( inputValue );
} }
=======
inputFormat="YYYY/MM/DD h:mm A ZZ"
onChange={ this.onChange }
>>>>>>>
defaultText={ this.props.defaultText || "" }
inputFormat="YYYY/MM/DD h:mm A ZZ"
onChange={ this.onChange }
<<<<<<<
defaultText: PropTypes.string,
mode: PropTypes.string,
inputFormat: PropTypes.string,
size: PropTypes.string,
dateTime: PropTypes.oneOfType( [
React.PropTypes.string,
React.PropTypes.number,
React.PropTypes.object
] )
=======
onSelection: PropTypes.func,
reactKey: PropTypes.string
>>>>>>>
onSelection: PropTypes.func,
reactKey: PropTypes.string
defaultText: PropTypes.string,
mode: PropTypes.string,
inputFormat: PropTypes.string,
size: PropTypes.string,
dateTime: PropTypes.oneOfType( [
React.PropTypes.string,
React.PropTypes.number,
React.PropTypes.object
] ) |
<<<<<<<
"add_photos_to_this_observation": "Add photos to this observation",
"add_tag": "Add tag",
"add_tags": "Add tags",
"add_to_a_project": "Add to a project",
"add_to_favorites": "Add to favorites",
"add_to_project": "Add to project",
=======
"add_photos_to_this_observation": "Add Photos to This Observation",
"add_plant_phenology_budding_annotation": "Add \"Plant Phenology: Budding\" annotation",
"add_plant_phenology_flowering_annotation": "Add \"Plant Phenology: Flowering\" annotation",
"add_plant_phenology_fruiting_annotation": "Add \"Plant Phenology: Fruiting\" annotation",
"add_tag": "Add Tag",
"add_tags": "Add Tags",
"add_to_a_project": "Add to a Project",
"add_to_favorites": "Add to Favorites",
"add_to_project": "Add to Project",
>>>>>>>
"add_photos_to_this_observation": "Add Photos to This Observation",
"add_tag": "Add Tag",
"add_tags": "Add Tags",
"add_to_a_project": "Add to a Project",
"add_to_favorites": "Add to Favorites",
"add_to_project": "Add to Project",
<<<<<<<
"feature_this_project_": "Feature this project",
"featured": "featured",
"featured_": "Featured",
"featuring": "Featuring",
=======
"feature_this_project": "Feature this project?",
"featured": "Featured",
>>>>>>>
"feature_this_project_": "Feature this project",
"featured": "Featured",
"featuring": "Featuring",
<<<<<<<
=======
"random": "Random",
>>>>>>>
"random": "Random",
<<<<<<<
"kingdom": "kingdom",
"subkingdom": "subkingdom",
"phylum": "phylum",
"subphylum": "subphylum",
"superclass": "superclass",
"class": "class",
"subclass": "subclass",
"infraclass": "infraclass",
"subterclass": "subterclass",
"superorder": "superorder",
"order": "order",
"suborder": "suborder",
"infraorder": "infraorder",
"parvorder": "parvorder",
"zoosection": "zoosection",
"zoosubsection": "zoosubsection",
"superfamily": "superfamily",
"epifamily": "epifamily",
"family": "family",
"subfamily": "subfamily",
"supertribe": "supertribe",
"tribe": "tribe",
"subtribe": "subtribe",
"genus": "genus",
"genushybrid": "genushybrid",
"subgenus": "subgenus",
"section": "section",
"subsection": "subsection",
"species": "species",
"hybrid": "hybrid",
"subspecies": "subspecies",
"variety": "variety",
"form": "form",
"infrahybrid": "infrahybrid",
"leaves": "leaves"
=======
"kingdom": "Kingdom",
"subkingdom": "Subkingdom",
"phylum": "Phylum",
"subphylum": "Subphylum",
"superclass": "Superclass",
"class": "Class",
"subclass": "Subclass",
"infraclass": "Infraclass",
"superorder": "Superorder",
"order": "Order",
"suborder": "Suborder",
"infraorder": "Infraorder",
"parvorder": "Parvorder",
"zoosection": "Zoosection",
"zoosubsection": "Zoosubsection",
"superfamily": "Superfamily",
"epifamily": "Epifamily",
"family": "Family",
"subfamily": "Subfamily",
"supertribe": "Supertribe",
"tribe": "Tribe",
"subtribe": "Subtribe",
"genus": "Genus",
"genushybrid": "Genushybrid",
"subgenus": "Subgenus",
"section": "Section",
"subsection": "Subsection",
"species": "Species",
"hybrid": "Hybrid",
"subspecies": "Subspecies",
"variety": "Variety",
"form": "Form",
"infrahybrid": "Infrahybrid",
"leaves": "Leaves"
>>>>>>>
"kingdom": "Kingdom",
"subkingdom": "Subkingdom",
"phylum": "Phylum",
"subphylum": "Subphylum",
"superclass": "Superclass",
"class": "Class",
"subclass": "Subclass",
"infraclass": "Infraclass",
"superorder": "Superorder",
"order": "Order",
"suborder": "Suborder",
"infraorder": "Infraorder",
"subterclass": "Subterclass",
"parvorder": "Parvorder",
"zoosection": "Zoosection",
"zoosubsection": "Zoosubsection",
"superfamily": "Superfamily",
"epifamily": "Epifamily",
"family": "Family",
"subfamily": "Subfamily",
"supertribe": "Supertribe",
"tribe": "Tribe",
"subtribe": "Subtribe",
"genus": "Genus",
"genushybrid": "Genushybrid",
"subgenus": "Subgenus",
"section": "Section",
"subsection": "Subsection",
"species": "Species",
"hybrid": "Hybrid",
"subspecies": "Subspecies",
"variety": "Variety",
"form": "Form",
"infrahybrid": "Infrahybrid",
"leaves": "Leaves"
<<<<<<<
"similar_species": "Similar species",
"site_admin_tools": "Site admin tools",
=======
"similar_species": "Similar Species",
>>>>>>>
"similar_species": "Similar Species",
"site_admin_tools": "Site admin tools", |
<<<<<<<
import disagreementAlert from "../ducks/disagreement_alert";
=======
import suggestions from "../ducks/suggestions";
import controlledTerms from "../../show/ducks/controlled_terms";
import qualityMetrics from "../../show/ducks/quality_metrics";
import flaggingModal from "../../show/ducks/flagging_modal";
import subscriptions from "../../show/ducks/subscriptions";
>>>>>>>
import suggestions from "../ducks/suggestions";
import controlledTerms from "../../show/ducks/controlled_terms";
import qualityMetrics from "../../show/ducks/quality_metrics";
import flaggingModal from "../../show/ducks/flagging_modal";
import subscriptions from "../../show/ducks/subscriptions";
import disagreementAlert from "../ducks/disagreement_alert";
<<<<<<<
alert,
disagreementAlert
=======
alert,
suggestions,
controlledTerms,
qualityMetrics,
flaggingModal,
subscriptions
>>>>>>>
alert,
suggestions,
controlledTerms,
qualityMetrics,
flaggingModal,
subscriptions,
disagreementAlert |
<<<<<<<
const params = { id: state.project.id, per_page: 100, order: "login" };
return inatjs.projects.members( params ).then( response => {
=======
const params = { id: state.project.id, per_page: 100 };
if ( state.config.currentUser ) {
params.ttl = -1;
}
return inatjs.projects.followers( params ).then( response => {
>>>>>>>
const params = { id: state.project.id, per_page: 100, order: "login" };
if ( state.config.currentUser ) {
params.ttl = -1;
}
return inatjs.projects.members( params ).then( response => { |
<<<<<<<
COMMON_CREATEWALLET: 'Create Wallet',
COMMON_LOGIN: 'Login',
HOMEPAGE_ADDRESSEXAMPLE: '(e.g. 1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P)',
HOMEPAGE_BALANCECHECK:'Balance Check',
HOMEPAGE_CHECKBALANCE: 'Check Balance',
HOMEPAGE_ENTERVALIDADDRESS:'Enter a valid Bitcoin Address ',
HOMEPAGE_WELCOME: 'Welcome to Omniwallet',
NAVIGATION_CREATE: 'Create Wallet',
NAVIGATION_WALLET: 'My Wallet',
=======
COMMON_VALUE: 'Value',
HOMEPAGE_BALANCECHECK: 'Balance Check',
HOMEPAGE_BROWSERRECOMMENDATION: 'Omniwallet recommends the use of Chrome, since the wallet may not yet function perfectly on other browsers.',
HOMEPAGE_ENTERVALIDADDRESS: 'Enter a valid Bitcoin Address, e.g. 1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P',
NAVIGATION_ABOUT:'About',
NAVIGATION_ABOUTOMNI:'About Omniwallet',
NAVIGATION_ABOUTMSC:'About Mastercoin',
NAVIGATION_ACCOUNT:'My Account',
>>>>>>>
COMMON_VALUE: 'Value',
COMMON_CREATEWALLET: 'Create Wallet',
COMMON_LOGIN: 'Login',
HOMEPAGE_ADDRESSEXAMPLE: '(e.g. 1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P)',
HOMEPAGE_BALANCECHECK:'Balance Check',
HOMEPAGE_CHECKBALANCE: 'Check Balance',
HOMEPAGE_ENTERVALIDADDRESS:'Enter a valid Bitcoin Address ',
HOMEPAGE_WELCOME: 'Welcome to Omniwallet',
NAVIGATION_ABOUT:'About',
NAVIGATION_ABOUTOMNI:'About Omniwallet',
NAVIGATION_ABOUTMSC:'About Mastercoin',
NAVIGATION_ACCOUNT:'My Account', |
<<<<<<<
"value": appraiser.getValue(currencyItem.value, currencyItem.symbol),
"private": hasPrivate,
"offline": isOffline
=======
"value": appraiser.getValue(currencyItem.value, currencyItem.symbol, currencyItem.divisible),
"private": hasPrivate
>>>>>>>
"value": appraiser.getValue(currencyItem.value, currencyItem.symbol, currencyItem.divisible),
"private": hasPrivate,
"offline": isOffline |
<<<<<<<
$('.togglesmall').each(function(index, html) {
var switchery = new Switchery(html,
{
size: 'small',
color: '#59aa29',
secondaryColor: '#c4c4c4'
});
$(html).removeClass('togglesmall');
});
$('.toggle').each(function(index, html) {
var switchery = new Switchery(html,
{
color: '#59aa29',
secondaryColor: '#c4c4c4'
});
$(html).removeClass('toggle');
});
$('.togglemedium').each(function(index, html) {
var switchery = new Switchery(html,
{
className: 'switcherymid',
color: '#59aa29',
secondaryColor: '#c4c4c4'
});
$(html).removeClass('togglemedium');
});
// loading tooltip
jQuery(document).ready(function($) {
$('cf_tip').each(function() { // Grab all ".cf_tip" elements, and for each...
log(this); // ...print out "this", which now refers to each ".cf_tip" DOM element
});
$('.cf_tip').each(function() {
$(this).jBox('Tooltip', {
content: $(this).children('.cf_tooltiptext'),
delayOpen: 100,
delayClose: 100,
position: {
x: 'right',
y: 'center'
},
outside: 'x'
});
});
});
// Build link to in-use CF version documentation
var documentationButton = $('div#content #button-documentation');
documentationButton.html("Documentation for "+CONFIG.flightControllerVersion);
documentationButton.attr("href","https://github.com/cleanflight/cleanflight/tree/v{0}/docs".format(CONFIG.flightControllerVersion));
=======
>>>>>>> |
<<<<<<<
loggedIn : false,
disclaimerSeen : false
=======
walletMetadata: { currencies : [] },
loggedIn : false
>>>>>>>
walletMetadata: { currencies : [] },
loggedIn : false,
disclaimerSeen : false |
<<<<<<<
angular.module('omniwallet', [
'ngRoute',
'ui.bootstrap',
'ui.bootstrap.popover'
],
function($routeProvider, $locationProvider) {
=======
var app = angular.module('omniwallet', ['ngRoute'],
function($routeProvider, $locationProvider, $httpProvider) {
$httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8';
$httpProvider.defaults.transformRequest = [TransformRequest];
>>>>>>>
angular.module('omniwallet', [
'ngRoute',
'ui.bootstrap',
'ui.bootstrap.popover'
],
function($routeProvider, $locationProvider, $httpProvider) {
$httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8';
$httpProvider.defaults.transformRequest = [TransformRequest];
<<<<<<<
function HomeCtrl($templateCache) {
//DEV ONLY
$templateCache.removeAll()
=======
function SimpleSendController($scope, userService) {
var wallet = userService.getWallet();
MySimpleSendHelpers(wallet);
}
function HomeCtrl($templateCache) {
$templateCache.removeAll();
>>>>>>>
function SimpleSendController($scope, userService) {
var wallet = userService.getWallet();
MySimpleSendHelpers(wallet);
}
function HomeCtrl($templateCache) {
$templateCache.removeAll();
<<<<<<<
}
angular.module('omniwallet').directive('omSelect', function() {
return {
template: '<div class="form-inline col-xs-4"> \
{{text}} \
<select class="form-control"> \
<option ng-repeat="option in options"> {{option}} </option> \
</select> \
</div> ',
scope: {
localOptions: '@options'
},
link: function link(scope, iElement, iAttrs) {
//DEBUG console.log(typeof iAttrs.options, scope)
scope.options = JSON.parse(scope.localOptions)
scope.text = iAttrs.text
}
}
});
angular.module('omniwallet').directive('omInput', function() {
return {
template: '<div class="input-group"> \
<span class="input-group-addon"> {{text}} </span> \
<input type="text" class="form-control"> \
</div>',
scope: {
addons: '@'
},
link: function link(scope, iElement, iAttrs) {
scope.text = iAttrs.text
iElement.find('.input-group').addClass(iAttrs.addclass)
if( iAttrs.value )
iElement.find('.form-control').attr('value',iAttrs.value)
else
iElement.find('.form-control').attr('placeholder',iAttrs.placeholder)
if( iAttrs.disable ) {
iElement.find('.form-control').attr('disabled','')
}
if( iAttrs.addons ) {
scope.addons = iAttrs.addons.split(',');
for( var i = scope.addons.length-1; i >= 0; i--) {
iElement.find('.form-control')
.after('<span class="input-group-addon">' + scope.addons[i] + ' </span>');
}
}
}
}
});
=======
}
app.factory('userService', ['$rootScope', function ($rootScope) {
// Rewire to use localstorage
var service = {
data: {
loggedIn: false,
username: '',
uuid: '',
addresses: [
{
privateKey: '',
address: ''
}
]
},
saveSession: function () {
localStorage["Wallet"] = angular.toJson(service.data)
},
restoreSession: function() {
service.data = angular.fromJson(localStorage["Wallet"]);
}
};
// $rootScope.$watch('userService.data', function(newVal, oldVal) {
// console.log("watched");
// $rootScope.$broadcast('savestate');
// }, true);
$rootScope.$on("savestate", service.saveSession);
$rootScope.$on("restorestate", service.restoreSession);
return service;
}]);
function TransformRequest(data) {
var param = function(obj) {
var query = '';
var name, value, fullSubName, subName, subValue, innerObj, i;
for(name in obj) {
value = obj[name];
if(value instanceof Array) {
for(i=0; i<value.length; ++i) {
subValue = value[i];
fullSubName = name + '[' + i + ']';
innerObj = {};
innerObj[fullSubName] = subValue;
query += param(innerObj) + '&';
}
}
else if(value instanceof Object) {
for(subName in value) {
subValue = value[subName];
fullSubName = name + '[' + subName + ']';
innerObj = {};
innerObj[fullSubName] = subValue;
query += param(innerObj) + '&';
}
}
else if(value !== undefined && value !== null) {
query += encodeURIComponent(name) + '=' + encodeURIComponent(value) + '&';
}
}
return query.length ? query.substr(0, query.length - 1) : query;
};
return angular.isObject(data) && String(data) !== '[object File]' ? param(data) : data;
}
>>>>>>>
}
angular.module('omniwallet').directive('omSelect', function() {
return {
template: '<div class="form-inline col-xs-4"> \
{{text}} \
<select class="form-control"> \
<option ng-repeat="option in options"> {{option}} </option> \
</select> \
</div> ',
scope: {
localOptions: '@options'
},
link: function link(scope, iElement, iAttrs) {
//DEBUG console.log(typeof iAttrs.options, scope)
scope.options = JSON.parse(scope.localOptions)
scope.text = iAttrs.text
}
}
});
angular.module('omniwallet').directive('omInput', function() {
return {
template: '<div class="input-group"> \
<span class="input-group-addon"> {{text}} </span> \
<input type="text" class="form-control"> \
</div>',
scope: {
addons: '@'
},
link: function link(scope, iElement, iAttrs) {
scope.text = iAttrs.text
iElement.find('.input-group').addClass(iAttrs.addclass)
if( iAttrs.value )
iElement.find('.form-control').attr('value',iAttrs.value)
else
iElement.find('.form-control').attr('placeholder',iAttrs.placeholder)
if( iAttrs.disable ) {
iElement.find('.form-control').attr('disabled','')
}
if( iAttrs.addons ) {
scope.addons = iAttrs.addons.split(',');
for( var i = scope.addons.length-1; i >= 0; i--) {
iElement.find('.form-control')
.after('<span class="input-group-addon">' + scope.addons[i] + ' </span>');
}
}
}
}
});
app.factory('userService', ['$rootScope', function ($rootScope) {
// Rewire to use localstorage
var service = {
data: {
loggedIn: false,
username: '',
uuid: '',
addresses: [
{
privateKey: '',
address: ''
}
]
},
saveSession: function () {
localStorage["Wallet"] = angular.toJson(service.data)
},
restoreSession: function() {
service.data = angular.fromJson(localStorage["Wallet"]);
}
};
// $rootScope.$watch('userService.data', function(newVal, oldVal) {
// console.log("watched");
// $rootScope.$broadcast('savestate');
// }, true);
$rootScope.$on("savestate", service.saveSession);
$rootScope.$on("restorestate", service.restoreSession);
return service;
}]);
function TransformRequest(data) {
var param = function(obj) {
var query = '';
var name, value, fullSubName, subName, subValue, innerObj, i;
for(name in obj) {
value = obj[name];
if(value instanceof Array) {
for(i=0; i<value.length; ++i) {
subValue = value[i];
fullSubName = name + '[' + i + ']';
innerObj = {};
innerObj[fullSubName] = subValue;
query += param(innerObj) + '&';
}
}
else if(value instanceof Object) {
for(subName in value) {
subValue = value[subName];
fullSubName = name + '[' + subName + ']';
innerObj = {};
innerObj[fullSubName] = subValue;
query += param(innerObj) + '&';
}
}
else if(value !== undefined && value !== null) {
query += encodeURIComponent(name) + '=' + encodeURIComponent(value) + '&';
}
}
return query.length ? query.substr(0, query.length - 1) : query;
};
return angular.isObject(data) && String(data) !== '[object File]' ? param(data) : data;
} |
<<<<<<<
// Quick regexp-escaping function, because JS doesn't have RegExp.escape().
var escapeRegExp = function(s) { return s.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1'); };
=======
// Save bytes in the minified (but not gzipped) version:
var ArrayPrototype = Array.prototype;
>>>>>>>
// Quick regexp-escaping function, because JS doesn't have RegExp.escape().
var escapeRegExp = function(s) { return s.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1'); };
// Save bytes in the minified (but not gzipped) version:
var ArrayPrototype = Array.prototype; |
<<<<<<<
MSP.send_message(MSPCodes.MSP_BF_CONFIG, false, false, load_serial_config);
}
function load_serial_config() {
var next_callback = load_rc_map;
if (semver.lt(CONFIG.apiVersion, "1.6.0")) {
MSP.send_message(MSPCodes.MSP_CF_SERIAL_CONFIG, false, false, next_callback);
} else {
next_callback();
}
}
function load_rc_map() {
MSP.send_message(MSPCodes.MSP_RX_MAP, false, false, load_misc);
=======
MSP.send_message(MSP_codes.MSP_BF_CONFIG, false, false, load_misc);
>>>>>>>
MSP.send_message(MSPCodes.MSP_BF_CONFIG, false, false, load_misc);
<<<<<<<
var next_callback = load_loop_time;
if (semver.gte(CONFIG.apiVersion, "1.8.0")) {
MSP.send_message(MSPCodes.MSP_ARMING_CONFIG, false, false, next_callback);
} else {
next_callback();
}
=======
MSP.send_message(MSP_codes.MSP_ARMING_CONFIG, false, false, load_loop_time);
>>>>>>>
MSP.send_message(MSPCodes.MSP_ARMING_CONFIG, false, false, load_loop_time);
<<<<<<<
var next_callback = load_rx_config;
if (semver.gte(CONFIG.apiVersion, "1.8.0")) {
MSP.send_message(MSPCodes.MSP_LOOP_TIME, false, false, next_callback);
} else {
next_callback();
}
=======
MSP.send_message(MSP_codes.MSP_LOOP_TIME, false, false, load_rx_config);
>>>>>>>
MSP.send_message(MSPCodes.MSP_LOOP_TIME, false, false, load_rx_config);
<<<<<<<
var next_callback = load_sensor_alignment;
if (semver.gte(CONFIG.apiVersion, "1.14.0")) {
MSP.send_message(MSPCodes.MSP_3D, false, false, next_callback);
} else {
next_callback();
}
=======
MSP.send_message(MSP_codes.MSP_3D, false, false, load_sensor_alignment);
>>>>>>>
MSP.send_message(MSPCodes.MSP_3D, false, false, load_sensor_alignment);
<<<<<<<
var next_callback = loadAdvancedConfig;
if (semver.gte(CONFIG.apiVersion, "1.15.0")) {
MSP.send_message(MSPCodes.MSP_SENSOR_ALIGNMENT, false, false, next_callback);
} else {
next_callback();
}
=======
MSP.send_message(MSP_codes.MSP_SENSOR_ALIGNMENT, false, false, loadAdvancedConfig);
>>>>>>>
MSP.send_message(MSPCodes.MSP_SENSOR_ALIGNMENT, false, false, loadAdvancedConfig);
<<<<<<<
function save_serial_config() {
if (semver.lt(CONFIG.apiVersion, "1.6.0")) {
MSP.send_message(MSPCodes.MSP_SET_CF_SERIAL_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_CF_SERIAL_CONFIG), false, save_misc);
} else {
save_misc();
}
}
=======
>>>>>>>
<<<<<<<
var next_callback = save_sensor_alignment;
if(semver.gte(CONFIG.apiVersion, "1.14.0")) {
MSP.send_message(MSPCodes.MSP_SET_3D, mspHelper.crunch(MSPCodes.MSP_SET_3D), false, next_callback);
} else {
next_callback();
}
=======
MSP.send_message(MSP_codes.MSP_SET_3D, MSP.crunch(MSP_codes.MSP_SET_3D), false, save_sensor_alignment);
>>>>>>>
MSP.send_message(MSPCodes.MSP_SET_3D, mspHelper.crunch(MSPCodes.MSP_SET_3D), false, save_sensor_alignment);
<<<<<<<
var next_callback = save_acc_trim;
if(semver.gte(CONFIG.apiVersion, "1.15.0")) {
MSP.send_message(MSPCodes.MSP_SET_SENSOR_ALIGNMENT, mspHelper.crunch(MSPCodes.MSP_SET_SENSOR_ALIGNMENT), false, next_callback);
} else {
next_callback();
}
=======
MSP.send_message(MSP_codes.MSP_SET_SENSOR_ALIGNMENT, MSP.crunch(MSP_codes.MSP_SET_SENSOR_ALIGNMENT), false, save_acc_trim);
>>>>>>>
MSP.send_message(MSPCodes.MSP_SET_SENSOR_ALIGNMENT, mspHelper.crunch(MSPCodes.MSP_SET_SENSOR_ALIGNMENT), false, save_acc_trim);
<<<<<<<
MSP.send_message(MSPCodes.MSP_SET_ACC_TRIM, mspHelper.crunch(MSPCodes.MSP_SET_ACC_TRIM), false
, semver.gte(CONFIG.apiVersion, "1.8.0") ? save_arming_config : save_to_eeprom);
=======
MSP.send_message(MSP_codes.MSP_SET_ACC_TRIM, MSP.crunch(MSP_codes.MSP_SET_ACC_TRIM), false, save_arming_config);
>>>>>>>
MSP.send_message(MSPCodes.MSP_SET_ACC_TRIM, mspHelper.crunch(MSPCodes.MSP_SET_ACC_TRIM), false, save_arming_config);
<<<<<<<
MSP.send_message(MSPCodes.MSP_IDENT, false, false, function () {
=======
MSP.send_message(MSP_codes.MSP_IDENT, false, false, function () {
//noinspection JSUnresolvedVariable
>>>>>>>
MSP.send_message(MSPCodes.MSP_IDENT, false, false, function () {
//noinspection JSUnresolvedVariable
<<<<<<<
MSP.send_message(MSPCodes.MSP_SET_BF_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_BF_CONFIG), false, save_serial_config);
=======
MSP.send_message(MSP_codes.MSP_SET_BF_CONFIG, MSP.crunch(MSP_codes.MSP_SET_BF_CONFIG), false, save_misc);
>>>>>>>
MSP.send_message(MSPCodes.MSP_SET_BF_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_BF_CONFIG), false, save_misc);
<<<<<<<
MSP.send_message(MSPCodes.MSP_STATUS);
=======
MSP.send_message(MSP_codes.MSP_STATUS);
if (semver.gte(CONFIG.flightControllerVersion, "1.5.0")) {
MSP.send_message(MSP_codes.MSP_SENSOR_STATUS);
}
>>>>>>>
MSP.send_message(MSPCodes.MSP_STATUS);
if (semver.gte(CONFIG.flightControllerVersion, "1.5.0")) {
MSP.send_message(MSPCodes.MSP_SENSOR_STATUS);
} |
<<<<<<<
(util.isFunction(list.listener) && list.listener === listener)) {
this._events[type] = undefined;
=======
(typeof list.listener === 'function' && list.listener === listener)) {
delete this._events[type];
>>>>>>>
(util.isFunction(list.listener) && list.listener === listener)) {
delete this._events[type]; |
<<<<<<<
return (this[offset] * 0x1000000) +
((this[offset + 1] << 16) |
(this[offset + 2] << 8) |
(this[offset + 3]) >>> 0);
};
=======
return (this[offset] * 0x1000000) +
((this[offset + 1] << 16) |
(this[offset + 2] << 8) |
this[offset + 3]);
};
>>>>>>>
return (this[offset] * 0x1000000) +
((this[offset + 1] << 16) |
(this[offset + 2] << 8) |
this[offset + 3]);
};
<<<<<<<
=======
return (this[offset] << 24) |
(this[offset + 1] << 16) |
(this[offset + 2] << 8) |
(this[offset + 3]);
};
Buffer.prototype.readFloatLE = function(offset, noAssert) {
if (!noAssert)
checkOffset(offset, 4, this.length);
return this.parent.readFloatLE(this.offset + offset, !!noAssert);
};
>>>>>>>
<<<<<<<
this[offset] = value;
this[offset + 1] = (value >>> 8);
return offset + 2;
=======
this[offset] = value;
this[offset + 1] = (value >>> 8);
>>>>>>>
this[offset] = value;
this[offset + 1] = (value >>> 8);
return offset + 2;
<<<<<<<
this[offset] = (value >>> 8);
this[offset + 1] = value;
return offset + 2;
=======
this[offset] = (value >>> 8);
this[offset + 1] = value;
>>>>>>>
this[offset] = (value >>> 8);
this[offset + 1] = value;
return offset + 2;
<<<<<<<
this[offset + 3] = (value >>> 24);
this[offset + 2] = (value >>> 16);
this[offset + 1] = (value >>> 8);
this[offset] = value;
return offset + 4;
=======
this[offset + 3] = (value >>> 24);
this[offset + 2] = (value >>> 16);
this[offset + 1] = (value >>> 8);
this[offset] = value;
>>>>>>>
this[offset + 3] = (value >>> 24);
this[offset + 2] = (value >>> 16);
this[offset + 1] = (value >>> 8);
this[offset] = value;
return offset + 4;
<<<<<<<
this[offset] = (value >>> 24);
this[offset + 1] = (value >>> 16);
this[offset + 2] = (value >>> 8);
this[offset + 3] = value;
return offset + 4;
=======
this[offset] = (value >>> 24);
this[offset + 1] = (value >>> 16);
this[offset + 2] = (value >>> 8);
this[offset + 3] = value;
>>>>>>>
this[offset] = (value >>> 24);
this[offset + 1] = (value >>> 16);
this[offset + 2] = (value >>> 8);
this[offset + 3] = value;
return offset + 4;
<<<<<<<
this[offset] = value;
this[offset + 1] = (value >>> 8);
return offset + 2;
=======
this[offset] = value;
this[offset + 1] = (value >>> 8);
>>>>>>>
this[offset] = value;
this[offset + 1] = (value >>> 8);
return offset + 2;
<<<<<<<
this[offset] = (value >>> 8);
this[offset + 1] = value;
return offset + 2;
=======
this[offset] = (value >>> 8);
this[offset + 1] = value;
>>>>>>>
this[offset] = (value >>> 8);
this[offset + 1] = value;
return offset + 2;
<<<<<<<
this[offset] = value;
this[offset + 1] = (value >>> 8);
this[offset + 2] = (value >>> 16);
this[offset + 3] = (value >>> 24);
return offset + 4;
=======
this[offset] = value;
this[offset + 1] = (value >>> 8);
this[offset + 2] = (value >>> 16);
this[offset + 3] = (value >>> 24);
>>>>>>>
this[offset] = value;
this[offset + 1] = (value >>> 8);
this[offset + 2] = (value >>> 16);
this[offset + 3] = (value >>> 24);
return offset + 4;
<<<<<<<
this[offset] = (value >>> 24);
this[offset + 1] = (value >>> 16);
this[offset + 2] = (value >>> 8);
this[offset + 3] = value;
return offset + 4;
=======
this[offset] = (value >>> 24);
this[offset + 1] = (value >>> 16);
this[offset + 2] = (value >>> 8);
this[offset + 3] = value;
};
Buffer.prototype.writeFloatLE = function(value, offset, noAssert) {
if (!noAssert)
checkOffset(offset, 4, this.length);
this.parent.writeFloatLE(value, this.offset + offset, !!noAssert);
};
Buffer.prototype.writeFloatBE = function(value, offset, noAssert) {
if (!noAssert)
checkOffset(offset, 4, this.length);
this.parent.writeFloatBE(value, this.offset + offset, !!noAssert);
};
Buffer.prototype.writeDoubleLE = function(value, offset, noAssert) {
if (!noAssert)
checkOffset(offset, 8, this.length);
this.parent.writeDoubleLE(value, this.offset + offset, !!noAssert);
};
Buffer.prototype.writeDoubleBE = function(value, offset, noAssert) {
if (!noAssert)
checkOffset(offset, 8, this.length);
this.parent.writeDoubleBE(value, this.offset + offset, !!noAssert);
>>>>>>>
this[offset] = (value >>> 24);
this[offset + 1] = (value >>> 16);
this[offset + 2] = (value >>> 8);
this[offset + 3] = value;
return offset + 4; |
<<<<<<<
assert.ok(os.hostname().length > 0);
assert.ok(os.loadavg().length > 0);
assert.ok(os.uptime() > 0);
assert.ok(os.freemem() > 0);
assert.ok(os.totalmem() > 0);
assert.ok(os.cpus().length > 0);
assert.ok(os.type().length > 0);
assert.ok(os.release().length > 0);
var interfaces = os.getNetworkInterfaces();
console.error(interfaces);
switch (process.platform) {
case 'linux':
assert.equal('127.0.0.1', interfaces.lo.ip);
break;
}
=======
var hostname = os.hostname()
console.log("hostname = %s", hostname);
assert.ok(hostname.length > 0);
var uptime = os.uptime();
console.log("uptime = %d", uptime);
assert.ok(uptime > 0);
var cpus = os.cpus();
console.log("cpus = ", cpus);
assert.ok(cpus.length > 0);
var type = os.type();
console.log("type = ", type);
assert.ok(type.length > 0);
var release = os.release();
console.log("release = ", release);
assert.ok(release.length > 0);
if (process.platform != 'sunos') {
// not implemeneted yet
assert.ok(os.loadavg().length > 0);
assert.ok(os.freemem() > 0);
assert.ok(os.totalmem() > 0);
}
>>>>>>>
var hostname = os.hostname()
console.log("hostname = %s", hostname);
assert.ok(hostname.length > 0);
var uptime = os.uptime();
console.log("uptime = %d", uptime);
assert.ok(uptime > 0);
var cpus = os.cpus();
console.log("cpus = ", cpus);
assert.ok(cpus.length > 0);
var type = os.type();
console.log("type = ", type);
assert.ok(type.length > 0);
var release = os.release();
console.log("release = ", release);
assert.ok(release.length > 0);
if (process.platform != 'sunos') {
// not implemeneted yet
assert.ok(os.loadavg().length > 0);
assert.ok(os.freemem() > 0);
assert.ok(os.totalmem() > 0);
}
var interfaces = os.getNetworkInterfaces();
console.error(interfaces);
switch (process.platform) {
case 'linux':
assert.equal('127.0.0.1', interfaces.lo.ip);
break;
} |
<<<<<<<
expect: 'undefined\r\n' + prompt_unix,
chakracore: 'skip' },
=======
expect: 'undefined\n' + prompt_unix },
>>>>>>>
expect: 'undefined\n' + prompt_unix },
chakracore: 'skip' }, |
<<<<<<<
errExec('throws_error4.js', function(err, stdout, stderr) {
if (!common.isChakraEngine) { // chakra does not output source line
assert.ok(/\/\*\*/.test(stderr));
}
=======
errExec('throws_error4.js', common.mustCall(function(err, stdout, stderr) {
assert.ok(/\/\*\*/.test(stderr));
>>>>>>>
errExec('throws_error4.js', common.mustCall(function(err, stdout, stderr) {
if (!common.isChakraEngine) { // chakra does not output source line
assert.ok(/\/\*\*/.test(stderr));
} |
<<<<<<<
assert.equal(util.inspect({}), '{}');
assert.equal(util.inspect({a: 1}), '{ a: 1 }');
assert.equal(util.inspect({a: function() {}}), common.engineSpecificMessage({
v8: '{ a: [Function: a] }',
chakracore: '{ a: [Function: a] }'
}));
assert.equal(util.inspect({a: 1, b: 2}), '{ a: 1, b: 2 }');
assert.equal(util.inspect({'a': {}}), '{ a: {} }');
assert.equal(util.inspect({'a': {'b': 2}}), '{ a: { b: 2 } }');
assert.equal(util.inspect({'a': {'b': { 'c': { 'd': 2 }}}}),
=======
assert.strictEqual(util.inspect({}), '{}');
assert.strictEqual(util.inspect({a: 1}), '{ a: 1 }');
assert.strictEqual(util.inspect({a: function() {}}), '{ a: [Function: a] }');
assert.strictEqual(util.inspect({a: 1, b: 2}), '{ a: 1, b: 2 }');
assert.strictEqual(util.inspect({'a': {}}), '{ a: {} }');
assert.strictEqual(util.inspect({'a': {'b': 2}}), '{ a: { b: 2 } }');
assert.strictEqual(util.inspect({'a': {'b': { 'c': { 'd': 2 }}}}),
>>>>>>>
assert.strictEqual(util.inspect({}), '{}');
assert.strictEqual(util.inspect({a: 1}), '{ a: 1 }');
assert.strictEqual(util.inspect({a: function() {}}), common.engineSpecificMessage({
v8: '{ a: [Function: a] }',
chakracore: '{ a: [Function: a] }'
}));
assert.strictEqual(util.inspect({a: 1, b: 2}), '{ a: 1, b: 2 }');
assert.strictEqual(util.inspect({'a': {}}), '{ a: {} }');
assert.strictEqual(util.inspect({'a': {'b': 2}}), '{ a: { b: 2 } }');
assert.strictEqual(util.inspect({'a': {'b': { 'c': { 'd': 2 }}}}),
<<<<<<<
assert.equal(util.inspect(value), common.engineSpecificMessage({
v8: '{ [Function: value] aprop: 42 }',
chakracore: '{ [Function: value] aprop: 42 }'
}));
=======
assert.strictEqual(util.inspect(value), '{ [Function: value] aprop: 42 }');
>>>>>>>
assert.strictEqual(util.inspect(value), common.engineSpecificMessage({
v8: '{ [Function: value] aprop: 42 }',
chakracore: '{ [Function: value] aprop: 42 }'
}));
<<<<<<<
assert.equal(util.inspect(Promise.resolve(3)), common.engineSpecificMessage({
v8: 'Promise { 3 }',
chakracore: 'Promise {}'
}));
assert.equal(util.inspect(Promise.reject(3)), common.engineSpecificMessage({
v8: 'Promise { <rejected> 3 }',
chakracore: 'Promise {}'
}));
assert.equal(util.inspect(new Promise(function() {})),
common.engineSpecificMessage({
v8: 'Promise { <pending> }',
chakracore: 'Promise {}'
}));
=======
assert.strictEqual(util.inspect(Promise.resolve(3)), 'Promise { 3 }');
assert.strictEqual(util.inspect(Promise.reject(3)), 'Promise { <rejected> 3 }');
assert.strictEqual(
util.inspect(new Promise(function() {})),
'Promise { <pending> }'
);
>>>>>>>
assert.strictEqual(util.inspect(Promise.resolve(3)), common.engineSpecificMessage({
v8: 'Promise { 3 }',
chakracore: 'Promise {}'
}));
assert.strictEqual(util.inspect(Promise.reject(3)), common.engineSpecificMessage({
v8: 'Promise { <rejected> 3 }',
chakracore: 'Promise {}'
}));
assert.strictEqual(util.inspect(new Promise(function() {})),
common.engineSpecificMessage({
v8: 'Promise { <pending> }',
chakracore: 'Promise {}'
}));
<<<<<<<
assert.equal(util.inspect(promise), common.engineSpecificMessage({
v8: 'Promise { \'foo\', bar: 42 }',
chakracore: 'Promise { bar: 42 }'
}));
=======
assert.strictEqual(util.inspect(promise), 'Promise { \'foo\', bar: 42 }');
>>>>>>>
assert.strictEqual(util.inspect(promise), common.engineSpecificMessage({
v8: 'Promise { \'foo\', bar: 42 }',
chakracore: 'Promise { bar: 42 }'
}));
<<<<<<<
assert.equal(util.inspect(new Promise()), common.engineSpecificMessage({
v8: '{ bar: 42 }',
chakracore: 'Object { \'<unknown>\', bar: 42 }'
}));
=======
assert.strictEqual(util.inspect(new Promise()), '{ bar: 42 }');
>>>>>>>
assert.strictEqual(util.inspect(new Promise()), common.engineSpecificMessage({
v8: '{ bar: 42 }',
chakracore: 'Object { \'<unknown>\', bar: 42 }'
}));
<<<<<<<
assert.equal(util.inspect(new PromiseSubclass(function() {})),
common.engineSpecificMessage({
v8: 'PromiseSubclass { <pending> }',
chakracore: 'PromiseSubclass {}'
}));
=======
assert.strictEqual(util.inspect(new PromiseSubclass(function() {})),
'PromiseSubclass { <pending> }');
>>>>>>>
assert.strictEqual(util.inspect(new PromiseSubclass(function() {})),
common.engineSpecificMessage({
v8: 'PromiseSubclass { <pending> }',
chakracore: 'PromiseSubclass {}'
})); |
<<<<<<<
testPBKDF2('password', 'salt', 2, 20,
'\xea\x6c\x01\x4d\xc7\x2d\x6f\x8c\xcd\x1e\xd9\x2a' +
'\xce\x1d\x41\xf0\xd8\xde\x89\x57');
testPBKDF2('password', 'salt', 4096, 20,
'\x4b\x00\x79\x01\xb7\x65\x48\x9a\xbe\xad\x49\xd9\x26' +
'\xf7\x21\xd0\x65\xa4\x29\xc1');
testPBKDF2('passwordPASSWORDpassword',
'saltSALTsaltSALTsaltSALTsaltSALTsalt',
4096,
25,
'\x3d\x2e\xec\x4f\xe4\x1c\x84\x9b\x80\xc8\xd8\x36\x62' +
'\xc0\xe4\x4a\x8b\x29\x1a\x96\x4c\xf2\xf0\x70\x38');
testPBKDF2('pass\0word', 'sa\0lt', 4096, 16,
'\x56\xfa\x6a\xa7\x55\x48\x09\x9d\xcc\x37\xd7\xf0\x34' +
'\x25\xe0\xc3');
function assertSorted(list) {
for (var i = 0, k = list.length - 1; i < k; ++i) {
var a = list[i + 0];
var b = list[i + 1];
assert(a <= b);
}
}
// Assume that we have at least AES256-SHA.
assert.notEqual(0, crypto.getCiphers());
assert.notEqual(-1, crypto.getCiphers().indexOf('AES256-SHA'));
assertSorted(crypto.getCiphers());
// Assert that we have sha and sha1 but not SHA and SHA1.
assert.notEqual(0, crypto.getHashes());
assert.notEqual(-1, crypto.getHashes().indexOf('sha1'));
assert.notEqual(-1, crypto.getHashes().indexOf('sha'));
assert.equal(-1, crypto.getHashes().indexOf('SHA1'));
assert.equal(-1, crypto.getHashes().indexOf('SHA'));
assertSorted(crypto.getHashes());
(function() {
var c = crypto.createDecipher('aes-128-ecb', '');
assert.throws(function() { c.final('utf8') }, /invalid public key/);
})();
// Base64 padding regression test, see #4837.
(function() {
var c = crypto.createCipher('aes-256-cbc', 'secret');
var s = c.update('test', 'utf8', 'base64') + c.final('base64');
assert.equal(s, '375oxUQCIocvxmC5At+rvA==');
})();
=======
// Error path should not leak memory (check with valgrind).
assert.throws(function() {
crypto.pbkdf2('password', 'salt', 1, 20, null);
});
// Calling Cipher.final() or Decipher.final() twice should error but
// not assert. See #4886.
(function() {
var c = crypto.createCipher('aes-256-cbc', 'secret');
try { c.final('xxx') } catch (e) { /* Ignore. */ }
try { c.final('xxx') } catch (e) { /* Ignore. */ }
try { c.final('xxx') } catch (e) { /* Ignore. */ }
var d = crypto.createDecipher('aes-256-cbc', 'secret');
try { d.final('xxx') } catch (e) { /* Ignore. */ }
try { d.final('xxx') } catch (e) { /* Ignore. */ }
try { d.final('xxx') } catch (e) { /* Ignore. */ }
})();
>>>>>>>
testPBKDF2('password', 'salt', 2, 20,
'\xea\x6c\x01\x4d\xc7\x2d\x6f\x8c\xcd\x1e\xd9\x2a' +
'\xce\x1d\x41\xf0\xd8\xde\x89\x57');
testPBKDF2('password', 'salt', 4096, 20,
'\x4b\x00\x79\x01\xb7\x65\x48\x9a\xbe\xad\x49\xd9\x26' +
'\xf7\x21\xd0\x65\xa4\x29\xc1');
testPBKDF2('passwordPASSWORDpassword',
'saltSALTsaltSALTsaltSALTsaltSALTsalt',
4096,
25,
'\x3d\x2e\xec\x4f\xe4\x1c\x84\x9b\x80\xc8\xd8\x36\x62' +
'\xc0\xe4\x4a\x8b\x29\x1a\x96\x4c\xf2\xf0\x70\x38');
testPBKDF2('pass\0word', 'sa\0lt', 4096, 16,
'\x56\xfa\x6a\xa7\x55\x48\x09\x9d\xcc\x37\xd7\xf0\x34' +
'\x25\xe0\xc3');
function assertSorted(list) {
for (var i = 0, k = list.length - 1; i < k; ++i) {
var a = list[i + 0];
var b = list[i + 1];
assert(a <= b);
}
}
// Assume that we have at least AES256-SHA.
assert.notEqual(0, crypto.getCiphers());
assert.notEqual(-1, crypto.getCiphers().indexOf('AES256-SHA'));
assertSorted(crypto.getCiphers());
// Assert that we have sha and sha1 but not SHA and SHA1.
assert.notEqual(0, crypto.getHashes());
assert.notEqual(-1, crypto.getHashes().indexOf('sha1'));
assert.notEqual(-1, crypto.getHashes().indexOf('sha'));
assert.equal(-1, crypto.getHashes().indexOf('SHA1'));
assert.equal(-1, crypto.getHashes().indexOf('SHA'));
assertSorted(crypto.getHashes());
(function() {
var c = crypto.createDecipher('aes-128-ecb', '');
assert.throws(function() { c.final('utf8') }, /invalid public key/);
})();
// Base64 padding regression test, see #4837.
(function() {
var c = crypto.createCipher('aes-256-cbc', 'secret');
var s = c.update('test', 'utf8', 'base64') + c.final('base64');
assert.equal(s, '375oxUQCIocvxmC5At+rvA==');
})();
// Error path should not leak memory (check with valgrind).
assert.throws(function() {
crypto.pbkdf2('password', 'salt', 1, 20, null);
});
// Calling Cipher.final() or Decipher.final() twice should error but
// not assert. See #4886.
(function() {
var c = crypto.createCipher('aes-256-cbc', 'secret');
try { c.final('xxx') } catch (e) { /* Ignore. */ }
try { c.final('xxx') } catch (e) { /* Ignore. */ }
try { c.final('xxx') } catch (e) { /* Ignore. */ }
var d = crypto.createDecipher('aes-256-cbc', 'secret');
try { d.final('xxx') } catch (e) { /* Ignore. */ }
try { d.final('xxx') } catch (e) { /* Ignore. */ }
try { d.final('xxx') } catch (e) { /* Ignore. */ }
})(); |
<<<<<<<
if (common.isChakraEngine) {
console.log('1..0 # Skipped: This test is disabled for chakra engine ' +
'because debugger support is not implemented yet.');
return;
}
const PORT_MIN = common.PORT + 1337;
=======
const PORT_MIN = common.PORT;
>>>>>>>
if (common.isChakraEngine) {
console.log('1..0 # Skipped: This test is disabled for chakra engine ' +
'because debugger support is not implemented yet.');
return;
}
const PORT_MIN = common.PORT; |
<<<<<<<
{
client: client_unix, send: 'a = 3.5e',
expect: /^SyntaxError: Invalid or unexpected token/
},
].filter((v) => !common.engineSpecificMessage(v)));
=======
{ client: client_unix, send: 'a = 3.5e',
expect: /^SyntaxError: Invalid or unexpected token/ },
// Mitigate https://github.com/nodejs/node/issues/548
{ client: client_unix, send: 'function name(){ return "node"; };name()',
expect: "'node'\n" + prompt_unix },
{ client: client_unix, send: 'function name(){ return "nodejs"; };name()',
expect: "'nodejs'\n" + prompt_unix },
]);
>>>>>>>
{
client: client_unix, send: 'a = 3.5e',
expect: /^SyntaxError: Invalid or unexpected token/ },
// Mitigate https://github.com/nodejs/node/issues/548
{ client: client_unix, send: 'function name(){ return "node"; };name()',
expect: "'node'\n" + prompt_unix },
{ client: client_unix, send: 'function name(){ return "nodejs"; };name()',
expect: "'nodejs'\n" + prompt_unix },
].filter((v) => !common.engineSpecificMessage(v))); |
<<<<<<<
if (!common.isChakraEngine) { // chakra does not show script/source
assert(/bad_syntax\.js:1/.test(arrowMessage));
}
const args = [
'--expose-internals',
'-e',
"require('internal/util').error('foo %d', 5)"
];
const result = spawnSync(process.argv[0], args, { encoding: 'utf8' });
assert.strictEqual(result.stderr.indexOf('%'), -1);
assert(/foo 5/.test(result.stderr));
=======
assert(/bad_syntax\.js:1/.test(arrowMessage));
>>>>>>>
if (!common.isChakraEngine) { // chakra does not show script/source
assert(/bad_syntax\.js:1/.test(arrowMessage));
} |
<<<<<<<
var SDCARD = {
supported: false,
state: 0,
filesystemLastError: 0,
freeSizeKB: 0,
totalSizeKB: 0,
};
var BLACKBOX = {
supported: false,
blackboxDevice: 0,
blackboxRateNum: 1,
blackboxRateDenom: 1
};
=======
var RC_deadband = {
deadband: 0,
yaw_deadband: 0,
alt_hold_deadband: 0
};
var SENSOR_ALIGNMENT = {
align_gyro: 0,
align_acc: 0,
align_mag: 0
};
>>>>>>>
var SDCARD = {
supported: false,
state: 0,
filesystemLastError: 0,
freeSizeKB: 0,
totalSizeKB: 0,
};
var BLACKBOX = {
supported: false,
blackboxDevice: 0,
blackboxRateNum: 1,
blackboxRateDenom: 1
};
var RC_deadband = {
deadband: 0,
yaw_deadband: 0,
alt_hold_deadband: 0
};
var SENSOR_ALIGNMENT = {
align_gyro: 0,
align_acc: 0,
align_mag: 0
}; |
<<<<<<<
var crypto= require("crypto");
=======
var dns = require('dns');
>>>>>>>
var crypto= require("crypto");
var dns = require('dns');
<<<<<<<
if (this.forceClose) this.forceClose(e);
=======
self.destroy(e);
>>>>>>>
if (this.forceClose) this.forceClose(e);
self.destroy(e);
<<<<<<<
if (self.secure && bytesRead == 0 && secureBytesRead > 0){
// Deal with SSL handshake
if (self.server) {
self._checkForSecureHandshake();
} else {
if (self.secureEstablised) {
self.flush();
} else {
self._checkForSecureHandshake();
}
}
} else if (bytesRead === 0) {
=======
if (bytesRead === 0) {
// EOF
>>>>>>>
if (self.secure && bytesRead == 0 && secureBytesRead > 0){
// Deal with SSL handshake
if (self.server) {
self._checkForSecureHandshake();
} else {
if (self.secureEstablised) {
self.flush();
} else {
self._checkForSecureHandshake();
}
}
} else if (bytesRead === 0) {
<<<<<<<
if (!this.writable) {
if (this.secure) return false;
else throw new Error('Stream is not writable');
}
=======
if (!this.writable) throw new Error('Stream is not writable');
if (data.length == 0) return true;
>>>>>>>
if (!this.writable) {
if (this.secure) return false;
else throw new Error('Stream is not writable');
}
if (data.length == 0) return true; |
<<<<<<<
// Mark a constructor not supporting @@species
function markNoSpeciesConstructor(constructor) {
if (Symbol.species) {
Object.defineProperty(constructor, Symbol.species, {
get: function() { return undefined; },
configurable: true,
});
}
}
function Buffer(arg, encoding) {
=======
/**
* The Buffer() construtor is "soft deprecated" ... that is, it is deprecated
* in the documentation and should not be used moving forward. Rather,
* developers should use one of the three new factory APIs: Buffer.from(),
* Buffer.allocUnsafe() or Buffer.alloc() based on their specific needs. There
* is no hard deprecation because of the extent to which the Buffer constructor
* is used in the ecosystem currently -- a hard deprecation would introduce too
* much breakage at this time. It's not likely that the Buffer constructors
* would ever actually be removed.
**/
function Buffer(arg, encodingOrOffset, length) {
>>>>>>>
// Mark a constructor not supporting @@species
function markNoSpeciesConstructor(constructor) {
if (Symbol.species) {
Object.defineProperty(constructor, Symbol.species, {
get: function() { return undefined; },
configurable: true,
});
}
}
/**
* The Buffer() construtor is "soft deprecated" ... that is, it is deprecated
* in the documentation and should not be used moving forward. Rather,
* developers should use one of the three new factory APIs: Buffer.from(),
* Buffer.allocUnsafe() or Buffer.alloc() based on their specific needs. There
* is no hard deprecation because of the extent to which the Buffer constructor
* is used in the ecosystem currently -- a hard deprecation would introduce too
* much breakage at this time. It's not likely that the Buffer constructors
* would ever actually be removed.
**/
function Buffer(arg, encodingOrOffset, length) { |
<<<<<<<
expect: common.engineSpecificMessage({
v8: /^SyntaxError: Unexpected end of input/,
chakracore: /^SyntaxError: Expected '}'/})
},
=======
expect: /\bSyntaxError: Unexpected end of input/ },
>>>>>>>
expect: common.engineSpecificMessage({
v8: /\bSyntaxError: Unexpected end of input/,
chakracore: /^SyntaxError: Expected '}'/})
},
<<<<<<<
expect: common.engineSpecificMessage({
v8: /^SyntaxError: Unexpected token i/,
chakracore: /^SyntaxError: Invalid character/})
},
=======
expect: /\bSyntaxError: Unexpected token i/ },
>>>>>>>
expect: common.engineSpecificMessage({
v8: /\bSyntaxError: Unexpected token i/,
chakracore: /^SyntaxError: Invalid character/})
},
<<<<<<<
expect: common.engineSpecificMessage({
v8: /^SyntaxError: Unexpected number/,
chakracore: /^SyntaxError: Invalid number/})
},
=======
expect: /\bSyntaxError: Unexpected number/ },
>>>>>>>
expect: common.engineSpecificMessage({
v8: /\bSyntaxError: Unexpected number/,
chakracore: /^SyntaxError: Invalid number/})
},
<<<<<<<
expect: common.engineSpecificMessage({
v8: /^SyntaxError: Unexpected end of JSON input/,
chakracore: /^SyntaxError: Syntax error/})
},
=======
expect: /\bSyntaxError: Unexpected end of JSON input/ },
>>>>>>>
expect: common.engineSpecificMessage({
v8: /\bSyntaxError: Unexpected end of JSON input/,
chakracore: /^SyntaxError: Syntax error/})
},
<<<<<<<
expect: common.engineSpecificMessage({
v8: /^SyntaxError: Invalid regular expression\:/,
chakracore: /^SyntaxError: Expected '\)' in regular expression/})
},
=======
expect: /\bSyntaxError: Invalid regular expression\:/ },
>>>>>>>
expect: common.engineSpecificMessage({
v8: /\bSyntaxError: Invalid regular expression\:/,
chakracore: /^SyntaxError: Expected '\)' in regular expression/})
},
<<<<<<<
expect: common.engineSpecificMessage({
v8: /^SyntaxError: Invalid flags supplied to RegExp constructor/,
chakracore: /^SyntaxError: Syntax error in regular expression/})
},
=======
expect: /\bSyntaxError: Invalid flags supplied to RegExp constructor/ },
>>>>>>>
expect: common.engineSpecificMessage({
v8: /\bSyntaxError: Invalid flags supplied to RegExp constructor/,
chakracore: /^SyntaxError: Syntax error in regular expression/})
},
<<<<<<<
expect: common.engineSpecificMessage({
v8: /^SyntaxError: Octal literals are not allowed in strict mode/,
chakracore: /^SyntaxError: Octal numeric literals and escape characters not allowed in strict mode/})
},
=======
expect: /\bSyntaxError: Octal literals are not allowed in strict mode/ },
>>>>>>>
expect: common.engineSpecificMessage({
v8: /\bSyntaxError: Octal literals are not allowed in strict mode/,
chakracore: /^SyntaxError: Octal numeric literals and escape characters not allowed in strict mode/})
},
<<<<<<<
expect: common.engineSpecificMessage({
v8: /^SyntaxError: Duplicate parameter name not allowed in this context/,
chakracore: /^SyntaxError: Duplicate formal parameter names not allowed in strict mode/})
},
=======
expect: /\bSyntaxError: Duplicate parameter name not allowed in this context/ },
>>>>>>>
expect: common.engineSpecificMessage({
v8: /\bSyntaxError: Duplicate parameter name not allowed in this context/,
chakracore: /^SyntaxError: Duplicate formal parameter names not allowed in strict mode/})
},
<<<<<<<
expect: common.engineSpecificMessage({
v8: /^SyntaxError: Strict mode code may not include a with statement/,
chakracore: /^SyntaxError: 'with' statements are not allowed in strict mode/})
},
=======
expect: /\bSyntaxError: Strict mode code may not include a with statement/ },
>>>>>>>
expect: common.engineSpecificMessage({
v8: /\bSyntaxError: Strict mode code may not include a with statement/,
chakracore: /^SyntaxError: 'with' statements are not allowed in strict mode/})
},
<<<<<<<
expect: common.engineSpecificMessage({
v8: /^SyntaxError: Delete of an unqualified identifier in strict mode/,
chakracore: /^SyntaxError: Calling delete on expression not allowed in strict mode/})
},
=======
expect: /\bSyntaxError: Delete of an unqualified identifier in strict mode/ },
>>>>>>>
expect: common.engineSpecificMessage({
v8: /\bSyntaxError: Delete of an unqualified identifier in strict mode/,
chakracore: /^SyntaxError: Calling delete on expression not allowed in strict mode/})
},
<<<<<<<
expect: common.engineSpecificMessage({
v8: /^SyntaxError: Unexpected eval or arguments in strict mode/,
chakracore: /^SyntaxError: Invalid usage of 'eval' in strict mode/})
},
=======
expect: /\bSyntaxError: Unexpected eval or arguments in strict mode/ },
>>>>>>>
expect: common.engineSpecificMessage({
v8: /\bSyntaxError: Unexpected eval or arguments in strict mode/,
chakracore: /^SyntaxError: Invalid usage of 'eval' in strict mode/})
},
<<<<<<<
expect: common.engineSpecificMessage({
v8: /^SyntaxError: In strict mode code, functions can only be declared at top level or inside a block./,
chakracore: /^SyntaxError: Syntax error/})
},
=======
expect: /\bSyntaxError: In strict mode code, functions can only be declared at top level or inside a block./ },
>>>>>>>
expect: common.engineSpecificMessage({
v8: /\bSyntaxError: In strict mode code, functions can only be declared at top level or inside a block./,
chakracore: /^SyntaxError: Syntax error/})
},
<<<<<<<
expect: 'undefined\n' + prompt_unix,
chakracore: 'skip' },
=======
expect: 'undefined\r\n' + prompt_unix },
>>>>>>>
expect: 'undefined\r\n' + prompt_unix,
chakracore: 'skip' },
<<<<<<<
expect: common.engineSpecificMessage({
v8: /^SyntaxError: Invalid or unexpected token/,
chakracore: /^SyntaxError: Invalid character/})
},
=======
expect: /\bSyntaxError: Invalid or unexpected token/ },
>>>>>>>
expect: common.engineSpecificMessage({
v8: /\bSyntaxError: Invalid or unexpected token/,
chakracore: /^SyntaxError: Invalid character/})
},
<<<<<<<
{
client: client_unix, send: 'a = 3.5e',
expect: /^SyntaxError: Invalid or unexpected token/ },
=======
{ client: client_unix, send: 'a = 3.5e',
expect: /\bSyntaxError: Invalid or unexpected token/ },
>>>>>>>
{
client: client_unix, send: 'a = 3.5e',
expect: /\bSyntaxError: Invalid or unexpected token/ },
<<<<<<<
expect: "'nodejs'\n" + prompt_unix },
].filter((v) => !common.engineSpecificMessage(v)));
=======
expect: "'nodejs'\r\n" + prompt_unix },
// Avoid emitting repl:line-number for SyntaxError
{ client: client_unix, send: 'a = 3.5e',
expect: /^(?!repl)/ },
// Avoid emitting stack trace
{ client: client_unix, send: 'a = 3.5e',
expect: /^(?!\s+at\s)/gm },
]);
>>>>>>>
expect: "'nodejs'\r\n" + prompt_unix },
// Avoid emitting repl:line-number for SyntaxError
{ client: client_unix, send: 'a = 3.5e',
expect: /^(?!repl)/ },
// Avoid emitting stack trace
{ client: client_unix, send: 'a = 3.5e',
expect: /^(?!\s+at\s)/gm },
].filter((v) => !common.engineSpecificMessage(v))); |
<<<<<<<
xmin = Number.MAX_VALUE,
ymin = Number.MAX_VALUE,
xmax = Number.MIN_VALUE,
ymax = Number.MIN_VALUE,
v, vx, vy;
=======
xmin = Infinity,
ymin = Infinity,
xmax = -Infinity,
ymax = -Infinity;
>>>>>>>
xmin = Infinity,
ymin = Infinity,
xmax = -Infinity,
ymax = -Infinity,
v, vx, vy; |
<<<<<<<
import DatabaseClient from '../lib/DatabaseClient';
=======
import {ACTIONS} from '../lib/Constants';
>>>>>>>
import {ACTIONS} from '../lib/Constants';
import DatabaseClient from '../lib/DatabaseClient'; |
<<<<<<<
if (compareVersions(migratedVersion, '0.66.0') && !compareVersions(configuration.apiVersion, '1.15.0')) {
// api 1.14 exposes deadband and yaw_deadband
for (var profileIndex = 0; profileIndex < configuration.profiles.length; profileIndex++) {
if (configuration.profile[profileIndex].RCcontrols == undefined) {
configuration.profile[profileIndex].RCcontrols = {
deadband: 0,
yaw_deadband: 0,
alt_hold_deadband: 40,
alt_hold_fast_change: 1
};
}
}
appliedMigrationsCount++;
}
=======
if (compareVersions(migratedVersion, '0.66.0') && !compareVersions(configuration.apiVersion, '1.15.0')) {
// api 1.15 exposes RX_CONFIG, FAILSAFE_CONFIG and RXFAIL_CONFIG configuration
if (configuration.RX_CONFIG == undefined) {
configuration.RX_CONFIG = {
serialrx_provider: 0,
spektrum_sat_bind: 0,
midrc: 1500,
mincheck: 1100,
maxcheck: 1900,
rx_min_usec: 885,
rx_max_usec: 2115
};
}
if (configuration.FAILSAFE_CONFIG == undefined) {
configuration.FAILSAFE_CONFIG = {
failsafe_delay: 10,
failsafe_off_delay: 200,
failsafe_throttle: 1000,
failsafe_kill_switch: 0,
failsafe_throttle_low_delay: 100,
failsafe_procedure: 0
};
}
if (configuration.RXFAIL_CONFIG == undefined) {
configuration.RXFAIL_CONFIG = [
{mode: 0, value: 1500},
{mode: 0, value: 1500},
{mode: 0, value: 1500},
{mode: 0, value: 875}
];
for (var i = 0; i < 14; i++) {
var rxfailChannel = {
mode: 1,
value: 1500
};
configuration.RXFAIL_CONFIG.push(rxfailChannel);
}
}
appliedMigrationsCount++;
}
>>>>>>>
if (compareVersions(migratedVersion, '0.66.0') && !compareVersions(configuration.apiVersion, '1.15.0')) {
// api 1.14 exposes deadband and yaw_deadband
for (var profileIndex = 0; profileIndex < configuration.profiles.length; profileIndex++) {
if (configuration.profile[profileIndex].RCcontrols == undefined) {
configuration.profile[profileIndex].RCcontrols = {
deadband: 0,
yaw_deadband: 0,
alt_hold_deadband: 40,
alt_hold_fast_change: 1
};
}
}
appliedMigrationsCount++;
}
// api 1.15 exposes RX_CONFIG, FAILSAFE_CONFIG and RXFAIL_CONFIG configuration
if (configuration.RX_CONFIG == undefined) {
configuration.RX_CONFIG = {
serialrx_provider: 0,
spektrum_sat_bind: 0,
midrc: 1500,
mincheck: 1100,
maxcheck: 1900,
rx_min_usec: 885,
rx_max_usec: 2115
};
}
if (configuration.FAILSAFE_CONFIG == undefined) {
configuration.FAILSAFE_CONFIG = {
failsafe_delay: 10,
failsafe_off_delay: 200,
failsafe_throttle: 1000,
failsafe_kill_switch: 0,
failsafe_throttle_low_delay: 100,
failsafe_procedure: 0
};
}
if (configuration.RXFAIL_CONFIG == undefined) {
configuration.RXFAIL_CONFIG = [
{mode: 0, value: 1500},
{mode: 0, value: 1500},
{mode: 0, value: 1500},
{mode: 0, value: 875}
];
for (var i = 0; i < 14; i++) {
var rxfailChannel = {
mode: 1,
value: 1500
};
configuration.RXFAIL_CONFIG.push(rxfailChannel);
}
}
appliedMigrationsCount++;
} |
<<<<<<<
PostsRoute = AuthenticatedRoute.extend(ShortcutsRoute, styleBody, loadingIndicator, PaginationRouteMixin, {
titleToken: '博文列表',
=======
PostsRoute = AuthenticatedRoute.extend(ShortcutsRoute, styleBody, PaginationRouteMixin, {
titleToken: 'Content',
>>>>>>>
PostsRoute = AuthenticatedRoute.extend(ShortcutsRoute, styleBody, PaginationRouteMixin, {
titleToken: '博文列表', |
<<<<<<<
// NOTE: Must be ES5 for now, Electron's `remote` does not like ES6 Classes!
/* eslint-disable no-var, object-shorthand, prefer-arrow-callback */
=======
/**
* Unicorn: FileServer - Respond to a FileClient over IPC, sharing our access to
* the Node/io.js layer of filesystem, so client can CRUD files.
*
* Must be ES5 for now, Electron's `remote` doesn't seem to like ES6 Classes!
*/
>>>>>>>
// NOTE: Must be ES5 for now, Electron's `remote` does not like ES6 Classes!
/* eslint-disable no-var, object-shorthand, prefer-arrow-callback */
<<<<<<<
const SAMPLES_FILE_PATH = path.join(__dirname, '..', 'samples');
=======
// MAIN
>>>>>>>
const SAMPLES_FILE_PATH = path.join(__dirname, '..', 'samples');
<<<<<<<
FileServer.prototype.getContents = function (filename, callback) {
filesystem.readFile(filename, function (error, data) {
if (error) {
callback(error, null);
return;
}
callback(null, data);
=======
FileServer.prototype.getContents = function(filename, callback) {
fs.readFile(filename, function(error, data) {
callback(error, data);
>>>>>>>
FileServer.prototype.getContents = function(filename, callback) {
fs.readFile(filename, callback);
};
/**
* Get a list of sample files embedded with the application.
* @param {Function} callback - Async callback: function (error, results)
*/
FileServer.prototype.getSampleFiles = function (callback) {
filesystem.readdir(SAMPLES_FILE_PATH, function (error, data) {
var files;
if (error) {
callback(error, null);
return;
}
files = data.map((item) => {
var filename = path.resolve(SAMPLES_FILE_PATH, item);
return {
uid: Utils.generateId(filename),
name: path.basename(item),
filename: filename,
type: 'sample'
};
});
callback(null, files);
<<<<<<<
// @TODO throw?
=======
>>>>>>>
<<<<<<<
.once('error', callback)
.once('end', callback);
=======
.once('error', function(error) {
callback(error);
})
.once('end', function() {
callback();
});
>>>>>>>
.once('error', callback)
.once('end', callback);
<<<<<<<
limit = options.limit;
stream = filesystem.createReadStream(path.resolve(filename));
stream.pipe(csv(options))
.on('data', function (data) {
=======
let limit = options.limit;
let fileStream = fs.createReadStream(path.resolve(filename));
let csvParser = csv(options);
let lastStream = csvParser;
let aggregator;
if ('aggregation' in options) {
aggregator = new TimeAggregator(options['aggregation']);
lastStream = aggregator;
}
lastStream
.on('data', function(data) {
>>>>>>>
let limit = options.limit;
let fileStream = fs.createReadStream(path.resolve(filename));
let csvParser = csv(options);
let lastStream = csvParser;
let aggregator;
if ('aggregation' in options) {
aggregator = new TimeAggregator(options['aggregation']);
lastStream = aggregator;
}
lastStream
.on('data', function(data) {
<<<<<<<
.once('error', callback)
.once('close', callback)
.once('end', callback);
=======
.once('error', function(error) {
callback(error);
})
.once('close', function() {
callback();
})
.once('end', function() {
callback();
});
if (aggregator) {
fileStream.pipe(csvParser).pipe(aggregator);
} else {
fileStream.pipe(csvParser);
}
>>>>>>>
.once('error', callback)
.once('close', callback)
.once('end', callback);
if (aggregator) {
fileStream.pipe(csvParser).pipe(aggregator);
} else {
fileStream.pipe(csvParser);
}
<<<<<<<
* @param {Function} callback - This callback will be called with the results in
* the following format:
=======
* @param {Function} callback: This callback will be called with the results
* in the following format:
>>>>>>>
* @param {Function} callback - This callback will be called with the results in
* the following format:
<<<<<<<
=======
let stats = {
count: 0,
fields: {}
};
let fields = stats.fields;
>>>>>>>
let stats = {
count: 0,
fields: {}
};
let fields = stats.fields;
<<<<<<<
for (field in data) {
val = new Number(data[field]);
=======
stats.count++;
for (let name in data) {
let val = new Number(data[name]);
>>>>>>>
stats.count++;
for (let name in data) {
let min, max, oldMean, newMean;
let val = new Number(data[name]);
<<<<<<<
min = stats[field].min;
max = stats[field].max;
stats[field].min = val < min ? val : min;
stats[field].max = val > max ? val : max;
=======
let min = fields[name].min;
let max = fields[name].max;
fields[name].min = val < min ? val : min;
fields[name].max = val > max ? val : max;
fields[name].sum += val;
// Compute variance based on online algorithm from
// D. Knuth, The Art of Computer Programming, Vol 2, 3rd ed, p.232
if (stats.count > 1) {
let oldMean = fields[name].mean;
let newMean = oldMean + (val - oldMean) / stats.count;
fields[name].mean = newMean;
fields[name].variance += (val - oldMean) * (val - newMean);
}
>>>>>>>
min = fields[name].min;
max = fields[name].max;
fields[name].min = val < min ? val : min;
fields[name].max = val > max ? val : max;
fields[name].sum += val;
// Compute variance based on online algorithm from
// D. Knuth, The Art of Computer Programming, Vol 2, 3rd ed, p.232
if (stats.count > 1) {
oldMean = fields[name].mean;
newMean = oldMean + (val - oldMean) / stats.count;
fields[name].mean = newMean;
fields[name].variance += (val - oldMean) * (val - newMean);
} |
<<<<<<<
* Get all/queried MetricDatas records.
=======
* Get all/queried MetricData records
>>>>>>>
* Get all/queried MetricData records
<<<<<<<
DatabaseServer.prototype.putFiles = function (files, callback) {
const table = this.dbh.sublevel('file');
=======
DatabaseServer.prototype.putFileBatch = function (files, callback) {
>>>>>>>
DatabaseServer.prototype.putFileBatch = function (files, callback) {
let ops = [];
const table = this.dbh.sublevel('file');
// validate
files.forEach((file) => {
const validation = this.validator.validate(file, FileSchema);
if (validation.errors.length) {
callback(validation.errors, null);
return;
}
});
// prepare
ops = files.map((file) => {
return {
type: 'put',
key: file.uid,
value: file
};
});
// execute
table.batch(ops, callback);
};
/**
* Put a single Metric to DB.
* @param {Object} metric - Data object of Metric info to save
* @param {Function} callback - Async callback on done: function(error, results)
*/
DatabaseServer.prototype.putMetric = function (metric, callback) {
const table = this.dbh.sublevel('metric');
const validation = this.validator.validate(metric, MetricSchema);
if (validation.errors.length) {
callback(validation.errors, null);
return;
}
table.put(metric.uid, metric, callback);
};
/**
* Put multiple Metrics into DB.
* @param {Array} metrics - Data objects of Metrics info to save
* @param {Function} callback - Async callback on done: function(error, results)
*/
DatabaseServer.prototype.putMetricBatch = function(metrics, callback) {
const table = this.dbh.sublevel('metric');
<<<<<<<
DatabaseServer.prototype.putMetrics = function (metrics, callback) {
const table = this.dbh.sublevel('metric');
=======
DatabaseServer.prototype.putMetricBatch = function(metrics, callback) {
>>>>>>>
DatabaseServer.prototype.putMetricBatch = function(metrics, callback) {
const table = this.dbh.sublevel('metric');
<<<<<<<
DatabaseServer.prototype.putMetricDatas = function (metricDatas, callback) {
const table = this.dbh.sublevel('metricData');
=======
DatabaseServer.prototype.putMetricDataBatch = function(metricDatas, callback) {
>>>>>>>
DatabaseServer.prototype.putMetricDataBatch = function(metricDatas, callback) {
const table = this.dbh.sublevel('metricData'); |
<<<<<<<
};
var SENSOR_ALIGNMENT = {
align_gyro: 0,
align_acc: 0,
align_mag: 0
};
=======
};
var RX_CONFIG = {
serialrx_provider: 0,
maxcheck: 0,
midrc: 0,
mincheck: 0,
spektrum_sat_bind: 0,
rx_min_usec: 0,
rx_max_usec: 0
};
var FAILSAFE_CONFIG = {
failsafe_delay: 0,
failsafe_off_delay: 0,
failsafe_throttle: 0,
failsafe_kill_switch: 0,
failsafe_throttle_low_delay: 0,
failsafe_procedure: 0
};
var RXFAIL_CONFIG = [];
>>>>>>>
};
var SENSOR_ALIGNMENT = {
align_gyro: 0,
align_acc: 0,
align_mag: 0
};
var RX_CONFIG = {
serialrx_provider: 0,
maxcheck: 0,
midrc: 0,
mincheck: 0,
spektrum_sat_bind: 0,
rx_min_usec: 0,
rx_max_usec: 0
};
var FAILSAFE_CONFIG = {
failsafe_delay: 0,
failsafe_off_delay: 0,
failsafe_throttle: 0,
failsafe_kill_switch: 0,
failsafe_throttle_low_delay: 0,
failsafe_procedure: 0
};
var RXFAIL_CONFIG = []; |
<<<<<<<
import {ModelServer} from './ModelServer';
=======
import { ModelServer } from './ModelServer';
import UserError from './UserError';
>>>>>>>
import {ModelServer} from './ModelServer';
import UserError from './UserError';
<<<<<<<
throw new Error(`Unknown model command ${command}`);
=======
throw new UserError('Unknown model command "' + command + '"');
>>>>>>>
throw new UserError(`Unknown model command ${command}`);
<<<<<<<
modelId,
'error',
{error, ipcevent: payload}
=======
modelId, 'error', {
'error': error,
'ipcevent': payload
}
>>>>>>>
modelId,
'error',
{error, ipcevent: payload}
<<<<<<<
this._webContents.send(
MODEL_SERVER_IPC_CHANNEL, modelId, command, payload
);
=======
if (command === 'error') {
this._webContents.send(MODEL_SERVER_IPC_CHANNEL, modelId, 'error', {
'error': new UserError(payload)
});
} else {
this._webContents.send(MODEL_SERVER_IPC_CHANNEL, modelId, command,
payload);
}
>>>>>>>
if (command === 'error') {
this._webContents.send(
MODEL_SERVER_IPC_CHANNEL,
modelId,
'error',
{error: new UserError(payload)}
);
} else {
this._webContents.send(
MODEL_SERVER_IPC_CHANNEL, modelId, command, payload
);
} |
<<<<<<<
=======
// Active models and their event handlers
let activeModels = new Map();
/**
* Initialize the application populating local data on first run
*/
function initializeApplicationData() {
// Check if running for the first time
let initialized = config.get('initialized');
if (!initialized) {
let promisify = Utils.promisify;
// Load sample files from the file system
promisify(::fileService.getSampleFiles)
// Save all sample files to the database
.then((files) => Promise.all(
files.map((file) => promisify(::database.uploadFile, file)))
)
.then(() => {
// Make sure to only run once
config.set('initialized', true);
config.save();
})
.catch((error) => {
console.log(error); // eslint-disable-line
dialog.showErrorBox('Error', error);
});
}
}
/**
* Handles model data event saving the results to the database
* @param {string} modelId Model receiving data
* @param {Array} data model data in the following format:
* [timestamp, metric_value, anomaly_score]
*/
function receiveModelData(modelId, data) {
let [timestamp, value, score] = data; // eslint-disable-line
let metricData = {
metric_uid: modelId,
timestamp,
metric_value: value,
anomaly_score: score
};
database.putModelData(metricData, (error) => {
if (error) {
log.error('Error saving model data', error, metricData);
}
});
}
/**
* Handle application wide model services events
*/
function handleModelEvents() {
// Attach event handler on model creation
modelService.on('newListener', (modelId, listener) => {
if (!activeModels.has(modelId)) {
let listener = (command, data) => { // eslint-disable-line
try {
if (command === 'data') {
// Handle model data
receiveModelData(modelId, JSON.parse(data));
}
} catch (e) {
log.error('Model Error', e, modelId, command, data);
}
};
activeModels.set(modelId, listener);
modelService.on(modelId, listener);
}
});
// Detach event handler on model close
modelService.on('removeListener', (modelId, listener) => {
if (activeModels.has(modelId)) {
let listener = activeModels.get(modelId);
activeModels.delete(modelId);
modelService.removeListener(modelId, listener);
}
});
}
>>>>>>>
/**
* Initialize the application populating local data on first run
*/
function initializeApplicationData() {
// Check if running for the first time
let initialized = config.get('initialized');
if (!initialized) {
let promisify = Utils.promisify;
// Load sample files from the file system
promisify(::fileService.getSampleFiles)
// Save all sample files to the database
.then((files) => Promise.all(
files.map((file) => promisify(::database.uploadFile, file)))
)
.then(() => {
// Make sure to only run once
config.set('initialized', true);
config.save();
})
.catch((error) => {
console.log(error); // eslint-disable-line
dialog.showErrorBox('Error', error);
});
}
}
/**
* Handles model data event saving the results to the database
* @param {string} modelId Model receiving data
* @param {Array} data model data in the following format:
* [timestamp, metric_value, anomaly_score]
*/
function receiveModelData(modelId, data) {
let [timestamp, value, score] = data; // eslint-disable-line
let metricData = {
metric_uid: modelId,
timestamp,
metric_value: value,
anomaly_score: score
};
database.putModelData(metricData, (error) => {
if (error) {
log.error('Error saving model data', error, metricData);
}
});
}
/**
* Handle application wide model services events
*/
function handleModelEvents() {
// Attach event handler on model creation
modelService.on('newListener', (modelId, listener) => {
if (!activeModels.has(modelId)) {
let listener = (command, data) => { // eslint-disable-line
try {
if (command === 'data') {
// Handle model data
receiveModelData(modelId, JSON.parse(data));
}
} catch (e) {
log.error('Model Error', e, modelId, command, data);
}
};
activeModels.set(modelId, listener);
modelService.on(modelId, listener);
}
});
// Detach event handler on model close
modelService.on('removeListener', (modelId, listener) => {
if (activeModels.has(modelId)) {
let listener = activeModels.get(modelId);
activeModels.delete(modelId);
modelService.removeListener(modelId, listener);
}
});
} |
<<<<<<<
var nominatim = "https://nominatim.openstreetmap.org/search";
var nominatim_reverse = "https://nominatim.openstreetmap.org/reverse";
=======
//var nominatim = "http://open.mapquestapi.com/nominatim/v1/search.php";
//var nominatim_reverse = "http://open.mapquestapi.com/nominatim/v1/reverse.php";
var nominatim = "//nominatim.openstreetmap.org/search";
var nominatim_reverse = "//nominatim.openstreetmap.org/reverse";
>>>>>>>
var nominatimURL = "https://nominatim.openstreetmap.org/search";
var nominatimReverseURL = "https://nominatim.openstreetmap.org/reverse";
<<<<<<<
var activeLayer = 'Lyrk';
=======
var i18nIsInitialized;
>>>>>>>
var activeLayer = 'Lyrk';
var i18nIsInitialized;
<<<<<<<
var osmAttr = '© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors';
=======
// provider
//@see http://leaflet-extras.github.io/leaflet-providers/preview/index.html
var osmAttr = '© <a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> contributors';
>>>>>>>
var osmAttr = '© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors';
// provider
//@see http://leaflet-extras.github.io/leaflet-providers/preview/index.html
var osmAttr = '© <a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> contributors';
<<<<<<<
var lyrk = L.tileLayer('https://tiles.lyrk.org/' + tp + '/{z}/{x}/{y}?apikey=6e8cfef737a140e2a58c8122aaa26077', {
attribution: osmAttr + ', <a href="https://geodienste.lyrk.de/">Lyrk</a>',
=======
var lyrk = L.tileLayer('http://{s}.tiles.lyrk.org/' + tp + '/{z}/{x}/{y}?apikey=6e8cfef737a140e2a58c8122aaa26077', {
attribution: osmAttr + ', <a href="http://geodienste.lyrk.de/" target="_blank">Lyrk</a>',
>>>>>>>
var lyrk = L.tileLayer('https://tiles.lyrk.org/' + tp + '/{z}/{x}/{y}?apikey=6e8cfef737a140e2a58c8122aaa26077', {
attribution: osmAttr + ', <a href="https://geodienste.lyrk.de/">Lyrk</a>',
<<<<<<<
=======
var baseMaps = {
"Lyrk": lyrk,
"MapQuest": mapquest,
"MapQuest Aerial": mapquestAerial,
"TF Transport": thunderTransport,
"TF Cycle": thunderCycle,
"TF Outdoors": thunderOutdoors,
"WanderReitKarte": wrk,
"OpenStreetMap": osm,
"OpenStreetMap.de": osmde
};
>>>>>>>
<<<<<<<
map.fitBounds(new L.LatLngBounds(new L.LatLng(bounds.minLat, bounds.minLon),
new L.LatLng(bounds.maxLat, bounds.maxLon)));
if (isProduction())
=======
map.fitBounds(new L.LatLngBounds(
new L.LatLng(bounds.minLat, bounds.minLon),
new L.LatLng(bounds.maxLat, bounds.maxLon)
)
);
if (isProduction())
>>>>>>>
map.fitBounds(new L.LatLngBounds(new L.LatLng(bounds.minLat, bounds.minLon),
new L.LatLng(bounds.maxLat, bounds.maxLon)));
if (isProduction())
<<<<<<<
var urlForHistory = request.createFullURL() + "&layer=" + activeLayer;
=======
var urlForHistory = request.createHistoryURL();
>>>>>>>
var urlForHistory = request.createHistoryURL() + "&layer=" + activeLayer;
<<<<<<<
googleLink.attr("href", "https://maps.google.com/?q=saddr=" + from + "&daddr=" + to + addToGoogle);
=======
googleLink.attr("href", "http://maps.google.com/?saddr=" + request.from + "&daddr=" + request.to + addToGoogle);
>>>>>>>
googleLink.attr("href", "https://maps.google.com/?saddr=" + request.from + "&daddr=" + request.to + addToGoogle);
<<<<<<<
bingLink.attr("href", "https://www.bing.com/maps/default.aspx?rtp=adr." + from + "~adr." + to + addToBing);
=======
bingLink.attr("href", "http://www.bing.com/maps/default.aspx?rtp=adr." + request.from + "~adr." + request.to + addToBing);
>>>>>>>
bingLink.attr("href", "https://www.bing.com/maps/default.aspx?rtp=adr." + request.from + "~adr." + request.to + addToBing); |
<<<<<<<
import { settingsActions, appActions, ipfsActions } from '../../actions';
import { getShowSplashScreen, getShowAnalyticsTrackingDialog } from '../../selectors/settings';
=======
import { appActions } from '../../actions';
import { getShowAnalyticsTrackingDialog } from '../../selectors/settings';
>>>>>>>
import { appActions, ipfsActions } from '../../actions';
import { getShowAnalyticsTrackingDialog } from '../../selectors/settings';
<<<<<<<
},
showSplashNoMore: () => {
dispatch(settingsActions.showSplashNoMore());
},
importProjectFromIpfs: (hash) => {
dispatch(ipfsActions.importProjectFromIpfs(hash));
},
=======
}
>>>>>>>
},
importProjectFromIpfs: (hash) => {
dispatch(ipfsActions.importProjectFromIpfs(hash));
}, |
<<<<<<<
...ipfsEpics,
...settingsEpics
=======
...settingsEpics,
...sidePanelsEpics
>>>>>>>
...ipfsEpics,
...settingsEpics
...settingsEpics,
...sidePanelsEpics |
<<<<<<<
Version: 0.1.1
Date: Tue Aug 16 13:28:16 2011 -0400
*/
var __slice = Array.prototype.slice;
=======
Version: 0.2
Date: Fri Jul 29 16:41:36 2011 -0400
*/
var __slice = Array.prototype.slice;
>>>>>>>
Version: 0.2
Date: Tue Aug 16 13:28:16 2011 -0400
*/
var __slice = Array.prototype.slice;
<<<<<<<
Synapse.version = '0.1.1';
=======
Synapse.version = '0.2';
>>>>>>>
Synapse.version = '0.2'; |
<<<<<<<
import 'babel-polyfill';
import app from './server-index';
=======
import 'babel/polyfill';
import app from './server-init';
import log4js from 'log4js';
log4js.configure({
appenders: [
{ type: "console" }
],
replaceConsole: true
});
>>>>>>>
import 'babel-polyfill';
import app from './server-init';
import log4js from 'log4js';
log4js.configure({
appenders: [
{ type: "console" }
],
replaceConsole: true
}); |
<<<<<<<
this.paths.cache =
join(this.paths.meteorApp.root, '.meteor', 'local', 'desktop-cache');
=======
this.paths.electronApp.extractedNodeModules =
join(this.paths.meteorApp.root, '.meteor', '.desktop_extracted_node_modules');
this.paths.electronApp.extractedNodeModulesBin =
join(this.paths.electronApp.extractedNodeModules, '.bin');
>>>>>>>
this.paths.cache =
join(this.paths.meteorApp.root, '.meteor', 'local', 'desktop-cache');
this.paths.electronApp.extractedNodeModules =
join(this.paths.meteorApp.root, '.meteor', '.desktop_extracted_node_modules');
this.paths.electronApp.extractedNodeModulesBin =
join(this.paths.electronApp.extractedNodeModules, '.bin'); |
<<<<<<<
if (!noTransitLegs) {
let firstDeparture = false;
if (
data.legs[1] != null &&
!(data.legs[1].rentedBike || data.legs[0].transitLeg)
) {
firstDeparture = data.legs[1].startTime;
}
if (data.legs[0].transitLeg && !data.legs[0].rentedBike) {
firstDeparture = data.legs[0].startTime;
}
if (firstDeparture) {
firstLegStartTime = (
<div className={cx('itinerary-first-leg-start-time')}>
<span>{moment(firstDeparture).format('HH:mm')}</span>
</div>
);
}
}
=======
>>>>>>>
if (!noTransitLegs) {
let firstDeparture = false;
if (
data.legs[1] != null &&
!(data.legs[1].rentedBike || data.legs[0].transitLeg)
) {
firstDeparture = data.legs[1].startTime;
}
if (data.legs[0].transitLeg && !data.legs[0].rentedBike) {
firstDeparture = data.legs[0].startTime;
}
if (firstDeparture) {
firstLegStartTime = (
<div className={cx('itinerary-first-leg-start-time')}>
<span>{moment(firstDeparture).format('HH:mm')}</span>
</div>
);
}
} |
<<<<<<<
color: React.PropTypes.string,
vehicles: React.PropTypes.array,
stop: React.PropTypes.object,
mode: React.PropTypes.string,
className: React.PropTypes.string,
distance: React.PropTypes.number,
currentTime: React.PropTypes.number.isRequired,
first: React.PropTypes.bool,
last: React.PropTypes.bool,
=======
vehicles: PropTypes.array,
stop: PropTypes.object,
mode: PropTypes.string,
className: PropTypes.string,
distance: PropTypes.number,
currentTime: PropTypes.number.isRequired,
first: PropTypes.bool,
last: PropTypes.bool,
>>>>>>>
color: PropTypes.string,
vehicles: PropTypes.array,
stop: PropTypes.object,
mode: PropTypes.string,
className: PropTypes.string,
distance: PropTypes.number,
currentTime: PropTypes.number.isRequired,
first: PropTypes.bool,
last: PropTypes.bool, |
<<<<<<<
import ViaPointSelector from './ViaPointSelector';
=======
import WalkLeg from './WalkLeg';
import WaitLeg from './WaitLeg';
import BicycleLeg from './BicycleLeg';
import EndLeg from './EndLeg';
import AirportCheckInLeg from './AirportCheckInLeg';
import AirportCollectLuggageLeg from './AirportCollectLuggageLeg';
import BusLeg from './BusLeg';
import AirplaneLeg from './AirplaneLeg';
import SubwayLeg from './SubwayLeg';
import TramLeg from './TramLeg';
import RailLeg from './RailLeg';
import FerryLeg from './FerryLeg';
import CarLeg from './CarLeg';
import ViaLeg from './ViaLeg';
>>>>>>>
import ViaPointSelector from './ViaPointSelector';
import WalkLeg from './WalkLeg';
import WaitLeg from './WaitLeg';
import BicycleLeg from './BicycleLeg';
import EndLeg from './EndLeg';
import AirportCheckInLeg from './AirportCheckInLeg';
import AirportCollectLuggageLeg from './AirportCollectLuggageLeg';
import BusLeg from './BusLeg';
import AirplaneLeg from './AirplaneLeg';
import SubwayLeg from './SubwayLeg';
import TramLeg from './TramLeg';
import RailLeg from './RailLeg';
import FerryLeg from './FerryLeg';
import CarLeg from './CarLeg';
import ViaLeg from './ViaLeg';
<<<<<<<
ViaPointSelector,
=======
WalkLeg,
WaitLeg,
BicycleLeg,
EndLeg,
AirportCheckInLeg,
AirportCollectLuggageLeg,
BusLeg,
AirplaneLeg,
SubwayLeg,
TramLeg,
RailLeg,
FerryLeg,
CarLeg,
ViaLeg,
>>>>>>>
ViaPointSelector,
WalkLeg,
WaitLeg,
BicycleLeg,
EndLeg,
AirportCheckInLeg,
AirportCollectLuggageLeg,
BusLeg,
AirplaneLeg,
SubwayLeg,
TramLeg,
RailLeg,
FerryLeg,
CarLeg,
ViaLeg, |
<<<<<<<
=======
const transferMarginSliderValues =
CustomizeSearch.getSliderStepsArray(60, 720, 180).map(num => Math.round(num));
const initVal = this.context.location.query.minTransferTime ?
mapToSlider(this.context.location.query.minTransferTime, transferMarginSliderValues) :
10;
>>>>>>> |
<<<<<<<
<input id={this.props.id} {...p} />
=======
<input onClick={this.inputClicked} {...p} />
>>>>>>>
<input id={this.props.id} onClick={this.inputClicked} {...p} /> |
<<<<<<<
intl: intlShape.isRequired,
viaPointName: PropTypes.string,
setViaPointName: PropTypes.func,
=======
tab: PropTypes.string,
>>>>>>>
intl: intlShape.isRequired,
viaPointName: PropTypes.string,
setViaPointName: PropTypes.func,
tab: PropTypes.string,
<<<<<<<
refPoint={this.props.origin}
className={this.class(this.props.origin)}
searchType={this.props.originSearchType}
placeholder={this.props.originPlaceHolder}
value={this.value(this.props.origin)}
isFocused={this.isFocused}
onLocationSelected={location => {
let origin = { ...location, ready: true };
let destination = this.props.destination;
if (location.type === 'CurrentLocation') {
origin = { ...location, gps: true, ready: !!location.lat };
if (destination.gps === true) {
// destination has gps, clear destination
destination = { set: false };
}
}
navigateTo({
origin,
destination,
context: this.props.isItinerary ? PREFIX_ITINERARY_SUMMARY : '',
router: this.context.router,
});
}}
/>
}
{this.props.isViaPoint && (
<div className="viapoint-input-container">
<div className="viapoint-before">
<div className="viapoint-before_line-top" />
<div className="viapoint-icon">
<Icon img="icon-icon_place" />
</div>
<div className="viapoint-before_line-bottom" />
</div>
<DTEndpointAutosuggest
id="viapoint"
autoFocus={this.context.breakpoint === 'large'}
refPoint={this.props.origin}
searchType="endpoint"
placeholder={this.props.intl.formatMessage({
id: 'via-point',
defaultMessage: 'Viapoint',
})}
className={`viapoint`}
isFocused={this.isFocused}
value={this.props.viaPointName}
onLocationSelected={item => {
this.context.router.replace({
...this.context.location,
query: {
...this.context.location.query,
intermediatePlaces: locationToOTP({
lat: item.lat,
lon: item.lon,
address: item.address,
}),
},
});
this.props.setViaPointName(item.address);
}}
/>
</div>
)}
=======
navigateTo({
origin,
destination,
context: this.props.isItinerary ? PREFIX_ITINERARY_SUMMARY : '',
router: this.context.router,
tab: this.props.tab,
});
}}
/>
>>>>>>>
refPoint={this.props.origin}
className={this.class(this.props.origin)}
searchType={this.props.originSearchType}
placeholder={this.props.originPlaceHolder}
value={this.value(this.props.origin)}
isFocused={this.isFocused}
onLocationSelected={location => {
let origin = { ...location, ready: true };
let destination = this.props.destination;
if (location.type === 'CurrentLocation') {
origin = { ...location, gps: true, ready: !!location.lat };
if (destination.gps === true) {
// destination has gps, clear destination
destination = { set: false };
}
}
navigateTo({
origin,
destination,
context: this.props.isItinerary ? PREFIX_ITINERARY_SUMMARY : '',
router: this.context.router,
});
}}
/>
}
{this.props.isViaPoint && (
<div className="viapoint-input-container">
<div className="viapoint-before">
<div className="viapoint-before_line-top" />
<div className="viapoint-icon">
<Icon img="icon-icon_place" />
</div>
<div className="viapoint-before_line-bottom" />
</div>
<DTEndpointAutosuggest
id="viapoint"
autoFocus={this.context.breakpoint === 'large'}
refPoint={this.props.origin}
searchType="endpoint"
placeholder={this.props.intl.formatMessage({
id: 'via-point',
defaultMessage: 'Viapoint',
})}
className={`viapoint`}
isFocused={this.isFocused}
value={this.props.viaPointName}
onLocationSelected={item => {
this.context.router.replace({
...this.context.location,
query: {
...this.context.location.query,
intermediatePlaces: locationToOTP({
lat: item.lat,
lon: item.lon,
address: item.address,
}),
},
});
this.props.setViaPointName(item.address);
}}
/>
</div>
)} |
<<<<<<<
const FavouritesPanel = (
{ origin, routes, currentTime, favouriteLocations, favouriteStops },
context,
) => (
=======
const FavouritesPanel = ({
origin,
routes,
currentTime,
favouriteLocations,
breakpoint,
}) => (
>>>>>>>
const FavouritesPanel = ({
origin,
routes,
currentTime,
favouriteLocations,
favouriteStops,
breakpoint,
}) => (
<<<<<<<
favouriteStops: PropTypes.array,
};
FavouritesPanel.contextTypes = {
breakpoint: PropTypes.string,
=======
breakpoint: PropTypes.string.isRequired,
>>>>>>>
favouriteStops: PropTypes.array,
breakpoint: PropTypes.string.isRequired, |
<<<<<<<
componentDidUpdate(prevProps) {
// send tracking calls when visiting a new stop or route
const oldLocation = prevProps.location.pathname;
const newLocation = this.props.location.pathname;
const newContext = newLocation.slice(1, newLocation.indexOf('/', 1));
switch (newContext) {
case 'linjat':
if (
oldLocation.indexOf(newContext) !== 1 ||
(prevProps.params.routeId &&
this.props.params.routeId &&
prevProps.params.routeId !== this.props.params.routeId)
) {
addAnalyticsEvent({
category: 'Route',
action: 'OpenRoute',
name: this.props.params.routeId,
});
}
break;
case 'pysakit':
case 'terminaalit':
if (
oldLocation.indexOf(newContext) !== 1 ||
(prevProps.params.stopId &&
this.props.params.stopId &&
prevProps.params.stopId !== this.props.params.stopId) ||
(prevProps.params.terminalId &&
this.props.params.terminalId &&
prevProps.params.terminalId !== this.props.params.terminalId)
) {
addAnalyticsEvent({
category: 'Stop',
action: 'OpenStop',
name: this.props.params.stopId || this.props.params.terminalId,
});
}
break;
default:
break;
}
}
=======
componentDidUpdate(prevProps) {
// send tracking calls when url changes
// listen for this here instead of in router directly to get access to old location as well
const oldLocation = prevProps.location.pathname;
const newLocation = this.props.location.pathname;
if (oldLocation && newLocation && oldLocation !== newLocation) {
addAnalyticsEvent({
event: 'Pageview',
url: newLocation,
});
}
}
logIn = () => {
this.setState(prevState => ({
loggedIn: !prevState.loggedIn,
}));
};
>>>>>>>
componentDidUpdate(prevProps) {
// send tracking calls when url changes
// listen for this here instead of in router directly to get access to old location as well
const oldLocation = prevProps.location.pathname;
const newLocation = this.props.location.pathname;
if (oldLocation && newLocation && oldLocation !== newLocation) {
addAnalyticsEvent({
event: 'Pageview',
url: newLocation,
});
}
// send tracking calls when visiting a new stop or route
const newContext = newLocation.slice(1, newLocation.indexOf('/', 1));
switch (newContext) {
case 'linjat':
if (
oldLocation.indexOf(newContext) !== 1 ||
(prevProps.params.routeId &&
this.props.params.routeId &&
prevProps.params.routeId !== this.props.params.routeId)
) {
addAnalyticsEvent({
category: 'Route',
action: 'OpenRoute',
name: this.props.params.routeId,
});
}
break;
case 'pysakit':
case 'terminaalit':
if (
oldLocation.indexOf(newContext) !== 1 ||
(prevProps.params.stopId &&
this.props.params.stopId &&
prevProps.params.stopId !== this.props.params.stopId) ||
(prevProps.params.terminalId &&
this.props.params.terminalId &&
prevProps.params.terminalId !== this.props.params.terminalId)
) {
addAnalyticsEvent({
category: 'Stop',
action: 'OpenStop',
name: this.props.params.stopId || this.props.params.terminalId,
});
}
break;
default:
break;
}
}
logIn = () => {
this.setState(prevState => ({
loggedIn: !prevState.loggedIn,
}));
}; |
<<<<<<<
const links = config.topNaviLinks.map(link =>
(<div className="offcanvas-section">
=======
let links = config.topNaviLinks.map(link =>
(<div key={link.name} className="offcanvas-section">
>>>>>>>
const links = config.topNaviLinks.map(link =>
(<div key={link.name} className="offcanvas-section"> |
<<<<<<<
// // zone-related configuration, to be enabled on or after 2019-04-27
// fares: [
// 'HSL:AB',
// 'HSL:BC',
// 'HSL:CD',
// 'HSL:D',
// 'HSL:ABC',
// 'HSL:BCD',
// 'HSL:ABCD',
// ],
// // zone-related configuration, to be enabled on or after 2019-04-27
// // mapping (string, lang) from OTP fare identifiers to human readable form
// // in the new HSL zone model, just strip off the prefix 'HSL:'
// fareMapping: function mapHslFareId(fareId) {
// return fareId && fareId.substring
// ? fareId.substring(fareId.indexOf(':') + 1)
// : '';
// },
// // zone-related configuration, to be enabled on or after 2019-04-27
// itinerary: {
// showZoneLimits: true,
// },
// // zone-related configuration, to be enabled on or after 2019-04-27
// stopCard: {
// header: {
// showZone: true,
// },
// },
// // zone-related configuration, to be enabled on or after 2019-04-27
// useTicketIcons: true,
=======
cityBike: {
// TODO: Change according to the real network names TBD later
networks: {
samocat: {
icon: 'scooter',
name: {
fi: 'Vuosaari',
sv: 'Nordsjö',
en: 'Vuosaari',
},
type: 'scooter',
},
smoove: {
icon: 'citybike',
name: {
fi: 'Helsinki ja Espoo',
sv: 'Helsingfors och Esbo',
en: 'Helsinki and Espoo',
},
type: 'citybike',
},
vantaa: {
icon: 'citybike-secondary',
name: {
fi: 'Vantaa',
sv: 'Vanda',
en: 'Vantaa',
},
type: 'citybike',
},
},
},
>>>>>>>
fares: [
'HSL:AB',
'HSL:BC',
'HSL:CD',
'HSL:D',
'HSL:ABC',
'HSL:BCD',
'HSL:ABCD',
],
// mapping (string, lang) from OTP fare identifiers to human readable form
// in the new HSL zone model, just strip off the prefix 'HSL:'
fareMapping: function mapHslFareId(fareId) {
return fareId && fareId.substring
? fareId.substring(fareId.indexOf(':') + 1)
: '';
},
itinerary: {
showZoneLimits: true,
},
stopCard: {
header: {
showZone: true,
},
},
useTicketIcons: true,
cityBike: {
// TODO: Change according to the real network names TBD later
networks: {
samocat: {
icon: 'scooter',
name: {
fi: 'Vuosaari',
sv: 'Nordsjö',
en: 'Vuosaari',
},
type: 'scooter',
},
smoove: {
icon: 'citybike',
name: {
fi: 'Helsinki ja Espoo',
sv: 'Helsingfors och Esbo',
en: 'Helsinki and Espoo',
},
type: 'citybike',
},
vantaa: {
icon: 'citybike-secondary',
name: {
fi: 'Vantaa',
sv: 'Vanda',
en: 'Vantaa',
},
type: 'citybike',
},
},
}, |
<<<<<<<
<div key={i} className="leg">
{props.breakpoint === 'large' &&
=======
<div key={`${leg.mode}_${leg.startTime}`} className="leg">
{breakpoint === 'large' &&
>>>>>>>
<div key={`${leg.mode}_${leg.startTime}`} className="leg">
{props.breakpoint === 'large' &&
<<<<<<<
<div className="flex-grow itinerary-heading">
<FormattedMessage
id="itinerary-page.title"
defaultMessage="Itinerary"
tagName="h2"
/>
</div>,
=======
<FormattedMessage
key="title"
id="itinerary-page.title"
defaultMessage="Itinerary"
tagName="h2"
/>,
>>>>>>>
<div className="flex-grow itinerary-heading">
<FormattedMessage
key="title"
id="itinerary-page.title"
defaultMessage="Itinerary"
tagName="h2"
/>
</div>,
<<<<<<<
SummaryRow.description = () => {
const today = moment().hour(12).minute(34).second(0)
.valueOf();
const date = 1478611781000;
return (
<div>
<p>
=======
const emptyFunction = () => {};
SummaryRow.description = () =>
<div>
<p>
>>>>>>>
const nop = () => {};
SummaryRow.description = () => {
const today = moment().hour(12).minute(34).second(0)
.valueOf();
const date = 1478611781000;
return (
<div>
<p>
<<<<<<<
<ComponentUsageExample description="passive-small-today">
<SummaryRow
refTime={today}
breakpoint="small"
data={exampleData(today)}
passive
onSelect={() => {}}
onSelectImmediately={() => {}}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="active-small-today">
<SummaryRow
refTime={today}
breakpoint="small"
data={exampleData(today)}
onSelect={() => {}}
onSelectImmediately={() => {}}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="passive-large-today">
<SummaryRow
refTime={today}
breakpoint="large"
data={exampleData(today)}
passive
onSelect={() => {}}
onSelectImmediately={() => {}}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="active-large-today">
<SummaryRow
refTime={today}
breakpoint="large"
data={exampleData(today)}
onSelect={() => {}}
onSelectImmediately={() => {}}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="passive-small-tomorrow">
<SummaryRow
refTime={today}
breakpoint="small"
data={exampleData(date)}
passive
onSelect={() => {}}
onSelectImmediately={() => {}}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="active-small-tomorrow">
<SummaryRow
refTime={today}
breakpoint="small"
data={exampleData(date)}
onSelect={() => {}}
onSelectImmediately={() => {}}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="passive-large-tomorrow">
<SummaryRow
refTime={today}
breakpoint="large"
data={exampleData(date)}
passive
onSelect={() => {}}
onSelectImmediately={() => {}}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="active-large-tomorrow">
<SummaryRow
refTime={today}
breakpoint="large"
data={exampleData(date)}
onSelect={() => {}}
onSelectImmediately={() => {}}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="open-large-today">
<SummaryRow
refTime={today}
breakpoint="large"
data={exampleData(today)}
onSelect={() => {}}
onSelectImmediately={() => {}}
hash={1}
open
/>
</ComponentUsageExample>
<ComponentUsageExample description="open-large-tomorrow">
<SummaryRow
refTime={today}
breakpoint="large"
data={exampleData(date)}
onSelect={() => {}}
onSelectImmediately={() => {}}
hash={1}
open
/>
</ComponentUsageExample>
</div>
);
};
const withBreakPoint = getContext({
breakpoint: React.PropTypes.string.isRequired })(SummaryRow);
export { SummaryRow as component, withBreakPoint as default };
=======
<ComponentUsageExample description="passive">
<SummaryRow
data={exampleData}
passive
onSelect={emptyFunction}
onSelectImmediately={emptyFunction}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="active">
<SummaryRow
data={exampleData}
onSelect={emptyFunction}
onSelectImmediately={emptyFunction}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="open">
<SummaryRow
open
data={exampleData}
onSelect={emptyFunction}
onSelectImmediately={emptyFunction}
hash={1}
/>
</ComponentUsageExample>
</div>;
>>>>>>>
<ComponentUsageExample description="passive-small-today">
<SummaryRow
refTime={today}
breakpoint="small"
data={exampleData(today)}
passive
onSelect={nop}
onSelectImmediately={nop}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="active-small-today">
<SummaryRow
refTime={today}
breakpoint="small"
data={exampleData(today)}
onSelect={nop}
onSelectImmediately={nop}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="passive-large-today">
<SummaryRow
refTime={today}
breakpoint="large"
data={exampleData(today)}
passive
onSelect={nop}
onSelectImmediately={nop}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="active-large-today">
<SummaryRow
refTime={today}
breakpoint="large"
data={exampleData(today)}
onSelect={nop}
onSelectImmediately={nop}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="passive-small-tomorrow">
<SummaryRow
refTime={today}
breakpoint="small"
data={exampleData(date)}
passive
onSelect={nop}
onSelectImmediately={nop}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="active-small-tomorrow">
<SummaryRow
refTime={today}
breakpoint="small"
data={exampleData(date)}
onSelect={nop}
onSelectImmediately={nop}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="passive-large-tomorrow">
<SummaryRow
refTime={today}
breakpoint="large"
data={exampleData(date)}
passive
onSelect={nop}
onSelectImmediately={nop}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="active-large-tomorrow">
<SummaryRow
refTime={today}
breakpoint="large"
data={exampleData(date)}
onSelect={nop}
onSelectImmediately={nop}
hash={1}
/>
</ComponentUsageExample>
<ComponentUsageExample description="open-large-today">
<SummaryRow
refTime={today}
breakpoint="large"
data={exampleData(today)}
onSelect={nop}
onSelectImmediately={nop}
hash={1}
open
/>
</ComponentUsageExample>
<ComponentUsageExample description="open-large-tomorrow">
<SummaryRow
refTime={today}
breakpoint="large"
data={exampleData(date)}
onSelect={nop}
onSelectImmediately={nop}
hash={1}
open
/>
</ComponentUsageExample>
</div>
);
};
const withBreakPoint = getContext({
breakpoint: React.PropTypes.string.isRequired })(SummaryRow);
export { SummaryRow as component, withBreakPoint as default }; |
<<<<<<<
// Needs config for citybike network names
export const getCityBikeNetworkName = (network, config) => {
return config.citybikeModes.find(
o => o.networkName.toLowerCase() === network.toLowerCase(),
);
};
export const getDefaultNetworks = config => {
return config.citybikeModes.map(mode => mode.networkName.toUpperCase());
};
/**
* Retrieves all chosen citybike networks from the URI,
* localstorage or default configuration.
*
* @param {*} location The current location
* @param {*} config The configuration for the software installation
*/
export const getCitybikeNetworks = (location, config) => {
if (location && location.query && location.query.allowedBikeRentalNetworks) {
return decodeURI(location.query.allowedBikeRentalNetworks)
.split('?')[0]
.split(',')
.map(m => m.toUpperCase());
}
const { allowedBikeRentalNetworks } = getCustomizedSettings();
if (
Array.isArray(allowedBikeRentalNetworks) &&
!isEmpty(allowedBikeRentalNetworks)
) {
return allowedBikeRentalNetworks;
}
return getDefaultNetworks(config);
};
/** *
* Updates the list of allowed citybike networks either by removing or adding
*
* @param currentSettings the current settings
* @param newValue the network to be added/removed
* @param config The configuration for the software installation
* @param router the router
*/
export const updateCitybikeNetworks = (
currentSettings,
newValue,
config,
router,
) => {
const mappedcurrentSettings = currentSettings.allowedBikeRentalNetworks.map(
o => o.toUpperCase(),
);
const chosenNetworks = mappedcurrentSettings.find(
o => o === newValue.toUpperCase(),
)
? without(mappedcurrentSettings, newValue.toUpperCase())
: mappedcurrentSettings.concat([newValue.toUpperCase()]);
if (
chosenNetworks.length === 0 ||
(currentSettings.allowedBikeRentalNetworks.length === 0 && newValue)
) {
toggleTransportMode('citybike', config, router);
if (chosenNetworks.length === 0) {
replaceQueryParams(router, {
allowedBikeRentalNetworks: getDefaultNetworks(config).join(),
});
return;
}
}
replaceQueryParams(router, {
allowedBikeRentalNetworks: chosenNetworks.join(),
});
};
=======
export const defaultNetworkConfig = {
icon: 'citybike',
name: {},
type: 'citybike',
};
export const getCityBikeNetworkId = networks => {
if (!Array.isArray(networks) || networks.length === 0) {
return undefined;
}
return networks[0];
};
export const getCityBikeNetworkConfig = (networkId, config) => {
if (!networkId || !networkId.toLowerCase) {
return defaultNetworkConfig;
}
const id = networkId.toLowerCase();
if (
config &&
config.cityBike &&
config.cityBike.networks &&
config.cityBike.networks[id] &&
Object.keys(config.cityBike.networks[id]).length > 0
) {
return config.cityBike.networks[id];
}
return defaultNetworkConfig;
};
export const getCityBikeNetworkName = (
networkConfig = defaultNetworkConfig,
language = 'en',
) => (networkConfig.name && networkConfig.name[language]) || undefined;
export const getCityBikeNetworkIcon = (networkConfig = defaultNetworkConfig) =>
`icon-icon_${networkConfig.icon || 'citybike'}`;
>>>>>>>
export const defaultNetworkConfig = {
icon: 'citybike',
name: {},
type: 'citybike',
};
export const getCityBikeNetworkName = (
networkConfig = defaultNetworkConfig,
language = 'en',
) => (networkConfig.name && networkConfig.name[language]) || undefined;
export const getCityBikeNetworkIcon = (networkConfig = defaultNetworkConfig) =>
`icon-icon_${networkConfig.icon || 'citybike'}`;
export const getCityBikeNetworkId = networks => {
if (!Array.isArray(networks) || networks.length === 0) {
return undefined;
}
return networks[0];
};
export const getCityBikeNetworkConfig = (networkId, config) => {
if (!networkId || !networkId.toLowerCase) {
return defaultNetworkConfig;
}
const id = networkId.toLowerCase();
if (
config &&
config.cityBike &&
config.cityBike.networks &&
config.cityBike.networks[id] &&
Object.keys(config.cityBike.networks[id]).length > 0
) {
return config.cityBike.networks[id];
}
return defaultNetworkConfig;
};
export const getDefaultNetworks = config => {
return config.citybikeModes.map(mode => mode.networkName.toUpperCase());
};
/**
* Retrieves all chosen citybike networks from the URI,
* localstorage or default configuration.
*
* @param {*} location The current location
* @param {*} config The configuration for the software installation
*/
export const getCitybikeNetworks = (location, config) => {
if (location && location.query && location.query.allowedBikeRentalNetworks) {
return decodeURI(location.query.allowedBikeRentalNetworks)
.split('?')[0]
.split(',')
.map(m => m.toUpperCase());
}
const { allowedBikeRentalNetworks } = getCustomizedSettings();
if (
Array.isArray(allowedBikeRentalNetworks) &&
!isEmpty(allowedBikeRentalNetworks)
) {
return allowedBikeRentalNetworks;
}
return getDefaultNetworks(config);
};
/** *
* Updates the list of allowed citybike networks either by removing or adding
*
* @param currentSettings the current settings
* @param newValue the network to be added/removed
* @param config The configuration for the software installation
* @param router the router
*/
export const updateCitybikeNetworks = (
currentSettings,
newValue,
config,
router,
) => {
const mappedcurrentSettings = currentSettings.allowedBikeRentalNetworks.map(
o => o.toUpperCase(),
);
const chosenNetworks = mappedcurrentSettings.find(
o => o === newValue.toUpperCase(),
)
? without(mappedcurrentSettings, newValue.toUpperCase())
: mappedcurrentSettings.concat([newValue.toUpperCase()]);
if (
chosenNetworks.length === 0 ||
(currentSettings.allowedBikeRentalNetworks.length === 0 && newValue)
) {
toggleTransportMode('citybike', config, router);
if (chosenNetworks.length === 0) {
replaceQueryParams(router, {
allowedBikeRentalNetworks: getDefaultNetworks(config).join(),
});
return;
}
}
replaceQueryParams(router, {
allowedBikeRentalNetworks: chosenNetworks.join(),
});
}; |
<<<<<<<
stoptimes: stoptimesWithoutPatterns(omitCanceled: false) {
pickupType
realtimeState
stop {
gtfsId
}
trip {
gtfsId
routeShortName
tripHeadsign
}
}
=======
zoneId
>>>>>>>
stoptimes: stoptimesWithoutPatterns(omitCanceled: false) {
pickupType
realtimeState
stop {
gtfsId
}
trip {
gtfsId
routeShortName
tripHeadsign
}
}
zoneId
<<<<<<<
stoptimes: stoptimesWithoutPatterns(omitCanceled: false) {
pickupType
realtimeState
stop {
gtfsId
}
}
=======
zoneId
>>>>>>>
stoptimes: stoptimesWithoutPatterns(omitCanceled: false) {
pickupType
realtimeState
stop {
gtfsId
}
}
zoneId |
<<<<<<<
const { retryFetch } = require('../app/util/fetchUtils');
=======
const config = require('../app/config').getConfiguration();
>>>>>>>
const { retryFetch } = require('../app/util/fetchUtils');
const config = require('../app/config').getConfiguration(); |
<<<<<<<
{startTime.format('HH:mm')}
=======
<LocalTime time={startTime} />
{firstLegStartTime}
>>>>>>>
<LocalTime time={startTime} /> |
<<<<<<<
const { token, user } = this.props;
await SDK.sendMessage({ msg, token, rid });
await SDK.notifyVisitorTyping(rid, user.username, false);
=======
const { alerts, dispatch, token } = this.props;
try {
const message = await SDK.sendMessage({ msg, token, rid });
console.log(message);
// TODO: check the room id to ensure that the state room id and the message room id are the same
// Otherwise, it's necessary to reset/reload the local room
} catch (error) {
const { message: reason } = error.data;
const alert = { id: createToken(), children: reason, error: true, timeout: 5000 };
await dispatch({ alerts: insert(alerts, alert) });
}
>>>>>>>
const { alerts, dispatch, token, user } = this.props;
try {
await SDK.sendMessage({ msg, token, rid });
// TODO: check the room id to ensure that the state room id and the message room id are the same
// Otherwise, it's necessary to reset/reload the local room
} catch (error) {
const { message: reason } = error.data;
const alert = { id: createToken(), children: reason, error: true, timeout: 5000 };
await dispatch({ alerts: insert(alerts, alert) });
}
await SDK.notifyVisitorTyping(rid, user.username, false); |
<<<<<<<
<div className={`leg-before-circle circle ${this.props.modeClassName}`} >
<svg
xmlns="http://www.w3.org/2000/svg"
width={28}
height={28}
style={{ fill: this.props.color, stroke: this.props.color }}
>
<circle stroke="white" strokeWidth="2" width={28} cx={11} cy={10} r={6} />
=======
<div className={`leg-before-circle circle ${this.props.modeClassName}`}>
<svg xmlns="http://www.w3.org/2000/svg" width={28} height={28}>
<circle
stroke="white"
strokeWidth="2"
width={28}
cx={11}
cy={10}
r={6}
/>
>>>>>>>
<div className={`leg-before-circle circle ${this.props.modeClassName}`}>
<svg
xmlns="http://www.w3.org/2000/svg"
width={28}
height={28}
style={{ fill: this.props.color, stroke: this.props.color }}
>
<circle
stroke="white"
strokeWidth="2"
width={28}
cx={11}
cy={10}
r={6}
/> |
<<<<<<<
'canceled-itineraries-amount':
'Additional {itineraryAmount, plural, =1 {1 canceled itinerary} other {{itineraryAmount} canceled itineraries}}',
'canceled-itineraries-amount-hide':
'Hide canceled itineraries ({itineraryAmount})',
=======
'canceled-legs': 'Canceled departures on the route',
>>>>>>>
'canceled-itineraries-amount':
'Additional {itineraryAmount, plural, =1 {1 canceled itinerary} other {{itineraryAmount} canceled itineraries}}',
'canceled-itineraries-amount-hide':
'Hide canceled itineraries ({itineraryAmount})',
'canceled-legs': 'Canceled departures on the route',
<<<<<<<
'canceled-itineraries-amount':
'Lisäksi {itineraryAmount, plural, =1 {1 peruttu reittiehdotus} other {{itineraryAmount} peruttua reittiehdotusta}}',
'canceled-itineraries-amount-hide':
'Piilota perutut reittiehdotukset ({itineraryAmount})',
=======
'canceled-legs': 'Reitillä peruttuja vuoroja',
>>>>>>>
'canceled-itineraries-amount':
'Lisäksi {itineraryAmount, plural, =1 {1 peruttu reittiehdotus} other {{itineraryAmount} peruttua reittiehdotusta}}',
'canceled-itineraries-amount-hide':
'Piilota perutut reittiehdotukset ({itineraryAmount})',
'canceled-legs': 'Reitillä peruttuja vuoroja',
<<<<<<<
'canceled-itineraries-amount':
'Ytterligare {itineraryAmount, plural, =1 {1 avställt avgång} other {{itineraryAmount} avställda avgångar}}',
'canceled-itineraries-amount-hide':
'Dölja inställda reseförslag ({itineraryAmount})',
=======
'canceled-legs': 'Inställda avgångar på linjen',
>>>>>>>
'canceled-itineraries-amount':
'Ytterligare {itineraryAmount, plural, =1 {1 avställt avgång} other {{itineraryAmount} avställda avgångar}}',
'canceled-itineraries-amount-hide':
'Dölja inställda reseförslag ({itineraryAmount})',
'canceled-legs': 'Inställda avgångar på linjen', |
<<<<<<<
import { insert, createToken, asyncForEach } from 'components/helpers';
=======
import { insert, createToken } from '../components/helpers';
>>>>>>>
import { insert, createToken, asyncForEach } from '../components/helpers'; |
<<<<<<<
'ticket-type-none': 'No fare zone limits',
'tickets': 'Tickets',
'time': 'Time',
'timetable': 'Timetable',
=======
tickets: 'Tickets',
time: 'Time',
timetable: 'Timetable',
>>>>>>>
'ticket-type-none': 'No fare zone limits',
tickets: 'Tickets',
time: 'Time',
timetable: 'Timetable',
<<<<<<<
'ticket-type-none': 'Ei lippuvyöhykerajoitusta',
'tickets': 'Matkaliput',
'time': 'Aika',
'timetable': 'Aikataulu',
=======
tickets: 'Matkaliput',
time: 'Aika',
timetable: 'Aikataulu',
>>>>>>>
'ticket-type-none': 'Ei lippuvyöhykerajoitusta',
tickets: 'Matkaliput',
time: 'Aika',
timetable: 'Aikataulu',
<<<<<<<
'ticket-type-none': 'Ingen resezonsbegränsning',
'tickets': 'Biljetter',
'time': 'Tid',
'timetable': 'Tidtabell',
=======
tickets: 'Biljetter',
time: 'Tid',
timetable: 'Tidtabell',
>>>>>>>
'ticket-type-none': 'Ingen resezonsbegränsning',
tickets: 'Biljetter',
time: 'Tid',
timetable: 'Tidtabell', |
<<<<<<<
<Header.Avatar><Avatar src={src} /></Header.Avatar>
=======
<Header.Picture><Avatar /></Header.Picture>
>>>>>>>
<Header.Picture><Avatar src={src} /></Header.Picture> |
<<<<<<<
this.replaceParams({
walkSpeed: defaultSettings.walkSpeed,
walkReluctance: defaultSettings.walkReluctance,
walkBoardCost: defaultSettings.walkBoardCost,
minTransferTime: defaultSettings.minTransferTime,
accessibilityOption: defaultSettings.accessibilityOption,
modes: ModeUtils.getDefaultModes(this.context.config).toString(),
ticketTypes: defaultSettings.ticketTypes,
});
=======
this.replaceParams(
{
walkSpeed: defaultSettings.walkSpeed,
walkReluctance: defaultSettings.walkReluctance,
walkBoardCost: defaultSettings.walkBoardCost,
minTransferTime: defaultSettings.minTransferTime,
accessibilityOption: defaultSettings.accessibilityOption,
modes: getDefaultModes(this.context.config).toString(),
ticketTypes: defaultSettings.ticketTypes,
},
...this.context.config.defaultSettings,
);
>>>>>>>
this.replaceParams(
{
walkSpeed: defaultSettings.walkSpeed,
walkReluctance: defaultSettings.walkReluctance,
walkBoardCost: defaultSettings.walkBoardCost,
minTransferTime: defaultSettings.minTransferTime,
accessibilityOption: defaultSettings.accessibilityOption,
modes: ModeUtils.getDefaultModes(this.context.config).toString(),
ticketTypes: defaultSettings.ticketTypes,
},
...this.context.config.defaultSettings,
); |
<<<<<<<
>
<DTAutosuggestPanel
origin={this.props.origin}
destination={this.props.destination}
tab={this.props.tab}
originSearchType="all"
originPlaceHolder="search-origin"
/>
<div key="foo" className="fpccontainer">
<FrontPagePanelLarge
selectedPanel={selectedMainTab}
nearbyClicked={this.clickNearby}
favouritesClicked={this.clickFavourites}
>
{this.renderTab()}
</FrontPagePanelLarge>
</div>
</MapWithTracking>
=======
activeArea="activeAreaLarge"
/>
>>>>>>>
/> |
<<<<<<<
layers: PropTypes.array,
=======
isFocused: PropTypes.func,
>>>>>>>
layers: PropTypes.array,
isFocused: PropTypes.func, |
<<<<<<<
import FavouritesPanel from './component/favourites/FavouritesPanel';
import NearbyRoutesPanel from './component/front-page/NearbyRoutesPanel';
=======
import SummaryTitle from './component/summary/SummaryTitle';
import ItineraryTab from './component/itinerary/ItineraryTab';
import ItineraryPageMap from './component/itinerary/ItineraryPageMap';
>>>>>>>
import FavouritesPanel from './component/favourites/FavouritesPanel';
import NearbyRoutesPanel from './component/front-page/NearbyRoutesPanel';
import SummaryTitle from './component/summary/SummaryTitle';
import ItineraryTab from './component/itinerary/ItineraryTab';
import ItineraryPageMap from './component/itinerary/ItineraryPageMap';
<<<<<<<
path="/reitti/:from/:to"
components={{ title: () => <span>Reittiehdotukset</span>, content: SummaryPage }}
/>
<Route
path="/reitti/:from/:to/:hash"
components={{ title: () => <span>Reittiohje</span>, content: ItineraryPage }}
/>
<Route path="/styleguide" component={StyleGuidelines} />
<Route path="/styleguide/component/:componentName" component={StyleGuidelines} />
<Route path="/suosikki/uusi" component={AddFavouritePage} />
<Route path="/suosikki/muokkaa/:id" component={AddFavouritePage} />
=======
path="reitti/:from/:to"
components={{
title: SummaryTitle,
content: SummaryPage,
}}
queries={{ content: planQueries }}
prepareParams={preparePlanParams}
render={{ content: SummaryPageWrapper }}
loadAction={(params) => [
[storeEndpoint, { target: 'origin', endpoint: otpToLocation(params.from) }],
[storeEndpoint, { target: 'destination', endpoint: otpToLocation(params.to) }],
]}
>
<Route path=":hash" components={{ content: ItineraryTab, map: ItineraryPageMap }}>
<Route path="kartta" fullscreenMap />
</Route>
</Route>
<Route path="styleguide" component={StyleGuidelines} />
<Route path="styleguide/component/:componentName" component={StyleGuidelines} />
<Route path="suosikki/uusi" component={AddFavouritePage} />
<Route path="suosikki/muokkaa/:id" component={AddFavouritePage} />
>>>>>>>
path="reitti/:from/:to"
components={{
title: SummaryTitle,
content: SummaryPage,
}}
queries={{ content: planQueries }}
prepareParams={preparePlanParams}
render={{ content: SummaryPageWrapper }}
loadAction={(params) => [
[storeEndpoint, { target: 'origin', endpoint: otpToLocation(params.from) }],
[storeEndpoint, { target: 'destination', endpoint: otpToLocation(params.to) }],
]}
>
<Route path=":hash" components={{ content: ItineraryTab, map: ItineraryPageMap }}>
<Route path="kartta" fullscreenMap />
</Route>
</Route>
<Route path="styleguide" component={StyleGuidelines} />
<Route path="styleguide/component/:componentName" component={StyleGuidelines} />
<Route path="suosikki/uusi" component={AddFavouritePage} />
<Route path="suosikki/muokkaa/:id" component={AddFavouritePage} /> |
<<<<<<<
isFocused: PropTypes.func,
=======
refPoint: dtLocationShape.isRequired,
>>>>>>>
isFocused: PropTypes.func,
refPoint: dtLocationShape.isRequired, |
<<<<<<<
onChange={onChangeText}
=======
placeholder={I18n.t('Type your message here')}
ref={this.handleInputRef}
>>>>>>>
onChange={onChangeText}
placeholder={I18n.t('Type your message here')}
ref={this.handleInputRef} |
<<<<<<<
<DTEndpointAutosuggest
id="origin"
autoFocus={
// Disable autofocus if using IE11
navigator.userAgent.indexOf('Trident') !== -1
? false
: this.context.breakpoint === 'large' && !this.props.origin.ready
}
refPoint={this.props.origin}
className={this.class(this.props.origin)}
searchType={this.props.originSearchType}
placeholder={this.props.originPlaceHolder}
value={this.value(this.props.origin)}
isFocused={this.isFocused}
onLocationSelected={location => {
let origin = { ...location, ready: true };
let destination = this.props.destination;
if (location.type === 'CurrentLocation') {
origin = { ...location, gps: true, ready: !!location.lat };
if (destination.gps === true) {
// destination has gps, clear destination
destination = { set: false };
}
=======
{
<DTEndpointAutosuggest
id="origin"
autoFocus={
this.context.breakpoint === 'large' && !this.props.origin.ready
>>>>>>>
{
<DTEndpointAutosuggest
id="origin"
autoFocus={
// Disable autofocus if using IE11
navigator.userAgent.indexOf('Trident') !== -1
? false
: this.context.breakpoint === 'large' && !this.props.origin.ready |
<<<<<<<
id: React.PropTypes.string,
viewBox: React.PropTypes.string,
color: React.PropTypes.string,
className: React.PropTypes.string,
img: React.PropTypes.string.isRequired,
=======
id: PropTypes.string,
viewBox: PropTypes.string,
className: PropTypes.string,
img: PropTypes.string.isRequired,
>>>>>>>
id: PropTypes.string,
viewBox: PropTypes.string,
color: PropTypes.string,
className: PropTypes.string,
img: PropTypes.string.isRequired, |
<<<<<<<
import SummaryRow from '../component/summary/SummaryRow';
=======
import SelectedStopPopupContent from '../component/stop/SelectedStopPopupContent';
>>>>>>>
import SelectedStopPopupContent from '../component/stop/SelectedStopPopupContent';
import SummaryRow from '../component/summary/SummaryRow';
<<<<<<<
SummaryRow,
=======
SelectedStopPopupContent,
>>>>>>>
SelectedStopPopupContent,
SummaryRow, |
<<<<<<<
import SummaryTitle from './component/summary/SummaryTitle';
import ItineraryPageMap from './component/itinerary/ItineraryPageMap';
=======
import FavouritesPanel from './component/favourites/FavouritesPanel';
import NearbyRoutesPanel from './component/front-page/NearbyRoutesPanel';
>>>>>>>
import SummaryTitle from './component/summary/SummaryTitle';
import ItineraryPageMap from './component/itinerary/ItineraryPageMap';
import FavouritesPanel from './component/favourites/FavouritesPanel';
import NearbyRoutesPanel from './component/front-page/NearbyRoutesPanel';
<<<<<<<
path="reitti/:from/:to"
components={{
title: SummaryTitle,
content: SummaryPage,
}}
queries={{ content: planQueries }}
prepareParams={preparePlanParams}
render={{ content: ({ props, routerProps }) => (props ?
<SummaryPage {...props} /> :
<SummaryPage
{...routerProps}
{...preparePlanParams(routerProps.params, routerProps)}
plan={{ plan: { } }}
loading
/>
) }}
loadAction={(params) => [
[storeEndpoint, { target: 'origin', endpoint: otpToLocation(params.from) }],
[storeEndpoint, { target: 'destination', endpoint: otpToLocation(params.to) }],
]}
>
<Route path=":hash" components={{ content: ItineraryPage, map: ItineraryPageMap }}>
<Route path="kartta" fullscreenMap />
</Route>
</Route>
<Route path="styleguide" component={StyleGuidelines} />
<Route path="styleguide/component/:componentName" component={StyleGuidelines} />
<Route path="suosikki/uusi" component={AddFavouritePage} />
<Route path="suosikki/muokkaa/:id" component={AddFavouritePage} />
=======
path="/reitti/:from/:to"
components={{ title: () => <span>Reittiehdotukset</span>, content: SummaryPage }}
/>
<Route
path="/reitti/:from/:to/:hash"
components={{ title: () => <span>Reittiohje</span>, content: ItineraryPage }}
/>
<Route path="/styleguide" component={StyleGuidelines} />
<Route path="/styleguide/component/:componentName" component={StyleGuidelines} />
<Route path="/suosikki/uusi" component={AddFavouritePage} />
<Route path="/suosikki/muokkaa/:id" component={AddFavouritePage} />
>>>>>>>
path="/reitti/:from/:to"
components={{
title: SummaryTitle,
content: SummaryPage,
}}
queries={{ content: planQueries }}
prepareParams={preparePlanParams}
render={{ content: ({ props, routerProps }) => (props ?
<SummaryPage {...props} /> :
<SummaryPage
{...routerProps}
{...preparePlanParams(routerProps.params, routerProps)}
plan={{ plan: { } }}
loading
/>
) }}
loadAction={(params) => [
[storeEndpoint, { target: 'origin', endpoint: otpToLocation(params.from) }],
[storeEndpoint, { target: 'destination', endpoint: otpToLocation(params.to) }],
]}
>
<Route path=":hash" components={{ content: ItineraryPage, map: ItineraryPageMap }}>
<Route path="kartta" fullscreenMap />
</Route>
</Route>
<Route path="/styleguide" component={StyleGuidelines} />
<Route path="/styleguide/component/:componentName" component={StyleGuidelines} />
<Route path="/suosikki/uusi" component={AddFavouritePage} />
<Route path="/suosikki/muokkaa/:id" component={AddFavouritePage} /> |
<<<<<<<
'public-transport': 'Public transport',
=======
'print-timetable': 'Timetable',
>>>>>>>
'print-timetable': 'Timetable',
'public-transport': 'Public transport',
<<<<<<<
'public-transport': 'Joukkoliikenne',
=======
'print-timetable': 'Aikataulu',
>>>>>>>
'print-timetable': 'Aikataulu',
'public-transport': 'Joukkoliikenne',
<<<<<<<
'public-transport': 'Kollektivtrafik',
=======
'print-timetable': 'Tidtabell',
>>>>>>>
'print-timetable': 'Tidtabell',
'public-transport': 'Kollektivtrafik', |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.