conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
if (res&&res.result) {
//todo 签名成功
this.successAlert('签名成功.')
=======
if (res.result) {
// 签名成功 transaction_signature_muti_successful
this.successAlert(intl.formatMessage({
id:"transaction_signature_muti_successful"
}))
>>>>>>>
if (res&&res.result) {
// 签名成功 transaction_signature_muti_successful
this.successAlert(intl.formatMessage({
id:"transaction_signature_muti_successful"
})) |
<<<<<<<
var constraints = getConstraints();
//prepare outgoing call
=======
//prepare outgoing call
>>>>>>>
var constraints = getConstraints();
<<<<<<<
localVideoDisplay: localVideo,
remoteVideoDisplay: remoteVideo,
constraints: constraints
=======
localVideoDisplay: localVideo,
remoteVideoDisplay: remoteVideo
>>>>>>>
remoteVideoDisplay: remoteVideo,
localVideoDisplay: localVideo,
constraints: constraints
<<<<<<<
var constraints = getConstraints();
=======
>>>>>>>
var constraints = getConstraints();
<<<<<<<
inCall.setAudioOutputId($('#speakerList').find(":selected").val());
=======
inCall.setAudioOutputId($('#audioOutput').val());
>>>>>>>
inCall.setAudioOutputId($('#speakerList').find(":selected").val());
<<<<<<<
$('[id^=switch]').prop('disabled', true);
=======
clearInterval(statIntervalId);
>>>>>>>
clearInterval(statIntervalId);
$('[id^=switch]').prop('disabled', true); |
<<<<<<<
fill_a_valid_ledger_note:'Please confirm that the Transactions Data option in the ledger settings is allowed, otherwise you cannot send notes',
enter_up_to_50_characters:'Enter up to 50 characters',
=======
address_token_less_than_10:'tokens with a value less than 10 TRX',
address_total_tron_power:'Total TRON Power',
address_total_tron_power_remain:'Available TORN Power',
address_total_tron_power_used:'Used TRON Power'
>>>>>>>
fill_a_valid_ledger_note:'Please confirm that the Transactions Data option in the ledger settings is allowed, otherwise you cannot send notes',
enter_up_to_50_characters:'Enter up to 50 characters',
address_token_less_than_10:'tokens with a value less than 10 TRX',
address_total_tron_power:'Total TRON Power',
address_total_tron_power_remain:'Available TORN Power',
address_total_tron_power_used:'Used TRON Power' |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
//
d3.json('data/points1.json', function(data) {
moz_chart({
title: "First Scatter",
description: "Example of a scatterplot - wip",
data: data,
chart_type: 'point',
width: trunk.width*2,
height: trunk.height*2,
right: trunk.right,
target: 'div#scatter1',
xax_format: function(f) {
var pf = d3.formatPrefix(f);
return pf.scale(f) + pf.symbol;
},
x_accessor: 'x',
y_accessor: 'y'
});
});
})
>>>>>>>
d3.json('data/points1.json', function(data) {
moz_chart({
title: "First Scatter",
description: "Example of a scatterplot - wip",
data: data,
chart_type: 'point',
width: trunk.width*2,
height: trunk.height*2,
right: trunk.right,
target: 'div#scatter1',
xax_format: function(f) {
var pf = d3.formatPrefix(f);
return pf.scale(f) + pf.symbol;
},
x_accessor: 'x',
y_accessor: 'y'
});
}); |
<<<<<<<
=======
}
>>>>>>>
}
<<<<<<<
for(var i=0; i<args.data.length; i++) {
args.data[i].sort(function(a, b) {
return a[args.x_accessor] - b[args.x_accessor];
});
}
=======
if (args.chart_type == 'line'){
for(var i=0; i<args.data.length; i++) {
args.data[i].sort(function(a, b) {
return a[args.x_accessor] - b[args.x_accessor];
});
}
}
>>>>>>>
if (args.chart_type == 'line'){
for(var i=0; i<args.data.length; i++) {
args.data[i].sort(function(a, b) {
return a[args.x_accessor] - b[args.x_accessor];
});
}
} |
<<<<<<<
var Grunticon = require( 'grunticon-lib' );
=======
>>>>>>>
<<<<<<<
var grunticon = new Grunticon( files, output, config );
grunticon.process(done);
=======
var gicon = new Grunticon(files, config.dest, config);
gicon.process(function( result ) {
done( result );
});
>>>>>>>
var gicon = new Grunticon(files, output, config);
gicon.process( done ); |
<<<<<<<
if (!url || typeof url !== 'string') {
return null;
}
url = url.trim();
var pattern = parsePattern(url);
=======
if (url === '' || url === null || url === undefined) {
return null;
}
debugger;
var pattern;
try {
pattern = parsePattern(url);
} catch (e) {
return null;
}
>>>>>>>
if (!url || typeof url !== 'string') {
return null;
}
url = url.trim();
var pattern = parsePattern(url);
<<<<<<<
if (!urlIsGlobalExcluded(tab.url)) {
=======
if (!urlIsGlobalExcluded(updatedInfo.url)) {
>>>>>>>
if (!urlIsGlobalExcluded(tab.url)) {
if (!urlIsGlobalExcluded(updatedInfo.url)) { |
<<<<<<<
//if(0 < tmp){
// return;
//}
root.on('get', msg);
=======
if(0 < tmp){
return;
}
cat.on('get', at);
}
}());
;(function(){
Gun.on.ask = function(cb, as){
if(!this.on){ return }
var id = text_rand(9);
if(cb){
var to = this.on(id, cb, as), lack = (this.gun._.opt.lack || 9000);
to.err = setTimeout(function(){
to.next({err: "Error: No ACK received yet."});
to.off();
}, lack < 1000 ? 1000 : lack);
}
return id;
}
Gun.on.ack = function(at, reply){
if(!at || !reply || !this.on){ return }
var id = at['#'] || at, tmp = (this.tag||empty)[id];
if(!tmp){ return }
this.on(id, reply);
clearTimeout(tmp.err);
return true;
>>>>>>>
//if(0 < tmp){
// return;
//}
root.on('get', msg);
<<<<<<<
function output(msg){
var put, get, at = this.as, back = at.back._, root = at.root._;
if(!msg.gun){ msg.gun = at.gun }
this.to.next(msg);
if(get = msg.get){
/*if(u !== at.put){
at.on('in', at);
return;
}*/
if(get['#'] || at.soul){
get['#'] = get['#'] || at.soul;
msg['#'] || (msg['#'] = root.opt.uuid());
back = (root.gun.get(get['#'])._);
if(!(get = get['.'])){
if(obj_has(back, 'put')){
//if(u !== back.put){
back.on('in', back);
=======
function output(at){
var cat = this.as, gun = cat.gun, root = gun.back(-1), put, get, now, tmp;
if(!at.gun){
at.gun = gun;
}
this.to.next(at);
if(get = at.get){
if(tmp = get[_soul]){
tmp = (root.get(tmp)._);
if(obj_has(get, _field)){
if(obj_has(put = tmp.put, get = get[_field])){
tmp.on('in', {get: tmp.get, put: Gun.state.to(put, get), gun: tmp.gun}); // TODO: Ugly, clean up? Simplify all these if conditions (without ruining the whole chaining API)?
}
} else
if(obj_has(tmp, 'put')){
//if(u !== tmp.put){
tmp.on('in', tmp);
}
} else {
if(obj_has(get, _field)){
get = get[_field];
var next = get? (gun.get(get)._) : cat;
// TODO: BUG! Handle plural chains by iterating over them.
//if(obj_has(next, 'put')){ // potentially incorrect? Maybe?
if(u !== next.put){ // potentially incorrect? Maybe?
//next.tag['in'].last.next(next);
next.on('in', next);
return;
}
if(obj_has(cat, 'put')){
//if(u !== cat.put){
var val = cat.put, rel;
if(rel = Gun.node.soul(val)){
val = Gun.val.rel.ify(rel);
}
if(rel = Gun.val.rel.is(val)){
if(!at.gun._){ return }
(at.gun._).on('out', {
get: tmp = {'#': rel, '.': get, gun: at.gun},
'#': root._.ask(ack, tmp),
gun: at.gun
});
return;
}
if(u === val || Gun.val.is(val)){
if(!at.gun._){ return }
(at.gun._).on('in', {
get: get,
gun: at.gun
});
return;
}
} else
if(cat.map){
obj_map(cat.map, function(proxy){
proxy.at.on('in', proxy.at);
});
};
if(cat.soul){
if(!at.gun._){ return }
(at.gun._).on('out', {
get: tmp = {'#': cat.soul, '.': get, gun: at.gun},
'#': root._.ask(ack, tmp),
gun: at.gun
});
return;
}
if(cat.get){
if(!cat.back._){ return }
(cat.back._).on('out', {
get: obj_put({}, _field, cat.get),
gun: gun
});
return;
}
at = obj_to(at, {get: {}});
} else {
if(obj_has(cat, 'put')){
//if(u !== cat.put){
cat.on('in', cat);
} else
if(cat.map){
obj_map(cat.map, function(proxy){
proxy.at.on('in', proxy.at);
});
}
if(cat.ack >= 0){
if(!obj_has(cat, 'put')){ // u !== cat.put instead?
//if(u !== cat.put){
return;
}
}
cat.ack = -1;
if(cat.soul){
cat.on('out', {
get: tmp = {'#': cat.soul, gun: cat.gun},
'#': root._.ask(ack, tmp),
gun: cat.gun
});
return;
>>>>>>>
function output(msg){
var put, get, at = this.as, back = at.back._, root = at.root._;
if(!msg.gun){ msg.gun = at.gun }
this.to.next(msg);
if(get = msg.get){
/*if(u !== at.put){
at.on('in', at);
return;
}*/
if(get['#'] || at.soul){
get['#'] = get['#'] || at.soul;
msg['#'] || (msg['#'] = root.opt.uuid());
back = (root.gun.get(get['#'])._);
if(!(get = get['.'])){
if(obj_has(back, 'put')){
//if(u !== back.put){
back.on('in', back);
<<<<<<<
function stun(cb){
if(cb){ cb() }
return;
var as = this;
if(!as.ref){ return }
if(cb){
as.after = as.ref._.tag;
as.now = as.ref._.tag = {};
cb();
return;
}
if(as.after){
as.ref._.tag = as.after;
}
}
=======
function stun(cb){
if(cb){ cb() }
return;
var as = this;
if(!as.ref){ return }
if(cb){
as.after = as.ref._.tag;
as.now = as.ref._.tag = {};
cb();
return;
}
if(as.after){
as.ref._.tag = as.after;
}
}
>>>>>>>
function stun(cb){
if(cb){ cb() }
return;
var as = this;
if(!as.ref){ return }
if(cb){
as.after = as.ref._.tag;
as.now = as.ref._.tag = {};
cb();
return;
}
if(as.after){
as.ref._.tag = as.after;
}
}
<<<<<<<
Gun.on('opt', function(root){
this.to.next(root);
var opt = root.opt;
if(root.once){ return }
if(false === opt.WebSocket){ return }
=======
Gun.on('opt', function(ctx){
this.to.next(ctx);
var opt = ctx.opt;
if(ctx.once){ return }
if(!websocket || false === opt.WebSocket){ return }
>>>>>>>
Gun.on('opt', function(root){
this.to.next(root);
var opt = root.opt;
if(root.once){ return }
if(!websocket || false === opt.WebSocket){ return } |
<<<<<<<
var files = filesToProcess(eslint);
if (files.length) {
grunt.config.set('eslint.validate', files);
validate.push('eslint:validate');
=======
if (filesToProcess(eslint)) {
validate.push(eslintName + ':validate');
>>>>>>>
var files = filesToProcess(eslint);
if (files.length) {
grunt.config.set('eslint.validate', files);
validate.push(eslintName + ':validate');
<<<<<<<
if (filesToProcess(eslint.src).length) {
analyze.push('eslint:analyze');
=======
if (filesToProcess(eslint.src)) {
analyze.push(eslintName + ':analyze');
>>>>>>>
if (filesToProcess(eslint.src).length) {
analyze.push(eslintName + ':analyze'); |
<<<<<<<
WMFJS.GDIContext.prototype.polyPolygon = function(polyPolygon) {
console.log("[gdi] polyPolygon: polyPolygon=" + JSON.stringify(polyPolygon) + " with pen " + this.state.selected.pen.toString() + " and brush " + this.state.selected.brush.toString());
this._pushGroup();
var cnt = polyPolygon._polygons.length;
for (var i = 0; i < cnt; i++)
this.polygon(polyPolygon._polygons[i]);
};
=======
WMFJS.GDIContext.prototype.polyline = function(points) {
console.log("[gdi] polyline: points=" + points + " with pen " + this.state.selected.pen.toString() + " and brush " + this.state.selected.brush.toString());
var pts = [];
for (var i = 0; i < points.length; i++) {
var point = points[i];
pts.push([this._todevX(point.x), this._todevY(point.y)]);
}
console.log("[gdi] polyline: TRANSLATED: pts=" + pts);
this._pushGroup();
var opts = {
fill: this._getFill(),
stroke: "#" + this.state.selected.pen.color.toHex(), // TODO: pen style
strokeWidth: this._todevW(this.state.selected.pen.width.x) // TODO: is .y ever used?
}
this._svg.polyline(this.state._svggroup, pts, opts);
};
>>>>>>>
WMFJS.GDIContext.prototype.polyPolygon = function(polyPolygon) {
console.log("[gdi] polyPolygon: polyPolygon=" + JSON.stringify(polyPolygon) + " with pen " + this.state.selected.pen.toString() + " and brush " + this.state.selected.brush.toString());
this._pushGroup();
var cnt = polyPolygon._polygons.length;
for (var i = 0; i < cnt; i++)
this.polygon(polyPolygon._polygons[i]);
};
WMFJS.GDIContext.prototype.polyline = function(points) {
console.log("[gdi] polyline: points=" + points + " with pen " + this.state.selected.pen.toString() + " and brush " + this.state.selected.brush.toString());
var pts = [];
for (var i = 0; i < points.length; i++) {
var point = points[i];
pts.push([this._todevX(point.x), this._todevY(point.y)]);
}
console.log("[gdi] polyline: TRANSLATED: pts=" + pts);
this._pushGroup();
var opts = {
fill: this._getFill(),
stroke: "#" + this.state.selected.pen.color.toHex(), // TODO: pen style
strokeWidth: this._todevW(this.state.selected.pen.width.x) // TODO: is .y ever used?
}
this._svg.polyline(this.state._svggroup, pts, opts);
};
<<<<<<<
case WMFJS.GDI.RecordType.META_SETPOLYFILLMODE:
var polyfillmode = reader.readUint16();
this._records.push(
(function(polyfillmode) {
return function(gdi) {
gdi.setPolyFillMode(polyfillmode);
}
})(polyfillmode)
);
break;
case WMFJS.GDI.RecordType.META_POLYPOLYGON:
var polyPolygon = new WMFJS.PolyPolygon(reader);
this._records.push(
(function(polyPolygon) {
return function(gdi) {
gdi.polyPolygon(polyPolygon);
}
})(polyPolygon)
);
break;
=======
case WMFJS.GDI.RecordType.META_POLYLINE:
var cnt = reader.readInt16();
var points = [];
while (cnt > 0) {
points.push(new WMFJS.PointS(reader));
cnt--;
}
this._records.push(
(function(points) {
return function(gdi) {
gdi.polyline(points);
}
})(points)
);
break;
>>>>>>>
case WMFJS.GDI.RecordType.META_SETPOLYFILLMODE:
var polyfillmode = reader.readUint16();
this._records.push(
(function(polyfillmode) {
return function(gdi) {
gdi.setPolyFillMode(polyfillmode);
}
})(polyfillmode)
);
break;
case WMFJS.GDI.RecordType.META_POLYPOLYGON:
var polyPolygon = new WMFJS.PolyPolygon(reader);
this._records.push(
(function(polyPolygon) {
return function(gdi) {
gdi.polyPolygon(polyPolygon);
}
})(polyPolygon)
);
break;
case WMFJS.GDI.RecordType.META_POLYLINE:
var cnt = reader.readInt16();
var points = [];
while (cnt > 0) {
points.push(new WMFJS.PointS(reader));
cnt--;
}
this._records.push(
(function(points) {
return function(gdi) {
gdi.polyline(points);
}
})(points)
);
break; |
<<<<<<<
'<li class="ng-toast__message {{message.classes}}">' +
'<div class="alert alert-{{message.alertClass}}" ' +
'ng-class="{\'alert-dismissable\': message.dismissButton}">' +
=======
'<li class="ng-toast__message">' +
'<div class="alert alert-{{message.className}}" ' +
'ng-class="{\'alert-dismissible\': message.dismissButton}">' +
>>>>>>>
'<li class="ng-toast__message {{message.classes}}">' +
'<div class="alert alert-{{message.alertClass}}" ' +
'ng-class="{\'alert-dismissible\': message.dismissButton}">' + |
<<<<<<<
'<li class="ng-toast__message {{message.classes}}">' +
'<div class="alert alert-{{message.alertClass}}" ' +
'ng-class="{\'alert-dismissable\': message.dismissButton}">' +
=======
'<li class="ng-toast__message">' +
'<div class="alert alert-{{message.className}}" ' +
'ng-class="{\'alert-dismissible\': message.dismissButton}">' +
>>>>>>>
'<li class="ng-toast__message {{message.classes}}">' +
'<div class="alert alert-{{message.alertClass}}" ' +
'ng-class="{\'alert-dismissible\': message.dismissButton}">' + |
<<<<<<<
{
"name": "Udemy Courses",
"shadow": "0 0 1px 1px rgba(20,23,28,.1), 0 3px 1px 0 rgba(20,23,28,.1);",
"border": "0"
}
=======
{
"name": "Netflix Login Modal",
"shadow": "0 0 8px 0 rgba(0,0,0,.32)",
"border": "0"
},
>>>>>>>
{
"name": "Udemy Courses",
"shadow": "0 0 1px 1px rgba(20,23,28,.1), 0 3px 1px 0 rgba(20,23,28,.1);",
"border": "0"
},
{
"name": "Netflix Login Modal",
"shadow": "0 0 8px 0 rgba(0,0,0,.32)",
"border": "0"
}, |
<<<<<<<
{
"name": "AirBnb Landing Page Card Shadow",
"shadow": "0 16px 40px rgba(0,0,0,0.12)",
"border": '0'
}
=======
{
"name": "Aisha Aqeel",
"shadow": "5px 10px #888888",
"border": "1px solid"
},
>>>>>>>
{
"name": "AirBnb Landing Page Card Shadow",
"shadow": "0 16px 40px rgba(0,0,0,0.12)",
"border": '0'
},
{
"name": "Aisha Aqeel",
"shadow": "5px 10px #888888",
"border": "1px solid"
}, |
<<<<<<<
{
"name": "Google Search Recommendation",
"shadow": "0 4px 6px 0 rgba(32,33,36,0.28)",
"border":"0"
}
=======
{
"name": "gaana login box shadow",
"shadow": "1px 0px 11px 6px rgba(0,0,0,0.49)",
"border": "0"
},
{
"name": "AWS Solutions Box",
"shadow": "0 1px 3px 0 rgba(0,0,0,.3), 0 0 0 1px rgba(0,0,0,.04)",
"border": "1px solid #232f3e"
},
>>>>>>>
{
"name": "Google Search Recommendation",
"shadow": "0 4px 6px 0 rgba(32,33,36,0.28)",
"border":"0"
},
{
"name": "gaana login box shadow",
"shadow": "1px 0px 11px 6px rgba(0,0,0,0.49)",
"border": "0"
},
{
"name": "AWS Solutions Box",
"shadow": "0 1px 3px 0 rgba(0,0,0,.3), 0 0 0 1px rgba(0,0,0,.04)",
"border": "1px solid #232f3e"
}, |
<<<<<<<
{
"name": "Floating Button",
"shadow": "0px 17px 10px -10px rgba(0,0,0,0.4)",
"border": "1px solid"
},
=======
{
"name": "Inset shadow",
"shadow": "inset 0px 0px 38px -24px",
"border": "0"
},
{
"name": "Inset Primary",
"shadow": "inset 0px 0px 38px -24px #0275d8",
"border": "0"
},
{
"name": "Inset Success",
"shadow": "inset 0px 0px 38px -24px #5cb85c",
"border": "0"
},
{
"name": "Inset Warning",
"shadow": "inset 0px 0px 38px -24px #f0ad4e",
"border": "0"
},
{
"name": "Inset Danger",
"shadow": "inset 0px 0px 38px -24px #d9534f",
"border": "0"
},
>>>>>>>
{
"name": "Floating Button",
"shadow": "0px 17px 10px -10px rgba(0,0,0,0.4)",
"border": "1px solid"
},
{
"name": "Inset shadow",
"shadow": "inset 0px 0px 38px -24px",
"border": "0"
},
{
"name": "Inset Primary",
"shadow": "inset 0px 0px 38px -24px #0275d8",
"border": "0"
},
{
"name": "Inset Success",
"shadow": "inset 0px 0px 38px -24px #5cb85c",
"border": "0"
},
{
"name": "Inset Warning",
"shadow": "inset 0px 0px 38px -24px #f0ad4e",
"border": "0"
},
{
"name": "Inset Danger",
"shadow": "inset 0px 0px 38px -24px #d9534f",
"border": "0"
}, |
<<<<<<<
if (process.env.UNFOLLOW_UPDATES) {
await unfollowGiveaways(page);
}
=======
} else if (winnerPromoCard.length > 0) {
await enterWinnerPromoCardGiveaway(page);
>>>>>>>
if (process.env.UNFOLLOW_UPDATES) {
await unfollowGiveaways(page);
}
} else if (winnerPromoCard.length > 0) {
await enterWinnerPromoCardGiveaway(page); |
<<<<<<<
} else if (range.clientX != null || range.pageX != null || range.left != null) {
this.rangeFromPoint(range)
} else if (range.originalEvent && range.originalEvent.touches && range.originalEvent.touches.length) {
this.rangeFromPoint(range.originalEvent.touches[0])
} else if (range.originalEvent && range.originalEvent.changedTouches && range.originalEvent.changedTouches.length) {
this.rangeFromPoint(range.originalEvent.changedTouches[0])
=======
} else if (range.clientX || range.pageX || range.left) {
this.moveToPoint(range)
>>>>>>>
} else if (range.clientX != null || range.pageX != null || range.left != null) {
this.moveToPoint(range)
} else if (range.originalEvent && range.originalEvent.touches && range.originalEvent.touches.length) {
this.moveToPoint(range.originalEvent.touches[0])
} else if (range.originalEvent && range.originalEvent.changedTouches && range.originalEvent.changedTouches.length) {
this.moveToPoint(range.originalEvent.changedTouches[0])
<<<<<<<
}, supportWhitespace,
isWhitespace = function(el){
if(supportWhitespace == null){
supportWhitespace = 'isElementContentWhitespace' in el;
}
return (supportWhitespace? el.isElementContentWhitespace :
(el.nodeType === 3 && '' == el.data.trim()));
}, within = function(rect, point){
=======
},
// if a point is within a rectangle
within = function(rect, point){
>>>>>>>
},
supportWhitespace,
isWhitespace = function(el){
if(supportWhitespace == null){
supportWhitespace = 'isElementContentWhitespace' in el;
}
return (supportWhitespace? el.isElementContentWhitespace :
(el.nodeType === 3 && '' == el.data.trim()));
},
// if a point is within a rectangle
within = function(rect, point){
<<<<<<<
$("<div id='rect' />").appendTo(document.body)
=======
// support
support.moveToPoint = !!$.Range().range.moveToPoint
>>>>>>>
support.moveToPoint = !!$.Range().range.moveToPoint |
<<<<<<<
test("removeAttr test", function(){
var person = new Person({foo: "bar"})
equals(person.foo, "bar", "property set");
person.removeAttr('foo')
equals(person.foo, undefined, "property removed");
var attrs = person.attrs()
equals(attrs.foo, undefined, "attrs removed");
});
=======
test("identity should replace spaces with underscores", function(){
$.Model("Task",{},{});
t = new Task({
id: "id with spaces"
});
equals(t.identity(), "task_id_with_spaces")
});
>>>>>>>
test("removeAttr test", function(){
var person = new Person({foo: "bar"})
equals(person.foo, "bar", "property set");
person.removeAttr('foo')
equals(person.foo, undefined, "property removed");
var attrs = person.attrs()
equals(attrs.foo, undefined, "attrs removed");
});
test("identity should replace spaces with underscores", function(){
$.Model("Task",{},{});
t = new Task({
id: "id with spaces"
});
equals(t.identity(), "task_id_with_spaces")
}); |
<<<<<<<
// function _instructions(label) {
// return `
// <p>Go to</p>
// <div class="checkin-label circled"><span>${label}</span></div>
// <p><small>Touch the screen<br/>when you are ready.</small></p>
// `;
// }
=======
>>>>>>> |
<<<<<<<
var _displayTouchSurface = require('./display/TouchSurface');
var _displayTouchSurface2 = _interopRequireDefault(_displayTouchSurface);
var _displayDefaultTemplates = require('./display/defaultTemplates');
var _displayDefaultTemplates2 = _interopRequireDefault(_displayDefaultTemplates);
var _displayDefaultTextContents = require('./display/defaultTextContents');
var _displayDefaultTextContents2 = _interopRequireDefault(_displayDefaultTextContents);
=======
>>>>>>>
var _displayTouchSurface = require('./display/TouchSurface');
var _displayTouchSurface2 = _interopRequireDefault(_displayTouchSurface);
var _displayDefaultTemplates = require('./display/defaultTemplates');
var _displayDefaultTemplates2 = _interopRequireDefault(_displayDefaultTemplates);
var _displayDefaultTextContents = require('./display/defaultTextContents');
var _displayDefaultTextContents2 = _interopRequireDefault(_displayDefaultTextContents);
<<<<<<<
=======
>>>>>>> |
<<<<<<<
/*
##################################################################################
# #
# notice 2018-12-10 #
# #
##################################################################################
*/
"OthersArticle":"Articles in this group",
=======
"TRC20_exchange_online":"TRC20 exchange is online now",
"Trade_on_TRXMarket":"Trade on TRXMarket",
>>>>>>>
"TRC20_exchange_online":"TRC20 exchange is online now",
"Trade_on_TRXMarket":"Trade on TRXMarket",
/*
##################################################################################
# #
# notice 2018-12-10 #
# #
##################################################################################
*/
"OthersArticle":"Articles in this group", |
<<<<<<<
this.view.addEventListener('click', this._clickHandler);
=======
// install click listener
this.view.addEventListener('click', this._clickHandler);
>>>>>>>
this.view.addEventListener('click', this._clickHandler);
<<<<<<<
// this.view.removeEventListener('touchstart', this._clickHandler); TODO: remove completely?
=======
>>>>>>> |
<<<<<<<
start(offset = 0) {
=======
start(offset = 0) {
console.log('START');
// cannot start twice without stopping in between
if (this.isPlaying()) {
console.warn('start discarded, must stop first');
return;
}
>>>>>>>
start(offset = 0) {
console.log('START');
// cannot start twice without stopping in between
if (this.isPlaying()) {
console.warn('start discarded, must stop first');
return;
}
<<<<<<<
// quantization mode: start with offset in file to match period
// (offset must be computed accordingly, in parent who calls this method)
// if (offset !== undefined) {
// if (offset >= duration)
// console.error('req. offset above file duration', offset, duration);
// }
=======
// quantization mode: start with offset in file to match period (offset must be computed accordingly, in parent who calls this method)
if (offset >= duration) { console.error('req. offset above file duration', offset, duration); }
// discard if start required in sync mode while running clock - syncStartTime beyond file duration
if( (this.syncService.getSyncTime() - this._syncStartTime) > duration && !this._loop ){ return; }
>>>>>>>
// quantization mode: start with offset in file to match period
// (offset must be computed accordingly, in parent who calls this method)
// if (offset !== undefined) {
// if (offset >= duration)
// console.error('req. offset above file duration', offset, duration);
// }
// // quantization mode: start with offset in file to match period (offset must be computed accordingly, in parent who calls this method)
// if (offset >= duration) { console.error('req. offset above file duration', offset, duration); }
// // discard if start required in sync mode while running clock - syncStartTime beyond file duration
// if( (this.syncService.getSyncTime() - this._syncStartTime) > duration && !this._loop ){ return; }
<<<<<<<
if (this._loop) {
this._currentBufferIndex = 0;
} else {
=======
if (this._loop) {
this._currentBufferIndex = 0;
console.log('d', this._currentBufferIndex);
} else {
>>>>>>>
if (this._loop) {
this._currentBufferIndex = 0;
console.log('d', this._currentBufferIndex);
} else {
<<<<<<<
// activate onended callback (todo: should be called by last AudioBufferSource rather than with setTimeout)
const timeBeforeEnd = this._ctxTimeWhenQueueEnds - this.syncService.getSyncTime();
=======
// activate onended callback (todo: should be called by last AudioBufferSource rather than with setTimeout)
const timeBeforeEnd = this._ctx_time_when_queue_ends - this.syncService.getSyncTime();
>>>>>>>
// activate onended callback (todo: should be called by last AudioBufferSource rather than with setTimeout)
const timeBeforeEnd = this._ctx_time_when_queue_ends - this.syncService.getSyncTime(); |
<<<<<<<
renderDrawer() {
=======
renderDrawer () {
if (this.props.desktop) {
return <div />
}
>>>>>>>
renderDrawer() {
if (this.props.desktop) {
return <div />
}
<<<<<<<
renderNavigation() {
=======
renderNavigation () {
if (this.props.desktop) {
return <div />
}
>>>>>>>
renderNavigation() {
if (this.props.desktop) {
return <div />
}
<<<<<<<
renderCover() {
if (!this.hasCover) {
return
=======
renderCover () {
if (!this.hasCover || this.props.desktop) {
return <div />
>>>>>>>
renderCover() {
if (!this.hasCover || this.props.desktop) {
return <div />
<<<<<<<
renderFooter() {
if (this.props.noFooter) {
return
}
=======
renderFooter () {
if (this.props.desktop) {
return <div />
}
>>>>>>>
renderFooter() {
if (this.props.desktop) {
return <div />
}
if (this.props.noFooter) {
return
}
<<<<<<<
renderPrimary() {
if (this.props.sidebar && this.props.private && !this.props.isSmallScreen) {
=======
renderPrimary () {
if (this.props.sidebar && this.props.private && !this.props.isSmallScreen) {
>>>>>>>
renderPrimary() {
if (this.props.sidebar && this.props.private && !this.props.isSmallScreen) {
<<<<<<<
renderWithSidebar() {
var index = 0
=======
renderSidebarItem (item) {
return (<Menu.Item key={item.id}>
<Icon type={item.icon} />
<span className='nav-text'> {item.title}</span>
</Menu.Item>)
}
renderWithSidebar () {
const collapseSidebar = (this.props.desktop ? false : this.props.isSmallScreen)
const width = this.props.sidebarWidth
>>>>>>>
renderSidebarItem(item) {
return (<Menu.Item key={item.id}>
<Icon type={item.icon} />
<span className='nav-text'> {item.title}</span>
</Menu.Item>)
}
renderWithSidebar() {
const collapseSidebar = (this.props.desktop ? false : this.props.isSmallScreen)
const width = this.props.sidebarWidth
<<<<<<<
{
this.props.sidebar.map(item => (
<Menu.Item key={index++}>
<Icon type={item.icon} />
<span className='nav-text'> {item.title}</span>
</Menu.Item>
))}
=======
{ this.props.sidebar.map(item => this.renderSidebarItem(item)) }
>>>>>>>
{this.props.sidebar.map(item => this.renderSidebarItem(item))}
<<<<<<<
<div style={{
marginLeft: 56,
backgroundColor: '#ffffff',
minHeight: 360,
alignItems: 'center',
justifyContent: 'center',
flex: 1,
display: 'flex'
}}>
{this.renderComponents()}
</div>
=======
{ this.renderComponents() }
>>>>>>>
{this.renderComponents()}
<<<<<<<
let marginTop
if (this.props.forceNavigation) {
marginTop = 0
} else {
marginTop = (this.props.layout.fixed && !this.hasCover ? this.navigationHeight : 0)
}
=======
const marginTop = (this.props.desktop ? 0 : (this.props.layout.fixed && !this.hasCover ? this.navigationHeight : 0))
>>>>>>>
let marginTop
if (this.props.forceNavigation) {
marginTop = 0
} else {
marginTop = (this.props.layout.fixed && !this.hasCover ? this.navigationHeight : 0)
}
if (this.props.desktop) {
marginTop = 0
} |
<<<<<<<
app.use(bodyParser.json({limit: '1kb'}));
app.use(bodyParser.urlencoded({limit: '1kb', extended: true}));
=======
app.use(bodyParser.json({limit: '30kb'}));
app.use(bodyParser.urlencoded({limit: '30kb', extended: true}));
app.get('/api/v:version/node/info', function(req, res) {
return dispatchPromise('nodeInfo', req, res);
});
/* healthcheck */
app.get('/fbtrex/health', function(req,res){
res.send({"status": "OK"});
});
/* byDay (impressions, users, metadata ) -- discontinued GUI */
app.get('/api/v:version/daily/:what/:dayback', function(req, res) {
return dispatchPromise('byDayStats', req, res);
});
/* actually used APIs for stats/impact */
app.get('/api/v:version/stats/:what/:months', function(req, res) {
return dispatchPromise('getStats', req, res);
});
app.get('/api/v:version/stats/engagement', function(req, res) {
return dispatchPromise('getEngagement', req, res);
});
/* column only - c3 */
app.get('/api/v:version/node/countries/c3', function(req, res) {
return dispatchPromise('countriesStats', req, res);
});
app.get('/api/v:version/user/:kind/:CPN/:userId/:format', function(req, res){
return dispatchPromise('userAnalysis', req, res);
});
/* Querying API */
app.post('/api/v:version/query', function(req, res) {
return dispatchPromise('queryContent', req, res);
});
/* Parser API */
app.post('/api/v:version/snippet/status', function(req, res) {
return dispatchPromise('snippetAvailable', req, res);
});
app.post('/api/v:version/snippet/content', function(req, res) {
return dispatchPromise('snippetContent', req, res);
});
app.post('/api/v:version/snippet/result', function(req, res) {
return dispatchPromise('snippetResult', req, res);
});
/* HTML single snippet */
app.get('/api/v:version/html/:htmlId', function(req, res) {
return dispatchPromise('unitById', req, res);
});
/* timeline snippet */
app.get('/api/v:version/verify/:timelineId', function(req, res) {
return dispatchPromise('verifyTimeline', req, res);
});
/* debug special */
app.get('/api/v:version/fbtrexdebug/:key', function(req, res) {
return dispatchPromise('fbtrexdebug', req, res);
});
app.get('/fbtrexdebug/:key?', function(req, res) {
req.params.page = 'fbtrexdebug';
return dispatchPromise('getPage', req, res);
});
>>>>>>>
app.use(bodyParser.json({limit: '30kb'}));
app.use(bodyParser.urlencoded({limit: '30kb', extended: true})); |
<<<<<<<
=======
var personalP = jade.compileFile(__dirname + '/../sections/personal.jade');
var overseerP = jade.compileFile(__dirname + '/../sections/overseer.jade');
var slideMap = {
moca2016: jade.compileFile(__dirname + '/../sections/moca.jade'),
background: jade.compileFile(__dirname + '/../sections/background.jade'),
fbexperiment: jade.compileFile(__dirname + '/../sections/fbexperiment.jade'),
cooperation: jade.compileFile(__dirname + '/../sections/collaboration.jade')
};
>>>>>>>
<<<<<<<
=======
/* extend the refresh object with session-info and not just
* post dependend info */
var hashMap = {};
>>>>>>>
<<<<<<<
=======
/* in both cases, clean the saved timelines */
console.log("from a timeline of " + _.size(processed.timeline) +
" entries stripping " + failures);
processed.timeline = _.find(processed.timeline, !_.isNull);
>>>>>>>
<<<<<<<
if(_.size(processed.timeline)) {
functionList = [
mongo.updateOne(
nconf.get('schema').supporters,
{ userId: supportInfo.numId },
{ userId: supportInfo.numId, lastInfo: moment().format() }
),
mongo.writeMany(
nconf.get('schema').timeline,
processed.timeline
)
];
} else
debug("%s No timeline here !?", req.randomUnicode);
=======
var functionList = [
mongo.updateOne(
nconf.get('schema').supporters,
{ userId: supportInfo.numId },
{ userId: supportInfo.numId, lastInfo: moment().format() }
),
mongo.writeMany(
nconf.get('schema').timeline,
processed.timeline
)
];
>>>>>>>
if(_.size(processed.timeline)) {
functionList = [
mongo.updateOne(
nconf.get('schema').supporters,
{ userId: supportInfo.numId },
{ userId: supportInfo.numId, lastInfo: moment().format() }
),
mongo.writeMany(
nconf.get('schema').timeline,
processed.timeline
)
];
} else
debug("%s No timeline here !?", req.randomUnicode);
<<<<<<<
if(_.size(debugStats)) {
functionList.push(
mongo.writeMany(
nconf.get('schema').debug,
debugStats
)
);
}
debug("%s saving %d TLe %d Ref, user %d [%s] (%d debug)",
=======
debug("%s saving %d TLe (last order %s), user %d (%d debug)",
>>>>>>>
if(_.size(debugStats)) {
functionList.push(
mongo.writeMany(
nconf.get('schema').debug,
debugStats
)
);
}
debug("%s saving %d TLe %d Ref, user %d (%d debug)",
<<<<<<<
_.size(processed.refreshes), supportInfo.numId,
parsedVersion, _.size(debugStats) );
/* this is a pretty nice way to see what you are copying */
// console.log(JSON.stringify(processed, undefined, 2));
=======
(_.isUndefined(_.last(processed.timeline))) ?
"??!" :
_.last(processed.timeline).order,
supportInfo.numId,
_.size(debugStats) );
>>>>>>>
_.size(processed.refreshes), supportInfo.numId,
_.size(debugStats) );
/* this is a pretty nice way to see what you are copying */
// console.log(JSON.stringify(processed, undefined, 2));
<<<<<<<
mongo.readLimit(nconf.get('schema').refreshes,
{ userId: numId },
{ refreshTime: -1 },
REFRESH_NUMBER, past ),
=======
mongo.readLimit(nconf.get('schema').refreshes,
{userId: numId}, {refreshTime: 1}, 6, past),
>>>>>>>
mongo.readLimit(nconf.get('schema').refreshes,
{ userId: numId },
{ refreshTime: -1 },
REFRESH_NUMBER, past ),
<<<<<<<
.readLimit(nconf.get('schema').timeline,
{refreshId: refresh.refreshId},
{order: 1}, POST_NUMBER, 0);
=======
.readLimit(nconf.get('schema').timeline,
{refreshId: refresh.refreshId},
{order: -1}, 20, 0);
>>>>>>>
.readLimit(nconf.get('schema').timeline,
{refreshId: refresh.refreshId},
{order: 1}, POST_NUMBER, 0);
<<<<<<<
=======
/* this is a page that has to use req.name as variable,
* and trigger the future presentations */
return {
'text': myLovelyPropaganda()
};
>>>>>>> |
<<<<<<<
var utils = require('../lib/utils');
=======
>>>>>>>
var utils = require('../lib/utils'); |
<<<<<<<
// params: paramaters for the ajax query, you can pass auth_token here
// totalPages: total number of pages
// url: URL used to request more data
// method: HTML method for call URL, default - get
=======
// params: paramaters for the ajax query (hash or function), you can pass auth_token here
// totalPages: total number of pages (integer or function)
// url: URL used to request more data (string or function)
>>>>>>>
// params: paramaters for the ajax query (hash or function), you can pass auth_token here
// totalPages: total number of pages (integer or function)
// url: URL used to request more data (string or function)
// method: HTML method for call URL, default - get
<<<<<<<
$.extend( settings.params
, { page: settings.currentPage });
// finally ajax query
if (settings.method == 'post') {
$.post( settings.url
, settings.params
, function (data) {
$.isFunction(settings.scrape) ? settings.scrape(data) : data;
loader ? loader.before(data) : element.append(data);
loading(FALSE);
=======
var requestParams = $.isFunction(settings.params) ? settings.params() : settings.params;
$.extend( requestParams
, { page: currentPage });
// finally ajax query
$.get( $.isFunction(settings.url) ? settings.url() : settings.url
, requestParams
, function (data) {
$.isFunction(settings.scrape) ? settings.scrape(data) : data;
loader ? loader.before(data) : element.append(data);
loading(FALSE);
>>>>>>>
$.extend( requestParams, { page: currentPage });
// finally ajax query
if (settings.method == 'post') {
$.post(url, requestParams,
function (data) {
$.isFunction(settings.scrape) ? settings.scrape(data) : data;
loader ? loader.before(data) : element.append(data);
loading(FALSE); |
<<<<<<<
height: 170
},
remoteWindow: null
=======
height: 170,
webPreferences: {
nodeIntegration: true
},
}
>>>>>>>
height: 170,
webPreferences: {
nodeIntegration: true
},
},
remoteWindow: null |
<<<<<<<
};
=======
slider.container.css('transform',target);
}
>>>>>>>
slider.container.css('transform',target);
}; |
<<<<<<<
<Text style={[{margin:5},group.header.headerStyle]} numberOfLines={1} ellipsizeMode="tail" ref={group.header.headerRef}>{group.header.headerText}</Text>
=======
<Text style={[{margin:5},group.header.headerStyle]} numberOfLines={group.header.headerNumberOfLines} ellipsizeMode="tail">{group.header.headerText}</Text>
>>>>>>>
<Text style={[{margin:5},group.header.headerStyle]} numberOfLines={group.header.headerNumberOfLines} ellipsizeMode="tail" ref={group.header.headerRef}>{group.header.headerText}</Text>
<<<<<<<
headerRef: React.PropTypes.func,
=======
headerNumberOfLines: React.PropTypes.number,
},
getDefaultProps() {
return {
headerNumberOfLines: 1,
};
>>>>>>>
headerRef: React.PropTypes.func,
headerNumberOfLines: React.PropTypes.number,
},
getDefaultProps() {
return {
headerNumberOfLines: 1,
};
<<<<<<<
borderHide: React.PropTypes.oneOf(['Top', 'Bottom', 'Both']),
itemRef: React.PropTypes.func,
=======
borderHide: PropTypes.oneOf(['Top', 'Bottom', 'Both'])
>>>>>>>
borderHide: React.PropTypes.oneOf(['Top', 'Bottom', 'Both']),
itemRef: React.PropTypes.func,
borderHide: PropTypes.oneOf(['Top', 'Bottom', 'Both']) |
<<<<<<<
class TimetableLoader extends BaseLoader {
=======
class TimetableLoader {
constructor(APIToken, baseURL) {
this.APIToken = APIToken;
this.baseURL = baseURL;
}
>>>>>>>
class TimetableLoader extends BaseLoader {
<<<<<<<
const url = `${baseURL}/plan/${evaId}/${nowString}`;
const configuration = this.fetchConfiguration;
return this.fetch(url, configuration)
=======
const url = `${this.baseURL}${serviceURL}/plan/${evaId}/${nowString}`;
const myInit = { method: 'GET',
headers: { Authorization: `Bearer ${this.APIToken}` } };
return fetch(url, myInit)
>>>>>>>
const url = `${this.baseURL}${serviceURL}/plan/${evaId}/${nowString}`;
const configuration = this.fetchConfiguration;
return this.fetch(url, configuration) |
<<<<<<<
const { stationNearby } = require('./station');
=======
const loadNearbyBikes = require('./CallABikeGeoQuery');
>>>>>>>
const { stationNearby } = require('./station');
const loadNearbyBikes = require('./CallABikeGeoQuery');
<<<<<<<
get stations() {
return stationNearby(this.lat, this.lon)
}
=======
get bikes() {
return loadNearbyBikes(this.lat, this.lon);
}
>>>>>>>
get stations() {
return stationNearby(this.lat, this.lon)
}
get bikes() {
return loadNearbyBikes(this.lat, this.lon);
} |
<<<<<<<
constructor(parkingSpaceService, trackService) {
this.parkingSpaceService = parkingSpaceService;
this.trackService = trackService;
=======
/**
* A StationRelationships connects different datasources related to a station.
* @constructor
*/
constructor(parkingSpaceService, facilityService, timeTableService) {
this.parkingSpaceService = parkingSpaceService
this.facilityService = facilityService
this.timeTableService = timeTableService
>>>>>>>
/**
* A StationRelationships connects different datasources related to a station.
* @constructor
*/
constructor(parkingSpaceService, facilityService, timeTableService, trackService) {
this.parkingSpaceService = parkingSpaceService
this.facilityService = facilityService
this.timeTableService = timeTableService
this.trackService = trackService;
<<<<<<<
const parkingSpaceService = this.parkingSpaceService;
const trackService = this.trackService;
station.facilities = function () {
return loadElevatorFor(station.stationNumber);
};
station.arrivalDepatureBoard = function () {
return loadTimeTableFor(station.primaryEvaId);
};
=======
const parkingSpaceService = this.parkingSpaceService;
const facilityService = this.facilityService;
const timeTableService = this.timeTableService;
>>>>>>>
const parkingSpaceService = this.parkingSpaceService;
const facilityService = this.facilityService;
const timeTableService = this.timeTableService;
const trackService = this.trackService;
<<<<<<<
station.tracks = function() {
return trackService.tracksForStationNumber(station.stationNumber)
}
=======
station.facilities = function () {
return facilityService.facilitiesForStationNumber(station.stationNumber);
};
station.timetable = function () {
return timeTableService.timetableForEvaId(station.primaryEvaId);
};
>>>>>>>
station.facilities = function () {
return facilityService.facilitiesForStationNumber(station.stationNumber);
};
station.timetable = function () {
return timeTableService.timetableForEvaId(station.primaryEvaId);
};
station.tracks = function() {
return trackService.tracksForStationNumber(station.stationNumber)
} |
<<<<<<<
const TrackService = require('./Platforms/TrackService.js');
=======
const TravelCenterService = require('./TravelCenter/TravelCenterService');
const FacilityService = require('./Facility/FacilityService.js');
const RoutingService = require('./Routing/RoutingService.js');
const TimetableService = require('./Timetable/TimetableService.js');
>>>>>>>
const TravelCenterService = require('./TravelCenter/TravelCenterService');
const FacilityService = require('./Facility/FacilityService.js');
const RoutingService = require('./Routing/RoutingService.js');
const TimetableService = require('./Timetable/TimetableService.js');
const TrackService = require('./Platforms/TrackService.js');
<<<<<<<
const trackService = new TrackService()
=======
const travelCenterService = new TravelCenterService(travelCenterLoader);
const facilityService = new FacilityService(facilityLoader)
const routingService = new RoutingService();
const flinksterService = new FlinksterService(flinksterLoader);
const timetableServcie = new TimetableService(timetableLoader);
>>>>>>>
const travelCenterService = new TravelCenterService(travelCenterLoader);
const facilityService = new FacilityService(facilityLoader)
const routingService = new RoutingService();
const flinksterService = new FlinksterService(flinksterLoader);
const timetableServcie = new TimetableService(timetableLoader);
const trackService = new TrackService()
<<<<<<<
stationService.relationships = new StationRelationships(parkingspaceService, trackService);
=======
stationService.relationships = new StationRelationships(parkingspaceService, facilityService, timetableServcie);
>>>>>>>
stationService.relationships = new StationRelationships(parkingspaceService, facilityService, timetableServcie, trackService); |
<<<<<<<
const TimetableLoader = require('./Timetable/TimetableLoader.js');
=======
const FacilityLoader = require('./Facility/FacilityLoader.js');
>>>>>>>
const TimetableLoader = require('./Timetable/TimetableLoader.js');
const FacilityLoader = require('./Facility/FacilityLoader.js');
<<<<<<<
const NearbyStationService = require('./Station/NearbyStationsService.js');
const TimetableService = require('./Timetable/TimetableService.js');
=======
const NearbyStationService = require('./Station/NearbyStationsService');
const FacilityService = require('./Facility/FacilityService.js');
const RoutingService = require('./Routing/RoutingService.js');
>>>>>>>
const NearbyStationService = require('./Station/NearbyStationsService');
const FacilityService = require('./Facility/FacilityService.js');
const RoutingService = require('./Routing/RoutingService.js');
const TimetableService = require('./Timetable/TimetableService.js');
<<<<<<<
const timetableServcie = new TimetableService(timetableLoader);
=======
const facilityService = new FacilityService(facilityLoader)
const routingService = new RoutingService();
const flinksterService = new FlinksterService(flinksterLoader);
>>>>>>>
const facilityService = new FacilityService(facilityLoader)
const routingService = new RoutingService();
const flinksterService = new FlinksterService(flinksterLoader);
const timetableServcie = new TimetableService(timetableLoader);
<<<<<<<
stationService.relationships = new StationRelationships(parkingspaceService, timetableServcie);
=======
stationService.relationships = new StationRelationships(parkingspaceService, facilityService);
>>>>>>>
stationService.relationships = new StationRelationships(parkingspaceService, facilityService, timetableServcie); |
<<<<<<<
"name_of_the_token": "通证名称",
"token_message": "通证名称，尽量避免重复",
"token_abbr": "通证简称",
"abbr_message": "通证缩写，建议不与交易所现有符号重复",
"total_supply": "发行总量",
"issued_token": "已发行通证",
"create_token": "发行通证",
"description": "简介",
"description_url": "网站URL",
"quote_token_amount": "二级通证数额",
"base_token_amount": "基本通证数额",
"creating_a_token": "发行通证",
"available": "可用",
"testnet": "测试网",
"days_to_freeze": "冻结天数",
"trx_token_fee_message": "发行新通证将花费1024TRX",
"trx_token_account_limit": "每个账户只能发行1种通证",
"trx_token_wallet_requirement": "发行通证需要首先打开钱包",
"invalid_address": "无效地址",
"insufficient_tokens": "通证不足",
"fill_a_valid_number": "请填写有效的数值",
"fill_a_valid_address": "请填写有效的地址",
"make_another_transaction": "发起其他交易",
"token_exchange_confirm": "确认花费 {trx数额} 用于认购通证，总计获得{通证数额} 个代币。",
"An_unknown_error_occurred,_please_try_again_in_a_few_minutes": "发生未知错误，请几分钟后再次尝试",
"An_error_occurred": "发生错误",
"create_a_token": "发行通证",
"not_started_yet": "尚未开始",
"participated": "成功参与通证发行！",
"participated_error": "发生错误",
/*
=======
"name_of_the_token": "通证名称",
"token_message": "通证名称，尽量避免重复",
"token_abbr": "通证缩写",
"abbr_message": "通证缩写，建议不与交易所现有符号重复",
"total_supply": "发行量",
"issued_token": "已发行通证",
"create_token": "发行通证",
"description": "简介",
"description_url": "网站URL",
"quote_token_amount": "二级通证数额",
"base_token_amount": "基本通证数额",
"creating_a_token": "发行通证",
"available": "可用",
"testnet": "测试网",
"days_to_freeze": "冻结天数",
"trx_token_fee_message": "发行新通证将花费1024TRX",
"trx_token_account_limit": "每个账户只能发行1种通证",
"trx_token_wallet_requirement": "发行通证需要首先打开钱包",
"invalid_address": "无效地址",
"insufficient_tokens": "通证不足",
"fill_a_valid_number": "请填写有效的数值",
"fill_a_valid_address": "请填写有效的地址",
"make_another_transaction": "发起其他交易",
"token_exchange_confirm": "确认花费 {trx数额} 用于认购通证，总计获得{通证数额} 个代币。",
"An_unknown_error_occurred,_please_try_again_in_a_few_minutes": "发生未知错误，请几分钟后再次尝试",
"An_error_occurred": "发生错误",
"create_a_token": "发行通证",
"not_started_yet": "尚未开始",
"participated": "成功参与通证发行！",
"participated_error": "发生错误",
/*
>>>>>>>
"name_of_the_token": "通证名称",
"token_message": "通证名称，尽量避免重复",
"token_abbr": "通证缩写",
"abbr_message": "通证缩写，建议不与交易所现有符号重复",
"total_supply": "发行量",
"issued_token": "已发行通证",
"create_token": "发行通证",
"description": "简介",
"description_url": "网站URL",
"quote_token_amount": "二级通证数额",
"base_token_amount": "基本通证数额",
"creating_a_token": "发行通证",
"available": "可用",
"testnet": "测试网",
"days_to_freeze": "冻结天数",
"trx_token_fee_message": "发行新通证将花费1024TRX",
"trx_token_account_limit": "每个账户只能发行1种通证",
"trx_token_wallet_requirement": "发行通证需要首先打开钱包",
"invalid_address": "无效地址",
"insufficient_tokens": "通证不足",
"fill_a_valid_number": "请填写有效的数值",
"fill_a_valid_address": "请填写有效的地址",
"make_another_transaction": "发起其他交易",
"token_exchange_confirm": "确认花费 {trx数额} 用于认购通证，总计获得{通证数额} 个代币。",
"An_unknown_error_occurred,_please_try_again_in_a_few_minutes": "发生未知错误，请几分钟后再次尝试",
"An_error_occurred": "发生错误",
"create_a_token": "发行通证",
"not_started_yet": "尚未开始",
"participated": "成功参与通证发行！",
"participated_error": "发生错误",
/*
<<<<<<<
"my_token": "我发行的通证",
"my_token_desc_1": "通证相关信息信息将展示在通证页，同时依据信息全面性和真实性获得",
"tron_rating": "波场通证信誉评级",
"my_token_desc_2": "如需修改信息，请使用公司邮箱或附其他证明文件，将修改信息按表格形式发送至[email protected]",
"brief_info": "简介",
"website_official": "官方网站",
"white_paper": "白皮书",
"GitHub": "GitHub",
"country": "国家",
"social_link": "社交媒体链接",
"download_excel": "下载模板",
"no_message": "暂无，请发邮件补充信息",
"insufficient_message": "信息不充分",
"neutral": "中立",
"pending": "审核中",
"fake": "虚假",
"token_detail": "通证详情",
"contact_us": "联系我们",
"my_token": "我的通证",
"try_later": "请稍后再试",
"contract_address": "合约地址",
/*
=======
my_token: "我发行的通证",
my_token_desc_1:
"通证相关信息信息将展示在通证页，同时依据信息全面性和真实性获得",
tron_rating: "波场通证信誉评级",
my_token_desc_2:
"如需修改信息，请使用公司邮箱或附其他证明文件，将修改信息按表格形式发送至[email protected]",
brief_info: "简介",
website_official: "官方网站",
white_paper: "白皮书",
GitHub: "GitHub",
country: "国家",
social_link: "社交媒体链接",
download_excel: "下载模板",
no_message: "暂无，请发邮件补充信息",
insufficient_message: "信息不充分",
neutral: "中立",
pending: "审核中",
fake: "虚假",
token_detail: "通证详情",
contact_us: "联系我们",
my_token: "我的通证",
try_later: "请稍后再试",
contract_address: "合约地址",
/*
>>>>>>> origin/dev2019
=======
"my_token": "我发行的通证",
"my_token_desc_1": "通证相关信息信息将展示在通证页，同时依据信息全面性和真实性获得",
"tron_rating": "波场通证信誉评级",
"my_token_desc_2": "如需修改信息，请使用公司邮箱或附其他证明文件，将修改信息按表格形式发送至[email protected]",
"brief_info": "简介",
"website_official": "官方网站",
"white_paper": "白皮书",
"GitHub": "GitHub",
"country": "国家",
"social_link": "社交媒体链接",
"download_excel": "下载模板",
"no_message": "暂无，请发邮件补充信息",
"insufficient_message": "信息不充分",
"neutral": "中立",
"pending": "审核中",
"fake": "虚假",
"token_detail": "通证详情",
"contact_us": "联系我们",
"my_token": "我的通证",
"try_later": "请稍后再试",
"contract_address": "合约地址",
/*
>>>>>>>
"my_token": "我发行的通证",
"my_token_desc_1": "通证相关信息信息将展示在通证页，同时依据信息全面性和真实性获得",
"tron_rating": "波场通证信誉评级",
"my_token_desc_2": "如需修改信息，请使用公司邮箱或附其他证明文件，将修改信息按表格形式发送至[email protected]",
"brief_info": "简介",
"website_official": "官方网站",
"white_paper": "白皮书",
"GitHub": "GitHub",
"country": "国家",
"social_link": "社交媒体链接",
"download_excel": "下载模板",
"no_message": "暂无，请发邮件补充信息",
"insufficient_message": "信息不充分",
"neutral": "中立",
"pending": "审核中",
"fake": "虚假",
"token_detail": "通证详情",
"contact_us": "联系我们",
"my_token": "我的通证",
"try_later": "请稍后再试",
"contract_address": "合约地址",
/*
my_token: "我发行的通证",
my_token_desc_1:
"通证相关信息信息将展示在通证页，同时依据信息全面性和真实性获得",
tron_rating: "波场通证信誉评级",
my_token_desc_2:
"如需修改信息，请使用公司邮箱或附其他证明文件，将修改信息按表格形式发送至[email protected]",
brief_info: "简介",
website_official: "官方网站",
white_paper: "白皮书",
GitHub: "GitHub",
country: "国家",
social_link: "社交媒体链接",
download_excel: "下载模板",
no_message: "暂无，请发邮件补充信息",
insufficient_message: "信息不充分",
neutral: "中立",
pending: "审核中",
fake: "虚假",
token_detail: "通证详情",
contact_us: "联系我们",
my_token: "我的通证",
try_later: "请稍后再试",
contract_address: "合约地址",
/*
<<<<<<<
/*
##################################################################################
# #
# tokens input 2019-04-10 #
# #
##################################################################################
*/
=======
/*
##################################################################################
# #
# new variables ledger 2019-04-24 #
# #
##################################################################################
*/
"ledger_user_guide":"Ledger使用指南",
"latest_version_chrome":"推荐使用最新版Chrome",
"ledger_support_version":"Ledger支持版本：0.1.0，chrome支持版本 73.0",
"ledger_you_can":"您可以去",
"ledger_website":"Ledger官网",
"ledger_website_download":"下载更新最新的Ledger版本",
"ledger_click_help":"点此获得更多帮助",
>>>>>>>
/*
##################################################################################
# #
# new variables ledger 2019-04-24 #
# #
##################################################################################
*/
"ledger_user_guide":"Ledger使用指南",
"latest_version_chrome":"推荐使用最新版Chrome",
"ledger_support_version":"Ledger支持版本：0.1.0，chrome支持版本 73.0",
"ledger_you_can":"您可以去",
"ledger_website":"Ledger官网",
"ledger_website_download":"下载更新最新的Ledger版本",
"ledger_click_help":"点此获得更多帮助",
/*
##################################################################################
# #
# tokens input 2019-04-10 #
# #
##################################################################################
*/
<<<<<<<
=======
"login_privatekey_warn":"为确保您的账户安全，请您妥善保管好私钥，以防资产丢失。建议您使用",
"login_privatekey_warn_safe":"安全登录",
>>>>>>>
"login_privatekey_warn":"为确保您的账户安全，请您妥善保管好私钥，以防资产丢失。建议您使用",
"login_privatekey_warn_safe":"安全登录", |
<<<<<<<
const TravelCenterLoader = require('./TravelCenter/TravelCenterLoader');
=======
const TimetableLoader = require('./Timetable/TimetableLoader.js');
const FacilityLoader = require('./Facility/FacilityLoader.js');
>>>>>>>
const TravelCenterLoader = require('./TravelCenter/TravelCenterLoader');
const TimetableLoader = require('./Timetable/TimetableLoader.js');
const FacilityLoader = require('./Facility/FacilityLoader.js');
<<<<<<<
const TravelCenterService = require('./TravelCenter/TravelCenterService');
=======
const FacilityService = require('./Facility/FacilityService.js');
const RoutingService = require('./Routing/RoutingService.js');
const TimetableService = require('./Timetable/TimetableService.js');
>>>>>>>
const TravelCenterService = require('./TravelCenter/TravelCenterService');
const FacilityService = require('./Facility/FacilityService.js');
const RoutingService = require('./Routing/RoutingService.js');
const TimetableService = require('./Timetable/TimetableService.js');
<<<<<<<
const travelCenterLoader = new TravelCenterLoader(APIToken);
=======
const facilityLoader = new FacilityLoader(APIToken);
const flinksterLoader = new FlinksterLoader(APIToken);
>>>>>>>
const travelCenterLoader = new TravelCenterLoader(APIToken);
const facilityLoader = new FacilityLoader(APIToken);
const flinksterLoader = new FlinksterLoader(APIToken);
<<<<<<<
const travelCenterService = new TravelCenterService(travelCenterLoader);
=======
const facilityService = new FacilityService(facilityLoader)
const routingService = new RoutingService();
const flinksterService = new FlinksterService(flinksterLoader);
const timetableServcie = new TimetableService(timetableLoader);
>>>>>>>
const travelCenterService = new TravelCenterService(travelCenterLoader);
const facilityService = new FacilityService(facilityLoader)
const routingService = new RoutingService();
const flinksterService = new FlinksterService(flinksterLoader);
const timetableServcie = new TimetableService(timetableLoader);
<<<<<<<
nearby: args => new NearbyQuery(args.latitude, args.longitude, nearbyStationService, parkingspaceService, travelCenterService),
=======
nearby: args => new NearbyQuery(args.latitude, args.longitude, args.radius, nearbyStationService, parkingspaceService, flinksterService),
>>>>>>>
nearby: args => new NearbyQuery(args.latitude, args.longitude, args.radius, nearbyStationService, parkingspaceService, flinksterService, travelCenterService), |
<<<<<<<
const FacilityService = require('./Facility/FacilityService.js');
=======
const RoutingService = require('./Routing/RoutingService.js');
>>>>>>>
const FacilityService = require('./Facility/FacilityService.js');
const RoutingService = require('./Routing/RoutingService.js');
<<<<<<<
const facilityLoader = new FacilityLoader(APIToken);
=======
const flinksterLoader = new FlinksterLoader(APIToken);
>>>>>>>
const facilityLoader = new FacilityLoader(APIToken);
const flinksterLoader = new FlinksterLoader(APIToken);
<<<<<<<
const facilityService = new FacilityService(facilityLoader)
=======
const routingService = new RoutingService();
const flinksterService = new FlinksterService(flinksterLoader);
>>>>>>>
const facilityService = new FacilityService(facilityLoader)
const routingService = new RoutingService();
const flinksterService = new FlinksterService(flinksterLoader); |
<<<<<<<
=======
$(event.data.fake_input).resetAutosize(settings);
>>>>>>>
$(event.data.fake_input).resetAutosize(settings); |
<<<<<<<
var selectPresetValues = loadPresetsList();
=======
>>>>>>>
var selectPresetValues = loadPresetsList();
<<<<<<<
var warningDynamicNotch_e = $('#pid-tuning .dynamicNotchWarning');
if (!(gyroDynamicLowpassEnabled || gyroLowpass1Enabled) || !(dtermDynamicLowpassEnabled || dtermLowpass1Enabled) && (CONFIG.boardIdentifier !== "HESP" && CONFIG.boardIdentifier !== "SX10" && CONFIG.boardIdentifier !== "FLUX")) {
warning_e.show();
} else {
warning_e.hide();
}
if (semver.gte(CONFIG.apiVersion, "1.42.0")) {
if (FEATURE_CONFIG.features.isEnabled('DYNAMIC_FILTER')) {
warningDynamicNotch_e.hide();
=======
if (!(gyroDynamicLowpassEnabled || gyroLowpass1Enabled) || !(dtermDynamicLowpassEnabled || dtermLowpass1Enabled)) {
if (CONFIG.boardIdentifier == "HESP" || CONFIG.boardIdentifier == "SX10" || CONFIG.boardIdentifier == "FLUX") {
warning_e.hide();
>>>>>>>
if (!(gyroDynamicLowpassEnabled || gyroLowpass1Enabled) || !(dtermDynamicLowpassEnabled || dtermLowpass1Enabled)) {
if (CONFIG.boardIdentifier == "HESP" || CONFIG.boardIdentifier == "SX10" || CONFIG.boardIdentifier == "FLUX") {
warning_e.hide(); |
<<<<<<<
relationMetadata: undefined,
=======
topBarTitle: undefined,
>>>>>>>
relationMetadata: undefined,
topBarTitle: undefined,
<<<<<<<
setRelationMetadata(state, value) {
state.relationMetadata = value;
},
=======
setTopBarTitle(state, value) {
state.topBarTitle = value;
},
>>>>>>>
setRelationMetadata(state, value) {
state.relationMetadata = value;
},
setTopBarTitle(state, value) {
state.topBarTitle = value;
},
<<<<<<<
updateRelationMetadata({ commit, state }, value) {
const newState = { ...state.relationMetadata, ...value };
commit('setRelationMetadata', newState);
},
clearRelationMetadata({ commit }) {
commit('setRelationMetadata', {});
},
=======
async updateTopBarTitle({ commit }, value) {
commit('setTopBarTitle', value);
},
>>>>>>>
async updateTopBarTitle({ commit }, value) {
commit('setTopBarTitle', value);
},
updateRelationMetadata({ commit, state }, value) {
const newState = { ...state.relationMetadata, ...value };
commit('setRelationMetadata', newState);
},
clearRelationMetadata({ commit }) {
commit('setRelationMetadata', {});
}, |
<<<<<<<
relationMetadata: undefined,
=======
topBarTitle: undefined,
>>>>>>>
relationMetadata: undefined,
topBarTitle: undefined,
<<<<<<<
setRelationMetadata(state, value) {
state.relationMetadata = value;
},
=======
setTopBarTitle(state, value) {
state.topBarTitle = value;
},
>>>>>>>
setRelationMetadata(state, value) {
state.relationMetadata = value;
},
setTopBarTitle(state, value) {
state.topBarTitle = value;
},
<<<<<<<
updateRelationMetadata({ commit, state }, value) {
const newState = { ...state.relationMetadata, ...value };
commit('setRelationMetadata', newState);
},
clearRelationMetadata({ commit }) {
commit('setRelationMetadata', {});
},
=======
async updateTopBarTitle({ commit }, value) {
commit('setTopBarTitle', value);
},
>>>>>>>
updateRelationMetadata({ commit, state }, value) {
const newState = { ...state.relationMetadata, ...value };
commit('setRelationMetadata', newState);
},
clearRelationMetadata({ commit }) {
commit('setRelationMetadata', {});
},
async updateTopBarTitle({ commit }, value) {
commit('setTopBarTitle', value);
}, |
<<<<<<<
import { Cell, CellGroup } from "@sallar/react-native-cell-components";
=======
import { Cell, CellGroup } from "react-native-cell-components";
import { withNamespaces } from "react-i18next";
>>>>>>>
import { Cell, CellGroup } from "@sallar/react-native-cell-components";
import { withNamespaces } from "react-i18next"; |
<<<<<<<
import { AppRegistry, View, StatusBar, YellowBox } from "react-native";
=======
import { AppRegistry, View } from "react-native";
import { I18nextProvider } from "react-i18next";
>>>>>>>
import { AppRegistry, View, StatusBar, YellowBox } from "react-native";
import { I18nextProvider } from "react-i18next";
<<<<<<<
<Fragment>
<DropdownAlert ref={ref => (this.dropdown = ref)} closeInterval={8000} />
<StatusBar barStyle="dark-content" />
=======
<I18nextProvider i18n={i18n}>
>>>>>>>
<I18nextProvider i18n={i18n}>
<DropdownAlert ref={ref => (this.dropdown = ref)} closeInterval={8000} />
<StatusBar barStyle="dark-content" />
<<<<<<<
</Fragment>
=======
<DropdownAlert ref={ref => (this.dropdown = ref)} closeInterval={8000} />
</I18nextProvider>
>>>>>>>
</I18nextProvider> |
<<<<<<<
import { navigateBack } from "./nav.js";
import { simpleCloneObject } from "../library/helpers.js";
=======
import i18n from "../shared/i18n";
>>>>>>>
import { navigateBack } from "./nav.js";
import { simpleCloneObject } from "../library/helpers.js";
import i18n from "../shared/i18n"; |
<<<<<<<
...lang19Q4,
=======
// 2019-12-10
"ledger_tronlink":"Login to TRONSCAN via TronLink",
// 2019-12-18
"address_vote_reward_pending":"مكافأة التصويت",
"address_balance":"رصيد TRX",
"address_get_energe":"من أجل الحصول على الطاقة",
"address_get_bandwith":"للحصول على عرض النطاق الترددي",
"address_freeze_owner":"تجميد إلى حسابك",
"address_freeze_other":"تجميد إلى حسابات الآخرين",
>>>>>>>
// 2019-12-10
"ledger_tronlink":"Login to TRONSCAN via TronLink",
// 2019-12-18
"address_vote_reward_pending":"مكافأة التصويت",
"address_balance":"رصيد TRX",
"address_get_energe":"من أجل الحصول على الطاقة",
"address_get_bandwith":"للحصول على عرض النطاق الترددي",
"address_freeze_owner":"تجميد إلى حسابك",
"address_freeze_other":"تجميد إلى حسابات الآخرين",
...lang19Q4, |
<<<<<<<
const validFeeManagerTypes = ['BRIDGE_VALIDATORS_REWARD', 'POSDAO_REWARD']
=======
const validRewardModes = ['false', 'ONE_DIRECTION', 'BOTH_DIRECTIONS']
>>>>>>>
const validRewardModes = ['false', 'ONE_DIRECTION', 'BOTH_DIRECTIONS']
const validFeeManagerTypes = ['BRIDGE_VALIDATORS_REWARD', 'POSDAO_REWARD'] |
<<<<<<<
var React = require('react');
var Immutable = require('immutable');
var Draft = require('draft-js');
=======
/* globals React, ReactDOM, Draft, diff_match_patch, lodash */
>>>>>>>
<<<<<<<
// Create editors state
state.leftState = editorStateFromText(left);
state.rightState = editorStateFromText(right);
// Compute diff at block level
var blockMapLeft = state.leftState.getCurrentContent().getBlockMap();
var blockMapRight = state.rightState.getCurrentContent().getBlockMap();
var blockDiffs = contentBlockDiff(blockMapLeft, blockMapRight);
var mappings = blockDiffMapping(blockDiffs);
// Make decorators
state.leftState = Draft.EditorState.set(state.leftState, {
decorator: createDiffsDecorator(toTextMapping(mappings[0], blockMapRight), DIFF.DELETE)
});
state.rightState = Draft.EditorState.set(state.rightState, {
decorator: createDiffsDecorator(toTextMapping(mappings[1], blockMapLeft), DIFF.INSERT)
});
=======
// Create editors state
state.leftState = editorStateFromText(left);
state.rightState = editorStateFromText(right);
// Compute diff on whole texts
var diffs = computeDiff(left, right);
var mappingLeft = mapDiffsToBlocks(diffs, DIFF.REMOVED, state.leftState.getCurrentContent().getBlockMap());
var mappingRight = mapDiffsToBlocks(diffs, DIFF.INSERTED, state.rightState.getCurrentContent().getBlockMap());
// Update the decorators
state.leftState = Draft.EditorState.set(state.leftState, {
decorator: createDiffsDecorator(mappingLeft, DIFF.REMOVED)
});
state.rightState = Draft.EditorState.set(state.rightState, {
decorator: createDiffsDecorator(mappingRight, DIFF.INSERTED)
});
>>>>>>>
<<<<<<<
=======
this.debouncedUpdateDiffs();
}
// Update the EditorState
this.setState({
leftState: leftState
});
},
>>>>>>>
<<<<<<<
// Compute diff at block level
var blockMapLeft = this.state.leftState.getCurrentContent().getBlockMap();
var blockMapRight = rightState.getCurrentContent().getBlockMap();
var blockDiffs = contentBlockDiff(blockMapLeft, blockMapRight);
var mappings = blockDiffMapping(blockDiffs);
=======
// We use a debounced version of it
updateDiffs: function () {
var newState = {};
var left = this.state.leftState.getCurrentContent().getPlainText();
var right = this.state.rightState.getCurrentContent().getPlainText();
>>>>>>>
<<<<<<<
// Update the decorators
newState.leftState = Draft.EditorState.set(this.state.leftState, {
decorator: createDiffsDecorator(toTextMapping(mappings[0], blockMapRight), DIFF.DELETE)
});
newState.rightState = Draft.EditorState.set(rightState, {
decorator: createDiffsDecorator(toTextMapping(mappings[1], blockMapLeft), DIFF.INSERT)
});
} else {
// Just update the EditorState
newState.leftState = this.state.leftState;
newState.rightState = rightState;
}
=======
var diffs = computeDiff(left, right);
>>>>>>>
<<<<<<<
function toTextMapping(blockMapping, blockMap) {
return new Immutable.Map(blockMapping).map(function (mappedDiff, blockKey) {
return {
type: mappedDiff.type,
mappedText: mappedDiff.key ? blockMap.get(mappedDiff.key).getText() : undefined
};
}).toObject();
=======
function editorStateFromText(text, decorator) {
var content = Draft.ContentState.createFromText(text);
return Draft.EditorState.createWithContent(content, decorator);
>>>>>>>
<<<<<<<
function editorStateFromText(text) {
var content = Draft.ContentState.createFromText(text);
return Draft.EditorState.createWithContent(content);
=======
function computeDiff(txt1, txt2) {
var diffs = DMP.diff_wordMode(txt1, txt2);
return diffs;
>>>>>>>
<<<<<<<
* @param textMapping
=======
>>>>>>>
<<<<<<<
function createDiffsDecorator(textMapping, type) {
=======
function createDiffsDecorator(mappedRanges, type) {
>>>>>>>
<<<<<<<
strategy: findDiff.bind(undefined, textMapping, type),
component: type === DIFF.INSERT ? InsertedSpan : RemovedSpan
=======
strategy: findDiff.bind(undefined, mappedRanges, type),
component: type === DIFF.INSERTED ? InsertedSpan : RemovedSpan
>>>>>>>
<<<<<<<
function findDiff(textMapping, type, contentBlock, callback) {
var key = contentBlock.getKey();
var blockDiff = textMapping[key];
if (!blockDiff) {
return;
}
if (blockDiff.type === type) {
var text1;
var text2;
if (type === DIFF.INSERT) {
text1 = blockDiff.mappedText || '';
text2 = contentBlock.getText();
} else {
text1 = contentBlock.getText();
text2 = blockDiff.mappedText || '';
}
var diffs = DWM.diff_wordMode(text1, text2);
var charIndex = 0;
diffs.forEach(function (diff) {
var diffType = diff[0];
var diffText = diff[1];
if (diffType === DIFF.EQUAL) {
// No highlight. Move to next difference
charIndex += diffText.length;
} else if (diffType === type) {
// Highlight, and move to next difference
callback(charIndex, charIndex + diffText.length);
charIndex += diffText.length;
} else {
// The diff text should not be in the contentBlock, so skip.
return;
}
});
}
=======
function findDiff(mappedRanges, type, contentBlock, callback) {
var mapping = mappedRanges.get(contentBlock.getKey());
if (mapping && mapping.text === contentBlock.getText()) {
mapping.ranges.forEach(function (range) {
callback(range.start, range.end);
});
}
>>>>>>> |
<<<<<<<
.src([
'node_modules/{bootstrap/dist/css/bootstrap.min,jquery-ui-css/jquery-ui.min}.css',
'./node_modules/@binary-com/smartcharts/dist/smartcharts.css',
])
=======
.src(['node_modules/jquery-ui-css/jquery-ui.min.css'])
>>>>>>>
.src([
'node_modules/{bootstrap/dist/css/bootstrap.min,jquery-ui-css/jquery-ui.min}.css',
'./node_modules/@binary-com/smartcharts/dist/smartcharts.css',
])
.src(['node_modules/jquery-ui-css/jquery-ui.min.css']) |
<<<<<<<
this.appendDummyInput()
.appendField(i18n._("Step 1: Trade"));
this.appendStatementInput("SUBMARKET")
.setCheck('Submarket');
=======
this.appendStatementInput("SUBMARKET")
.setCheck("Submarket")
.appendField(i18n._("Step 1: Define Trade"));
>>>>>>>
this.appendDummyInput()
.appendField(i18n._("Step 1: Define Trade"));
this.appendStatementInput("SUBMARKET")
.setCheck('Submarket'); |
<<<<<<<
import WebhookInterface from './WebhookInterface';
=======
import { translate } from '../../../common/i18n';
>>>>>>>
import WebhookInterface from './WebhookInterface';
import { translate } from '../../../common/i18n'; |
<<<<<<<
target: view.getUiComponent('undo_redo'),
closeButton: true,
=======
target: view.getUiComponent('actions_menu'),
>>>>>>>
target: view.getUiComponent('actions_menu'),
closeButton: true,
<<<<<<<
content: '<p>' + i18n._("You can see the summary of your trades by clicking on this button.") + '</p>',
target: view.getUiComponent('summary'),
closeButton: true,
=======
content: '<p>' + i18n._("You can see the summary of your trades in this menu.") + '</p>',
target: view.getUiComponent('actions_menu'),
>>>>>>>
content: '<p>' + i18n._("You can see the summary of your trades in this menu.") + '</p>',
target: view.getUiComponent('actions_menu'),
closeButton: true, |
<<<<<<<
</Fragment>
);
default:
return (
<Fragment>
<div className="card-body table-title">
<h5>
<i className="fa fa-exchange-alt"></i>
{contract.contractType}
</h5>
</div>
<table className="table">
<tbody>
{
contract['owner_address']?
<Field label="owner_address"><AddressLink address={contract['owner_address']}/></Field>
:''
}
</tbody>
</table>
</Fragment>
);
}
}
=======
</Fragment>
);
default:
return (
<Fragment>
<div className="card-body table-title">
<h5>
<i className="fa fa-exchange-alt"></i>
{contract.contractType}
</h5>
</div>
<table className="table">
<tbody>
{
contract['owner_address']?
<Field label="owner_address"><AddressLink address={contract['owner_address']}/></Field>
:''
}
</tbody>
</table>
</Fragment>
);
}
}
>>>>>>>
</Fragment>
);
default:
return (
<Fragment>
<div className="card-body table-title">
<h5>
<i className="fa fa-exchange-alt"></i>
{contract.contractType}
</h5>
</div>
<table className="table">
<tbody>
{
contract['owner_address']?
<Field label="owner_address"><AddressLink address={contract['owner_address']}/></Field>
:''
}
</tbody>
</table>
</Fragment>
);
}
}
<<<<<<<
=======
>>>>>>> |
<<<<<<<
camZ = width / tan(90 / 2) << 0; // adapting cam pos to field of view (90°)
=======
camZ = width / 1.5 / tan(90 / 2) << 0; // adapting cam pos to field of view (90°), 1.5 is an empirical correction factor
>>>>>>>
camZ = width / 1.5 / tan(90 / 2) << 0; // adapting cam pos to field of view (90°), 1.5 is an empirical correction factor
<<<<<<<
footprint, roof, wall,
=======
footprint, roof,
>>>>>>>
footprint, roof,
<<<<<<<
wall = [];
=======
>>>>>>>
<<<<<<<
if ((bx - ax) * (_a[1] - ay) > (_a[0] - ax) * (by - ay)) {
wall = [
bx + 0.5, by + 0.5,
ax + 0.5, ay + 0.5,
_a[0], _a[1],
_b[0], _b[1]
];
=======
if ((bx - ax) * (_a.y - ay) > (_a.x - ax) * (by - ay)) {
>>>>>>>
if ((bx - ax) * (_a.y - ay) > (_a.x - ax) * (by - ay)) {
<<<<<<<
drawShape(roof, TRUE);
=======
drawShape(roof, !shadows);
>>>>>>>
drawShape(roof, !shadows); |
<<<<<<<
// 03-26 tag
account_tags_list:'Lista de etiquetas',
account_tags_add:'Agregar',
account_tags_desc:'Función de etiquetas, poner etiquetas personales para que puedas agregar cuentas con más facilidad',
account_tags_number:'{total} cuentas en total',
account_tags_table_1:'etiquetas',
account_tags_table_2:'Nota',
account_tags_add_title:'Agregar etiquetas',
account_tags_edit_title:'edit tag',
account_tags_add_success:'The tag has been successfully added',
account_tags_edit_success:'The tag has been successfully edited',
account_tags_number_rec:'{number} accounts mark',
account_tags_tip:'Etiquetas personales, sólo se muestra para tí',
account_tags_edit: "edit",
account_tags_delete: "remove",
account_tags_delete_is: "¿Estás seguro de quitar la etiqueta?",
account_tags_delete_succss: "Eliminado con éxito",
account_address_name_tag:'(Etiqueta certificada por la plataforma)',
account_tags_address_placehold:'请输入正确的地址',
account_tags_tag_placehold:'Ingrese una etiqueta con una longitud de 20 caracteres.',
account_tags_note_placehold:'Opcional, entre 100 caracteres',
account_tags_tag_valid:'Only Chinese, English or Arabic numbers can be entered',
account_tags_rec:"Etiqueta certificada por la plataforma",
account_tags_my_tag:'Mis etiquetas',
account_tags_my_tag_update:'Actualización',
account_tags_my_tag_login_show:'Mostrar después de iniciar sesión',
account_tags_my_tag_not_available:'Not Available',
=======
fill_a_valid_ledger_note:'Please confirm that the Transactions Data option in the ledger settings is allowed, otherwise you cannot send notes',
enter_up_to_50_characters:'Enter up to 50 characters',
>>>>>>>
// 03-26 tag
account_tags_list:'Lista de etiquetas',
account_tags_add:'Agregar',
account_tags_desc:'Función de etiquetas, poner etiquetas personales para que puedas agregar cuentas con más facilidad',
account_tags_number:'{total} cuentas en total',
account_tags_table_1:'etiquetas',
account_tags_table_2:'Nota',
account_tags_add_title:'Agregar etiquetas',
account_tags_edit_title:'edit tag',
account_tags_add_success:'The tag has been successfully added',
account_tags_edit_success:'The tag has been successfully edited',
account_tags_number_rec:'{number} accounts mark',
account_tags_tip:'Etiquetas personales, sólo se muestra para tí',
account_tags_edit: "edit",
account_tags_delete: "remove",
account_tags_delete_is: "¿Estás seguro de quitar la etiqueta?",
account_tags_delete_succss: "Eliminado con éxito",
account_address_name_tag:'(Etiqueta certificada por la plataforma)',
account_tags_address_placehold:'请输入正确的地址',
account_tags_tag_placehold:'Ingrese una etiqueta con una longitud de 20 caracteres.',
account_tags_note_placehold:'Opcional, entre 100 caracteres',
account_tags_tag_valid:'Only Chinese, English or Arabic numbers can be entered',
account_tags_rec:"Etiqueta certificada por la plataforma",
account_tags_my_tag:'Mis etiquetas',
account_tags_my_tag_update:'Actualización',
account_tags_my_tag_login_show:'Mostrar después de iniciar sesión',
account_tags_my_tag_not_available:'Not Available',
fill_a_valid_ledger_note:'Please confirm that the Transactions Data option in the ledger settings is allowed, otherwise you cannot send notes',
enter_up_to_50_characters:'Enter up to 50 characters', |
<<<<<<<
"can_be_unlocked_now": "通证可以解锁",
=======
"totle_transactions_per_day":"总交易数",
"tron_total_transactions_chart":"TRON总交易数图表",
>>>>>>>
"totle_transactions_per_day":"总交易数",
"tron_total_transactions_chart":"TRON总交易数图表",
"can_be_unlocked_now": "通证可以解锁", |
<<<<<<<
context.fillStyle = item[RENDERCOLOR][2] || roofColorAlpha;
context.strokeStyle = item[RENDERCOLOR][1] || altColorAlpha;
drawRoof3(roof, h);
=======
context.fillStyle = item[RENDER_COLOR][2] || roofColorAlpha;
context.strokeStyle = item[RENDER_COLOR][1] || altColorAlpha;
drawShape(roof, true);
>>>>>>>
context.fillStyle = item[RENDER_COLOR][2] || roofColorAlpha;
context.strokeStyle = item[RENDER_COLOR][1] || altColorAlpha;
drawRoof3(roof, h); |
<<<<<<<
hide() {
if ((this.element.contains(event.target) === false) && (!this.menuTarget.classList.contains(this.toggleClass))) {
=======
hide(event) {
if (this.element.contains(event.target) === false) {
>>>>>>>
hide(event) {
if ((this.element.contains(event.target) === false) && (!this.menuTarget.classList.contains(this.toggleClass))) { |
<<<<<<<
if (!this.data.get("disable-backdrop")) {
document.body.insertAdjacentHTML('beforeend', this.backgroundHtml);
this.background = document.querySelector('#' + this.backgroundId)
}
=======
document.body.insertAdjacentHTML('beforeend', this.backgroundHtml);
this.background = document.querySelector(`#${this.backgroundId}`);
>>>>>>>
if (!this.data.get("disable-backdrop")) {
document.body.insertAdjacentHTML('beforeend', this.backgroundHtml);
this.background = document.querySelector(`#${this.backgroundId}`);
}
<<<<<<<
if (this.background) { this.background.remove() }
=======
this.background.remove();
>>>>>>>
if (this.background) { this.background.remove() } |
<<<<<<<
export { Autosave, Dropdown, Modal, Tabs, Toggle }
=======
export {
Dropdown,
Modal,
Tabs,
Toggle,
Popover
}
>>>>>>>
export {
Autosave,
Dropdown,
Modal,
Tabs,
Toggle,
Popover
} |
<<<<<<<
import React, { useState, useEffect } from 'react';
=======
import React, { useState, useRef } from 'react';
import html2canvas from 'html2canvas';
>>>>>>>
import React, { useState, useRef, useEffect } from 'react';
import html2canvas from 'html2canvas';
<<<<<<<
const mutateMapText = (newText) => {
=======
const mutateMapText = (newText) => {
>>>>>>>
const mutateMapText = (newText) => {
<<<<<<<
generateMap(mapText, metaText);
=======
generateMap(newText, newMeta);
>>>>>>>
generateMap(mapText, metaText);
<<<<<<<
$("#map")
.html(renderSvg(r, getWidth(), getHeight()))
.on("mousemove", drag);
$(".draggable")
.on("mousedown", startDrag)
.on("mouseup", endDrag);
=======
setMapObject(r);
setMapDimensions({width: getWidth(), height: 600});
setMapStyle(r.presentation.style);
$('g#map').html(renderSvg(r, getWidth(), 600));
$('.draggable').on('mousedown', startDrag)
.on('mousemove', drag)
.on('mouseup', endDrag);
>>>>>>>
setMapObject(r);
setMapDimensions({width: getWidth(), getHeight()});
setMapStyle(r.presentation.style);
$('g#map').html(renderSvg(r, getWidth(), 600));
$('.draggable').on('mousedown', startDrag)
.on('mousemove', drag)
.on('mouseup', endDrag);
<<<<<<<
<React.Fragment>
<nav className="navbar navbar-dark">
<div className="container-fluid">
<a className="navbar-brand" href="#">
<h3>Online Wardley Maps</h3>
</a>
<div id="controlsMenuControl">
<Controls mutateMapText={mutateMapText} newMapClick={NewMap} saveMapClick={SaveMap} />
</div>
=======
<>
<nav className="navbar navbar-dark">
<div className="container-fluid">
<a className="navbar-brand" href="#">
<h3>Online Wardley Maps</h3>
</a>
<div id="controlsMenuControl">
<Controls mutateMapText={mutateMapText} newMapClick={NewMap} saveMapClick={SaveMap} downloadMapImage={downloadMap} />
>>>>>>>
<React.Fragment>
<nav className="navbar navbar-dark">
<div className="container-fluid">
<a className="navbar-brand" href="#">
<h3>Online Wardley Maps</h3>
</a>
<div id="controlsMenuControl">
<Controls mutateMapText={mutateMapText} newMapClick={NewMap} saveMapClick={SaveMap} downloadMapImage={downloadMap} />
</div>
<<<<<<<
=======
<MapView
mapTitle={mapTitle}
mapObject={mapObject}
mapDimensions={mapDimensions}
mapEvolutionStates={mapEvolutionStates}
mapStyle={mapStyle}
mapRef={mapRef} />
>>>>>>> |
<<<<<<<
=======
} else if (status === 'special') {
statusDetail = chrome.i18n.getMessage('js_popup_special');
statusIconClass = 'fa fa-remove';
>>>>>>>
<<<<<<<
statusDetail = 'No network connection.';
statusIconClass = 'fa fa-plane';
=======
statusDetail = chrome.i18n.getMessage('js_popup_no_connectivity');
statusIconClass = 'fa fa-pause';
>>>>>>>
statusDetail = chrome.i18n.getMessage('js_popup_no_connectivity');
statusIconClass = 'fa fa-plane';
<<<<<<<
statusDetail = 'Connected to power source.';
statusIconClass = 'fa fa-plug';
=======
statusDetail = chrome.i18n.getMessage('js_popup_charging');
statusIconClass = 'fa fa-pause';
}
>>>>>>>
statusDetail = chrome.i18n.getMessage('js_popup_charging');
statusIconClass = 'fa fa-plug'; |
<<<<<<<
=======
contextMenuItems = [];
//Open tab suspended
contextMenuItems.push(chrome.contextMenus.create({
title: chrome.i18n.getMessage('js_background_open_link_in_suspended_tab'),
contexts:["link"],
onclick: function (info, tab) {
openLinkInSuspendedTab(tab, info.linkUrl);
}
}));
>>>>>>>
<<<<<<<
chrome.contextMenus.create({
title: 'Suspend tab',
=======
//make right click Context Menu for Chrome
contextMenuItems.push(chrome.contextMenus.create({
type: "separator"
}));
//Suspend present tab
contextMenuItems.push(chrome.contextMenus.create({
title: chrome.i18n.getMessage('js_background_suspend_tab'),
>>>>>>>
chrome.contextMenus.create({
title: chrome.i18n.getMessage('js_background_suspend_tab'),
<<<<<<<
});
chrome.contextMenus.create({
title: 'Don\'t suspend for now',
=======
}));
//Add present tab to temporary whitelist
contextMenuItems.push(chrome.contextMenus.create({
title: chrome.i18n.getMessage('js_background_dont_suspend_now'),
>>>>>>>
});
chrome.contextMenus.create({
title: chrome.i18n.getMessage('js_background_dont_suspend_now'),
<<<<<<<
});
chrome.contextMenus.create({
title: 'Never suspend this site',
=======
}));
//Add present tab to permenant whitelist
contextMenuItems.push(chrome.contextMenus.create({
title: chrome.i18n.getMessage('js_background_never_suspend_site'),
>>>>>>>
});
chrome.contextMenus.create({
title: chrome.i18n.getMessage('js_background_never_suspend_site'), |
<<<<<<<
RSVPnotifications = new Mongo.Collection("rsvp-notifications");
Comments = new Mongo.Collection('comments');
=======
RSVPnotifications = new Mongo.Collection("rsvp-notifications");
ArchivedUsers = new Mongo.Collection("archived-users");
>>>>>>>
RSVPnotifications = new Mongo.Collection("rsvp-notifications");
Comments = new Mongo.Collection('comments');
ArchivedUsers = new Mongo.Collection("archived-users"); |
<<<<<<<
this.ready();
=======
>>>>>>>
this.ready();
<<<<<<<
var projection = new Object();
projection.sort = {'start' : 1};
projection.fields = {"topic" : 1, 'host':1, "views" : 1, "users" : 1, "slug" : 1, "start":1, "end":1 ,'type':1, 'group':1 };
projection.limit = limit;
var options = new Object();
options.reactive=false;
switch (hangoutFilter) {
case 'live':
query.start = {'$lte' : new Date()};
query.end = {'$gte' : new Date()};
break;
case 'upcoming':
query.start = {$gte : new Date()};
break;
default:
}
return Hangouts.find(query, projection, options);
});
Meteor.publish("hangoutByGroupId", function(groupId, limit, hangoutFilter) {
check(limit, Number);
check(hangoutFilter, String);
var query = new Object();
query.visibility = {$ne:false};
query['group.id'] = groupId;
=======
>>>>>>>
var projection = new Object();
projection.sort = {'start' : 1};
projection.fields = {"topic" : 1, 'host':1, "views" : 1, "users" : 1, "slug" : 1, "start":1, "end":1 ,'type':1, 'group':1 };
projection.limit = limit;
var options = new Object();
options.reactive=false;
switch (hangoutFilter) {
case 'live':
query.start = {'$lte' : new Date()};
query.end = {'$gte' : new Date()};
break;
case 'upcoming':
query.start = {$gte : new Date()};
break;
default:
}
return Hangouts.find(query, projection, options);
});
Meteor.publish("hangoutByGroupId", function(groupId, limit, hangoutFilter) {
check(limit, Number);
check(hangoutFilter, String);
var query = new Object();
query.visibility = {$ne:false};
query['group.id'] = groupId; |
<<<<<<<
Template.profile.rendered = function() {
Meteor.call('getHangoutsJoinedCount', function(err, result){
Session.set('hangoutsJoinedCount', result);
});
};
=======
Template.profile.onCreated(function(){
var username = FlowRouter.getParam('name');
var title = username + " | Profile";
DocHead.setTitle(title);
});
>>>>>>>
Template.profile.rendered = function() {
Meteor.call('getHangoutsJoinedCount', function(err, result){
Session.set('hangoutsJoinedCount', result);
});
};
Template.profile.onCreated(function(){
var username = FlowRouter.getParam('name');
var title = username + " | Profile";
DocHead.setTitle(title);
}); |
<<<<<<<
Template.hangoutList.onCreated(function () {
var instance = this;
instance.limit = new ReactiveVar(5);
instance.flag = new ReactiveVar(false);
instance.autorun(function () {
var limit = instance.limit.get();
instance.subscribe('hangouts', limit);
});
=======
Template.hangoutList.onCreated(function() {
var instance = this;
instance.limit = new ReactiveVar(20);
instance.flag = new ReactiveVar(false);
instance.autorun(function () {
var limit = instance.limit.get();
instance.subscribe('hangouts', limit);
});
var instance = this;
>>>>>>>
Template.hangoutList.onCreated(function() {
var instance = this;
instance.limit = new ReactiveVar(20);
instance.flag = new ReactiveVar(false);
instance.autorun(function () {
var limit = instance.limit.get();
instance.subscribe('hangouts', limit);
});
<<<<<<<
if (Hangouts.find().count() === instance.limit.get()) {
instance.limit.set(instance.limit.get() + 8);
=======
if(Hangouts.find().count() === instance.limit.get()){
instance.limit.set(instance.limit.get() + 9);
>>>>>>>
if(Hangouts.find().count() === instance.limit.get()){
instance.limit.set(instance.limit.get() + 9); |
<<<<<<<
Meteor.startup(function(){
/*Use reactive-var to make sure inProgress hangouts change automatically*/
reactiveDate = {
nowMinutes: new ReactiveVar(new Date)
};
setInterval(function () {
reactiveDate.nowMinutes.set(new Date);
}, 60 * 1000); // every minute
/*Hangout Links*/
});
=======
Meteor.startup(function(){
$.getScript('https://apis.google.com/js/platform.js', function(){
// // script has loaded
var active_hangouts = [];
jQuery("div[id^='placeholder-div']").each(function(i,e) {
active_hangouts.push($(e).attr('id'));
});
active_hangouts.forEach(function(entry) {
gapi.hangout.render(entry, { 'render': 'createhangout', 'widget_size': 72 });
});
});
/*Use reactive-var to make sure inProgress hangouts change automatically*/
reactiveDate = {
nowMinutes: new ReactiveVar(new Date)
};
setInterval(function () {
reactiveDate.nowMinutes.set(new Date);
}, 60 * 1000); // every minute
/*Hangout Links*/
});
>>>>>>>
/*Use reactive-var to make sure inProgress hangouts change automatically*/
reactiveDate = {
nowMinutes: new ReactiveVar(new Date)
};
setInterval(function () {
reactiveDate.nowMinutes.set(new Date);
}, 60 * 1000); // every minute
/*Hangout Links*/
});
<<<<<<<
return reactiveDate.nowMinutes.get() > hangout.start && reactiveDate.nowMinutes.get() < hangout.end;
//return reactiveDate.nowMinutes.get() > hangout.start && reactiveDate.nowMinutes.get() < hangout.end;
=======
function return_unused_link() {
hangout_links = {
'http://codebuddies.org/hangout': 'unused',
'http://codebuddies.org/javascript-hangout': 'unused',
'http://codebuddies.org/python-hangout': 'unused',
}
//whether the button has a URL
//if it has a URL, flag it as "used"
// if button doesn't have a URL, then find the first URL in hangout_links
//that does not have a status of "used"
// turn the status to "used"
// change value back to unused when the button status becomes false.
for (var key in hangout_links) {
if (hangout_links[key] === 'unused') {
console.log(key + ' yay');
hangout_link = key;
hangout_links[key] === 'used';
console.log(key + ' afterwards');
break;
} else {
continue;
}
}
//var hangout_link = ._findkey(hangout_links, function(o) { return o === "unused"}; });
console.log(hangout_link);
return hangout_link;
} //function
//console.log(reactiveDate.nowMinutes.get()-60000);
//console.log(hangout.start+10000 + 'hangout.start')
if (reactiveDate.nowMinutes.get() > hangout.start && reactiveDate.nowMinutes.get() < hangout.end) {
// jQuery("div[id^='placeholder-div-]").each(function(i,e) {
// e.addClass('show-hangout');
// });
//gapi.hangout.render("placeholder-div-"+hangout._id, { 'render': 'createhangout', 'widget_size': 72 });
$("div[id^='hangout-']").each(function () {
this.attr('href', return_unused_link()).css('background','dodgerblue');
console.log(hangout._id);
});
return true;
} else {
return false;
}
//return reactiveDate.nowMinutes.get() > hangout.start && reactiveDate.nowMinutes.get() < hangout.end;
>>>>>>>
return reactiveDate.nowMinutes.get() > hangout.start && reactiveDate.nowMinutes.get() < hangout.end;
//return reactiveDate.nowMinutes.get() > hangout.start && reactiveDate.nowMinutes.get() < hangout.end; |
<<<<<<<
ArchivedUsers = new Mongo.Collection("archived-users");
StudyGroups = new Mongo.Collection("study-groups");
Resources = new Mongo.Collection("resources");
Activities = new Mongo.Collection("activities");
=======
ArchivedUsers = new Mongo.Collection("archived-users");
Migrations = new Mongo.Collection("migrations");
>>>>>>>
ArchivedUsers = new Mongo.Collection("archived-users");
StudyGroups = new Mongo.Collection("study-groups");
Resources = new Mongo.Collection("resources");
Activities = new Mongo.Collection("activities");
Migrations = new Mongo.Collection("migrations"); |
<<<<<<<
});
Meteor.publish("studyGroupMemberDetail", function (groupId, userId) {
check(groupId, String);
check(userId, String);
if (Roles.userIsInRole(this.userId, ["owner","moderator"], groupId)) {
return Meteor.users.find({_id: userId}, {fields: {'createdAt':1, email: 1, profile: 1, roles: 1, username: 1, status: 1}});
}
this.ready();
=======
>>>>>>>
});
Meteor.publish("studyGroupMemberDetail", function (groupId, userId) {
check(groupId, String);
check(userId, String);
if (Roles.userIsInRole(this.userId, ["owner","moderator"], groupId)) {
return Meteor.users.find({_id: userId}, {fields: {'createdAt':1, email: 1, profile: 1, roles: 1, username: 1, status: 1}});
}
this.ready(); |
<<<<<<<
const quality = parseInt(req.query.quality || 75, 10)
const baseHost = options.baseHost || req.headers.host
=======
const quality = parseInt(req.query.quality || DEFAULT_QUALITY, 10)
>>>>>>>
const quality = parseInt(req.query.quality || DEFAULT_QUALITY, 10)
const baseHost = options.baseHost || req.headers.host |
<<<<<<<
const { className, children } = this.props
const theme = this.state.theme || this.props.theme || {}
=======
const { className, children, innerRef } = this.props
const theme = this.state.theme || {}
>>>>>>>
const { className, children, innerRef } = this.props
const theme = this.state.theme || this.props.theme || {} |
<<<<<<<
import constructWithOptions from './constructWithOptions'
import type { Target } from '../types'
=======
import css from './css'
import type { Interpolation, Target } from '../types'
import domElements from '../utils/domElements'
>>>>>>>
import constructWithOptions from './constructWithOptions'
import type { Target } from '../types'
import domElements from '../utils/domElements' |
<<<<<<<
propsForElement.ref = this.generateRef()
delete propsForElement.innerRef
=======
if (innerRef) {
propsForElement.ref = innerRef
if (isTag(target)) delete propsForElement.innerRef
}
>>>>>>>
if (innerRef) {
propsForElement.ref = this.generateRef()
if (isTag(target)) delete propsForElement.innerRef
} |
<<<<<<<
var A_LAST = MAX_NUM_ITEMS;
var A_FUTURE = (A_LAST + 1);
var A_UNSET = (A_LAST + 2);
=======
var A_LAST = (MAX_NUM_ADVANCES + 1);
var A_UNSET = (A_LAST + 1);
var A_FUTURE = (A_LAST + 2);
>>>>>>>
var A_LAST = (MAX_NUM_ADVANCES + 1);
var A_FUTURE = (A_LAST + 1);
var A_UNSET = (A_LAST + 2); |
<<<<<<<
=======
state.clickedComponentToDelete = payload;
setTimeout(() => {
state.clickedComponentToDelete = '';
console.log('clickedComponentToDelete has been reset');
}, 2500);
>>>>>>>
<<<<<<<
const { componentMap, clickedComponent: componentName } = state;
let newObj = Object.assign({}, componentMap);
delete newObj[componentName];
=======
const { componentMap, clickedComponentToDelete: componentName } = state;
>>>>>>>
const { componentMap, clickedComponent: componentName } = state;
let newObj = Object.assign({}, componentMap);
delete newObj[componentName];
<<<<<<<
state.componentMap = newObj;
=======
delete componentMap[componentName];
let newObj = Object.assign({}, componentMap);
state.componentMap = newObj;
>>>>>>>
state.componentMap = newObj; |
<<<<<<<
Vue.use(Buefy, {
defaultIconPack: 'fas'
});
Vue.use(VModal, { dynamic: true });
=======
// Vue.use(VModal, { dynamic: true });
>>>>>>>
Vue.use(Buefy, {
defaultIconPack: 'fas'
});
// Vue.use(VModal, { dynamic: true }); |
<<<<<<<
},
[types.deleteProjectTab]: ({ commit }, payload) => {
commit(types.DELETE_PROJECT_TAB, payload);
=======
},
[types.updateComponentChildrenMultiselectValue]: ({ commit }, payload) => {
commit(types.UPDATE_COMPONENT_CHILDREN_MULTISELECT_VALUE, payload);
},
[types.updateActiveComponentChildrenValue]: ({ commit }, payload) => {
commit(types.UPDATE_ACTIVE_COMPONENT_CHILDREN_VALUE, payload);
commit(types.UPDATE_COMPONENT_CHILDREN_MULTISELECT_VALUE, []);
},
[types.updateComponentNameInputValue]: ({ commit }, payload) => {
commit(types.UPDATE_COMPONENT_NAME_INPUT_VALUE, payload);
>>>>>>>
},
[types.deleteProjectTab]: ({ commit }, payload) => {
commit(types.DELETE_PROJECT_TAB, payload);
},
[types.updateComponentChildrenMultiselectValue]: ({ commit }, payload) => {
commit(types.UPDATE_COMPONENT_CHILDREN_MULTISELECT_VALUE, payload);
},
[types.updateActiveComponentChildrenValue]: ({ commit }, payload) => {
commit(types.UPDATE_ACTIVE_COMPONENT_CHILDREN_VALUE, payload);
commit(types.UPDATE_COMPONENT_CHILDREN_MULTISELECT_VALUE, []);
},
[types.updateComponentNameInputValue]: ({ commit }, payload) => {
commit(types.UPDATE_COMPONENT_NAME_INPUT_VALUE, payload); |
<<<<<<<
export const SET_STATE = 'SET_STATE';
=======
export const ADD_PROJECT = 'ADD_PROJECT';
>>>>>>>
export const SET_STATE = 'SET_STATE';
export const ADD_PROJECT = 'ADD_PROJECT';
<<<<<<<
export const deleteSelectedElement = 'deleteSelectedElement';
export const setState = 'setState';
=======
export const deleteSelectedElement = 'deleteSelectedElement';
export const addProject = 'addProject';
>>>>>>>
export const deleteSelectedElement = 'deleteSelectedElement';
export const setState = 'setState';
export const addProject = 'addProject'; |
<<<<<<<
//2019-12-10 leon
"token_overview":"Token Tracker",
"token_rank": "Rank",
"gain_tip": "24 hour change compared with TRX",
"total_supply_tip1": "Calculated by multiplying total circulating supply by current price of each token. Tokens with 24h trading volume lower than ",
"total_supply_tip2":" TRX are excluded.",
"market_capitalization_t": "Market Cap",
"token_tron_total": "Total TRON Tokens",
"token_week": "This Week",
"token_scan_total": "Total in TRONSCAN",
"create_token_btn": "Issue Tokens",
"token_exchange":"Exchange",
"token_exchange_pair":"Trading Pair",
"token_exchange_price":"Price",
"token_exchange_24h_vol":"24h Volume",
"token_exchange_vol_rate":"Percentage",
"token_exchange_total1":" ",
"token_exchange_total2":" trading pairs in total",
"token_exchange_rate_tip":"24h volume of the trading pair / 24h volume of the token",
"contract_available_energy":"Available Energy",
=======
//2019-12-15
"token_estimated_cost":"Estimated Cost",
"token_enter_number":"Please enter the amount you want to buy",
"token_rules_0":"Unknown",
"token_rules_1":"Neutral",
"token_rules_2":"OK",
"token_rules_3":"Suspicious",
"token_rules_4":"Scam",
>>>>>>>
//2019-12-10 leon
"token_overview":"Token Tracker",
"token_rank": "Rank",
"gain_tip": "24 hour change compared with TRX",
"total_supply_tip1": "Calculated by multiplying total circulating supply by current price of each token. Tokens with 24h trading volume lower than ",
"total_supply_tip2":" TRX are excluded.",
"market_capitalization_t": "Market Cap",
"token_tron_total": "Total TRON Tokens",
"token_week": "This Week",
"token_scan_total": "Total in TRONSCAN",
"create_token_btn": "Issue Tokens",
"token_exchange":"Exchange",
"token_exchange_pair":"Trading Pair",
"token_exchange_price":"Price",
"token_exchange_24h_vol":"24h Volume",
"token_exchange_vol_rate":"Percentage",
"token_exchange_total1":" ",
"token_exchange_total2":" trading pairs in total",
"token_exchange_rate_tip":"24h volume of the trading pair / 24h volume of the token",
"contract_available_energy":"Available Energy",
//2019-12-15
"token_estimated_cost":"Estimated Cost",
"token_enter_number":"Please enter the amount you want to buy",
"token_rules_0":"Unknown",
"token_rules_1":"Neutral",
"token_rules_2":"OK",
"token_rules_3":"Suspicious",
"token_rules_4":"Scam", |
<<<<<<<
it(`handles eq operator with false value`, async () => {
let result = await queryResult(
nodes,
`
{
allNode(filter: {boolean: { eq: false }}) {
edges { node { name }}
}
}
`
)
expect(result.errors).not.toBeDefined()
expect(result.data.allNode.edges.length).toEqual(1)
expect(result.data.allNode.edges[0].node.name).toEqual(`The Mad Wax`)
})
=======
it(`handles eq operator with 0`, async () => {
let result = await queryResult(
nodes,
`
{
allNode(filter: {hair: { eq: 0 }}) {
edges { node { hair }}
}
}
`
)
expect(result.errors).not.toBeDefined()
expect(result.data.allNode.edges.length).toEqual(1)
expect(result.data.allNode.edges[0].node.hair).toEqual(0)
})
>>>>>>>
it(`handles eq operator with false value`, async () => {
let result = await queryResult(
nodes,
`
{
allNode(filter: {boolean: { eq: false }}) {
edges { node { name }}
}
}
`
)
expect(result.errors).not.toBeDefined()
expect(result.data.allNode.edges.length).toEqual(1)
expect(result.data.allNode.edges[0].node.name).toEqual(`The Mad Wax`)
})
it(`handles eq operator with 0`, async () => {
let result = await queryResult(
nodes,
`
{
allNode(filter: {hair: { eq: 0 }}) {
edges { node { hair }}
}
}
`
)
expect(result.errors).not.toBeDefined()
expect(result.data.allNode.edges.length).toEqual(1)
expect(result.data.allNode.edges[0].node.hair).toEqual(0)
}) |
<<<<<<<
const websocketManager = require(`../utils/websocket-manager`)
=======
const getSslCert = require(`../utils/get-ssl-cert`)
>>>>>>>
const websocketManager = require(`../utils/websocket-manager`)
const getSslCert = require(`../utils/get-ssl-cert`)
<<<<<<<
const server = require(`http`).Server(app)
websocketManager.init({ server, directory: program.directory })
const socket = websocketManager.getSocket()
=======
let server = require(`http`).Server(app)
// If a SSL cert exists in program, use it with `createServer`.
if (program.ssl) {
server = require(`https`).createServer(program.ssl, app)
}
const io = require(`socket.io`)(server)
io.on(`connection`, socket => {
socket.join(`clients`)
})
>>>>>>>
==== BASE ====
let server = require(`http`).Server(app)
// If a SSL cert exists in program, use it with `createServer`.
if (program.ssl) {
server = require(`https`).createServer(program.ssl, app)
}
websocketManager.init({ server, directory: program.directory })
const socket = websocketManager.getSocket() |
<<<<<<<
type QueryJob = {
id: string,
hash?: string,
jsonName: string,
query: string,
componentPath: string,
context: Object,
isPage: Boolean,
}
// Run query
module.exports = async (queryJob: QueryJob, component: Any) => {
=======
const indentString = string => string.replace(/\n/g, `\n `)
// Run query for a page
module.exports = async (pageOrLayout, component) => {
pageOrLayout.id = pageOrLayout._id
>>>>>>>
type QueryJob = {
id: string,
hash?: string,
jsonName: string,
query: string,
componentPath: string,
context: Object,
isPage: Boolean,
}
const indentString = string => string.replace(/\n/g, `\n `)
// Run query
module.exports = async (queryJob: QueryJob, component: Any) => {
<<<<<<<
Errors:
${result.errors || []}
URL path:
${queryJob.path}
Context:
${JSON.stringify(queryJob.context, null, 4)}
Plugin:
${queryJob.pluginCreatorId || `none`}
Query:
${component.query}
`
)
=======
Errors:
${result.errors || []}
URL path:
${pageOrLayout.path}
Context:
${indentString(JSON.stringify(pageOrLayout.context, null, 2))}
Plugin:
${pageOrLayout.pluginCreatorId || `none`}
Query:
${indentString(component.query)}`)
>>>>>>>
Errors:
${result.errors || []}
URL path:
${queryJob.path}
Context:
${indentString(JSON.stringify(queryJob.context, null, 2))}
Plugin:
${queryJob.pluginCreatorId || `none`}
Query:
${indentString(component.query)}`) |
<<<<<<<
{ actions, getNode, createNodeId, hasNodeChanged },
pluginOptions,
done
=======
{ boundActionCreators, getNode, hasNodeChanged },
pluginOptions
>>>>>>>
{ actions, getNode, createNodeId, hasNodeChanged },
pluginOptions
<<<<<<<
MongoClient.connect(
`mongodb://${authUrlPart}${serverOptions.address}:${
serverOptions.port
}/${dbName}`,
function(err, db) {
// Establish connection to db
if (err) {
console.warn(err)
return
}
let collection = pluginOptions.collection || `documents`
if (_.isArray(collection)) {
for (const col of collection) {
createNodes(
db,
pluginOptions,
dbName,
createNode,
createNodeId,
col,
done
)
}
} else {
createNodes(
db,
pluginOptions,
dbName,
createNode,
createNodeId,
collection,
done
)
=======
const connectionURL = `mongodb://${authUrlPart}${serverOptions.address}:${
serverOptions.port
}/${dbName}`
return MongoClient.connect(connectionURL)
.then(db => {
let collection = pluginOptions.collection || [`documents`]
if (!_.isArray(collection)) {
collection = [collection]
>>>>>>>
const connectionURL = `mongodb://${authUrlPart}${serverOptions.address}:${
serverOptions.port
}/${dbName}`
return MongoClient.connect(connectionURL)
.then(db => {
let collection = pluginOptions.collection || [`documents`]
if (!_.isArray(collection)) {
collection = [collection]
<<<<<<<
function createNodes(
db,
pluginOptions,
dbName,
createNode,
createNodeId,
collectionName,
done
) {
let collection = db.collection(collectionName)
let cursor = collection.find()
=======
function createNodes(db, pluginOptions, dbName, createNode, collectionName) {
return new Promise((resolve, reject) => {
let collection = db.collection(collectionName)
let cursor = collection.find()
>>>>>>>
function createNodes(db, pluginOptions, dbName, createNode, createNodeId, collectionName) {
return new Promise((resolve, reject) => {
let collection = db.collection(collectionName)
let cursor = collection.find()
<<<<<<<
var node = {
// Data for the node.
...item,
id: createNodeId(`${id}`),
parent: `__${collectionName}__`,
children: [],
internal: {
type: `mongodb${caps(dbName)}${caps(collectionName)}`,
content: JSON.stringify(item),
contentDigest: crypto
.createHash(`md5`)
.update(JSON.stringify(item))
.digest(`hex`),
},
}
const childrenNodes = []
if (pluginOptions.map) {
let mapObj = pluginOptions.map
if (pluginOptions.map[collectionName]) {
mapObj = pluginOptions.map[collectionName]
=======
var node = {
// Data for the node.
...item,
id: `${id}`,
parent: `__${collectionName}__`,
children: [],
internal: {
type: `mongodb${caps(dbName)}${caps(collectionName)}`,
content: JSON.stringify(item),
contentDigest: crypto
.createHash(`md5`)
.update(JSON.stringify(item))
.digest(`hex`),
},
>>>>>>>
var node = {
// Data for the node.
...item,
id: createNodeId(`${id}`),
parent: `__${collectionName}__`,
children: [],
internal: {
type: `mongodb${caps(dbName)}${caps(collectionName)}`,
content: JSON.stringify(item),
contentDigest: crypto
.createHash(`md5`)
.update(JSON.stringify(item))
.digest(`hex`),
}, |
<<<<<<<
import _ from 'lodash'
=======
import babelConfig from './babel-config'
>>>>>>>
import _ from 'lodash'
import babelConfig from './babel-config' |
<<<<<<<
=======
import SidebarBody from "../components/sidebar-body"
import SearchBar from "../components/searchbar-body"
import tutorialSidebar from "../pages/docs/tutorial-links.yml"
import docsSidebar from "../pages/docs/doc-links.yaml"
import featuresSidebar from "../pages/docs/features-links.yaml"
import { rhythm, options } from "../utils/typography"
import presets, { colors } from "../utils/presets"
import hex2rgba from "hex2rgba"
>>>>>>>
<<<<<<<
{this.props.children}
=======
{/* TODO Move this under docs/index.js once Gatsby supports multiple levels
of layouts */}
<div
css={{
...sidebarStyles,
[presets.Tablet]: {
display: isDoc ? `block` : `none`,
},
...sidebarStylesDesktop,
}}
>
<SidebarBody yaml={docsSidebar} />
</div>
{/* This is for the searchbar template */}
<div
css={{
...searchbarStyles,
[presets.Tablet]: {
display: isPackageSearchPage
? `block`
: isPackageSearchPage && isPackageReadme ? `block` : `none`,
width: packageSidebarWidth,
position: `fixed`,
background: colors.ui.whisper,
borderRight: `1px solid ${colors.ui.light}`,
},
}}
>
<SearchBar history={this.props.history} />
</div>
{/* TODO Move this under docs/tutorial/index.js once Gatsby supports multiple levels
of layouts */}
<div
css={{
...sidebarStyles,
[presets.Tablet]: {
display: isTutorial ? `block` : `none`,
},
...sidebarStylesDesktop,
}}
>
<SidebarBody yaml={tutorialSidebar} />
</div>
<div
css={{
...sidebarStyles,
[presets.Tablet]: {
display: isFeature ? `block` : `none`,
},
...sidebarStylesDesktop,
}}
>
<SidebarBody yaml={featuresSidebar} />
</div>
<div
css={{
marginTop: isHomepage || isBlog ? 0 : `calc(2.8rem - 1px)`,
...childrenMobileDisplay,
[presets.Tablet]: {
paddingLeft: leftPadding(10),
...childrenTabletDisplay,
},
[presets.Desktop]: {
paddingLeft: leftPadding(12),
},
}}
className={isSearchSource && `docSearch-content`}
>
{this.props.children()}
</div>
>>>>>>>
{this.props.children} |
<<<<<<<
import apiRunnerNode from '../utils/api-runner-node'
=======
import imagesSchema from './images-schema'
import pdfSchema from './pdf'
>>>>>>>
import apiRunnerNode from '../utils/api-runner-node'
import imagesSchema from './images-schema'
import pdfSchema from './pdf' |
<<<<<<<
const { getGraphQLTag } = require(`babel-plugin-remove-graphql-queries`)
const report = require(`../../reporter`)
=======
const report = require(`gatsby-cli/lib/reporter`)
const { getGraphQLTag } = require(`../../utils/babel-plugin-extract-graphql`)
>>>>>>>
const { getGraphQLTag } = require(`babel-plugin-remove-graphql-queries`)
const report = require(`gatsby-cli/lib/reporter`) |
<<<<<<<
{ actions, getNode, store, cache },
=======
{ boundActionCreators, getNode, store, cache, createNodeId },
>>>>>>>
{ actions, getNode, store, cache },
{ actions, getNode, store, cache, createNodeId }, |
<<<<<<<
configPlugins = configPlugins.concat([
plugins.hotModuleReplacement(),
plugins.noErrors(),
=======
return [
new webpack.optimize.OccurenceOrderPlugin(),
new webpack.HotModuleReplacementPlugin(),
new webpack.NoErrorsPlugin(),
new webpack.DefinePlugin({
"process.env": processEnv(stage, `development`),
__PREFIX_PATHS__: program.prefixPaths,
__PATH_PREFIX__: JSON.stringify(store.getState().config.pathPrefix),
__POLYFILL__: store.getState().config.polyfill,
}),
>>>>>>>
configPlugins = configPlugins.concat([
plugins.hotModuleReplacement(),
plugins.noErrors(),
<<<<<<<
components.push(`layout-component---index`)
configPlugins = configPlugins.concat([
=======
return [
// Moment.js includes 100s of KBs of extra localization data by
// default in Webpack that most sites don't want. This line disables
// loading locale modules. This is a practical solution that requires
// the user to opt into importing specific locales.
// https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
>>>>>>>
components.push(`layout-component---index`)
configPlugins = configPlugins.concat([
<<<<<<<
=======
// Add a few global variables. Set NODE_ENV to production (enables
// optimizations for React) and whether prefixing links is enabled
// (__PREFIX_PATHS__) and what the link prefix is (__PATH_PREFIX__).
new webpack.DefinePlugin({
"process.env": processEnv(stage, `production`),
__PREFIX_PATHS__: program.prefixPaths,
__PATH_PREFIX__: JSON.stringify(store.getState().config.pathPrefix),
__POLYFILL__: store.getState().config.polyfill,
}),
// Extract CSS so it doesn't get added to JS bundles.
new ExtractTextPlugin(`build-js-styles.css`),
>>>>>>> |
<<<<<<<
let hasFetched = Object.create(null)
let syncRequires = {}
let asyncRequires = {}
const fetchResource = resourceName => {
// Find resource
let resourceFunction
if (resourceName.slice(0, 12) === `component---`) {
resourceFunction = asyncRequires.components[resourceName]
} else if (resourceName.slice(0, 9) === `layout---`) {
resourceFunction = asyncRequires.layouts[resourceName]
} else {
resourceFunction = asyncRequires.json[resourceName]
}
// Download the resource
hasFetched[resourceName] = true
return resourceFunction()
}
const getResourceModule = resourceName =>
fetchResource(resourceName).then(preferDefault)
=======
let fetchHistory = []
const failedPaths = {}
const failedResources = {}
const MAX_HISTORY = 5
>>>>>>>
let hasFetched = Object.create(null)
let syncRequires = {}
let asyncRequires = {}
let pathPrefix = ``
let fetchHistory = []
const failedPaths = {}
const failedResources = {}
const MAX_HISTORY = 5
const fetchResource = resourceName => {
// Find resource
let resourceFunction
if (resourceName.slice(0, 12) === `component---`) {
resourceFunction = asyncRequires.components[resourceName]
} else if (resourceName.slice(0, 9) === `layout---`) {
resourceFunction = asyncRequires.layouts[resourceName]
} else {
resourceFunction = asyncRequires.json[resourceName]
}
// Download the resource
hasFetched[resourceName] = true
return new Promise(resolve => {
const fetchPromise = resourceFunction()
let failed = false
return fetchPromise
.catch(() => {
failed = true
})
.then(() => {
fetchHistory.push({
resource: resourceName,
succeeded: failed,
})
if (!failedResources[resourceName]) {
failedResources[resourceName] = failed
}
fetchHistory = fetchHistory.slice(-MAX_HISTORY)
console.log(`fetchHistory`, fetchHistory)
})
})
}
const getResourceModule = resourceName =>
fetchResource(resourceName).then(preferDefault)
<<<<<<<
dequeue: () => resourcesArray.pop(),
// dequeue: path => pathArray.pop(),
enqueue: path => {
=======
dequeue: () => pathArray.pop(),
enqueue: rawPath => {
>>>>>>>
dequeue: () => resourcesArray.pop(),
enqueue: rawPath => {
<<<<<<<
=======
return pathScriptsCache[path]
}
emitter.emit(`onPreLoadPageResources`, { path })
// Nope, we need to load resource(s)
let component
let json
let layout
// Load the component/json/layout and parallel and call this
// function when they're done loading. When both are loaded,
// we move on.
const done = () => {
if (component && json && (!page.layoutComponentChunkName || layout)) {
pathScriptsCache[path] = { component, json, layout, page }
const pageResources = { component, json, layout, page }
cb(pageResources)
emitter.emit(`onPostLoadPageResources`, {
page,
pageResources,
})
}
}
getResourceModule(page.componentChunkName, (err, c) => {
if (err) {
handleResourceLoadError(
page.path,
`Loading the component for ${page.path} failed`
)
}
component = c
done()
})
getResourceModule(page.jsonName, (err, j) => {
if (err) {
handleResourceLoadError(
page.path,
`Loading the JSON for ${page.path} failed`
)
}
json = j
done()
>>>>>>>
return pathScriptsCache[path]
})
emitter.emit(`onPreLoadPageResources`, { path })
// Nope, we need to load resource(s)
let component
let json
let layout
// Load the component/json/layout and parallel and call this
// function when they're done loading. When both are loaded,
// we move on.
const done = () => {
if (component && json && (!page.layoutComponentChunkName || layout)) {
pathScriptsCache[path] = { component, json, layout, page }
const pageResources = { component, json, layout, page }
cb(pageResources)
emitter.emit(`onPostLoadPageResources`, {
page,
pageResources,
})
}
}
getResourceModule(page.componentChunkName, (err, c) => {
if (err) {
handleResourceLoadError(
page.path,
`Loading the component for ${page.path} failed`
)
}
component = c
done()
})
getResourceModule(page.jsonName, (err, j) => {
if (err) {
handleResourceLoadError(
page.path,
`Loading the JSON for ${page.path} failed`
)
}
json = j
done() |
<<<<<<<
loader.addPagesArray(pages)
loader.addProdRequires(asyncRequires)
=======
const history = createHistory()
// Convert to a map for faster lookup in maybeRedirect()
const redirectMap = redirects.reduce((map, redirect) => {
map[redirect.fromPath] = redirect
return map
}, {})
const maybeRedirect = pathname => {
const redirect = redirectMap[pathname]
if (redirect != null) {
history.replace(redirect.toPath)
return true
} else {
return false
}
}
// Check for initial page-load redirect
maybeRedirect(window.location.pathname)
>>>>>>>
loader.addPagesArray(pages)
loader.addProdRequires(asyncRequires)
const history = createHistory()
// Convert to a map for faster lookup in maybeRedirect()
const redirectMap = redirects.reduce((map, redirect) => {
map[redirect.fromPath] = redirect
return map
}, {})
const maybeRedirect = pathname => {
const redirect = redirectMap[pathname]
if (redirect != null) {
history.replace(redirect.toPath)
return true
} else {
return false
}
}
// Check for initial page-load redirect
maybeRedirect(window.location.pathname) |
<<<<<<<
boundActionCreators.setWebpackConfig({
resolve: {
alias: {
react: `preact-compat`,
"react-dom": `preact-compat`,
},
},
})
=======
config._config.resolve.alias = {
react: `preact-compat`,
"react-dom": `preact-compat`,
"create-react-class": `preact-compat/lib/create-react-class`,
}
>>>>>>>
boundActionCreators.setWebpackConfig({
resolve: {
alias: {
react: `preact-compat`,
"react-dom": `preact-compat`,
"create-react-class": `preact-compat/lib/create-react-class`,
},
},
}) |
<<<<<<<
Helpers.blockchainFee = (amount, options) =>
amount <= options.min_tx_amount
? 0
: Math.min(Math.floor(amount * options.percent), options.max_service_charge);
Helpers.balanceMinusFee = (balance, options) => {
if (!options || options.max_service_charge === undefined ||
options.percent === undefined ||
options.min_tx_amount === undefined) {
return balance;
}
if (balance <= options.min_tx_amount) {
return balance;
}
const point = Math.floor(options.max_service_charge * ((1 / options.percent) + 1));
if (options.min_tx_amount < balance && balance <= point) {
const maxWithFee = Math.floor(balance / (1 + options.percent));
return Math.max(maxWithFee, options.min_tx_amount);
}
return point < balance
? balance - options.max_service_charge
: balance;
};
Helpers.guidToGroup = (guid) => {
let hashed = WalletCrypo.sha256(new Buffer(guid.replace(/-/g, ''), 'hex'));
return hashed[0] & 1 ? 'b' : 'a';
};
=======
Helpers.deepClone = function (object) {
return JSON.parse(JSON.stringify(object));
};
>>>>>>>
Helpers.blockchainFee = (amount, options) =>
amount <= options.min_tx_amount
? 0
: Math.min(Math.floor(amount * options.percent), options.max_service_charge);
Helpers.balanceMinusFee = (balance, options) => {
if (!options || options.max_service_charge === undefined ||
options.percent === undefined ||
options.min_tx_amount === undefined) {
return balance;
}
if (balance <= options.min_tx_amount) {
return balance;
}
const point = Math.floor(options.max_service_charge * ((1 / options.percent) + 1));
if (options.min_tx_amount < balance && balance <= point) {
const maxWithFee = Math.floor(balance / (1 + options.percent));
return Math.max(maxWithFee, options.min_tx_amount);
}
return point < balance
? balance - options.max_service_charge
: balance;
};
Helpers.guidToGroup = (guid) => {
let hashed = WalletCrypo.sha256(new Buffer(guid.replace(/-/g, ''), 'hex'));
return hashed[0] & 1 ? 'b' : 'a';
}
Helpers.deepClone = function (object) {
return JSON.parse(JSON.stringify(object));
}; |
<<<<<<<
Helpers.delay = (time) => new Promise((resolve) => {
setTimeout(resolve, time);
});
=======
const etherUnits = {
kwei: new BigNumber(1e3),
mwei: new BigNumber(1e6),
gwei: new BigNumber(1e9),
szabo: new BigNumber(1e12),
finney: new BigNumber(1e15),
ether: new BigNumber(1e18)
};
Helpers.toWei = function (x, unit) {
unit = unit || 'ether';
if (!etherUnits[unit]) {
throw new Error(`Unsupported ether unit in toWei: ${unit}`);
}
let result = Helpers.toBigNumber(x).mul(etherUnits[unit]);
return Helpers.isBigNumber(x) ? result : result.toString();
};
Helpers.fromWei = function (x, unit) {
unit = unit || 'ether';
if (!etherUnits[unit]) {
throw new Error(`Unsupported ether unit in fromWei: ${unit}`);
}
let result = Helpers.toBigNumber(x).div(etherUnits[unit]);
return Helpers.isBigNumber(x) ? result : result.toString();
};
Helpers.isBigNumber = function (x) {
return x instanceof BigNumber;
};
Helpers.toBigNumber = function (x) {
return Helpers.isBigNumber(x) ? x : new BigNumber((x || 0).toString());
};
Helpers.isEtherAddress = function (address) {
return ethUtil.isValidAddress(address);
};
>>>>>>>
Helpers.delay = (time) => new Promise((resolve) => {
setTimeout(resolve, time);
});
const etherUnits = {
kwei: new BigNumber(1e3),
mwei: new BigNumber(1e6),
gwei: new BigNumber(1e9),
szabo: new BigNumber(1e12),
finney: new BigNumber(1e15),
ether: new BigNumber(1e18)
};
Helpers.toWei = function (x, unit) {
unit = unit || 'ether';
if (!etherUnits[unit]) {
throw new Error(`Unsupported ether unit in toWei: ${unit}`);
}
let result = Helpers.toBigNumber(x).mul(etherUnits[unit]);
return Helpers.isBigNumber(x) ? result : result.toString();
};
Helpers.fromWei = function (x, unit) {
unit = unit || 'ether';
if (!etherUnits[unit]) {
throw new Error(`Unsupported ether unit in fromWei: ${unit}`);
}
let result = Helpers.toBigNumber(x).div(etherUnits[unit]);
return Helpers.isBigNumber(x) ? result : result.toString();
};
Helpers.isBigNumber = function (x) {
return x instanceof BigNumber;
};
Helpers.toBigNumber = function (x) {
return Helpers.isBigNumber(x) ? x : new BigNumber((x || 0).toString());
};
Helpers.isEtherAddress = function (address) {
return ethUtil.isValidAddress(address);
}; |
<<<<<<<
var Bitcoin = require('bitcoinjs-lib');
var JSONB = require('json-buffer');
=======
>>>>>>>
var Bitcoin = require('bitcoinjs-lib');
var JSONB = require('json-buffer'); |
<<<<<<<
"2015-03-15 HJ.Park : https://github.com/axisj-com/axisj/issues/447 이슈 해결"
=======
"2015-03-13 HJ.Park : https://github.com/axisj-com/axisj/issues/447 이슈 해결"
"2015-03-17 KimJM : https://github.com/axisj-com/axisj/issues/419 이슈 관련 수정"
>>>>>>>
"2015-03-15 HJ.Park : https://github.com/axisj-com/axisj/issues/447 이슈 해결"
"2015-03-17 KimJM : https://github.com/axisj-com/axisj/issues/419 이슈 관련 수정" |
<<<<<<<
}]);
})();
=======
$scope.getTranslationProperties = function () {
return {
imagesLength: (($scope.page || {}).images || {}).length || 0
};
};
}]);
>>>>>>>
$scope.getTranslationProperties = function () {
return {
imagesLength: (($scope.page || {}).images || {}).length || 0
};
};
}]);
})(); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.