conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
when(c)
.it('should have joinRelation').assertEqual(c.joinRelation, c.sut.joinRelation)
.it('should set childTable').assertEqual(c.childTable,c.sut.childTable)
=======
when(c)
.it('should have joinRelation').assertEqual(c.joinRelation, c.sut.joinRelation)
.it('should set childTable').assertEqual(c.childTable, c.sut.childTable)
.it('should set expand to expanderCache.add').assertStrictEqual(c.expanderCache.tryAdd, c.sut.expand)
.it('should set getRowsSync to oneCache.tryGet').assertEqual(c.oneCache.tryGet, c.sut.getRowsSync)
.it('should set isExpanded to expanderCache.tryGet').assertEqual(c.expanderCache.tryGet, c.sut.isExpanded)
>>>>>>>
when(c)
.it('should have joinRelation').assertEqual(c.joinRelation, c.sut.joinRelation)
.it('should set childTable').assertEqual(c.childTable, c.sut.childTable)
.it('should set getRowsSync to oneCache.tryGet').assertEqual(c.oneCache.tryGet, c.sut.getRowsSync) |
<<<<<<<
ignoreControlKeys: true,
useThousandsSeparator: true
=======
ignoreControlKeys: true,
minimumLength: 2
>>>>>>>
ignoreControlKeys: true,
useThousandsSeparator: true,
minimumLength: 2
<<<<<<<
$.formatRut = function (rut, useThousandsSeparator) {
if(useThousandsSeparator===undefined) useThousandsSeparator = true;
return format(rut, useThousandsSeparator);
=======
$.computeDv = function(rut){
var cleanRut = clearFormat(rut);
return computeDv( parseInt(cleanRut, 10) );
}
$.formatRut = function(rut) {
return format(rut);
>>>>>>>
$.formatRut = function (rut, useThousandsSeparator) {
if(useThousandsSeparator===undefined) useThousandsSeparator = true;
return format(rut, useThousandsSeparator);
}
$.computeDv = function(rut){
var cleanRut = clearFormat(rut);
return computeDv( parseInt(cleanRut, 10) ); |
<<<<<<<
if ( !ath.hasLocalStorage ) {
this.doLog("Add to homescreen: not displaying callout because browser is in private mode");
=======
if ( !this.options.privateModeOverride && !ath.hasLocalStorage ) {
>>>>>>>
if ( !this.options.privateModeOverride && !ath.hasLocalStorage ) {
this.doLog("Add to homescreen: not displaying callout because browser is in private mode"); |
<<<<<<<
if (collWithMario == 't') { //kill goombas if collision is from top
goombas[i].state = 'dead';
=======
if (collWithMario == 't') { //kill goombas if collision is from top
>>>>>>>
if (collWithMario == 't') { //kill goombas if collision is from top
goombas[i].state = 'dead';
<<<<<<<
=======
goombas.splice(i, 1);
>>>>>>>
<<<<<<<
goombas[i].state = 'deadFromBullet';
=======
goombas.splice(i, 1);
>>>>>>>
goombas[i].state = 'deadFromBullet'; |
<<<<<<<
const CartSmall = ({ items }) => {
let price;
if (items.length) {
price = items.map(i => i.quantity * i.price)
.reduce((a, b) => a + Number(b))
=======
class CartSmall extends Component {
render() {
let price;
if (this.props.items.length) {
price = this.props.items
.map(i => i.quantity*i.price)
.reduce((a,b) => a+Number(b))
.toLocaleString('en-US', { style: 'currency', currency: 'USD' })
}
return (
<Wrapper>
{ this.props.items.map((d,i) => {
let attrs = [];
for (let key in d.attr) {
attrs.push(`${key.replace("_", " ")}: ${d.attr[key]}`)
}
attrs = attrs.join(", ");
return (<Row key={`cart${i}`}>
<span>
<Image img={d.img} />
</span>
<span className="full">
<Row>
<span className="black-text">{d.name}</span>
<span>{d.quantity}</span>
</Row>
<div className="small-text">{attrs}</div>
</span>
</Row>);
})}
<Divider style={{ margin: "20px 0" }}/>
<Row>
<span className="small-text">Subtotal</span>
<span className="black-text small-text">{price}</span>
</Row>
<Row>
<span className="small-text">Shipping</span>
<span className="black-text small-text">FREE</span>
</Row>
<Divider style={{ margin: "20px 0" }}/>
<Row>
<span>Total</span>
<span className="black-text">{price}</span>
</Row>
</Wrapper>
);
>>>>>>>
const CartSmall = ({ items }) => {
let price;
if (items.length) {
price = items.map(i => i.quantity * i.price)
.reduce((a, b) => a + Number(b))
.toLocaleString('en-US', { style: 'currency', currency: 'USD' }) |
<<<<<<<
import bcrypt from 'bcrypt';
import errors from 'feathers-errors';
=======
import bcrypt from 'bcryptjs';
>>>>>>>
import errors from 'feathers-errors';
import bcrypt from 'bcryptjs';
<<<<<<<
=======
options = Object.assign({}, defaults, options);
const crypto = options.bcrypt || bcrypt;
>>>>>>>
<<<<<<<
bcrypt.genSalt(10, function(err, salt) {
bcrypt.hash(password, salt, function(err, hash) {
=======
crypto.genSalt(10, function(err, salt) {
crypto.hash(hook.data[options.passwordField], salt, function(err, hash) {
>>>>>>>
crypto.genSalt(10, function(error, salt) {
crypto.hash(password, salt, function(error, hash) { |
<<<<<<<
element.css('width', mapWidth + (/^[0-9]+$/.test(mapWidth)?'px':''));
element.css('height', mapHeight + (/^[0-9]+$/.test(mapHeight)?'px':''));
=======
if ( isNaN(mapWidth) ) {
element.css('width', mapWidth);
} else {
// using px as default unit
element.css('width', mapWidth + 'px');
}
if ( isNaN(mapHeight) ) {
element.css('height', mapHeight);
} else {
// using px as default unit
element.css('height', mapHeight + 'px');
}
>>>>>>>
if ( isNaN(mapWidth) ) {
element.css('width', mapWidth);
} else {
element.css('width', mapWidth + 'px');
}
if ( isNaN(mapHeight) ) {
element.css('height', mapHeight);
} else {
element.css('height', mapHeight + 'px');
} |
<<<<<<<
<<<<<<< HEAD
var summary = currPrefix.child(exports.globalValidationSummary).tryGet();
=======
var summary = valOptions["errorSummaryId"] ? $('#' + valOptions["errorSummaryId"]) : $('#' + SF.compose(currPrefix, exports.globalValidationSummary));
>>>>>>> ValidatorErrorSummaryId
=======
var summary = valOptions["errorSummaryId"] ? $('#' + valOptions["errorSummaryId"]) : $('#' + SF.compose(currPrefix, exports.globalValidationSummary));
>>>>>>>
var summary = valOptions["errorSummaryId"] ? $('#' + valOptions["errorSummaryId"]) : currPrefix.child(exports.globalValidationSummary).tryGet(); |
<<<<<<<
var url = $txt.attr("data-url");
this.autoCompleter = new AjaxEntityAutocompleter(url || SF.Urls.autocomplete, function (term) {
return ({ types: _this.staticInfo().getValue(Entities.StaticInfo._types), l: 5, q: term });
=======
this.autoCompleter = new AjaxEntityAutoCompleter(this.options.autoCompleteUrl || SF.Urls.autocomplete, function (term) {
return ({ types: _this.options.types, l: 5, q: term });
>>>>>>>
this.autoCompleter = new AjaxEntityAutocompleter(this.options.autoCompleteUrl || SF.Urls.autocomplete, function (term) {
return ({ types: _this.options.types, l: 5, q: term });
<<<<<<<
return new Entities.EntityValue(new Entities.RuntimeInfoValue(item.type, item.id, false), item.text, item.link);
=======
return new Entities.EntityValue(new Entities.RuntimeInfo(item.type, parseInt(item.id), false), item.text, item.link);
>>>>>>>
return new Entities.EntityValue(new Entities.RuntimeInfoValue(item.type, parseInt(item.id), false), item.text, item.link);
return new Entities.EntityValue(new Entities.RuntimeInfoValue(item.type, item.id, false), item.text, item.link);
return new Entities.EntityValue(new Entities.RuntimeInfo(item.type, parseInt(item.id), false), item.text, item.link); |
<<<<<<<
);
process.exit(result.status);
break;
case 'test':
result = spawn.sync(
'./node_modules/jest/bin/jest.js',
[].concat(args),
{ stdio: 'inherit' }
);
process.exit(result.status);
break;
=======
)
process.exit(result.status)
break
>>>>>>>
)
process.exit(result.status)
break
case 'test':
result = spawn.sync(
'./node_modules/jest/bin/jest.js',
[].concat(args),
{ stdio: 'inherit' }
)
process.exit(result.status)
break |
<<<<<<<
*
* You can use this component to display data from a JSON endpoint, or
* from table rows in the DOM. Displaying from the DOM is more practical,
* but sometimes you don't want to load everything at once (if you have
* a HUGE table). In those cases, you should configure Ink.UI.Table to
* get data from JSON endpoint.
*
* To enable sorting, just set the `data-sortable` attribute of your table headers (they must be in the `thead` of the table) to "true".
*
* To enable pagination, you should pass either an `Ink.UI.Pagination` instance or a selector to create the Ink.UI.Pagination element on.
=======
* You can use this component to display data from a JSON endpoint, or from table rows in the DOM. Displaying from the DOM is more practical, but sometimes you don't want to load everything at once (if you have a HUGE table). In those cases, you should configure Ink.UI.Table to get data from JSON endpoint.
* To enable sorting, just set the `data-sortable` attribute of your table headers (they must be in the `thead` of the table) to "true". To enable pagination, you should pass either an `Ink.UI.Pagination` instance or a selector to create the Ink.UI.Paginate element on.
>>>>>>>
* You can use this component to display data from a JSON endpoint, or from table rows in the DOM. Displaying from the DOM is more practical, but sometimes you don't want to load everything at once (if you have a HUGE table). In those cases, you should configure Ink.UI.Table to get data from JSON endpoint.
* To enable sorting, just set the `data-sortable` attribute of your table headers (they must be in the `thead` of the table) to "true". To enable pagination, you should pass either an `Ink.UI.Pagination` instance or a selector to create the Ink.UI.Pagination element on. |
<<<<<<<
// ui components as single files
ui: {
files: [{
expand: true,
cwd: '<%= ink.folders.js.src %>UI/',
src: ['**/[0-9]/lib.js'],
dest: '<%= ink.folders.js.dist %>',
rename: function (dest, src) {
// check if this is v1
// Here data is in the form of [UIComponent]/[ver]/lib.js
var split = src.split(/\//);
var modName = split[0].toLowerCase();
var version = split[1];
=======
clean: {
js: {
src: ["<%= ink.folders.js.dist %>/ink*.js"]
},
css: {
src: ["<%= ink.folders.css.dist %>/*.css"]
},
fontAwesome: {
src: ["<%= ink.folders.css.src %>/less/modules/icons/*.less"]
},
tmp: {
src: ["tmp"]
}
},
>>>>>>>
// ui components as single files
ui: {
files: [{
expand: true,
cwd: '<%= ink.folders.js.src %>UI/',
src: ['**/[0-9]/lib.js'],
dest: '<%= ink.folders.js.dist %>',
rename: function (dest, src) {
// check if this is v1
// Here data is in the form of [UIComponent]/[ver]/lib.js
var split = src.split(/\//);
var modName = split[0].toLowerCase();
var version = split[1];
<<<<<<<
// Runs JSHint on the Ink.js JavaScript source
jshint: {
inkjs: {
options: {
jshintrc: '<%= ink.folders.js.srcBase %>.jshintrc'
},
files: {
src: '<%= ink.folders.js.src %>**/lib.js'
}
}
=======
compass: {
css: {
options: {
config: "config.rb"
}
},
},
cssmin: {
minify: {
expand: true,
cwd: '<%= ink.folders.css.dist %>',
src: ['*.css', '!quick-start.css'],
dest: '<%= ink.folders.css.dist %>',
ext: '.min.css',
options: {
report: 'min'
}
}
},
// Creates a plato report
plato: {
inkjs: {
options: {
jshint: eval('(' +
grunt.file.read(jshintFile, { encoding: 'utf-8'}) +
')')
>>>>>>>
// Runs JSHint on the Ink.js JavaScript source
jshint: {
inkjs: {
options: {
jshintrc: '<%= ink.folders.js.srcBase %>.jshintrc'
},
files: {
src: '<%= ink.folders.js.src %>**/lib.js'
}
},
},
compass: {
css: {
options: {
config: "config.rb"
}
},
},
cssmin: {
minify: {
expand: true,
cwd: '<%= ink.folders.css.dist %>',
src: ['*.css', '!quick-start.css'],
dest: '<%= ink.folders.css.dist %>',
ext: '.min.css',
options: {
report: 'min'
}
} |
<<<<<<<
asyncTest('fire() and bubbling, no appending to document', function () {
var elem = InkElement.create('div', {className: 'elem'});
var child = InkElement.create('div', { insertBottom: elem });
InkEvent.observe(elem, 'click', function (ev) {
equal(ev.memo.memo, 'check');
ok(InkEvent.element(ev) === child);
ok(this === elem);
start();
});
InkEvent.fire(child, 'click', {memo: 'check'});
});
asyncTest('fire() and the window', function () {
=======
asyncTest('events on the window', function () {
>>>>>>>
asyncTest('fire() and bubbling, no appending to document', function () {
var elem = InkElement.create('div', {className: 'elem'});
var child = InkElement.create('div', { insertBottom: elem });
InkEvent.observe(elem, 'click', function (ev) {
equal(ev.memo.memo, 'check');
ok(InkEvent.element(ev) === child);
ok(this === elem);
start();
});
InkEvent.fire(child, 'click', {memo: 'check'});
});
asyncTest('events on the window', function () { |
<<<<<<<
Object.defineProperty(SceneManager.prototype, "scenes", {
/**
*
*/
get: function () {
return this._scenes;
},
enumerable: true,
configurable: true
});
Object.defineProperty(SceneManager.prototype, "globalScene", {
/**
*
*/
get: function () {
if (!this._globalScene) {
this._globalScene = this.createScene("global" /* Global */, false);
this._scenes.pop(); // Remove global scene from scenes.
}
return this._globalScene;
},
enumerable: true,
configurable: true
});
Object.defineProperty(SceneManager.prototype, "activeScene", {
/**
* 当前激活的场景。
*/
get: function () {
if (this._scenes.length === 0) {
this.createScene("default");
}
return this._scenes[0];
},
set: function (value) {
if (this._scenes.length <= 1 ||
this._scenes[0] === value ||
this._globalScene === value //|| // Cannot active global scene.
) {
return;
}
var index = this._scenes.indexOf(value);
if (index >= 0) {
this._scenes.splice(index, 1);
this._scenes.unshift(value);
=======
/**
* @internal
*/
SystemManager.prototype.update = function () {
for (var _i = 0, _a = this._systems; _i < _a.length; _i++) {
var system = _a[_i];
if (system && system.enabled && !system._started) {
this._currentSystem = system;
system._started = true;
system.onStart && system.onStart();
>>>>>>>
/**
* @internal
*/
SystemManager.prototype.update = function () {
for (var _i = 0, _a = this._systems; _i < _a.length; _i++) {
var system = _a[_i];
if (system && system.enabled && !system._started) {
this._currentSystem = system;
system._started = true;
system.onStart && system.onStart();
<<<<<<<
// let v = camera.gameObject.transform.getLocalPosition();
// v.x++;
// v.y = v.y + 1;
// camera.gameObject.transform.setLocalPosition(v)
// console.log(camera.gameObject.transform)
=======
renderState.targetAndViewport(camera.viewport, camera.renderTarget);
renderState.cleanBuffer(camera.clearOption_Color, camera.clearOption_Depth, camera.backgroundColor);
>>>>>>>
renderState.targetAndViewport(camera.viewport, camera.renderTarget);
renderState.cleanBuffer(camera.clearOption_Color, camera.clearOption_Depth, camera.backgroundColor);
<<<<<<<
=======
//初始化编辑场景
this.editorSceneModel = new editor.EditorSceneModel();
this.editorSceneModel.init();
paper.Application.sceneManager.camerasScene = this.editorSceneModel.editorScene;
>>>>>>>
//初始化编辑场景
this.editorSceneModel = new editor.EditorSceneModel();
this.editorSceneModel.init();
paper.Application.sceneManager.camerasScene = this.editorSceneModel.editorScene;
<<<<<<<
Gizmo.enabled = false;
Gizmo.mvpMatrix = new egret3d.Matrix();
Gizmo.mMatrix = new egret3d.Matrix();
Gizmo.vMatrix = new egret3d.Matrix();
Gizmo.pMatrix = new egret3d.Matrix();
Gizmo.helpVec31 = new egret3d.Vector3();
Gizmo.helpVec32 = new egret3d.Vector3();
Gizmo.helpVec33 = new egret3d.Vector3();
Gizmo.helpVec34 = new egret3d.Vector3();
Gizmo.helpVec35 = new egret3d.Vector3();
Gizmo.helpVec36 = new egret3d.Vector3();
Gizmo.xArrowMMatrix = new egret3d.Matrix();
Gizmo.yArrowMMatrix = new egret3d.Matrix(new Float32Array([
0, 1, 0, 0,
-1, 0, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1
]));
Gizmo.zArrowMMatrix = new egret3d.Matrix(new Float32Array([
0, 0, 1, 0,
0, 1, 0, 0,
-1, 0, 0, 0,
0, 0, 0, 1
]));
Gizmo.helpMat = new egret3d.Matrix();
Gizmo.helpMat1 = new egret3d.Matrix();
Gizmo._imageLoadCount = 0;
Gizmo.textures = {};
Gizmo = Gizmo_1 = __decorate([
paper.executeInEditMode
], Gizmo);
return Gizmo;
var Gizmo_1;
}(paper.Behaviour));
editor.Gizmo = Gizmo;
__reflect(Gizmo.prototype, "paper.editor.Gizmo");
=======
GizmoShader.prototype.setTexture = function (name, value) {
var gl = this.gl;
gl.uniform1i(gl.getUniformLocation(this.prg, name), value);
};
return GizmoShader;
}());
editor.GizmoShader = GizmoShader;
__reflect(GizmoShader.prototype, "paper.editor.GizmoShader");
>>>>>>>
GizmoShader.prototype.setTexture = function (name, value) {
var gl = this.gl;
gl.uniform1i(gl.getUniformLocation(this.prg, name), value);
};
return GizmoShader;
}());
editor.GizmoShader = GizmoShader;
__reflect(GizmoShader.prototype, "paper.editor.GizmoShader"); |
<<<<<<<
it('Create Additional User 2', async function () {
this.timeout(8000)
const signedup = await n.wait('#LogoutBtn')
.click('#LogoutBtn')
.wait(() => !document.querySelector('#LogoutBtn'))
=======
it('Create Additional User', async function () {
this.timeout(6000)
const signedup = await n
.wait('#LogoutBtn')
.click('#LogoutBtn')
>>>>>>>
it('Create Additional User', async function () {
this.timeout(8000)
const signedup = await n
.wait('#LogoutBtn')
.click('#LogoutBtn')
<<<<<<<
.wait(() => !document.querySelector('#LoginModal.is-active'))
=======
.wait('#LogoutBtn')
>>>>>>>
.wait(() => !document.querySelector('#LoginModal.is-active')) |
<<<<<<<
import Mailbox from './views/Mailbox.vue'
import Join from './views/Join.vue'
=======
>>>>>>>
import Mailbox from './views/Mailbox.vue'
import Join from './views/Join.vue'
<<<<<<<
/*
The following are reusable guard for routes
the 'guard' defines how the route is blocked and the redirect determines the redirect behavior
when a route is blocked
*/
// Check if user is logged in
var loginGuard = {
guard (store) {
return !store.state.loggedIn
},
redirect (to, from) {
return { path: '/signup', query: { next: to.path } }
}
}
var signupGuard = {
guard: store => !!store.state.loggedIn,
redirect: (to, from) => ({ path: '/' })
}
// Check if user has a group to invite users to
var inviteGuard = {
guard (store) {
return !store.state.currentGroupId
},
redirect (to, from) {
return { path: '/new-group' }
}
}
var joinGuard = {
guard (store, to, from) {
return from.name !== Mailbox.name
},
redirect (to, from) {
return { path: '/mailbox' }
}
}
function createEnterGuards (store, ...guards) {
return function (to, from, next) {
for (let current of guards) {
if (current.guard(store, to, from)) {
return next(current.redirect(to, from))
}
}
next()
}
}
=======
/*
The following are reusable guard for routes
the 'guard' defines how the route is blocked and the redirect determines the redirect behavior
when a route is blocked
*/
// Check if user is logged in
var loginGuard = {
guard: store => !store.state.loggedIn,
redirect: (to, from) => ({ path: '/signup', query: { next: to.path } })
}
// Check if user has a group to invite users to
var inviteGuard = {
guard: store => !store.state.currentGroupId,
redirect: (to, from) => ({ path: '/new-group' })
}
function createEnterGuards (store, ...guards) {
return function (to, from, next) {
for (let current of guards) {
if (current.guard(store, to, from)) {
return next(current.redirect(to, from))
}
}
next()
}
}
>>>>>>>
/*
The following are reusable guard for routes
the 'guard' defines how the route is blocked and the redirect determines the redirect behavior
when a route is blocked
*/
// Check if user is logged in
var loginGuard = {
guard: store => !store.state.loggedIn,
redirect: (to, from) => ({ path: '/signup', query: { next: to.path } })
}
var signupGuard = {
guard: store => !!store.state.loggedIn,
redirect: (to, from) => ({ path: '/' })
}
// Check if user has a group to invite users to
var inviteGuard = {
guard: store => !store.state.currentGroupId,
redirect: (to, from) => ({ path: '/new-group' })
}
var joinGuard = {
guard: (store, to, from) => from.name !== Mailbox.name,
redirect: (to, from) => ({ path: '/mailbox' })
}
function createEnterGuards (store, ...guards) {
return function (to, from, next) {
for (let current of guards) {
if (current.guard(store, to, from)) {
return next(current.redirect(to, from))
}
}
next()
}
}
<<<<<<<
beforeEnter: createEnterGuards(store, loginGuard, inviteGuard)
},
{
path: '/mailbox',
name: Mailbox.name,
component: Mailbox,
meta: {
title: 'Mailbox'
},
beforeEnter: createEnterGuards(store, loginGuard)
},
{
path: '/join',
name: Join.name,
component: Join,
meta: {
title: 'Join a Group'
},
beforeEnter: createEnterGuards(store, loginGuard, joinGuard)
=======
beforeEnter: createEnterGuards(store, loginGuard, inviteGuard)
>>>>>>>
beforeEnter: createEnterGuards(store, loginGuard, inviteGuard)
},
{
path: '/mailbox',
name: Mailbox.name,
component: Mailbox,
meta: {
title: 'Mailbox'
},
beforeEnter: createEnterGuards(store, loginGuard)
},
{
path: '/join',
name: Join.name,
component: Join,
meta: {
title: 'Join a Group'
},
beforeEnter: createEnterGuards(store, loginGuard, joinGuard) |
<<<<<<<
static vuex = GroupContract.Vuex({
state: { proposals: [], payments: [], members: [], invitees: [] },
mutations: {
Payment (state, data) { state.payments.push(data) },
Proposal (state, data, hash) { state.proposals.push({...data, for: [], against: [], hash}) },
VoteForProposal (state, data) {
let index = state.proposals.findIndex(proposal => proposal.hash === data.hash)
if (index > -1) {
state.proposals[index].for.push(data.username)
if (state.proposals[index].for.length > 1) { state.proposals.splice(index, 1) }
}
},
VoteAgainstProposal (state, data) {
let index = state.proposals.findIndex(proposal => proposal.hash === data.hash)
if (index > -1) {
state.proposals[index].against.push(data.username)
if (state.proposals[index].against.length > 1) { state.proposals.splice(index, 1) }
}
},
RecordInvitation (state, data) { state.invitees.push(data.username) },
DeclineInvitation (state, data) {
let index = state.invitees.findIndex(username => username === data.username)
if (index > -1) { state.invitees.splice(index, 1) }
},
AcceptInvitation (state, data) {
let index = state.invitees.findIndex(username => username === data.username)
if (index > -1) {
state.invitees.splice(index, 1)
state.members.push(data.username)
}
},
AcknowledgeFounder (state, data) {
if (!state.members.find(username => username === data.username)) { state.members.push(data.username) }
}
}
})
=======
>>>>>>>
<<<<<<<
export class Proposal extends HashableAction {
static fields = Proposal.Fields([
['proposal', 'string'],
['threshold', 'uint32'],
['action', 'string']
])
constructor (data: JSONObject, action: HashableAction, parentHash?: string) {
super({...data, action: JSON.stringify(action.toObject())}, parentHash)
}
}
export class VoteForMotion extends HashableAction {
static fields = VoteForMotion.Fields([
['username', 'string']
])
}
export class VoteAgainstMotion extends HashableAction {
static fields = VoteAgainstMotion.Fields([
['username', 'string']
=======
export class HashableGroupVote extends HashableAction {
static fields = HashableGroupVote.Fields([
['vote', 'string'] // TODO: make a real vote
>>>>>>>
export class HashableGroupProposal extends HashableAction {
static fields = HashableGroupProposal.Fields([
['proposal', 'string'],
['threshold', 'uint32'],
['action', 'string']
])
constructor (data: JSONObject, action: HashableAction, parentHash?: string) {
super({...data, action: JSON.stringify(action.toObject())}, parentHash)
}
}
export class HashableGroupVoteForMotion extends HashableAction {
static fields = VoteForMotion.Fields([
['username', 'string']
])
}
export class HashableGroupVoteAgainstMotion extends HashableAction {
static fields = VoteAgainstMotion.Fields([
['username', 'string']
<<<<<<<
export class MailboxContract extends HashableContract {
static vuex = MailboxContract.Vuex({
state: { messages: [] },
mutations: {
PostMessage (state, data, hash) { state.messages.push({...data, hash: hash}) },
AuthorizeSender (state, data) { state.authorizations[AuthorizeSender.authorization.name].data = data.sender }
}
})
}
=======
export class HashableMailbox extends HashableContract {}
>>>>>>>
export class HashableMailbox extends HashableContract {}
<<<<<<<
static TypeVote = 'Vote'
static fields = PostMessage.Fields([
=======
static fields = HashableMailboxPostMessage.Fields([
>>>>>>>
static fields = HashableMailboxPostMessage.Fields([ |
<<<<<<<
=======
import dayjs from 'dayjs';
>>>>>>> |
<<<<<<<
excludePrivate: true,
}
=======
};
>>>>>>>
excludePrivate: true,
}; |
<<<<<<<
// XXX: html5-only
// var background1 = cc.Sprite.create(s_parallax, cc.rect(0, 0, 1024, 512));
// var background2 = cc.Sprite.create(s_parallax, cc.rect(0, 0, 1024, 512));
// var backLayer = cc.Layer.create();
// backLayer.addChild(background1, Z_MOUNTAINS);
// backLayer.addChild(background2, Z_MOUNTAINS);
// background2.setPosition(cc.p(1024, 0));
// scroll.addChild(backLayer, Z_MOUNTAINS, cc._p(0.2, 0.2), cc._p(0, -150));
// background1.setAnchorPoint(cc.p(0,0));
// background2.setAnchorPoint(cc.p(0, 0));
// "endless" background image - this is not compatible with current -html5
var background = cc.Sprite.create(s_parallax, cc.rect(0,0,4096,512) );
scroll.addChild(background, Z_MOUNTAINS , cc._p(0.2, 0.2), cc._p(0,-150));
background.setAnchorPoint( cc._p(0,0) );
background.getTexture().setTexParameters(gl.LINEAR, gl.LINEAR, gl.REPEAT, gl.CLAMP_TO_EDGE);
=======
if(cc.config.platform == "browser")
{
// This code runs on both HTML5 and JSB
// It places two big sprites in the screen, one after the other.
// (...see below...)
var background1 = cc.Sprite.create(s_parallax, cc.rect(0, 0, 1024, 512));
var background2 = cc.Sprite.create(s_parallax, cc.rect(0, 0, 1024, 512));
var backLayer = cc.Layer.create();
backLayer.addChild(background1, Z_MOUNTAINS);
backLayer.addChild(background2, Z_MOUNTAINS+1);
background2.setPosition(cc.p(1024, 0));
scroll.addChild(backLayer, Z_MOUNTAINS, cc._p(0.2, 0.2), cc._p(0, -150));
background1.setAnchorPoint(cc._p(0,0));
background2.setAnchorPoint(cc._p(0,0));
}
else{
// (...see above...)
// But since JSB runs on top of OpenGL (cocos2d-iphone or cocos2d-x), you can use
// OpenGL commands, and your code will run faster (but it is not compatible with cocos2d-html5... yet)
var background = cc.Sprite.create(s_parallax, cc.rect(0,0,4096,512) );
scroll.addChild(background, Z_MOUNTAINS , cc._p(0.2, 0.2), cc._p(0,-150));
background.setAnchorPoint( cc._p(0,0) );
background.getTexture().setTexParameters(gl.LINEAR, gl.LINEAR, gl.REPEAT, gl.CLAMP_TO_EDGE);
}
>>>>>>>
if(cc.config.platform == "browser")
{
// This code runs on both HTML5 and JSB
// It places two big sprites in the screen, one after the other.
// (...see below...)
var background1 = cc.Sprite.create(s_parallax, cc.rect(0, 0, 1024, 512));
var background2 = cc.Sprite.create(s_parallax, cc.rect(0, 0, 1024, 512));
var backLayer = cc.Layer.create();
backLayer.addChild(background1, Z_MOUNTAINS);
backLayer.addChild(background2, Z_MOUNTAINS+1);
background2.setPosition(cc.p(1024, 0));
scroll.addChild(backLayer, Z_MOUNTAINS, cc._p(0.2, 0.2), cc._p(0, -150));
background1.setAnchorPoint(cc._p(0,0));
background2.setAnchorPoint(cc._p(0,0));
}
else{
// (...see above...)
// But since JSB runs on top of OpenGL (cocos2d-iphone or cocos2d-x), you can use
// OpenGL commands, and your code will run faster (but it is not compatible with cocos2d-html5... yet)
var background = cc.Sprite.create(s_parallax, cc.rect(0,0,4096,512) );
scroll.addChild(background, Z_MOUNTAINS , cc._p(0.2, 0.2), cc._p(0,-150));
background.setAnchorPoint( cc._p(0,0) );
background.getTexture().setTexParameters(gl.LINEAR, gl.LINEAR, gl.REPEAT, gl.CLAMP_TO_EDGE);
}
<<<<<<<
// cc.Reader = new cc.BuilderReader(cc.NodeLoaderLibrary.newDefaultCCNodeLoaderLibrary());
// cc.Reader.setCCBRootPath("Resources/CCB/");
// cc.Reader.load = cc.Reader.readNodeGraphFromFile;
var hud = cc.BuilderReader.load(s_HUD, this);
=======
var hud = cc.BuilderReader.load("HUD.ccbi", this);
>>>>>>>
var hud = cc.BuilderReader.load(s_HUD, this);
<<<<<<<
// XXX: html5-only
// cc.Reader = new cc.BuilderReader(cc.NodeLoaderLibrary.newDefaultCCNodeLoaderLibrary());
// cc.Reader.setCCBRootPath("Resources/CCB/");
// cc.Reader.load = cc.Reader.readNodeGraphFromFile;
// var menuNode = cc.Reader.load(s_MainMenu, this);
// var scene = cc.Scene.create();
// scene.addChild(menuNode);
var scene = cc.BuilderReader.loadAsScene(s_MainMenu);
=======
var scene = cc.BuilderReader.loadAsScene("MainMenu.ccbi");
>>>>>>>
var scene = cc.BuilderReader.loadAsScene(s_MainMenu); |
<<<<<<<
var AtlasDemo = cc.LayerGradient.extend({
ctor:function () {
this._super();
cc.associateWithNative(this, cc.LayerGradient);
this.init(cc.c4b(0, 0, 0, 255), cc.c4b(98, 99, 117, 255));
},
=======
var AtlasDemo = BaseTestLayer.extend({
>>>>>>>
var AtlasDemo = BaseTestLayer.extend({
<<<<<<<
onEnter:function () {
this._super();
var s = director.getWinSize();
var label = cc.LabelTTF.create(this.title(), "Arial", 28);
this.addChild(label, 1);
label.setPosition(cc.p(s.width / 2, s.height - 50));
var strSubtitle = this.subtitle();
if (strSubtitle) {
var l = cc.LabelTTF.create(strSubtitle.toString(), "Thonburi", 16);
this.addChild(l, 1);
l.setPosition(cc.p(s.width / 2, s.height - 80));
}
var item1 = cc.MenuItemImage.create(s_pathB1, s_pathB2, this.backCallback, this);
var item2 = cc.MenuItemImage.create(s_pathR1, s_pathR2, this.restartCallback, this);
var item3 = cc.MenuItemImage.create(s_pathF1, s_pathF2, this.nextCallback, this);
var menu = cc.Menu.create(item1, item2, item3);
menu.setPosition(cc.p(0, 0));
var cs = item2.getContentSize();
item1.setPosition(cc.p(winSize.width / 2 - cs.width * 2, cs.height / 2));
item2.setPosition(cc.p(winSize.width / 2, cs.height / 2));
item3.setPosition(cc.p(winSize.width / 2 + cs.width * 2, cs.height / 2));
this.addChild(menu, 1);
},
restartCallback:function (sender) {
=======
onRestartCallback:function (sender) {
>>>>>>>
onRestartCallback:function (sender) {
<<<<<<<
label2.setColor(cc.c3b(255, 0, 0));
=======
label2.setColor( cc.RED );
>>>>>>>
label2.setColor( cc.RED );
<<<<<<<
onMouseUp:function (touch) {
this.snapArrowsToEdge();
=======
onMouseUp:function(touch){
//this.snapArrowsToEdge();
>>>>>>>
onMouseUp:function (touch) {
//this.snapArrowsToEdge();
<<<<<<<
BMFontColorParentChild,
LabelAtlasTest,
LabelAtlasColorTest,
Atlas3,
Atlas4,
Atlas5,
Atlas6,
AtlasBitmapColor,
AtlasFastBitmap,
BitmapFontMultiLine,
BitmapFontMultiLine2,
LabelsEmpty,
LabelBMFontHD,
=======
LabelAtlasOpacityTest,
LabelAtlasOpacityColorTest,
>>>>>>>
LabelAtlasOpacityTest,
LabelAtlasOpacityColorTest, |
<<<<<<<
=======
// bullet hit batch node
var bulletHitsTexture = cc.TextureCache.getInstance().addImage(s_hit);
this._bulletHits = cc.SpriteBatchNode.createWithTexture(bulletHitsTexture);
this._bulletHits.setBlendFunc(gl.SRC_ALPHA, gl.ONE);
this.addChild(this._bulletHits);
// bullet batch node
cc.SpriteFrameCache.getInstance().addSpriteFrames(s_bullet_plist);
var bulletTexture = cc.TextureCache.getInstance().addImage(s_bullet);
this._bullets = cc.SpriteBatchNode.createWithTexture(bulletTexture, 100);
this._bullets.setBlendFunc(gl.SRC_ALPHA, gl.ONE);
this.addChild(this._bullets);
// enemy batch node
cc.SpriteFrameCache.getInstance().addSpriteFrames(s_Enemy_plist);
var enemyTexture = cc.TextureCache.getInstance().addImage(s_Enemy);
this._enemyBatch = cc.SpriteBatchNode.createWithTexture(enemyTexture,20);
this.addChild(this._enemyBatch);
// spark batch
cc.SpriteFrameCache.getInstance().addSpriteFrames(s_explode_plist);
var sparkTexture = cc.TextureCache.getInstance().addImage(s_explode);
this._sparkBatch = cc.SpriteBatchNode.createWithTexture(sparkTexture,20);
this._sparkBatch.setBlendFunc(gl.SRC_ALPHA, gl.ONE);
this.addChild(this._sparkBatch);
>>>>>>>
<<<<<<<
// ship
this._ship = new Ship();
this._tex8888Batch.addChild(this._ship, this._ship.zOrder, MW.UNIT_TAG.PLAYER);
=======
this._ship.born();
>>>>>>>
this._ship.born();
<<<<<<<
GameLayer.prototype.addSpark = function (spark)
{
this._tex565Batch.addChild(spark);
}
=======
GameLayer.prototype.addSpark = function (spark) {
this._sparkBatch.addChild(spark);
};
>>>>>>>
GameLayer.prototype.addSpark = function (spark) {
this._tex565Batch.addChild(spark);
}; |
<<<<<<<
async.apply(zip, 'www'),
async.apply(zip, 'design-tokens')
], (err, [_prepare, _dist, _examples, _website, _tokens, info, stats, sha, dependencies, _zip]) => {
=======
async.apply(zip, 'www')
], (err, [_prepare, _dist, _examples, _snaps, _website, info, stats, sha, dependencies, _zip]) => {
>>>>>>>
async.apply(zip, 'www'),
async.apply(zip, 'design-tokens')
], (err, [_prepare, _dist, _examples, _snaps, _website, _tokens, info, stats, sha, dependencies, _zip]) => {
<<<<<<<
zips: ['dist.zip', 'examples.zip', 'www.zip', 'design-tokens.zip']
=======
zips: ['dist.zip', 'examples.zip', 'www.zip', 'snapshot.json']
>>>>>>>
zips: ['dist.zip', 'examples.zip', 'www.zip', 'snapshot.json', 'design-tokens.zip'] |
<<<<<<<
it('renders badge', () => matchesMarkup(<LightBadge>Light</LightBadge>));
=======
it('renders badge', () =>
matchesMarkupAndStyle(<LightestBadge>Light</LightestBadge>));
>>>>>>>
it('renders badge', () =>
matchesMarkup(<LightestBadge>Light</LightestBadge>));
<<<<<<<
matchesMarkup(
<LightBadge>
=======
matchesMarkupAndStyle(
<LightestBadge>
>>>>>>>
matchesMarkup(
<LightestBadge>
<<<<<<<
matchesMarkup(
<LightBadge>
=======
matchesMarkupAndStyle(
<LightestBadge>
>>>>>>>
matchesMarkup(
<LightestBadge>
<<<<<<<
it('renders badge with icon only', () =>
matchesMarkup(
<LightBadge>
=======
xit('renders badge with icon only', () =>
matchesMarkupAndStyle(
<LightestBadge>
>>>>>>>
it('renders badge with icon only', () =>
matchesMarkup(
<LightestBadge> |
<<<<<<<
import tokenlint from './plugins/lint-tokens';
import yamlValidate from 'gulp-yaml-validate';
=======
import vnu from './vnu-lint';
import minimist from 'minimist';
>>>>>>>
import tokenlint from './plugins/lint-tokens';
import yamlValidate from 'gulp-yaml-validate';
import vnu from './vnu-lint';
import minimist from 'minimist';
<<<<<<<
gulp.task('lint:tokens:yaml', () =>
gulp.src([
'./ui/components/**/tokens/*.yml',
'./design-tokens/aliases/*.yml'
])
.pipe(yamlValidate())
);
gulp.task('lint:tokens:components', () =>
gulp.src([
'./ui/components/**/tokens/*.yml',
'!./ui/components/**/tokens/bg-*.yml', // icons
'!./ui/components/**/tokens/force-font-commons.yml' // fonts
])
.pipe(tokenlint())
.pipe(tokenlint.report('verbose'))
);
gulp.task('lint:tokens:aliases', () =>
gulp.src([
'./design-tokens/aliases/*.yml'
])
.pipe(tokenlint({ prefix: false }))
.pipe(tokenlint.report('verbose'))
);
gulp.task('lint:tokens', ['lint:tokens:yaml', 'lint:tokens:components', 'lint:tokens:aliases']);
gulp.task('lint', ['lint:sass', 'lint:spaces', 'lint:js', 'lint:html', 'lint:tokens']);
=======
const parseComponentArgument = argv =>
minimist(argv.slice(2)).component || '*';
gulp.task('lint:vnu', ['generate:examples:wrap'], () =>
gulp.src(`.html/${parseComponentArgument(process.argv)}`)
.pipe(vnu.lint())
.pipe(vnu.report())
.pipe(gulp.dest('.reports/')));
gulp.task('lint', ['lint:sass', 'lint:spaces', 'lint:js', 'lint:html']);
>>>>>>>
gulp.task('lint:tokens:yaml', () =>
gulp.src([
'./ui/components/**/tokens/*.yml',
'./design-tokens/aliases/*.yml'
])
.pipe(yamlValidate())
);
gulp.task('lint:tokens:components', () =>
gulp.src([
'./ui/components/**/tokens/*.yml',
'!./ui/components/**/tokens/bg-*.yml', // icons
'!./ui/components/**/tokens/force-font-commons.yml' // fonts
])
.pipe(tokenlint())
.pipe(tokenlint.report('verbose'))
);
gulp.task('lint:tokens:aliases', () =>
gulp.src([
'./design-tokens/aliases/*.yml'
])
.pipe(tokenlint({ prefix: false }))
.pipe(tokenlint.report('verbose'))
);
gulp.task('lint:tokens', ['lint:tokens:yaml', 'lint:tokens:components', 'lint:tokens:aliases']);
gulp.task('lint', ['lint:sass', 'lint:spaces', 'lint:js', 'lint:html', 'lint:tokens']);
const parseComponentArgument = argv =>
minimist(argv.slice(2)).component || '*';
gulp.task('lint:vnu', ['generate:examples:wrap'], () =>
gulp.src(`.html/${parseComponentArgument(process.argv)}`)
.pipe(vnu.lint())
.pipe(vnu.report())
.pipe(gulp.dest('.reports/')));
gulp.task('lint', ['lint:sass', 'lint:spaces', 'lint:js', 'lint:html']); |
<<<<<<<
export function canLogEvent() {
return window.ll && window.location &&
globals.analyticsHostWhitelist.indexOf(window.location.host) >= 0;
=======
function logEvent(tagEvent, type, extraValues = {}) {
let canLogEvent = window.location && _.includes(globals.analyticsHostWhitelist, window.location.host);
_.defaults(extraValues, {
path: window.location.path,
type: ''
});
if (canLogEvent) {
if (window.ll) window.ll(tagEvent, type, extraValues);
if (window.ga) window.ga('send', 'event', type, extraValues.type);
}
>>>>>>>
export function logEvent(tagEvent, type, extraValues = {}) {
let canLogEvent = window.location && _.includes(globals.analyticsHostWhitelist, window.location.host);
_.defaults(extraValues, {
path: window.location.path,
type: ''
});
if (canLogEvent) {
if (window.ll) window.ll(tagEvent, type, extraValues);
if (window.ga) window.ga('send', 'event', type, extraValues.type);
}
<<<<<<<
export function logCurrentPageVisit() {
if (canLogEvent()) {
window.ll('tagScreen', normalizedLocationPathname());
}
=======
function logCurrentPageVisit() {
logEvent('tagScreen', normalizedLocationPathname());
>>>>>>>
export function logCurrentPageVisit() {
logEvent('tagScreen', normalizedLocationPathname());
<<<<<<<
export function logCTAEvent(type, extraValues) {
if (canLogEvent()) {
let values = Object.assign({'path': normalizedLocationPathname(), 'type': type, 'usertype': process.env.DEFAULT_USER_TPE}, extraValues);
window.ll('tagEvent', 'CTA', values);
}
=======
function logCTAEvent(type, extraValues) {
let values = _.assign({'path': normalizedLocationPathname(), 'type': type, 'usertype': process.env.DEFAULT_USER_TPE}, extraValues);
logEvent('tagEvent', 'CTA', values);
>>>>>>>
export function logCTAEvent(type, extraValues) {
let values = _.assign({'path': normalizedLocationPathname(), 'type': type, 'usertype': process.env.DEFAULT_USER_TPE}, extraValues);
logEvent('tagEvent', 'CTA', values);
<<<<<<<
export function logInputEvent(type, extraValues) {
if (canLogEvent()) {
let values = Object.assign({'path': normalizedLocationPathname(), 'type': type, 'usertype': process.env.DEFAULT_USER_TPE}, extraValues);
window.ll('tagEvent', 'Input', values);
}
=======
function logInputEvent(type, extraValues) {
let values = _.assign({'path': normalizedLocationPathname(), 'type': type, 'usertype': process.env.DEFAULT_USER_TPE}, extraValues);
logEvent('tagEvent', 'Input', values);
>>>>>>>
export function logInputEvent(type, extraValues) {
let values = _.assign({'path': normalizedLocationPathname(), 'type': type, 'usertype': process.env.DEFAULT_USER_TPE}, extraValues);
logEvent('tagEvent', 'Input', values);
<<<<<<<
export function logDownloadEvent(type) {
if (canLogEvent()) {
window.ll('tagEvent', 'Download', {'path': normalizedLocationPathname(), 'type': type, 'usertype': process.env.DEFAULT_USER_TPE});
}
=======
function logDownloadEvent(type, extraValues) {
let values = _.assign({'path': normalizedLocationPathname(), 'type': type, 'usertype': process.env.DEFAULT_USER_TPE}, extraValues);
logEvent('tagEvent', 'Download', values);
>>>>>>>
export function logDownloadEvent(type, extraValues) {
let values = _.assign({'path': normalizedLocationPathname(), 'type': type, 'usertype': process.env.DEFAULT_USER_TPE}, extraValues);
logEvent('tagEvent', 'Download', values); |
<<<<<<<
import './generate-tokens';
import './generate-cmps';
=======
import './generate-tokens-components';
import './generate-tokens-ui';
import './generate-ui-kit-zip';
>>>>>>>
import './generate-cmps';
import './generate-tokens-components';
import './generate-tokens-ui';
import './generate-ui-kit-zip';
<<<<<<<
gulp.task('generate', [
'generate:icons',
'generate:release-notes',
'generate:tokens:zip',
'generate:tokens',
'generate:ui',
'generate:examples',
'generate:cmps',
'generate:whitelist',
'generate:whitelist-utilities'
]);
=======
gulp.task('generate', callback =>
runSequence(
[
'generate:release-notes'
],
[
'generate:icons',
'generate:tokens:zip',
'generate:tokens:ui',
'generate:ui-kit:zip',
'generate:ui',
'generate:whitelist',
'generate:whitelist-utilities'
],
'generate:examples',
callback)
);
>>>>>>>
gulp.task('generate', callback =>
runSequence(
[
'generate:release-notes'
],
[
'generate:icons',
'generate:tokens:zip',
'generate:tokens:ui',
'generate:ui-kit:zip',
'generate:ui',
'generate:whitelist',
'generate:whitelist-utilities'
],
'generate:examples',
'generate:cmps',
callback)
); |
<<<<<<<
}, [activeChannel, channel]);
return (
<Preview
{...props}
lastMessage={lastMessage}
unread={unread}
lastRead={lastRead}
latestMessage={getLatestMessagePreview(channel, t)}
latestMessageDisplayTest={getLatestMessagePreview(channel, t)}
displayTitle={getDisplayTitle(channel, client.user)}
displayImage={getDisplayImage(channel, client.user)}
active={activeChannel && activeChannel.cid === channel.cid}
/>
);
};
ChannelPreview.defaultProps = {
Preview: ChannelPreviewCountOnly,
};
ChannelPreview.propTypes = {
/** **Available from [chat context](https://getstream.github.io/stream-chat-react/#chat)** */
channel: PropTypes.object.isRequired,
/** Current selected channel object */
activeChannel: PropTypes.object,
/** Setter for selected channel */
setActiveChannel: PropTypes.func.isRequired,
/**
* Available built-in options (also accepts the same props as):
*
* 1. [ChannelPreviewCompact](https://getstream.github.io/stream-chat-react/#ChannelPreviewCompact) (default)
* 2. [ChannelPreviewLastMessage](https://getstream.github.io/stream-chat-react/#ChannelPreviewLastMessage)
* 3. [ChannelPreviewMessanger](https://getstream.github.io/stream-chat-react/#ChannelPreviewMessanger)
*
* The Preview to use, defaults to ChannelPreviewLastMessage
* */
Preview: PropTypes.elementType,
/**
* Object containing watcher parameters
* @see See [Pagination documentation](https://getstream.io/chat/docs/#channel_pagination) for a list of available fields for sort.
* */
watchers: PropTypes.object,
};
=======
};
componentDidUpdate(prevProps) {
if (
this.props.activeChannel &&
prevProps.activeChannel &&
this.props.activeChannel.cid !== prevProps.activeChannel.cid
) {
const isActive = this.props.activeChannel.cid === this.props.channel.cid;
if (isActive) {
this.setState({ unread: 0 });
}
}
}
render() {
const props = { ...this.state, ...this.props };
const { Preview, channel, client, activeChannel, t } = this.props;
return (
<Preview
{...props}
latestMessage={getLatestMessagePreview(channel, t)}
latestMessageDisplayTest={getLatestMessagePreview(channel, t)}
displayTitle={getDisplayTitle(channel, client.user)}
displayImage={getDisplayImage(channel, client.user)}
active={activeChannel && activeChannel.cid === channel.cid}
/>
);
}
}
ChannelPreview = withTranslationContext(withChatContext(ChannelPreview));
>>>>>>>
}, [activeChannel, channel]);
return (
<Preview
{...props}
lastMessage={lastMessage}
unread={unread}
latestMessage={getLatestMessagePreview(channel, t)}
latestMessageDisplayTest={getLatestMessagePreview(channel, t)}
displayTitle={getDisplayTitle(channel, client.user)}
displayImage={getDisplayImage(channel, client.user)}
active={activeChannel && activeChannel.cid === channel.cid}
/>
);
};
ChannelPreview.defaultProps = {
Preview: ChannelPreviewCountOnly,
};
ChannelPreview.propTypes = {
/** **Available from [chat context](https://getstream.github.io/stream-chat-react/#chat)** */
channel: PropTypes.object.isRequired,
/** Current selected channel object */
activeChannel: PropTypes.object,
/** Setter for selected channel */
setActiveChannel: PropTypes.func.isRequired,
/**
* Available built-in options (also accepts the same props as):
*
* 1. [ChannelPreviewCompact](https://getstream.github.io/stream-chat-react/#ChannelPreviewCompact) (default)
* 2. [ChannelPreviewLastMessage](https://getstream.github.io/stream-chat-react/#ChannelPreviewLastMessage)
* 3. [ChannelPreviewMessanger](https://getstream.github.io/stream-chat-react/#ChannelPreviewMessanger)
*
* The Preview to use, defaults to ChannelPreviewLastMessage
* */
Preview: PropTypes.elementType,
/**
* Object containing watcher parameters
* @see See [Pagination documentation](https://getstream.io/chat/docs/#channel_pagination) for a list of available fields for sort.
* */
watchers: PropTypes.object,
}; |
<<<<<<<
>> Now, I will help you set up your devices and accounts.
>> To do so, try ‘configure‘ followed by the type of device or account (e.g., ‘configure twitter’ or ‘configure tv’), or try ‘discover’ and I'll take a look at what you have.
>> If you need help at any point, try ‘help’.
>> context = null // {}
=======
>> Ok, on to what I can do: I am capable of understanding actions and events over web services and smart devices. I do not chat, and I do not understand questions very well. Please check out the Cheatsheet (from the menu) to find out what I understand, or type ‘help’.
>> To start, how about you try one of these examples:
>> button: get a #cat gif {"code":["now","=>","@com.giphy.get","param:tag:Entity(tt:hashtag)","=","HASHTAG_0","=>","notify"],"entities":{"HASHTAG_0":"cat"}}
>> button: show me the weather for San Francisco {"code":["now","=>","@org.thingpedia.weather.current","param:location:Location","=","LOCATION_0","=>","notify"],"entities":{"LOCATION_0":{"latitude":37.7792808,"longitude":-122.4192363,"display":"San Francisco, San Francisco City and County, California, United States of America"}}}
>> button: search almond recipes on bing {"code":["now","=>","@com.bing.web_search","param:query:String","=","QUOTED_STRING_0","=>","notify"],"entities":{"QUOTED_STRING_0":"almond recipes"}}
>> button: translate a sentence to Chinese {"code":["now","=>","@com.yandex.translate.translate","param:target_language:Entity(tt:iso_lang_code)","=","GENERIC_ENTITY_tt:iso_lang_code_0","=>","notify"],"entities":{"GENERIC_ENTITY_tt:iso_lang_code_0":{"value":"zh","display":"Chinese"}}}
>>>>>>>
>> Ok, on to what I can do: I am capable of understanding actions and events over web services and smart devices. I do not chat, and I do not understand questions very well. Please check out the Cheatsheet (from the menu) to find out what I understand, or type ‘help’.
>> To start, how about you try one of these examples:
>> button: get a #cat gif {"code":["now","=>","@com.giphy.get","param:tag:Entity(tt:hashtag)","=","HASHTAG_0","=>","notify"],"entities":{"HASHTAG_0":"cat"}}
>> button: show me the weather for San Francisco {"code":["now","=>","@org.thingpedia.weather.current","param:location:Location","=","LOCATION_0","=>","notify"],"entities":{"LOCATION_0":{"latitude":37.7792808,"longitude":-122.4192363,"display":"San Francisco, San Francisco City and County, California, United States of America"}}}
>> button: search almond recipes on bing {"code":["now","=>","@com.bing.web_search","param:query:String","=","QUOTED_STRING_0","=>","notify"],"entities":{"QUOTED_STRING_0":"almond recipes"}}
>> button: translate a sentence to Chinese {"code":["now","=>","@com.yandex.translate.translate","param:target_language:Entity(tt:iso_lang_code)","=","GENERIC_ENTITY_tt:iso_lang_code_0","=>","notify"],"entities":{"GENERIC_ENTITY_tt:iso_lang_code_0":{"value":"zh","display":"Chinese"}}}
>> context = null // {}
<<<<<<<
`>> Sorry, I cannot find any Cryptocurrency Code matching “invalid”
>> context = now => @org.coinbin.get_price param:currency:Entity(tt:cryptocurrency_code) = GENERIC_ENTITY_tt:cryptocurrency_code_0 => notify // {"GENERIC_ENTITY_tt:cryptocurrency_code_0":{"value":null,"display":"invalid"}}
=======
`>> Sorry, I cannot find any Cryptocurrency Code matching “invalid”.
>>>>>>>
`>> Sorry, I cannot find any Cryptocurrency Code matching “invalid”.
>> context = now => @org.coinbin.get_price param:currency:Entity(tt:cryptocurrency_code) = GENERIC_ENTITY_tt:cryptocurrency_code_0 => notify // {"GENERIC_ENTITY_tt:cryptocurrency_code_0":{"value":null,"display":"invalid"}} |
<<<<<<<
`>> What's the value of this filter?
>> context = null // {}
=======
`>> What should the title contain?
>>>>>>>
`>> What should the title contain?
>> context = null // {}
<<<<<<<
`>> What's the value of this filter?
>> context = null // {}
=======
`>> What should the title contain?
>>>>>>>
`>> What should the title contain?
>> context = null // {}
<<<<<<<
`>> What is the value of the filter on the title?
>> context = policy true : @com.xkcd.get_comic filter param:title:String =~ undefined => notify // {}
=======
`>> What should the title contain?
>>>>>>>
`>> What should the title contain?
>> context = policy true : @com.xkcd.get_comic filter param:title:String =~ undefined => notify // {}
<<<<<<<
`>> What's the value of this filter?
>> context = policy param:source:Entity(tt:contact) == GENERIC_ENTITY_tt:contact_0 : @com.xkcd.get_comic filter param:title:String =~ undefined => notify // {"GENERIC_ENTITY_tt:contact_0":{"value":"mock-account:...","display":"Bob Smith (dad)"}}
=======
`>> What should the title contain?
>>>>>>>
`>> What should the title contain?
>> context = policy param:source:Entity(tt:contact) == GENERIC_ENTITY_tt:contact_0 : @com.xkcd.get_comic filter param:title:String =~ undefined => notify // {"GENERIC_ENTITY_tt:contact_0":{"value":"mock-account:...","display":"Bob Smith (dad)"}}
<<<<<<<
`>> What's the value of this filter?
>> context = policy param:source:Entity(tt:contact) == GENERIC_ENTITY_tt:contact_0 : @com.xkcd.get_comic filter @org.thingpedia.builtin.thingengine.builtin.get_gps { not param:location:Location == undefined } => notify // {"GENERIC_ENTITY_tt:contact_0":{"value":"mock-account:...","display":"Bob Smith (dad)"}}
=======
`>> What location are you interested in?
>>>>>>>
`>> What location are you interested in?
>> context = policy param:source:Entity(tt:contact) == GENERIC_ENTITY_tt:contact_0 : @com.xkcd.get_comic filter @org.thingpedia.builtin.thingengine.builtin.get_gps { not param:location:Location == undefined } => notify // {"GENERIC_ENTITY_tt:contact_0":{"value":"mock-account:...","display":"Bob Smith (dad)"}}
<<<<<<<
`>> What's the value of this filter?
>> context = policy param:source:Entity(tt:contact) == GENERIC_ENTITY_tt:contact_0 : @com.xkcd.get_comic filter @org.thingpedia.builtin.thingengine.builtin.get_gps { param:location:Location == undefined } => notify // {"GENERIC_ENTITY_tt:contact_0":{"value":"mock-account:...","display":"Bob Smith (dad)"}}
=======
`>> What location are you interested in?
>>>>>>>
`>> What location are you interested in?
>> context = policy param:source:Entity(tt:contact) == GENERIC_ENTITY_tt:contact_0 : @com.xkcd.get_comic filter @org.thingpedia.builtin.thingengine.builtin.get_gps { param:location:Location == undefined } => notify // {"GENERIC_ENTITY_tt:contact_0":{"value":"mock-account:...","display":"Bob Smith (dad)"}}
<<<<<<<
`>> What is the value of the filter on the hashtags?
>> context = now => ( @com.twitter.search ) filter param:hashtags:Array(Entity(tt:hashtag)) == undefined => notify // {}
=======
`>> What should the hashtags be equal to?
>>>>>>>
`>> What should the hashtags be equal to?
>> context = now => ( @com.twitter.search ) filter param:hashtags:Array(Entity(tt:hashtag)) == undefined => notify // {}
<<<<<<<
`>> What is the value of the filter on the hashtags?
>> context = now => ( @com.twitter.search ) filter param:hashtags:Array(Entity(tt:hashtag)) == undefined => notify // {}
=======
`>> What should the hashtags be equal to?
>>>>>>>
`>> What should the hashtags be equal to?
>> context = now => ( @com.twitter.search ) filter param:hashtags:Array(Entity(tt:hashtag)) == undefined => notify // {}
<<<<<<<
`search hello on bing with title filter`,
`>> Ok, so you want me to get websites matching “hello” on Bing if the title contains ____ and then notify you. Is that right?
>> context = now => ( @com.bing.web_search param:query:String = QUOTED_STRING_0 ) filter param:title:String =~ undefined => notify // {"QUOTED_STRING_0":"hello"}
>> ask special yesno
`,
['bookkeeping', 'special', 'special:yes'],
`>> What is the value of the filter on the title?
=======
`search hello on bing with title filter`,
`>> Ok, so you want me to get websites matching “hello” on Bing if the title contains ____ and then notify you. Is that right?\n>> ask special yesno\n`,
['bookkeeping', 'special', 'special:yes'],
`>> What should the title contain?
>>>>>>>
`search hello on bing with title filter`,
`>> Ok, so you want me to get websites matching “hello” on Bing if the title contains ____ and then notify you. Is that right?
>> context = now => ( @com.bing.web_search param:query:String = QUOTED_STRING_0 ) filter param:title:String =~ undefined => notify // {"QUOTED_STRING_0":"hello"}
>> ask special yesno
`,
['bookkeeping', 'special', 'special:yes'],
`>> What should the title contain? |
<<<<<<<
break
=======
>>>>>>>
<<<<<<<
break
=======
>>>>>>>
<<<<<<<
break
=======
>>>>>>>
<<<<<<<
return this.timeAgoFromMs(ms)
}
else {
return null
=======
return this.timeAgoFromMs(ms)
} else {
return null
>>>>>>>
return this.timeAgoFromMs(ms)
} else {
return null
<<<<<<<
return 'a year ago'
=======
return 'a year ago'
>>>>>>>
return 'a year ago'
<<<<<<<
var ms = this.date.getTime() - (new Date().getTime())
return this.timeUntilFromMs(ms)
}
=======
var ms = this.date.getTime() - new Date().getTime()
return this.timeUntilFromMs(ms)
}
>>>>>>>
var ms = this.date.getTime() - new Date().getTime()
return this.timeUntilFromMs(ms)
}
<<<<<<<
var ms = this.date.getTime() - (new Date().getTime())
var sec = Math.round(ms / 1000)
var min = Math.round(sec / 60)
var hr = Math.round(min / 60)
var day = Math.round(hr / 24)
var month = Math.round(day / 30)
var year = Math.round(month / 12)
=======
var ms = this.date.getTime() - new Date().getTime()
var sec = Math.round(ms / 1000)
var min = Math.round(sec / 60)
var hr = Math.round(min / 60)
var day = Math.round(hr / 24)
var month = Math.round(day / 30)
var year = Math.round(month / 12)
>>>>>>>
var ms = this.date.getTime() - new Date().getTime()
var sec = Math.round(ms / 1000)
var min = Math.round(sec / 60)
var hr = Math.round(min / 60)
var day = Math.round(hr / 24)
var month = Math.round(day / 30)
var year = Math.round(month / 12)
<<<<<<<
var title = this.getFormattedTitle()
if (title && this.getAttribute('title') !== title) {
this.setAttribute('title', title)
=======
var title = this.getFormattedTitle()
if (title) {
this.setAttribute('title', title)
>>>>>>>
var title = this.getFormattedTitle()
if (title && this.getAttribute('title') !== title) {
this.setAttribute('title', title)
<<<<<<<
return this._date.toLocaleString()
} catch(e) {
=======
return this._date.toLocaleString()
} catch (e) {
>>>>>>>
return this._date.toLocaleString()
} catch (e) {
<<<<<<<
RelativeTimeElement.prototype.attachedCallback = function() {
nowElements.push(this)
=======
RelativeTimePrototype.attachedCallback = function() {
nowElements.push(this)
>>>>>>>
RelativeTimeElement.prototype.attachedCallback = function() {
nowElements.push(this)
<<<<<<<
RelativeTimeElement.prototype.detachedCallback = function() {
var ix = nowElements.indexOf(this)
=======
RelativeTimePrototype.detachedCallback = function() {
var ix = nowElements.indexOf(this)
>>>>>>>
RelativeTimeElement.prototype.detachedCallback = function() {
var ix = nowElements.indexOf(this)
<<<<<<<
window.LocalTimeElement = LocalTimeElement
window.customElements.define('local-time', LocalTimeElement)
})()
=======
window.LocalTimeElement = document.registerElement('local-time', {
prototype: LocalTimePrototype
})
})()
>>>>>>>
window.LocalTimeElement = LocalTimeElement
window.customElements.define('local-time', LocalTimeElement)
})() |
<<<<<<<
function extractFiles(path, sheet) {
var unzip = require('unzip'),
=======
function extractFiles(path) {
var unzip = require('unzip2'),
>>>>>>>
function extractFiles(path, sheet) {
var unzip = require('unzip2'),
<<<<<<<
sheet: {
deferred: defer()
},
'xl/sharedStrings.xml': 'strings'
};
files['xl/worksheets/sheet' + sheet + '.xml'] = 'sheet';
=======
'xl/sharedStrings.xml': {
deferred: defer()
}
};
var noop = function () {};
>>>>>>>
sheet: {
deferred: defer()
},
'xl/sharedStrings.xml': 'strings'
};
files['xl/worksheets/sheet' + sheet + '.xml'] = 'sheet';
var noop = function () {};
<<<<<<<
var libxmljs = require('libxmljs'),
sheet = libxmljs.parseXml(files.sheet.contents),
strings = libxmljs.parseXml(files.strings.contents),
ns = {a: 'http://schemas.openxmlformats.org/spreadsheetml/2006/main'},
data = [];
=======
try {
var libxmljs = require('libxmljs'),
sheet = libxmljs.parseXml(files['xl/worksheets/sheet1.xml'].contents),
strings = libxmljs.parseXml(files['xl/sharedStrings.xml'].contents),
ns = {a: 'http://schemas.openxmlformats.org/spreadsheetml/2006/main'},
data = [];
} catch(parseError){
return [];
}
>>>>>>>
try {
var libxmljs = require('libxmljs'),
sheet = libxmljs.parseXml(files.sheet.contents),
strings = libxmljs.parseXml(files.strings.contents),
ns = {a: 'http://schemas.openxmlformats.org/spreadsheetml/2006/main'},
data = [];
} catch(parseError){
return [];
} |
<<<<<<<
}
];
var autocompleteValues = [
{// LEVEL1
'robot.':{
'synonyms':[],
'values':['goDown()', 'goUp()', 'goLeft()', 'goRight()']
},
'scanner.':{
'synonyms':['robot.getScanner().'],
'values':[]
},
' == ':{
'synonyms':[' != '],
'values':[]
}
},
{// LEVEL2
'robot.':{
'synonyms':[],
'values':['getScanner()']
},
'scanner.':{
'synonyms':['robot.getScanner().'],
'values':['atRight()', 'atLeft()', 'atUp()', 'atDown()']
},
' == ':{
'synonyms':[' != '],
'values':['\'WALL\'']
}
}
];
=======
};
>>>>>>>
];
var autocompleteValues = [
{// LEVEL1
'robot.':{
'synonyms':[],
'values':['goDown()', 'goUp()', 'goLeft()', 'goRight()']
},
'scanner.':{
'synonyms':['robot.getScanner().'],
'values':[]
},
' == ':{
'synonyms':[' != '],
'values':[]
}
},
{// LEVEL2
'robot.':{
'synonyms':[],
'values':['getScanner()']
},
'scanner.':{
'synonyms':['robot.getScanner().'],
'values':['atRight()', 'atLeft()', 'atUp()', 'atDown()']
},
' == ':{
'synonyms':[' != '],
'values':['\'WALL\'']
}
}
]; |
<<<<<<<
console.print('Waiting for next command...');
=======
// console.print('Ожидаем следующей команды...');
>>>>>>>
// console.print('Waiting for next command...'); |
<<<<<<<
=======
"use strict";
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
>>>>>>>
<<<<<<<
function formatDate(frmt, dateObj) {
var chars = frmt.split("");
return chars.map(function (c, i) {
return self.formats[c] && chars[i - 1] !== "\\" ? self.formats[c](dateObj) : c !== "\\" ? c : "";
}).join("");
}
function handleYearChange() {
if (self.currentMonth < 0 || self.currentMonth > 11) {
self.currentYear += self.currentMonth % 11;
self.currentMonth = (self.currentMonth + 12) % 12;
=======
this.triggerEvent("Open");
}
}, {
key: "pad",
value: function pad(number) {
return ("0" + number).slice(-2);
}
}, {
key: "parseConfig",
value: function parseConfig() {
var userConfig = _extends({}, this.element.dataset, this.instanceConfig);
this.config = _extends({}, Flatpickr.defaultConfig, userConfig);
if (!userConfig.dateFormat && this.config.enableTime) {
if (this.config.noCalendar) {
// time picker
this.config.dateFormat = "H:i";
this.config.altFormat = "h:i K";
} else {
this.config.dateFormat += " H:i" + (this.config.enableSeconds ? ":S" : "");
this.config.altFormat = "h:i" + (this.config.enableSeconds ? ":S" : "") + " K";
}
}
>>>>>>>
<<<<<<<
if (self.config.altInput && self.config.enableTime && !self.config.altFormat) {
self.config.altFormat = self.config.noCalendar ? "h:i" + (self.config.enableSeconds ? ":S K" : " K") : Flatpickr.defaultConfig.altFormat + (" h:i" + (self.config.enableSeconds ? ":S" : "") + " K");
=======
}, {
key: "setupLocale",
value: function setupLocale() {
this.l10n = _extends({}, Flatpickr.l10n);
>>>>>>> |
<<<<<<<
import DonationPage from "./Donate";
=======
import RecipientDashboard from "./Recipient";
>>>>>>>
import DonationPage from "./Donate";
import RecipientDashboard from "./Recipient";
<<<<<<<
=======
Signup,
MissionsCompleted,
Dashboard,
>>>>>>>
<<<<<<<
MissionsCompleted,
MissionsCreated,
OrganizerSignupPage,
RequestPage,
Signup,
Status,
UserProfile,
=======
ErrorLanding,
RecipientDashboard,
>>>>>>>
MissionsCompleted,
OrganizerSignupPage,
RecipientDashboard,
RequestPage,
Signup,
Status,
UserProfile, |
<<<<<<<
/**
* Component used for showing user profile
*
* @component
*/
const UserProfile = ({ history, ...props }) => {
=======
const UserProfile = ({ history }) => {
>>>>>>>
/**
* Component used for showing user profile
*
* @component
*/
const UserProfile = ({ history }) => { |
<<<<<<<
/**
* Recursively flatten the data
* [{path:string},{path:string}] => {path,path2}
* @param menus
*/
const getFlatMenuKeys = menuData => {
let keys = [];
menuData.forEach(item => {
if (item.children) {
keys = keys.concat(getFlatMenuKeys(item.children));
}
keys.push(item.path);
});
return keys;
};
export default props =>
props.isMobile || props.fixSiderbar ? (
=======
const SiderMenuWrapper = props =>
props.isMobile ? (
>>>>>>>
/**
* Recursively flatten the data
* [{path:string},{path:string}] => {path,path2}
* @param menus
*/
const getFlatMenuKeys = menuData => {
let keys = [];
menuData.forEach(item => {
if (item.children) {
keys = keys.concat(getFlatMenuKeys(item.children));
}
keys.push(item.path);
});
return keys;
};
const SiderMenuWrapper = props =>
props.isMobile ? (
<<<<<<<
<SiderMenu {...props} flatMenuKeys={getFlatMenuKeys(props.menuData)} />
);
=======
<SiderMenu {...props} />
);
export default SiderMenuWrapper;
>>>>>>>
<SiderMenu {...props} flatMenuKeys={getFlatMenuKeys(props.menuData)} />
);
export default SiderMenuWrapper; |
<<<<<<<
componentDidUpdate(preProps) {
if (JSON.stringify(preProps.data) !== JSON.stringify(this.props.data)) {
this.renderChart(this.props);
=======
componentWillReceiveProps(nextProps) {
const { data } = this.props;
if (JSON.stringify(nextProps.data) !== JSON.stringify(data)) {
this.renderChart(nextProps);
>>>>>>>
componentDidUpdate(preProps) {
const { data } = this.props;
if (JSON.stringify(preProps.data) !== JSON.stringify(data)) {
this.renderChart(this.props); |
<<<<<<<
const RightSidebar = connect(({ setting }) => ({ ...setting }))(Sidebar);
=======
/**
* 根据菜单取得重定向地址.
*/
const redirectData = [];
const getRedirect = item => {
if (item && item.children) {
if (item.children[0] && item.children[0].path) {
redirectData.push({
from: `${item.path}`,
to: `${item.children[0].path}`,
});
item.children.forEach(children => {
getRedirect(children);
});
}
}
};
getMenuData().forEach(getRedirect);
>>>>>>>
const RightSidebar = connect(({ setting }) => ({ ...setting }))(Sidebar);
<<<<<<<
=======
let isMobile;
enquireScreen(b => {
isMobile = b;
});
>>>>>>>
<<<<<<<
=======
};
state = {
isMobile,
>>>>>>>
<<<<<<<
=======
componentDidMount() {
enquireScreen(mobile => {
this.setState({
isMobile: mobile,
});
});
this.props.dispatch({
type: 'user/fetchCurrent',
});
}
>>>>>>>
<<<<<<<
};
changeSetting = setting => {
=======
};
handleNoticeClear = type => {
message.success(`清空了${type}`);
>>>>>>>
};
changeSetting = setting => {
<<<<<<<
};
=======
};
handleMenuClick = ({ key }) => {
if (key === 'triggerError') {
this.props.dispatch(routerRedux.push('/exception/trigger'));
return;
}
if (key === 'logout') {
this.props.dispatch({
type: 'login/logout',
});
}
};
handleNoticeVisibleChange = visible => {
if (visible) {
this.props.dispatch({
type: 'global/fetchNotices',
});
}
};
>>>>>>>
};
<<<<<<<
const { isMobile, redirectData, routerData, fixedHeader, match } = this.props;
const isTop = this.props.layout === 'topmenu';
=======
const {
currentUser,
collapsed,
fetchingNotices,
notices,
routerData,
match,
location,
} = this.props;
>>>>>>>
const { isMobile, redirectData, routerData, fixedHeader, match } = this.props;
const isTop = this.props.layout === 'topmenu';
<<<<<<<
{myRedirectData.map(item => (
<Redirect key={item.from} exact from={item.from} to={item.to} />
))}
{getRoutes(match.path, routerData).map(item => (
<AuthorizedRoute
key={item.key}
path={item.path}
component={item.component}
exact={item.exact}
authority={item.authority}
redirectPath="/exception/403"
/>
))}
=======
{redirectData.map(item => (
<Redirect key={item.from} exact from={item.from} to={item.to} />
))}
{getRoutes(match.path, routerData).map(item => (
<AuthorizedRoute
key={item.key}
path={item.path}
component={item.component}
exact={item.exact}
authority={item.authority}
redirectPath="/exception/403"
/>
))}
>>>>>>>
{myRedirectData.map(item => (
<Redirect key={item.from} exact from={item.from} to={item.to} />
))}
{getRoutes(match.path, routerData).map(item => (
<AuthorizedRoute
key={item.key}
path={item.path}
component={item.component}
exact={item.exact}
authority={item.authority}
redirectPath="/exception/403"
/>
))}
<<<<<<<
<Footer />
=======
<Footer style={{ padding: 0 }}>
<GlobalFooter
links={[
{
key: 'Pro 首页',
title: 'Pro 首页',
href: 'http://pro.ant.design',
blankTarget: true,
},
{
key: 'github',
title: <Icon type="github" />,
href: 'https://github.com/ant-design/ant-design-pro',
blankTarget: true,
},
{
key: 'Ant Design',
title: 'Ant Design',
href: 'http://ant.design',
blankTarget: true,
},
]}
copyright={
<Fragment>
Copyright <Icon type="copyright" /> 2018 蚂蚁金服体验技术部出品
</Fragment>
}
/>
</Footer>
>>>>>>>
<Footer /> |
<<<<<<<
import React from 'react';
=======
import { parse, stringify } from 'qs';
>>>>>>>
import React from 'react';
import { parse, stringify } from 'qs'; |
<<<<<<<
import { fakeAccountLogin, getFakeCaptcha } from '../services/api';
=======
import { stringify } from 'qs';
import { fakeAccountLogin } from '../services/api';
>>>>>>>
import { stringify } from 'qs';
import { fakeAccountLogin, getFakeCaptcha } from '../services/api';
<<<<<<<
*getCaptcha({ payload }, { call }) {
yield call(getFakeCaptcha, payload);
},
=======
*logout(_, { put }) {
yield put({
type: 'changeLoginStatus',
payload: {
status: false,
currentAuthority: 'guest',
},
});
reloadAuthorized();
yield put(
routerRedux.push({
pathname: '/user/login',
search: stringify({
redirect: window.location.href,
}),
})
);
},
>>>>>>>
*getCaptcha({ payload }, { call }) {
yield call(getFakeCaptcha, payload);
},
*logout(_, { put }) {
yield put({
type: 'changeLoginStatus',
payload: {
status: false,
currentAuthority: 'guest',
},
});
reloadAuthorized();
yield put(
routerRedux.push({
pathname: '/user/login',
search: stringify({
redirect: window.location.href,
}),
})
);
}, |
<<<<<<<
=======
const { SubMenu } = Menu;
// Allow menu.js config icon as string or ReactNode
// icon: 'setting',
// icon: 'http://demo.com/icon.png',
// icon: <Icon type="setting" />,
const getIcon = (icon) => {
if (typeof icon === 'string' && icon.indexOf('http') === 0) {
return <img src={icon} alt="icon" className={`${styles.icon} sider-menu-item-img`} />;
}
if (typeof icon === 'string') {
return <Icon type={icon} />;
}
return icon;
};
export const getMeunMatcheys = (flatMenuKeys, path) => {
return flatMenuKeys.filter((item) => {
return pathToRegexp(item).test(path);
});
};
>>>>>>>
const { SubMenu } = Menu;
// Allow menu.js config icon as string or ReactNode
// icon: 'setting',
// icon: 'http://demo.com/icon.png',
// icon: <Icon type="setting" />,
const getIcon = (icon) => {
if (typeof icon === 'string' && icon.indexOf('http') === 0) {
return <img src={icon} alt="icon" className={`${styles.icon} sider-menu-item-img`} />;
}
if (typeof icon === 'string') {
return <Icon type={icon} />;
}
return icon;
};
<<<<<<<
* Convert pathname to openKeys
* /list/search/articles = > ['list','/list/search']
* @param props
=======
* 判断是否是http链接.返回 Link 或 a
* Judge whether it is http link.return a or Link
* @memberof SiderMenu
*/
getMenuItemPath = (item) => {
const itemPath = this.conversionPath(item.path);
const icon = getIcon(item.icon);
const { target, name } = item;
// Is it a http link
if (/^https?:\/\//.test(itemPath)) {
return (
<a href={itemPath} target={target}>
{icon}
<span>{name}</span>
</a>
);
}
return (
<Link
to={itemPath}
target={target}
replace={itemPath === this.props.location.pathname}
onClick={
this.props.isMobile
? () => {
this.props.onCollapse(true);
}
: undefined
}
>
{icon}
<span>{name}</span>
</Link>
);
};
/**
* get SubMenu or Item
*/
getSubMenuOrItem = (item) => {
if (item.children && item.children.some(child => child.name)) {
const childrenItems = this.getNavMenuItems(item.children);
// 当无子菜单时就不展示菜单
if (childrenItems && childrenItems.length > 0) {
return (
<SubMenu
title={
item.icon ? (
<span>
{getIcon(item.icon)}
<span>{item.name}</span>
</span>
) : (
item.name
)
}
key={item.path}
>
{childrenItems}
</SubMenu>
);
}
return null;
} else {
return (
<Menu.Item key={item.path}>{this.getMenuItemPath(item)}</Menu.Item>
);
}
};
/**
* 获得菜单子节点
* @memberof SiderMenu
>>>>>>>
* Convert pathname to openKeys
* /list/search/articles = > ['list','/list/search']
* @param props
* 判断是否是http链接.返回 Link 或 a
* Judge whether it is http link.return a or Link
* @memberof SiderMenu
*/
getMenuItemPath = (item) => {
const itemPath = this.conversionPath(item.path);
const icon = getIcon(item.icon);
const { target, name } = item;
// Is it a http link
if (/^https?:\/\//.test(itemPath)) {
return (
<a href={itemPath} target={target}>
{icon}
<span>{name}</span>
</a>
);
}
return (
<Link
to={itemPath}
target={target}
replace={itemPath === this.props.location.pathname}
onClick={
this.props.isMobile
? () => {
this.props.onCollapse(true);
}
: undefined
}
>
{icon}
<span>{name}</span>
</Link>
);
};
/**
* get SubMenu or Item
*/
getSubMenuOrItem = (item) => {
if (item.children && item.children.some(child => child.name)) {
const childrenItems = this.getNavMenuItems(item.children);
// 当无子菜单时就不展示菜单
if (childrenItems && childrenItems.length > 0) {
return (
<SubMenu
title={
item.icon ? (
<span>
{getIcon(item.icon)}
<span>{item.name}</span>
</span>
) : (
item.name
)
}
key={item.path}
>
{childrenItems}
</SubMenu>
);
}
return null;
} else {
return (
<Menu.Item key={item.path}>{this.getMenuItemPath(item)}</Menu.Item>
);
}
};
/**
* 获得菜单子节点
* @memberof SiderMenu |
<<<<<<<
=======
openFileDialog = (callback, props) => {
this.setState({
openModal: {
component: FileDialogModalContainer,
shouldCloseOnOverlayClick: true,
props: {
onCancel: this.onCloseModal,
onConfirm: filePath => {
this.setState({ openModal: null });
callback({ path: filePath, isValid: true });
},
...props
}
}
});
};
>>>>>>>
<<<<<<<
setTimeout(() => {
if (saved) return;
this.showDialog(ProgressDialog, {
title: "Saving Scene",
message: "Saving scene..."
});
}, PROGRESS_DIALOG_DELAY);
const serializedScene = this.props.editor.serializeScene(sceneURI);
this.props.editor.ignoreNextSceneFileChange = true;
await this.props.project.writeJSON(sceneURI, serializedScene);
=======
const { project, editor } = this.props;
const serializedScene = editor.serializeScene(sceneURI);
editor.ignoreNextSceneFileChange = true;
await project.writeJSON(sceneURI, serializedScene);
const sceneUserData = editor.scene.userData;
>>>>>>>
setTimeout(() => {
if (saved) return;
this.showDialog(ProgressDialog, {
title: "Saving Scene",
message: "Saving scene..."
});
}, PROGRESS_DIALOG_DELAY);
const { project, editor } = this.props;
const serializedScene = editor.serializeScene(sceneURI);
editor.ignoreNextSceneFileChange = true;
await project.writeJSON(sceneURI, serializedScene);
const sceneUserData = editor.scene.userData;
<<<<<<<
this.hideDialog();
=======
editor.signals.sceneGraphChanged.dispatch();
this.setState({ openModal: null });
>>>>>>>
this.hideDialog();
editor.signals.sceneGraphChanged.dispatch();
<<<<<<<
let opened = false;
try {
setTimeout(() => {
if (opened) return;
this.showDialog(ProgressDialog, {
title: "Opening Scene",
message: "Opening scene..."
});
}, PROGRESS_DIALOG_DELAY);
await this.props.editor.openRootScene(uri);
this.hideDialog();
} catch (e) {
console.error(e);
this.showDialog(ErrorDialog, {
title: "Error Opening Scene",
message: e.message || "There was an error when opening the scene."
});
} finally {
opened = true;
}
=======
this.props.editor
.openRootScene(uri)
.then(scene => {
document.title = `Hubs Editor - ${scene.name}`;
})
.catch(e => {
this.setState({
openModal: {
component: OptionDialog,
shouldCloseOnOverlayClick: false,
props: {
title: "Error",
message: `${e.message}:
${e.url}.
Please make sure the file exists and then press "Resolved" to reload the scene.`,
options: [
{
label: "Resolved",
onClick: () => {
this.setState({ openModal: null });
this.onOpenScene(uri);
}
}
],
cancelLabel: "Cancel",
onCancel: () => {
this.setState({ openModal: null });
}
}
}
});
});
>>>>>>>
let opened = false;
try {
setTimeout(() => {
if (opened) return;
this.showDialog(ProgressDialog, {
title: "Opening Scene",
message: "Opening scene..."
});
}, PROGRESS_DIALOG_DELAY);
await this.props.editor.openRootScene(uri);
this.hideDialog();
} catch (e) {
console.error(e);
this.setState({
openModal: {
component: OptionDialog,
shouldCloseOnOverlayClick: false,
props: {
title: "Error Opening Scene",
message: `
${e.message}:
${e.url}.
Please make sure the file exists and then press "Resolved" to reload the scene.
`,
options: [
{
label: "Resolved",
onClick: () => {
this.setState({ openModal: null });
this.onOpenScene(uri);
}
}
],
cancelLabel: "Cancel",
onCancel: () => {
this.setState({ openModal: null });
}
}
}
});
} finally {
opened = true;
} |
<<<<<<<
app.use(rewrite(/^\/scenes/, "/"));
if (process.env.NODE_ENV === "development") {
=======
if (opts.publicPath || process.env.NODE_ENV !== "development") {
app.use(serve(opts.publicPath || path.join(__dirname, "..", "..", "public")));
} else {
>>>>>>>
app.use(rewrite(/^\/scenes/, "/"));
if (opts.publicPath || process.env.NODE_ENV !== "development") {
app.use(serve(opts.publicPath || path.join(__dirname, "..", "..", "public")));
} else { |
<<<<<<<
this._addComponent(navNode, "visible", { visible: false });
await this._addComponent(navNode, "gltf-model", { src: path });
this._addComponent(navNode, "heightfield");
=======
await this._addComponent(navNode, "heightfield");
>>>>>>>
this._addComponent(navNode, "visible", { visible: false });
await this._addComponent(navNode, "gltf-model", { src: path });
await this._addComponent(navNode, "heightfield"); |
<<<<<<<
import BoxColliderComponent from "./BoxColliderComponent";
=======
import MediaLoaderComponent from "./MediaLoaderComponent";
import SuperSpawnerComponent from "./SuperSpawnerComponent";
import HoverableComponent from "./HoverableComponent";
>>>>>>>
import BoxColliderComponent from "./BoxColliderComponent";
import MediaLoaderComponent from "./MediaLoaderComponent";
import SuperSpawnerComponent from "./SuperSpawnerComponent";
import HoverableComponent from "./HoverableComponent";
<<<<<<<
TransformComponent,
BoxColliderComponent
=======
SuperSpawnerComponent,
TransformComponent
>>>>>>>
BoxColliderComponent,
SuperSpawnerComponent,
TransformComponent |
<<<<<<<
import FileDropTarget from "../FileDropTarget";
import AddNodeActionButtons from "../AddNodeActionButtons";
=======
import AssetDropTarget from "../AssetDropTarget";
>>>>>>>
import FileDropTarget from "../FileDropTarget";
import AssetDropTarget from "../AssetDropTarget";
import AddNodeActionButtons from "../AddNodeActionButtons";
<<<<<<<
<FileDropTarget onDropFile={this.onDropFile}>
<Viewport ref={this.canvasRef} onDropFile={this.onDropFile} />
</FileDropTarget>
<AddNodeActionButtons />
=======
<AssetDropTarget onDropAsset={this.onDropAsset}>
<Viewport ref={this.canvasRef} onDropAsset={this.onDropAsset} />
</AssetDropTarget>
>>>>>>>
<FileDropTarget onDropFile={this.onDropFile}>
<Viewport ref={this.canvasRef} onDropFile={this.onDropFile} />
</FileDropTarget>
<AssetDropTarget onDropAsset={this.onDropAsset}>
<Viewport ref={this.canvasRef} onDropAsset={this.onDropAsset} />
</AssetDropTarget>
<AddNodeActionButtons /> |
<<<<<<<
if (this.navMeshMode === NavMeshMode.Automatic) {
const boxColliderNodes = this.editor.scene.getNodesByType(BoxColliderNode);
=======
const boxColliderNodes = this.editor.scene.getNodesByType(BoxColliderNode, false);
>>>>>>>
if (this.navMeshMode === NavMeshMode.Automatic) {
const boxColliderNodes = this.editor.scene.getNodesByType(BoxColliderNode, false); |
<<<<<<<
import { Components } from "./components";
import { types } from "./components/utils";
import SceneReferenceComponent from "./components/SceneReferenceComponent";
import SaveableComponent from "./components/SaveableComponent";
import { last } from "../utils";
import { getUrlFilename } from "../utils/url-path";
=======
>>>>>>>
import { getUrlFilename } from "../utils/url-path"; |
<<<<<<<
import SystemMessageModalContainer from "./modals/SystemMessageModalContainer";
=======
import { DialogContextProvider } from "./contexts/DialogContext";
>>>>>>>
import { DialogContextProvider } from "./contexts/DialogContext";
import SystemMessageModalContainer from "./modals/SystemMessageModalContainer";
<<<<<<<
this.props.editor
.openRootScene(uri)
.then(scene => {
document.title = `Hubs Editor - ${scene.name}`;
})
.catch(e => {
this.setState({
systemMessage: {
messageType: "error",
messageContent: [e],
isOpen: true,
onRequestClose: () => {
this.setState({ systemMessage: null });
},
actions: [
{
name: "Cancel",
method: () => {
this.setState({ systemMessage: null });
}
},
{
name: "Resolved",
method: () => {
this.onOpenScene(uri);
this.setState({ systemMessage: null });
}
}
]
}
});
});
=======
this.props.editor.openRootScene(uri).catch(e => {
console.error(e);
});
>>>>>>>
this.props.editor
.openRootScene(uri)
.then(scene => {
document.title = `Hubs Editor - ${scene.name}`;
})
.catch(e => {
this.setState({
systemMessage: {
messageType: "error",
messageContent: [e],
isOpen: true,
onRequestClose: () => {
this.setState({ systemMessage: null });
},
actions: [
{
name: "Cancel",
method: () => {
this.setState({ systemMessage: null });
}
},
{
name: "Resolved",
method: () => {
this.onOpenScene(uri);
this.setState({ systemMessage: null });
}
}
]
}
});
});
<<<<<<<
<MenuBarContainer menus={menus} />
<MosaicWithoutDragDropContext
className="mosaic-theme"
renderTile={this.renderPanel}
initialValue={initialPanels}
onChange={this.onPanelChange}
/>
<Modal
ariaHideApp={false}
isOpen={!!openModal}
onRequestClose={this.onCloseModal}
shouldCloseOnOverlayClick={openModal && openModal.shouldCloseOnOverlayClick}
className="Modal"
overlayClassName="Overlay"
>
{openModal && <openModal.component {...openModal.props} />}
</Modal>
<SystemMessageModalContainer {...systemMessage} />
=======
<DialogContextProvider>
<MenuBarContainer menus={menus} />
<MosaicWithoutDragDropContext
className="mosaic-theme"
renderTile={this.renderPanel}
initialValue={initialPanels}
onChange={this.onPanelChange}
/>
<Modal
ariaHideApp={false}
isOpen={!!openModal}
onRequestClose={this.onCloseModal}
shouldCloseOnOverlayClick={openModal && openModal.shouldCloseOnOverlayClick}
className="Modal"
overlayClassName="Overlay"
>
{openModal && <openModal.component {...openModal.props} />}
</Modal>
</DialogContextProvider>
>>>>>>>
<DialogContextProvider>
<MenuBarContainer menus={menus} />
<MosaicWithoutDragDropContext
className="mosaic-theme"
renderTile={this.renderPanel}
initialValue={initialPanels}
onChange={this.onPanelChange}
/>
<Modal
ariaHideApp={false}
isOpen={!!openModal}
onRequestClose={this.onCloseModal}
shouldCloseOnOverlayClick={openModal && openModal.shouldCloseOnOverlayClick}
className="Modal"
overlayClassName="Overlay"
>
{openModal && <openModal.component {...openModal.props} />}
</Modal>
<SystemMessageModalContainer {...systemMessage} />
</DialogContextProvider> |
<<<<<<<
var diffArray = require('./helper/diff').diffArray;
var combine = require('./helper/combine');
var animate = require("./helper/animate");
var node = require("./parser/node");
var Group = require('./group');
var dom = require("./dom");
=======
var diffArray = require('./helper/diff').diffArray;
var combine = require('./helper/combine');
var animate = require("./helper/animate");
var Parser = require('./parser/Parser');
var node = require("./parser/node");
var Group = require('./group');
var dom = require("./dom");
>>>>>>>
var diffArray = require('./helper/diff').diffArray;
var combine = require('./helper/combine');
var animate = require("./helper/animate");
var Parser = require('./parser/Parser');
var node = require("./parser/node");
var Group = require('./group');
var dom = require("./dom");
<<<<<<<
var consts = require('./const');
var OPTIONS = consts.OPTIONS;
=======
var consts = require('./const')
var ERROR = consts.ERROR;
var MSG = consts.MSG;
var nodeCursor = require('./helper/cursor');
var config = require('./config')
var shared = require('./render/shared');
>>>>>>>
var consts = require('./const');
var OPTIONS = consts.OPTIONS;
var ERROR = consts.ERROR;
var MSG = consts.MSG;
var nodeCursor = require('./helper/cursor');
var config = require('./config')
var shared = require('./render/shared');
<<<<<<<
var section = self.$compile(ast.body, {
=======
data = _.createObject(extra, data);
var curOptions = {
>>>>>>>
var section = self.$compile(ast.body, {
<<<<<<<
=======
>>>>>>>
<<<<<<<
dom.text(node, newval == null? "": String(newval) );
}, OPTIONS.STABLE_INIT )
=======
dom.text(node, _.toText(newval) );
},{ init: true })
>>>>>>>
dom.text(node, _.toText(newval));
}, OPTIONS.STABLE_INIT )
<<<<<<<
var text = ast.text;
var node = document.createTextNode(
text.indexOf('&') !== -1? _.convertEntity(text): text
);
return node;
=======
var cursor = options.cursor , node;
var astText = _.convertEntity( ast.text );
if(cursor && cursor.node) {
var mountNode = cursor.node;
// maybe regularjs parser have some difference with html builtin parser when process empty text
// @todo error report
if(mountNode.nodeType !== 3 ){
if( _.blankReg.test(astText) ) return {
code: ERROR.UNMATCHED_AST
}
}else{
node = walkers._handleMountText( cursor, astText )
}
}
return node || document.createTextNode( astText );
>>>>>>>
var cursor = options.cursor , node;
var text = ast.text;
var astText = text.indexOf('&') !== -1? _.convertEntity(text): text;
if(cursor && cursor.node) {
var mountNode = cursor.node;
// maybe regularjs parser have some difference with html builtin parser when process empty text
// @todo error report
if(mountNode.nodeType !== 3 ){
if( _.blankReg.test(astText) ) return {
code: ERROR.UNMATCHED_AST
}
}else{
node = walkers._handleMountText( cursor, astText )
}
}
return node || document.createTextNode( astText );
<<<<<<<
=======
>>>>>>> |
<<<<<<<
=======
import dayjs from 'dayjs';
>>>>>>> |
<<<<<<<
'r-html': function(elem, value){
this.$watch(value, function(nvalue){
nvalue = nvalue || "";
dom.html(elem, nvalue)
}, {force: true, stable: true});
=======
'r-html': {
ssr: function(value, tag){
tag.body = value;
return "";
},
link: function(elem, value){
this.$watch(value, function(nvalue){
nvalue = nvalue || "";
dom.html(elem, nvalue)
}, {force: true});
}
>>>>>>>
'r-html': {
ssr: function(value, tag){
tag.body = value;
return "";
},
link: function(elem, value){
this.$watch(value, function(nvalue){
nvalue = nvalue || "";
dom.html(elem, nvalue)
}, {force: true, stable: true});
} |
<<<<<<<
var MAX_PRIORITY = 9999;
=======
var config = require('./config');
>>>>>>>
var MAX_PRIORITY = 9999;
var config = require('./config');
<<<<<<<
// remove directive param from AST
_.fixTagAST = function( tagAST, Component ){
if( tagAST.touched ) return;
var attrs = tagAST.attrs;
if( !attrs ) return;
// Maybe multiple directive need same param,
// We place all param in totalParamMap
var len = attrs.length;
if(!len) return;
var directives=[], otherAttrMap = {};
for(;len--;){
var attr = attrs[ len ];
// @IE fix IE9- input type can't assign after value
if(attr.name === 'type') attr.priority = MAX_PRIORITY+1;
var directive = Component.directive( attr.name );
if( directive ) {
attr.priority = directive.priority || 1;
attr.directive = true;
directives.push(attr);
}else if(attr.type === 'attribute'){
otherAttrMap[attr.name] = attr.value;
}
}
directives.forEach( function( attr ){
var directive = Component.directive(attr.name);
var param = directive.param;
if(param && param.length){
attr.param = {};
param.forEach(function( name ){
if( name in otherAttrMap ){
attr.param[name] = otherAttrMap[name] === undefined? true: otherAttrMap[name]
_.removeOne(attrs, function(attr){
return attr.name === name
})
}
})
}
});
attrs.sort(function(a1, a2){
var p1 = a1.priority;
var p2 = a2.priority;
if( p1 == null ) p1 = MAX_PRIORITY;
if( p2 == null ) p2 = MAX_PRIORITY;
return p2 - p1;
})
tagAST.touched = true;
}
_.findItem = function(list, filter){
if(!list || !list.length) return;
var len = list.length;
while(len--){
if(filter(list[len])) return list[len]
}
}
_.getParamObj = function(component, param){
var paramObj = {};
if(param) {
for(var i in param) if(param.hasOwnProperty(i)){
var value = param[i];
paramObj[i] = value && value.type==='expression'? component.$get(value): value;
}
}
return paramObj;
}
=======
_.eventReg = /^on-(\w[-\w]+)$/;
_.toText = function(obj){
return obj == null ? "": "" + obj;
}
// hogan
// https://github.com/twitter/hogan.js
// MIT
_.escape = (function(){
var rAmp = /&/g,
rLt = /</g,
rGt = />/g,
rApos = /\'/g,
rQuot = /\"/g,
hChars = /[&<>\"\']/;
function ignoreNullVal(val) {
return String((val === undefined || val == null) ? '' : val);
}
return function (str) {
str = ignoreNullVal(str);
return hChars.test(str) ?
str
.replace(rAmp, '&')
.replace(rLt, '<')
.replace(rGt, '>')
.replace(rApos, ''')
.replace(rQuot, '"') :
str;
}
})();
>>>>>>>
// remove directive param from AST
_.fixTagAST = function( tagAST, Component ){
if( tagAST.touched ) return;
var attrs = tagAST.attrs;
if( !attrs ) return;
// Maybe multiple directive need same param,
// We place all param in totalParamMap
var len = attrs.length;
if(!len) return;
var directives=[], otherAttrMap = {};
for(;len--;){
var attr = attrs[ len ];
// @IE fix IE9- input type can't assign after value
if(attr.name === 'type') attr.priority = MAX_PRIORITY+1;
var directive = Component.directive( attr.name );
if( directive ) {
attr.priority = directive.priority || 1;
attr.directive = true;
directives.push(attr);
}else if(attr.type === 'attribute'){
otherAttrMap[attr.name] = attr.value;
}
}
directives.forEach( function( attr ){
var directive = Component.directive(attr.name);
var param = directive.param;
if(param && param.length){
attr.param = {};
param.forEach(function( name ){
if( name in otherAttrMap ){
attr.param[name] = otherAttrMap[name] === undefined? true: otherAttrMap[name]
_.removeOne(attrs, function(attr){
return attr.name === name
})
}
})
}
});
attrs.sort(function(a1, a2){
var p1 = a1.priority;
var p2 = a2.priority;
if( p1 == null ) p1 = MAX_PRIORITY;
if( p2 == null ) p2 = MAX_PRIORITY;
return p2 - p1;
})
tagAST.touched = true;
}
_.findItem = function(list, filter){
if(!list || !list.length) return;
var len = list.length;
while(len--){
if(filter(list[len])) return list[len]
}
}
_.getParamObj = function(component, param){
var paramObj = {};
if(param) {
for(var i in param) if(param.hasOwnProperty(i)){
var value = param[i];
paramObj[i] = value && value.type==='expression'? component.$get(value): value;
}
}
return paramObj;
}
_.eventReg = /^on-(\w[-\w]+)$/;
_.toText = function(obj){
return obj == null ? "": "" + obj;
}
// hogan
// https://github.com/twitter/hogan.js
// MIT
_.escape = (function(){
var rAmp = /&/g,
rLt = /</g,
rGt = />/g,
rApos = /\'/g,
rQuot = /\"/g,
hChars = /[&<>\"\']/;
function ignoreNullVal(val) {
return String((val === undefined || val == null) ? '' : val);
}
return function (str) {
str = ignoreNullVal(str);
return hChars.test(str) ?
str
.replace(rAmp, '&')
.replace(rLt, '<')
.replace(rGt, '>')
.replace(rApos, ''')
.replace(rQuot, '"') :
str;
}
})(); |
<<<<<<<
/* 23 */
/***/ function(module, exports, __webpack_require__) {
/**
* event directive bundle
*
*/
var _ = __webpack_require__(5);
var dom = __webpack_require__(4);
var Regular = __webpack_require__(3);
Regular._addProtoInheritCache("event");
Regular.directive( /^on-\w+$/, function( elem, value, name , attrs) {
if ( !name || !value ) return;
var type = name.split("-")[1];
return this._handleEvent( elem, type, value, attrs );
});
// TODO.
/**
- $('dx').delegate()
*/
Regular.directive( /^(delegate|de)-\w+$/, function( elem, value, name ) {
var root = this.$root;
var _delegates = root._delegates || ( root._delegates = {} );
if ( !name || !value ) return;
var type = name.split("-")[1];
var fire = _.handleEvent.call(this, value, type);
function delegateEvent(ev){
matchParent(ev, _delegates[type], root.parentNode);
}
if( !_delegates[type] ){
_delegates[type] = [];
if(root.parentNode){
dom.on(root.parentNode, type, delegateEvent);
}else{
root.$on( "$inject", function( node, position, preParent ){
var newParent = this.parentNode;
if( preParent ){
dom.off(preParent, type, delegateEvent);
}
if(newParent) dom.on(this.parentNode, type, delegateEvent);
})
}
root.$on("$destroy", function(){
if(root.parentNode) dom.off(root.parentNode, type, delegateEvent)
_delegates[type] = null;
})
}
var delegate = {
element: elem,
fire: fire
}
_delegates[type].push( delegate );
return function(){
var delegates = _delegates[type];
if(!delegates || !delegates.length) return;
for( var i = 0, len = delegates.length; i < len; i++ ){
if( delegates[i] === delegate ) delegates.splice(i, 1);
}
}
});
function matchParent(ev , delegates, stop){
if(!stop) return;
var target = ev.target, pair;
while(target && target !== stop){
for( var i = 0, len = delegates.length; i < len; i++ ){
pair = delegates[i];
if(pair && pair.element === target){
pair.fire(ev)
}
}
target = target.parentNode;
}
}
/***/ },
/* 24 */
/***/ function(module, exports, __webpack_require__) {
// Regular
var _ = __webpack_require__(5);
var dom = __webpack_require__(4);
var Regular = __webpack_require__(3);
var hasInput;
var modelHandlers = {
"text": initText,
"select": initSelect,
"checkbox": initCheckBox,
"radio": initRadio
}
// @TODO
// autoUpdate directive for select element
// to fix r-model issue , when handle dynamic options
/**
* <select r-model={name}>
* <r-option value={value} ></r-option>
* </select>
*/
// two-way binding with r-model
// works on input, textarea, checkbox, radio, select
Regular.directive("r-model", {
param: ['throttle', 'lazy'],
link: function( elem, value, name, extra ){
var tag = elem.tagName.toLowerCase();
var sign = tag;
if(sign === "input") sign = elem.type || "text";
else if(sign === "textarea") sign = "text";
if(typeof value === "string") value = this.$expression(value);
if( modelHandlers[sign] ) return modelHandlers[sign].call(this, elem, value, extra);
else if(tag === "input"){
return modelHandlers.text.call(this, elem, value, extra);
}
}
})
// binding <select>
function initSelect( elem, parsed, extra){
var self = this;
var wc = this.$watch(parsed, function(newValue){
var children = elem.getElementsByTagName('option');
for(var i =0, len = children.length ; i < len; i++){
if(children[i].value == newValue){
elem.selectedIndex = i;
break;
}
}
});
function handler(){
parsed.set(self, this.value);
wc.last = this.value;
self.$update();
}
dom.on( elem, "change", handler );
if(parsed.get(self) === undefined && elem.value){
parsed.set(self, elem.value);
}
return function destroy(){
dom.off(elem, "change", handler);
}
}
// input,textarea binding
function initText(elem, parsed, extra){
var param = extra.param;
var throttle, lazy = param.lazy
if('throttle' in param){
// <input throttle r-model>
if(param[throttle] === true){
throttle = 400;
}else{
throttle = parseInt(param.throttle , 10)
}
}
var self = this;
var wc = this.$watch(parsed, function(newValue){
if(elem.value !== newValue) elem.value = newValue == null? "": "" + newValue;
});
// @TODO to fixed event
var handler = function (ev){
var that = this;
if(ev.type==='cut' || ev.type==='paste'){
_.nextTick(function(){
var value = that.value
parsed.set(self, value);
wc.last = value;
self.$update();
})
}else{
var value = that.value
parsed.set(self, value);
wc.last = value;
self.$update();
}
};
if(throttle && !lazy){
var preHandle = handler, tid;
handler = _.throttle(handler, throttle);
}
if(hasInput === undefined){
hasInput = dom.msie !== 9 && "oninput" in document.createElement('input')
}
if(lazy){
dom.on(elem, 'change', handler)
}else{
if( hasInput){
elem.addEventListener("input", handler );
}else{
dom.on(elem, "paste keyup cut change", handler)
}
}
if(parsed.get(self) === undefined && elem.value){
parsed.set(self, elem.value);
}
return function (){
if(lazy) return dom.off(elem, "change", handler);
if( hasInput ){
elem.removeEventListener("input", handler );
}else{
dom.off(elem, "paste keyup cut change", handler)
}
}
}
// input:checkbox binding
function initCheckBox(elem, parsed){
var self = this;
var watcher = this.$watch(parsed, function(newValue){
dom.attr(elem, 'checked', !!newValue);
});
var handler = function handler(){
var value = this.checked;
parsed.set(self, value);
watcher.last = value;
self.$update();
}
if(parsed.set) dom.on(elem, "change", handler)
if(parsed.get(self) === undefined){
parsed.set(self, !!elem.checked);
}
return function destroy(){
if(parsed.set) dom.off(elem, "change", handler)
}
}
// input:radio binding
function initRadio(elem, parsed){
var self = this;
var wc = this.$watch(parsed, function( newValue ){
if(newValue == elem.value) elem.checked = true;
else elem.checked = false;
});
var handler = function handler(){
var value = this.value;
parsed.set(self, value);
self.$update();
}
if(parsed.set) dom.on(elem, "change", handler)
// beacuse only after compile(init), the dom structrue is exsit.
if(parsed.get(self) === undefined){
if(elem.checked) {
parsed.set(self, elem.value);
}
}
return function destroy(){
if(parsed.set) dom.off(elem, "change", handler)
}
}
/***/ },
=======
>>>>>>>
/* 23 */
/***/ function(module, exports, __webpack_require__) {
/**
* event directive bundle
*
*/
var _ = __webpack_require__(5);
var dom = __webpack_require__(4);
var Regular = __webpack_require__(3);
Regular._addProtoInheritCache("event");
Regular.directive( /^on-\w+$/, function( elem, value, name , attrs) {
if ( !name || !value ) return;
var type = name.split("-")[1];
return this._handleEvent( elem, type, value, attrs );
});
// TODO.
/**
- $('dx').delegate()
*/
Regular.directive( /^(delegate|de)-\w+$/, function( elem, value, name ) {
var root = this.$root;
var _delegates = root._delegates || ( root._delegates = {} );
if ( !name || !value ) return;
var type = name.split("-")[1];
var fire = _.handleEvent.call(this, value, type);
function delegateEvent(ev){
matchParent(ev, _delegates[type], root.parentNode);
}
if( !_delegates[type] ){
_delegates[type] = [];
if(root.parentNode){
dom.on(root.parentNode, type, delegateEvent);
}else{
root.$on( "$inject", function( node, position, preParent ){
var newParent = this.parentNode;
if( preParent ){
dom.off(preParent, type, delegateEvent);
}
if(newParent) dom.on(this.parentNode, type, delegateEvent);
})
}
root.$on("$destroy", function(){
if(root.parentNode) dom.off(root.parentNode, type, delegateEvent)
_delegates[type] = null;
})
}
var delegate = {
element: elem,
fire: fire
}
_delegates[type].push( delegate );
return function(){
var delegates = _delegates[type];
if(!delegates || !delegates.length) return;
for( var i = 0, len = delegates.length; i < len; i++ ){
if( delegates[i] === delegate ) delegates.splice(i, 1);
}
}
});
function matchParent(ev , delegates, stop){
if(!stop) return;
var target = ev.target, pair;
while(target && target !== stop){
for( var i = 0, len = delegates.length; i < len; i++ ){
pair = delegates[i];
if(pair && pair.element === target){
pair.fire(ev)
}
}
target = target.parentNode;
}
}
/***/ },
/* 24 */
/***/ function(module, exports, __webpack_require__) {
// Regular
var _ = __webpack_require__(5);
var dom = __webpack_require__(4);
var Regular = __webpack_require__(3);
var hasInput;
var modelHandlers = {
"text": initText,
"select": initSelect,
"checkbox": initCheckBox,
"radio": initRadio
}
// @TODO
// autoUpdate directive for select element
// to fix r-model issue , when handle dynamic options
/**
* <select r-model={name}>
* <r-option value={value} ></r-option>
* </select>
*/
// two-way binding with r-model
// works on input, textarea, checkbox, radio, select
Regular.directive("r-model", {
param: ['throttle', 'lazy'],
link: function( elem, value, name, extra ){
var tag = elem.tagName.toLowerCase();
var sign = tag;
if(sign === "input") sign = elem.type || "text";
else if(sign === "textarea") sign = "text";
if(typeof value === "string") value = this.$expression(value);
if( modelHandlers[sign] ) return modelHandlers[sign].call(this, elem, value, extra);
else if(tag === "input"){
return modelHandlers.text.call(this, elem, value, extra);
}
}
})
// binding <select>
function initSelect( elem, parsed, extra){
var self = this;
var wc = this.$watch(parsed, function(newValue){
var children = elem.getElementsByTagName('option');
for(var i =0, len = children.length ; i < len; i++){
if(children[i].value == newValue){
elem.selectedIndex = i;
break;
}
}
});
function handler(){
parsed.set(self, this.value);
wc.last = this.value;
self.$update();
}
dom.on( elem, "change", handler );
if(parsed.get(self) === undefined && elem.value){
parsed.set(self, elem.value);
}
return function destroy(){
dom.off(elem, "change", handler);
}
}
// input,textarea binding
function initText(elem, parsed, extra){
var param = extra.param;
var throttle, lazy = param.lazy
if('throttle' in param){
// <input throttle r-model>
if(param[throttle] === true){
throttle = 400;
}else{
throttle = parseInt(param.throttle , 10)
}
}
var self = this;
var wc = this.$watch(parsed, function(newValue){
if(elem.value !== newValue) elem.value = newValue == null? "": "" + newValue;
});
// @TODO to fixed event
var handler = function (ev){
var that = this;
if(ev.type==='cut' || ev.type==='paste'){
_.nextTick(function(){
var value = that.value
parsed.set(self, value);
wc.last = value;
self.$update();
})
}else{
var value = that.value
parsed.set(self, value);
wc.last = value;
self.$update();
}
};
if(throttle && !lazy){
var preHandle = handler, tid;
handler = _.throttle(handler, throttle);
}
if(hasInput === undefined){
hasInput = dom.msie !== 9 && "oninput" in document.createElement('input')
}
if(lazy){
dom.on(elem, 'change', handler)
}else{
if( hasInput){
elem.addEventListener("input", handler );
}else{
dom.on(elem, "paste keyup cut change", handler)
}
}
if(parsed.get(self) === undefined && elem.value){
parsed.set(self, elem.value);
}
return function (){
if(lazy) return dom.off(elem, "change", handler);
if( hasInput ){
elem.removeEventListener("input", handler );
}else{
dom.off(elem, "paste keyup cut change", handler)
}
}
}
// input:checkbox binding
function initCheckBox(elem, parsed){
var self = this;
var watcher = this.$watch(parsed, function(newValue){
dom.attr(elem, 'checked', !!newValue);
});
var handler = function handler(){
var value = this.checked;
parsed.set(self, value);
watcher.last = value;
self.$update();
}
if(parsed.set) dom.on(elem, "change", handler)
if(parsed.get(self) === undefined){
parsed.set(self, !!elem.checked);
}
return function destroy(){
if(parsed.set) dom.off(elem, "change", handler)
}
}
// input:radio binding
function initRadio(elem, parsed){
var self = this;
var wc = this.$watch(parsed, function( newValue ){
if(newValue == elem.value) elem.checked = true;
else elem.checked = false;
});
var handler = function handler(){
var value = this.value;
parsed.set(self, value);
self.$update();
}
if(parsed.set) dom.on(elem, "change", handler)
// beacuse only after compile(init), the dom structrue is exsit.
if(parsed.get(self) === undefined){
if(elem.checked) {
parsed.set(self, elem.value);
}
}
return function destroy(){
if(parsed.set) dom.off(elem, "change", handler)
}
}
/***/ }, |
<<<<<<<
this._handles = null;
=======
this.$refs = null;
this._events = null;
this.$off();
>>>>>>>
this._handles = null;
this.$refs = null; |
<<<<<<<
if (keyNames.includes(event.code)) {
dispatch({ type: 'down', key: event.code });
=======
if (keyNames.includes(event.key)) {
event.preventDefault();
dispatch({ type: 'down', key: event.key });
>>>>>>>
if (keyNames.includes(event.code)) {
event.preventDefault();
dispatch({ type: 'down', key: event.code });
<<<<<<<
if (keyNames.includes(event.code)) {
dispatch({ type: 'up', key: event.code });
=======
if (keyNames.includes(event.key)) {
event.preventDefault();
dispatch({ type: 'up', key: event.key });
>>>>>>>
if (keyNames.includes(event.code)) {
event.preventDefault();
dispatch({ type: 'up', key: event.code }); |
<<<<<<<
this.serverTop.push({ header: i18n("My Music"), id: TOP_MMHDR_ID, weight:0, group: GROUP_MY_MUSIC, action:SEARCH_LIB_ACTION} );
for (var idx=0, loop=data.result.item_loop, loopLen=loop.length; idx<loopLen; ++idx) {
var c = loop[idx];
=======
this.serverTop.push({ header: i18n("My Music").replace(" ", " "), id: TOP_MMHDR_ID, weight:0, group: GROUP_MY_MUSIC, action:SEARCH_LIB_ACTION} );
data.result.item_loop.forEach(c => {
>>>>>>>
this.serverTop.push({ header: i18n("My Music").replace(" ", " "), id: TOP_MMHDR_ID, weight:0, group: GROUP_MY_MUSIC, action:SEARCH_LIB_ACTION} );
for (var idx=0, loop=data.result.item_loop, loopLen=loop.length; idx<loopLen; ++idx) {
var c = loop[idx]; |
<<<<<<<
ConnectionCollection.prototype.contains = function(connection) {
if (!connection) {
return false;
}
return !!this.connections[connection.id];
};
ConnectionCollection.prototype.getUsers = function() {
var users = _.map(this.connections, function(value, key) {
return value.user;
});
=======
ConnectionCollection.prototype.getUsers = function(filter) {
var connections = this.connections;
if (filter) {
connections = this.query(filter);
}
>>>>>>>
ConnectionCollection.prototype.contains = function(connection) {
if (!connection) {
return false;
}
return !!this.connections[connection.id];
};
ConnectionCollection.prototype.getUsers = function(filter) {
var connections = this.connections;
if (filter) {
connections = this.query(filter);
} |
<<<<<<<
user = user.toJSON();
user.room = data.roomId;
if (data.roomHasPassword) {
app.io.to(data.roomId).emit('users:join', user);
} else {
app.io.emit('users:join', user);
}
=======
if (!err && user) {
user = user.toJSON();
user.room = data.roomId;
app.io.emit('users:join', user);
}
>>>>>>>
if (!err && user) {
user = user.toJSON();
user.room = data.roomId;
if (data.roomHasPassword) {
app.io.to(data.roomId).emit('users:join', user);
} else {
app.io.emit('users:join', user);
}
}
<<<<<<<
user = user.toJSON();
user.room = data.roomId;
if (data.roomHasPassword) {
app.io.to(data.roomId).emit('users:leave', user);
} else {
app.io.emit('users:leave', user);
}
=======
if (!err && user) {
user = user.toJSON();
user.room = data.roomId;
app.io.emit('users:leave', user);
}
>>>>>>>
if (!err && user) {
user = user.toJSON();
user.room = data.roomId;
if (data.roomHasPassword) {
app.io.to(data.roomId).emit('users:leave', user);
} else {
app.io.emit('users:leave', user);
}
} |
<<<<<<<
message: 'There were problems logging you in.',
errors: err
}, 400);
=======
message: 'There were problems logging you in.'
});
>>>>>>>
message: 'There were problems logging you in.',
errors: err
}); |
<<<<<<<
=======
//
// Join rooms from localstorage
//
var openRooms = store.get('openrooms');
if (openRooms instanceof Array) {
// Flush the stored array
store.set('openrooms', []);
// Let's open some rooms!
_.defer(function() {//slow down because router can start a join with no password
_.each(_.uniq(openRooms), function(room) {
this.joinRoom(room);
}, this);
}.bind(this));
}
>>>>>>> |
<<<<<<<
var id = room !== undefined ? room.id : undefined;
var password = room !== undefined ? room.password : undefined;
=======
>>>>>>>
var id = room !== undefined ? room.id : undefined;
var password = room !== undefined ? room.password : undefined; |
<<<<<<<
- [Julia](#julia)
=======
- [Kotlin](#kotlin)
- [Perl](#perl)
>>>>>>>
- [Julia](#julia)
- [Kotlin](#kotlin)
- [Perl](#perl)
<<<<<<<
- [R](#r)
- [Scala](#scala)
=======
>>>>>>>
- [R](#r) |
<<<<<<<
{
name: 'Protel',
img: 'protel.png',
link: 'https://protel.com.tr/',
},
=======
{
name: 'Helsinki Regional Transport Authority HSL',
img: 'hsl.png',
link: 'https://www.hsl.fi/',
},
{
name: 'Digitransit',
img: 'digitransit.png',
link: 'https://digitransit.fi/',
},
{
name: 'MyHeritage',
img: 'myheritage.png',
link: 'https://www.myheritage.com',
},
>>>>>>>
{
name: 'Helsinki Regional Transport Authority HSL',
img: 'hsl.png',
link: 'https://www.hsl.fi/',
},
{
name: 'Digitransit',
img: 'digitransit.png',
link: 'https://digitransit.fi/',
},
{
name: 'MyHeritage',
img: 'myheritage.png',
link: 'https://www.myheritage.com',
},
{
name: 'Protel',
img: 'protel.png',
link: 'https://protel.com.tr/',
}, |
<<<<<<<
{
name: 'Ediket',
img: 'ediket.png',
link: 'https://ediket.com/'
}
=======
{
name: 'HousingAnywhere',
img: 'housinganywhere.png',
link: 'https://housinganywhere.com/'
},
>>>>>>>
{
name: 'Ediket',
img: 'ediket.png',
link: 'https://ediket.com/'
},
{
name: 'HousingAnywhere',
img: 'housinganywhere.png',
link: 'https://housinganywhere.com/'
}, |
<<<<<<<
{
name: 'Digitransit',
img: 'digitransit.png',
link: 'https://digitransit.fi/',
},
=======
{
name: 'Helsinki Regional Transport Authority HSL',
img: 'hsl.png',
link: 'https://www.hsl.fi/',
},
>>>>>>>
{
name: 'Helsinki Regional Transport Authority HSL',
img: 'hsl.png',
link: 'https://www.hsl.fi/',
},
{
name: 'Digitransit',
img: 'digitransit.png',
link: 'https://digitransit.fi/',
}, |
<<<<<<<
{
name: 'Attendify',
img: 'attendify.png',
link: 'https://attendify.com/'
},
{
name: 'Brewery Buddy',
img: 'brewerybuddy.png',
link: 'http://brewerybuddy.co/'
},
{
name: 'Loggi',
img: 'loggi.png',
link: 'https://www.loggi.com/'
},
{
name: 'Restorando',
img: 'restorando.png',
link: 'https://www.restorando.com/'
},
{
name: 'Wishlife',
img: 'wishlife.png',
link: 'http://www.wishlife.com'
},
{
name: 'Project September',
img: 'project-september.png',
link: 'https://www.projectseptember.com/'
},
// Adding your logo?
// Add it to the /users/logos/ directory and then append an entry above this comment.
//
// Please include logos with transparent backgrounds with no extra margin in the image.
// If your logo is round, include `isRound: true` in your entry.
=======
{
name: 'Curio',
img: 'curio.png',
link: 'https://curio.org'
},
>>>>>>>
{
name: 'Attendify',
img: 'attendify.png',
link: 'https://attendify.com/'
},
{
name: 'Brewery Buddy',
img: 'brewerybuddy.png',
link: 'http://brewerybuddy.co/'
},
{
name: 'Loggi',
img: 'loggi.png',
link: 'https://www.loggi.com/'
},
{
name: 'Restorando',
img: 'restorando.png',
link: 'https://www.restorando.com/'
},
{
name: 'Wishlife',
img: 'wishlife.png',
link: 'http://www.wishlife.com'
},
{
name: 'Project September',
img: 'project-september.png',
link: 'https://www.projectseptember.com/'
},
{
name: 'Curio',
img: 'curio.png',
link: 'https://curio.org'
},
// Adding your logo?
// Add it to the /users/logos/ directory and then append an entry above this comment.
//
// Please include logos with transparent backgrounds with no extra margin in the image.
// If your logo is round, include `isRound: true` in your entry. |
<<<<<<<
=======
const getPatchURL = ({ fromVersion, toVersion }) =>
`https://raw.githubusercontent.com/react-native-community/rn-diff-purge/diffs/diffs/${fromVersion}..${toVersion}.diff`
const getDiffKey = ({ oldRevision, newRevision }) =>
`${oldRevision}${newRevision}`
>>>>>>>
const getDiffKey = ({ oldRevision, newRevision }) =>
`${oldRevision}${newRevision}`
<<<<<<<
<UsefulContentSection fromVersion={fromVersion} toVersion={toVersion} />
{diff.map(diff => (
<Diff
key={`${diff.oldRevision}${diff.newRevision}`}
{...diff}
fromVersion={fromVersion}
toVersion={toVersion}
selectedChanges={selectedChanges}
onToggleChangeSelection={onToggleChangeSelection}
/>
))}
=======
{diff.map(diff => {
const diffKey = getDiffKey(diff)
return (
<Diff
key={`${diff.oldRevision}${diff.newRevision}`}
{...diff}
diffKey={diffKey}
isDiffCompleted={completedDiffs.includes(diffKey)}
onCompleteDiff={handleCompleteDiff}
selectedChanges={selectedChanges}
onToggleChangeSelection={onToggleChangeSelection}
/>
)
})}
>>>>>>>
<UsefulContentSection fromVersion={fromVersion} toVersion={toVersion} />
{diff.map(diff => {
const diffKey = getDiffKey(diff)
return (
<Diff
key={`${diff.oldRevision}${diff.newRevision}`}
{...diff}
diffKey={diffKey}
fromVersion={fromVersion}
toVersion={toVersion}
isDiffCompleted={completedDiffs.includes(diffKey)}
onCompleteDiff={handleCompleteDiff}
selectedChanges={selectedChanges}
onToggleChangeSelection={onToggleChangeSelection}
/>
)
})} |
<<<<<<<
const DownloadFileButton = styled(
({ visible, toVersion, newPath, ...props }) =>
visible && (
<Button
{...props}
type="ghost"
shape="circle"
icon="download"
onClick={() =>
(window.location = getBinaryFileURL({
version: toVersion,
path: newPath
}))
}
/>
)
)`
color: #24292e;
font-size: 12px;
border-width: 0;
&:hover,
&:focus {
color: #24292e;
}
`
const CollapseDiffButton = styled(
({ visible, isDiffCollapsed, ...props }) =>
visible && <Button {...props} type="link" icon="up" />
)`
=======
const CompleteDiffButton = styled(
({ diffKey, isDiffCompleted, onCompleteDiff, ...props }) => (
<Button
{...props}
type="ghost"
shape="circle"
icon="check"
onClick={() => onCompleteDiff(diffKey)}
/>
)
)`
font-size: 12px;
line-height: 0;
border-width: 0px;
width: 20px;
height: 20px;
margin: 5px 8px 0;
&,
&:hover,
&:focus {
color: ${({ isDiffCompleted }) =>
isDiffCompleted ? '#52c41a' : '#24292e'};
}
`
const CollapseDiffButton = styled(
({ isDiffCollapsed, isDiffCompleted, ...props }) => (
<Button {...props} type="link" icon="down" />
)
)`
>>>>>>>
const DownloadFileButton = styled(
({ visible, toVersion, newPath, ...props }) =>
visible ? (
<Button
{...props}
type="ghost"
shape="circle"
icon="download"
onClick={() =>
(window.location = getBinaryFileURL({
version: toVersion,
path: newPath
}))
}
/>
) : null
)`
color: #24292e;
font-size: 12px;
border-width: 0;
&:hover,
&:focus {
color: #24292e;
}
`
const CompleteDiffButton = styled(
({ diffKey, isDiffCompleted, onCompleteDiff, ...props }) => (
<Button
{...props}
type="ghost"
shape="circle"
icon="check"
onClick={() => onCompleteDiff(diffKey)}
/>
)
)`
font-size: 12px;
line-height: 0;
border-width: 0px;
width: 20px;
height: 20px;
margin: 5px 8px 0;
&,
&:hover,
&:focus {
color: ${({ isDiffCompleted }) =>
isDiffCompleted ? '#52c41a' : '#24292e'};
}
`
const CollapseDiffButton = styled(
({ visible, isDiffCollapsed, ...props }) =>
visible ? <Button {...props} type="link" icon="down" /> : null
)`
<<<<<<<
<HeaderButtonsContainer>
<Fragment>
<DownloadFileButton
visible={!hasDiff}
toVersion={toVersion}
newPath={newPath}
/>
<CollapseDiffButton
visible={hasDiff}
isDiffCollapsed={isDiffCollapsed}
onClick={() => setIsDiffCollapsed(!isDiffCollapsed)}
/>
</Fragment>
=======
<HeaderButtonsContainer hasDiff={hasDiff}>
<CompleteDiffButton
diffKey={diffKey}
isDiffCompleted={isDiffCompleted}
onCompleteDiff={onCompleteDiff}
/>
>>>>>>>
<HeaderButtonsContainer>
<Fragment>
<DownloadFileButton
visible={!hasDiff}
toVersion={toVersion}
newPath={newPath}
/>
<CompleteDiffButton
diffKey={diffKey}
isDiffCompleted={isDiffCompleted}
onCompleteDiff={onCompleteDiff}
/>
</Fragment> |
<<<<<<<
c.y = _.ceil(lastCount / this.props.numColumns) * this.emojiSize + accurateY;
accurateY = c.y + (_.size(v) === 1 ? 0 : this.props.categorySize);
=======
c.y =
_.ceil(lastCount / this.props.numColumns) * this.emojiSize +
accurateY;
accurateY = c.y + this.props.categoryLabelSize;
>>>>>>>
c.y = _.ceil(lastCount / this.props.numColumns) * this.emojiSize + accurateY;
accurateY = c.y + (_.size(v) === 1 ? 0 : this.props.categorySize);
<<<<<<<
onPress={() => { this.handleEmojiPress(data); }}>
<Text style={{ ...styles.emojiText, fontSize: this.props.emojiFontSize }}>{data.char}</Text>
=======
onPress={() => {
this.props.onEmojiSelected(data);
}}>
<Text
style={{
...styles.emojiText,
fontSize: this.props.emojiFontSize,
}}>
{data.char}
</Text>
>>>>>>>
onPress={() => { this.handleEmojiPress(data); }}>
<Text style={{ ...styles.emojiText, fontSize: this.props.emojiFontSize }}>{data.char}</Text>
<<<<<<<
{ !this.state.searchQuery && this.props.showCategoryTab && (
<TouchableWithoutFeedback>
<View style={styles.footerContainer}>
{ _.drop(category, this.props.enableFrequentlyUsedEmoji ? 0 : 1).map(({ key, icon }) => (
<TouchableOpacity
key={key}
onPress={() => this.handleCategoryPress(key)}
style={styles.categoryIconContainer}>
<View>
{icon({
color:
key ===
this.state.currentCategoryKey
? this.props
.categoryHighlightColor
: this.props
.categoryUnhighlightedColor,
size: this.props.categoryFontSize,
})}
</View>
</TouchableOpacity>
)) }
</View>
</TouchableWithoutFeedback>
) }
=======
{!this.state.searchQuery &&
this.props.showCategoryTab && (
<TouchableWithoutFeedback>
<View style={styles.footerContainer}>
{category.map(({ key, icon }) => (
<TouchableOpacity
key={key}
onPress={() =>
this.handleCategoryPress(key)
}
style={styles.categoryIconContainer}>
<View>
{icon({
color:
key ===
this.state
.currentCategoryKey
? this.props
.categoryHighlightColor
: this.props
.categoryUnhighlightedColor,
size: this.props
.categoryFontSize,
})}
</View>
</TouchableOpacity>
))}
</View>
</TouchableWithoutFeedback>
)}
>>>>>>>
{ !this.state.searchQuery && this.props.showCategoryTab && (
<TouchableWithoutFeedback>
<View style={styles.footerContainer}>
{ _.drop(category, this.props.enableFrequentlyUsedEmoji ? 0 : 1).map(({ key, icon }) => (
<TouchableOpacity
key={key}
onPress={() => this.handleCategoryPress(key)}
style={styles.categoryIconContainer}>
<View>
{icon({
color:
key ===
this.state.currentCategoryKey
? this.props
.categoryHighlightColor
: this.props
.categoryUnhighlightedColor,
size: this.props.categoryFontSize,
})}
</View>
</TouchableOpacity>
)) }
</View>
</TouchableWithoutFeedback>
) }
<<<<<<<
=======
categoryLabelSize: PropTypes.number,
>>>>>>>
<<<<<<<
onEmojiSelected: PropTypes.func.isRequired,
=======
categoryFontSize: PropTypes.number,
>>>>>>>
onEmojiSelected: PropTypes.func.isRequired,
<<<<<<<
categoryFontSize: PropTypes.number,
categoryUnhighlightedColor: PropTypes.string,
categoryHighlightColor: PropTypes.string,
categorySize: PropTypes.number,
enableSearch: PropTypes.bool,
enableFrequentlyUsedEmoji: PropTypes.bool,
numFrequentlyUsedEmoji: PropTypes.number,
defaultFrequentlyUsedEmoji: PropTypes.arrayOf(PropTypes.string)
=======
enableSearch: PropTypes.bool,
>>>>>>>
categoryFontSize: PropTypes.number,
categoryUnhighlightedColor: PropTypes.string,
categoryHighlightColor: PropTypes.string,
categorySize: PropTypes.number,
enableSearch: PropTypes.bool,
enableFrequentlyUsedEmoji: PropTypes.bool,
numFrequentlyUsedEmoji: PropTypes.number,
defaultFrequentlyUsedEmoji: PropTypes.arrayOf(PropTypes.string) |
<<<<<<<
var version = '3.1.0';
var minimumCordovaVersion = '3.5';
=======
var version = '3.0.1';
var minimumCordovaVersion = '4.0';
>>>>>>>
var version = '3.1.0';
var minimumCordovaVersion = '4.0'; |
<<<<<<<
var version = '3.3.0';
=======
var version = '3.2.1';
>>>>>>>
var version = '3.3.0';
<<<<<<<
shelljs.exec('cordova platform add android');
shelljs.exec('cordova plugin add https://github.com/forcedotcom/SalesforceMobileSDK-CordovaPlugin#unstable');
=======
shelljs.exec('cordova platform add android@' + cordovaPlatformVersion);
shelljs.exec('cordova plugin add https://github.com/forcedotcom/SalesforceMobileSDK-CordovaPlugin');
>>>>>>>
shelljs.exec('cordova platform add android@' + cordovaPlatformVersion);
shelljs.exec('cordova plugin add https://github.com/forcedotcom/SalesforceMobileSDK-CordovaPlugin#unstable'); |
<<<<<<<
MESSAGE_TYPE_ODOMETRY,
=======
MESSAGE_TYPE_PATH,
>>>>>>>
MESSAGE_TYPE_ODOMETRY,
MESSAGE_TYPE_PATH,
<<<<<<<
case MESSAGE_TYPE_ODOMETRY:
return new Amphion.DisplayOdometry(this.ros, name);
=======
case MESSAGE_TYPE_PATH:
return new Amphion.Path(this.ros, name);
>>>>>>>
case MESSAGE_TYPE_ODOMETRY:
return new Amphion.DisplayOdometry(this.ros, name);
case MESSAGE_TYPE_PATH:
return new Amphion.Path(this.ros, name); |
<<<<<<<
MESSAGE_TYPE_TF,
MESSAGE_TYPE_TF2,
=======
MESSAGE_TYPE_WRENCHSTAMPED,
>>>>>>>
MESSAGE_TYPE_TF,
MESSAGE_TYPE_TF2,
MESSAGE_TYPE_WRENCHSTAMPED,
<<<<<<<
=======
VIZ_TYPE_WRENCH,
DEFAULT_OPTIONS_SCENE,
>>>>>>>
VIZ_TYPE_WRENCH, |
<<<<<<<
import { createShippingStrategyRegistry, ShippingCountryActionCreator, ShippingOptionActionCreator, ShippingStrategyActionCreator } from '../shipping';
import { MissingDataError } from '../common/error/errors';
import { getAppConfig, getLegacyAppConfig } from '../config/configs.mock';
import { getBillingAddress, getBillingAddressResponseBody } from '../billing/internal-billing-addresses.mock';
import { getCartResponseBody } from '../cart/internal-carts.mock';
import { getCountriesResponseBody } from '../geography/countries.mock';
import { getCouponResponseBody } from '../coupon/internal-coupons.mock';
import { getCompleteOrderResponseBody, getOrderRequestBody, getSubmittedOrder } from '../order/internal-orders.mock';
import { getCustomerResponseBody, getGuestCustomer } from '../customer/internal-customers.mock';
import { getFormFields } from '../form/form.mocks';
import { getGiftCertificateResponseBody } from '../coupon/internal-gift-certificates.mock';
import { getQuoteResponseBody } from '../quote/internal-quotes.mock';
import { getAuthorizenet, getBraintree, getPaymentMethodResponseBody, getPaymentMethodsResponseBody, getPaymentMethod } from '../payment/payment-methods.mock';
import { getInstrumentsMeta, getVaultAccessTokenResponseBody, getInstrumentsResponseBody, vaultInstrumentRequestBody, vaultInstrumentResponseBody, deleteInstrumentResponseBody } from '../payment/instrument/instrument.mock';
=======
import { getQuoteResponseBody, getQuoteState } from '../quote/internal-quotes.mock';
import { createShippingStrategyRegistry, ShippingCountryActionCreator, ShippingStrategyActionCreator } from '../shipping';
import ConsignmentActionCreator from '../shipping/consignment-action-creator';
>>>>>>>
import { getQuoteResponseBody, getQuoteState } from '../quote/internal-quotes.mock';
import { createShippingStrategyRegistry, ShippingCountryActionCreator, ShippingStrategyActionCreator } from '../shipping';
import ConsignmentActionCreator from '../shipping/consignment-action-creator';
<<<<<<<
config: {
data: {
...getLegacyAppConfig(),
storeConfig: {
formFields: getAppConfig().storeConfig.formFields,
},
},
},
=======
cart: getCartState(),
quote: getQuoteState(),
order: getCompleteOrderState(),
checkout: getCheckoutState(),
config: { data: getAppConfig() },
>>>>>>>
cart: getCartState(),
quote: getQuoteState(),
order: getCompleteOrderState(),
checkout: getCheckoutState(),
config: {
data: {
...getLegacyAppConfig(),
storeConfig: {
formFields: getAppConfig().storeConfig.formFields,
},
},
}, |
<<<<<<<
export { BraintreeCreditCardPaymentStrategy } from './braintree';
export { SquarePaymentStrategy } from './square';
export { default as WepayPaymentStrategy } from './wepay-payment-strategy';
=======
export { BraintreeCreditCardPaymentStrategy, BraintreePaypalPaymentStrategy } from './braintree';
export { SquarePaymentStrategy } from './square';
>>>>>>>
export { BraintreeCreditCardPaymentStrategy, BraintreePaypalPaymentStrategy } from './braintree';
export { SquarePaymentStrategy } from './square';
export { default as WepayPaymentStrategy } from './wepay-payment-strategy'; |
<<<<<<<
type: OrderActionType.LoadOrderSucceeded,
meta: response.meta,
payload: response.data,
=======
type: orderActionTypes.LOAD_ORDER_SUCCEEDED,
payload: getOrder(),
};
initialState = {
data: getCompleteOrderResponseBody().data.order,
>>>>>>>
type: OrderActionType.LoadOrderSucceeded,
payload: getOrder(),
};
initialState = {
data: getCompleteOrderResponseBody().data.order, |
<<<<<<<
const sortAssetsByNativeAmount = (assets, showShitcoins) => {
const assetsWithMarketValue = assets.filter(asset => asset.native !== null);
const sortedAssetsWithMarketValue = assetsWithMarketValue.sort((a, b) => {
=======
const filterEmptyAssetSections = sections => sections.filter(({ totalItems }) => totalItems);
const sortAssetsByNativeAmount = assets =>
assets.sort((a, b) => {
>>>>>>>
const filterEmptyAssetSections = sections => sections.filter(({ totalItems }) => totalItems);
const sortAssetsByNativeAmount = (assets, showShitcoins) => {
const assetsWithMarketValue = assets.filter(asset => asset.native !== null);
const sortedAssetsWithMarketValue = assetsWithMarketValue.sort((a, b) => { |
<<<<<<<
removeTransaction: PropTypes.func,
}
=======
}
>>>>>>>
removeTransaction: PropTypes.func,
}
<<<<<<<
const { transactionDetails } = this.props.navigation.state.params;
const transactionReceipt = await sendTransaction(transactionDetails.transactionPayload.data, 'Confirm transaction' );
=======
const { transactionDetails } = this.props.navigation.state.params;
const txPayload = transactionDetails.transactionPayload.data;
const transactionReceipt = await sendTransaction(txPayload, lang.t('wallet.transaction.confirm'));
>>>>>>>
const { transactionDetails } = this.props.navigation.state.params;
const txPayload = transactionDetails.transactionPayload.data;
const transactionReceipt = await sendTransaction(txPayload, lang.t('wallet.transaction.confirm'));
<<<<<<<
await this.sendFailedTransactionStatus();
AlertIOS.alert('Unable to send transaction.');
=======
this.handleCancelTransaction();
AlertIOS.alert(lang.t('wallet.transaction.alert.authentication'));
>>>>>>>
await this.sendFailedTransactionStatus();
AlertIOS.alert(lang.t('wallet.transaction.alert.authentication'));
<<<<<<<
const { transactionDetails } = this.props.navigation.state.params;
const walletConnector = this.props.walletConnectors[transactionDetails.sessionId];
await walletConnectSendTransactionHash(walletConnector, transactionDetails.transactionId, false, null);
=======
const { transactionDetails } = this.props.navigation.state.params;
const walletConnector = this.props.walletConnectors[transactionDetails.sessionId];
await walletConnectSendTransactionHash(walletConnector, transactionDetails.transactionId, false, null);
this.closeTransactionScreen();
} catch (error) {
>>>>>>>
const { transactionDetails } = this.props.navigation.state.params;
const walletConnector = this.props.walletConnectors[transactionDetails.sessionId];
await walletConnectSendTransactionHash(walletConnector, transactionDetails.transactionId, false, null);
this.closeTransactionScreen();
} catch (error) { |
<<<<<<<
this.props.accountInitializeState();
this.handleWalletConfig();
=======
await this.props.accountInitializeState();
walletInit()
.then(walletAddress => {
if (!walletAddress) { return; }
console.log('wallet address is', walletAddress);
this.props.accountUpdateAccountAddress(walletAddress, 'BALANCEWALLET');
this.props.transactionsToApproveInit();
walletConnectInitAllConnectors()
.then(allConnectors => {
this.props.setWalletConnectors(allConnectors);
firebase
.notifications()
.getInitialNotification()
.then(notificationOpen => {
if (!notificationOpen) {
this.fetchAllRequestsFromWalletConnectSessions();
}
});
})
.catch(error => {
console.log('Unable to init all WalletConnect sessions');
});
/*
*/
})
.catch(error => {
AlertIOS.alert('Error: Failed to initialize wallet.');
});
>>>>>>>
this.props.accountInitializeState();
this.handleWalletConfig();
<<<<<<<
<Routes
ref={this.handleNavigatorRef}
screenProps={{ handleWalletConfig: this.handleWalletConfig }}
/>
</Container>
=======
<Routes ref={this.handleNavigatorRef} />
</FlexItem>
>>>>>>>
<Routes
ref={this.handleNavigatorRef}
screenProps={{ handleWalletConfig: this.handleWalletConfig }}
/>
</FlexItem> |
<<<<<<<
const seedPhraseKey = 'seedPhrase';
const privateKeyKey = 'privateKey';
const addressKey = 'addressKey';
import { ACCESS_CONTROL, ACCESSIBLE } from 'react-native-keychain';
=======
const seedPhraseKey = 'balanceWalletSeedPhrase';
const privateKeyKey = 'balanceWalletPrivateKey';
const addressKey = 'balanceWalletAddressKey';
>>>>>>>
const seedPhraseKey = 'balanceWalletSeedPhrase';
const privateKeyKey = 'balanceWalletPrivateKey';
const addressKey = 'balanceWalletAddressKey';
import { ACCESS_CONTROL, ACCESSIBLE } from 'react-native-keychain';
<<<<<<<
console.log('create wallet');
seedPhrase = seedPhrase || generateSeedPhrase();
const wallet = ethers.Wallet.fromMnemonic(seedPhrase);
=======
const walletSeedPhrase = seedPhrase || generateSeedPhrase();
const wallet = ethers.Wallet.fromMnemonic(walletSeedPhrase);
>>>>>>>
const walletSeedPhrase = seedPhrase || generateSeedPhrase();
const wallet = ethers.Wallet.fromMnemonic(walletSeedPhrase); |
<<<<<<<
const AssetListHeader = ({ section: { contextMenuOptions, title, totalValue } }) => (
=======
const AssetListHeader = ({
section: {
showContextMenu,
title,
totalValue,
},
}) => (
>>>>>>>
const AssetListHeader = ({
section: {
contextMenuOptions,
title,
totalValue,
},
}) => ( |
<<<<<<<
var _props = this.props,
form = _props.form,
value = _props.value,
error = _props.error,
onChangeValidate = _props.onChangeValidate;
return _react2.default.createElement(_TextField2.default, {
type: form.type,
label: form.title,
placeholder: form.placeholder,
helperText: error || form.description,
error: !!error,
onChange: onChangeValidate,
defaultValue: value,
disabled: form.readonly,
fullWidth: true
});
=======
var value = (0, _utils.selectOrSet)(this.props.form.key, this.props.model) ? (0, _utils.selectOrSet)(this.props.form.key, this.props.model) : '';
return _react2.default.createElement(
'div',
null,
_react2.default.createElement(_core.TextField, {
type: this.props.form.type,
label: this.props.form.title,
helperText: this.props.errorText,
error: !!this.props.error,
onChange: this.props.onChangeValidate,
value: value,
disabled: this.props.form.readonly,
style: this.props.form.style || { width: '100%' }
})
);
>>>>>>>
var _props = this.props,
form = _props.form,
error = _props.error,
value = _props.value,
onChangeValidate = _props.onChangeValidate;
return _react2.default.createElement(_TextField2.default, {
type: form.type,
label: form.title,
placeholder: form.placeholder,
helperText: error || form.description,
error: !!error,
onChange: onChangeValidate,
value: value,
disabled: form.readonly,
fullWidth: true
}); |
<<<<<<<
=======
const startCodepoint = this.options.startCodepoint;
this.fontCodePoints = {};
>>>>>>>
<<<<<<<
files = this.files;
=======
this.files = files = Array.from(new Set(this.files)).sort();
files.forEach((file, index) => {
const codePoint = (startCodepoint + index).toString(16).slice(1);
this.fontCodePoints[file] = codePoint;
});
>>>>>>>
files = this.files;
<<<<<<<
=======
const fontCodePoints = this.fontCodePoints;
const replaceReg = /ICON_FONT_LOADER_IMAGE\(([^)]*)\)/g;
>>>>>>>
<<<<<<<
=======
if (file.endsWith('.js') || file.endsWith('.css')) {
// 处理css模块
const source = compilation.assets[file];
let content = compilation.assets[file].source();
content = content.replace(replaceReg, ($1, $2) => {
if (fontCodePoints[$2]) {
const code = String.fromCharCode(parseInt('F' + fontCodePoints[$2], 16));
return `'${code}'`;
} else
return $1;
});
const replaceSource = new ReplaceSource(source);
replaceSource.replace(0, source.size(), content);
compilation.assets[file] = replaceSource;
}
>>>>>>> |
<<<<<<<
var shallowRenderer = new ShallowRenderer();
=======
>>>>>>>
var shallowRenderer = new ShallowRenderer(); |
<<<<<<<
var _FormControl = require('@material-ui/core/FormControl');
var _FormControl2 = _interopRequireDefault(_FormControl);
var _styles = require('@material-ui/core/styles');
=======
var _utils = require('./utils');
var _utils2 = _interopRequireDefault(_utils);
var _Number = require('./Number');
var _Number2 = _interopRequireDefault(_Number);
var _Text = require('./Text');
var _Text2 = _interopRequireDefault(_Text);
var _TextArea = require('./TextArea');
var _TextArea2 = _interopRequireDefault(_TextArea);
var _Select = require('./Select');
var _Select2 = _interopRequireDefault(_Select);
var _Radios = require('./Radios');
var _Radios2 = _interopRequireDefault(_Radios);
var _Date = require('./Date');
var _Date2 = _interopRequireDefault(_Date);
var _Checkbox = require('./Checkbox');
var _Checkbox2 = _interopRequireDefault(_Checkbox);
var _Help = require('./Help');
var _Help2 = _interopRequireDefault(_Help);
var _lodash = require('lodash');
var _lodash2 = _interopRequireDefault(_lodash);
>>>>>>>
var _FormControl = require('@material-ui/core/FormControl');
var _FormControl2 = _interopRequireDefault(_FormControl);
var _FormLabel = require('@material-ui/core/FormLabel');
var _FormLabel2 = _interopRequireDefault(_FormLabel);
var _styles = require('@material-ui/core/styles');
<<<<<<<
var forms = form.items.map(function (f, index) {
return builder(f, model, index, onChange, mapper, builder);
});
=======
var forms = this.props.form.items.map(function (form, index) {
return this.props.builder(form, this.props.model, index, this.props.mapper, this.props.onChange, this.props.builder);
}.bind(this));
>>>>>>>
var forms = form.items.map(function (f, index) {
return builder(f, model, index, mapper, onChange, builder);
}); |
<<<<<<<
import FormControl from '@material-ui/core/FormControl';
import { withStyles } from '@material-ui/core/styles';
const styles = theme => ({
root: {
marginTop: theme.spacing.unit
}
});
=======
import utils from './utils';
import Number from './Number';
import Text from './Text';
import TextArea from './TextArea';
import Select from './Select';
import Radios from './Radios';
import Date from './Date';
import Checkbox from './Checkbox';
import Help from './Help';
import _ from 'lodash';
>>>>>>>
import FormControl from '@material-ui/core/FormControl';
import FormLabel from '@material-ui/core/FormLabel';
import { withStyles } from '@material-ui/core/styles';
const styles = theme => ({
root: {
marginTop: theme.spacing.unit
},
fields: {
marginLeft: theme.spacing.unit
}
});
<<<<<<<
let forms = form.items.map(
(f, index) => builder(f, model, index, onChange, mapper, builder)
);
=======
let forms = this.props.form.items.map(function(form, index){
return this.props.builder(form, this.props.model, index, this.props.mapper, this.props.onChange, this.props.builder);
}.bind(this));
>>>>>>>
let forms = form.items.map(
(f, index) => builder(f, model, index, mapper, onChange, builder)
); |
<<<<<<<
if (attrs.show === 'false') {
axis.show = false;
}
=======
var paddingLeft = attrs.paddingLeft;
var paddingRight = attrs.paddingRight;
if (paddingLeft || paddingRight) {
paddingLeft = (paddingLeft) ? paddingLeft : 0;
paddingRight = (paddingRight)? paddingRight : 0;
axis.padding = {"left":parseInt(paddingLeft),"right":parseInt(paddingRight)};
}
>>>>>>>
var paddingLeft = attrs.paddingLeft;
var paddingRight = attrs.paddingRight;
if (paddingLeft || paddingRight) {
paddingLeft = (paddingLeft) ? paddingLeft : 0;
paddingRight = (paddingRight)? paddingRight : 0;
axis.padding = {"left":parseInt(paddingLeft),"right":parseInt(paddingRight)};
}
if (attrs.show === 'false') {
axis.show = false;
} |
<<<<<<<
this.hideGridFocus = function() {
if ($scope.grid == null) {
$scope.grid = {};
}
$scope.grid["focus"] = {"show": false};
};
=======
this.addColorFunction = function(colorFunction) {
$scope.colorFunction = colorFunction;
};
>>>>>>>
this.addColorFunction = function(colorFunction) {
$scope.colorFunction = colorFunction;
};
this.hideGridFocus = function() {
if ($scope.grid == null) {
$scope.grid = {};
}
$scope.grid["focus"] = {"show": false};
}; |
<<<<<<<
/* 初始化菜单 */
// Sidebar
initSidebar = () => {
const CURRENT_URL = window.location.href.split('#')[0].split('?')[0],
$BODY = $('body'),
$MENU_TOGGLE = $('#menu_toggle'),
$SIDEBAR_MENU = $('#sidebar-menu'),
$SIDEBAR_FOOTER = $('.sidebar-footer'),
$LEFT_COL = $('.left_col'),
$RIGHT_COL = $('.right_col'),
$NAV_MENU = $('.nav_menu'),
$FOOTER = $('footer');
// TODO: This is some kind of easy fix, maybe we can improve this
console.log("init_sidebar");
var setContentHeight = function () {
// reset height
$RIGHT_COL.css('min-height', $(window).height());
var bodyHeight = $BODY.outerHeight(),
footerHeight = $BODY.hasClass('footer_fixed')
? -10
: $FOOTER.height(),
leftColHeight = $LEFT_COL
.eq(1)
.height() + $SIDEBAR_FOOTER.height(),
contentHeight = bodyHeight < leftColHeight
? leftColHeight
: bodyHeight;
// normalize content
contentHeight -= $NAV_MENU.height() + footerHeight;
$RIGHT_COL.css('min-height', contentHeight);
};
$SIDEBAR_MENU
.find('a')
.on('click', function (ev) {
console.log('clicked - sidebar_menu');
var $li = $(this).parent();
if ($li.is('.active')) {
$li.removeClass('active active-sm');
$('ul:first', $li).slideUp(function () {
setContentHeight();
});
} else {
// prevent closing menu if we are on child menu
if (!$li.parent().is('.child_menu')) {
$SIDEBAR_MENU
.find('li')
.removeClass('active active-sm');
$SIDEBAR_MENU
.find('li ul')
.slideUp();
} else {
if ($BODY.is(".nav-sm")) {
$li
.parent()
.find("li")
.removeClass("active active-sm");
$li
.parent()
.find("li ul")
.slideUp();
}
}
$li.addClass('active');
$('ul:first', $li).slideDown(function () {
setContentHeight();
});
}
});
// toggle small or large menu
$MENU_TOGGLE.on('click', function () {
console.log('clicked - menu toggle');
if ($BODY.hasClass('nav-md')) {
$SIDEBAR_MENU
.find('li.active ul')
.hide();
$SIDEBAR_MENU
.find('li.active')
.addClass('active-sm')
.removeClass('active');
} else {
$SIDEBAR_MENU
.find('li.active-sm ul')
.show();
$SIDEBAR_MENU
.find('li.active-sm')
.addClass('active')
.removeClass('active-sm');
}
$BODY.toggleClass('nav-md nav-sm');
setContentHeight();
$('.dataTable').each(function () {
$(this)
.dataTable()
.fnDraw();
});
});
// check active menu
$SIDEBAR_MENU
.find('a[href="' + CURRENT_URL + '"]')
.parent('li')
.addClass('current-page');
$SIDEBAR_MENU
.find('a')
.filter(function () {
return this.href == CURRENT_URL;
})
.parent('li')
.addClass('current-page')
.parents('ul')
.slideDown(function () {
setContentHeight();
})
.parent()
.addClass('active');
setContentHeight();
// fixed sidebar
if ($.fn.mCustomScrollbar) {
$('.menu_fixed').mCustomScrollbar({
autoHideScrollbar: true,
theme: 'minimal',
mouseWheel: {
preventDefault: true
}
});
}
};
// /Sidebar
/* 初始化菜单事件 */
componentDidMount() {
this.initSidebar();
}
render() {
return (
<div>
<div className="left_col scroll-view">
<div className="navbar nav_title" style={{
border: 0
}}>
<a href="index.html" className="site_title"><i className="fa fa-paw"/>
<span>Gentelella Alela!</span>
</a>
=======
/* 初始化菜单 */
// Sidebar
init_sidebar = () => {
const CURRENT_URL = window.location.href.split('#')[0].split('?')[0],
$BODY = $('body'),
$MENU_TOGGLE = $('#menu_toggle'),
$SIDEBAR_MENU = $('#sidebar-menu'),
$SIDEBAR_FOOTER = $('.sidebar-footer'),
$LEFT_COL = $('.left_col'),
$RIGHT_COL = $('.right_col'),
$NAV_MENU = $('.nav_menu'),
$FOOTER = $('footer');
// TODO: This is some kind of easy fix, maybe we can improve this
console.log("init_sidebar");
var setContentHeight = function () {
// reset height
$RIGHT_COL.css('min-height', $(window).height());
var bodyHeight = $BODY.outerHeight(),
footerHeight = $BODY.hasClass('footer_fixed')
? -10
: $FOOTER.height(),
leftColHeight = $LEFT_COL
.eq(1)
.height() + $SIDEBAR_FOOTER.height(),
contentHeight = bodyHeight < leftColHeight
? leftColHeight
: bodyHeight;
// normalize content
contentHeight -= $NAV_MENU.height() + footerHeight;
$RIGHT_COL.css('min-height', contentHeight);
};
$SIDEBAR_MENU
.find('a')
.on('click', function (ev) {
console.log('clicked - sidebar_menu');
var $li = $(this).parent();
if ($li.is('.active')) {
$li.removeClass('active active-sm');
$('ul:first', $li).slideUp(function () {
setContentHeight();
});
} else {
// prevent closing menu if we are on child menu
if (!$li.parent().is('.child_menu')) {
$SIDEBAR_MENU
.find('li')
.removeClass('active active-sm');
$SIDEBAR_MENU
.find('li ul')
.slideUp();
} else {
if ($BODY.is(".nav-sm")) {
$li
.parent()
.find("li")
.removeClass("active active-sm");
$li
.parent()
.find("li ul")
.slideUp();
}
}
$li.addClass('active');
$('ul:first', $li).slideDown(function () {
setContentHeight();
});
}
});
// toggle small or large menu
$MENU_TOGGLE.on('click', function () {
console.log('clicked - menu toggle');
if ($BODY.hasClass('nav-md')) {
$SIDEBAR_MENU
.find('li.active ul')
.hide();
$SIDEBAR_MENU
.find('li.active')
.addClass('active-sm')
.removeClass('active');
} else {
$SIDEBAR_MENU
.find('li.active-sm ul')
.show();
$SIDEBAR_MENU
.find('li.active-sm')
.addClass('active')
.removeClass('active-sm');
}
$BODY.toggleClass('nav-md nav-sm');
setContentHeight();
$('.dataTable').each(function () {
$(this)
.dataTable()
.fnDraw();
});
});
// check active menu
$SIDEBAR_MENU
.find('a[href="' + CURRENT_URL + '"]')
.parent('li')
.addClass('current-page');
$SIDEBAR_MENU
.find('a')
.filter(function () {
return this.href == CURRENT_URL;
})
.parent('li')
.addClass('current-page')
.parents('ul')
.slideDown(function () {
setContentHeight();
})
.parent()
.addClass('active');
setContentHeight();
// fixed sidebar
if ($.fn.mCustomScrollbar) {
$('.menu_fixed').mCustomScrollbar({
autoHideScrollbar: true,
theme: 'minimal',
mouseWheel: {
preventDefault: true
}
});
}
};
// /Sidebar
/* 初始化菜单事件 */
componentDidMount() {
this.init_sidebar();
}
render() {
return (
<div>
<div className="left_col scroll-view">
<div className="navbar nav_title" style={{
border: 0
}}>
<a href="index.html" className="site_title"><i className="fa fa-paw"/>
<span>Gentelella Alela!</span>
</a>
>>>>>>>
/* 初始化菜单 */
// Sidebar
initSidebar = () => {
const CURRENT_URL = window.location.href.split('#')[0].split('?')[0],
$BODY = $('body'),
$SIDEBAR_MENU = $('#sidebar-menu'),
$SIDEBAR_FOOTER = $('.sidebar-footer'),
$LEFT_COL = $('.left_col'),
$RIGHT_COL = $('.right_col'),
$NAV_MENU = $('.nav_menu'),
$FOOTER = $('footer');
// TODO: This is some kind of easy fix, maybe we can improve this
console.log("init_sidebar");
var setContentHeight = function () {
// reset height
$RIGHT_COL.css('min-height', $(window).height());
var bodyHeight = $BODY.outerHeight(),
footerHeight = $BODY.hasClass('footer_fixed')
? -10
: $FOOTER.height(),
leftColHeight = $LEFT_COL
.eq(1)
.height() + $SIDEBAR_FOOTER.height(),
contentHeight = bodyHeight < leftColHeight
? leftColHeight
: bodyHeight;
// normalize content
contentHeight -= $NAV_MENU.height() + footerHeight;
$RIGHT_COL.css('min-height', contentHeight);
};
$SIDEBAR_MENU
.find('a')
.on('click', function (ev) {
console.log('clicked - sidebar_menu');
var $li = $(this).parent();
if ($li.is('.active')) {
$li.removeClass('active active-sm');
$('ul:first', $li).slideUp(function () {
setContentHeight();
});
} else {
// prevent closing menu if we are on child menu
if (!$li.parent().is('.child_menu')) {
$SIDEBAR_MENU
.find('li')
.removeClass('active active-sm');
$SIDEBAR_MENU
.find('li ul')
.slideUp();
} else {
if ($BODY.is(".nav-sm")) {
$li
.parent()
.find("li")
.removeClass("active active-sm");
$li
.parent()
.find("li ul")
.slideUp();
}
}
$li.addClass('active');
$('ul:first', $li).slideDown(function () {
setContentHeight();
});
}
});
// check active menu
$SIDEBAR_MENU
.find('a[href="' + CURRENT_URL + '"]')
.parent('li')
.addClass('current-page');
$SIDEBAR_MENU
.find('a')
.filter(function () {
return this.href == CURRENT_URL;
})
.parent('li')
.addClass('current-page')
.parents('ul')
.slideDown(function () {
setContentHeight();
})
.parent()
.addClass('active');
setContentHeight();
// fixed sidebar
if ($.fn.mCustomScrollbar) {
$('.menu_fixed').mCustomScrollbar({
autoHideScrollbar: true,
theme: 'minimal',
mouseWheel: {
preventDefault: true
}
});
}
};
// /Sidebar
/* 初始化菜单事件 */
componentDidMount() {
this.initSidebar();
}
render() {
return (
<div>
<div className="left_col scroll-view">
<div className="navbar nav_title" style={{
border: 0
}}>
<a href="index.html" className="site_title"><i className="fa fa-paw"/>
<span>Gentelella Alela!</span>
</a> |
<<<<<<<
// if (process.platform != 'darwin')
app.quit();
=======
if (process.platform !== 'darwin')
app.quit();
>>>>>>>
// if (process.platform !== 'darwin')
app.quit();
<<<<<<<
app.setName('Ansel');
mainWindow = new BrowserWindow({
width: 1356,
height: 768,
title: 'Ansel',
webPreferences: {
experimentalFeatures: true,
blinkFeatures: 'CSSGridLayout'
}
});
=======
mainWindow = new BrowserWindow({ width: 1356, height: 768, webPreferences: {
experimentalFeatures: true,
blinkFeatures: 'CSSGridLayout'
} });
>>>>>>>
app.setName('Ansel');
mainWindow = new BrowserWindow({
width: 1356,
height: 768,
title: 'Ansel',
webPreferences: {
experimentalFeatures: true,
blinkFeatures: 'CSSGridLayout'
}
});
<<<<<<<
// let usb = new Usb();
// usb.scan((err, drives) => {
// mainWindow.webContents.send('scanned-devices', drives);
// });
//
// usb.watch((err, action, drive) => {
// console.log('new drive', action, drive);
//
// if (action == 'add')
// mainWindow.webContents.send('add-device', drive);
// else
// mainWindow.webContents.send('remove-device', drive);
// });
=======
let usb = new Usb();
usb.scan((err, drives) => {
mainWindow.webContents.send('scanned-devices', drives);
});
usb.watch((err, action, drive) => {
if (action === 'add')
mainWindow.webContents.send('add-device', drive);
else
mainWindow.webContents.send('remove-device', drive);
});
>>>>>>>
//let usb = new Usb();
//
//usb.scan((err, drives) => {
// mainWindow.webContents.send('scanned-devices', drives);
//});
//
//usb.watch((err, action, drive) => {
// if (action === 'add')
// mainWindow.webContents.send('add-device', drive);
// else
// mainWindow.webContents.send('remove-device', drive);
//}); |
<<<<<<<
_proEditorToolbar.__onCommand = function(_command){
_v._$stopBubble(arguments[1]);
=======
_pro.__onCommand = function(_command){
_v._$stop(arguments[1]);
>>>>>>>
_pro.__onCommand = function(_command){
_v._$stopBubble(arguments[1]); |
<<<<<<<
this.selectedActions = $('<div class="actions ui-widget-header ui-helper-clearfix"><span class="count">0 items selected</span><a href="#" class="remove-all">'+$.ui.multiselect.locale.removeAll+'</a></div>').appendTo(this.selectedContainer);
this.availableActions = $('<div class="actions ui-widget-header ui-helper-clearfix"><input type="text" class="search empty ui-widget-content ui-corner-all"/><a href="#" class="add-all">'+$.ui.multiselect.locale.addAll+'</a></div>').appendTo(this.availableContainer);
this.selectedList = $('<ul class="selected"></ul>').bind('selectstart', function(){return false;}).appendTo(this.selectedContainer);
this.availableList = $('<ul class="available"></ul>').bind('selectstart', function(){return false;}).appendTo(this.availableContainer);
=======
this.selectedActions = $('<div class="actions ui-widget-header ui-helper-clearfix"><span class="count">0 items selected</span><a href="#" class="remove-all">Remove All</a></div>').appendTo(this.selectedContainer);
this.availableActions = $('<div class="actions ui-widget-header ui-helper-clearfix"><input type="text" class="search ui-widget-content ui-corner-all"/><a href="#" class="add-all">Add All</a></div>').appendTo(this.availableContainer);
this.selectedList = $('<ul class="selected connected-list"><li class="ui-helper-hidden-accessible"></li></ul>').bind('selectstart', function(){return false;}).appendTo(this.selectedContainer);
this.availableList = $('<ul class="available connected-list"><li class="ui-helper-hidden-accessible"></li></ul>').bind('selectstart', function(){return false;}).appendTo(this.availableContainer);
>>>>>>>
this.selectedActions = $('<div class="actions ui-widget-header ui-helper-clearfix"><span class="count">0 items selected</span><a href="#" class="remove-all">'+$.ui.multiselect.locale.removeAll+'</a></div>').appendTo(this.selectedContainer);
this.availableActions = $('<div class="actions ui-widget-header ui-helper-clearfix"><input type="text" class="search empty ui-widget-content ui-corner-all"/><a href="#" class="add-all">'+$.ui.multiselect.locale.addAll+'</a></div>').appendTo(this.availableContainer);
this.selectedList = $('<ul class="selected connected-list"><li class="ui-helper-hidden-accessible"></li></ul>').bind('selectstart', function(){return false;}).appendTo(this.selectedContainer);
this.availableList = $('<ul class="available connected-list"><li class="ui-helper-hidden-accessible"></li></ul>').bind('selectstart', function(){return false;}).appendTo(this.availableContainer);
<<<<<<<
$(this.selectedList).sortable({
containment: 'parent',
update: function(event, ui) {
// apply the new sort order to the original selectbox
that.selectedList.find('li').each(function() {
if (this.optionLink) $(this.optionLink).remove().appendTo(that.element);
});
}
=======
$("ul.selected").sortable({
placeholder: 'ui-state-highlight',
axis: 'y',
update: function(event, ui) {
// apply the new sort order to the original selectbox
that.selectedList.find('li').each(function() {
if ($(this).data('optionLink'))
$(this).data('optionLink').remove().appendTo(that.element);
});
},
receive: function(event, ui) {
// increment count
that.count += 1;
that._updateCount();
// workaround, because there's no way to reference
// the new element, see http://dev.jqueryui.com/ticket/4303
that.selectedList.children('.ui-draggable').each(function() {
$(this).removeClass('ui-draggable');
$(this).data('optionLink', ui.item.data('optionLink'));
$(this).data('idx', ui.item.data('idx'));
that._applyItemState($(this), true);
});
// workaround according to http://dev.jqueryui.com/ticket/4088
setTimeout(function() { ui.item.remove(); }, 1);
}
>>>>>>>
$("ul.selected").sortable({
placeholder: 'ui-state-highlight',
axis: 'y',
update: function(event, ui) {
// apply the new sort order to the original selectbox
that.selectedList.find('li').each(function() {
if ($(this).data('optionLink'))
$(this).data('optionLink').remove().appendTo(that.element);
});
},
receive: function(event, ui) {
// increment count
that.count += 1;
that._updateCount();
// workaround, because there's no way to reference
// the new element, see http://dev.jqueryui.com/ticket/4303
that.selectedList.children('.ui-draggable').each(function() {
$(this).removeClass('ui-draggable');
$(this).data('optionLink', ui.item.data('optionLink'));
$(this).data('idx', ui.item.data('idx'));
that._applyItemState($(this), true);
});
// workaround according to http://dev.jqueryui.com/ticket/4088
setTimeout(function() { ui.item.remove(); }, 1);
}
<<<<<<<
_populateLists: function(options) {
this.selectedList.empty();
this.availableList.empty();
=======
_populateLists: function(options) {
this.selectedList.children('.ui-element').remove();
this.availableList.children('.ui-element').remove();
this.count = 0;
>>>>>>>
_populateLists: function(options) {
this.selectedList.children('.ui-element').remove();
this.availableList.children('.ui-element').remove();
this.count = 0;
var that = this;
var items = $(options.map(function(i) {
<<<<<<<
}));
// register events
this._registerAddEvents(this.availableList.find('a.action'));
this._registerRemoveEvents(this.selectedList.find('a.action'));
this._registerHoverEvents(this.container.find('li'));
=======
}));
>>>>>>>
}));
<<<<<<<
var node = $('<li class="ui-state-default"><span class="ui-icon"/>'+$(option).text()+'<a href="#" class="action"><span class="ui-corner-all ui-icon"/></a></li>').hide();
node[0].optionLink = option;
=======
var node = $('<li class="ui-state-default ui-element"> \
<span class="ui-icon"/> \
'+$(option).text()+'\
<a href="#" class="action"><span class="ui-corner-all ui-icon"/></a> \
</li>').hide();
node.data('optionLink', $(option));
>>>>>>>
var node = $('<li class="ui-state-default ui-element"><span class="ui-icon"/>'+$(option).text()+'<a href="#" class="action"><span class="ui-corner-all ui-icon"/></a></li>').hide();
node.data('optionLink', $(option));
<<<<<<<
});
},
_registerRemoveEvents: function(elements) {
var that = this;
elements.click(function() {
=======
});
// make draggable
elements.each(function() {
$(this).parent().draggable({
connectToSortable: 'ul.selected',
helper: function() {
var selectedItem = that._cloneWithData($(this));
selectedItem.width($(this).width());
return selectedItem;
},
revert: 'invalid',
containment: '.ui-multiselect'
});
});
},
_registerRemoveEvents: function(elements) {
var that = this;
elements.click(function() {
>>>>>>>
});
// make draggable
elements.each(function() {
$(this).parent().draggable({
connectToSortable: 'ul.selected',
helper: function() {
var selectedItem = that._cloneWithData($(this));
selectedItem.width($(this).width());
return selectedItem;
},
revert: 'invalid',
containment: '.ui-multiselect'
});
});
},
_registerRemoveEvents: function(elements) {
var that = this;
elements.click(function() { |
<<<<<<<
allFocused: { type: "boolean", def: false, id: "allFocused" }, // default: disabled
=======
clockOffset: { type: "string", def: "", id: "clockOffset" }, // default: no offset
>>>>>>>
clockOffset: { type: "string", def: "", id: "clockOffset" }, // default: no offset
allFocused: { type: "boolean", def: false, id: "allFocused" }, // default: disabled |
<<<<<<<
=======
// General options
options["oa"] = getElement("optionsAccess").value;
options["password"] = getElement("accessPassword").value;
options["hpp"] = getElement("hidePassword").checked;
options["timerVisible"] = getElement("timerVisible").checked;
options["timerSize"] = getElement("timerSize").value;
options["timerLocation"] = getElement("timerLocation").value;
options["timerBadge"] = getElement("timerBadge").checked;
options["orm"] = getElement("overrideMins").value;
options["ora"] = getElement("overrideAccess").value;
options["warnSecs"] = getElement("warnSecs").value;
options["contextMenu"] = getElement("contextMenu").checked;
>>>>>>> |
<<<<<<<
import ValidInput from '../../components/ValidInput/'
import createFileEmptyIcon from '../../../resources/createFileEmpty.svg'
import TezosIcon from "../../components/TezosIcon/"
=======
import ValidInput from '../../components/ValidInput';
import createFileEmptyIcon from '../../../resources/createFileEmpty.svg';
import TezosIcon from '../../components/TezosIcon';
import styles from './styles.css';
>>>>>>>
import ValidInput from '../../components/ValidInput/';
import createFileEmptyIcon from '../../../resources/createFileEmpty.svg';
import TezosIcon from '../../components/TezosIcon/';
<<<<<<<
const isDisabled = isLoading || !this.state.isPasswordValidation || !this.state.isPasswordMatched || !walletFileName;
let walletFileSection = <CreateFileEmptyIcon src={createFileEmptyIcon} />;
=======
const isDisabled =
isLoading ||
!this.state.isPasswordValidation ||
!this.state.isPasswordMatched ||
!walletFileName;
let walletFileSection = (
<img
className={styles.createFileEmptyIcon}
src={createFileEmptyIcon}
alt=""
/>
);
>>>>>>>
const isDisabled =
isLoading ||
!this.state.isPasswordValidation ||
!this.state.isPasswordMatched ||
!walletFileName;
let walletFileSection = (
<CreateFileEmptyIcon src={createFileEmptyIcon} />
);
<<<<<<<
walletFileSection = (
<WalletFileSection>
<CheckIcon
iconName='checkmark2'
size={ms(5)}
color="check"
/>
<WalletFileName>
{ walletFileName }
</WalletFileName>
</WalletFileSection>
);
=======
walletFileSection = (
<div className={styles.walletFileSection}>
<CheckIcon
iconName="checkmark2"
size={ms(5)}
color="check"
className={styles.checkMark}
/>
<WalletFileName>{walletFileName}</WalletFileName>
</div>
);
>>>>>>>
walletFileSection = (
<WalletFileSection>
<CheckIcon
iconName="checkmark2"
size={ms(5)}
color="check"
/>
<WalletFileName>
{ walletFileName }
</WalletFileName>
</WalletFileSection>
);
<<<<<<<
<WalletContainers>
<BackToWallet
onClick={goBack}
>
=======
<div className={styles.walletContainers}>
<BackToWallet onClick={goBack}>
>>>>>>>
<WalletContainers>
<BackToWallet
onClick={goBack}
>
<<<<<<<
<WalletTitle>Create a new wallet</WalletTitle>
<WalletDescription>
Your wallet information will be saved to your computer. It will be encrypted with a password that you set.
</WalletDescription>
<FormContainer>
=======
<h3 className={styles.walletTitle}>Create a new wallet</h3>
<div className={styles.walletDescription}>
Your wallet information will be saved to your computer. It will be
encrypted with a password that you set.
</div>
<div className={styles.formContainer}>
>>>>>>>
<WalletTitle>Create a new wallet</WalletTitle>
<WalletDescription>
Your wallet information will be saved to your computer. It will be encrypted with a password that you set.
</WalletDescription>
<FormContainer>
<<<<<<<
<CreateFileButton
buttonTheme="secondary"
onClick={this.saveFile}
small
>
=======
<Button
buttonTheme="secondary"
onClick={this.saveFile}
small
className={styles.createFileButton}
>
>>>>>>>
<CreateFileButton
buttonTheme="secondary"
onClick={this.saveFile}
small
>
<<<<<<<
onShow={() => this.onPasswordShow(0)}
=======
className={styles.createPasswordField}
onShow={() => this.onPasswordShow(0)}
>>>>>>>
onShow={() => this.onPasswordShow(0)} |
<<<<<<<
import { READY } from '../constants/StatusTypes';
=======
import ManagerAddressTooltip from './Tooltips/ManagerAddressTooltip';
>>>>>>>
import ManagerAddressTooltip from './Tooltips/ManagerAddressTooltip';
import { READY } from '../constants/StatusTypes'; |
<<<<<<<
return <Delegate
isReady={ ready }
address={selectedAccount.get('delegateValue')}
selectedAccountHash={ selectedAccountHash }
selectedParentHash={ selectedParentHash }
/>;
=======
return (
<Delegate
isReady={isReady}
address={selectedAccount.get('delegateValue')}
selectedAccountHash={selectedAccountHash}
selectedParentHash={selectedParentHash}
/>
)
>>>>>>>
return <Delegate
isReady={ ready }
address={selectedAccount.get('delegateValue')}
selectedAccountHash={ selectedAccountHash }
selectedParentHash={ selectedParentHash }
/>;
<<<<<<<
return <Send
isReady={ ready }
selectedAccountHash={ selectedAccountHash }
selectedParentHash={ selectedParentHash }
/>;
=======
return(
<Send
isReady={isReady}
selectedAccountHash={selectedAccountHash}
selectedParentHash={selectedParentHash}
/>
)
>>>>>>>
return <Send
isReady={ ready }
selectedAccountHash={ selectedAccountHash }
selectedParentHash={ selectedParentHash }
/>;
<<<<<<<
if ( !ready ) {
return <AccountStatus address={ selectedAccount } />
}
return isEmpty(transactions.toJS())
=======
const JSTransactions = transactions.toJS();
return isEmpty(JSTransactions)
>>>>>>>
if ( !ready ) {
return <AccountStatus address={ selectedAccount } />
}
const JSTransactions = transactions.toJS();
return isEmpty(JSTransactions)
<<<<<<<
isReady={ isReady(status, storeTypes) }
=======
isReady={isReady}
>>>>>>>
isReady={ isReady(status, storeTypes) }
<<<<<<<
<TabList>
{tabs.map(tab => {
const ready = isReady(status, storeTypes, tab);
return (
<Tab
isActive={ activeTab === tab }
key={tab}
isReady={ ready }
buttonTheme="plain"
onClick={() => {
if ( ready ) {
this.handleLinkPress(tab)
}
}}
>
<TabText isReady={ ready }>{ tab }</TabText>
</Tab>
);
})}
=======
<TabList isReady={isReady}>
{tabs.map(tab => (
<Tab
isActive={activeTab === tab}
key={tab}
isReady={isReady}
buttonTheme="plain"
onClick={() => this.handleLinkPress(tab)}
>
{tab}
</Tab>
))}
>>>>>>>
<TabList>
{tabs.map(tab => {
const ready = isReady(status, storeTypes, tab);
return (
<Tab
isActive={ activeTab === tab }
key={tab}
isReady={ ready }
buttonTheme="plain"
onClick={() => {
if ( ready ) {
this.handleLinkPress(tab)
}
}}
>
<TabText isReady={ ready }>{ tab }</TabText>
</Tab>
);
})} |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.