conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import neo4j from 'neo4j-driver'
import { stringFormat } from 'services/bolt/cypherTypesFormatting'
=======
import { v1 as neo4j } from 'neo4j-driver'
import { stringModifier } from 'services/bolt/cypherTypesFormatting'
>>>>>>>
import neo4j from 'neo4j-driver'
import { stringModifier } from 'services/bolt/cypherTypesFormatting' |
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+ |
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+ |
<<<<<<<
BBTag.Support.prototype.populateBySymbolArray = function(symbolArray){
for (var i = 0, l = symbolArray.length; i < l; i++) {
var symbol = symbolArray[i];
this.populateBySymbol(symbol);
}
=======
BBTag.Support.prototype.populateBySymbolArray = function (symbolArray) {
for (var i = 0, l = symbolArray.length; i < l; i++) {
var symbol = symbolArray[i];
this.populateBySymbol(symbol);
}
>>>>>>>
BBTag.Support.prototype.populateBySymbolArray = function (symbolArray) {
for (var i = 0, l = symbolArray.length; i < l; i++) {
var symbol = symbolArray[i];
this.populateBySymbol(symbol);
}
<<<<<<<
=======
function resolveSupport(symbol) {
var support = new BBTag.Support();
if (symbol) {
support.populateBySymbol(symbol);
var children = [].concat(symbol.methods, symbol.properties, symbol.events);
for (var i = 0, l = children.length; i < l; i++) {
var object = children[i];
var childSupport = resolveSupport(object);
support.populateBySupport(childSupport);
}
symbol.support = support;
}
return support;
}
>>>>>>>
<<<<<<<
}
}
}
);
=======
}
//Mark all properties as callback based on their tags
if (fieldCBs.length) {
symbol.isCallback = true;
for (var i = 0; i < fieldCBs; i++) {
currentCB = fieldCBs[i];
if (currentCB) {}
}
}
}
},
onDocCommentTags: function (comment) {
if (comment) {
//The name must be nibbled so we get a name property like a normal param
//They are marked as callbacks for future processing.
//We mark the items as fields and set the description accordingly
var propertyCBTags = comment.tags.filter(function ($) {
return $.title == "propertyCB"
});
if (propertyCBTags.length) {
for (var i = 0; i < propertyCBTags.length; i++) {
var currentPropertyCBTag = propertyCBTags[i];
currentPropertyCBTag.desc = currentPropertyCBTag.nibbleName(currentPropertyCBTag.desc);
currentPropertyCBTag.isCallback = true;
var fieldTag = new JSDOC.DocTag("field");
fieldTag.isCallback = true;
fieldTag.name = currentPropertyCBTag.name;
comment.tags.push(fieldTag);
comment.tags.push(new JSDOC.DocTag("type " + currentPropertyCBTag.type));
comment.tags.push(new JSDOC.DocTag("desc " + currentPropertyCBTag.desc));
}
} else if (comment.getTag("squareAccessor").length) {
//Push a function tag because we only support [] functions
comment.tags.push(new JSDOC.DocTag("function"));
}
}
},
onDocTag: function (docTag) {
if (docTag.title) {
//Callbacks pretend to be parameters so that their order is preserved
//The name must be nibbled so we get a name property like a normal param
//They are marked as callbacks for future processing.
if (docTag.title == "callback") {
docTag.desc = docTag.nibbleName(docTag.desc);
docTag.title = "param";
docTag.isCallback = true;
} else if (docTag.title == "learns") {
docTag.desc = docTag.nibbleName(docTag.desc);
} else if (docTag.title == "constructedBy") {
if (!docTag.type) {
LOG.warn(docTag.title + " missing type");
} else {
var parts = GetType(docTag.desc);
docTag.desc = parts.type;
docTag.example = parts.remainder;
}
} else if (docTag.title == "permission") {
docTag.desc = docTag.nibbleName(docTag.desc);
}
}
},
onFinishedParsing: function (symbolSet) {
if (symbolSet) {
var symbols = symbolSet.toArray();
var classes = symbols.filter(isaClass);
// create each of the class pages
for (var i = 0, l = classes.length; i < l; i++) {
resolveSupport(classes[i]);
}
}
}
});
>>>>>>>
}
}
}
}); |
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @PB10
* @RIPPLE
>>>>>>>
* @PB10+
* @RIPPLE
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+
<<<<<<<
* @PB10+
=======
* @RIPPLE
* @PB10
>>>>>>>
* @RIPPLE
* @PB10+ |
<<<<<<<
* @BB50+
* @PB10
=======
* @BB50+
* @RIPPLE
>>>>>>>
* @BB50+
* @PB10
* @RIPPLE
<<<<<<<
* @PB10
=======
* @RIPPLE
>>>>>>>
* @PB10
* @RIPPLE
<<<<<<<
* @PB10
=======
* @RIPPLE
>>>>>>>
* @PB10
* @RIPPLE |
<<<<<<<
page: String,
routeData: Object,
subroute: String,
=======
page: {
type: String,
reflectToAttribute: true,
observer: '_pageChanged'
},
>>>>>>>
page: String,
routeData: Object,
subroute: String,
<<<<<<<
constructor() {
super();
this.rootPath = '/';
}
=======
>>>>>>>
constructor() {
super();
this.rootPath = '/';
} |
<<<<<<<
${helmet ? helmet.script.toString() : ''}
${javascriptScripts}
=======
${helmet && helmet.script.toString()}
${scripts}
>>>>>>>
${helmet ? helmet.script.toString() : ''}
${scripts} |
<<<<<<<
import HTML from 'components/html';
import getConfig from '../../../config/get';
import onlyIf from '../../../internal/utils/logic/onlyIf';
import removeNil from '../../../internal/utils/arrays/removeNil';
=======
import config from '../../../config';
import onlyIf from '../../../shared/utils/logic/onlyIf';
import removeNil from '../../../shared/utils/arrays/removeNil';
>>>>>>>
import config from '../../../config';
import onlyIf from '../../../internal/utils/logic/onlyIf';
import removeNil from '../../../internal/utils/arrays/removeNil';
<<<<<<<
import ClientConfigScript from '../../../config/ClientConfigScript';
=======
import ClientConfig from '../../../config/components/ClientConfig';
import HTML from '../../../shared/components/HTML';
>>>>>>>
import ClientConfig from '../../../config/components/ClientConfig';
import HTML from '../../../shared/components/html';
<<<<<<<
initialState,
=======
helmet,
nonce,
reactAppString,
>>>>>>>
initialState,
helmet,
nonce,
reactAppString,
<<<<<<<
appName={getConfig('htmlPage.appName')}
title={helmet.title.toComponent()}
=======
title={config('htmlPage.defaultTitle')}
description={config('htmlPage.description')}
>>>>>>>
appName={config('htmlPage.appName')}
title={helmet.title.toComponent()}
<<<<<<<
reactAppString: PropTypes.string,
nonce: PropTypes.string,
// eslint-disable-next-line react/forbid-prop-types
helmet: PropTypes.object,
initialState: PropTypes.string,
=======
>>>>>>> |
<<<<<<<
export const IS_TESTNET = process.env.NET === 'testnet';
export const IS_DESKTOP = process.env.DESKTOP === 'true';
//export const IS_MAINNET = Lockr.get('NET') === 'mainnet' || !Lockr.get('NET');
//export const IS_SUNNET = Lockr.get('NET') === 'sunnet';
=======
export const IS_TESTNET = process.env.NET === "testnet";
export const IS_DESKTOP = process.env.DESKTOP === "true";
//export const IS_MAINNET = Lockr.get("NET") === "mainnet" || !Lockr.get("NET");
//export const IS_SUNNET = Lockr.get("NET") === "sunnet";
>>>>>>>
export const IS_TESTNET = process.env.NET === "testnet";
export const IS_DESKTOP = process.env.DESKTOP === "true";
export const IS_MAINNET = Lockr.get("NET") === "mainnet" || !Lockr.get("NET");
export const IS_SUNNET = Lockr.get("NET") === "sunnet";
<<<<<<<
MAINNET:'http://18.217.215.94:86',
SUNNET:'http://18.217.215.94:89',
}
=======
MAINNET: "https://tronscan.org",
SUNNET: "https://dappchain.tronscan.org"
};
>>>>>>>
//MAINNET: "https://tronscan.org",
// SUNNET: "https://dappchain.tronscan.org"
MAINNET:'http://18.217.215.94:86',
SUNNET:'http://18.217.215.94:89',
};
//
<<<<<<<
WSSURLMAIN: "ws://3.14.14.175:9000/api/tronsocket",
WSSURLSUN: "ws://3.15.181.169:9000/api/tronsocket",
}
=======
WSSURLMAIN: "wss://apilist.tronscan.org/api/tronsocket",
WSSURLSUN: "wss://dappchainapi.tronscan.org/api/tronsocket"
};
// token type
export const TOKENTYPE = {
TOKEN10: 'trc10',
TOKEN20: 'trc20',
};
// market basic page
export const MARKETPAGE = {
CREATE: 'create',
UPDATE: 'update',
};
// market token verify status
export const VERIFYSTATUS = {
HASBEENSUBMITTEDTHREE:-3,
NOTRECORDED: -2, // No recorded
HASBEENRECORDED: -1, // Has been recorded
HASBEENSUBMITTED: 0, // Has been submitted
NOTRECOMMENDED: 1, // not recommended
TOAUDIT: 2, // to audit
APPROVED: 3, // reviewed for recommendation
RECOMMENDED: 4, // reviewed and recommended
REJECTED: 5, // rejected
SHELVES: 6, // Has been off the shelves
CONFIRMED: 7, // Have been confirmed
RECOMMENDEDFAILED: 8, // Review recommendation failed
};
// JSEncrypt key
export const JSENCRYPTKEY = `-----BEGIN PUBLIC KEY-----MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCezlJJy/F7LO5+fmIcUjWq0APOILbzUEAcMyK/1VK7d5G0vb58thDtG0rK72uzFA1e0SByI2Hdqy0JbE8a2+cSIBN1y9iKw4WW5MJLBZXrMZmUjcgHYCbH7yjbDOOGCXtmINaNeLOcieLVvf7fDQaRAJniNuDgNtqjqtMuOFfApQIDAQAB-----END PUBLIC KEY-----`;
// market token entry fromId
export const FROMID = 1;
// url regexp
export const URLREGEXP = /^((ht|f)tps?):\/\/[\w\-]+(\.[\w\-]+)+([\w\-.,@?^=%&:\\/~+#]*[\w\-@?^=%&\\/~+#])?$/;
>>>>>>>
WSSURLMAIN: "wss://apilist.tronscan.org/api/tronsocket",
WSSURLSUN: "wss://dappchainapi.tronscan.org/api/tronsocket"
};
// token type
export const TOKENTYPE = {
TOKEN10: 'trc10',
TOKEN20: 'trc20',
};
// market basic page
export const MARKETPAGE = {
CREATE: 'create',
UPDATE: 'update',
};
// market token verify status
export const VERIFYSTATUS = {
HASBEENSUBMITTEDTHREE:-3,
NOTRECORDED: -2, // No recorded
HASBEENRECORDED: -1, // Has been recorded
HASBEENSUBMITTED: 0, // Has been submitted
NOTRECOMMENDED: 1, // not recommended
TOAUDIT: 2, // to audit
APPROVED: 3, // reviewed for recommendation
RECOMMENDED: 4, // reviewed and recommended
REJECTED: 5, // rejected
SHELVES: 6, // Has been off the shelves
CONFIRMED: 7, // Have been confirmed
RECOMMENDEDFAILED: 8, // Review recommendation failed
};
// JSEncrypt key
export const JSENCRYPTKEY = `-----BEGIN PUBLIC KEY-----MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCezlJJy/F7LO5+fmIcUjWq0APOILbzUEAcMyK/1VK7d5G0vb58thDtG0rK72uzFA1e0SByI2Hdqy0JbE8a2+cSIBN1y9iKw4WW5MJLBZXrMZmUjcgHYCbH7yjbDOOGCXtmINaNeLOcieLVvf7fDQaRAJniNuDgNtqjqtMuOFfApQIDAQAB-----END PUBLIC KEY-----`;
// market token entry fromId
export const FROMID = 1;
// url regexp
export const URLREGEXP = /^((ht|f)tps?):\/\/[\w\-]+(\.[\w\-]+)+([\w\-.,@?^=%&:\\/~+#]*[\w\-@?^=%&\\/~+#])?$/; |
<<<<<<<
ifProd('transform-react-constant-elements'),
// Decorators for everybody
'transform-decorators-legacy',
=======
ifOptimize('transform-react-constant-elements'),
>>>>>>>
<<<<<<<
ifProdClient(() => ({
loaders: [
'classnames-loader',
ExtractTextPlugin.extract({
fallbackLoader: 'style-loader',
loader: [`css-loader?modules=1&sourceMap&importLoaders=1&localIdentName=${localIdentName}!postcss-loader!sass-loader?outputStyle=expanded&sourceMap`],
}),
],
=======
ifOptimizeClient(() => ({
loader: ExtractTextPlugin.extract({
fallbackLoader: 'style-loader',
loader: ['css-loader'],
}),
>>>>>>>
ifOptimizeClient(() => ({
loaders: [
'classnames-loader',
ExtractTextPlugin.extract({
fallbackLoader: 'style-loader',
loader: [`css-loader?modules=1&sourceMap&importLoaders=1&localIdentName=${localIdentName}!postcss-loader!sass-loader?outputStyle=expanded&sourceMap`],
}),
], |
<<<<<<<
function createNotification(subject, msg, open) {
const title = `${subject.toUpperCase()} DEVSERVER`;
console.log(`==> ${title} -> ${msg}`);
=======
function createNotification(subject, msg) {
const title = `🔥 ${subject.toUpperCase()}`;
>>>>>>>
function createNotification(subject, msg, open) {
const title = `🔥 ${subject.toUpperCase()}`;
<<<<<<<
message: msg
};
if (typeof open === "string") {
notifyProps.open = open;
}
notifier.notify(notifyProps);
}
/**
* -----------------------------------------------------------------------------
* Server Bundle Server
*/
let serverListener = null;
let lastConnectionKey = 0;
const connectionMap = {};
const serverBundleCompiler = webpack(serverBundleConfig);
const serverBundlePath = path.resolve(
serverBundleConfig.output.path, `${Object.keys(serverBundleConfig.entry)[0]}.js`
);
serverBundleCompiler.plugin('done', (stats) => {
if (stats.hasErrors()) {
createNotification('server', '😵 Build failed, check console for error');
console.log(stats.toString());
return;
}
createNotification('server', '✅ Bundle built');
=======
message: msg,
});
>>>>>>>
message: msg
};
if (typeof open === "string") {
notifyProps.open = open;
}
notifier.notify(notifyProps);
<<<<<<<
createNotification('server', '🌎 Running', `http://localhost:${process.env.SERVER_PORT}`);
} catch (err) {
createNotification('server', '😵 Bundle invalid, check console for error');
console.log(err);
=======
class HotServer {
constructor(compiler) {
this.compiler = compiler;
this.listenerManager = null;
const compiledOutputPath = path.resolve(
compiler.options.output.path, `${Object.keys(compiler.options.entry)[0]}.js`
);
try {
// The server bundle will automatically start the web server just by
// requiring it. It returns the http listener too.
this.listenerManager = new ListenerManager(require(compiledOutputPath).default);
createNotification('server', '✅ Running');
} catch (err) {
createNotification('server', '😵 Bundle invalid, check console for error');
console.log(err);
}
>>>>>>>
class HotServer {
constructor(compiler) {
this.compiler = compiler;
this.listenerManager = null;
const compiledOutputPath = path.resolve(
compiler.options.output.path, `${Object.keys(compiler.options.entry)[0]}.js`
);
try {
// The server bundle will automatically start the web server just by
// requiring it. It returns the http listener too.
this.listenerManager = new ListenerManager(require(compiledOutputPath).default);
createNotification('server', '✅ Running');
} catch (err) {
createNotification('server', '😵 Bundle invalid, check console for error');
console.log(err);
} |
<<<<<<<
import { withAsyncComponents } from 'react-async-component';
import { Provider } from 'mobx-react';
import { toJS } from 'mobx';
import stringify from 'json-stringify-safe';
import Store from 'store';
import App from '../shared';
=======
import asyncBootstrapper from 'react-async-bootstrapper';
import { AsyncComponentProvider } from 'react-async-component';
import './polyfills';
import ReactHotLoader from './components/ReactHotLoader';
import DemoApp from '../shared/components/DemoApp';
>>>>>>>
import asyncBootstrapper from 'react-async-bootstrapper';
import { AsyncComponentProvider } from 'react-async-component';
import { Provider } from 'mobx-react';
import { toJS } from 'mobx';
import stringify from 'json-stringify-safe';
import Store from 'store';
import ReactHotLoader from './components/ReactHotLoader';
import App from '../shared';
<<<<<<<
<Provider {...store}>
<BrowserRouter forceRefresh={!supportsHistory}>
<TheApp />
</BrowserRouter>
</Provider>
=======
<ReactHotLoader>
<AsyncComponentProvider rehydrateState={asyncComponentsRehydrateState}>
<BrowserRouter forceRefresh={!supportsHistory}>
<TheApp />
</BrowserRouter>
</AsyncComponentProvider>
</ReactHotLoader>
>>>>>>>
<ReactHotLoader>
<AsyncComponentProvider rehydrateState={asyncComponentsRehydrateState}>
<Provider {...store}>
<BrowserRouter forceRefresh={!supportsHistory}>
<TheApp />
</BrowserRouter>
</Provider>
</AsyncComponentProvider>
</ReactHotLoader>
<<<<<<<
() => renderApp(require('../shared').default),
=======
'../shared/components/DemoApp',
() => {
renderApp(require('../shared/components/DemoApp').default);
},
>>>>>>>
() => renderApp(require('../shared').default), |
<<<<<<<
import { BrowserRouter } from 'react-router-dom';
=======
import BrowserRouter from 'react-router-dom/BrowserRouter';
>>>>>>>
import BrowserRouter from 'react-router-dom/BrowserRouter';
<<<<<<<
import { Provider } from 'mobx-react';
import { toJS } from 'mobx';
import stringify from 'json-stringify-safe';
import Store from 'store';
import ReactHotLoader from './components/react-hot-loader';
import App from '../shared';
=======
import './polyfills';
import DemoApp from '../shared/components/DemoApp';
>>>>>>>
import { Provider } from 'mobx-react';
import { toJS } from 'mobx';
import stringify from 'json-stringify-safe';
import Store from 'store';
import App from '../shared';
<<<<<<<
// eslint-disable-next-line
let store = window.store = new Store(window.__INITIAL_STATE__);
=======
/**
* Renders the given React Application component.
*/
>>>>>>>
// eslint-disable-next-line
let store = window.store = new Store(window.__INITIAL_STATE__);
/**
* Renders the given React Application component.
*/
<<<<<<<
<ReactHotLoader>
<Provider {...store}>
<BrowserRouter>
<TheApp />
</BrowserRouter>
</Provider>
</ReactHotLoader>
=======
<BrowserRouter>
<TheApp />
</BrowserRouter>
>>>>>>>
<Provider {...store}>
<BrowserRouter>
<TheApp />
</BrowserRouter>
</Provider>
<<<<<<<
if (process.env.NODE_ENV === 'development' && module.hot) {
if (module.hot.data && module.hot.data.store) {
// Create new store with previous store state
store = new Store(JSON.parse(module.hot.data.store));
}
module.hot.dispose((data) => {
// Deserialize store and keep in hot module data for next replacement
data.store = stringify(toJS(store)); // eslint-disable-line
});
=======
if (process.env.BUILD_FLAG_IS_DEV && module.hot) {
>>>>>>>
if (process.env.BUILD_FLAG_IS_DEV && module.hot) {
if (module.hot.data && module.hot.data.store) {
// Create new store with previous store state
store = new Store(JSON.parse(module.hot.data.store));
}
module.hot.dispose((data) => {
// Deserialize store and keep in hot module data for next replacement
data.store = stringify(toJS(store)); // eslint-disable-line
}); |
<<<<<<<
import enforceHttps from './middleware/enforceHttps';
import basicAuth from './middleware/basicAuth';
=======
import config from '../config';
import { log } from '../internal/utils';
>>>>>>>
import enforceHttps from './middleware/enforceHttps';
import basicAuth from './middleware/basicAuth';
import { log } from '../internal/utils';
<<<<<<<
const listener = app.listen(config('port'), () => {
const host = config('host');
const port = config('port');
const localUrl = `http://${host}:${port}`;
const publicUrl = process.env.PUBLIC_URL;
const url = publicUrl && publicUrl !== '' ? publicUrl : localUrl;
console.info(`Server listening on ${url}`);
});
=======
const listener = app.listen(config('port'), () =>
log({
title: 'server',
level: 'special',
message: `✓
${config('welcomeMessage')}
${config('htmlPage.defaultTitle')} is ready!
with
Service Workers: ${config('serviceWorker.enabled')}
Polyfills: ${config('polyfillIO.enabled')} (${config('polyfillIO.features').join(', ')})
Server is now listening on Port ${config('port')}
You can access it in the browser at http://${config('host')}:${config('port')}
Press Ctrl-C to stop.
`,
}),
);
>>>>>>>
const listener = app.listen(config('port'), () =>
log({
title: 'server',
level: 'special',
message: `✓
${config('welcomeMessage')}
with
Service Workers: ${config('serviceWorker.enabled')}
Polyfills: ${config('polyfillIO.enabled')} (${config('polyfillIO.features').join(', ')})
Server is now listening on Port ${config('port')}
You can access it in the browser at http://${config('host')}:${config('port')}
Press Ctrl-C to stop.
`,
}),
); |
<<<<<<<
const ifOptimizeClient = ifElse(isOptimize && isClient);
const ifPublicUrl = ifElse(config('publicUrl'));
=======
const ifProdClient = ifElse(isProd && isClient);
>>>>>>>
const ifProdClient = ifElse(isProd && isClient);
const ifPublicUrl = ifElse(config('publicUrl'));
<<<<<<<
// Required to support hot reloading of our client.
ifDevClient(() => `webpack-hot-middleware/client?reload=true&path=${publicUrl}/__webpack_hmr`),
=======
>>>>>>>
<<<<<<<
alias: mergeDeep(
{
modernizr$: path.resolve(appRootDir.get(), './.modernizrrc'),
},
),
// UENO: The ./shared is now a resolved root.
modules: [
'./shared',
path.resolve(appRootDir.get(), 'shared'),
'node_modules',
],
=======
alias: {
modernizr$: path.resolve(appRootDir.get(), './.modernizrrc'),
},
>>>>>>>
alias: {
modernizr$: path.resolve(appRootDir.get(), './.modernizrrc'),
},
// UENO: The ./shared is now a resolved root.
modules: [
'./shared',
path.resolve(appRootDir.get(), 'shared'),
'node_modules',
],
<<<<<<<
//
// NOTE: You may be used to having to do NODE_ENV = production here to
// get optimized React/ReactDOM builds. Almost every blog and example
// will tell you to do this. I have decided against this model as it
// often confused me when I was passing custom NODE_ENV values
// such as "staging" / "test" to my scripts. Therefore to avoid any
// confusion we instead use the webpack alias feature to target the
// pre-optimised dist versions of React/ReactDOM when required.
new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify(isDev ? 'development' : 'production'),
=======
new webpack.EnvironmentPlugin({
// It is really important to use NODE_ENV=production in order to use
// optimised versions of some node_modules, such as React.
NODE_ENV: isProd ? 'production' : 'development',
>>>>>>>
new webpack.EnvironmentPlugin({
// It is really important to use NODE_ENV=production in order to use
// optimised versions of some node_modules, such as React.
NODE_ENV: isProd ? 'production' : 'development',
<<<<<<<
ifClient(['latest', { es2015: { modules: false } }]),
// Stage 3 javascript syntax.
// "Candidate: complete spec and initial browser implementations."
// Add anything lower than stage 3 at your own risk. :)
'stage-0',
// For a node bundle we use the awesome babel-preset-env which
// acts like babel-preset-latest in that it supports the latest
// ratified ES201X syntax, however, it will only transpile what
// is necessary for a target environment. We have configured it
// to target our current node version. This is cool because
// recent node versions have extensive support for ES201X syntax.
// Also, we have disabled modules transpilation as webpack will
// take care of that for us ensuring tree shaking takes place.
// NOTE: Make sure you use the same node version for development
// and production.
ifNode(['env', { targets: { node: true }, modules: false }]),
=======
ifClient(['env', { es2015: { modules: false } }]),
// For a node bundle we use the specific target against
// babel-preset-env so that only the unsupported features of
// our target node version gets transpiled.
ifNode(['env', { targets: { node: true } }]),
>>>>>>>
ifClient(['env', { es2015: { modules: false } }]),
'stage-0',
// For a node bundle we use the specific target against
// babel-preset-env so that only the unsupported features of
// our target node version gets transpiled.
ifNode(['env', { targets: { node: true } }]),
<<<<<<<
=======
ifProd('transform-react-constant-elements'),
>>>>>>>
ifProd('transform-react-constant-elements'),
<<<<<<<
ifOptimizeClient(() => ({
use: [
'classnames-loader',
...ExtractTextPlugin.extract({
fallback: 'style-loader',
use: [
`css-loader?modules=1&importLoaders=1&localIdentName=${localIdentName}`,
'postcss-loader',
'sass-loader?outputStyle=expanded',
],
}),
],
=======
ifProdClient(() => ({
loader: ExtractTextPlugin.extract({
fallback: 'style-loader',
use: ['css-loader'],
}),
>>>>>>>
ifProdClient(() => ({
use: [
'classnames-loader',
...ExtractTextPlugin.extract({
fallback: 'style-loader',
use: [
`css-loader?modules=1&importLoaders=1&localIdentName=${localIdentName}`,
'postcss-loader',
'sass-loader?outputStyle=expanded',
],
}),
], |
<<<<<<<
import { renderToStaticMarkup } from 'react-dom/server';
import { StaticRouter } from 'react-router-dom';
=======
import Helmet from 'react-helmet';
import { renderToString, renderToStaticMarkup } from 'react-dom/server';
import { StaticRouter } from 'react-router-dom';
>>>>>>>
import { renderToStaticMarkup } from 'react-dom/server';
import { StaticRouter } from 'react-router-dom';
<<<<<<<
function reactApplicationMiddleware(request, response, next) {
// We should have had a nonce provided to us. See the server/index.js for
// more information on what this is.
=======
export default function reactApplicationMiddleware(request, response) {
// Ensure a nonce has been provided to us.
// See the server/middleware/security.js for more info.
>>>>>>>
export default function reactApplicationMiddleware(request, response, next) {
// Ensure a nonce has been provided to us.
// See the server/middleware/security.js for more info.
<<<<<<<
const reactRouterContext = {};
// Initialize the store
const store = new Store();
=======
const reactRouterContext = {};
>>>>>>>
const reactRouterContext = {};
// Initialize the store
const store = new Store();
<<<<<<<
<StaticRouter location={request.url} context={reactRouterContext}>
<Provider {...store}>
<App />
</Provider>
</StaticRouter>
=======
<StaticRouter location={request.url} context={reactRouterContext}>
<DemoApp />
</StaticRouter>
>>>>>>>
<StaticRouter location={request.url} context={reactRouterContext}>
<Provider {...store}>
<App />
</Provider>
</StaticRouter> |
<<<<<<<
const html = renderToStaticMarkup(<ServerHTML helmet={Helmet.rewind()} nonce={nonce} />);
response.status(200).send(html);
=======
const html = renderToStaticMarkup(<ServerHTML nonce={nonce} />);
response.status(200).send(`<!DOCTYPE html>${html}`);
>>>>>>>
const html = renderToStaticMarkup(<ServerHTML helmet={Helmet.rewind()} nonce={nonce} />);
response.status(200).send(`<!DOCTYPE html>${html}`); |
<<<<<<<
import { CALL_API } from '../../middleware/api'
import { routeActions } from 'react-router-redux';
=======
import { CALL_API } from '../../middleware/api';
import { pushPath, replacePath } from 'react-router-redux';
>>>>>>>
import { CALL_API } from '../../middleware/api'
import { routeActions } from 'react-router-redux';
<<<<<<<
dispatch(routeActions.replace('/'))
=======
dispatch(replacePath('/'));
>>>>>>>
dispatch(routeActions.replace('/'))
<<<<<<<
console.log(e);
localStorage.removeItem('token')
})
=======
localStorage.removeItem('token');
});
>>>>>>>
localStorage.removeItem('token')
})
<<<<<<<
localStorage.removeItem('token')
dispatch({type: LOGOUT_SUCCEEDED})
dispatch(routeActions.push("/login"))
}
=======
localStorage.removeItem('token');
dispatch(LOGOUT_SUCCEEDED);
dispatch(pushPath('/login'));
};
>>>>>>>
localStorage.removeItem('token')
dispatch({type: LOGOUT_SUCCEEDED})
dispatch(routeActions.push("/login"))
}
<<<<<<<
localStorage.setItem('token', payload.token)
//dispatch(loadInitialData())
dispatch(routeActions.push('/'))
=======
localStorage.setItem('token', payload.token);
dispatch(loadInitialData());
dispatch(pushPath('/'));
>>>>>>>
localStorage.setItem('token', payload.token)
dispatch(routeActions.push('/'))
<<<<<<<
localStorage.setItem('token', payload.token)
//dispatch(loadInitialData())
dispatch(routeActions.push('/'))
=======
localStorage.setItem('token', payload.token);
dispatch(loadInitialData());
dispatch(pushPath('/'));
>>>>>>>
localStorage.setItem('token', payload.token)
dispatch(routeActions.push('/')) |
<<<<<<<
class Editor extends React.Component {
state = {
defaultValue: toEditorState('hello world'),
value: null,
};
editorChange = (editorState) => {
=======
const Editor = React.createClass({
getInitialState() {
return {
defaultValue: toEditorState('hello world'),
value: null,
readOnly: false,
};
},
editorChange(editorState) {
>>>>>>>
class Editor extends React.Component {
state = {
defaultValue: toEditorState('hello world'),
value: null,
readOnly: false,
};
editorChange = (editorState) => {
<<<<<<<
}
=======
},
toggleReadOnly() {
this.setState({
readOnly: !this.state.readOnly,
})
},
>>>>>>>
}
toggleReadOnly() {
this.setState({
readOnly: !this.state.readOnly,
})
} |
<<<<<<<
import PeerAvatar from '../PeerAvatar/PeerAvatar';
import SelectSwitcher from './SelectSwitcher';
=======
import Avatar from '../Avatar/Avatar';
import CheckButton from '../CheckButton/CheckButton';
>>>>>>>
import PeerAvatar from '../PeerAvatar/PeerAvatar';
import CheckButton from '../CheckButton/CheckButton'; |
<<<<<<<
// Building experimental swift features
full: {
options: {
almond: true,
mainConfigFile: "./src/config.js",
optimize: "none",
keepBuildDir: true,
name: "mobify-swift",
out: "./build/mobify-swift-<%= pkg.version %>.js",
}
},
fullOptimized: {
options: {
almond: true,
mainConfigFile: "./src/config.js",
keepBuildDir: true,
name: "mobify-swift",
out: "./build/mobify-swift-<%= pkg.version %>.min.js",
}
},
// Building custom Mobify.js library
=======
// Building custom Mobify.js library (must copy mobify-custom.js.example -> mobify-custom.js)
>>>>>>>
// Building experimental swift features
full: {
options: {
almond: true,
mainConfigFile: "./src/config.js",
optimize: "none",
keepBuildDir: true,
name: "mobify-swift",
out: "./build/mobify-swift-<%= pkg.version %>.js",
}
},
fullOptimized: {
options: {
almond: true,
mainConfigFile: "./src/config.js",
keepBuildDir: true,
name: "mobify-swift",
out: "./build/mobify-swift-<%= pkg.version %>.min.js",
}
},
// Building custom Mobify.js library (must copy mobify-custom.js.example -> mobify-custom.js) |
<<<<<<<
img.setAttribute(opts.attribute, getImageURL(url, opts));
img.setAttribute('data-orig-src', attrVal);
if(opts.onerror) {
img.setAttribute('onerror', opts.onerror);
}
=======
img.setAttribute(opts.attribute, ResizeImages.getImageURL(url, opts));
>>>>>>>
img.setAttribute(opts.attribute, ResizeImages.getImageURL(url, opts));
img.setAttribute('data-orig-src', attrVal);
if(opts.onerror) {
img.setAttribute('onerror', opts.onerror);
}
<<<<<<<
attribute: "x-src",
onerror: 'Mobify.ResizeImages.restoreOriginalSrc(event);'
};
var restoreOriginalSrc = ResizeImages.restoreOriginalSrc = function(event) {
var origSrc;
event.target.removeAttribute('onerror'); // remove ourselves
if (origSrc = event.target.getAttribute('data-orig-src')) {
console.log("Restoring " + event.target.src + " to " + origSrc);
event.target.setAttribute('src', origSrc);
}
=======
attribute: "x-src",
webp: ResizeImages.supportsWebp()
>>>>>>>
attribute: "x-src",
webp: ResizeImages.supportsWebp(),
onerror: 'Mobify.ResizeImages.restoreOriginalSrc(event);'
};
var restoreOriginalSrc = ResizeImages.restoreOriginalSrc = function(event) {
var origSrc;
event.target.removeAttribute('onerror'); // remove ourselves
if (origSrc = event.target.getAttribute('data-orig-src')) {
console.log("Restoring " + event.target.src + " to " + origSrc);
event.target.setAttribute('src', origSrc);
} |
<<<<<<<
}).call(this,require("FWaASH"))
},{"FWaASH":11,"xmldom":5}],69:[function(require,module,exports){
=======
}).call(this,require("/Users/tmcw/src/geojson.io/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js"))
},{"/Users/tmcw/src/geojson.io/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js":10,"xmldom":5}],74:[function(require,module,exports){
>>>>>>>
}).call(this,require("FWaASH"))
},{"FWaASH":11,"xmldom":5}],74:[function(require,module,exports){
<<<<<<<
},{}],102:[function(require,module,exports){
=======
},{}],107:[function(require,module,exports){
module.exports = hasKeys
function hasKeys(source) {
return source !== null &&
(typeof source === "object" ||
typeof source === "function")
}
},{}],108:[function(require,module,exports){
var Keys = require("object-keys")
var hasKeys = require("./has-keys")
>>>>>>>
},{}],107:[function(require,module,exports){
<<<<<<<
},{}],103:[function(require,module,exports){
=======
},{"./has-keys":107,"object-keys":110}],109:[function(require,module,exports){
var hasOwn = Object.prototype.hasOwnProperty;
var toString = Object.prototype.toString;
var isFunction = function (fn) {
var isFunc = (typeof fn === 'function' && !(fn instanceof RegExp)) || toString.call(fn) === '[object Function]';
if (!isFunc && typeof window !== 'undefined') {
isFunc = fn === window.setTimeout || fn === window.alert || fn === window.confirm || fn === window.prompt;
}
return isFunc;
};
module.exports = function forEach(obj, fn) {
if (!isFunction(fn)) {
throw new TypeError('iterator must be a function');
}
var i, k,
isString = typeof obj === 'string',
l = obj.length,
context = arguments.length > 2 ? arguments[2] : null;
if (l === +l) {
for (i = 0; i < l; i++) {
if (context === null) {
fn(isString ? obj.charAt(i) : obj[i], i, obj);
} else {
fn.call(context, isString ? obj.charAt(i) : obj[i], i, obj);
}
}
} else {
for (k in obj) {
if (hasOwn.call(obj, k)) {
if (context === null) {
fn(obj[k], k, obj);
} else {
fn.call(context, obj[k], k, obj);
}
}
}
}
};
},{}],110:[function(require,module,exports){
module.exports = Object.keys || require('./shim');
},{"./shim":112}],111:[function(require,module,exports){
var toString = Object.prototype.toString;
module.exports = function isArguments(value) {
var str = toString.call(value);
var isArguments = str === '[object Arguments]';
if (!isArguments) {
isArguments = str !== '[object Array]'
&& value !== null
&& typeof value === 'object'
&& typeof value.length === 'number'
&& value.length >= 0
&& toString.call(value.callee) === '[object Function]';
}
return isArguments;
};
},{}],112:[function(require,module,exports){
(function () {
"use strict";
// modified from https://github.com/kriskowal/es5-shim
var has = Object.prototype.hasOwnProperty,
toString = Object.prototype.toString,
forEach = require('./foreach'),
isArgs = require('./isArguments'),
hasDontEnumBug = !({'toString': null}).propertyIsEnumerable('toString'),
hasProtoEnumBug = (function () {}).propertyIsEnumerable('prototype'),
dontEnums = [
"toString",
"toLocaleString",
"valueOf",
"hasOwnProperty",
"isPrototypeOf",
"propertyIsEnumerable",
"constructor"
],
keysShim;
keysShim = function keys(object) {
var isObject = object !== null && typeof object === 'object',
isFunction = toString.call(object) === '[object Function]',
isArguments = isArgs(object),
theKeys = [];
if (!isObject && !isFunction && !isArguments) {
throw new TypeError("Object.keys called on a non-object");
}
if (isArguments) {
forEach(object, function (value) {
theKeys.push(value);
});
} else {
var name,
skipProto = hasProtoEnumBug && isFunction;
for (name in object) {
if (!(skipProto && name === 'prototype') && has.call(object, name)) {
theKeys.push(name);
}
}
}
if (hasDontEnumBug) {
var ctor = object.constructor,
skipConstructor = ctor && ctor.prototype === object;
forEach(dontEnums, function (dontEnum) {
if (!(skipConstructor && dontEnum === 'constructor') && has.call(object, dontEnum)) {
theKeys.push(dontEnum);
}
});
}
return theKeys;
};
module.exports = keysShim;
}());
},{"./foreach":109,"./isArguments":111}],113:[function(require,module,exports){
>>>>>>>
},{}],108:[function(require,module,exports){
<<<<<<<
},{}],104:[function(require,module,exports){
=======
},{}],114:[function(require,module,exports){
>>>>>>>
},{}],109:[function(require,module,exports){
<<<<<<<
},{}],105:[function(require,module,exports){
=======
},{}],115:[function(require,module,exports){
>>>>>>>
},{}],110:[function(require,module,exports){
<<<<<<<
},{"../source/gist":121,"../source/github":122,"../source/local":123,"clone":12,"xtend":102}],106:[function(require,module,exports){
=======
},{"../source/gist":131,"../source/github":132,"../source/local":133,"clone":12,"xtend":108}],116:[function(require,module,exports){
>>>>>>>
},{"../source/gist":126,"../source/github":127,"../source/local":128,"clone":12,"xtend":107}],111:[function(require,module,exports){
<<<<<<<
},{"../lib/zoomextent":117,"../ui/flash":127,"qs-hash":32}],107:[function(require,module,exports){
=======
},{"../lib/zoomextent":127,"../ui/flash":137,"qs-hash":37}],117:[function(require,module,exports){
>>>>>>>
},{"../lib/zoomextent":122,"../ui/flash":132,"qs-hash":37}],112:[function(require,module,exports){
<<<<<<<
},{"../lib/zoomextent":117,"qs-hash":32}],108:[function(require,module,exports){
=======
},{"../lib/zoomextent":127,"qs-hash":37}],118:[function(require,module,exports){
>>>>>>>
},{"../lib/zoomextent":122,"qs-hash":37}],113:[function(require,module,exports){
<<<<<<<
},{"../config.js":103}],109:[function(require,module,exports){
=======
},{"../config.js":113}],119:[function(require,module,exports){
>>>>>>>
},{"../config.js":108}],114:[function(require,module,exports){
<<<<<<<
},{"qs-hash":32,"xtend":102}],110:[function(require,module,exports){
=======
},{"qs-hash":37,"xtend":108}],120:[function(require,module,exports){
>>>>>>>
},{"qs-hash":37,"xtend":107}],115:[function(require,module,exports){
<<<<<<<
},{"../config.js":103}],111:[function(require,module,exports){
=======
},{"../config.js":113}],121:[function(require,module,exports){
>>>>>>>
},{"../config.js":108}],116:[function(require,module,exports){
<<<<<<<
},{"./core/api":104,"./core/data":105,"./core/loader":106,"./core/recovery":107,"./core/repo":108,"./core/router":109,"./core/user":110,"./ui":124,"./ui/map":129,"store":67}],112:[function(require,module,exports){
=======
},{"./core/api":114,"./core/data":115,"./core/loader":116,"./core/recovery":117,"./core/repo":118,"./core/router":119,"./core/user":120,"./ui":134,"./ui/map":139,"store":72}],122:[function(require,module,exports){
>>>>>>>
},{"./core/api":109,"./core/data":110,"./core/loader":111,"./core/recovery":112,"./core/repo":113,"./core/router":114,"./core/user":115,"./ui":129,"./ui/map":134,"store":72}],117:[function(require,module,exports){
<<<<<<<
},{"leaflet-hash":28,"qs-hash":32}],113:[function(require,module,exports){
=======
},{"leaflet-hash":33,"qs-hash":37}],123:[function(require,module,exports){
>>>>>>>
},{"leaflet-hash":33,"qs-hash":37}],118:[function(require,module,exports){
<<<<<<<
},{}],114:[function(require,module,exports){
=======
},{}],124:[function(require,module,exports){
>>>>>>>
},{}],119:[function(require,module,exports){
<<<<<<<
},{"csv2geojson":13,"osmtogeojson":30,"polytogeojson":31,"togeojson":68,"topojson":"BOmyIj"}],115:[function(require,module,exports){
=======
},{"csv2geojson":13,"osmtogeojson":35,"polytogeojson":36,"togeojson":73,"topojson":"BOmyIj"}],125:[function(require,module,exports){
>>>>>>>
},{"csv2geojson":13,"osmtogeojson":35,"polytogeojson":36,"togeojson":73,"topojson":"BOmyIj"}],120:[function(require,module,exports){
<<<<<<<
},{}],116:[function(require,module,exports){
=======
},{}],126:[function(require,module,exports){
>>>>>>>
},{}],121:[function(require,module,exports){
<<<<<<<
},{"geojsonhint":20}],117:[function(require,module,exports){
=======
},{"geojsonhint":20}],127:[function(require,module,exports){
>>>>>>>
},{"geojsonhint":20}],122:[function(require,module,exports){
<<<<<<<
},{}],118:[function(require,module,exports){
=======
},{}],128:[function(require,module,exports){
>>>>>>>
},{}],123:[function(require,module,exports){
<<<<<<<
},{"buffer":6,"fs":1}],119:[function(require,module,exports){
=======
},{"buffer":6,"fs":1}],129:[function(require,module,exports){
>>>>>>>
},{"buffer":6,"fs":1}],124:[function(require,module,exports){
<<<<<<<
},{"../lib/validate":116,"../lib/zoomextent":117,"../ui/saver.js":133}],120:[function(require,module,exports){
=======
},{"../lib/validate":126,"../lib/zoomextent":127,"../ui/saver.js":143}],130:[function(require,module,exports){
>>>>>>>
},{"../lib/validate":121,"../lib/zoomextent":122,"../ui/saver.js":138}],125:[function(require,module,exports){
<<<<<<<
},{"../lib/smartzoom.js":115,"d3-metatable":16}],121:[function(require,module,exports){
=======
},{"../lib/smartzoom.js":125,"d3-metatable":16}],131:[function(require,module,exports){
>>>>>>>
},{"../lib/smartzoom.js":120,"d3-metatable":16}],126:[function(require,module,exports){
<<<<<<<
},{"fs":1}],122:[function(require,module,exports){
=======
},{"fs":1}],132:[function(require,module,exports){
>>>>>>>
},{"fs":1}],127:[function(require,module,exports){
<<<<<<<
},{}],123:[function(require,module,exports){
=======
},{}],133:[function(require,module,exports){
>>>>>>>
},{}],128:[function(require,module,exports){
<<<<<<<
},{}],124:[function(require,module,exports){
=======
},{}],134:[function(require,module,exports){
>>>>>>>
},{}],129:[function(require,module,exports){
<<<<<<<
},{"./ui/dnd":125,"./ui/file_bar":126,"./ui/layer_switch":128,"./ui/mode_buttons":132,"./ui/user":135}],125:[function(require,module,exports){
=======
},{"./ui/dnd":135,"./ui/file_bar":136,"./ui/layer_switch":138,"./ui/mode_buttons":142,"./ui/user":145}],135:[function(require,module,exports){
>>>>>>>
},{"./ui/dnd":130,"./ui/file_bar":131,"./ui/layer_switch":133,"./ui/mode_buttons":137,"./ui/user":140}],130:[function(require,module,exports){
<<<<<<<
},{"../lib/readfile.js":114,"../lib/zoomextent":117,"./flash.js":127}],126:[function(require,module,exports){
=======
},{"../lib/readfile.js":124,"../lib/zoomextent":127,"./flash.js":137}],136:[function(require,module,exports){
>>>>>>>
},{"../lib/readfile.js":119,"../lib/zoomextent":122,"./flash.js":132}],131:[function(require,module,exports){
<<<<<<<
},{"../lib/readfile":114,"../lib/zoomextent":117,"../ui/saver.js":133,"./flash":127,"./modal.js":131,"./share":134,"clone":12,"filesaver.js":17,"geojson2dsv":18,"gist-map-browser":22,"github-file-browser":24,"shp-write":33,"tokml":69,"topojson":"BOmyIj"}],127:[function(require,module,exports){
=======
},{"../lib/readfile":124,"../lib/zoomextent":127,"../ui/saver.js":143,"./flash":137,"./modal.js":141,"./share":144,"clone":12,"filesaver.js":17,"geojson2dsv":18,"gist-map-browser":22,"github-file-browser":24,"shp-write":38,"tokml":74,"topojson":"BOmyIj"}],137:[function(require,module,exports){
>>>>>>>
},{"../lib/readfile":119,"../lib/zoomextent":122,"../ui/saver.js":138,"./flash":132,"./modal.js":136,"./share":139,"clone":12,"filesaver.js":17,"geojson2dsv":18,"gist-map-browser":22,"github-file-browser":24,"shp-write":38,"tokml":74,"topojson":"BOmyIj"}],132:[function(require,module,exports){
<<<<<<<
},{"./message":130}],128:[function(require,module,exports){
=======
},{"./message":140}],138:[function(require,module,exports){
>>>>>>>
},{"./message":135}],133:[function(require,module,exports){
<<<<<<<
},{}],129:[function(require,module,exports){
=======
},{}],139:[function(require,module,exports){
>>>>>>>
},{}],134:[function(require,module,exports){
<<<<<<<
},{"../lib/custom_hash.js":112,"../lib/popup":113,"qs-hash":32}],130:[function(require,module,exports){
=======
},{"../lib/custom_hash.js":122,"../lib/popup":123,"leaflet-geodesy":28,"qs-hash":37}],140:[function(require,module,exports){
>>>>>>>
},{"../lib/custom_hash.js":117,"../lib/popup":118,"leaflet-geodesy":28,"qs-hash":37}],135:[function(require,module,exports){
<<<<<<<
},{}],131:[function(require,module,exports){
=======
},{}],141:[function(require,module,exports){
>>>>>>>
},{}],136:[function(require,module,exports){
<<<<<<<
},{}],132:[function(require,module,exports){
=======
},{}],142:[function(require,module,exports){
>>>>>>>
},{}],137:[function(require,module,exports){
<<<<<<<
},{"../panel/help":118,"../panel/json":119,"../panel/table":120}],133:[function(require,module,exports){
=======
},{"../panel/help":128,"../panel/json":129,"../panel/table":130}],143:[function(require,module,exports){
>>>>>>>
},{"../panel/help":123,"../panel/json":124,"../panel/table":125}],138:[function(require,module,exports){
<<<<<<<
},{"./flash":127}],134:[function(require,module,exports){
=======
},{"./flash":137}],144:[function(require,module,exports){
>>>>>>>
},{"./flash":132}],139:[function(require,module,exports){
<<<<<<<
},{"../source/gist":121,"./modal":131}],135:[function(require,module,exports){
=======
},{"../source/gist":131,"./modal":141}],145:[function(require,module,exports){
>>>>>>>
},{"../source/gist":126,"./modal":136}],140:[function(require,module,exports){
<<<<<<<
},{}]},{},[111])
=======
},{}]},{},[121])
>>>>>>>
},{}]},{},[116]) |
<<<<<<<
map: file.content,
name: file.name,
path: [d.user.login, d.id].join('/'),
=======
map: mapFile(d),
path: [(d.user && d.user.login) || 'anonymous', d.id].join('/'),
>>>>>>>
map: file.content,
name: file.name,
path: [(d.user && d.user.login) || 'anonymous', d.id].join('/'), |
<<<<<<<
import Comments from './../comments/Comments';
=======
import PostActionButtons from './PostActionButtons';
>>>>>>>
import Comments from './../comments/Comments';
import PostActionButtons from './PostActionButtons';
<<<<<<<
<Comments postId={post.id} />
=======
{this.props.replies !== 'false' && post.children > 0 && <RepliesShort parent={post.author} parentPermlink={post.permlink} />}
>>>>>>>
<Comments postId={post.id} /> |
<<<<<<<
]
componentWillMount() {
this.props.getFeedContent({
sortBy: 'blog',
category: this.props.match.params.name,
limit: this.props.limit,
});
}
isFavorited() {
const { favorites } = this.props;
const username = this.props.match.params.name;
return username && favorites.includes(username);
}
=======
];
>>>>>>>
]
componentWillMount() {
this.props.getFeedContent({
sortBy: 'blog',
category: this.props.match.params.name,
limit: this.props.limit,
});
}
<<<<<<<
const { feed, posts, getMoreFeedContent, limit, auth } = this.props;
const username = this.props.match.params.name;
=======
const {
feed,
posts,
auth,
user,
match,
limit,
getFeedContent,
getMoreFeedContent,
} = this.props;
const username = match.params.name;
>>>>>>>
const { feed, posts, getMoreFeedContent, limit, auth } = this.props;
const username = this.props.match.params.name;
<<<<<<<
const loadMoreContentAction = () => getMoreFeedContent({
sortBy: 'blog',
category: username,
limit
});
const user = this.props.user;
const jsonMetadata = user.json_metadata || {};
=======
const loadContentAction = () =>
getFeedContent({
sortBy: 'blog',
category: username,
limit,
});
const loadMoreContentAction = () =>
getMoreFeedContent({
sortBy: 'blog',
category: username,
limit,
});
>>>>>>>
const loadMoreContentAction = () => getMoreFeedContent({
sortBy: 'blog',
category: username,
limit,
});
const user = this.props.user; |
<<<<<<<
=======
import PostSinglePage from './PostSinglePage';
import Comments from '../../comments/Comments';
import PostSingleModal from './PostSingleModal';
>>>>>>>
<<<<<<<
=======
// static defaultProps = {
// modal: false,
// contentList: [],
// modalResetScroll: () => null
// };
state = {
commentsVisible: false,
}
>>>>>>>
state = {
commentsVisible: false,
}
<<<<<<<
(loading && !pendingLikes.filter(post => post === content.id) > 0)
? <Loading />
: <StoryFull
post={content}
postState={postState}
pendingLike={pendingLikes.includes(content.id)}
pendingFollow={pendingFollows.includes(content.author)}
onFollowClick={this.handleFollowClick}
onSaveClick={() => toggleBookmark(content.id, content.author, content.permlink)}
onReportClick={reportPost}
onLikeClick={likePost}
onCommentClick={() => {}}
onShareClick={() => reblog(content.id)}
/>
=======
(loading && !pendingLikes.filter(post => post === content.id) > 0) ? <Loading /> :
<StoryFull
post={content}
postState={postState}
commentCount={content.children}
pendingLike={pendingLikes.includes(content.id)}
pendingFollow={pendingFollows.includes(content.author)}
onFollowClick={this.handleFollowClick}
onSaveClick={() => toggleBookmark(content.id, content.author, content.permlink)}
onReportClick={reportPost}
onLikeClick={likePost}
onCommentClick={() => console.log('Comment click')}
onShareClick={() => reblog(content.id)}
/>
>>>>>>>
(loading && !pendingLikes.filter(post => post === content.id) > 0)
? <Loading />
: <StoryFull
post={content}
postState={postState}
commentCount={content.children}
pendingLike={pendingLikes.includes(content.id)}
pendingFollow={pendingFollows.includes(content.author)}
onFollowClick={this.handleFollowClick}
onSaveClick={() => toggleBookmark(content.id, content.author, content.permlink)}
onReportClick={reportPost}
onLikeClick={likePost}
onCommentClick={() => {}}
onShareClick={() => reblog(content.id)}
/> |
<<<<<<<
import notificationReducer from './notification/notificationReducers';
=======
import favoritesReducer from './favorites/favoritesReducer';
>>>>>>>
import notificationReducer from './notification/notificationReducers';
import favoritesReducer from './favorites/favoritesReducer';
<<<<<<<
notifications: notificationReducer,
=======
favorites: favoritesReducer,
>>>>>>>
notifications: notificationReducer,
favorites: favoritesReducer, |
<<<<<<<
case "UNFREEZEASSETCONTRACT":
return <UnfreezeAssetContract contract={contract}></UnfreezeAssetContract>;
case "UPDATEASSETCONTRACT":
return <UpdateAssetContract contract={contract}></UpdateAssetContract>;
=======
case "UPDATESETTINGCONTRACT":
return <UpdateSettingContract contract={contract}/>;
case "EXCHANGECREATECONTRACT":
return <ExchangeCreateContract contract={contract}/>
>>>>>>>
case "UNFREEZEASSETCONTRACT":
return <UnfreezeAssetContract contract={contract}></UnfreezeAssetContract>;
case "UPDATEASSETCONTRACT":
return <UpdateAssetContract contract={contract}></UpdateAssetContract>;
case "UPDATESETTINGCONTRACT":
return <UpdateSettingContract contract={contract}/>;
case "EXCHANGECREATECONTRACT":
return <ExchangeCreateContract contract={contract}/> |
<<<<<<<
var val = (option.val || option.val === 0) ? option.val : '';
itemHtml += ('<input type="radio" name="'+self.id+'" value="'+val+'" id="'+self.id+'-'+index+'" />')
itemHtml += ('<label for="'+self.id+'-'+index+'">'+option.label+'</label>')
=======
var val = option.val ? option.val : '';
itemHtml += ('<input type="radio" name="'+self.id+'" value="'+val+'" id="'+self.id+'-'+index+'" />');
itemHtml += ('<label for="'+self.id+'-'+index+'">'+option.label+'</label>');
>>>>>>>
var val = (option.val || option.val === 0) ? option.val : '';
itemHtml += ('<input type="radio" name="'+self.id+'" value="'+val+'" id="'+self.id+'-'+index+'" />');
itemHtml += ('<label for="'+self.id+'-'+index+'">'+option.label+'</label>');
<<<<<<<
var val = (option.val || option.val === 0) ? option.val : '';
itemHtml += ('<input type="checkbox" name="'+self.id+'" value="'+val+'" id="'+self.id+'-'+index+'" />')
itemHtml += ('<label for="'+self.id+'-'+index+'">'+option.label+'</label>')
=======
var val = option.val ? option.val : '';
itemHtml += ('<input type="checkbox" name="'+self.id+'" value="'+val+'" id="'+self.id+'-'+index+'" />');
itemHtml += ('<label for="'+self.id+'-'+index+'">'+option.label+'</label>');
>>>>>>>
var val = (option.val || option.val === 0) ? option.val : '';
itemHtml += ('<input type="checkbox" name="'+self.id+'" value="'+val+'" id="'+self.id+'-'+index+'" />');
itemHtml += ('<label for="'+self.id+'-'+index+'">'+option.label+'</label>'); |
<<<<<<<
const { comment, likeComment, unlikeComment, dislikeComment, auth, allComments } = this.props;
=======
const { comment, likeComment, unlikeComment, auth, allComments, sortOrder } = this.props;
>>>>>>>
const { comment, likeComment, unlikeComment, dislikeComment, auth, allComments, sortOrder } = this.props; |
<<<<<<<
import ProfileTooltipOrigin from '../../user/profileTooltip/ProfileTooltipOrigin';
=======
import { calculatePayout } from '../../helpers/steemitHelpers';
>>>>>>>
import ProfileTooltipOrigin from '../../user/profileTooltip/ProfileTooltipOrigin';
import { calculatePayout } from '../../helpers/steemitHelpers';
<<<<<<<
{ post.first_reblogged_by &&
<div className="PostFeedCard__cell PostFeedCard__cell--top">
<ul>
<li>
<Icon name="repeat" sm />
{ ' Reblogged by ' }
<ProfileTooltipOrigin username={post.first_reblogged_by} >
<Link to={`/@${post.first_reblogged_by}`}>@{post.first_reblogged_by}</Link>
</ProfileTooltipOrigin>
</li>
</ul>
</div>
=======
{post.first_reblogged_by &&
<div className="PostFeedCard__cell PostFeedCard__cell--top">
<ul>
<li>
<Icon name="repeat" sm />
{' Reblogged by '}
<Link to={`/@${post.first_reblogged_by}`}>@{post.first_reblogged_by}</Link>
</li>
</ul>
</div>
>>>>>>>
{ post.first_reblogged_by &&
<div className="PostFeedCard__cell PostFeedCard__cell--top">
<ul>
<li>
<Icon name="repeat" sm />
{' Reblogged by '}
<ProfileTooltipOrigin username={post.first_reblogged_by} >
<Link to={`/@${post.first_reblogged_by}`}>@{post.first_reblogged_by}</Link>
</ProfileTooltipOrigin>
</li>
</ul>
</div>
<<<<<<<
<ProfileTooltipOrigin username={post.author} >
<Link to={`/@${post.author}`}>
<Avatar xs username={post.author} />
{ ` @${post.author}` }
</Link>
</ProfileTooltipOrigin>
=======
<Link to={`/@${post.author}`}>
<Avatar xs username={post.author} />
{` @${post.author}`}
</Link>
>>>>>>>
<ProfileTooltipOrigin username={post.author} >
<Link to={`/@${post.author}`}>
<Avatar xs username={post.author} />
{ ` @${post.author}` }
</Link>
</ProfileTooltipOrigin> |
<<<<<<<
this.props.login();
=======
if (Cookie.get('access_token')) {
this.props.login();
}
this.props.getConfig();
>>>>>>>
if (Cookie.get('access_token')) {
this.props.login();
} |
<<<<<<<
import { FormattedRelative } from 'react-intl';
import _ from 'lodash';
import numeral from 'numeral';
=======
import { FormattedMessage, FormattedRelative } from 'react-intl';
import _ from 'lodash';
>>>>>>>
import { FormattedMessage, FormattedRelative } from 'react-intl';
import _ from 'lodash';
import numeral from 'numeral';
<<<<<<<
import { calculatePayout } from '../../helpers/steemitHelpers';
=======
>>>>>>>
import { calculatePayout } from '../../helpers/steemitHelpers';
<<<<<<<
{' '}in <Link to={`/hot/${post.category}`}>#{post.category}</Link>
=======
{ ' ' }<FormattedMessage id="in" />{ ' ' }
<Link to={`/hot/${post.category}`}>#{post.category}</Link>
>>>>>>>
{ ' ' }<FormattedMessage id="in" />{ ' ' }
<Link to={`/hot/${post.category}`}>#{post.category}</Link> |
<<<<<<<
STEEMCONNECT_HOST: JSON.stringify(process.env.STEEMCONNECT_HOST || 'https://v2.steemconnect.com'),
STEEMCONNECT_REDIRECT_URL: JSON.stringify(process.env.STEEMCONNECT_REDIRECT_URL || 'https://busy.org/callback'),
WS: JSON.stringify(process.env.WS || 'wss://steemd.steemit.com'),
=======
STEEMCONNECT_HOST: JSON.stringify(process.env.STEEMCONNECT_HOST || 'https://steemconnect.com'),
STEEMCONNECT_REDIRECT_URL: JSON.stringify(process.env.STEEMCONNECT_REDIRECT_URL || 'https://busy.org'),
WS: JSON.stringify(process.env.WS || 'wss://steemd-int.steemit.com'),
>>>>>>>
STEEMCONNECT_HOST: JSON.stringify(process.env.STEEMCONNECT_HOST || 'https://v2.steemconnect.com'),
STEEMCONNECT_REDIRECT_URL: JSON.stringify(process.env.STEEMCONNECT_REDIRECT_URL || 'https://busy.org/callback'),
WS: JSON.stringify(process.env.WS || 'wss://steemd-int.steemit.com'), |
<<<<<<<
let body = striptags(remarkable.render(striptags(decodeEntities(props.body))));
body = body.replace(/(?:https?|ftp):\/\/[\n\S]+/g, '');
=======
let body = striptags(remarkable.render(decodeEntities(props.body)));
body = body.replace(/(?:https?|ftp):\/\/[\S]+/g, '');
>>>>>>>
let body = striptags(remarkable.render(striptags(decodeEntities(props.body))));
body = body.replace(/(?:https?|ftp):\/\/[\S]+/g, ''); |
<<<<<<<
import * as commentsActions from './../comments/commentsActions';
=======
import { toggleBookmark } from './../bookmarks/bookmarksActions';
>>>>>>>
import * as commentsActions from './../comments/commentsActions';
import { toggleBookmark } from './../bookmarks/bookmarksActions';
<<<<<<<
openCommentingDraft: bindActionCreators(commentsActions.openCommentingDraft, dispatch),
closeCommentingDraft: bindActionCreators(commentsActions.closeCommentingDraft, dispatch),
=======
toggleBookmark: (postId) => dispatch(
toggleBookmark({ postId })
),
>>>>>>>
openCommentingDraft: bindActionCreators(commentsActions.openCommentingDraft, dispatch),
closeCommentingDraft: bindActionCreators(commentsActions.closeCommentingDraft, dispatch),
toggleBookmark: (postId) => dispatch(
toggleBookmark({ postId })
),
<<<<<<<
const { account, category, sortBy, path, auth, feed, posts } = this.props;
const { openCommentingDraft, closeCommentingDraft } = this.props;
=======
const { account, category, sortBy, path, auth, feed, posts, limit, bookmarks } = this.props;
>>>>>>>
const { account, category, sortBy, path, auth, feed, posts, limit, bookmarks } = this.props;
const { openCommentingDraft, closeCommentingDraft } = this.props;
<<<<<<<
openCommentingDraft={openCommentingDraft}
closeCommentingDraft={closeCommentingDraft}
=======
toggleBookmark={this.props.toggleBookmark}
bookmarks={this.props.bookmarks}
>>>>>>>
openCommentingDraft={openCommentingDraft}
closeCommentingDraft={closeCommentingDraft}
toggleBookmark={this.props.toggleBookmark}
bookmarks={bookmarks} |
<<<<<<<
const FavoriteCategoryButton = ({ children, onClick, isFavorited, intl }) =>
<TooltipOrigin
content={intl.formatMessage({ id: '@tooltip_add_fav' })}
active={!isFavorited}
>
<a
className={isFavorited ? 'FavoriteButton FavoriteButton--active' : 'FavoriteButton'}
onClick={onClick}
>
<Icon name={isFavorited ? 'star' : 'star_border'} sm />
{ children && ' ' }
{ children }
</a>
</TooltipOrigin>;
=======
const FavoriteCategoryButton = ({ children, onClick, isFavorited }) =>
<a className={isFavorited ? 'FavoriteButton FavoriteButton--active' : 'FavoriteButton'} onClick={onClick}>
{ children }
{ children && ' ' }
<Icon name={isFavorited ? 'star' : 'star_border'} sm />
</a>;
>>>>>>>
const FavoriteCategoryButton = ({ children, onClick, isFavorited, intl }) =>
<TooltipOrigin
content={intl.formatMessage({ id: '@tooltip_add_fav' })}
active={!isFavorited}
>
<a
className={isFavorited ? 'FavoriteButton FavoriteButton--active' : 'FavoriteButton'}
onClick={onClick}
>
{ children }
{ children && ' ' }
<Icon name={isFavorited ? 'star' : 'star_border'} sm />
</a>
</TooltipOrigin>; |
<<<<<<<
export default React.createClass({
=======
function decodeEntities(body) {
return body.replace(/</g, '<').replace(/>/g, '>');
}
module.exports = React.createClass({
>>>>>>>
function decodeEntities(body) {
return body.replace(/</g, '<').replace(/>/g, '>');
}
export default React.createClass({ |
<<<<<<<
import { LocaleProvider } from 'antd';
import enUS from 'antd/lib/locale-provider/en_US';
=======
import { history } from './routes';
>>>>>>>
import { LocaleProvider } from 'antd';
import enUS from 'antd/lib/locale-provider/en_US';
import { history } from './routes';
<<<<<<<
}
</LocaleProvider>
=======
</AppContainer>
:
<Component
history={history}
onUpdate={logPageView}
/>
}
>>>>>>>
}
</LocaleProvider> |
<<<<<<<
<ScrollToTopOnMount />
{user && <UserHero auth={auth} user={user} username={displayedUsername} isSameUser={isSameUser} />}
=======
{user &&
<UserHero
auth={auth}
user={user}
username={displayedUsername}
isSameUser={isSameUser}
isFollowed={isFollowed}
pendingFollow={pendingFollow}
onFollowClick={this.handleFollowClick}
/>
}
>>>>>>>
<ScrollToTopOnMount />
{user &&
<UserHero
auth={auth}
user={user}
username={displayedUsername}
isSameUser={isSameUser}
isFollowed={isFollowed}
pendingFollow={pendingFollow}
onFollowClick={this.handleFollowClick}
/>
} |
<<<<<<<
import { Link } from 'react-router-dom';
import './SidebarBlock.less';
=======
import './SignUp.less';
>>>>>>>
import './SidebarBlock.less';
<<<<<<<
<Link to="#signup">
<button className="SidebarBlock__button">
=======
<a target="_blank" rel="noopener noreferrer" href="https://steemit.com/pick_account">
<button className="SignUp__button">
>>>>>>>
<a target="_blank" rel="noopener noreferrer" href="https://steemit.com/pick_account">
<button className="SidebarBlock__button"> |
<<<<<<<
<Popover
placement="bottomRight"
trigger="click"
content={
<PopoverMenu onSelect={this.handleClick} bold={false}>
<PopoverMenuItem key="follow" disabled={pendingFollow}>
{pendingFollow ? <Icon type="loading" /> : <i className="iconfont icon-people" />}
{followText}
</PopoverMenuItem>
<PopoverMenuItem key="save">
{pendingBookmark ? <Icon type="loading" /> : <i className="iconfont icon-collection" />}
<FormattedMessage id={postState.isSaved ? 'unsave_post' : 'save_post'} defaultMessage={postState.isSaved ? 'Unsave post' : 'Save post'} />
</PopoverMenuItem>
<PopoverMenuItem key="report">
<i className="iconfont icon-flag" />
<FormattedMessage id="report_post" defaultMessage="Report post" />
</PopoverMenuItem>
</PopoverMenu>
}
>
<i className="iconfont icon-unfold Story__more" />
</Popover>
<div className="Story__header">
<Link to={`/@${post.author}`}>
<Avatar username={post.author} size={40} />
</Link>
<div className="Story__header__text">
=======
{rebloggedUI}
<div className="Story__content">
<Popover
placement="bottomRight"
trigger="click"
content={
<PopoverMenu onSelect={this.handleClick} bold={false}>
<PopoverMenuItem key="follow" disabled={pendingFollow}>
{pendingFollow ? <Icon type="loading" /> : <i className="iconfont icon-people" />}
{followText}
</PopoverMenuItem>
<PopoverMenuItem key="save">
<i className="iconfont icon-collection" />
<FormattedMessage id={postState.isSaved ? 'unsave_post' : 'save_post'} defaultMessage={postState.isSaved ? 'Unsave post' : 'Save post'} />
</PopoverMenuItem>
<PopoverMenuItem key="report">
<i className="iconfont icon-flag" />
<FormattedMessage id="report_post" defaultMessage="Report post" />
</PopoverMenuItem>
</PopoverMenu>
}
>
<i className="iconfont icon-unfold Story__more" />
</Popover>
<div className="Story__header">
>>>>>>>
{rebloggedUI}
<div className="Story__content">
<Popover
placement="bottomRight"
trigger="click"
content={
<PopoverMenu onSelect={this.handleClick} bold={false}>
<PopoverMenuItem key="follow" disabled={pendingFollow}>
{pendingFollow ? <Icon type="loading" /> : <i className="iconfont icon-people" />}
{followText}
</PopoverMenuItem>
<PopoverMenuItem key="save">
{pendingBookmark ? <Icon type="loading" /> : <i className="iconfont icon-collection" />}
<FormattedMessage id={postState.isSaved ? 'unsave_post' : 'save_post'} defaultMessage={postState.isSaved ? 'Unsave post' : 'Save post'} />
</PopoverMenuItem>
<PopoverMenuItem key="report">
<i className="iconfont icon-flag" />
<FormattedMessage id="report_post" defaultMessage="Report post" />
</PopoverMenuItem>
</PopoverMenu>
}
>
<i className="iconfont icon-unfold Story__more" />
</Popover>
<div className="Story__header"> |
<<<<<<<
{
(user.isFetching) ? <UserHeaderLoading />
: <UserHeader
authenticated={authenticated}
username={username}
handle={user.name}
userReputation={user.reputation}
isSameUser={isSameUser}
isFollowed={isFollowed}
pendingFollow={pendingFollow}
onFollowClick={onFollowClick}
/>
}
=======
<UserHeader
authenticated={authenticated}
username={username}
handle={user.name}
userReputation={user.reputation}
rank={getUserRank(user.vesting_shares)}
isSameUser={isSameUser}
isFollowed={isFollowed}
pendingFollow={pendingFollow}
onFollowClick={onFollowClick}
/>
>>>>>>>
{
(user.isFetching) ? <UserHeaderLoading />
: <UserHeader
authenticated={authenticated}
username={username}
handle={user.name}
userReputation={user.reputation}
rank={getUserRank(user.vesting_shares)}
isSameUser={isSameUser}
isFollowed={isFollowed}
pendingFollow={pendingFollow}
onFollowClick={onFollowClick}
/>
} |
<<<<<<<
var targetDir = configDir + '/credentials',
=======
console.log('CONFIG DIR IS ', configDir);
var targetDir = path.resolve(configDir + '/credentials'),
>>>>>>>
var targetDir = path.resolve(configDir + '/credentials'),
<<<<<<<
fs.mkdirSync(targetDir, 0755);
=======
console.log('TARGET DIR IS ', targetDir);
>>>>>>>
fs.mkdirSync(targetDir, 0755); |
<<<<<<<
var url = api.settings.url.home, args = {};
=======
var url = api.settings.url.home,
args = {};
>>>>>>>
var url = api.settings.url.home, args = {};
<<<<<<<
// @todo Also remove all postmeta settings for this post?
api.remove( section.id );
delete component.fetchedPosts[ section.params.post_id ];
=======
if ( 'page' === section.params.post_type ) {
section.purgeStaticPageDropDown( section.params.post_id );
}
>>>>>>>
// @todo Also remove all postmeta settings for this post?
api.remove( section.id );
delete component.fetchedPosts[ section.params.post_id ];
if ( 'page' === section.params.post_type ) {
section.purgeStaticPageDropDown( section.params.post_id );
} |
<<<<<<<
post_content: editor && ! editor.isHidden() ? wp.editor.removep( editor.getContent() ) : $( '#content' ).val(),
post_author: $( '#post_author_override' ).val()
=======
post_content: editor && ! editor.isHidden() ? wp.editor.removep( editor.getContent() ) : $( '#content' ).val(),
post_excerpt: $( '#excerpt' ).val()
>>>>>>>
post_content: editor && ! editor.isHidden() ? wp.editor.removep( editor.getContent() ) : $( '#content' ).val(),
post_excerpt: $( '#excerpt' ).val(),
post_author: $( '#post_author_override' ).val()
<<<<<<<
$( '#post_author_override' ).val( data[ postSettingId ].post_author ).trigger( 'change' );
=======
$( '#excerpt' ).val( data[ postSettingId ].post_excerpt ).trigger( 'change' );
>>>>>>>
$( '#excerpt' ).val( data[ postSettingId ].post_excerpt ).trigger( 'change' );
$( '#post_author_override' ).val( data[ postSettingId ].post_author ).trigger( 'change' ); |
<<<<<<<
=======
.option('--force-ssl', 'enforce access via https. default is false.')
.option('BASIC_AUTH_USER', 'user name of basic authentication. define with env.')
.option('BASIC_AUTH_PASS', 'password of basic authentication. define with env.')
.option('GRIDFS', 'Set "true" when useing gridfs. define with env.')
>>>>>>>
.option('--force-ssl', 'enforce access via https. default is false.') |
<<<<<<<
"freeze_balance_limit":"残高が不足しています。再入力してください",
/*
##################################################################################
# #
# SR rewards #
# #
##################################################################################
*/
"SR_set_brokerage":"有権者褒賞レート",
"SR_brokerage_save_tip":"各投票ラウンドの後に、投票者の報酬が最新のレート設定に基づいて割り当てられます",
"SR_brokerage_save":"保存",
"SR_brokerage_save_verify":"0~100までの数値を入力してください",
"SR_reward_available":"受け取り可能",
"SR_set_github_learn_more":"更に知る",
"SR_vote_for_reward":"褒賞に投票",
"SR_receive_award_btn":"褒賞を受け取る",
"SR_receive_award_tip1":"収集出来ません，",
"SR_receive_award_tip2":"24時間以内に一度しか受け取れません",
"SR_brokerage_save_result": "投票者の共有を保存しました！",
"successfully_brokerage_save": "设置选民分成比例成功",
"could_not_brokerage_save": "割合を正しく共有するように有権者を設定する",
"brokerage_save_error_message": "有権者分割比を設定しようとして問題が発生しました。後でもう一度やり直してください。",
"rewards_claimed_submitted":"トランザクションは提出されました",
"rewards_claimed_hash":"トランザクションハッシュ値(txid）",
"rewards_claimed_hash_await":"取引が確認された後、アカウントページで表紙可能",
"voting_brokerage":"有権者の褒賞率",
"voting_brokerage_tip":"SRの有権者に分配される報酬の割合。投票者の報酬= SRの報酬*投票者の報酬率*（投票者の投票/ SRのすべての投票）。",
"SR_set_brokerage_contract":"スーパー代表がボーナス分配率を設定します",
"countdown_to_voting":"この投票ラウンドの終わりまでのカウントダウン",
=======
"freeze_balance_limit":"残高が不足しています。再入力してください",
"total_tron_ecosystem_tokens":"Total TRON-ecosystem tokens:",
"number_of_lists":"Number of lists:",
"total_in_tronscan":"Total in tronscan:"
>>>>>>>
"freeze_balance_limit":"残高が不足しています。再入力してください",
/*
##################################################################################
# #
# SR rewards #
# #
##################################################################################
*/
"SR_set_brokerage":"有権者褒賞レート",
"SR_brokerage_save_tip":"各投票ラウンドの後に、投票者の報酬が最新のレート設定に基づいて割り当てられます",
"SR_brokerage_save":"保存",
"SR_brokerage_save_verify":"0~100までの数値を入力してください",
"SR_reward_available":"受け取り可能",
"SR_set_github_learn_more":"更に知る",
"SR_vote_for_reward":"褒賞に投票",
"SR_receive_award_btn":"褒賞を受け取る",
"SR_receive_award_tip1":"収集出来ません，",
"SR_receive_award_tip2":"24時間以内に一度しか受け取れません",
"SR_brokerage_save_result": "投票者の共有を保存しました！",
"successfully_brokerage_save": "设置选民分成比例成功",
"could_not_brokerage_save": "割合を正しく共有するように有権者を設定する",
"brokerage_save_error_message": "有権者分割比を設定しようとして問題が発生しました。後でもう一度やり直してください。",
"rewards_claimed_submitted":"トランザクションは提出されました",
"rewards_claimed_hash":"トランザクションハッシュ値(txid）",
"rewards_claimed_hash_await":"取引が確認された後、アカウントページで表紙可能",
"voting_brokerage":"有権者の褒賞率",
"voting_brokerage_tip":"SRの有権者に分配される報酬の割合。投票者の報酬= SRの報酬*投票者の報酬率*（投票者の投票/ SRのすべての投票）。",
"SR_set_brokerage_contract":"スーパー代表がボーナス分配率を設定します",
"countdown_to_voting":"この投票ラウンドの終わりまでのカウントダウン",
"total_tron_ecosystem_tokens":"Total TRON-ecosystem tokens:",
"number_of_lists":"Number of lists:",
"total_in_tronscan":"Total in tronscan:" |
<<<<<<<
"sign_in_with_ledger":"LEDGER",
=======
"TRC20_under_maintenance":"TRC20 under maintenance",
"transaction_fewer_than_100000":"1. When there are fewer than 100,000 (including 100,000) transaction data entries, all the data will be displayed.",
"transaction_more_than_100000":"2. When there are more than 100,000 transaction data entries, data of the latest 7 days will be displayed. ",
>>>>>>>
"sign_in_with_ledger":"LEDGER",
"TRC20_under_maintenance":"TRC20 under maintenance",
"transaction_fewer_than_100000":"1. When there are fewer than 100,000 (including 100,000) transaction data entries, all the data will be displayed.",
"transaction_more_than_100000":"2. When there are more than 100,000 transaction data entries, data of the latest 7 days will be displayed. ", |
<<<<<<<
/* Tests_SRS_NODE_DEVICE_MQTT_18_025: [** If the `Mqtt` constructor receives a second parameter, it shall be used as a provider in place of mqtt. **]** */
it ('accepts an mqttProvider for testing', function() {
var provider = {};
var mqtt = new Mqtt(null, provider);
assert.equal(mqtt._mqtt.mqttprovider, provider);
});
});
describe('#sendMethodResponse', function() {
var MockMqttBase = {
client: {
publish: function(){}
}
};
// Tests_SRS_NODE_DEVICE_MQTT_13_001: [ sendMethodResponse shall throw an Error if response is falsy or does not conform to the shape defined by DeviceMethodResponse. ]
[
// response is falsy
null,
// response is falsy
undefined,
// response.requestId is falsy
{},
// response.requestId is not a string
{ requestId: 42 },
// response.requestId is an empty string
{ requestId: '' },
// response.properties is falsy
{ requestId: 'req1' },
// response.properties is not an object
{
requestId: 'req1',
properties: 42
},
// response.properties has empty string keys
{
requestId: 'req1',
properties: {
'': 'val1'
}
},
// response.properties has non-string values
{
requestId: 'req1',
properties: {
'k1': 42
}
},
// response.properties has empty string values
{
requestId: 'req1',
properties: {
'k1': ''
}
},
// response.status is falsy
{
requestId: 'req1',
properties: {
'k1': 'v1'
}
},
// response.status is not a number
{
requestId: 'req1',
properties: {
'k1': 'v1'
},
status: '200'
},
// response.bodyParts is falsy
{
requestId: 'req1',
properties: {
'k1': 'v1'
},
status: 200
},
// response.bodyParts.length is falsy
{
requestId: 'req1',
properties: {
'k1': 'v1'
},
status: 200,
bodyParts: {}
}
].forEach(function(response) {
it('throws an Error if response is falsy or is improperly constructed', function()
{
var mqtt = new Mqtt(fakeConfig);
assert.throws(function() {
mqtt.sendMethodResponse(response, null);
});
});
});
// Tests_SRS_NODE_DEVICE_MQTT_13_002: [ sendMethodResponse shall build an MQTT topic name in the format: $iothub/methods/res/<STATUS>/?$rid=<REQUEST ID>&<PROPERTIES> where <STATUS> is response.status. ]
// Tests_SRS_NODE_DEVICE_MQTT_13_003: [ sendMethodResponse shall build an MQTT topic name in the format: $iothub/methods/res/<STATUS>/?$rid=<REQUEST ID>&<PROPERTIES> where <REQUEST ID> is response.requestId. ]
// Tests_SRS_NODE_DEVICE_MQTT_13_004: [ sendMethodResponse shall build an MQTT topic name in the format: $iothub/methods/res/<STATUS>/?$rid=<REQUEST ID>&<PROPERTIES> where <PROPERTIES> is URL encoded. ]
it('formats MQTT topic with status code', function() {
// setup
var mqtt = new Mqtt(fakeConfig);
var spy = sinon.spy(MockMqttBase.client, 'publish');
mqtt._mqtt = MockMqttBase;
// test
mqtt.sendMethodResponse({
requestId: 'req1',
status: 200,
payload: null
});
// assert
assert.isTrue(spy.calledOnce);
assert.strictEqual(spy.args[0][0], '$iothub/methods/res/200/?$rid=req1');
// cleanup
MockMqttBase.client.publish.restore();
});
// Tests_SRS_NODE_DEVICE_MQTT_13_006: [ If the MQTT publish fails then an error shall be returned via the done callback's first parameter. ]
it('calls callback with error when mqtt publish fails', function() {
// setup
var mqtt = new Mqtt(fakeConfig);
var stub = sinon.stub(MockMqttBase.client, 'publish')
.callsArgWith(3, new Error('No connection to broker'));
var callback = sinon.spy();
mqtt._mqtt = MockMqttBase;
// test
mqtt.sendMethodResponse({
requestId: 'req1',
status: 200,
payload: null
}, callback);
// assert
assert.isTrue(stub.calledOnce);
assert.isTrue(callback.calledOnce);
assert.isOk(callback.args[0][0]);
// cleanup
MockMqttBase.client.publish.restore();
});
// Tests_SRS_NODE_DEVICE_MQTT_13_007: [ If the MQTT publish is successful then the done callback shall be invoked passing null for the first parameter. ]
it('calls callback with null when mqtt publish succeeds', function() {
// setup
var mqtt = new Mqtt(fakeConfig);
var stub = sinon.stub(MockMqttBase.client, 'publish')
.callsArgWith(3, null);
var callback = sinon.spy();
mqtt._mqtt = MockMqttBase;
// test
mqtt.sendMethodResponse({
requestId: 'req1',
status: 200,
payload: null
}, callback);
// assert
assert.isTrue(stub.calledOnce);
assert.isTrue(callback.calledOnce);
assert.isNotOk(callback.args[0][0]);
// cleanup
MockMqttBase.client.publish.restore();
});
=======
/*Tests_SRS_NODE_DEVICE_MQTT_16_016: [The `Mqtt` constructor shall initialize the `uri` property of the `config` object to `mqtts://<host>`.]*/
it('sets the uri property to \'mqtts://<host>\'', function () {
var mqtt = new Mqtt(fakeConfig);
assert.strictEqual(mqtt._config.uri, 'mqtts://' + fakeConfig.host);
});
>>>>>>>
/* Tests_SRS_NODE_DEVICE_MQTT_18_025: [** If the `Mqtt` constructor receives a second parameter, it shall be used as a provider in place of mqtt. **]** */
it ('accepts an mqttProvider for testing', function() {
var provider = {};
var mqtt = new Mqtt(null, provider);
assert.equal(mqtt._mqtt.mqttprovider, provider);
});
});
describe('#sendMethodResponse', function() {
var MockMqttBase = {
client: {
publish: function(){}
}
};
// Tests_SRS_NODE_DEVICE_MQTT_13_001: [ sendMethodResponse shall throw an Error if response is falsy or does not conform to the shape defined by DeviceMethodResponse. ]
[
// response is falsy
null,
// response is falsy
undefined,
// response.requestId is falsy
{},
// response.requestId is not a string
{ requestId: 42 },
// response.requestId is an empty string
{ requestId: '' },
// response.properties is falsy
{ requestId: 'req1' },
// response.properties is not an object
{
requestId: 'req1',
properties: 42
},
// response.properties has empty string keys
{
requestId: 'req1',
properties: {
'': 'val1'
}
},
// response.properties has non-string values
{
requestId: 'req1',
properties: {
'k1': 42
}
},
// response.properties has empty string values
{
requestId: 'req1',
properties: {
'k1': ''
}
},
// response.status is falsy
{
requestId: 'req1',
properties: {
'k1': 'v1'
}
},
// response.status is not a number
{
requestId: 'req1',
properties: {
'k1': 'v1'
},
status: '200'
},
// response.bodyParts is falsy
{
requestId: 'req1',
properties: {
'k1': 'v1'
},
status: 200
},
// response.bodyParts.length is falsy
{
requestId: 'req1',
properties: {
'k1': 'v1'
},
status: 200,
bodyParts: {}
}
].forEach(function(response) {
it('throws an Error if response is falsy or is improperly constructed', function()
{
var mqtt = new Mqtt(fakeConfig);
assert.throws(function() {
mqtt.sendMethodResponse(response, null);
});
});
});
// Tests_SRS_NODE_DEVICE_MQTT_13_002: [ sendMethodResponse shall build an MQTT topic name in the format: $iothub/methods/res/<STATUS>/?$rid=<REQUEST ID>&<PROPERTIES> where <STATUS> is response.status. ]
// Tests_SRS_NODE_DEVICE_MQTT_13_003: [ sendMethodResponse shall build an MQTT topic name in the format: $iothub/methods/res/<STATUS>/?$rid=<REQUEST ID>&<PROPERTIES> where <REQUEST ID> is response.requestId. ]
// Tests_SRS_NODE_DEVICE_MQTT_13_004: [ sendMethodResponse shall build an MQTT topic name in the format: $iothub/methods/res/<STATUS>/?$rid=<REQUEST ID>&<PROPERTIES> where <PROPERTIES> is URL encoded. ]
it('formats MQTT topic with status code', function() {
// setup
var mqtt = new Mqtt(fakeConfig);
var spy = sinon.spy(MockMqttBase.client, 'publish');
mqtt._mqtt = MockMqttBase;
// test
mqtt.sendMethodResponse({
requestId: 'req1',
status: 200,
payload: null
});
// assert
assert.isTrue(spy.calledOnce);
assert.strictEqual(spy.args[0][0], '$iothub/methods/res/200/?$rid=req1');
// cleanup
MockMqttBase.client.publish.restore();
});
// Tests_SRS_NODE_DEVICE_MQTT_13_006: [ If the MQTT publish fails then an error shall be returned via the done callback's first parameter. ]
it('calls callback with error when mqtt publish fails', function() {
// setup
var mqtt = new Mqtt(fakeConfig);
var stub = sinon.stub(MockMqttBase.client, 'publish')
.callsArgWith(3, new Error('No connection to broker'));
var callback = sinon.spy();
mqtt._mqtt = MockMqttBase;
// test
mqtt.sendMethodResponse({
requestId: 'req1',
status: 200,
payload: null
}, callback);
// assert
assert.isTrue(stub.calledOnce);
assert.isTrue(callback.calledOnce);
assert.isOk(callback.args[0][0]);
// cleanup
MockMqttBase.client.publish.restore();
});
// Tests_SRS_NODE_DEVICE_MQTT_13_007: [ If the MQTT publish is successful then the done callback shall be invoked passing null for the first parameter. ]
it('calls callback with null when mqtt publish succeeds', function() {
// setup
var mqtt = new Mqtt(fakeConfig);
var stub = sinon.stub(MockMqttBase.client, 'publish')
.callsArgWith(3, null);
var callback = sinon.spy();
mqtt._mqtt = MockMqttBase;
// test
mqtt.sendMethodResponse({
requestId: 'req1',
status: 200,
payload: null
}, callback);
// assert
assert.isTrue(stub.calledOnce);
assert.isTrue(callback.calledOnce);
assert.isNotOk(callback.args[0][0]);
// cleanup
MockMqttBase.client.publish.restore();
});
/*Tests_SRS_NODE_DEVICE_MQTT_16_016: [The `Mqtt` constructor shall initialize the `uri` property of the `config` object to `mqtts://<host>`.]*/
it('sets the uri property to \'mqtts://<host>\'', function () {
var mqtt = new Mqtt(fakeConfig);
assert.strictEqual(mqtt._config.uri, 'mqtts://' + fakeConfig.host);
}); |
<<<<<<<
import { factory } from '../../utils/factory.js'
import { deepMap } from '../../utils/collection.js'
=======
import { factory } from '../../utils/factory'
import { deepMap } from '../../utils/collection'
import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
>>>>>>>
import { factory } from '../../utils/factory.js'
import { deepMap } from '../../utils/collection.js'
import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14' |
<<<<<<<
// median([a, b, c, d, ...], dim)
'Array | Matrix, number | BigNumber': function (array, dim) {
// TODO: implement median(A, dim)
throw new Error('median(A, dim) is not yet supported');
//return collection.reduce(arguments[0], arguments[1], ...);
},
// median(a, b, c, d, ...)
'...': function () {
return _median(Array.prototype.slice.call(arguments));
=======
if (isCollection(args)) {
if (arguments.length == 1) {
// median([a, b, c, d, ...])
return _median(args.valueOf(), false);
}
else if (arguments.length == 2) {
// median([a, b, c, d, ...], dim)
// TODO: implement median(A, dim)
throw new Error('median(A, dim) is not yet supported');
//return collection.reduce(arguments[0], arguments[1], ...);
}
else {
throw new SyntaxError('Wrong number of parameters');
}
}
else {
// median(a, b, c, d, ...)
var argArr = new Array(arguments.length);
for (var i = 0; i < argArr.length; ++i) {
argArr[i] = arguments[i];
}
return _median(argArr, true);
>>>>>>>
// median([a, b, c, d, ...], dim)
'Array | Matrix, number | BigNumber': function (array, dim) {
// TODO: implement median(A, dim)
throw new Error('median(A, dim) is not yet supported');
//return collection.reduce(arguments[0], arguments[1], ...);
},
// median(a, b, c, d, ...)
'...': function () {
return _median(Array.prototype.slice.call(arguments));
<<<<<<<
* @param {Array | Matrix} array
* @return {number} median
=======
* @param {Array} array
* @param {Boolean} isFlat
* @return {Number} median
>>>>>>>
* @param {Array} array
* @return {Number} median
<<<<<<<
function _median(array) {
var flat = flatten(array.valueOf());
flat.sort(compare);
var num = flat.length;
=======
function _median(array, isFlat) {
if (!isFlat) {
array = flatten(array);
}
>>>>>>>
function _median(array) {
array = flatten(array.valueOf());
<<<<<<<
return middle2(flat[num / 2 - 1], flat[num / 2]);
=======
var mid = num / 2 - 1;
var right = math.partitionSelect(array, mid + 1);
// array now partitioned at mid + 1, take max of left part
var left = array[mid];
for (var i = 0; i < mid; ++i) {
if (math.compare(array[i], left) > 0) {
left = array[i];
}
}
if (!isNumber(left) && !(left instanceof BigNumber) && !(left instanceof Unit)) {
throw new math.error.UnsupportedTypeError('median', math['typeof'](left));
}
if (!isNumber(right) && !(right instanceof BigNumber) && !(right instanceof Unit)) {
throw new math.error.UnsupportedTypeError('median', math['typeof'](right));
}
return math.divide(math.add(left, right), 2);
>>>>>>>
var mid = num / 2 - 1;
var right = partitionSelect(array, mid + 1);
// array now partitioned at mid + 1, take max of left part
var left = array[mid];
for (var i = 0; i < mid; ++i) {
if (compare(array[i], left) > 0) {
left = array[i];
}
}
return middle2(left, right);
<<<<<<<
return middle(flat[(num - 1) / 2]);
=======
var middle = math.partitionSelect(array, (num - 1) / 2);
if (!isNumber(middle) && !(middle instanceof BigNumber) && !(middle instanceof Unit)) {
throw new math.error.UnsupportedTypeError('median', math['typeof'](middle));
}
return middle;
>>>>>>>
var m = partitionSelect(array, (num - 1) / 2);
return middle(m); |
<<<<<<<
import {API_URL} from "../../constants";
=======
import Address from '../addresses/Address';
>>>>>>>
import {API_URL} from "../../constants";
import Address from '../addresses/Address';
<<<<<<<
checkExistingToken = () => {
let {wallet} = this.props;
if (wallet !== null) {
xhr.get(API_URL+"/api/token?owner=" + wallet.address).then((result) => {
if (result.data.data[0]) {
this.setState({
issuedAsset: result.data.data[0],
});
}
});
/*
Client.getIssuedAsset(wallet.address).then(({token}) => {
if (token) {
this.setState({
issuedAsset: token,
});
}
});
*/
}
=======
checkExistingToken = (walletAddress) => {
xhr.get("https://www.tronapp.co:9009/api/mytoken?owner=" + walletAddress).then((result) => {
if (result.data.data['Data'][0]) {
this.setState({
issuedAsset: result.data.data['Data'][0],
});
}
});
>>>>>>>
checkExistingToken = () => {
let {wallet} = this.props;
if (wallet !== null) {
xhr.get(API_URL+"/api/token?owner=" + wallet.address).then((result) => {
if (result.data.data[0]) {
this.setState({
issuedAsset: result.data.data[0],
});
}
});
/*
Client.getIssuedAsset(wallet.address).then(({token}) => {
if (token) {
this.setState({
issuedAsset: token,
});
}
});
*/
} |
<<<<<<<
var number = require('../../util/number');
var collection = require('../../type/collection');
=======
module.exports = function (math) {
var util = require('../../util/index'),
collection = math.collection,
number = util.number,
isNumber = util.number.isNumber,
isCollection = collection.isCollection;
>>>>>>>
var number = require('../../util/number'); |
<<<<<<<
var collection = require('../../type/collection');
var isInteger = require('../../util/number').isInteger;
var bigBitAnd = require('../../util/bignumber').and;
=======
module.exports = function (math, config) {
var util = require('../../util/index'),
BigNumber = math.type.BigNumber,
Matrix = math.type.Matrix,
Unit = require('../../type/Unit'),
collection = math.collection,
isBoolean = util['boolean'].isBoolean,
isInteger = util.number.isInteger,
isNumber = util.number.isNumber,
isCollection = collection.isCollection,
bigBitAnd = util.bignumber.and;
>>>>>>>
var isInteger = require('../../util/number').isInteger;
var bigBitAnd = require('../../util/bignumber').and; |
<<<<<<<
=======
it ('deprecated select function should still be functional', function () {
assert.ok(math.select(45) instanceof Chain);
assert.ok(math.select(math.complex(2,3)) instanceof Chain);
assert.ok(math.select() instanceof Chain);
assert.strictEqual(math.chaining.Selector, math.chaining.Chain);
});
it('should LaTeX chain', function () {
var expression = math.parse('chain(1)');
assert.equal(expression.toTex(), '\\mathrm{chain}\\left({1}\\right)');
});
>>>>>>>
it('should LaTeX chain', function () {
var expression = math.parse('chain(1)');
assert.equal(expression.toTex(), '\\mathrm{chain}\\left({1}\\right)');
}); |
<<<<<<<
=======
toNumber = util.number.toNumber,
toBigNumber = util.number.toBigNumber,
nearlyEqual = util.number.nearlyEqual,
>>>>>>>
nearlyEqual = util.number.nearlyEqual, |
<<<<<<<
var collection = require('../../type/collection');
var nearlyEqual = require('../../util/number').nearlyEqual;
=======
module.exports = function (math, config) {
var util = require('../../util/index'),
BigNumber = math.type.BigNumber,
Complex = require('../../type/Complex'),
Unit = require('../../type/Unit'),
collection = math.collection,
isNumber = util.number.isNumber,
nearlyEqual = util.number.nearlyEqual,
isBoolean = util['boolean'].isBoolean,
isString = util.string.isString,
isComplex = Complex.isComplex,
isUnit = Unit.isUnit,
isCollection = collection.isCollection;
>>>>>>>
var nearlyEqual = require('../../util/number').nearlyEqual; |
<<<<<<<
assert.strictEqual(format(0, options), '0.00')
assert.strictEqual(format(123, options), '123.00')
assert.strictEqual(format(123.456, options), '123.46')
assert.strictEqual(format(123.7, options), '123.70')
assert.strictEqual(format(0.123456, options), '0.12')
assert.strictEqual(format(-0.5555, options), '-0.56')
assert.strictEqual(format(123456789, options), '123456789.00')
assert.strictEqual(format(123456789e+9, options), '123456789000000000.00')
assert.strictEqual(format(123456789e+18, options), '123456789000000000000000000.00')
assert.strictEqual(format(123456789e+19, options), '1234567890000000000000000000.00')
assert.strictEqual(format(123456789e+20, options), '12345678900000000000000000000.00')
assert.strictEqual(format(123456789e+21, options), '123456789000000000000000000000.00')
assert.strictEqual(format(123456789e+22, options), '1234567890000000000000000000000.00')
assert.strictEqual(format(1.2e-14, options), '0.00')
assert.strictEqual(format(1.3e-18, options), '0.00')
assert.strictEqual(format(1.3e-19, options), '0.00')
assert.strictEqual(format(1.3e-20, options), '0.00')
assert.strictEqual(format(1.3e-21, options), '0.00')
assert.strictEqual(format(1.3e-22, options), '0.00')
assert.strictEqual(format(5.6789e-30, { notation: 'fixed', precision: 32 }),
=======
assert.strictEqual(number.format(0, options), '0.00')
assert.strictEqual(number.format(123, options), '123.00')
assert.strictEqual(number.format(123.456, options), '123.46')
assert.strictEqual(number.format(123.7, options), '123.70')
assert.strictEqual(number.format(0.123456, options), '0.12')
assert.strictEqual(number.format(-0.5555, options), '-0.56')
assert.strictEqual(number.format(123456789, options), '123456789.00')
assert.strictEqual(number.format(123456789e+9, options), '123456789000000000.00')
assert.strictEqual(number.format(123456789e+18, options), '123456789000000000000000000.00')
assert.strictEqual(number.format(123456789e+19, options), '1234567890000000000000000000.00')
assert.strictEqual(number.format(123456789e+20, options), '12345678900000000000000000000.00')
assert.strictEqual(number.format(123456789e+21, options), '123456789000000000000000000000.00')
assert.strictEqual(number.format(123456789e+22, options), '1234567890000000000000000000000.00')
assert.strictEqual(number.format(1.2e-14, options), '0.00')
assert.strictEqual(number.format(1.3e-18, options), '0.00')
assert.strictEqual(number.format(1.3e-19, options), '0.00')
assert.strictEqual(number.format(1.3e-20, options), '0.00')
assert.strictEqual(number.format(1.3e-21, options), '0.00')
assert.strictEqual(number.format(1.3e-22, options), '0.00')
assert.strictEqual(number.format(5.6789e-30, { notation, precision: 32 }),
>>>>>>>
assert.strictEqual(format(0, options), '0.00')
assert.strictEqual(format(123, options), '123.00')
assert.strictEqual(format(123.456, options), '123.46')
assert.strictEqual(format(123.7, options), '123.70')
assert.strictEqual(format(0.123456, options), '0.12')
assert.strictEqual(format(-0.5555, options), '-0.56')
assert.strictEqual(format(123456789, options), '123456789.00')
assert.strictEqual(format(123456789e+9, options), '123456789000000000.00')
assert.strictEqual(format(123456789e+18, options), '123456789000000000000000000.00')
assert.strictEqual(format(123456789e+19, options), '1234567890000000000000000000.00')
assert.strictEqual(format(123456789e+20, options), '12345678900000000000000000000.00')
assert.strictEqual(format(123456789e+21, options), '123456789000000000000000000000.00')
assert.strictEqual(format(123456789e+22, options), '1234567890000000000000000000000.00')
assert.strictEqual(format(1.2e-14, options), '0.00')
assert.strictEqual(format(1.3e-18, options), '0.00')
assert.strictEqual(format(1.3e-19, options), '0.00')
assert.strictEqual(format(1.3e-20, options), '0.00')
assert.strictEqual(format(1.3e-21, options), '0.00')
assert.strictEqual(format(1.3e-22, options), '0.00')
assert.strictEqual(format(5.6789e-30, { notation, precision: 32 }),
<<<<<<<
assert.strictEqual(format(5.6999e-30, { notation: 'fixed', precision: 32 }),
=======
assert.strictEqual(number.format(5.6999e-30, { notation, precision: 32 }),
>>>>>>>
assert.strictEqual(format(5.6999e-30, { notation, precision: 32 }), |
<<<<<<<
function factory (type, config, load, typed) {
var complexSqrt = load(require('../arithmetic/sqrt')).signatures['Complex'];
var complexLog = load(require('../arithmetic/log')).signatures['Complex'];
=======
BigNumber = math.type.BigNumber,
Complex = require('../../type/Complex'),
collection = math.collection,
isNumber = util.number.isNumber,
isBoolean = util['boolean'].isBoolean,
isComplex = Complex.isComplex,
isCollection = collection.isCollection,
bigArcSin = util.bignumber.arcsin_arccsc;
>>>>>>>
function factory (type, config, load, typed) {
var collection = load(require('../../type/collection'));
var complexSqrt = load(require('../arithmetic/sqrt')).signatures['Complex'];
var complexLog = load(require('../arithmetic/log')).signatures['Complex'];
<<<<<<<
'Array | Matrix': function (x) {
return collection.deepMap(x, asin);
=======
if (isCollection(x)) {
// deep map collection, skip zeros since asin(0) = 0
return collection.deepMap(x, asin, true);
>>>>>>>
'Array | Matrix': function (x) {
// deep map collection, skip zeros since asin(0) = 0
return collection.deepMap(x, asin, true); |
<<<<<<<
var collection = require('../../type/collection');
var nearlyEqual = require('../../util/number').nearlyEqual;
=======
module.exports = function (math, config) {
var util = require('../../util/index'),
BigNumber = math.type.BigNumber,
Complex = require('../../type/Complex'),
Unit = require('../../type/Unit'),
collection = math.collection,
isNumber = util.number.isNumber,
nearlyEqual = util.number.nearlyEqual,
isBoolean = util['boolean'].isBoolean,
isString = util.string.isString,
isComplex = Complex.isComplex,
isUnit = Unit.isUnit,
isCollection = collection.isCollection;
>>>>>>>
var nearlyEqual = require('../../util/number').nearlyEqual; |
<<<<<<<
var collection = require('../../type/collection');
var bigAtanh = require('../../util/bignumber').atanh_acoth;
=======
module.exports = function (math) {
var util = require('../../util/index'),
BigNumber = math.type.BigNumber,
Complex = require('../../type/Complex'),
Unit = require('../../type/Unit'),
collection = math.collection,
isNumber = util.number.isNumber,
isBoolean = util['boolean'].isBoolean,
isComplex = Complex.isComplex,
isUnit = Unit.isUnit,
isCollection = collection.isCollection,
bigAtanh = util.bignumber.atanh_acoth;
>>>>>>>
var bigAtanh = require('../../util/bignumber').atanh_acoth;
<<<<<<<
'Array | Matrix': function (x) {
return collection.deepMap(x, atanh);
=======
if (isCollection(x)) {
// deep map collection, skip zeros since atanh(0) = 0
return collection.deepMap(x, atanh, true);
>>>>>>>
'Array | Matrix': function (x) {
// deep map collection, skip zeros since atanh(0) = 0
return collection.deepMap(x, atanh, true); |
<<<<<<<
import { factory } from '../../utils/factory.js'
import { deepMap } from '../../utils/collection.js'
import { nearlyEqual } from '../../utils/number.js'
import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual.js'
import { ceilNumber } from '../../plain/number/index.js'
=======
import { Decimal } from 'decimal.js'
import { factory } from '../../utils/factory'
import { deepMap } from '../../utils/collection'
import { nearlyEqual } from '../../utils/number'
import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual'
import { ceilNumber } from '../../plain/number'
import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11'
import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
>>>>>>>
import { Decimal } from 'decimal.js'
import { factory } from '../../utils/factory.js'
import { deepMap } from '../../utils/collection.js'
import { nearlyEqual } from '../../utils/number.js'
import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual.js'
import { ceilNumber } from '../../plain/number/index.js'
import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11'
import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14' |
<<<<<<<
var collection = require('../../type/collection');
var bigAtan2 = require('../../util/bignumber').arctan2;
=======
module.exports = function (math) {
var util = require('../../util/index'),
BigNumber = math.type.BigNumber,
Complex = require('../../type/Complex'),
collection = math.collection,
isNumber = util.number.isNumber,
isBoolean = util['boolean'].isBoolean,
isComplex = Complex.isComplex,
isCollection = collection.isCollection,
atan2Big = util.bignumber.arctan2;
>>>>>>>
var bigAtan2 = require('../../util/bignumber').arctan2; |
<<<<<<<
random: function(arg1, arg2, arg3) {
if (arguments.length > 3)
newArgumentsError('random', arguments.length, 0, 3);
// Random matrix
else if (Object.prototype.toString.call(arg1) === '[object Array]') {
var min = arg2, max = arg3;
if (max === undefined) max = 1;
if (min === undefined) min = 0;
return new Matrix(_randomDataForMatrix(arg1, min, max));
// Random float
} else {
// TODO: more precise error message?
if (arguments.length > 2)
newArgumentsError('random', arguments.length, 0, 2);
var min = arg1, max = arg2;
if (max === undefined) max = 1;
if (min === undefined) min = 0;
return min + distribution() * (max - min);
}
=======
random: function(min, max) {
if (arguments.length > 2)
newArgumentsError('random', arguments.length, 0, 2);
if (max === undefined) max = 1;
if (min === undefined) min = 0;
return min + distribution() * (max - min);
>>>>>>>
random: function(arg1, arg2, arg3) {
if (arguments.length > 3)
newArgumentsError('random', arguments.length, 0, 3);
// Random matrix
else if (Object.prototype.toString.call(arg1) === '[object Array]') {
var min = arg2, max = arg3;
if (max === undefined) max = 1;
if (min === undefined) min = 0;
return new Matrix(_randomDataForMatrix(arg1, min, max));
// Random float
} else {
// TODO: more precise error message?
if (arguments.length > 2)
newArgumentsError('random', arguments.length, 0, 2);
var min = arg1, max = arg2;
if (max === undefined) max = 1;
if (min === undefined) min = 0;
return min + distribution() * (max - min);
}
<<<<<<<
=======
},
randomMatrix: function(size, min, max) {
if (arguments.length > 3 || arguments.length < 1)
newArgumentsError('pickRandom', arguments.length, 1, 3);
return new Matrix(_randomDataForMatrix(size, min, max));
>>>>>>> |
<<<<<<<
* @version 0.11.1
* @date 2013-08-02
=======
* @version 0.11.2-SNAPSHOT
* @date 2013-07-29
>>>>>>>
* @version 0.11.2-SNAPSHOT
* @date 2013-08-02 |
<<<<<<<
var collection = require('../../type/collection');
var nearlyEqual = require('../../util/number').nearlyEqual;
=======
module.exports = function (math, config) {
var util = require('../../util/index'),
BigNumber = math.type.BigNumber,
Complex = require('../../type/Complex'),
Unit = require('../../type/Unit'),
collection = math.collection,
isNumber = util.number.isNumber,
nearlyEqual = util.number.nearlyEqual,
isBoolean = util['boolean'].isBoolean,
isString = util.string.isString,
isComplex = Complex.isComplex,
isUnit = Unit.isUnit,
isCollection = collection.isCollection;
>>>>>>>
var nearlyEqual = require('../../util/number').nearlyEqual; |
<<<<<<<
precision: 20
=======
decimals: 20,
epsilon: 1e-6
>>>>>>>
precision: 20,
epsilon: 1e-6
<<<<<<<
precision: 20
=======
decimals: 20,
epsilon: 1e-6
>>>>>>>
precision: 20,
epsilon: 1e-6
<<<<<<<
precision: 20
=======
decimals: 20,
epsilon: 1e-6
>>>>>>>
precision: 20,
epsilon: 1e-6
<<<<<<<
precision: 32
=======
decimals: 32,
epsilon: 1e-7
>>>>>>>
precision: 32,
epsilon: 1e-7
<<<<<<<
precision: 32
=======
decimals: 32,
epsilon: 1e-7
>>>>>>>
precision: 32,
epsilon: 1e-7 |
<<<<<<<
// Backbone - account - mapping
"main_account_mapping_title":"reflectar a DAppChain",
"main_account_mapping_text":"DAppChain es una cadena lateral desarrollada basada en la mainnet de TRON, una solución de escala para la red principal de TRON. Al reflectar a DAppChain, se obtendrá un TPS más alto con un menor consumo de energía.",
"main_account_mapping_text_1":"1.obtengan tps con menor consumo de energía.",
"main_account_mapping_text_2":"2.proceso de reflexión completamente gratuito",
"main_account_mapping_btn":"Cartografía",
"main_account_mapping_success_btn":"reflexión",
"main_account_mapping_desc1": "Cuando el token se reflecta a la cadena lateral, se generará un token con el mismo nombre en la cadena lateral",
"main_account_mapping_desc2": "Una vez se completa la reflexión, los usuarios pueden depositar el token en la cadena lateral.",
// sidechain - contract - mapping
"sidechain_contract_left":"reflexión del contrato de MainNet",
"sidechain_contract_right":" ",
// Sidechain - account - pledge
"sidechain_account_pledge_btn":"Depositar",
"sidechain_account_sign_btn":"Retirar",
"pledge_currency":"Tipo",
"pledge_sidechain":"Cadena lateral",
"pledge_num":"Cantidad",
'pledge_num_error':"El número nunca excede el saldo máximo disponible",
"pledge_text":"El depósito consumirá una cierta cantidad de energía.",
"pledge_mapping_text":"Sus activos no se han reflectado a DAppChain y, por lo tanto, no se pueden depositar.",
// success
"pledge_success": "Deposit Success",
"sign_success": "Withdraw Success",
"mapping_success": "Mapping Success",
// error
"pledge_error": "Deposit Error",
"sign_error": "Withdraw Error",
"mapping_error": "Mapping Error",
=======
"price_per_1000_WIN": "PRICE PER 1000 WIN",
"WIN_distribution_overview": "WIN DISTRIBUTION OVERVIEW",
"total_WIN_supply": "Total WIN Supply",
"WIN_supply": "WIN Supply",
"WIN_Token_Release_Schedule": "WIN Token Release Schedule",
"source_WIN_team": "Source: WIN Management Team",
>>>>>>>
// Backbone - account - mapping
"main_account_mapping_title":"reflectar a DAppChain",
"main_account_mapping_text":"DAppChain es una cadena lateral desarrollada basada en la mainnet de TRON, una solución de escala para la red principal de TRON. Al reflectar a DAppChain, se obtendrá un TPS más alto con un menor consumo de energía.",
"main_account_mapping_text_1":"1.obtengan tps con menor consumo de energía.",
"main_account_mapping_text_2":"2.proceso de reflexión completamente gratuito",
"main_account_mapping_btn":"Cartografía",
"main_account_mapping_success_btn":"reflexión",
"main_account_mapping_desc1": "Cuando el token se reflecta a la cadena lateral, se generará un token con el mismo nombre en la cadena lateral",
"main_account_mapping_desc2": "Una vez se completa la reflexión, los usuarios pueden depositar el token en la cadena lateral.",
// sidechain - contract - mapping
"sidechain_contract_left":"reflexión del contrato de MainNet",
"sidechain_contract_right":" ",
// Sidechain - account - pledge
"sidechain_account_pledge_btn":"Depositar",
"sidechain_account_sign_btn":"Retirar",
"pledge_currency":"Tipo",
"pledge_sidechain":"Cadena lateral",
"pledge_num":"Cantidad",
'pledge_num_error':"El número nunca excede el saldo máximo disponible",
"pledge_text":"El depósito consumirá una cierta cantidad de energía.",
"pledge_mapping_text":"Sus activos no se han reflectado a DAppChain y, por lo tanto, no se pueden depositar.",
// success
"pledge_success": "Deposit Success",
"sign_success": "Withdraw Success",
"mapping_success": "Mapping Success",
// error
"pledge_error": "Deposit Error",
"sign_error": "Withdraw Error",
"mapping_error": "Mapping Error",
"price_per_1000_WIN": "PRICE PER 1000 WIN",
"WIN_distribution_overview": "WIN DISTRIBUTION OVERVIEW",
"total_WIN_supply": "Total WIN Supply",
"WIN_supply": "WIN Supply",
"WIN_Token_Release_Schedule": "WIN Token Release Schedule",
"source_WIN_team": "Source: WIN Management Team", |
<<<<<<<
require('./apply'),
=======
require('./column'),
>>>>>>>
require('./apply'),
require('./column'), |
<<<<<<<
var collection = require('../../type/collection');
var bigSech = require('../../util/bignumber').cosh_sinh_csch_sech;
=======
module.exports = function (math) {
var util = require('../../util/index'),
BigNumber = math.type.BigNumber,
Complex = require('../../type/Complex'),
Unit = require('../../type/Unit'),
collection = math.collection,
isNumber = util.number.isNumber,
isBoolean = util['boolean'].isBoolean,
isComplex = Complex.isComplex,
isUnit = Unit.isUnit,
isCollection = collection.isCollection,
bigSech = util.bignumber.cosh_sinh_csch_sech;
>>>>>>>
var bigSech = require('../../util/bignumber').cosh_sinh_csch_sech; |
<<<<<<<
// Make profile fields editable.
$('.editable').editable(function(value, settings) {
self.editableHandler($(this).attr('id'), value);
return value;
});
=======
};
FirefeedUI.prototype.renderProfile = function(uid) {
var self = this;
$("#header").html($("#tmpl-page-header").html());
if (self._loggedIn) {
$("#logout-button").click(self.logout.bind(self));
} else {
$("#logout-button").remove();
}
// Render profile page body.
self._firefeed.getUserInfo(uid, function(info) {
var content = Mustache.to_html($("#tmpl-profile-content").html(), info);
var body = Mustache.to_html($("#tmpl-content").html(), {
classes: "cf", content: content
});
$("#body").html(body);
});
// Render this user's tweets. Capped to 5 for now.
self._handleNewSpark(
5, self._firefeed.onNewSparkFor.bind(self._firefeed, uid)
);
>>>>>>>
// Make profile fields editable.
$('.editable').editable(function(value, settings) {
self.editableHandler($(this).attr('id'), value);
return value;
});
};
FirefeedUI.prototype.renderProfile = function(uid) {
var self = this;
$("#header").html($("#tmpl-page-header").html());
if (self._loggedIn) {
$("#logout-button").click(self.logout.bind(self));
} else {
$("#logout-button").remove();
}
// Render profile page body.
self._firefeed.getUserInfo(uid, function(info) {
var content = Mustache.to_html($("#tmpl-profile-content").html(), info);
var body = Mustache.to_html($("#tmpl-content").html(), {
classes: "cf", content: content
});
$("#body").html(body);
});
// Render this user's tweets. Capped to 5 for now.
self._handleNewSpark(
5, self._firefeed.onNewSparkFor.bind(self._firefeed, uid)
); |
<<<<<<<
=======
'src/tables.intro.js',
'src/tables-init.js',
>>>>>>>
'src/tables.intro.js',
'src/tables-init.js',
<<<<<<<
=======
'src/tables.intro.js',
'src/tables-init.js',
'src/tablesaw.js',
>>>>>>>
'src/tables.intro.js',
'src/tables-init.js', |
<<<<<<<
import React from 'react';
import moment from 'moment';
import assert from 'assert';
import sinon from 'sinon';
import {shallow} from 'enzyme';
import Datepicker from '../../src/Datepicker';
import Textfield from '../../src/Textfield';
=======
>>>>>>>
import assert from 'assert';
<<<<<<<
assert(findCalendar(tree).node);
assert(!findClock(tree).node);
assert.equal(findButton(tree).prop('icon'), 'calendar');
=======
expect(tree.find(Calendar).node).toExist();
expect(tree.find(Clock).node).toNotExist();
expect(findButton(tree).prop('icon')).toBe('calendar');
>>>>>>>
assert(tree.find(Calendar).node);
assert(!tree.find(Clock).node);
assert.equal(findButton(tree).prop('icon'), 'calendar');
<<<<<<<
assert(findCalendar(tree).node);
assert(findClock(tree).node);
assert.equal(findButton(tree).prop('icon'), 'calendar');
=======
expect(tree.find(Calendar).node).toExist();
expect(tree.find(Clock).node).toExist();
expect(findButton(tree).prop('icon')).toBe('calendar');
>>>>>>>
assert(tree.find(Calendar).node);
assert(tree.find(Clock).node);
assert.equal(findButton(tree).prop('icon'), 'calendar');
<<<<<<<
assert(!findCalendar(tree).node);
assert(findClock(tree).node);
assert.equal(findButton(tree).prop('icon'), 'clock');
=======
expect(tree.find(Calendar).node).toNotExist();
expect(tree.find(Clock).node).toExist();
expect(findButton(tree).prop('icon')).toBe('clock');
>>>>>>>
assert(!tree.find(Calendar).node);
assert(tree.find(Clock).node);
assert.equal(findButton(tree).prop('icon'), 'clock');
<<<<<<<
it('clicking Button opens Popover', () => {
const tree = shallow(<Datepicker />);
assert.equal(tree.state('open'), false);
findButton(tree).simulate('click');
assert.equal(tree.state('open'), true);
assert.equal(tree.prop('open'), true);
});
describe('closing popover', () => {
it('typing escape while popover is open closes popover', () => {
const tree = shallow(<Datepicker type="datetime" />);
tree.setState({open: true});
findCalendar(tree).simulate('keydown', {keyCode: 27});
assert.equal(tree.state('open'), false);
tree.setState({open: true});
findClock(tree).simulate('keydown', {keyCode: 27});
assert.equal(tree.state('open'), false);
});
it('clicking a date on the calendar closes popover', () => {
const now = moment();
const tree = shallow(<Datepicker />);
tree.setState({open: true});
findCalendar(tree).simulate('change', now);
assert.equal(tree.state('open'), false);
});
it('popover can close itself', () => {
const tree = shallow(<Datepicker />);
tree.prop('onClose')();
assert.equal(tree.state('open'), false);
});
});
=======
>>>>>>>
<<<<<<<
textfield.simulate('change', simulatedGoodEvent);
assert(!spy.called);
=======
textfield.simulate('change', '2016-08-01 00:00', simulatedGoodEvent);
expect(spy).toNotHaveBeenCalled();
>>>>>>>
textfield.simulate('change', '2016-08-01 00:00', simulatedGoodEvent);
assert(!spy.called);
<<<<<<<
const clockEl = shallow(findClock(wrapper).node).find(`.coral-Clock-${ field }`);
clockEl.simulate('change', {stopPropagation: function () {}, target: {value: `${ value }`}});
return spy.lastCall.args[1];
=======
const clockEl = shallow(wrapper.find(Clock).node).find(`.coral-Clock-${ field }`);
clockEl.simulate('change', value, {stopPropagation: function () {}, target: {value: `${ value }`}});
return spy.getLastCall().arguments[1];
>>>>>>>
const clockEl = shallow(wrapper.find(Clock).node).find(`.coral-Clock-${ field }`);
clockEl.simulate('change', value, {stopPropagation: function () {}, target: {value: `${ value }`}});
return spy.lastCall.args[1];
<<<<<<<
assert.equal(tree.prop('aria-disabled'), true);
assert.equal(findTextfield(tree).prop('disabled'), true);
assert.equal(findButton(tree).prop('disabled'), true);
assert.equal(findCalendar(tree).prop('disabled'), true);
assert.equal(findClock(tree).prop('disabled'), true);
=======
expect(tree.prop('aria-disabled')).toBe(true);
expect(findTextfield(tree).prop('disabled')).toBe(true);
expect(findButton(tree).prop('disabled')).toBe(true);
expect(tree.find(Calendar).prop('disabled')).toBe(true);
expect(tree.find(Clock).prop('disabled')).toBe(true);
>>>>>>>
assert.equal(tree.prop('aria-disabled'), true);
assert.equal(findTextfield(tree).prop('disabled'), true);
assert.equal(findButton(tree).prop('disabled'), true);
assert.equal(tree.find(Calendar).prop('disabled'), true);
assert.equal(tree.find(Clock).prop('disabled'), true);
<<<<<<<
assert.equal(tree.prop('aria-invalid'), true);
assert.equal(tree.hasClass('is-invalid'), true);
assert.equal(findTextfield(tree).prop('invalid'), true);
assert.equal(findTextfield(tree).prop('aria-invalid'), true);
assert.equal(findCalendar(tree).prop('invalid'), true);
assert.equal(findClock(tree).prop('invalid'), true);
=======
expect(tree.prop('aria-invalid')).toBe(true);
expect(tree.hasClass('is-invalid')).toBe(true);
expect(findTextfield(tree).prop('invalid')).toBe(true);
expect(findTextfield(tree).prop('aria-invalid')).toBe(true);
expect(tree.find(Calendar).prop('invalid')).toBe(true);
expect(tree.find(Clock).prop('invalid')).toBe(true);
>>>>>>>
assert.equal(tree.prop('aria-invalid'), true);
assert.equal(tree.hasClass('is-invalid'), true);
assert.equal(findTextfield(tree).prop('invalid'), true);
assert.equal(findTextfield(tree).prop('aria-invalid'), true);
assert.equal(tree.find(Calendar).prop('invalid'), true);
assert.equal(tree.find(Clock).prop('invalid'), true);
<<<<<<<
assert.equal(tree.prop('aria-readonly'), true);
assert.equal(findTextfield(tree).prop('readOnly'), true);
assert.equal(findButton(tree).prop('disabled'), true);
assert.equal(findCalendar(tree).prop('readOnly'), true);
assert.equal(findClock(tree).prop('readOnly'), true);
=======
expect(tree.prop('aria-readonly')).toBe(true);
expect(findTextfield(tree).prop('readOnly')).toBe(true);
expect(findButton(tree).prop('disabled')).toBe(true);
expect(tree.find(Calendar).prop('readOnly')).toBe(true);
expect(tree.find(Clock).prop('readOnly')).toBe(true);
>>>>>>>
assert.equal(tree.prop('aria-readonly'), true);
assert.equal(findTextfield(tree).prop('readOnly'), true);
assert.equal(findButton(tree).prop('disabled'), true);
assert.equal(tree.find(Calendar).prop('readOnly'), true);
assert.equal(tree.find(Clock).prop('readOnly'), true);
<<<<<<<
assert.equal(tree.prop('aria-required'), true);
assert.equal(findCalendar(tree).prop('required'), true);
assert.equal(findClock(tree).prop('required'), true);
=======
expect(tree.prop('aria-required')).toBe(true);
expect(tree.find(Calendar).prop('required')).toBe(true);
expect(tree.find(Clock).prop('required')).toBe(true);
>>>>>>>
assert.equal(tree.prop('aria-required'), true);
assert.equal(tree.find(Calendar).prop('required'), true);
assert.equal(tree.find(Clock).prop('required'), true); |
<<<<<<<
assert(tree.find(Calendar).node);
assert(!tree.find(Clock).node);
assert.equal(findButton(tree).prop('icon').type, CalendarIcon);
=======
assert.equal(tree.find(Calendar).length, 1);
assert.equal(tree.find(Clock).length, 0);
assert.equal(findButton(tree).prop('icon'), 'calendar');
>>>>>>>
assert.equal(tree.find(Calendar).length, 1);
assert.equal(tree.find(Clock).length, 0);
assert.equal(findButton(tree).prop('icon').type, CalendarIcon);
<<<<<<<
assert(tree.find(Calendar).node);
assert(tree.find(Clock).node);
assert.equal(findButton(tree).prop('icon').type, CalendarIcon);
=======
assert.equal(tree.find(Calendar).length, 1);
assert.equal(tree.find(Clock).length, 1);
assert.equal(findButton(tree).prop('icon'), 'calendar');
>>>>>>>
assert.equal(tree.find(Calendar).length, 1);
assert.equal(tree.find(Clock).length, 1);
assert.equal(findButton(tree).prop('icon').type, CalendarIcon);
<<<<<<<
assert(!tree.find(Calendar).node);
assert(tree.find(Clock).node);
assert.equal(findButton(tree).prop('icon').type, ClockIcon);
=======
assert.equal(tree.find(Calendar).length, 0);
assert.equal(tree.find(Clock).length, 1);
assert.equal(findButton(tree).prop('icon'), 'clock');
>>>>>>>
assert.equal(tree.find(Calendar).length, 0);
assert.equal(tree.find(Clock).length, 1);
assert.equal(findButton(tree).prop('icon').type, ClockIcon); |
<<<<<<<
{showDropdown && results.length > 0 &&
<Menu className="coral-Autocomplete-menu" onSelect={this.onSelect}>
{results.map((result, i) =>
(<MenuItem
key={`item-${i}`}
=======
<Overlay target={this} show={showDropdown && results.length > 0} placement="bottom left">
<Menu onSelect={this.onSelect} style={{width: this.state.width}}>
{results.map((result, i) => (
<MenuItem
>>>>>>>
<Overlay target={this} show={showDropdown && results.length > 0} placement="bottom left">
<Menu onSelect={this.onSelect} style={{width: this.state.width}}>
{results.map((result, i) => (
<MenuItem
key={`item-${i}`} |
<<<<<<<
Name | Component | numChildren
${'v3 FormItem no children'} | ${FormItem} | ${0}
${'v2 FormItem no children'} | ${V2FormItem} | ${0}
${'v3 FormItem one child'} | ${FormItem} | ${1}
${'v2 FormItem one child'} | ${V2FormItem} | ${1}
${'v3 FormItem multiple children'} | ${FormItem} | ${2}
${'v2 FormItem multiple children'} | ${V2FormItem} | ${2}
`('$Name supports an icon with the label if provided', ({Component, numChildren}) => {
let tree = renderFormItem(Component, {label, labelFor, icon: <_3DMaterials />}, numChildren);
let fieldLabel = tree.getByText(label);
expect(within(fieldLabel).getByRole('img')).toBeTruthy();
=======
Name | Component | numChildren | props
${'v3 FormItem no children'} | ${FormItem} | ${0} | ${{isRequired: true, necessityIndicator: 'icon'}}
${'v3 FormItem one child'} | ${FormItem} | ${1} | ${{isRequired: true, necessityIndicator: 'icon'}}
${'v3 FormItem multiple children'} | ${FormItem} | ${2} | ${{isRequired: true, necessityIndicator: 'icon'}}
`('$Name will show an asterix when required with icon indicator', ({Component, numChildren, props}) => {
let tree = renderFormItem(Component, {label, labelFor, ...props}, numChildren);
let fieldLabel = tree.getByTestId(datatestid);
expect(within(fieldLabel).getByRole('presentation')).toBeTruthy();
>>>>>>>
Name | Component | numChildren | props
${'v3 FormItem no children'} | ${FormItem} | ${0} | ${{isRequired: true, necessityIndicator: 'icon'}}
${'v3 FormItem one child'} | ${FormItem} | ${1} | ${{isRequired: true, necessityIndicator: 'icon'}}
${'v3 FormItem multiple children'} | ${FormItem} | ${2} | ${{isRequired: true, necessityIndicator: 'icon'}}
`('$Name will show an asterix when required with icon indicator', ({Component, numChildren, props}) => {
let tree = renderFormItem(Component, {label, labelFor, ...props}, numChildren);
let fieldLabel = tree.getByTestId(datatestid);
expect(within(fieldLabel).getByRole('presentation')).toBeTruthy();
<<<<<<<
${'v2 FormItem no children'} | ${V2FormItem} | ${0}
${'v3 FormItem one child'} | ${FormItem} | ${1}
${'v2 FormItem one child'} | ${V2FormItem} | ${1}
${'v3 FormItem multiple children'} | ${FormItem} | ${2}
${'v2 FormItem multiple children'} | ${V2FormItem} | ${2}
`('$Name doesn\'t support an icon if label isn\'t provided', ({Component, numChildren}) => {
let tree = renderFormItem(Component, {labelFor, icon: <_3DMaterials />}, numChildren);
let fieldLabel = tree.getByTestId(datatestid);
expect(within(fieldLabel).queryByRole('img')).toBeFalsy();
});
it.each`
Name | Component | numChildren
${'v3 FormItem no children'} | ${FormItem} | ${0}
=======
>>>>>>>
<<<<<<<
describe('with no children', () => {
it.each`
Name | Component | label
${'v3 FormItem'} | ${FormItem} | ${label}
${'v2 FormItem'} | ${V2FormItem} | ${label}
${'v3 FormItem'} | ${FormItem} | ${null}
${'v2 FormItem'} | ${V2FormItem} | ${null}
`('$Name should combine the provided class name and labelClassName', ({Component}) => {
let tree = renderFormItem(Component, {label, labelFor, className: 'testClass', labelClassName: 'labelClass'}, 0);
let fieldLabel = tree.getByText(label);
expect(fieldLabel).toHaveAttribute('class', expect.stringContaining('testClass'));
expect(fieldLabel).toHaveAttribute('class', expect.stringContaining('labelClass'));
});
});
=======
>>>>>>>
<<<<<<<
=======
let wrapper = tree.getByTestId('wrapperId');
expect(wrapper).toBeTruthy();
>>>>>>>
<<<<<<<
=======
let wrapper = tree.getByTestId('wrapperId');
expect(wrapper).toBeTruthy();
>>>>>>>
<<<<<<<
let secondButton = tree.getByTestId('testbutton2');
=======
let secondButton = within(wrapper).getByTestId('testbutton2');
>>>>>>>
let secondButton = tree.getByTestId('testbutton2');
<<<<<<<
expect(secondButton).not.toHaveAttribute('aria-labelledby');
});
it.each`
Name | Component
${'v3 FormItem'} | ${FormItem}
${'v2 FormItem'} | ${V2FormItem}
`('$Name shouldn\'t combine the provided class name and labelClassName', ({Component}) => {
let tree = renderFormItem(Component, {label, className: 'testClass', labelClassName: 'labelClass'}, 2);
let fieldLabel = tree.getByText(label);
expect(fieldLabel).toHaveAttribute('class', expect.not.stringContaining('testClass'));
expect(fieldLabel).toHaveAttribute('class', expect.stringContaining('labelClass'));
=======
expect(secondButton).not.toHaveAttribute('aria-labelledby');
>>>>>>>
expect(secondButton).not.toHaveAttribute('aria-labelledby'); |
<<<<<<<
assert(!tree.find('.spectrum-Loader--bar-label').node);
=======
assert(!tree.find('.spectrum-Progress-label').length);
>>>>>>>
assert(!tree.find('.spectrum-Loader--bar-label').length);
<<<<<<<
const label = tree.find('.spectrum-Loader--bar-percentage');
assert(label.node);
=======
assert.equal(tree.hasClass('spectrum-Progress--rightLabel'), true);
const label = findLabel(tree);
assert(label.getElement());
>>>>>>>
const label = tree.find('.spectrum-Loader--bar-percentage');
assert(label.getElement()); |
<<<<<<<
import {action, storiesOf} from '@kadira/storybook';
import Bell from '../src/Icon/Bell';
=======
import {action, storiesOf} from '@storybook/react';
>>>>>>>
import {action, storiesOf} from '@storybook/react';
import Bell from '../src/Icon/Bell'; |
<<<<<<<
element.simulate('change', {stopPropagation: stopPropagationSpy, target: {value}});
assert(stopPropagationSpy.called);
=======
element.simulate('change', value, {stopPropagation: stopPropagationSpy, target: {value}});
expect(stopPropagationSpy).toHaveBeenCalled();
>>>>>>>
element.simulate('change', value, {stopPropagation: stopPropagationSpy, target: {value}});
assert(stopPropagationSpy.called);
<<<<<<<
findHourTextfield(tree).simulate('change', {stopPropagation: function () {}, target: {value: 0}});
assert.deepEqual(+tree.state('value'), +now.clone().hours(0));
=======
findHourTextfield(tree).simulate('change', 0, {stopPropagation: function () {}, target: {value: 0}});
expect(+tree.state('value')).toEqual(+now.clone().hours(0));
>>>>>>>
findHourTextfield(tree).simulate('change', 0, {stopPropagation: function () {}, target: {value: 0}});
assert.deepEqual(+tree.state('value'), +now.clone().hours(0));
<<<<<<<
findHourTextfield(tree).simulate('change', {stopPropagation: function () {}, target: {value: 0}});
assert.deepEqual(+tree.state('value'), +dateWeekLater);
=======
findHourTextfield(tree).simulate('change', 0, {stopPropagation: function () {}, target: {value: 0}});
expect(+tree.state('value')).toEqual(+dateWeekLater);
>>>>>>>
findHourTextfield(tree).simulate('change', 0, {stopPropagation: function () {}, target: {value: 0}});
assert.deepEqual(+tree.state('value'), +dateWeekLater); |
<<<<<<<
"sign_in_with_ledger":"LEDGER",
=======
"TRC20_under_maintenance":"TRC20 under maintenance",
"transaction_fewer_than_100000":"1. When there are fewer than 100,000 (including 100,000) transaction data entries, all the data will be displayed.",
"transaction_more_than_100000":"2. When there are more than 100,000 transaction data entries, data of the latest 7 days will be displayed. ",
>>>>>>>
"sign_in_with_ledger":"LEDGER",
"TRC20_under_maintenance":"TRC20 under maintenance",
"transaction_fewer_than_100000":"1. When there are fewer than 100,000 (including 100,000) transaction data entries, all the data will be displayed.",
"transaction_more_than_100000":"2. When there are more than 100,000 transaction data entries, data of the latest 7 days will be displayed. ", |
<<<<<<<
import {action, storiesOf} from '@kadira/storybook';
import AdobeAnalytics from '../../src/Icon/AdobeAnalytics';
import AdobeAudienceManager from '../../src/Icon/AdobeAudienceManager';
import AdobeCampaign from '../../src/Icon/AdobeCampaign';
import AdobeExperienceManager from '../../src/Icon/AdobeExperienceManager';
import AdobeMediaOptimizer from '../../src/Icon/AdobeMediaOptimizer';
import AdobePrimetime from '../../src/Icon/AdobePrimetime';
import AdobeSocial from '../../src/Icon/AdobeSocial';
import AdobeTarget from '../../src/Icon/AdobeTarget';
import Asset from '../../src/Icon/Asset';
import Bell from '../../src/Icon/Bell';
=======
import {action, storiesOf} from '@storybook/react';
>>>>>>>
import {action, storiesOf} from '@storybook/react';
import AdobeAnalytics from '../../src/Icon/AdobeAnalytics';
import AdobeAudienceManager from '../../src/Icon/AdobeAudienceManager';
import AdobeCampaign from '../../src/Icon/AdobeCampaign';
import AdobeExperienceManager from '../../src/Icon/AdobeExperienceManager';
import AdobeMediaOptimizer from '../../src/Icon/AdobeMediaOptimizer';
import AdobePrimetime from '../../src/Icon/AdobePrimetime';
import AdobeSocial from '../../src/Icon/AdobeSocial';
import AdobeTarget from '../../src/Icon/AdobeTarget';
import Asset from '../../src/Icon/Asset';
import Bell from '../../src/Icon/Bell'; |
<<<<<<<
import {action, storiesOf} from '@kadira/storybook';
import Instagram from '../src/Icon/Instagram';
=======
import {action, storiesOf} from '@storybook/react';
>>>>>>>
import {action, storiesOf} from '@storybook/react';
import Instagram from '../src/Icon/Instagram'; |
<<<<<<<
// Hack to get icons loading in the storybook without copying them over
config.plugins.push(new webpack.NormalModuleReplacementPlugin(/Icon\/([^\/\.]+)$/, function (resource) {
resource.request = require.resolve('@react/react-spectrum-icons/dist/' + path.basename(resource.request));
}));
config.plugins.push(new webpack.NormalModuleReplacementPlugin(/\.\.\/js\/Icon/, path.resolve(__dirname + '/../src/Icon/js/Icon.js')));
=======
if (env === 'PRODUCTION') {
// see https://github.com/storybooks/storybook/issues/1570
config.plugins = config.plugins.filter(plugin => plugin.constructor.name !== 'UglifyJsPlugin')
}
>>>>>>>
// Hack to get icons loading in the storybook without copying them over
config.plugins.push(new webpack.NormalModuleReplacementPlugin(/Icon\/([^\/\.]+)$/, function (resource) {
resource.request = require.resolve('@react/react-spectrum-icons/dist/' + path.basename(resource.request));
}));
config.plugins.push(new webpack.NormalModuleReplacementPlugin(/\.\.\/js\/Icon/, path.resolve(__dirname + '/../src/Icon/js/Icon.js')));
if (env === 'PRODUCTION') {
// see https://github.com/storybooks/storybook/issues/1570
config.plugins = config.plugins.filter(plugin => plugin.constructor.name !== 'UglifyJsPlugin')
} |
<<<<<<<
it('supports the subtle variation', () => {
const tree = shallow(<Link variant="subtle" className="myClass">Testing</Link>);
assert(tree.prop('className').indexOf('spectrum-Link--subtle') >= 0);
// deprecated subtle prop should still work
tree.setProps({subtle: true, variant: null});
assert(tree.prop('className').indexOf('spectrum-Link--subtle') >= 0);
=======
it('supports the quiet variation', () => {
const tree = shallow(<Link variant="quiet" className="myClass">Testing</Link>);
assert(tree.prop('className').indexOf('spectrum-Link--quiet') >= 0);
>>>>>>>
it('supports the quiet variation', () => {
const tree = shallow(<Link variant="quiet" className="myClass">Testing</Link>);
assert(tree.prop('className').indexOf('spectrum-Link--quiet') >= 0);
// deprecated subtle prop should still work
tree.setProps({subtle: true, variant: null});
assert(tree.prop('className').indexOf('spectrum-Link--quiet') >= 0); |
<<<<<<<
import {action, storiesOf} from '@kadira/storybook';
import Facebook from '../../src/Icon/Facebook';
import Flickr from '../../src/Icon/Flickr';
import Newsgator from '../../src/Icon/Newsgator';
=======
import {action, storiesOf} from '@storybook/react';
>>>>>>>
import {action, storiesOf} from '@storybook/react';
import Facebook from '../../src/Icon/Facebook';
import Flickr from '../../src/Icon/Flickr';
import Newsgator from '../../src/Icon/Newsgator'; |
<<<<<<<
=======
self.focused = true;
>>>>>>>
self.focused = true;
<<<<<<<
}).on('change', function(path) {
if (self.justSaved) {
self.justSaved = false;
} else {
self.askReload = true;
}
})
=======
});
>>>>>>>
}).on('change', function(path) {
if (self.justSaved) {
self.justSaved = false;
} else {
self.askReload = true;
}
});
<<<<<<<
var win = gui.Window.get()
var self = this;
self.justSaved = true;
=======
>>>>>>>
var self = this;
self.justSaved = true;
<<<<<<<
=======
>>>>>>> |
<<<<<<<
if (!def.action) throw new Error('Property `action` not found in the command definition.');
const userAction = def.action;
def.action = (...args) => {
const parserInstance = parser(program.path);
userAction(parserInstance, ...args);
if (program.stdout) {
process.stdout.on('error', process.exit);
process.stdout.write(parserInstance.stringify());
return;
}
=======
if (!def.handler) throw new Error('Property `handler` not found in the command definition.');
if (!def.describe) throw new Error('Property `describe` not found in the command definition.');
def.name = def.command.split(' ')[0].trim();
if (def.name.length === 0) {
throw new Error('Property `name` can\'t be defined.');
}
def.builder = def.builder || {};
const userHandler = def.handler;
def.handler = (argv) => {
const parserInstance = parser(argv.path);
return userHandler.call(
cli,
parserInstance,
argv,
() => {
// writer callback function
if (argv.stdout) {
process.stdout.on('error', process.exit);
process.stdout.write(parserInstance.stringify());
return;
}
parserInstance.write();
}
);
>>>>>>>
if (!def.handler) throw new Error('Property `handler` not found in the command definition.');
if (!def.describe) throw new Error('Property `describe` not found in the command definition.');
def.name = def.command.split(' ')[0].trim();
if (def.name.length === 0) {
throw new Error('Property `name` can\'t be defined.');
}
def.builder = def.builder || {};
const userHandler = def.handler;
def.handler = (argv) => {
const parserInstance = parser(argv.path);
return userHandler.call(
cli,
parserInstance,
argv,
() => {
// writer callback function
if (argv.stdout) {
process.stdout.on('error', process.exit);
process.stdout.write(parserInstance.stringify());
return;
}
}
); |
<<<<<<<
const prismPresetDictionary = require(`./utils/preset-dictionary`)
exports.onPreInit = ({ reporter }, options) => {
if (prismPreset in prismPresetDictionary) {
prismPreset = prismPresetDictionary[prismPreset]
}
if (prismPreset) {
try {
options.prismPreset = require(prismPreset)
} catch {
reporter.warn(`It appears the prism dependency is not installed.`)
=======
exports.onPreInit = (__, options) => {
let { preset } = options
if (typeof preset === 'string') {
try {
options.preset = require(preset)
} catch {
reporter.warn(
`It appears your theme dependency is not installed. Only local styles will appear.`
)
>>>>>>>
const prismPresetDictionary = require(`./utils/preset-dictionary`)
exports.onPreInit = ({ reporter }, options) => {
if (typeof preset === 'string') {
try {
options.preset = require(preset)
} catch {
reporter.warn(
`It appears your theme dependency is not installed. Only local styles will appear.`
)
}
}
if (prismPreset in prismPresetDictionary) {
prismPreset = prismPresetDictionary[prismPreset]
}
if (prismPreset) {
try {
options.prismPreset = require(prismPreset)
} catch {
reporter.warn(`It appears the prism dependency is not installed.`)
<<<<<<<
prismPreset: JSON,
=======
preset: JSON,
>>>>>>>
prismPreset: JSON,
preset: JSON,
<<<<<<<
}
exports.sourceNodes = (
{ actions, createContentDigest },
{ prismPreset = {} }
) => {
const { createNode } = actions
const themeUiConfig = {
prismPreset,
=======
}
exports.sourceNodes = ({ actions, createContentDigest }, { preset = {} }) => {
const { createNode } = actions
const themeUiConfig = {
preset,
>>>>>>>
}
exports.sourceNodes = (
{ actions, createContentDigest },
{ preset = {}, prismPreset = {} }
) => {
const { createNode } = actions
const themeUiConfig = {
preset,
prismPreset, |
<<<<<<<
setValue: function(prop, val) {
var data = {};
if (typeof prop === 'string') {
data[prop] = val;
} else {
data = prop;
}
for (var key in data) {
if (_.has(this.fields, key)) {
this.fields[key].setValue(data[key]);
}
=======
setValue: function(data) {
var key;
for (key in this.schema) {
if (data[key] !== undefined) {
this.fields[key].setValue(data[key]);
}
>>>>>>>
setValue: function(prop, val) {
var data = {};
if (typeof prop === 'string') {
data[prop] = val;
} else {
data = prop;
}
var key;
for (key in this.schema) {
if (data[key] !== undefined) {
this.fields[key].setValue(data[key]);
} |
<<<<<<<
scss={{
color: 'text'
=======
css={{
color: 'text',
>>>>>>>
scss={{
color: 'text', |
<<<<<<<
href='#content'
scss={{
=======
href="#content"
css={{
>>>>>>>
href="#content"
scss={{ |
<<<<<<<
export const Text = React.forwardRef(function Text(props, ref) {
return (
<Box ref={ref} {...props} __themeKey="text" __css={{ label: 'Text' }} />
)
})
=======
export const Text = React.forwardRef((props, ref) => (
<Box ref={ref} variant="default" {...props} __themeKey="text" />
))
>>>>>>>
export const Text = React.forwardRef(function Text(props, ref) {
return (
<Box
ref={ref}
variant="default"
{...props}
__themeKey="text"
__css={{ label: 'Text' }}
/>
)
}) |
<<<<<<<
size='1em'
color='currentcolor'
scss={{
fontSize: [ 96, 96, 160 ],
=======
size="1em"
color="currentcolor"
css={{
fontSize: [96, 96, 160],
>>>>>>>
size="1em"
color="currentcolor"
scss={{
fontSize: [96, 96, 160], |
<<<<<<<
// Backbone - account - mapping
"main_account_mapping_title":"Маппинг DAppChain",
"main_account_mapping_text":"DAppChain - это сайдчейн сеть, разработанная на основе цепи TRON, масштабируемое решения для сети TRON. При сопоставлении с DAppChain вы получите более высокий TPS с меньшим энергопотреблением.",
"main_account_mapping_text_1":"1.Более высокий TPS с меньшим энергопотреблением",
"main_account_mapping_text_2":"2.совершенно бесплатный процесс картирования",
"main_account_mapping_btn":"Маппинг",
"main_account_mapping_success_btn":"Маппиравано",
"main_account_mapping_desc1": "Когда токен маппирован с сайдчейн, токен с тем же именем будет создан на сайдчейн",
"main_account_mapping_desc2": "После завершения маппирования, пользователи могут вкладывать токен в сайдчейн.",
// sidechain - contract - mapping
"sidechain_contract_left":"Отображение из контракта Главной Сети",
"sidechain_contract_right":" ",
// Sidechain - account - pledge
"sidechain_account_pledge_btn":"Вкладывать",
"sidechain_account_sign_btn":"Снимать",
"pledge_currency":"Токен",
"pledge_sidechain":"Сайдчейн",
"pledge_num":"Количество",
'pledge_num_error':"Количество не может превышать максимально доступный баланс",
"pledge_text":"Вклад будет потреблять определенное количество энергии",
"pledge_mapping_text":"Ваши активы не были маппированы с DAppChain и поэтому вклад не может быть совершен.",
// success
"pledge_success": "Deposit Success",
"sign_success": "Withdraw Success",
"mapping_success": "Mapping Success",
// error
"pledge_error": "Deposit Error",
"sign_error": "Withdraw Error",
"mapping_error": "Mapping Error",
=======
"price_per_1000_WIN": "PRICE PER 1000 WIN",
"WIN_distribution_overview": "WIN DISTRIBUTION OVERVIEW",
"total_WIN_supply": "Total WIN Supply",
"WIN_supply": "WIN Supply",
"WIN_Token_Release_Schedule": "WIN Token Release Schedule",
"source_WIN_team": "Source: WIN Management Team",
>>>>>>>
// Backbone - account - mapping
"main_account_mapping_title":"Маппинг DAppChain",
"main_account_mapping_text":"DAppChain - это сайдчейн сеть, разработанная на основе цепи TRON, масштабируемое решения для сети TRON. При сопоставлении с DAppChain вы получите более высокий TPS с меньшим энергопотреблением.",
"main_account_mapping_text_1":"1.Более высокий TPS с меньшим энергопотреблением",
"main_account_mapping_text_2":"2.совершенно бесплатный процесс картирования",
"main_account_mapping_btn":"Маппинг",
"main_account_mapping_success_btn":"Маппиравано",
"main_account_mapping_desc1": "Когда токен маппирован с сайдчейн, токен с тем же именем будет создан на сайдчейн",
"main_account_mapping_desc2": "После завершения маппирования, пользователи могут вкладывать токен в сайдчейн.",
// sidechain - contract - mapping
"sidechain_contract_left":"Отображение из контракта Главной Сети",
"sidechain_contract_right":" ",
// Sidechain - account - pledge
"sidechain_account_pledge_btn":"Вкладывать",
"sidechain_account_sign_btn":"Снимать",
"pledge_currency":"Токен",
"pledge_sidechain":"Сайдчейн",
"pledge_num":"Количество",
'pledge_num_error':"Количество не может превышать максимально доступный баланс",
"pledge_text":"Вклад будет потреблять определенное количество энергии",
"pledge_mapping_text":"Ваши активы не были маппированы с DAppChain и поэтому вклад не может быть совершен.",
// success
"pledge_success": "Deposit Success",
"sign_success": "Withdraw Success",
"mapping_success": "Mapping Success",
// error
"pledge_error": "Deposit Error",
"sign_error": "Withdraw Error",
"mapping_error": "Mapping Error",
"price_per_1000_WIN": "PRICE PER 1000 WIN",
"WIN_distribution_overview": "WIN DISTRIBUTION OVERVIEW",
"total_WIN_supply": "Total WIN Supply",
"WIN_supply": "WIN Supply",
"WIN_Token_Release_Schedule": "WIN Token Release Schedule",
"source_WIN_team": "Source: WIN Management Team", |
<<<<<<<
const path = require('path');
const yaml = require('js-yaml');
=======
const {EventEmitter} = require('promise-events');
>>>>>>>
const path = require('path');
const yaml = require('js-yaml');
const {EventEmitter} = require('promise-events'); |
<<<<<<<
=======
const GitHubApi = require('github');
const debug = require('debug')('PRobot');
>>>>>>>
const debug = require('debug')('PRobot');
<<<<<<<
// Cache installations
installations.load();
// Listen for new installations
installations.listen(webhook);
=======
debug('Starting');
const github = new GitHubApi({debug: false});
github.authenticate({
type: 'oauth',
token: process.env.GITHUB_TOKEN
});
>>>>>>>
debug('Starting');
// Cache installations
installations.load();
// Listen for new installations
installations.listen(webhook); |
<<<<<<<
const logger = bunyan.createLogger({
name: 'PRobot',
level: process.env.LOG_LEVEL || 'debug',
stream: bunyanFormat({outputMode: process.env.LOG_FORMAT || 'short'})
});
/** The `robot` parameter available to plugins */
=======
>>>>>>>
/** The `robot` parameter available to plugins */
<<<<<<<
/**
* A logger backed by [bunyan](https://github.com/trentm/node-bunyan)
*
* The default log level is `debug`, but you can change it by setting the
* `LOG_LEVEL` environment variable to `trace`, `info`, `warn`, `error`, or
* `fatal`.
*
* @example
*
* robot.log("This is a debug message");
* robot.log.debug("…so is this");
* robot.log.trace("Now we're talking");
* robot.log.info("I thought you should know…");
* robot.log.warn("Woah there");
* robot.log.error("ETOOMANYLOGS");
* robot.log.fatal("Goodbye, cruel world!");
*/
log(...args) {
return logger.debug(...args);
}
=======
>>>>>>> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.