conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
=======
// console.log(trackstpl(getJsonData()));
>>>>>>> |
<<<<<<<
if (
// IE 6 & 7 fail to recognise Content-Types ending +xml (eg application/rss+xml)
// as XML, so we create an XML object from the text here
( glow.env.ie < 8 && endsPlusXml.test(this.header("Content-Type")) )
// If the _forceXml option is set, we need to turn the response text into xml
|| ( this._request._forceXml && !this._request.nativeRequest.overrideMimeType && window.ActiveXObject )
) {
=======
// check property exists
if (!nativeResponse.responseXML) {
throw new Error(STR.XML_ERR);
}
// IE fails to recognise the doc as XML in some cases
// so we create an XML object from the text here
if ( glow.env.ie && shouldParseAsXml.call(this) ) {
>>>>>>>
if (
// IE fails to recognise the doc as XML in some cases
( glow.env.ie && shouldParseAsXml.call(this) )
// If the _forceXml option is set, we need to turn the response text into xml
|| ( this._request._forceXml && !this._request.nativeRequest.overrideMimeType && window.ActiveXObject )
) { |
<<<<<<<
if (fmc.flightPlanManager.getApproachRunway() || fmc.vfrLandingRunway) {
=======
if (fmc.flightPlanManager.getApproachRunway() && fmc.landingQnh > 28 && fmc.landingQnh < 32 && fmc.landingOat && fmc.landingWindDir >= 0 && fmc.landingWindDir <= 360) {
>>>>>>>
if (arrRunwayOutput !== "NO APPROACH RW" && fmc.landingQnh > 28 && fmc.landingQnh < 32 && fmc.landingOat && fmc.landingWindDir >= 0 && fmc.landingWindDir <= 360) {
<<<<<<<
if (fmc.flightPlanManager.getApproachRunway() || fmc.vfrLandingRunway) {
=======
if (fmc.flightPlanManager.getApproachRunway() && fmc.landingQnh > 28 && fmc.landingQnh < 32 && fmc.landingOat && fmc.landingWindDir >= 0 && fmc.landingWindDir <= 360) {
>>>>>>>
if (arrRunwayOutput !== "NO APPROACH RW" && fmc.landingQnh > 28 && fmc.landingQnh < 32 && fmc.landingOat && fmc.landingWindDir >= 0 && fmc.landingWindDir <= 360) {
<<<<<<<
=======
let arrRunwayLength = "";
let arrRunway = fmc.flightPlanManager.getApproachRunway();
if (arrRunway) {
arrRunwayLength = new Number((arrRunway.length) * 3.28);
arrRunwayOutput = "RW" + fmc.getRunwayDesignation(arrRunway);
}
>>>>>>> |
<<<<<<<
SIGN_IN_WITH_HOSTEDUI_KEY: 'amplify-react-signin-with-hostedUI'
};
=======
SIGN_IN_WITH_HOSTEDUI_KEY: 'amplify-signin-with-hostedUI'
};
export default constants;
>>>>>>>
SIGN_IN_WITH_HOSTEDUI_KEY: 'amplify-signin-with-hostedUI'
}; |
<<<<<<<
=======
logger.debug(service_info);
>>>>>>>
logger.debug(service_info);
<<<<<<<
=======
logger.debug(request_str);
>>>>>>>
logger.debug(request_str); |
<<<<<<<
var tmpFolder = os.tmpdir();
var appsFolder = tmpFolder + '/matrix_app';
var updateFile = appsFolder + '/' + name + '-' + version + Math.round(Math.random() * 100000) + '.zip';
=======
var updateFile = '/tmp/matrix_app/' + name + '-' + version + Math.round(Math.random() * 100000) + '.zip';
>>>>>>>
var tmpFolder = os.tmpdir();
var appsFolder = tmpFolder + '/matrix_app';
var updateFile = appsFolder + '/' + name + '-' + version + Math.round(Math.random() * 100000) + '.zip';
<<<<<<<
if (!fs.existsSync(tmpFolder)) {
fs.mkdirSync(tmpFolder); //If missing temp folder create it
}
if (!fs.existsSync(appsFolder)) {
fs.mkdirSync(appsFolder); //If missing apps folder create it
}
=======
if (!fs.existsSync('/tmp/matrix_app/')) {
fs.mkdirSync('/tmp/matrix_app/');
}
>>>>>>>
if (!fs.existsSync(tmpFolder)) {
fs.mkdirSync(tmpFolder); //If missing temp folder create it
}
if (!fs.existsSync(appsFolder)) {
fs.mkdirSync(appsFolder); //If missing apps folder create it
}
<<<<<<<
//This message is required by the Windows App CMS integrations MOS app installer. It is used to identify successful application installation
console.log('App:', name, 'installed successfully!');
=======
>>>>>>>
//This message is required by the Windows App CMS integrations MOS app installer. It is used to identify successful application installation
console.log('App:', name, 'installed successfully!');
<<<<<<<
=======
// don't node debug because stderr (kills apps)
process.env.DEBUG = 'false';
>>>>>>>
// don't node debug because stderr (kills apps)
process.env.DEBUG = 'false'; |
<<<<<<<
debug('Killing process for app ' + id);
=======
// id == app name
>>>>>>>
debug('Killing process for app ' + id);
// id == app name
<<<<<<<
//remove app from process list
Matrix.activeApplications = _.reject(Matrix.activeApplications, function(p) {
return (p.name === id);
});
appStopped = true; //TODO Maybe actually make sure the process is killed?
=======
>>>>>>>
//remove app from process list
Matrix.activeApplications = _.reject(Matrix.activeApplications, function(p) {
return (p.name === id);
});
appStopped = true; //TODO Maybe actually make sure the process is killed? |
<<<<<<<
function readLocalDeviceInfo(cb) {
if (!_.isUndefined(Matrix.deviceId) && !_.isUndefined(Matrix.deviceSecret)) {
console.log('Not using device data from db, using '.yellow + 'MATRIX_DEVICE_ID'.gray + ' and '.yellow + 'MATRIX_DEVICE_SECRET'.gray + ' instead!'.yellow);
cb();
} else {
Matrix.db.device.findOne({
id: { $exists: true },
secret: { $exists: true },
env: Matrix.env
}, function(err, result){
if (err) return cb(err);
if (_.isNull(result)) {
debug('Sadly, we got no device records :(');
} else {
if (_.has(result, 'id') && _.has(result, 'secret')) {
debug('Device data found: ', result);
Matrix.deviceId = result.id;
Matrix.deviceSecret = result.secret;
} else {
err = new Error('No id and secret found for this device');
}
}
cb(err);
});
}
}
Matrix.haltTheMatrix = function () {
=======
Matrix.haltTheMatrix = function(cb){
>>>>>>>
function readLocalDeviceInfo(cb) {
if (!_.isUndefined(Matrix.deviceId) && !_.isUndefined(Matrix.deviceSecret)) {
console.log('Not using device data from db, using '.yellow + 'MATRIX_DEVICE_ID'.gray + ' and '.yellow + 'MATRIX_DEVICE_SECRET'.gray + ' instead!'.yellow);
cb();
} else {
Matrix.db.device.findOne({
id: { $exists: true },
secret: { $exists: true },
env: Matrix.env
}, function(err, result){
if (err) return cb(err);
if (_.isNull(result)) {
debug('Sadly, we got no device records :(');
} else {
if (_.has(result, 'id') && _.has(result, 'secret')) {
debug('Device data found: ', result);
Matrix.deviceId = result.id;
Matrix.deviceSecret = result.secret;
} else {
err = new Error('No id and secret found for this device');
}
}
cb(err);
});
}
}
Matrix.haltTheMatrix = function(cb){ |
<<<<<<<
require('prototypes');
=======
var path = require('path');
>>>>>>>
require('prototypes');
var path = require('path'); |
<<<<<<<
import StyledComponentsDocs from './styled-components.md';
import ChipDocs from '../Chip/chip.md';
=======
>>>>>>>
import ChipDocs from '../Chip/chip.md';
<<<<<<<
label: 'Library Integrations',
options: [
{
label: 'Styled Components',
url: `/styled-components`,
component: StyledComponentsDocs
}
]
},
{
=======
>>>>>>> |
<<<<<<<
[fixtures.findTimeEmail1, fixtures.findTimeEmail2],
fixtures.findTimeFuture,
fixtures.findTimeLength
).then(function(res) {
response = res;
=======
fixtures.findTime.emails,
fixtures.findTime.filters,
fixtures.findTime.future,
fixtures.findTime.lengthVar,
fixtures.findTime.sort
).then(function(response) {
expect(response.data).toBeDefined();
expect(Object.prototype.toString.call(response.data.data)).toBe('[object Array]');
done();
>>>>>>>
fixtures.findTime.emails,
fixtures.findTime.filters,
fixtures.findTime.future,
fixtures.findTime.lengthVar,
fixtures.findTime.sort
).then(function(res) {
response = res; |
<<<<<<<
//asserts., waits.
=======
>>>>>>>
//asserts., waits. |
<<<<<<<
var contents = require('./contents')
require('../index')(contents, {logo: 'logo.svg'})
=======
var contents = {
'overview': {
'about': 'about.md'
},
'animals': {
'furry': {
'sheep': 'sheep.md',
'puppy': 'puppy.md'
},
'pink': {
'pig': 'pig.md'
}
}
}
require('../index.js')(contents, {
logo: 'logo.svg',
style: true
})
>>>>>>>
var contents = require('./contents')
require('../index.js')(contents, {
logo: 'logo.svg',
style: true
}) |
<<<<<<<
this.log(index + ') ' + spec.fullName);
this.displayErrorMessages(spec);
=======
this.log(index + ') ' + this.getFullDescription(spec));
this.displayErrorMessages(spec, this.displaySummaryWithStacktrace);
>>>>>>>
this.log(index + ') ' + spec.fullName);
this.displayErrorMessages(spec, this.displaySummaryWithStacktrace);
<<<<<<<
for (var i = 0; i < spec.failedExpectations.length; i++) {
if (!spec.failedExpectations[i].passed) {
this.log('- '.failure + spec.failedExpectations[i].message.failure);
if (this.displayStacktrace && spec.failedExpectations[i].stack) {
this.log(this.filterStackTraces(spec.failedExpectations[i].stack));
=======
var assertions = spec.results().items_;
for (var i = 0; i < assertions.length; i++) {
if (!assertions[i].passed()) {
this.log('- '.failure + assertions[i].message.failure);
if (withStacktrace && assertions[i].trace.stack) {
this.log(this.filterStackTraces(assertions[i].trace.stack));
>>>>>>>
for (var i = 0; i < spec.failedExpectations.length; i++) {
if (!spec.failedExpectations[i].passed) {
this.log('- '.failure + spec.failedExpectations[i].message.failure);
if (withStacktrace && spec.failedExpectations[i].stack) {
this.log(this.filterStackTraces(spec.failedExpectations[i].stack)); |
<<<<<<<
var result = template.render({list: list});
is(result, 'evaluated', '{{.}} lambda correctly evaluated');
});
test("Lambda expression in included partial templates", function() {
var lambda = function() {
return function(argument) {
return 'changed ' + argument;
}
}
var parent = '{{$section}}{{/section}}';
var partial = '{{$label}}test1{{/label}}';
var text = '{{< parent}}{{$section}}{{<partial}}{{$label}}{{#lambda}}test2{{/lambda}}{{/label}}{{/partial}}{{/section}}{{/parent}}';
var template = Hogan.compile(text);
var result = template.render({lambda: lambda}, {partial: Hogan.compile(partial), parent: Hogan.compile(parent)});
is(result, 'changed test2', 'Lambda expression in included partial templates');
=======
var result = template.render(model);
is(result, 'direct indirect', 'get() is checked after direct access');
>>>>>>>
var result = template.render(model);
is(result, 'direct indirect', 'get() is checked after direct access');
});
test("Lambda expression in included partial templates", function() {
var lambda = function() {
return function(argument) {
return 'changed ' + argument;
}
}
var parent = '{{$section}}{{/section}}';
var partial = '{{$label}}test1{{/label}}';
var text = '{{< parent}}{{$section}}{{<partial}}{{$label}}{{#lambda}}test2{{/lambda}}{{/label}}{{/partial}}{{/section}}{{/parent}}';
var template = Hogan.compile(text);
var result = template.render({lambda: lambda}, {partial: Hogan.compile(partial), parent: Hogan.compile(parent)});
is(result, 'changed test2', 'Lambda expression in included partial templates'); |
<<<<<<<
var appNameArgument = cliparse.argument("app-name", { description: "Application name" });
var appIdArgument = cliparse.argument("app-id", { description: "Application ID" });
var aliasArgument = cliparse.argument("app-alias", { description: "Application alias" });
var envVariableName = cliparse.argument("variable-name", { description: "Name of the environment variable" });
var envVariableValue = cliparse.argument("variable-value", { description: "Value of the environment variable" });
var fqdnArgument = cliparse.argument("fqdn", { description: "Domain name of the Clever-Cloud application" });
=======
var appNameArgument = cliparse.argument("app-name", { helpT: "Application name" });
var appIdArgument = cliparse.argument("app-id", { helpT: "Application ID (or name, if unambiguous)" });
var aliasArgument = cliparse.argument("app-alias", { helpT: "Application alias" });
var envVariableName = cliparse.argument("variable-name", { helpT: "Name of the environment variable" });
var envVariableValue = cliparse.argument("variable-value", { helpT: "Value of the environment variable" });
var fqdnArgument = cliparse.argument("fqdn", { helpT: "Domain name of the Clever-Cloud application" });
>>>>>>>
var appNameArgument = cliparse.argument("app-name", { description: "Application name" });
var appIdArgument = cliparse.argument("app-id", { description: "Application ID (or name, if unambiguous)" });
var aliasArgument = cliparse.argument("app-alias", { description: "Application alias" });
var envVariableName = cliparse.argument("variable-name", { description: "Name of the environment variable" });
var envVariableValue = cliparse.argument("variable-value", { description: "Value of the environment variable" });
var fqdnArgument = cliparse.argument("fqdn", { description: "Domain name of the Clever-Cloud application" });
<<<<<<<
orgaOption,
aliasCreationOption
=======
aliasOption
>>>>>>>
aliasCreationOption |
<<<<<<<
=======
>>>>>>>
<<<<<<<
$(document).on('dblclick', '#' + leftID + ' li[class!="option_disabled"]', function(e){
=======
$('#' + leftID + ' li[class!="option_disabled"]').live('dblclick', function(e){
>>>>>>>
$('#' + leftID + ' li[class!="option_disabled"]').live('dblclick', function(e){
<<<<<<<
$(document).on('click', '#' + leftID + ' li', function(e){
if (isCtrlDown) {
$(this).removeClass(settings.selectedClass);
} else {
markForMove(this, leftID);
=======
$('#' + leftID + ' li').live('click', function(e){
if ($(this).hasClass('optgrp') === false)
{
if (isCtrlDown) {
$(this).removeClass(settings.selectedClass);
} else {
markForMove(this, leftID);
}
>>>>>>>
$('#' + leftID + ' li').live('click', function(e){
if ($(this).hasClass('optgrp') === false)
{
if (isCtrlDown) {
$(this).removeClass(settings.selectedClass);
} else {
markForMove(this, leftID);
}
<<<<<<<
$(this).prepend('<input type="hidden" name="' + $('#' + selectID).attr('name') + '" value="' + src.attr('value') + '"" class="sorted_val" />');
=======
$(this).prepend('<input type="hidden" name="' + $('#' + selectID).attr('name') + '" value="' + src.attr('value') + '" />');
>>>>>>>
$(this).prepend('<input type="hidden" name="' + $('#' + selectID).attr('name') + '" value="' + src.attr('value') + '"" class="sorted_val" />'); |
<<<<<<<
var stop = require("../src/stop.js");
=======
var status = require("../src/status.js");
>>>>>>>
var stop = require("../src/stop.js");
var status = require("../src/status.js");
<<<<<<<
// STOP COMMAND
var stopCommand = cliparse.command("stop", {
description: "Stop a running application on Clever-Cloud",
options: [
aliasOption
]
}, _.partial(stop, api));
=======
// STATUS COMMAND
var statusCommand = cliparse.command("status", {
description: "See the status of an application on Clever-Cloud",
options: [
aliasOption
]
}, _.partial(status, api));
>>>>>>>
// STOP COMMAND
var stopCommand = cliparse.command("stop", {
description: "Stop a running application on Clever-Cloud",
options: [
aliasOption
]
}, _.partial(stop, api));
// STATUS COMMAND
var statusCommand = cliparse.command("status", {
description: "See the status of an application on Clever-Cloud",
options: [
aliasOption
]
}, _.partial(status, api));
<<<<<<<
domainCommands,
stopCommand
=======
domainCommands,
statusCommand
>>>>>>>
domainCommands,
stopCommand,
statusCommand |
<<<<<<<
this.blackList = blackLists[Narcissus.options.version];
=======
this.blockComments = null;
>>>>>>>
this.blackList = blackLists[Narcissus.options.version];
this.blockComments = null; |
<<<<<<<
export const debug = (...message) => {
if (logLevel < logLevels.debug) {
return;
}
logger.log.apply(null, message);
};
export const info = (message, value) => {
if (logLevel < logLevels.info) {
return;
}
=======
const info = (message, value) => {
>>>>>>>
const debug = (...message) => {
if (logLevel < logLevels.debug) {
return;
}
logger.log.apply(null, message);
};
const info = (message, value) => {
if (logLevel < logLevels.info) {
return;
} |
<<<<<<<
import cliResolver from './paths/cliResolver';
import * as logger from './logger';
import { writeOutStoryLoader } from './storyWriterProcess';
import resolvePaths from './paths/multiResolver';
=======
const cliResolver = require('./paths/cliResolver');
const { info } = require('./logger');
const { writeOutStoryLoader } = require('./storyWriterProcess');
const resolvePaths = require('./paths/multiResolver');
>>>>>>>
const cliResolver = require('./paths/cliResolver');
const logger = require('./logger');
const { writeOutStoryLoader } = require('./storyWriterProcess');
const resolvePaths = require('./paths/multiResolver'); |
<<<<<<<
import AddCluster from './components/AddCluster';
=======
import Pods from './components/Pods';
>>>>>>>
import AddCluster from './components/AddCluster';
import Pods from './components/Pods';
<<<<<<<
Add: AddCluster
=======
Pods: Pods,
>>>>>>>
Add: AddCluster,
Pods: Pods |
<<<<<<<
webrtc.sendFile(connection, file);
=======
// TODO: currently sending file finishes almost instantly,
// so there's no point in listening for 'sending' progress.
// Need to somehow make it more accurate.
// peer.get('peer.connection').on('sending_progress', function (progress) {
// peer.set('transfer.sendingProgress', progress);
// });
_peer.sendFile(connection, file);
>>>>>>>
// TODO: currently sending file finishes almost instantly,
// so there's no point in listening for 'sending' progress.
// peer.get('peer.connection').on('sending_progress', function (progress) {
// peer.set('transfer.sendingProgress', progress);
// });
webrtc.sendFile(connection, file); |
<<<<<<<
checkAssignee: () => {
return new Promise((resolve) => {
resolve({ status: 204 })
})
},
=======
addLabels: jest.fn(),
>>>>>>>
checkAssignee: () => {
return new Promise((resolve) => {
resolve({ status: 204 })
})
},
addLabels: jest.fn(), |
<<<<<<<
const renderFeatureCallback = stub().returns("feature rendered");
renderFeatureCallback.withArgs({a: 1}).returns("feature object 1");
renderFeatureCallback.withArgs(1).returns("feature number 1");
renderFeatureCallback.withArgs([1]).returns("feature array 1");
const renderDefaultCallback = stub().returns("default rendered");
const initialRenderCallback = stub().returns("initial rendered");
=======
const renderFeatureCallback = jest.fn().mockReturnValue("feature rendered");
const renderDefaultCallback = jest.fn().mockReturnValue("default rendered");
const initialRenderCallback = jest.fn().mockReturnValue("initial rendered");
>>>>>>>
const renderFeatureCallback = jest.fn().mockImplementation((flagValue) => {
if(flagValue === {a: 1}) {return "feature object 1";}
if(flagValue === 1) {return "feature number 1";}
if(flagValue === [1]) {return "feature array 1";}
return "feature rendered";
});
const renderDefaultCallback = jest.fn().mockReturnValue("default rendered");
const initialRenderCallback = jest.fn().mockReturnValue("initial rendered");
<<<<<<<
context("when flagValue is true", () => {
=======
describe("when showFeature is true", () => {
>>>>>>>
describe("when flagValue is true", () => {
<<<<<<<
wrapper.setState({ flagValue: false, checkFeatureFlagComplete: true });
expect(wrapper.text()).to.equal(renderDefaultCallback());
=======
wrapper.setState({ showFeature: false, checkFeatureFlagComplete: true });
expect(wrapper.text()).toEqual(renderDefaultCallback());
>>>>>>>
wrapper.setState({ flagValue: false, checkFeatureFlagComplete: true });
expect(wrapper.text()).toEqual(renderDefaultCallback());
<<<<<<<
wrapper.setState({ flagValue: false, checkFeatureFlagComplete: false });
expect(wrapper.text()).to.equal(initialRenderCallback());
=======
wrapper.setState({ showFeature: false, checkFeatureFlagComplete: false });
expect(wrapper.text()).toEqual(initialRenderCallback());
>>>>>>>
wrapper.setState({ flagValue: false, checkFeatureFlagComplete: false });
expect(wrapper.text()).toEqual(initialRenderCallback());
<<<<<<<
expect(wrapper.state()).to.deep.equal({ checkFeatureFlagComplete: true, flagValue: true });
=======
expect(wrapper.state()).toEqual({ checkFeatureFlagComplete: true, showFeature: true });
>>>>>>>
expect(wrapper.state()).toEqual({ checkFeatureFlagComplete: true, flagValue: true });
<<<<<<<
expect(wrapper.state()).to.deep.equal({ checkFeatureFlagComplete: true, flagValue: false });
=======
expect(wrapper.state()).toEqual({ checkFeatureFlagComplete: true, showFeature: false });
>>>>>>>
expect(wrapper.state()).toEqual({ checkFeatureFlagComplete: true, flagValue: false });
<<<<<<<
expect(wrapper.state()).to.deep.equal({ checkFeatureFlagComplete: true, flagValue: false });
=======
expect(wrapper.state()).toEqual({ checkFeatureFlagComplete: true, showFeature: false });
>>>>>>>
expect(wrapper.state()).toEqual({ checkFeatureFlagComplete: true, flagValue: false });
<<<<<<<
expect(wrapper.state()).to.deep.equal({ checkFeatureFlagComplete: true, flagValue: true });
=======
expect(wrapper.state()).toEqual({ checkFeatureFlagComplete: true, showFeature: true });
>>>>>>>
expect(wrapper.state()).toEqual({ checkFeatureFlagComplete: true, flagValue: true });
<<<<<<<
expect(wrapper.state()).to.deep.equal({ checkFeatureFlagComplete: true, flagValue: true });
=======
expect(wrapper.state()).toEqual({ checkFeatureFlagComplete: true, showFeature: true });
>>>>>>>
expect(wrapper.state()).toEqual({ checkFeatureFlagComplete: true, flagValue: true });
<<<<<<<
expect(wrapper.state()).to.deep.equal({ checkFeatureFlagComplete: true, flagValue: true });
=======
expect(wrapper.state()).toEqual({ checkFeatureFlagComplete: true, showFeature: true });
>>>>>>>
expect(wrapper.state()).toEqual({ checkFeatureFlagComplete: true, flagValue: true }); |
<<<<<<<
=======
getinfo: function getInfo() {
actions.account.getInfo(PublicClient());
},
register: function register() {
actions.account.register(PublicClient());
},
login: function login() {
actions.account.login(program.url);
},
logout: function logout() {
actions.account.logout(PrivateClient());
},
resetpassword: function resetpassword(email) {
actions.account.resetpassword(PublicClient(), email);
},
listkeys: function listkeys() {
actions.keys.list(PrivateClient());
},
addkey: function addkey(pubkey) {
actions.keys.add(PrivateClient(), pubkey);
},
removekey: function removekey(pubkey, env) {
actions.keys.remove(PrivateClient(), pubkey, env);
},
listbuckets: function listbuckets() {
actions.buckets.list(PrivateClient());
},
getbucket: function showbucket(id) {
actions.buckets.get(PrivateClient(), id);
},
removebucket: function removebucket(id, env) {
actions.buckets.remove(PrivateClient(), id, env);
},
addbucket: function addbucket(name, storage, transfer) {
actions.buckets.add(PrivateClient(), name, storage, transfer);
},
updatebucket: function updatebucket(id, name, storage, transfer) {
actions.buckets.update(PrivateClient(), id, name, storage, transfer);
},
listfiles: function listfiles(bucketid) {
actions.files.list(PrivateClient(), bucketid);
},
removefile: function removefile(id, fileId, env) {
actions.files.remove(PrivateClient(), getKeyPass(), id, fileId, env);
},
uploadfile: function uploadfile(bucket, filepath, env) {
var privateClient = PrivateClient({
concurrency: env.concurrency ? parseInt(env.concurrency) : 6
});
var filepaths = process.argv.slice();
var firstFileIndex = filepaths.indexOf(filepath);
filepaths.splice(0,firstFileIndex);
actions.files.upload(privateClient, getKeyPass(), bucket, filepaths, env);
},
createmirrors: function createmirrors(bucket, file, env) {
actions.files.mirror(PrivateClient(), bucket, file, env);
},
getpointers: function getpointers(bucket, id, env) {
actions.files.getpointers(PrivateClient(), bucket, id, env);
},
addframe: function addframe() {
actions.frames.add(PrivateClient());
},
listframes: function listframes() {
actions.frames.list(PrivateClient());
},
getframe: function getframe(frame) {
actions.frames.get(PrivateClient(), frame);
},
removeframe: function removeframe(frame, env) {
actions.frames.remove(PrivateClient(), frame, env);
},
downloadfile: function downloadfile(bucket, id, filepath, env) {
actions.files.download(
PrivateClient(),
getKeyPass(),
bucket,
id,
filepath,
env
);
},
createtoken: function createtoken(bucket, operation) {
PrivateClient().createToken(bucket, operation, function(err, token) {
if (err) {
return log('error', err.message);
}
log('info', 'Token successfully created.');
log(
'info',
'Token: %s, Bucket: %s, Operation: %s',
[token.token, token.bucket, token.operation]
);
});
},
streamfile: function streamfile(bucket, id, env) {
var privateClient = PrivateClient({
logger: storj.deps.kad.Logger(0)
});
actions.files.stream(privateClient, getKeyPass(), bucket, id, env);
},
resetkeyring: function resetkeyring() {
utils.resetkeyring(getKeyPass());
},
listcontacts: function listcontacts(page) {
actions.contacts.list(PublicClient(), page);
},
getcontact: function getcontact(nodeid) {
actions.contacts.get(PublicClient(), nodeid);
},
generatekey: function generatekey(env) {
utils.generatekey(env);
},
signmessage: function signmessage(privatekey, message) {
utils.signmessage(privatekey, message, this.compact);
},
prepareaudits: function prepareaudits(num, filepath) {
utils.prepareaudits(num, filepath);
},
provefile: function provefile(leaves, challenge, filepath) {
utils.provefile(leaves, challenge, filepath);
},
verifyproof: function verifyproof(root, depth, resp) {
utils.verifyproof(root, depth, resp);
},
exportkeyring: function(directory) {
utils.exportkeyring(getKeyPass(), directory);
},
importkeyring: function(path) {
utils.importkeyring(getKeyPass(), path);
},
>>>>>>>
<<<<<<<
.description('upload a file to the network and track in a bucket')
.action(actions.files.upload.bind(program));
=======
.description('upload a file or files to the network and track in a bucket')
.description('<filepath> can be a path with wildcard or a space separated')
.description(' list of files')
.action(ACTIONS.uploadfile);
>>>>>>>
.description('upload a file or files to the network and track in a bucket')
.description('<filepath> can be a path with wildcard or a space separated')
.description(' list of files')
.action(actions.files.upload.bind(program)); |
<<<<<<<
}
const EmailRow = styled.form`
display: flex;
flex-direction: row;
`
const InputButton = styled.input`
padding: 0.25rem 0.75rem;
background-color: ${({ theme }) => theme.colors.link};
text-decoration: none;
color: ${({ theme }) => theme.invertedTextColor};
border-radius: 12px;
margin-right: 0.5rem;
display: inline-block;
transform: scale(0.98);
transition: transform 0.25s ease;
box-sizing: border-box;
font-weight: 400;
border: none;
:hover {
transform: scale(1);
cursor: pointer;
}
@media (max-width: 960px) {
margin-right: 0.5rem;
text-align: center;
text-decoration: none;
font-size: 0.825rem;
padding: 0.25rem 1rem;
}
outline-color: transparent;
outline-style: none;
`
const StyledInput = styled.input`
border-radius: 12px;
margin-right: 10px;
box-shadow: none;
background-image: none;
background-color: transparent;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
border: 1px solid ${({ theme }) => theme.chaliceGray};
width: 280px;
padding: 4px 0 4px 10px;
:focus {
outline-color: transparent;
outline-style: none;
border: 1px solid ${({ theme }) => theme.colors.link};
}
`
const EmailSection = () => {
const [email, setEmail] = useState('')
return (
<StyledSectionFlex>
<StyledGoal style={{ width: '100%', maxWidth: '450px' }}>
<h1>Stay In Touch</h1>
<p>Signup for updates filler text.</p>
<EmailRow
action="https://uniswap.us19.list-manage.com/subscribe/post?u=c93471c1443f1e6365b5ca093&id=7d591bff13"
method="post"
id="mc-embedded-subscribe-form"
name="mc-embedded-subscribe-form"
target="_blank"
novalidate
>
<StyledInput
type="email"
value={email}
name="EMAIL"
id="mce-EMAIL"
placeholder="email address"
required
onChange={val => setEmail(val.target.value)}
/>
<div>
<InputButton type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" />
</div>
</EmailRow>
</StyledGoal>
</StyledSectionFlex>
)
=======
>>>>>>>
}
const EmailRow = styled.form`
display: flex;
flex-direction: row;
`
const InputButton = styled.input`
padding: 0.25rem 0.75rem;
background-color: ${({ theme }) => theme.colors.link};
text-decoration: none;
color: ${({ theme }) => theme.invertedTextColor};
border-radius: 12px;
margin-right: 0.5rem;
display: inline-block;
transform: scale(0.98);
transition: transform 0.25s ease;
box-sizing: border-box;
font-weight: 400;
border: none;
:hover {
transform: scale(1);
cursor: pointer;
}
@media (max-width: 960px) {
margin-right: 0.5rem;
text-align: center;
text-decoration: none;
font-size: 0.825rem;
padding: 0.25rem 1rem;
}
outline-color: transparent;
outline-style: none;
`
const StyledInput = styled.input`
border-radius: 12px;
margin-right: 10px;
box-shadow: none;
background-image: none;
background-color: transparent;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
border: 1px solid ${({ theme }) => theme.chaliceGray};
width: 280px;
padding: 4px 0 4px 10px;
:focus {
outline-color: transparent;
outline-style: none;
border: 1px solid ${({ theme }) => theme.colors.link};
}
`
const EmailSection = () => {
const [email, setEmail] = useState('')
return (
<StyledSectionFlex>
<StyledGoal style={{ width: '100%', maxWidth: '450px' }}>
<h1>Stay In Touch</h1>
<p>Signup for updates filler text.</p>
<EmailRow
action="https://uniswap.us19.list-manage.com/subscribe/post?u=c93471c1443f1e6365b5ca093&id=7d591bff13"
method="post"
id="mc-embedded-subscribe-form"
name="mc-embedded-subscribe-form"
target="_blank"
novalidate
>
<StyledInput
type="email"
value={email}
name="EMAIL"
id="mce-EMAIL"
placeholder="email address"
required
onChange={val => setEmail(val.target.value)}
/>
<div>
<InputButton type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" />
</div>
</EmailRow>
</StyledGoal>
</StyledSectionFlex>
) |
<<<<<<<
{ name: 'Voting Portal', link: 'https://app.uniswap.org/#/vote' }
=======
{ name: 'Voting Portal', link: 'https://app.uniswap.org/#/vote/' },
{ name: 'Documentation', link: '/docs/v2/governance/overview' }
>>>>>>>
{ name: 'Voting Portal', link: 'https://app.uniswap.org/#/vote' },
{ name: 'Documentation', link: '/docs/v2/governance/overview' } |
<<<<<<<
=======
volume: 0,
>>>>>>>
volume: 0,
<<<<<<<
// @todo: here for later
// onVolumeChange: Ember.observer('volumeChange', function() {
// if (this.get('volume')) {
// this.send('play');
// } else {
// this.send('pause');
// }
// }),
=======
onVolumeChange: function() {
if (this.get('volume') > 100) {
this.set('volume', 100);
} else if (this.get('volume') < 0) {
this.set('volume', 0)
}
this.get('player').setVolume(this.get('volume'));
}.observes('volume'),
>>>>>>>
onVolumeChange: Ember.observer('volume', function() {
// keep values between 0 and 100
if (this.get('volume') > 100) {
this.set('volume', 100);
} else if (this.get('volume') < 0) {
this.set('volume', 0);
}
// set it on the player
this.get('player').setVolume(this.get('volume'));
}), |
<<<<<<<
// Change the mapUrl below to test!
,mapUrl = 'http://api.geosition.com/tile/lmv/{z}/{x}/{y}.png'
=======
,mapUrl = 'http://api.geosition.com/tilestache/gp/{z}/{x}/{y}.png'
>>>>>>>
,mapUrl = 'http://api.geosition.com/tile/lmv/{z}/{x}/{y}.png' |
<<<<<<<
import { useUIMode } from "../ThemeProvider";
import { DrawerTransition, DrawerOverlay, DrawerContent } from "./components";
=======
import CloseButton from "../CloseButton";
import { DrawerContent, DrawerOverlay, DrawerTransition } from "./components";
>>>>>>>
import { DrawerContent, DrawerOverlay, DrawerTransition } from "./components"; |
<<<<<<<
/* If cacheOptions is truthy, then the loaded data will be cached. The cache
will remain until `cacheOptions` changes value. */
cacheOptions: any,
/* Same behaviour as for Select */
onInputChange: (string, InputActionMeta) => void,
/* Same behaviour as for Select */
=======
onInputChange?: (string, InputActionMeta) => void,
>>>>>>>
/* If cacheOptions is truthy, then the loaded data will be cached. The cache
will remain until `cacheOptions` changes value. */
cacheOptions: any,
/* Same behaviour as for Select */
onInputChange?: (string, InputActionMeta) => void,
/* Same behaviour as for Select */ |
<<<<<<<
var getSelectControl = (instance) => {
return React.findDOMNode(instance).querySelector('.Select-control');
};
=======
function getSelectControl(instance) {
return ReactDOM.findDOMNode(instance).querySelector('.Select-control');
}
>>>>>>>
var getSelectControl = (instance) => {
return ReactDOM.findDOMNode(instance).querySelector('.Select-control');
};
<<<<<<<
var clickArrowToOpen = () => {
var selectArrow = React.findDOMNode(instance).querySelector('.Select-arrow');
=======
function clickArrowToOpen() {
var selectArrow = ReactDOM.findDOMNode(instance).querySelector('.Select-arrow');
>>>>>>>
var clickArrowToOpen = () => {
var selectArrow = ReactDOM.findDOMNode(instance).querySelector('.Select-arrow');
<<<<<<<
it('should show the options on mouse click', () => {
TestUtils.Simulate.mouseDown(React.findDOMNode(instance).querySelector('.Select-control'));
var node = React.findDOMNode(instance);
=======
it('should show the options on mouse click', function () {
TestUtils.Simulate.mouseDown(ReactDOM.findDOMNode(instance).querySelector('.Select-control'));
var node = ReactDOM.findDOMNode(instance);
>>>>>>>
it('should show the options on mouse click', function () {
TestUtils.Simulate.mouseDown(ReactDOM.findDOMNode(instance).querySelector('.Select-control'));
var node = ReactDOM.findDOMNode(instance);
<<<<<<<
it('should display the labels on mouse click', () => {
TestUtils.Simulate.mouseDown(React.findDOMNode(instance).querySelector('.Select-control'));
var node = React.findDOMNode(instance);
=======
it('should display the labels on mouse click', function () {
TestUtils.Simulate.mouseDown(ReactDOM.findDOMNode(instance).querySelector('.Select-control'));
var node = ReactDOM.findDOMNode(instance);
>>>>>>>
it('should display the labels on mouse click', () => {
TestUtils.Simulate.mouseDown(ReactDOM.findDOMNode(instance).querySelector('.Select-control'));
var node = ReactDOM.findDOMNode(instance);
<<<<<<<
it('should close the options one the second click on the arrow', () => {
var selectArrow = React.findDOMNode(instance).querySelector('.Select-arrow');
=======
it('should close the options one the second click on the arrow', function () {
var selectArrow = ReactDOM.findDOMNode(instance).querySelector('.Select-arrow');
>>>>>>>
it('should close the options one the second click on the arrow', () => {
var selectArrow = ReactDOM.findDOMNode(instance).querySelector('.Select-arrow');
<<<<<<<
it('should ignore a right mouse click on the arrow', () => {
var selectArrow = React.findDOMNode(instance).querySelector('.Select-arrow');
=======
it('should ignore a right mouse click on the arrow', function () {
var selectArrow = ReactDOM.findDOMNode(instance).querySelector('.Select-arrow');
>>>>>>>
it('should ignore a right mouse click on the arrow', () => {
var selectArrow = ReactDOM.findDOMNode(instance).querySelector('.Select-arrow');
<<<<<<<
expect(React.findDOMNode(instance), 'to contain no elements matching', DISPLAYED_SELECTION_SELECTOR);
expect(React.findDOMNode(instance), 'queried for' , '.Select-option',
=======
expect(ReactDOM.findDOMNode(instance), 'to contain no elements matching', DISPLAYED_SELECTION_SELECTOR)
expect(ReactDOM.findDOMNode(instance), 'queried for' , '.Select-option',
>>>>>>>
expect(ReactDOM.findDOMNode(instance), 'to contain no elements matching', DISPLAYED_SELECTION_SELECTOR)
expect(ReactDOM.findDOMNode(instance), 'queried for' , '.Select-option',
<<<<<<<
expect(React.findDOMNode(instance), 'to contain no elements matching', DISPLAYED_SELECTION_SELECTOR);
expect(React.findDOMNode(instance), 'queried for' , '.Select-option',
=======
expect(ReactDOM.findDOMNode(instance), 'to contain no elements matching', DISPLAYED_SELECTION_SELECTOR)
expect(ReactDOM.findDOMNode(instance), 'queried for' , '.Select-option',
>>>>>>>
expect(ReactDOM.findDOMNode(instance), 'to contain no elements matching', DISPLAYED_SELECTION_SELECTOR)
expect(ReactDOM.findDOMNode(instance), 'queried for' , '.Select-option',
<<<<<<<
expect(React.findDOMNode(instance), 'to contain no elements matching', DISPLAYED_SELECTION_SELECTOR);
expect(React.findDOMNode(instance), 'queried for' , '.Select-option',
=======
expect(ReactDOM.findDOMNode(instance), 'to contain no elements matching', DISPLAYED_SELECTION_SELECTOR)
expect(ReactDOM.findDOMNode(instance), 'queried for' , '.Select-option',
>>>>>>>
expect(ReactDOM.findDOMNode(instance), 'to contain no elements matching', DISPLAYED_SELECTION_SELECTOR)
expect(ReactDOM.findDOMNode(instance), 'queried for' , '.Select-option',
<<<<<<<
it('calls the renderer exactly once for each option', () => {
var selectArrow = React.findDOMNode(instance).querySelector('.Select-arrow');
=======
it('calls the renderer exactly once for each option', function () {
var selectArrow = ReactDOM.findDOMNode(instance).querySelector('.Select-arrow');
>>>>>>>
it('calls the renderer exactly once for each option', () => {
var selectArrow = ReactDOM.findDOMNode(instance).querySelector('.Select-arrow');
<<<<<<<
it('disabled option link is still clickable', () => {
var selectArrow = React.findDOMNode(instance).querySelector('.Select-arrow');
=======
it('disabled option link is still clickable', function () {
var selectArrow = ReactDOM.findDOMNode(instance).querySelector('.Select-arrow');
>>>>>>>
it('disabled option link is still clickable', () => {
var selectArrow = React.findDOMNode(instance).querySelector('.Select-arrow');
var selectArrow = ReactDOM.findDOMNode(instance).querySelector('.Select-arrow');
<<<<<<<
it('disabled option link with target doesn\'t navigate the current window', () => {
var selectArrow = React.findDOMNode(instance).querySelector('.Select-arrow');
=======
it('disabled option link with target doesn\'t navigate the current window', function () {
var selectArrow = ReactDOM.findDOMNode(instance).querySelector('.Select-arrow');
>>>>>>>
it('disabled option link with target doesn\'t navigate the current window', () => {
var selectArrow = ReactDOM.findDOMNode(instance).querySelector('.Select-arrow');
<<<<<<<
it('uses the placeholder initially', () => {
expect(React.findDOMNode(instance), 'queried for', '.Select-placeholder',
=======
it('uses the placeholder initially', function () {
expect(ReactDOM.findDOMNode(instance), 'queried for', '.Select-placeholder',
>>>>>>>
it('uses the placeholder initially', () => {
expect(ReactDOM.findDOMNode(instance), 'queried for', '.Select-placeholder', |
<<<<<<<
const { children, cx, getStyles, className, isDisabled, isFocused, menuIsOpen, innerRef, innerProps } = props;
=======
const { children, cx, getStyles, className, isDisabled, isFocused, innerRef, innerProps, emotion } = props;
>>>>>>>
const { children, cx, getStyles, className, isDisabled, isFocused, innerRef, innerProps, menuIsOpen, emotion } = props; |
<<<<<<<
import PropTypes from 'prop-types';
import React from 'react';
=======
import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
>>>>>>>
import React from 'react';
import PropTypes from 'prop-types';
<<<<<<<
const BGWASH = 'rgba(255,255,255,0.8)';
const RCT_WEBVIEW_REF = 'webview';
=======
var BGWASH = 'rgba(255,255,255,0.8)';
>>>>>>>
var BGWASH = 'rgba(255,255,255,0.8)';
<<<<<<<
class WKWebView extends React.Component {
static JSNavigationScheme = JSNavigationScheme;
static NavigationType = NavigationType;
static propTypes = {
...ViewPropTypes,
=======
var WKWebView = createReactClass({
statics: {
JSNavigationScheme: JSNavigationScheme,
NavigationType: NavigationType,
},
propTypes: {
...ViewPropTypes,
>>>>>>>
class WKWebView extends React.Component {
static JSNavigationScheme = JSNavigationScheme;
static NavigationType = NavigationType;
static propTypes = {
...ViewPropTypes,
<<<<<<<
getWebViewHandle = (): any => {
return ReactNative.findNodeHandle(this.refs[RCT_WEBVIEW_REF]);
};
=======
getWebViewHandle: function(): any {
return ReactNative.findNodeHandle(this.webview);
},
>>>>>>>
getWebViewHandle = (): any => {
return ReactNative.findNodeHandle(this.webview);
}; |
<<<<<<<
return function (window) {
if (!document) document = window.document;
=======
return function () {
search.resetIndex();
>>>>>>>
return function (window) {
if (!document) document = window.document;
search.resetIndex(); |
<<<<<<<
};
=======
};
>>>>>>>
};
<<<<<<<
if (_childCount === 0) {
isolate.renderNode.setFront(data.renderNode);
} else if (_childCount === 1) {
isolate.renderNode.setBack(data.renderNode);
=======
if (_childCount == 0) {
isolate.renderNode.setFront(data.renderGate);
} else if (_childCount == 1) {
isolate.renderNode.setBack(data.renderGate);
>>>>>>>
if (_childCount == 0) {
isolate.renderNode.setFront(data.renderGate);
} else if (_childCount == 1) {
isolate.renderNode.setBack(data.renderGate);
<<<<<<<
=======
isolate.renderNode.sequenceFrom(function(_children) {
var _ch = [];
angular.forEach(_children, function(c, i) {
_ch[i] = c.renderGate;
})
return _ch;
}(_children));
>>>>>>>
<<<<<<<
_ch[i] = c.renderNode;
});
=======
_ch[i] = c.renderGate;
})
>>>>>>>
_ch[i] = c.renderGate;
}) |
<<<<<<<
client.request(url.parse(sourceUrl), function(response) {
logger.debug(req, 'Receiving download response');
=======
var download_options = url.parse(sourceUrl);
download_options.method = "GET";
download_options.agent = false;
var download_request = client.request(download_options);
download_request.on('response', function(response) {
logger.debug('Request', req.id, 'receiving download response');
>>>>>>>
var download_options = url.parse(sourceUrl);
download_options.method = "GET";
download_options.agent = false;
var download_request = client.request(download_options);
download_request.on('response', function(response) {
logger.debug('Request', req.id, 'receiving download response');
<<<<<<<
logger.error(req, 'Source content type not allowed', response.headers['content-type']);
=======
logger.error('Request', req.id, 'source content type not allowed', response.headers['content-type']);
response.on('end', function() {});
>>>>>>>
logger.error(req, 'Source content type not allowed', response.headers['content-type']);
response.on('end', function() {}); |
<<<<<<<
'click .js-received-date': Popup.open('editCardReceivedDate'),
=======
'click .js-custom-fields': Popup.open('cardCustomFields'),
>>>>>>>
'click .js-received-date': Popup.open('editCardReceivedDate'),
'click .js-custom-fields': Popup.open('cardCustomFields'), |
<<<<<<<
function storagePath(defaultPath) {
const storePath = process.env.ATTACHMENTS_STORE_PATH;
return storePath ? storePath : defaultPath;
}
=======
// XXX Enforce a schema for the Attachments CollectionFS
if (Meteor.isServer) {
Attachments.files.after.insert((userId, doc) => {
// If the attachment doesn't have a source field
// or its source is different than import
if (!doc.source || doc.source !== 'import') {
// Add activity about adding the attachment
Activities.insert({
userId,
type: 'card',
activityType: 'addAttachment',
attachmentId: doc._id,
// this preserves the name so that notifications can be meaningful after
// this file is removed
attachmentName: doc.original.name,
boardId: doc.boardId,
cardId: doc.cardId,
listId: doc.listId,
swimlaneId: doc.swimlaneId,
});
} else {
// Don't add activity about adding the attachment as the activity
// be imported and delete source field
Attachments.update(
{
_id: doc._id,
},
{
$unset: {
source: '',
},
},
);
}
});
>>>>>>>
function storagePath(defaultPath) {
const storePath = process.env.ATTACHMENTS_STORE_PATH;
return storePath ? storePath : defaultPath;
}
<<<<<<<
activityType: 'addAttachment',
attachmentId: fileRef._id,
boardId: fileRef.meta.boardId,
cardId: fileRef.meta.cardId,
listId: fileRef.meta.listId,
swimlaneId: fileRef.meta.swimlaneId,
=======
activityType: 'deleteAttachment',
attachmentId: doc._id,
// this preserves the name so that notifications can be meaningful after
// this file is removed
attachmentName: doc.original.name,
boardId: doc.boardId,
cardId: doc.cardId,
listId: doc.listId,
swimlaneId: doc.swimlaneId,
>>>>>>>
activityType: 'addAttachment',
attachmentId: fileRef._id,
// this preserves the name so that notifications can be meaningful after
// this file is removed
attachmentName: fileRef.versions.original.name,
boardId: fileRef.meta.boardId,
cardId: fileRef.meta.cardId,
listId: fileRef.meta.listId,
swimlaneId: fileRef.meta.swimlaneId,
<<<<<<<
return true;
}
function onAttachmentRemoved(files) {
// Don't know why we need to remove the activity
/* for (let i in files) {
let doc = files[i];
Activities.remove({
attachmentId: doc._id,
});
}*/
=======
>>>>>>>
return true;
}
function onAttachmentRemoved(files) {
// Don't know why we need to remove the activity
/* for (let i in files) {
let doc = files[i];
Activities.remove({
attachmentId: doc._id,
});
}*/ |
<<<<<<<
import runWebpack, { showStats } from '../lib/webpack/run-webpack';
=======
import webpackConfig from '../lib/webpack-config';
import getSslCert from '../lib/ssl-cert';
import runWebpack, { showStats } from '../lib/run-webpack';
>>>>>>>
import getSslCert from '../lib/ssl-cert';
import runWebpack, { showStats } from '../lib/run-webpack';
<<<<<<<
=======
if (argv.https) {
let ssl = await getSslCert();
if (!ssl) {
ssl = true;
process.stderr.write('Using webpack-dev-server internal certificate.\n');
}
argv.https = ssl;
}
let config = webpackConfig(argv);
>>>>>>>
if (argv.https) {
let ssl = await getSslCert();
if (!ssl) {
ssl = true;
process.stderr.write('Using webpack-dev-server internal certificate.\n');
}
argv.https = ssl;
} |
<<<<<<<
const webpack = require('webpack');
const { resolve } = require('path');
const { existsSync } = require('fs');
const merge = require('webpack-merge');
const { filter } = require('minimatch');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const SWPrecacheWebpackPlugin = require('sw-precache-webpack-plugin');
const RenderHTMLPlugin = require('./render-html-plugin');
const PushManifestPlugin = require('./push-manifest');
const baseConfig = require('./webpack-base-config');
=======
import webpack from 'webpack';
import { resolve } from 'path';
import { existsSync } from 'fs';
import merge from 'webpack-merge';
import { filter } from 'minimatch';
import CopyWebpackPlugin from 'copy-webpack-plugin';
import SWPrecacheWebpackPlugin from 'sw-precache-webpack-plugin';
import RenderHTMLPlugin from './render-html-plugin';
import PushManifestPlugin from './push-manifest';
import baseConfig from './webpack-base-config';
import { normalizePath } from '../../util';
const cleanFilename = name => name.replace(/(^\/(routes|components\/(routes|async))\/|(\/index)?\.js$)/g, '');
>>>>>>>
const webpack = require('webpack');
const { resolve } = require('path');
const { existsSync } = require('fs');
const merge = require('webpack-merge');
const { filter } = require('minimatch');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const SWPrecacheWebpackPlugin = require('sw-precache-webpack-plugin');
const RenderHTMLPlugin = require('./render-html-plugin');
const PushManifestPlugin = require('./push-manifest');
const baseConfig = require('./webpack-base-config');
const { normalizePath } = require('../../util');
const cleanFilename = name => name.replace(/(^\/(routes|components\/(routes|async))\/|(\/index)?\.js$)/g, '');
<<<<<<<
return {
performance: Object.assign({
=======
const prodConfig = {
performance: {
>>>>>>>
const prodConfig = {
performance: Object.assign({ |
<<<<<<<
'ssr-bundle.js': { size: 9450 },
'ssr-bundle.js.map': { size: 42461 },
'style.*.css': { size: 130 },
'style.*.css.map': { size: 360 },
=======
'ssr-bundle.js': { size: 16245 },
'ssr-bundle.js.map': { size: 31821 },
'style.css': { size: 130 },
'style.css.map': { size: 360 },
>>>>>>>
'ssr-bundle.js': { size: 16245 },
'ssr-bundle.js.map': { size: 31821 },
'style.*.css': { size: 130 },
'style.*.css.map': { size: 360 },
<<<<<<<
'ssr-bundle.js': { size: 10100 },
'ssr-bundle.js.map': { size: 46466 },
'style.*.css': { size: 296 },
'style.*.css.map': { size: 621 },
=======
'ssr-bundle.js': { size: 18205 },
'ssr-bundle.js.map': { size: 33478 },
'style.css': { size: 296 },
'style.css.map': { size: 621 },
>>>>>>>
'ssr-bundle.js': { size: 18205 },
'ssr-bundle.js.map': { size: 33478 },
'style.*.css': { size: 296 },
'style.*.css.map': { size: 621 },
<<<<<<<
'ssr-bundle.js': { size: 18960 },
'ssr-bundle.js.map': { size: 97403 },
'style.*.css': { size: 1065 },
'style.*.css.map': { size: 2250 },
=======
'ssr-bundle.js': { size: 39459 },
'ssr-bundle.js.map': { size: 65629 },
'style.css': { size: 1065 },
'style.css.map': { size: 2250 },
>>>>>>>
'ssr-bundle.js': { size: 39459 },
'ssr-bundle.js.map': { size: 65629 },
'style.*.css': { size: 1065 },
'style.*.css.map': { size: 2250 },
<<<<<<<
'ssr-bundle.js': { size: 19820 },
'ssr-bundle.js.map': { size: 101502 },
'style.*.css': { size: 1065 },
'style.*.css.map': { size: 2345 },
=======
'ssr-bundle.js': { size: 41715 },
'ssr-bundle.js.map': { size: 66661 },
'style.css': { size: 1065 },
'style.css.map': { size: 2345 },
>>>>>>>
'ssr-bundle.js': { size: 41715 },
'ssr-bundle.js.map': { size: 66661 },
'style.*.css': { size: 1065 },
'style.*.css.map': { size: 2345 }, |
<<<<<<<
import { setup, clean, fromSubject } from './lib/output';
import { normalize, expectedOutputs, sassPrerendered } from './build.snapshot';
=======
import { setup, clean } from './lib/output';
import expectedOutputs from './build.snapshot';
import filesMatchSnapshot from './lib/filesMatchSnapshot';
>>>>>>>
import { setup, clean, fromSubject } from './lib/output';
import expectedOutputs, { sassPrerendered } from './build.snapshot';
import filesMatchSnapshot from './lib/filesMatchSnapshot'; |
<<<<<<<
const webpack = require('webpack');
const { resolve } = require('path');
const { readFileSync } = require('fs');
const autoprefixer = require('autoprefixer');
const ExtractTextPlugin = require('extract-text-webpack-plugin');
const ProgressBarPlugin = require('progress-bar-webpack-plugin');
const ReplacePlugin = require('webpack-plugin-replace');
const WebpackChunkHash = require('webpack-chunk-hash');
const requireRelative = require('require-relative');
const createBabelConfig = require('../babel-config');
=======
import webpack from 'webpack';
import { resolve } from 'path';
import { readFileSync } from 'fs';
import autoprefixer from 'autoprefixer';
import ExtractTextPlugin from 'extract-text-webpack-plugin';
import ProgressBarPlugin from 'progress-bar-webpack-plugin';
import ReplacePlugin from 'webpack-plugin-replace';
import requireRelative from 'require-relative';
import createBabelConfig from '../babel-config';
>>>>>>>
const webpack = require('webpack');
const { resolve } = require('path');
const { readFileSync } = require('fs');
const autoprefixer = require('autoprefixer');
const ExtractTextPlugin = require('extract-text-webpack-plugin');
const ProgressBarPlugin = require('progress-bar-webpack-plugin');
const ReplacePlugin = require('webpack-plugin-replace');
const WebpackChunkHash = require('webpack-chunk-hash');
const createBabelConfig = require('../babel-config'); |
<<<<<<<
'src/style/index.css'
];
=======
'src/style/index.css',
'src/tests/__mocks__/browserMocks.js',
'src/tests/__mocks__/fileMocks.js',
'src/tests/header.test.js'
];
exports.full = exports.default;
>>>>>>>
'src/style/index.css',
'src/tests/__mocks__/browserMocks.js',
'src/tests/__mocks__/fileMocks.js',
'src/tests/header.test.js'
]; |
<<<<<<<
<div className={ CSS }>
<span className='preview-header'>Preview</span>
<div className='preview-content' ref={ this.saveCardContainer }></div>
=======
<div className={ CSS } { ...debug }>
<span className="preview-header">Preview</span>
<div className="preview-content" ref={ this.saveCardContainer }></div>
>>>>>>>
<div className={ CSS }>
<span className="preview-header">Preview</span>
<div className="preview-content" ref={ this.saveCardContainer }></div> |
<<<<<<<
<BotChatEditor botId={ document.documentId } />
: contentType === constants.ContentType_Conversation ?
<ConversationEditor conversationId={ document.documentId } />
=======
<BotChatEditor botId={ document.documentId } />
: contentType === constants.ContentType_Converation ?
<ConversationEditor conversationId={ document.documentId } />
: contentType === constants.ContentType_TestBed ?
<TestBedEditor />
>>>>>>>
<BotChatEditor botId={ document.documentId } />
: contentType === constants.ContentType_Conversation ?
<ConversationEditor conversationId={ document.documentId } />
: contentType === constants.ContentType_TestBed ?
<TestBedEditor /> |
<<<<<<<
import * as constants from '../../../constants';
import ExpandCollapse from '../../layout/expandCollapse';
import { connect } from 'react-redux';
=======
import ExpandCollapse, { Controls as ExpandCollapseControls, Content as ExpandCollapseContent } from '../../layout/expandCollapse';
>>>>>>>
import * as constants from '../../../constants';
import { connect } from 'react-redux';
import ExpandCollapse, { Controls as ExpandCollapseControls, Content as ExpandCollapseContent } from '../../layout/expandCollapse';
<<<<<<<
export class CardExplorer extends React.Component {
constructor(props, context) {
super(props, context);
}
render() {
return(
<ul className={ CSS }>
<li>
<ExpandCollapse
initialExpanded={ true }
title="Cards"
>
<ul className={ BOTS_CSS }>
{
this.props.cards.length ?
this.props.cards.map(card => <li>{ card.title }</li>) : <li>No cards found...</li>
}
</ul>
</ExpandCollapse>
</li>
</ul>
);
}
}
export default connect(state => ({
cards: state.editor.documents.filter(doc => doc.contentType === constants.ContentType_Card)
}))(CardExplorer);
=======
export default props =>
<ul className={ CSS }>
<li>
<ExpandCollapse
initialExpanded={ true }
title="Cards"
>
<ExpandCollapseContent>
<ul className={ BOTS_CSS }>
<li>Greeting</li>
<li>Address input</li>
</ul>
</ExpandCollapseContent>
</ExpandCollapse>
</li>
</ul>
>>>>>>>
export class CardExplorer extends React.Component {
constructor(props, context) {
super(props, context);
}
render() {
return(
<ul className={ CSS }>
<li>
<ExpandCollapse
initialExpanded={ true }
title="Cards"
>
<ExpandCollapseContent>
<ul className={ BOTS_CSS }>
{
this.props.cards.length ?
this.props.cards.map(card => <li>{ card.title }</li>) : <li>No cards found...</li>
}
</ul>
</ExpandCollapseContent>
</ExpandCollapse>
</li>
</ul>
);
}
}
export default connect(state => ({
cards: state.editor.documents.filter(doc => doc.contentType === constants.ContentType_Card)
}))(CardExplorer); |
<<<<<<<
var tableNameIndex = 5;
var partitionIndex = 4;
var hostIndex = 1;
var tupleCountIndex = 7;
=======
>>>>>>>
var tableNameIndex = 5;
var partitionIndex = 4;
var hostIndex = 1;
var tupleCountIndex = 7;
<<<<<<<
=======
>>>>>>>
<<<<<<<
var populateTableJsonArrayForSorting = function (connection) {
var tableCount = 0;
if (connection != undefined) {
if (connection.Metadata['@Statistics_TABLE']) {
if (connection.Metadata['@Statistics_TABLE'].data != undefined) {
//apply search only if column is "TABLENAME"
var isPopulateSortData = checkSortColumnSortable();
if (isPopulateSortData) {
tableJsonArray = [];
connection.Metadata['@Statistics_TABLE'].data.forEach(function (entry) {
if (voltDbRenderer.searchText == "" || voltDbRenderer.searchText == undefined) {
if (!checkIfDuplicateJson(tableJsonArray, entry[tableNameIndex])) {
tableJsonArray[tableCount] = {
"TABLE_NAME": entry[tableNameIndex],
"HOST_ID": entry[hostIndex],
"PARTITION_ID": entry[partitionIndex],
"TUPLE_COUNT": entry[tupleCountIndex]
};
tableCount++;
}
} else {
if (isPopulateSortData) {
tableJsonArray[tableCount] = {
"TABLE_NAME": entry[tableNameIndex],
"HOST_ID": entry[hostIndex],
"PARTITION_ID": entry[partitionIndex],
"TUPLE_COUNT": entry[tupleCountIndex]
};
tableCount++;
}
}
});
}
}
}
}
};
var populateTableJsonArray = function (connection) {
var tableCount = 0;
if (connection != undefined) {
if (connection.Metadata['@Statistics_TABLE']) {
if (connection.Metadata['@Statistics_TABLE'].data != undefined) {
//apply search only if column is "TABLENAME"
var isPopulateSortData = checkSortColumnSortable();
if (isPopulateSortData) {
tableJsonArray = [];
connection.Metadata['@Statistics_TABLE'].data.forEach(function (entry) {
if (voltDbRenderer.searchText == "" || voltDbRenderer.searchText == undefined) {
if (!checkIfDuplicateJson(tableJsonArray, entry[tableNameIndex])) {
tableJsonArray[tableCount] = {
"TABLE_NAME": entry[tableNameIndex],
"HOST_ID": entry[hostIndex],
"PARTITION_ID": entry[partitionIndex],
"TUPLE_COUNT": entry[tupleCountIndex]
};
tableCount++;
}
} else {
if (isPopulateSortData) {
tableJsonArray[tableCount] = {
"TABLE_NAME": entry[tableNameIndex],
"HOST_ID": entry[hostIndex],
"PARTITION_ID": entry[partitionIndex],
"TUPLE_COUNT": entry[tupleCountIndex]
};
tableCount++;
}
}
});
}
}
}
}
};
=======
>>>>>>>
var populateTableJsonArrayForSorting = function (connection) {
var tableCount = 0;
if (connection != undefined) {
if (connection.Metadata['@Statistics_TABLE']) {
if (connection.Metadata['@Statistics_TABLE'].data != undefined) {
//apply search only if column is "TABLENAME"
var isPopulateSortData = checkSortColumnSortable();
if (isPopulateSortData) {
tableJsonArray = [];
connection.Metadata['@Statistics_TABLE'].data.forEach(function (entry) {
if (voltDbRenderer.searchText == "" || voltDbRenderer.searchText == undefined) {
if (!checkIfDuplicateJson(tableJsonArray, entry[tableNameIndex])) {
tableJsonArray[tableCount] = {
"TABLE_NAME": entry[tableNameIndex],
"HOST_ID": entry[hostIndex],
"PARTITION_ID": entry[partitionIndex],
"TUPLE_COUNT": entry[tupleCountIndex]
};
tableCount++;
}
} else {
if (isPopulateSortData) {
tableJsonArray[tableCount] = {
"TABLE_NAME": entry[tableNameIndex],
"HOST_ID": entry[hostIndex],
"PARTITION_ID": entry[partitionIndex],
"TUPLE_COUNT": entry[tupleCountIndex]
};
tableCount++;
}
}
});
}
}
}
}
};
var populateTableJsonArray = function (connection) {
var tableCount = 0;
if (connection != undefined) {
if (connection.Metadata['@Statistics_TABLE']) {
if (connection.Metadata['@Statistics_TABLE'].data != undefined) {
//apply search only if column is "TABLENAME"
var isPopulateSortData = checkSortColumnSortable();
if (isPopulateSortData) {
tableJsonArray = [];
connection.Metadata['@Statistics_TABLE'].data.forEach(function (entry) {
if (voltDbRenderer.searchText == "" || voltDbRenderer.searchText == undefined) {
if (!checkIfDuplicateJson(tableJsonArray, entry[tableNameIndex])) {
tableJsonArray[tableCount] = {
"TABLE_NAME": entry[tableNameIndex],
"HOST_ID": entry[hostIndex],
"PARTITION_ID": entry[partitionIndex],
"TUPLE_COUNT": entry[tupleCountIndex]
};
tableCount++;
}
} else {
if (isPopulateSortData) {
tableJsonArray[tableCount] = {
"TABLE_NAME": entry[tableNameIndex],
"HOST_ID": entry[hostIndex],
"PARTITION_ID": entry[partitionIndex],
"TUPLE_COUNT": entry[tupleCountIndex]
};
tableCount++;
}
}
});
}
}
}
}
};
<<<<<<<
this.sortTablesByColumns = function () {
var tableCount = 0;
var lConnection = VoltDBService.getTablesContextForSorting();
populateTableJsonArray(lConnection);
if (voltDbRenderer.sortOrder == "descending") {
tableJsonArray = descendingSortJSON(tableJsonArray, this.tableSortColumn);
}
else if (voltDbRenderer.sortOrder == "ascending") {
tableJsonArray = ascendingSortJSON(tableJsonArray, this.tableSortColumn);
}
mapJsonArrayToTables();
};
this.sortTablesByColumnsSync = function () {
var tableCount = 0;
var lConnection = VoltDBService.getTablesContextForSorting();
populateTableJsonArray(lConnection);
if (voltDbRenderer.isTableSearch) {
if (voltDbRenderer.sortOrder == "descending") {
tableSearchJsonArray = descendingSortJSON(tableSearchJsonArray, this.tableSortColumn);
}
else if (voltDbRenderer.sortOrder == "ascending") {
tableSearchJsonArray = ascendingSortJSON(tableSearchJsonArray, this.tableSortColumn);
}
mapJsonArrayToSearchedTables();
}
else if (!voltDbRenderer.isTableSearch) {
if (voltDbRenderer.sortOrder == "descending") {
tableJsonArray = descendingSortJSON(tableJsonArray, this.tableSortColumn);
}
else if (voltDbRenderer.sortOrder == "ascending") {
tableJsonArray = ascendingSortJSON(tableJsonArray, this.tableSortColumn);
}
mapJsonArrayToTables();
}
};
=======
>>>>>>>
this.sortTablesByColumns = function () {
var tableCount = 0;
var lConnection = VoltDBService.getTablesContextForSorting();
populateTableJsonArray(lConnection);
if (voltDbRenderer.sortOrder == "descending") {
tableJsonArray = descendingSortJSON(tableJsonArray, this.tableSortColumn);
}
else if (voltDbRenderer.sortOrder == "ascending") {
tableJsonArray = ascendingSortJSON(tableJsonArray, this.tableSortColumn);
}
mapJsonArrayToTables();
};
this.sortTablesByColumnsSync = function () {
var tableCount = 0;
var lConnection = VoltDBService.getTablesContextForSorting();
populateTableJsonArray(lConnection);
if (voltDbRenderer.isTableSearch) {
if (voltDbRenderer.sortOrder == "descending") {
tableSearchJsonArray = descendingSortJSON(tableSearchJsonArray, this.tableSortColumn);
}
else if (voltDbRenderer.sortOrder == "ascending") {
tableSearchJsonArray = ascendingSortJSON(tableSearchJsonArray, this.tableSortColumn);
}
mapJsonArrayToSearchedTables();
}
else if (!voltDbRenderer.isTableSearch) {
if (voltDbRenderer.sortOrder == "descending") {
tableJsonArray = descendingSortJSON(tableJsonArray, this.tableSortColumn);
}
else if (voltDbRenderer.sortOrder == "ascending") {
tableJsonArray = ascendingSortJSON(tableJsonArray, this.tableSortColumn);
}
mapJsonArrayToTables();
}
}; |
<<<<<<<
},
streamNameRules: {
required: true,
regex: /^[a-zA-Z0-9_.]+$/
},
streamNameMessages: {
required: "This field is required",
regex: 'Only alphabets, numbers, _ and . are allowed.'
},
userNameRule: {
required: true,
regex: /^[a-zA-Z0-9_.]+$/,
checkDuplicate: []
},
userNameMessage: {
required: "This field is required",
regex: 'Only alphabets, numbers, _ and . are allowed.',
checkDuplicate:'This username already exists.'
},
passwordRule: {
required: true
},
passwordMessage: {
required: "This field is required",
}
=======
},
queryTimeoutRules: {
required: true,
min: 0,
max: INT_MAX_VALUE,
digits: true,
},
queryTimeoutMessages: {
required: "Please enter a valid positive number.",
min: "Please enter a positive number.",
max: "Please enter a positive number between 0 and " + INT_MAX_VALUE + ".",
digits: "Please enter a positive number without any decimal."
},
>>>>>>>
},
streamNameRules: {
required: true,
regex: /^[a-zA-Z0-9_.]+$/
},
streamNameMessages: {
required: "This field is required",
regex: 'Only alphabets, numbers, _ and . are allowed.'
},
userNameRule: {
required: true,
regex: /^[a-zA-Z0-9_.]+$/,
checkDuplicate: []
},
userNameMessage: {
required: "This field is required",
regex: 'Only alphabets, numbers, _ and . are allowed.',
checkDuplicate:'This username already exists.'
},
passwordRule: {
required: true
},
passwordMessage: {
required: "This field is required",
},
queryTimeoutRules: {
required: true,
min: 0,
max: INT_MAX_VALUE,
digits: true,
},
queryTimeoutMessages: {
required: "Please enter a valid positive number.",
min: "Please enter a positive number.",
max: "Please enter a positive number between 0 and " + INT_MAX_VALUE + ".",
digits: "Please enter a positive number without any decimal."
},
<<<<<<<
=======
$("#loginWarnPopup").popup({
afterOpen: function (event, ui, ele) {
var popup = $(this)[0];
$("#btnLoginWarningOk").unbind("click");
$("#btnLoginWarningOk").on('click', function () {
if ($.cookie("username") == undefined || $.cookie("username") == 'null') {
location.reload(true);
}
if (VoltDbUI.CurrentTab == NavigationTabs.Admin) {
$("#navDbmonitor").click();
}
$("#navAdmin").hide();
popup.close();
});
},
closeContent: '',
modal: true
});
>>>>>>>
$("#loginWarnPopup").popup({
afterOpen: function (event, ui, ele) {
var popup = $(this)[0];
$("#btnLoginWarningOk").unbind("click");
$("#btnLoginWarningOk").on('click', function () {
if ($.cookie("username") == undefined || $.cookie("username") == 'null') {
location.reload(true);
}
if (VoltDbUI.CurrentTab == NavigationTabs.Admin) {
$("#navDbmonitor").click();
}
$("#navAdmin").hide();
popup.close();
});
},
closeContent: '',
modal: true
});
<<<<<<<
$("#frmUserList").validate();
=======
$("#formQueryTimeout").validate({
rules: {
txtQueryTimeout: adminValidationRules.queryTimeoutRules
},
messages: {
txtQueryTimeout: adminValidationRules.queryTimeoutMessages
}
});
>>>>>>>
$("#formQueryTimeout").validate({
rules: {
txtQueryTimeout: adminValidationRules.queryTimeoutRules
},
messages: {
txtQueryTimeout: adminValidationRules.queryTimeoutMessages
}
});
<<<<<<<
//Do not update the data in loading condition
if (adminEditObjects.exportConfiguration.data("status") == "loading"){
return;
}
=======
>>>>>>>
//Do not update the data in loading condition
if (adminEditObjects.exportConfiguration.data("status") == "loading"){
return;
} |
<<<<<<<
=======
}
VdmUI.isFirstStatusDisplay = false;
if (connection.Metadata['DATABASE_STATUS'].status == "errorNoMembers"){
$(".connectionFail").show();
$(".containerFail").html('');
$(".containerFail").html('<p>No server is available. Please add a server to start.</p>');
$(".loadingStart").hide();
$(".clusterBtnWrap").hide();
$(".databaseRg").hide();
$(".containerStalled").hide();
}
if (connection.Metadata['DATABASE_STATUS'].status == "error"){
$(".connectionFail").show()
$(".containerFail").html('');
$(".containerFail").html('<p>Could not connect to the server(s). Please ensure that all servers are reachable.</p>');
$(".loadingStart").hide();
$(".clusterBtnWrap").hide();
$(".databaseRg").hide();
$(".containerStalled").hide();
}
else if (connection.Metadata['DATABASE_STATUS'].status[0].status=="stopped")
{
$.each(connection.Metadata['DATABASE_STATUS'].serverDetails, function(k, v) {
if(v[Object.keys(v)[0]].hasOwnProperty('details') && v[Object.keys(v)[0]].details != "")
{
if((v[Object.keys(v)[0]].details.indexOf('Connection broken') < 0) && (v[Object.keys(v)[0]].details.indexOf('Connection refused') < 0) && (v[Object.keys(v)[0]].details.indexOf('@Shutdown') < 0))
failedOrStalled = true
}
>>>>>>> |
<<<<<<<
=======
this.drEnabled = false;
this.drStatus = '';
>>>>>>>
this.drStatus = ''; |
<<<<<<<
this.shortApiCredentials = "";
=======
this.authorization = null;
>>>>>>>
this.shortApiCredentials = "";
this.authorization = null; |
<<<<<<<
var iterator = 1;
//Error: "Authentication rejected(-3)"
if (connection.Metadata['@SystemInformation_OVERVIEW_status'] == -3) {
VoltDbUI.hasPermissionToView = false;
if (!$("#loginWarningPopup").is(":visible")) {
$("#loginWarningPopupMsg").text("Security settings has been changed. You no longer have permission to view this page.");
$("#loginWarnPopup").click();
}
return;
} else if (connection.Metadata['@SystemInformation_OVERVIEW'] == null) {
=======
var serverOverview = {};
var iterator = 0;
var ipAddress = "";
if (connection.Metadata['@SystemInformation_OVERVIEW'] == null) {
>>>>>>>
var serverOverview = {};
var iterator = 0;
var ipAddress = "";
//Error: "Authentication rejected(-3)"
if (connection.Metadata['@SystemInformation_OVERVIEW_status'] == -3) {
VoltDbUI.hasPermissionToView = false;
if (!$("#loginWarningPopup").is(":visible")) {
$("#loginWarningPopupMsg").text("Security settings has been changed. You no longer have permission to view this page.");
$("#loginWarnPopup").click();
}
return;
} else if (connection.Metadata['@SystemInformation_OVERVIEW'] == null) { |
<<<<<<<
loadSQLQueryPage(serverName, portid, userName);
var loadSchemaTab = function () {
var templateUrl = window.location.protocol + '//' + window.location.host + '/catalog';
var templateJavascript = "js/template.js";
$.post(templateUrl, function (result) {
result = result.replace('<!--##SIZES##>', '');
var body = $(result).filter("#wrapper").html();
$("#schema").html(body);
$("#schemaLinkSqlQuery").on("click", function (e) {
$("#navSqlQuery").trigger("click");
e.preventDefault();
});
$.getScript(templateJavascript);
$("#overlay").hide();
});
};
loadSchemaTab();
=======
//For SQL Query tab, we need to pass admin as false. This way, if the database is paused,
//users can't accidentally send requests that might change database contents.
loadSQLQueryPage(serverName, portid, userName, password, false);
VoltDbUI.refreshSqlAndSchemaTab();
>>>>>>>
loadSQLQueryPage(serverName, portid, userName);
VoltDbUI.refreshSqlAndSchemaTab(); |
<<<<<<<
=======
var setMemoryLimitValidation = function() {
$("#errorMemorySize").val("");
$("#errorMemorySize").hide();
$("#txtMemoryLimitSize").rules("remove");
var unit = $('#ddlMemoryLimitUnit').val();
if (unit == "%") {
$("#txtMemoryLimitSize").rules("add", {
min: 0,
max: 99,
digits: true,
messages: {
min: "Please enter a positive number.",
max: "Maximum value of percentage cannot be greater than 99.",
digits: "Please enter a positive number without any decimal."
}
});
} else if (unit == "GB") {
$("#txtMemoryLimitSize").rules("add", {
min: 0,
digits: true,
messages: {
min: "Please enter a positive number.",
digits: "Please enter a positive number without any decimal."
}
});
}
};
//Disk Limit
var toggleDiskSizeEdit = function (state) {
>>>>>>>
var setMemoryLimitValidation = function() {
$("#errorMemorySize").val("");
$("#errorMemorySize").hide();
$("#txtMemoryLimitSize").rules("remove");
var unit = $('#ddlMemoryLimitUnit').val();
if (unit == "%") {
$("#txtMemoryLimitSize").rules("add", {
min: 0,
max: 99,
digits: true,
messages: {
min: "Please enter a positive number.",
max: "Maximum value of percentage cannot be greater than 99.",
digits: "Please enter a positive number without any decimal."
}
});
} else if (unit == "GB") {
$("#txtMemoryLimitSize").rules("add", {
min: 0,
digits: true,
messages: {
min: "Please enter a positive number.",
digits: "Please enter a positive number without any decimal."
}
});
}
}; |
<<<<<<<
gulp.task('usemin-badbrowser', function() {
return gulp.src('app/badbrowser.html')
.pipe($.usemin({
html: [$.minifyHtml({empty: true})],
css: ['concat', $.minifyCss({compatibility: true, keepBreaks: true})],
}))
.pipe(gulp.dest('dist'));
});
gulp.task('usemin', ['templates', 'enable-production'], function() {
return gulp.src('app/index.html')
=======
gulp.task('usemin', function () {
return gulp.src(['app/index.html', 'app/badbrowser.html'])
>>>>>>>
gulp.task('usemin-badbrowser', function() {
return gulp.src('app/badbrowser.html')
.pipe($.usemin({
html: [$.minifyHtml({empty: true})],
css: ['concat', $.minifyCss({compatibility: true, keepBreaks: true})],
}))
.pipe(gulp.dest('dist'));
});
gulp.task('usemin', function () {
return gulp.src('app/index.html') |
<<<<<<<
background_image: "Enable background image"
=======
background_image: "Enable background image",
use_json_file: "Use config.json instead of this menu",
hide_gear_button: "Make gear button invisible"
>>>>>>>
background_image: "Enable background image",
hide_gear_button: "Make gear button invisible" |
<<<<<<<
$(this).text('');
add_loading_gif(this);
$.get('/xhr/log/pastebin', function(data){
=======
$.get(WEBROOT + '/xhr/log/pastebin', function(data){
>>>>>>>
$(this).text('');
add_loading_gif(this);
$.get(WEBROOT + '/xhr/log/pastebin', function(data){ |
<<<<<<<
if (dir) {
execArgs.push(
"-s", `${dir}`
);
}
=======
if (files) {
files.split(',').forEach(f => {
execArgs.push(
"-f", `${f}`
);
});
}
>>>>>>>
if (files) {
files.split(',').forEach(f => {
execArgs.push(
"-f", `${f}`
);
});
}
if (dir) {
execArgs.push(
"-s", `${dir}`
);
} |
<<<<<<<
import {FILTER_ALL} from './../services/filter';
import {getAll, createNew, updateStatus} from './../services/todo';
=======
import {FILTER_ACTIVE} from './../services/filter';
import {getAll, addToList, updateStatus} from './../services/todo';
>>>>>>>
import {FILTER_ALL} from './../services/filter';
import {getAll, addToList, updateStatus} from './../services/todo'; |
<<<<<<<
export function getItemById(itemId) {
return getAll().find(item => item.id === itemId);
}
export function updateStatus(items, itemId, completed) {
let index = items.findIndex(item => item.id === itemId);
// Returns a new list of data with updated item.
return update(items, {
[index]: {
completed: {$set: completed}
}
});
}
export function createNew(text) {
let nextId = this.state.items.length + 1;
let item = {
id: nextId,
text: text
};
=======
/**
* A counter to generate a unique id for a todo item.
* Can remove this logic when the todo is created using backend/database logic.
* @type {Number}
*/
let todoCounter = 1;
function getNextId() {
return getAll().length + todoCounter++;
}
/**
* Adds a new item on the list and returns the new updated list (immutable).
*
* @param {Array} list
* @param {Object} data
* @return {Array}
*/
export function addToList(list, data) {
let item = Object.assign({
id: getNextId()
}, data);
>>>>>>>
export function getItemById(itemId) {
return getAll().find(item => item.id === itemId);
}
export function updateStatus(items, itemId, completed) {
let index = items.findIndex(item => item.id === itemId);
// Returns a new list of data with updated item.
return update(items, {
[index]: {
completed: {$set: completed}
}
});
}
/**
* A counter to generate a unique id for a todo item.
* Can remove this logic when the todo is created using backend/database logic.
* @type {Number}
*/
let todoCounter = 1;
function getNextId() {
return getAll().length + todoCounter++;
}
/**
* Adds a new item on the list and returns the new updated list (immutable).
*
* @param {Array} list
* @param {Object} data
* @return {Array}
*/
export function addToList(list, data) {
let item = Object.assign({
id: getNextId()
}, data); |
<<<<<<<
'Indent/Outdent' : 'مسافة بادئة / مسافة خاتمة',
=======
'Indent/Outdent' : '',
>>>>>>>
'Indent/Outdent' : 'مسافة بادئة / مسافة خاتمة',
'Indent/Outdent' : '',
<<<<<<<
'Toggle display document structure' : 'إخفاء/ إظهار ',
=======
'Toggle display document structure' : '',
>>>>>>>
'Toggle display document structure' : 'إخفاء/ إظهار ',
<<<<<<<
'Popup' : 'نافذة منبئقة',
'Advanced' : 'متقدم',
'Events' : 'الأحداث',
=======
'Popup' : '',
'Advanced' : '',
'Events' : '',
>>>>>>>
'Popup' : 'نافذة منبئقة',
'Advanced' : 'متقدم',
'Events' : 'الأحداث',
'Popup' : '',
'Advanced' : '',
'Events' : '',
<<<<<<<
'Border' : 'حدود',
'Background' : 'الخلفية',
'Css class' : 'Css نمط',
'Css style' : 'Css تنسيق',
=======
'Border' : '',
'Background' : '',
'Css class' : '',
'Css style' : '',
>>>>>>>
'Border' : 'حدود',
'Background' : 'الخلفية',
'Css class' : 'Css نمط',
'Css style' : 'Css تنسيق',
'Border' : '',
'Background' : '',
'Css class' : '',
'Css style' : '',
<<<<<<<
'Heading 1' : 'عنوان رئيسي 1',
'Heading 2' : 'عنوان رئيسي 2',
'Heading 3' : 'عنوان رئيسي 3',
'Heading 4' : 'عنوان رئيسي 4',
'Heading 5' : 'عنوان رئيسي 5',
'Heading 6' : 'عنوان رئيسي 6',
=======
'Heading 1' : '',
'Heading 2' : '',
'Heading 3' : '',
'Heading 4' : '',
'Heading 5' : '',
'Heading 6' : '',
>>>>>>>
'Heading 1' : 'عنوان رئيسي 1',
'Heading 2' : 'عنوان رئيسي 2',
'Heading 3' : 'عنوان رئيسي 3',
'Heading 4' : 'عنوان رئيسي 4',
'Heading 5' : 'عنوان رئيسي 5',
'Heading 6' : 'عنوان رئيسي 6',
'Heading 1' : '',
'Heading 2' : '',
'Heading 3' : '',
'Heading 4' : '',
'Heading 5' : '',
'Heading 6' : '',
<<<<<<<
'Spacing' : 'مسافات (spacing)',
'Padding' : 'الهامش (padding)',
=======
'Spacing' : '',
'Padding' : '',
>>>>>>>
'Spacing' : 'مسافات (spacing)',
'Padding' : 'الهامش (padding)',
'Spacing' : '',
'Padding' : '',
<<<<<<<
'Inner borders' : 'حدود داخلية'
=======
'Inner borders' : ''
>>>>>>>
'Inner borders' : 'حدود داخلية' |
<<<<<<<
var async = require('async');
var exec = require('child_process').exec;
var csv = require('csv');
var fs = require('fs');
var MongoClient = require('mongodb').MongoClient;
var path = require('path');
var request = require('request');
var unzip = require('unzip2');
var downloadDir = 'downloads';
var q;
// check if this file was invoked direct through command line or required as an export
var invocation = (require.main === module) ? 'direct' : 'required';
var config = {};
if(invocation === 'direct') {
try {
var config = require('../config.js');
} catch(e) {
try {
var config = require('../config-sample.js');
} catch(e) {
handleError(new Error('Cannot find config.js'));
}
}
=======
var request = require('request')
, exec = require('child_process').exec
, fs = require('fs')
, path = require('path')
, csv = require('csv')
, async = require('async')
, unzip = require('unzip')
, proj4 = require('proj4')
, glob = require('glob')
, downloadDir = 'downloads'
, Db = require('mongodb').Db
, q;
//load config.js
try {
var config = require('../config.js');
} catch (e) {
handleError(new Error('Cannot find config.js'));
}
>>>>>>>
var async = require('async');
var exec = require('child_process').exec;
var csv = require('csv');
var fs = require('fs');
var MongoClient = require('mongodb').MongoClient;
var path = require('path');
var proj4 = require('proj4');
var request = require('request');
var unzip = require('unzip2');
var q;
// check if this file was invoked direct through command line or required as an export
var invocation = (require.main === module) ? 'direct' : 'required';
var config = {};
if(invocation === 'direct') {
try {
var config = require('../config.js');
} catch(e) {
try {
var config = require('../config-sample.js');
} catch(e) {
handleError(new Error('Cannot find config.js'));
}
}
<<<<<<<
=======
function downloadGTFS(task, cb){
var agency_key = task.agency_key
, agency_bounds = {sw: [], ne: []}
, agency_url = task.agency_url
, agency_path = task.agency_path
, agency_proj = task.agency_proj
;
>>>>>>>
<<<<<<<
=======
});
}
function downloadFiles(cb){
//do download
if (agency_url) {
request(agency_url, processDownloadedFile).pipe(fs.createWriteStream(downloadDir + '/latest.zip'));
} else {
processFile(agency_path);
}
function processDownloadedFile(e, response, body){
if(response && response.statusCode != 200){ cb(new Error('Couldn\'t download files')); }
console.log(agency_key + ': Download successful');
processFile(downloadDir + '/latest.zip');
}
function processFile(path) {
fs.createReadStream(path)
.pipe(unzip.Extract({ path: downloadDir }).on('close', cb))
.on('error', handleError);
>>>>>>>
}
function readFiles(cb) {
if(path.extname(task.path) === '.zip') {
// local file is zipped
fs.createReadStream(task.path)
.pipe(unzip.Extract({
path: downloadDir
}).on('close', cb))
.on('error', handleError);
} else {
// local file is unzipped, just read it from there.
gtfsDir = task.path;
cb();
}
<<<<<<<
async.series([
agencyCenter,
longestTrip,
updatedDate
], function (e, results) {
cb();
});
}
=======
async.series([
agencyCenter
, longestTrip
, fixCoordinates
], function(e, results){
cb();
});
}
>>>>>>>
async.series([
agencyCenter,
longestTrip,
updatedDate
], function (e, results) {
cb();
});
}
<<<<<<<
});
}
=======
function fixCoordinates(cb) {
console.log(agency_key + ': Post Processing data - fix coordinates');
db.collection('stops').find({agency_key: agency_key, location_type: 1}, function(e, stations){
if (e) handleError(e);
async.forEach(stations, function(station, cb){
if (station.loc[0]==0 || (station.loc[1]==0)) {
// its a station, and coordinates are wrong... lest find a stop in this station and copy its coordinates
console.log(agency_key + ': Post Processing data - fix coordinates - found "'+station.stop_id+'" have bad location');
db.collection('stops').findOne({agency_key: agency_key, parent_station: station.stop_id}, function(e, stop){
if (e) handleError(e);
sation.loc = stop.loc;
db.collection('stops').update({_id: station._id}, {$set: {loc: station.loc}}, {safe: true}, function(e) {
if (e) handleError(e);
console.log(agency_key + ': Post Processing data - fix coordinates - found "'+station.stop_id+'" have bad location : location fixed');
});
});
}
//cb();
}, cb);
});
//cb();
}
}
});
>>>>>>>
});
} |
<<<<<<<
(function(){
/*global YUITest, CSSLint*/
var Assert = YUITest.Assert;
YUITest.TestRunner.add(new YUITest.TestCase({
name: "Compatible Vendor Prefix Warnings",
"Using -webkit-border-radius should warn to also include -moz-border-radius.": function(){
var result = CSSLint.verify("h1 { -webkit-border-radius: 5px; }", { "compatible-vendor-prefixes": 1 });
Assert.areEqual(1, result.messages.length);
Assert.areEqual("warning", result.messages[0].type);
Assert.areEqual("The property -moz-border-radius is compatible with -webkit-border-radius and should be included as well.", result.messages[0].message);
},
"Using -webkit-transition and -moz-transition should warn to also include -o-transition.": function(){
var result = CSSLint.verify("h1 { -webkit-transition: height 20px 1s; -moz-transition: height 20px 1s; }", { "compatible-vendor-prefixes": 1 });
Assert.areEqual(1, result.messages.length);
Assert.areEqual("warning", result.messages[0].type);
Assert.areEqual("The property -o-transition is compatible with -webkit-transition and -moz-transition and should be included as well.", result.messages[0].message);
},
"Using -webkit-transform should warn to also include -moz-transform, -ms-transform, and -o-transform.": function(){
var result = CSSLint.verify("div.box { -webkit-transform: translate(50px, 100px); }", { "compatible-vendor-prefixes": 3 });
Assert.areEqual(3, result.messages.length);
Assert.areEqual("warning", result.messages[0].type);
Assert.areEqual("The property -moz-transform is compatible with -webkit-transform and should be included as well.", result.messages[0].message);
Assert.areEqual("warning", result.messages[1].type);
Assert.areEqual("The property -ms-transform is compatible with -webkit-transform and should be included as well.", result.messages[1].message);
Assert.areEqual("warning", result.messages[2].type);
Assert.areEqual("The property -o-transform is compatible with -webkit-transform and should be included as well.", result.messages[2].message);
},
"Using all compatible vendor prefixes for animation should be allowed with no warnings.": function(){
var result = CSSLint.verify(".next:focus { -moz-animation: 'diagonal-slide' 5s 10; -webkit-animation: 'diagonal-slide' 5s 10; }", { "compatible-vendor-prefixes": 0 });
Assert.areEqual(0, result.messages.length);
},
"Using box-shadow with no vendor prefixes should be allowed with no warnings.": function(){
var result = CSSLint.verify("h1 { box-shadow: 5px 5px 5px #ccc; }", { "compatible-vendor-prefixes": 0 });
Assert.areEqual(0, result.messages.length);
}
}));
})();
=======
>>>>>>>
(function(){
/*global YUITest, CSSLint*/
var Assert = YUITest.Assert;
YUITest.TestRunner.add(new YUITest.TestCase({
name: "Compatible Vendor Prefix Warnings",
"Using -webkit-border-radius should warn to also include -moz-border-radius.": function(){
var result = CSSLint.verify("h1 { -webkit-border-radius: 5px; }", { "compatible-vendor-prefixes": 1 });
Assert.areEqual(1, result.messages.length);
Assert.areEqual("warning", result.messages[0].type);
Assert.areEqual("The property -moz-border-radius is compatible with -webkit-border-radius and should be included as well.", result.messages[0].message);
},
"Using -webkit-transition and -moz-transition should warn to also include -o-transition.": function(){
var result = CSSLint.verify("h1 { -webkit-transition: height 20px 1s; -moz-transition: height 20px 1s; }", { "compatible-vendor-prefixes": 1 });
Assert.areEqual(1, result.messages.length);
Assert.areEqual("warning", result.messages[0].type);
Assert.areEqual("The property -o-transition is compatible with -webkit-transition and -moz-transition and should be included as well.", result.messages[0].message);
},
"Using -webkit-transform should warn to also include -moz-transform, -ms-transform, and -o-transform.": function(){
var result = CSSLint.verify("div.box { -webkit-transform: translate(50px, 100px); }", { "compatible-vendor-prefixes": 3 });
Assert.areEqual(3, result.messages.length);
Assert.areEqual("warning", result.messages[0].type);
Assert.areEqual("The property -moz-transform is compatible with -webkit-transform and should be included as well.", result.messages[0].message);
Assert.areEqual("warning", result.messages[1].type);
Assert.areEqual("The property -ms-transform is compatible with -webkit-transform and should be included as well.", result.messages[1].message);
Assert.areEqual("warning", result.messages[2].type);
Assert.areEqual("The property -o-transform is compatible with -webkit-transform and should be included as well.", result.messages[2].message);
},
"Using all compatible vendor prefixes for animation should be allowed with no warnings.": function(){
var result = CSSLint.verify(".next:focus { -moz-animation: 'diagonal-slide' 5s 10; -webkit-animation: 'diagonal-slide' 5s 10; }", { "compatible-vendor-prefixes": 0 });
Assert.areEqual(0, result.messages.length);
},
"Using box-shadow with no vendor prefixes should be allowed with no warnings.": function(){
var result = CSSLint.verify("h1 { box-shadow: 5px 5px 5px #ccc; }", { "compatible-vendor-prefixes": 0 });
Assert.areEqual(0, result.messages.length);
}
}));
})();
<<<<<<<
(function(){
/*global YUITest, CSSLint*/
var Assert = YUITest.Assert;
YUITest.TestRunner.add(new YUITest.TestCase({
name: "Duplicate Property Rule Errors",
"Duplicate properties back-to-back should not result in a warning": function(){
var result = CSSLint.verify(".foo { float: left; float: right }", { "duplicate-properties": 1 });
Assert.areEqual(0, result.messages.length);
},
"Duplicate properties in @font-face back-to-back should not result in a warning": function(){
var result = CSSLint.verify("@font-face { src: url(foo.svg); src: url(foo1.svg) }", { "duplicate-properties": 1 });
Assert.areEqual(0, result.messages.length);
},
"Duplicate properties in @page back-to-back should not result in a warning": function(){
var result = CSSLint.verify("@page :left { margin: 5px; margin: 4px; }", { "duplicate-properties": 1 });
Assert.areEqual(0, result.messages.length);
},
"Duplicate properties not back-to-back should result in a warning": function(){
var result = CSSLint.verify(".foo { float: left; margin: 0; float: right }", { "duplicate-properties": 1 });
Assert.areEqual(1, result.messages.length);
Assert.areEqual("warning", result.messages[0].type);
Assert.areEqual("Duplicate property 'float' found.", result.messages[0].message);
},
"Duplicate properties not back-to-back with same values should result in a warning": function(){
var result = CSSLint.verify(".foo { float: left; margin: 0; float: left }", { "duplicate-properties": 1 });
Assert.areEqual(1, result.messages.length);
Assert.areEqual("warning", result.messages[0].type);
Assert.areEqual("Duplicate property 'float' found.", result.messages[0].message);
},
"Duplicate properties back-to-back with same values should result in a warning": function(){
var result = CSSLint.verify(".foo { float: left; float: left }", { "duplicate-properties": 1 });
Assert.areEqual(1, result.messages.length);
Assert.areEqual("warning", result.messages[0].type);
Assert.areEqual("Duplicate property 'float' found.", result.messages[0].message);
}
}));
})();
=======
>>>>>>>
(function(){
/*global YUITest, CSSLint*/
var Assert = YUITest.Assert;
YUITest.TestRunner.add(new YUITest.TestCase({
name: "Duplicate Property Rule Errors",
"Duplicate properties back-to-back should not result in a warning": function(){
var result = CSSLint.verify(".foo { float: left; float: right }", { "duplicate-properties": 1 });
Assert.areEqual(0, result.messages.length);
},
"Duplicate properties in @font-face back-to-back should not result in a warning": function(){
var result = CSSLint.verify("@font-face { src: url(foo.svg); src: url(foo1.svg) }", { "duplicate-properties": 1 });
Assert.areEqual(0, result.messages.length);
},
"Duplicate properties in @page back-to-back should not result in a warning": function(){
var result = CSSLint.verify("@page :left { margin: 5px; margin: 4px; }", { "duplicate-properties": 1 });
Assert.areEqual(0, result.messages.length);
},
"Duplicate properties not back-to-back should result in a warning": function(){
var result = CSSLint.verify(".foo { float: left; margin: 0; float: right }", { "duplicate-properties": 1 });
Assert.areEqual(1, result.messages.length);
Assert.areEqual("warning", result.messages[0].type);
Assert.areEqual("Duplicate property 'float' found.", result.messages[0].message);
},
"Duplicate properties not back-to-back with same values should result in a warning": function(){
var result = CSSLint.verify(".foo { float: left; margin: 0; float: left }", { "duplicate-properties": 1 });
Assert.areEqual(1, result.messages.length);
Assert.areEqual("warning", result.messages[0].type);
Assert.areEqual("Duplicate property 'float' found.", result.messages[0].message);
},
"Duplicate properties back-to-back with same values should result in a warning": function(){
var result = CSSLint.verify(".foo { float: left; float: left }", { "duplicate-properties": 1 });
Assert.areEqual(1, result.messages.length);
Assert.areEqual("warning", result.messages[0].type);
Assert.areEqual("Duplicate property 'float' found.", result.messages[0].message);
}
}));
})();
<<<<<<<
(function(){
/*global YUITest, CSSLint*/
var Assert = YUITest.Assert;
YUITest.TestRunner.add(new YUITest.TestCase({
name: "Import Rule Errors",
"Using @import should result in a warning": function(){
var result = CSSLint.verify("@import url('foo.css');", { "import": 1 });
Assert.areEqual(1, result.messages.length);
Assert.areEqual("warning", result.messages[0].type);
Assert.areEqual("@import prevents parallel downloads, use <link> instead.", result.messages[0].message);
}
}));
})();
=======
>>>>>>>
(function(){
/*global YUITest, CSSLint*/
var Assert = YUITest.Assert;
YUITest.TestRunner.add(new YUITest.TestCase({
name: "Import Rule Errors",
"Using @import should result in a warning": function(){
var result = CSSLint.verify("@import url('foo.css');", { "import": 1 });
Assert.areEqual(1, result.messages.length);
Assert.areEqual("warning", result.messages[0].type);
Assert.areEqual("@import prevents parallel downloads, use <link> instead.", result.messages[0].message);
}
}));
})(); |
<<<<<<<
editorOptions: {
usageStatistics: false,
hideModeSwitch: true,
initialEditType: 'markdown',
hooks: {
addImageBlobHook: self.addImageBlobHook
},
customHTMLRenderer: {
image(node, context) {
const { destination } = node
const { getChildrenText, skipChildren } = context
skipChildren()
return {
type: "openTag",
tagName: "img",
selfClose: true,
attributes: {
src: self.blobUrlCache[destination],
alt: getChildrenText(node)
}
}
}
}
},
blobUrlCache: [],
=======
isRefreshing: false,
>>>>>>>
editorOptions: {
usageStatistics: false,
hideModeSwitch: true,
initialEditType: 'markdown',
hooks: {
addImageBlobHook: self.addImageBlobHook
},
customHTMLRenderer: {
image(node, context) {
const { destination } = node
const { getChildrenText, skipChildren } = context
skipChildren()
return {
type: "openTag",
tagName: "img",
selfClose: true,
attributes: {
src: self.blobUrlCache[destination],
alt: getChildrenText(node)
}
}
}
}
},
blobUrlCache: [],
isRefreshing: false,
<<<<<<<
addImageBlobHook: function(blob, cb) {
var self = this
helpers.handleFileSelectParts([ blob ], false, (err, res) => {
SSB.net.blobs.fsURL(res.link, (err, blobURL) => {
self.blobUrlCache[res.link] = blobURL
cb(res.link, res.name)
})
})
return false
},
onScroll: function() {
const scrollTop = (typeof document.body.scrollTop != 'undefined' ? document.body.scrollTop : window.scrollY)
if (scrollTop == 0) {
// At the top of the page. Enable autorefresh
var self = this
if (this.autorefreshTimer == 0) {
this.autorefreshTimer = setTimeout(() => {
console.log("refreshing from auto timer!")
self.autorefreshTimer = 0
self.onScroll()
self.refresh()
}, (this.messages.length > 0 ? 60000 : 5000))
}
} else if (this.autorefreshTimer) {
clearTimeout(this.autorefreshTimer)
this.autorefreshTimer = 0
}
},
=======
>>>>>>>
addImageBlobHook: function(blob, cb) {
var self = this
helpers.handleFileSelectParts([ blob ], false, (err, res) => {
SSB.net.blobs.fsURL(res.link, (err, blobURL) => {
self.blobUrlCache[res.link] = blobURL
cb(res.link, res.name)
})
})
return false
}, |
<<<<<<<
iframeWindow.addEventListener('digit1Pressed' , () => {
console.log('digit1Pressed');
annotationTools.createSpan();
});
=======
>>>>>>>
iframeWindow.addEventListener('digit1Pressed' , () => {
console.log('digit1Pressed');
annotationTools.createSpan();
});
<<<<<<<
annotationTools.setup();
=======
annotationsTools.setup();
inputLabel.setup();
>>>>>>>
annotationTools.setup();
inputLabel.setup(); |
<<<<<<<
@computed('mainMap.selected')
isSelectedBoundsOptions(selected) {
if (selected) {
const type = selected.constructor.modelName;
const el = this.$();
const height = el.height();
const width = el.width();
const fullWidth = window.innerWidth;
// width of content area on large screens is 5/12 of full
const contentWidth = (fullWidth / 12) * 5;
// on small screens, no offset
const offset = fullWidth < 1024 ? 0 : -((width - contentWidth) / 2);
const padding = Math.min(height, (width - contentWidth)) / 2.5;
return {
padding: selected && (type !== 'zoning-district') ? padding : 0,
offset: [offset, 0],
};
}
return null;
},
drawnFeatureLayers,
=======
>>>>>>>
drawnFeatureLayers,
<<<<<<<
map.addControl(new MeasurementText(), 'top-left');
=======
// map.addControl(draw, 'top-left');
// map.addControl(new MeasurementText(), 'top-left');
>>>>>>>
map.addControl(new MeasurementText(), 'top-left'); |
<<<<<<<
return carto.SQL(SQL('special_purpose_districts_v201809', geometry))
=======
@computed('model.value.geometry')
parentSpecialPurposeDistricts(geometry) {
return carto.SQL(SQL('special_purpose_districts_v201810', geometry))
>>>>>>>
return carto.SQL(SQL('special_purpose_districts_v201810', geometry)) |
<<<<<<<
this.route('data');
=======
this.route('features');
>>>>>>>
this.route('data');
this.route('features'); |
<<<<<<<
// TODO: want this at simply /country/{place} but need to make sure we don't
// interfere with other urls
app.get('/country/place/{place}/', function(req, res) {
res.render('country/place.html', {
place: place,
info: model.data.country.byplace[place]
});
});
=======
//This messes up URL arguments, removing for now
/*
app.get('/country/remove', function(req, res) {
//var country = req.param('country');
//var dataset = req.param('dataset');
remove('submitted', req);
});
*/
>>>>>>>
// TODO: want this at simply /country/{place} but need to make sure we don't
// interfere with other urls
app.get('/country/place/{place}/', function(req, res) {
res.render('country/place.html', {
place: place,
info: model.data.country.byplace[place]
});
});
//This messes up URL arguments, removing for now
/*
app.get('/country/remove', function(req, res) {
//var country = req.param('country');
//var dataset = req.param('dataset');
remove('submitted', req);
});
*/ |
<<<<<<<
=======
Logger.debug('Publishing poll', { meetingId });
>>>>>>>
<<<<<<<
Logger.debug(`Publishing Polls for ${meetingId} ${userId}`);
=======
Logger.debug('Publishing polls', { meetingId, requesterUserId });
>>>>>>>
Logger.debug('Publishing polls', { meetingId, userId }); |
<<<<<<<
=======
const dataSavingSetting = () => Settings.dataSaving.viewScreenshare;
>>>>>>>
const dataSavingSetting = () => Settings.dataSaving.viewScreenshare;
<<<<<<<
unshareScreen,
=======
dataSavingSetting,
>>>>>>>
unshareScreen,
dataSavingSetting, |
<<<<<<<
import '/imports/api/network-information/server';
=======
import '/imports/api/users-infos/server';
>>>>>>>
import '/imports/api/network-information/server';
import '/imports/api/users-infos/server'; |
<<<<<<<
import logger from '/imports/startup/client/logger';
=======
import { fetchStunTurnServers } from '/imports/utils/fetchStunTurnServers';
>>>>>>>
import logger from '/imports/startup/client/logger';
import { fetchStunTurnServers } from '/imports/utils/fetchStunTurnServers'; |
<<<<<<<
});
*/
//var g = new tracking.ConnectivityGraph(matchtable);
//var ts = g.getTracks();
//var tracks = tracking.track(matchtable);
//console.log(ts.length);
//console.log(ts[30]);
/*
hallsample
.promisePointTable([2,3,4,5,6])
.then(function(pointTable){
var matchtable = [[2,3],[3,4],[4,5],[5,6]].map(function(pair){
var from = pair[0], to = pair[1];
return {
from: from,
to: to,
matches: halldemo.getRawMatches(from, to)
};
});
var tracks = tracking.track(matchtable, pointTable);
console.log(tracks.length);
console.log(tracks[30]);
});
*/
console.log(hallsample.getRawMatches(9,10));
=======
});
*/
//var g = new tracking.ConnectivityGraph(matchtable);
//var ts = g.getTracks();
//var tracks = tracking.track(matchtable);
//console.log(ts.length);
//console.log(ts[30]);
hallsample
.promisePointTable([2,3,4,5,6])
.then(function(pointTable){
var matchtable = [[2,3],[3,4],[4,5],[5,6]].map(function(pair){
var from = pair[0], to = pair[1];
return {
from: from,
to: to,
matches: halldemo.getRawMatches(from, to)
};
});
var tracks = tracking.track(matchtable, pointTable);
console.log(tracks.length);
console.log(tracks[30]);
});
>>>>>>>
});
*/
//var g = new tracking.ConnectivityGraph(matchtable);
//var ts = g.getTracks();
//var tracks = tracking.track(matchtable);
//console.log(ts.length);
//console.log(ts[30]); |
<<<<<<<
import getFromUserSettings from '/imports/ui/services/users-settings';
=======
import { makeCall } from '/imports/ui/services/api';
import { notify } from '/imports/ui/services/notification';
import { monitorVideoConnection } from '/imports/utils/stats';
import browser from 'browser-detect';
import getFromUserSettings from '/imports/ui/services/users-settings';
import logger from '/imports/startup/client/logger';
const CAMERA_PROFILES = Meteor.settings.public.kurento.cameraProfiles;
const MULTIPLE_CAMERAS = Meteor.settings.public.app.enableMultipleCameras;
const SKIP_VIDEO_PREVIEW = Meteor.settings.public.kurento.skipVideoPreview;
>>>>>>>
import { makeCall } from '/imports/ui/services/api';
import { notify } from '/imports/ui/services/notification';
import { monitorVideoConnection } from '/imports/utils/stats';
import browser from 'browser-detect';
import getFromUserSettings from '/imports/ui/services/users-settings';
import logger from '/imports/startup/client/logger';
const CAMERA_PROFILES = Meteor.settings.public.kurento.cameraProfiles;
const MULTIPLE_CAMERAS = Meteor.settings.public.app.enableMultipleCameras;
const SKIP_VIDEO_PREVIEW = Meteor.settings.public.kurento.skipVideoPreview;
<<<<<<<
const ROLE_VIEWER = Meteor.settings.public.user.role_viewer;
const MIRROR_WEBCAM = Meteor.settings.public.app.mirrorOwnWebcam;
=======
const ENABLE_NETWORK_MONITORING = Meteor.settings.public.networkMonitoring.enableNetworkMonitoring;
const TOKEN = '_';
>>>>>>>
const ROLE_VIEWER = Meteor.settings.public.user.role_viewer;
const ENABLE_NETWORK_MONITORING = Meteor.settings.public.networkMonitoring.enableNetworkMonitoring;
const MIRROR_WEBCAM = Meteor.settings.public.app.mirrorOwnWebcam;
const TOKEN = '_';
<<<<<<<
getAllWebcamUsers() {
const webcamsLocked = this.webcamsLocked();
const webcamsOnlyForModerator = this.webcamsOnlyForModerator();
const currentUser = Users.findOne({ userId: Auth.userID });
const currentUserIsViewer = currentUser.role === ROLE_VIEWER;
const sharedWebcam = this.isSharing;
const videoStreams = VideoStreams.find({ meetingId: Auth.meetingID },
{ fields: { userId: 1 } }).fetch();
=======
sendUserShareWebcam(cameraId) {
makeCall('userShareWebcam', cameraId);
}
>>>>>>>
sendUserShareWebcam(cameraId) {
makeCall('userShareWebcam', cameraId);
}
<<<<<<<
if ((webcamsOnlyForModerator) && currentUserIsViewer) {
users = users.filter(userIsModerator);
}
=======
getConnectingStream(streams) {
let connectingStream;
>>>>>>>
getConnectingStream(streams) {
let connectingStream;
<<<<<<<
exitingVideo: () => videoService.exitingVideo(),
exitedVideo: () => videoService.exitedVideo(),
webcamsLocked: () => videoService.webcamsLocked(),
webcamOnlyModerator: () => videoService.webcamOnlyModerator(),
isSharing: () => videoService.isSharing,
isConnected: () => videoService.isConnected,
isWaitingResponse: () => videoService.isWaitingResponse,
joinVideo: () => videoService.joinVideo(),
joiningVideo: () => videoService.joiningVideo(),
joinedVideo: () => videoService.joinedVideo(),
sendUserShareWebcam: stream => videoService.sendUserShareWebcam(stream),
sendUserUnshareWebcam: stream => videoService.sendUserUnshareWebcam(stream),
mirrorOwnWebcam: user => videoService.mirrorOwnWebcam(user),
meetingId: () => videoService.meetingId(),
getAllWebcamUsers: () => videoService.getAllWebcamUsers(),
sessionToken: () => videoService.sessionToken(),
voiceBridge: () => videoService.voiceBridge(),
=======
joinVideo: deviceId => videoService.joinVideo(deviceId),
stopVideo: cameraId => videoService.stopVideo(cameraId),
getVideoStreams: () => videoService.getVideoStreams(),
getInfo: () => videoService.getInfo(),
getMyStream: deviceId => videoService.getMyStream(deviceId),
isUserLocked: () => videoService.isUserLocked(),
lockUser: () => videoService.lockUser(),
getAuthenticatedURL: () => videoService.getAuthenticatedURL(),
isLocalStream: cameraId => videoService.isLocalStream(cameraId),
hasVideoStream: () => videoService.hasVideoStream(),
isDisabled: () => videoService.isDisabled(),
playStart: cameraId => videoService.playStart(cameraId),
getCameraProfile: () => videoService.getCameraProfile(),
addCandidateToPeer: (peer, candidate, cameraId) => videoService.addCandidateToPeer(peer, candidate, cameraId),
processInboundIceQueue: (peer, cameraId) => videoService.processInboundIceQueue(peer, cameraId),
getRole: isLocal => videoService.getRole(isLocal),
getSharedDevices: () => videoService.getSharedDevices(),
getSkipVideoPreview: fromInterface => videoService.getSkipVideoPreview(fromInterface),
getUserParameterProfile: () => videoService.getUserParameterProfile(),
isMultipleCamerasEnabled: () => videoService.isMultipleCamerasEnabled(),
monitor: conn => videoService.monitor(conn),
onBeforeUnload: () => videoService.onBeforeUnload(),
notify: message => notify(message, 'error', 'video'),
>>>>>>>
joinVideo: deviceId => videoService.joinVideo(deviceId),
stopVideo: cameraId => videoService.stopVideo(cameraId),
getVideoStreams: () => videoService.getVideoStreams(),
getInfo: () => videoService.getInfo(),
getMyStream: deviceId => videoService.getMyStream(deviceId),
isUserLocked: () => videoService.isUserLocked(),
lockUser: () => videoService.lockUser(),
getAuthenticatedURL: () => videoService.getAuthenticatedURL(),
isLocalStream: cameraId => videoService.isLocalStream(cameraId),
hasVideoStream: () => videoService.hasVideoStream(),
isDisabled: () => videoService.isDisabled(),
playStart: cameraId => videoService.playStart(cameraId),
getCameraProfile: () => videoService.getCameraProfile(),
addCandidateToPeer: (peer, candidate, cameraId) => videoService.addCandidateToPeer(peer, candidate, cameraId),
processInboundIceQueue: (peer, cameraId) => videoService.processInboundIceQueue(peer, cameraId),
getRole: isLocal => videoService.getRole(isLocal),
getSharedDevices: () => videoService.getSharedDevices(),
getSkipVideoPreview: fromInterface => videoService.getSkipVideoPreview(fromInterface),
getUserParameterProfile: () => videoService.getUserParameterProfile(),
isMultipleCamerasEnabled: () => videoService.isMultipleCamerasEnabled(),
monitor: conn => videoService.monitor(conn),
mirrorOwnWebcam: user => videoService.mirrorOwnWebcam(user),
onBeforeUnload: () => videoService.onBeforeUnload(),
notify: message => notify(message, 'error', 'video'), |
<<<<<<<
clearUserInfoForRequester(meetingId, userId);
return Logger.info(`Ejected user id=${userId} meeting=${meetingId}`);
=======
return Logger.info(`Ejected user id=${userId} meeting=${meetingId} reason=${ejectedReason}`);
>>>>>>>
clearUserInfoForRequester(meetingId, userId);
return Logger.info(`Ejected user id=${userId} meeting=${meetingId} reason=${ejectedReason}`); |
<<<<<<<
import { joinListenOnly } from '/imports/api/phone';
import { exitAudio } from '/imports/api/phone';
=======
>>>>>>> |
<<<<<<<
import clearSlides from '/imports/api/slides/server/modifiers/clearSlides';
import { clearPollCollection } from '/imports/api/polls/server/modifiers/clearPollCollection';
=======
import { clearSlidesCollection } from '/imports/api/slides/server/modifiers/clearSlidesCollection';
import clearPoll from '/imports/api/polls/server/modifiers/clearPoll';
>>>>>>>
import clearSlides from '/imports/api/slides/server/modifiers/clearSlides';
import clearPoll from '/imports/api/polls/server/modifiers/clearPoll';
<<<<<<<
clearPollCollection();
clearPresentations();
=======
clearPoll();
clearPresentationsCollection();
>>>>>>>
clearPresentations();
clearPoll(); |
<<<<<<<
let UserConnectedToGlobalAudio =
require('./audio/UserConnectedToGlobalAudio.js')(Constants);
let UserDisconnectedFromGlobalAudio =
require('./audio/UserDisconnectedFromGlobalAudio.js')(Constants);
let UserConnectedToGlobalAudio2x =
require('./audio/UserConnectedToGlobalAudio2x.js')(Constants);
let UserDisconnectedFromGlobalAudio2x =
require('./audio/UserDisconnectedFromGlobalAudio2x.js')(Constants);
=======
let RecordingStatusRequestMessage2x = require('./recording/RecordingStatusRequestMessage2x.js')(Constants);
>>>>>>>
let RecordingStatusRequestMessage2x =
require('./recording/RecordingStatusRequestMessage2x.js')(Constants);
let UserConnectedToGlobalAudio =
require('./audio/UserConnectedToGlobalAudio.js')(Constants);
let UserDisconnectedFromGlobalAudio =
require('./audio/UserDisconnectedFromGlobalAudio.js')(Constants);
let UserConnectedToGlobalAudio2x =
require('./audio/UserConnectedToGlobalAudio2x.js')(Constants);
let UserDisconnectedFromGlobalAudio2x =
require('./audio/UserDisconnectedFromGlobalAudio2x.js')(Constants);
<<<<<<<
Messaging.prototype.generateUserConnectedToGlobalAudioMessage =
function(voiceConf, userId, name) {
let msg;
switch (Constants.COMMON_MESSAGE_VERSION) {
case "1.x":
msg = new UserConnectedToGlobalAudio(voiceConf, userId, name);
break;
default:
msg = new UserConnectedToGlobalAudio2x(voiceConf, userId, name);
}
return msg.toJson();
}
Messaging.prototype.generateUserDisconnectedFromGlobalAudioMessage =
function(voiceConf, userId, name) {
let msg;
switch (Constants.COMMON_MESSAGE_VERSION) {
case "1.x":
msg = new UserDisconnectedFromGlobalAudio(voiceConf, userId, name);
break;
default:
msg = new UserDisconnectedFromGlobalAudio2x(voiceConf, userId, name);
}
return msg.toJson();
}
=======
Messaging.prototype.generateRecordingStatusRequestMessage =
function(meetingId, userId = '') {
let rsqm = new RecordingStatusRequestMessage2x(meetingId, userId);
return rsqm.toJson();
}
>>>>>>>
Messaging.prototype.generateRecordingStatusRequestMessage =
function(meetingId, userId = '') {
let rsqm = new RecordingStatusRequestMessage2x(meetingId, userId);
return rsqm.toJson();
}
Messaging.prototype.generateUserConnectedToGlobalAudioMessage =
function(voiceConf, userId, name) {
let msg;
switch (Constants.COMMON_MESSAGE_VERSION) {
case "1.x":
msg = new UserConnectedToGlobalAudio(voiceConf, userId, name);
break;
default:
msg = new UserConnectedToGlobalAudio2x(voiceConf, userId, name);
}
return msg.toJson();
}
Messaging.prototype.generateUserDisconnectedFromGlobalAudioMessage =
function(voiceConf, userId, name) {
let msg;
switch (Constants.COMMON_MESSAGE_VERSION) {
case "1.x":
msg = new UserDisconnectedFromGlobalAudio(voiceConf, userId, name);
break;
default:
msg = new UserDisconnectedFromGlobalAudio2x(voiceConf, userId, name);
}
return msg.toJson();
} |
<<<<<<<
// Deskshare's whiteboard variables
var deskshareWidth = 1280.0;
var deskshareHeight = 720.0;
var widthScale = 1;
var heightScale = 1;
var widthTranslate = 0;
var heightTranslate = 0;
function clearTransform() {
widthScale = 1;
heightScale = 1;
widthTranslate = 0;
heightTranslate = 0;
}
function setDeskshareScale(viewBox) {
widthScale = viewBox[2] / deskshareWidth;
heightScale = viewBox[3] / deskshareHeight;
}
function setDeskshareTranslate(viewBox) {
widthTranslate = (deskshareWidth - viewBox[2]) / 2;
heightTranslate = (deskshareHeight - viewBox[3]) / 2;
}
// Deskshare viewBox has the information to transform the canvas to place it above the video
function adaptViewBoxToDeskshare(viewBox) {
var vb = viewBox.split(" ");
setDeskshareScale(vb);
setDeskshareTranslate(vb);
vb[0] = 0;
vb[1] = 0;
vb[2] = deskshareWidth;
vb[3] = deskshareHeight;
return vb.join(" ");
}
// Transform canvas to fit the different deskshare video sizes
function setTransform(time) {
if (mustShowDesktopVideo(time)) {
var canvasId = "canvas" + current_image.substr(5);
var canvas = svgobj.contentDocument ? svgobj.contentDocument.getElementById(canvasId) : svgobj.getSVGDocument('svgfile').getElementById(canvasId);
if (canvas !== undefined) {
var scale = "scale(" + widthScale.toString() + ", " + heightScale.toString() + ")";
var translate = "translate(" + widthTranslate.toString() + ", " + heightTranslate.toString() + ")";
var transform = translate + " " + scale;
canvas.setAttribute('transform', transform);
}
} else {
clearTransform();
}
}
function removeLoadingScreen() {
spinner.stop();
$("#playback-content").css('visibility','visible');
$("#loading-recording").css('visibility','hidden');
$("#loading-recording").css('height','0');
$("#load-recording-msg").css('display','none');
}
=======
>>>>>>>
// Deskshare's whiteboard variables
var deskshareWidth = 1280.0;
var deskshareHeight = 720.0;
var widthScale = 1;
var heightScale = 1;
var widthTranslate = 0;
var heightTranslate = 0;
function clearTransform() {
widthScale = 1;
heightScale = 1;
widthTranslate = 0;
heightTranslate = 0;
}
function setDeskshareScale(viewBox) {
widthScale = viewBox[2] / deskshareWidth;
heightScale = viewBox[3] / deskshareHeight;
}
function setDeskshareTranslate(viewBox) {
widthTranslate = (deskshareWidth - viewBox[2]) / 2;
heightTranslate = (deskshareHeight - viewBox[3]) / 2;
}
// Deskshare viewBox has the information to transform the canvas to place it above the video
function adaptViewBoxToDeskshare(viewBox) {
var vb = viewBox.split(" ");
setDeskshareScale(vb);
setDeskshareTranslate(vb);
vb[0] = 0;
vb[1] = 0;
vb[2] = deskshareWidth;
vb[3] = deskshareHeight;
return vb.join(" ");
}
// Transform canvas to fit the different deskshare video sizes
function setTransform(time) {
if (mustShowDesktopVideo(time)) {
var canvasId = "canvas" + current_image.substr(5);
var canvas = svgobj.contentDocument ? svgobj.contentDocument.getElementById(canvasId) : svgobj.getSVGDocument('svgfile').getElementById(canvasId);
if (canvas !== undefined) {
var scale = "scale(" + widthScale.toString() + ", " + heightScale.toString() + ")";
var translate = "translate(" + widthTranslate.toString() + ", " + heightTranslate.toString() + ")";
var transform = translate + " " + scale;
canvas.setAttribute('transform', transform);
}
} else {
clearTransform();
}
} |
<<<<<<<
let currentUserId = Auth.userID;
=======
let currentUserId = auth.getUser();
let currentUser = Users.findOne({ 'user.userid': currentUserId });
>>>>>>>
let currentUserId = Auth.userID;
let currentUser = Users.findOne({ 'user.userid': currentUserId }); |
<<<<<<<
return bridge.exitAudio();
=======
this.isEchoTest = false;
return this.bridge.exitAudio();
>>>>>>>
this.isEchoTest = false;
return bridge.exitAudio(); |
<<<<<<<
if (message.sender && message.sender.id !== SYSTEM_CHAT_TYPE) {
const sender = Users.findOne({ userId: message.sender.id }, { fields: { role: 1 } });
=======
if (message.sender && message.sender !== SYSTEM_CHAT_TYPE) {
const sender = Users.findOne({ userId: message.sender },
{
fields: {
color: 1,
role: 1,
name: 1,
avatar: 1,
connectionStatus: 1,
},
});
const {
color,
role,
name,
avatar,
connectionStatus,
} = sender;
>>>>>>>
if (message.sender && message.sender.id !== SYSTEM_CHAT_TYPE) {
const sender = Users.findOne({ userId: message.sender.id }, { fields: { avatar: 1, role: 1 } });
<<<<<<<
color: message.color,
isModerator: sender?.role === ROLE_MODERATOR,
name: message.sender.name,
isOnline: !!sender,
=======
color,
isModerator: role === ROLE_MODERATOR,
name,
avatar,
isOnline: connectionStatus === CONNECTION_STATUS_ONLINE,
>>>>>>>
avatar: sender?.avatar,
color: message.color,
isModerator: sender?.role === ROLE_MODERATOR,
name: message.sender.name,
isOnline: !!sender, |
<<<<<<<
import VertoBridge from '/imports/api/audio/client/bridge/verto';
=======
import {vertoWatchVideo} from '/imports/api/verto';
>>>>>>>
import VertoBridge from '/imports/api/audio/client/bridge/verto';
<<<<<<<
const vertoBridge = new VertoBridge();
=======
>>>>>>>
const vertoBridge = new VertoBridge();
<<<<<<<
// vertoBridge.exitVoiceCall();
=======
// references a functiion in the global namespace inside verto_extension.js
// that we load dynamically
vertoExitVideo();
>>>>>>>
// references a functiion in the global namespace inside verto_extension.js
// that we load dynamically
vertoBridge.vertoExitVideo();
<<<<<<<
vertoBridge.vertoWatchVideo();
=======
// references a functiion in the global namespace inside verto_extension.js
// that we load dynamically
vertoWatchVideo();
>>>>>>>
// references a functiion in the global namespace inside verto_extension.js
// that we load dynamically
vertoBridge.vertoWatchVideo(); |
<<<<<<<
import handleUserEjected from './handlers/userEjected';
=======
import handleChangeRole from './handlers/changeRole';
>>>>>>>
import handleUserEjected from './handlers/userEjected';
import handleChangeRole from './handlers/changeRole';
<<<<<<<
RedisPubSub.on('GuestApprovedEvtMsg', handleGuestApproved);
RedisPubSub.on('UserEjectedFromMeetingEvtMsg', handleUserEjected);
=======
RedisPubSub.on('GuestApprovedEvtMsg', handleGuestApproved);
RedisPubSub.on('UserRoleChangedEvtMsg', handleChangeRole);
>>>>>>>
RedisPubSub.on('GuestApprovedEvtMsg', handleGuestApproved);
RedisPubSub.on('UserEjectedFromMeetingEvtMsg', handleUserEjected);
RedisPubSub.on('UserRoleChangedEvtMsg', handleChangeRole); |
<<<<<<<
getBreakoutUserIsIn,
=======
isUserInBreakoutRoom,
>>>>>>>
getBreakoutUserIsIn,
isUserInBreakoutRoom, |
<<<<<<<
import {clientConfig} from '/config';
import {getVoiceBridge} from '/imports/api/phone';
import {getInStorage} from '/imports/ui/components/app/service';
import Users from '/imports/api/users';
let vertoManager = null;
function vertoInitialize() {
console.log('verto initialized');
vertoManager = new VertoManager();
}
=======
import Auth from '/imports/ui/services/auth';
import { clientConfig } from '/config';
import { getVoiceBridge } from '/imports/api/phone';
>>>>>>>
import {getInStorage} from '/imports/ui/components/app/service';
import Users from '/imports/api/users';
import Auth from '/imports/ui/services/auth';
import { clientConfig } from '/config';
import { getVoiceBridge } from '/imports/api/phone';
let vertoManager = null;
function vertoInitialize() {
console.log('verto initialized');
vertoManager = new VertoManager();
}
<<<<<<<
const uid = getInStorage('userID');
console.log(Users.find().fetch());
=======
const uid = Auth.getUser();
>>>>>>>
const uid = Auth.getUser(); |
<<<<<<<
import clearSlides from '/imports/api/slides/server/modifiers/clearSlides';
import { clearPollCollection } from '/imports/api/polls/server/modifiers/clearPollCollection';
=======
import { clearSlidesCollection } from '/imports/api/slides/server/modifiers/clearSlidesCollection';
import clearPoll from '/imports/api/polls/server/modifiers/clearPoll';
>>>>>>>
import clearSlides from '/imports/api/slides/server/modifiers/clearSlides';
import clearPoll from '/imports/api/polls/server/modifiers/clearPoll';
<<<<<<<
clearPollCollection(meetingId);
clearPresentations(meetingId);
=======
clearPoll(meetingId);
clearPresentationsCollection(meetingId);
>>>>>>>
clearPresentations(meetingId);
clearPoll(meetingId); |
<<<<<<<
let role = 'view';
let shared = false;
let iceQueue = {};
if (message.role == 'shared') {
role = 'share';
shared = true;
}
=======
let role = message.role? message.role : 'any';
let cameraId = message.cameraId;
>>>>>>>
let role = message.role? message.role : 'any';
let cameraId = message.cameraId;
let shared = false;
let iceQueue = {};
if (message.role == 'share') {
shared = true;
}
<<<<<<<
if (message.cameraId && sessions[sessionId][message.cameraId]) {
if (shared) {
video = sessions[sessionId].shared;
} else {
video = sessions[sessionId][message.cameraId];
}
=======
logAvailableSessions();
switch (role) {
case 'share':
if (message.cameraId && typeof sessions[sessionId][message.cameraId+'shared'] !== 'undefined' && sessions[sessionId][message.cameraId+'shared']) {
video = sessions[sessionId][message.cameraId+'shared'];
}
break;
case 'viewer':
if (message.cameraId && sessions[sessionId][message.cameraId]) {
video = sessions[sessionId][message.cameraId];
}
case 'any':
if (message.cameraId && typeof sessions[sessionId][message.cameraId+'shared'] !== 'undefined' && sessions[sessionId][message.cameraId+'shared']) {
video = sessions[sessionId][message.cameraId+'shared'];
}
else if (message.cameraId && sessions[sessionId][message.cameraId]) {
video = sessions[sessionId][message.cameraId];
}
break;
>>>>>>>
logAvailableSessions();
switch (role) {
case 'share':
if (message.cameraId && typeof sessions[sessionId][message.cameraId+'shared'] !== 'undefined' && sessions[sessionId][message.cameraId+'shared']) {
video = sessions[sessionId][message.cameraId+'shared'];
}
break;
case 'viewer':
if (message.cameraId && sessions[sessionId][message.cameraId]) {
video = sessions[sessionId][message.cameraId];
}
case 'any':
if (message.cameraId && typeof sessions[sessionId][message.cameraId+'shared'] !== 'undefined' && sessions[sessionId][message.cameraId+'shared']) {
video = sessions[sessionId][message.cameraId+'shared'];
}
else if (message.cameraId && sessions[sessionId][message.cameraId]) {
video = sessions[sessionId][message.cameraId];
}
break;
<<<<<<<
if (video && message.cameraId == video.id) {
video.stop(sessionId);
=======
if (video) {
stopSession(sessionId, role, cameraId);
>>>>>>>
if (video) {
stopSession(sessionId, role, cameraId);
<<<<<<<
console.log(" [iceCandidate] Queueing ice candidate for later in video " + message.cameraId);
if (!iceQueue[message.cameraId]) {
iceQueue[message.cameraId] = [];
}
iceQueue[message.cameraId].push(message.candidate);
=======
console.log(" [iceCandidate] Why is there no video on ICE CANDIDATE? " + role + " " + cameraId + " " + sessionId);
>>>>>>>
console.log(" [iceCandidate] Queueing ice candidate for later in video " + message.cameraId);
if (!iceQueue[message.cameraId]) {
iceQueue[message.cameraId] = [];
}
iceQueue[message.cameraId].push(message.candidate);
<<<<<<<
let stopSession = function(sessionId, videoId) {
console.log(' [VideoManager/x] Stopping session ' + sessionId);
if (sessions == null || sessionId == null || sessions[sessionId] == null) {
return;
}
=======
let stopSession = async function(sessionId, role, cameraId) {
console.log(' [VideoManager/x] Stopping session ' + sessionId + " with role " + role + " for camera " + cameraId);
>>>>>>>
let stopSession = async function(sessionId, role, cameraId) {
console.log(' [VideoManager/x] Stopping session ' + sessionId + " with role " + role + " for camera " + cameraId);
<<<<<<<
sessions[sessionId] = null;
delete sessions[sessionId];
=======
>>>>>>> |
<<<<<<<
createMediaElement (roomId, type, options) {
=======
async createMediaElement (roomId, type, options = {}) {
>>>>>>>
createMediaElement (roomId, type, options = {}) {
<<<<<<<
return new Promise(async (resolve, reject) => {
try {
const pipeline = await this._getMediaPipeline(roomId);
const mediaElement = await this._createElement(pipeline, type, options);
this._mediaPipelines[roomId].activeElements++;
resolve(mediaElement.id);
}
catch (err) {
reject(this._handleError(err));
}
});
=======
try {
const pipeline = await this._getMediaPipeline(roomId);
const mediaElement = await this._createElement(pipeline, type, options);
if (typeof mediaElement.setKeyframeInterval === 'function' && options.keyframeInterval) {
Logger.debug("[mcs-media] Creating element with keyframe interval set to", options.keyframeInterval);
mediaElement.setKeyframeInterval(options.keyframeInterval);
}
this._mediaPipelines[roomId].activeElements++;
return Promise.resolve(mediaElement.id);
}
catch (err) {
return Promise.reject(err);
}
>>>>>>>
return new Promise(async (resolve, reject) => {
try {
const pipeline = await this._getMediaPipeline(roomId);
const mediaElement = await this._createElement(pipeline, type, options);
if (typeof mediaElement.setKeyframeInterval === 'function' && options.keyframeInterval) {
Logger.debug("[mcs-media] Creating element with keyframe interval set to", options.keyframeInterval);
mediaElement.setKeyframeInterval(options.keyframeInterval);
}
this._mediaPipelines[roomId].activeElements++;
resolve(mediaElement.id);
}
catch (err) {
reject(this._handleError(err));
}
}); |
<<<<<<<
this.bbbGW.publish(JSON.stringify({
connectionId: this.sessionId,
type: 'video',
role: this.role,
id : 'playStart',
cameraId: this.id,
}), C.FROM_VIDEO);
// Record the video stream if it's the original being shared
if (config.get('recordWebcams') && this.shared) {
this.startRecording();
}
=======
>>>>>>>
// Record the video stream if it's the original being shared
if (config.get('recordWebcams') && this.shared) {
this.startRecording();
} |
<<<<<<<
=======
if (this.reconnectOngoing) {
this.reconnectOngoing = false;
clearTimeout(this.reconnectTimeout);
}
resolve(this.callback({ status: this.baseCallStates.started }));
>>>>>>>
if (this.reconnectOngoing) {
this.reconnectOngoing = false;
clearTimeout(this.reconnectTimeout);
} |
<<<<<<<
var archive = archiver(this.format || 'zip', this.archiverOpts || {})
=======
var self = this
var archive = archiver('zip')
>>>>>>>
var self = this
var archive = archiver(this.format || 'zip', this.archiverOpts || {}) |
<<<<<<<
getGroupChatPrivate,
=======
getEmojiList: () => EMOJI_STATUSES,
getEmoji: () => Users.findOne({ userId: Auth.userID }).emoji,
>>>>>>>
getGroupChatPrivate,
getEmojiList: () => EMOJI_STATUSES,
getEmoji: () => Users.findOne({ userId: Auth.userID }).emoji, |
<<<<<<<
import { redisPubSub } from '/imports/startup/server';
import { BREAK_LINE, CARRIAGE_RETURN, NEW_LINE } from '/imports/utils/lineEndings';
import WhiteboardMultiUser from '/imports/api/2.0/whiteboard-multi-user/';
export function appendMessageHeader(eventName, messageObj) {
const header = {
timestamp: new Date().getTime(),
name: eventName,
};
messageObj.header = header;
return messageObj;
}
=======
>>>>>>>
import WhiteboardMultiUser from '/imports/api/2.0/whiteboard-multi-user/'; |
<<<<<<<
let session = new SdpSession(this.emitter, sdp, this.roomId, type, adapter, name);
this.emitter.emit(C.EVENT.NEW_SESSION+this.id, session.id);
session.on("SESSION_STOPPED", (sessId) => {
Logger.info("[mcs-sfu-user] Session ", sessId, "stopped, cleaning it...");
=======
let session = new SdpSession(this.emitter, sdp, this.roomId, type);
session.emitter.on(C.EVENT.MEDIA_SESSION_STOPPED, (sessId) => {
>>>>>>>
let session = new SdpSession(this.emitter, sdp, this.roomId, type, adapter, name);
session.emitter.on(C.EVENT.MEDIA_SESSION_STOPPED, (sessId) => { |
<<<<<<<
const { meetingId, userId } = tokenValidation;
Logger.debug(`Publishing local settings for user=${userId}`);
=======
Logger.debug('Publishing local settings', { requesterUserId });
>>>>>>>
const { meetingId, userId } = tokenValidation;
Logger.debug('Publishing local settings', { userId }); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.