conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import WalletConnectConfirmationModal from './WalletConnectConfirmationModal';
import SendQRScannerScreenWithData from './SendQRScannerScreenWithData';
=======
// import ExamplePage from './ExamplePage';
>>>>>>>
import WalletConnectConfirmationModal from './WalletConnectConfirmationModal';
// import ExamplePage from './ExamplePage'; |
<<<<<<<
const Shadow = styled(Highlight)`
background-color: ${({ highlight }) => (highlight ? '#FFFFFF33' : colors.transparent)};
`;
const UniqueTokenCard = ({
=======
const enhance = compose(
shouldUpdate((props, nextProps) => {
const isNewHeight = isNewValueForPath(props, nextProps, 'height');
const isNewUniqueId = isNewValueForPath(props, nextProps, 'uniqueId');
const isNewWidth = isNewValueForPath(props, nextProps, 'height');
return isNewHeight || isNewUniqueId || isNewWidth;
}),
withHandlers({
onPress: ({ item, onPress }) => () => {
if (onPress) {
onPress(item);
}
},
}),
);
const UniqueTokenCard = enhance(({
disabled,
height,
>>>>>>>
const Shadow = styled(Highlight)`
background-color: ${({ highlight }) => (highlight ? '#FFFFFF33' : colors.transparent)};
`;
const enhance = compose(
shouldUpdate((props, nextProps) => {
const isNewHeight = isNewValueForPath(props, nextProps, 'height');
const isNewUniqueId = isNewValueForPath(props, nextProps, 'uniqueId');
const isNewWidth = isNewValueForPath(props, nextProps, 'height');
return isNewHeight || isNewUniqueId || isNewWidth;
}),
withHandlers({
onPress: ({ item, onPress }) => () => {
if (onPress) {
onPress(item);
}
},
}),
);
const UniqueTokenCard = enhance(({
disabled,
height,
<<<<<<<
size,
highlight,
=======
resizeMode,
shadows,
width,
>>>>>>>
size,
highlight,
resizeMode,
shadows,
width,
<<<<<<<
highlight: PropTypes.bool,
=======
disabled: PropTypes.bool,
height: PropTypes.number,
>>>>>>>
disabled: PropTypes.bool,
height: PropTypes.number,
highlight: PropTypes.bool,
<<<<<<<
export default compose(
shouldUpdate((...props) => isNewValueForPath(...props, 'uniqueId')),
withHandlers({
onPress: ({ item, onPress }) => () => {
if (onPress) {
onPress(item);
}
},
}),
withProps(({ item: { uniqueId } }) => ({ uniqueId })),
withFabSendAction,
)(UniqueTokenCard);
=======
UniqueTokenCard.defaultProps = {
shadows: [
[0, 3, 5, colors.black, 0.04],
[0, 6, 10, colors.black, 0.04],
],
};
export default UniqueTokenCard;
>>>>>>>
UniqueTokenCard.defaultProps = {
shadows: [
[0, 3, 5, colors.black, 0.04],
[0, 6, 10, colors.black, 0.04],
],
};
export default compose(
shouldUpdate((...props) => isNewValueForPath(...props, 'uniqueId')),
withHandlers({
onPress: ({ item, onPress }) => () => {
if (onPress) {
onPress(item);
}
},
}),
withProps(({ item: { uniqueId } }) => ({ uniqueId })),
withFabSendAction,
)(UniqueTokenCard); |
<<<<<<<
import { colors, margin, padding } from '../../styles';
import { dimensionsPropType, sortList } from '../../utils';
=======
import { colors, margin } from '../../styles';
import { dimensionsPropType } from '../../utils';
>>>>>>>
import { colors, margin, padding } from '../../styles';
import { dimensionsPropType } from '../../utils'; |
<<<<<<<
import { get } from 'lodash';
=======
>>>>>>>
import { get } from 'lodash';
<<<<<<<
import { compose, onlyUpdateForPropTypes, withHandlers } from 'recompact';
import styled from 'styled-components/primitives';
import { withWalletConnectConnections, withSafeAreaViewInsetValues } from '../../hoc';
import { borders, colors, shadow } from '../../styles';
import { Column } from '../layout';
=======
import { pure } from 'recompact';
import { safeAreaInsetValues } from '../../utils';
import { BubbleSheet } from '../bubble-sheet';
import { FlexItem } from '../layout';
>>>>>>>
import { safeAreaInsetValues } from '../../utils';
import { BubbleSheet } from '../bubble-sheet';
import { FlexItem } from '../layout';
import { pure } from 'recompact';
<<<<<<<
renderItem={({ index, item }) => (
<WalletConnectListItem
dappUrl={item.dappUrl}
dappName={item.dappName}
dappIcon={item.dappIcon}
key={get(item, 'dappName', index)}
onPress={onHandleDisconnectAlert}
/>
)}
scrollIndicatorInsets={{
bottom: safeAreaInset.bottom,
top: SheetBorderRadius,
}}
=======
renderItem={renderItem}
scrollEventThrottle={32}
scrollIndicatorInsets={scrollIndicatorInsets}
>>>>>>>
renderItem={renderItem}
scrollEventThrottle={32}
scrollIndicatorInsets={scrollIndicatorInsets}
<<<<<<<
export default compose(
withSafeAreaViewInsetValues,
withWalletConnectConnections,
withHandlers({
onHandleDisconnectAlert: ({ walletConnectDisconnectAllByDappName }) => (dappName) => {
showActionSheetWithOptions({
cancelButtonIndex: 1,
destructiveButtonIndex: 0,
options: ['Disconnect', 'Cancel'],
title: `Would you like to disconnect from ${dappName}?`,
}, (buttonIndex) => {
if (buttonIndex === 0) {
walletConnectDisconnectAllByDappName(dappName);
}
});
},
}),
onlyUpdateForPropTypes,
)(WalletConnectList);
=======
WalletConnectList.defaultProps = {
items: [],
};
export default pure(WalletConnectList);
>>>>>>>
WalletConnectList.defaultProps = {
items: [],
};
export default pure(WalletConnectList); |
<<<<<<<
import { Centered, InnerBorder } from '../layout';
import { Monospace, TruncatedText } from '../text';
=======
import { Centered } from '../layout';
import { TruncatedText } from '../text';
import InnerBorder from '../InnerBorder';
>>>>>>>
import { Centered, InnerBorder } from '../layout';
import { TruncatedText } from '../text'; |
<<<<<<<
export const signMessage = async (message, authenticationPrompt = lang.t('account.authenticate.please')) => {
try {
const wallet = await loadWallet(authenticationPrompt);
try {
return await wallet.signMessage(message);
} catch(error) {
console.log('signMessage error', error);
AlertIOS.alert(lang.t('wallet.message_signing.failed_signing'));
return null;
}
} catch(error) {
AlertIOS.alert(lang.t('wallet.transaction.alert.authentication'));
return null;
}
};
export const loadSeedPhrase = async () => {
const authenticationPrompt = lang.t('account.authenticate.please_seed_phrase');
=======
export const loadSeedPhrase = async (authenticationPrompt = lang.t('account.authenticate.please_seed_phrase')) => {
>>>>>>>
export const signMessage = async (message, authenticationPrompt = lang.t('account.authenticate.please')) => {
try {
const wallet = await loadWallet(authenticationPrompt);
try {
return await wallet.signMessage(message);
} catch(error) {
console.log('signMessage error', error);
AlertIOS.alert(lang.t('wallet.message_signing.failed_signing'));
return null;
}
} catch(error) {
AlertIOS.alert(lang.t('wallet.transaction.alert.authentication'));
return null;
}
};
export const loadSeedPhrase = async (authenticationPrompt = lang.t('account.authenticate.please_seed_phrase')) => { |
<<<<<<<
=======
import ButtonPressAnimation from '../animations/ButtonPressAnimation';
import InnerBorder from '../InnerBorder';
>>>>>>> |
<<<<<<<
await walletConnectSendTransactionHash(walletConnector, transactionDetails.transactionId, true, transactionHash);
=======
await walletConnectSendTransactionHash(walletConnector, transactionDetails.callId, true, transactionReceipt.hash);
>>>>>>>
await walletConnectSendTransactionHash(walletConnector, transactionDetails.callId, true, transactionHash); |
<<<<<<<
const AssetListHeader = ({ section: { contextMenuOptions, title, totalValue } }) => (
=======
const AssetListHeader = ({
section: {
showContextMenu,
title,
totalValue,
},
}) => (
>>>>>>>
const AssetListHeader = ({
section: {
contextMenuOptions,
title,
totalValue,
},
}) => ( |
<<<<<<<
var xscales = [], xscale, yscales = [], yscale;
var tooltips = [], tooltip;
=======
var xscales = [], xscale;
var yscale = d3.scale.linear().range([100,0]);
>>>>>>>
var xscales = [], xscale;
var yscale = d3.scale.linear().range([100,0]);
var tooltips = [], tooltip;
<<<<<<<
y = yscales[barChart.id],
tooltip = tooltips[barChart.id],
=======
y = yscale,
>>>>>>>
y = yscale,
tooltip = tooltips[barChart.id], |
<<<<<<<
import themeBuildings from './templates/buildings'
import themeHighways from './templates/highways'
import themePois from './templates/pois'
import themeWaterways from './templates/waterways'
import themeBuiltup from './templates/builtup'
const buildings = {
aggregatedFill: '#FDB863',
highlightFill: '#5CBAD8',
outline: '#E08214'
}
const highways = {
aggregatedFill: '#9e9ac8',
highlightFill: '#5CBAD8'
}
const pois = {
aggregatedFill: '#FF0000',
highlightFill: '#5CBAD8'
}
const waterways = {
aggregatedFill: '#c89ab7',
highlightFill: '#5CBAD8'
}
const builtup = {
aggregatedFill: '#666',
highlightFill: '#666'
}
=======
>>>>>>>
<<<<<<<
styles: {
buildings,
highways,
pois,
waterways,
builtup,
},
buildings: themeBuildings(buildings),
highways: themeHighways(highways),
pois: themePois(pois),
waterways: themeWaterways(waterways),
builtup: themeBuiltup(builtup)
=======
layerStyles: {}
>>>>>>>
layerStyles: {
builtup: {
"aggregated": {
"line-color": '#666'
},
"aggregated-highlight": {
"line-color": '#666'
}
}
} |
<<<<<<<
=======
// all comments are now indexed by node association
"comments": {
"type": "comment",
"properties": ["node"]
}
>>>>>>> |
<<<<<<<
* HELLO: 'hello',
* READY: 'shardReady',
* RESUMED: 'shardResume',
* RECONNECT: 'shardReconnecting',
* INVALID_SESSION: 'shardDisconnect',
* CHANNEL_CREATE: 'channelCreate',
* CHANNEL_UPDATE: 'channelUpdate',
* CHANNEL_DELETE: 'channelDelete',
* CHANNEL_PINS_UPDATE: 'channelPinUpdate',
* GUILD_CREATE: 'guildCreate',
* GUILD_UPDATE: 'guildUpdate',
* GUILD_DELETE: 'guildDelete',
* GUILD_BAN_ADD: 'guildBanAdd',
* GUILD_BAN_REMOVE: 'guildBanRemove',
* GUILD_EMOJIS_UPDATE: 'guildEmojisUpdate', // emojiCreate, emojiDelete
* GUILD_INTEGRATIONS_UPDATE: '',
* GUILD_MEMBER_ADD: 'guildMemberAdd',
* GUILD_MEMBER_REMOVE: 'guildMemberRemove',
* GUILD_MEMBER_UPDATE: 'guildMemberUpdate',
* GUILD_MEMBERS_CHUNK: 'guildMemberChunk',
* GUILD_ROLE_CREATE: 'guildRoleCreate',
* GUILD_ROLE_UPDATE: 'guildRoleUpdate',
* GUILD_ROLE_DELETE: 'guildRoleDelete',
* INVITE_CREATE: 'inviteCreate',
* INVITE_DELETE: 'inviteDelete',
* MESSAGE_CREATE: 'messageCreate',
* MESSAGE_UPDATE: 'messageUpdate',
* MESSAGE_DELETE: 'messageDelete',
* MESSAGE_DELETE_BULK: 'messageDeleteBulk',
* MESSAGE_REACTION_ADD: 'messageReactionAdd',
* MESSAGE_REACTION_REMOVE: 'messageReactionRemove',
* MESSAGE_REACTION_REMOVE_ALL: 'messageReactionRemoveAll',
* MESSAGE_REACTION_REMOVE_EMOJI: 'messageReactionRemoveEmoji',
* PRESENCE_UPDATE: 'presenceUpdate',
* TYPING_START: 'typingStart',
* USER_UPDATE: 'userUpdate',
* VOICE_STATE_UPDATE: 'voiceStateUpdate',
* VOICE_SERVER_UPDATE: '',
* WEBHOOKS_UPDATE: 'webhooksUpdate',
=======
* CHANNEL_CREATE: 'channelCreate'
* CHANNEL_DELETE: 'channelDelete'
* CHANNEL_UPDATE: 'channelUpdate'
* CHANNEL_PIN_UPDATE: 'channelPinUpdate'
* GUILD_AVAILABLE: 'guildAvailable'
* GUILD_CREATE: 'guildCreate'
* GUILD_DELETE: 'guildDelete'
* GUILD_EMOJIS_UPDATE: 'guildEmojisUpdate'
* GUILD_BAN_ADD: 'guildBanAdd'
* GUILD_BAN_REMOVE: 'guildBanRemove'
* GUILD_MEMBER_ADD: 'guildMemberAdd'
* GUILD_MEMBER_CHUNK: 'guildMemberChunk'
* GUILD_MEMBER_REMOVE: 'guildMemberRemove'
* GUILD_MEMBER_UPDATE: 'guildMemberUpdate'
* GUILD_ROLE_CREATE: 'roleCreate'
* GUILD_ROLE_DELETE: 'roleDelete'
* GUILD_ROLE_UPDATE: 'roleUpdate'
* GUILD_UNAVAILABLE: 'guildUnavailable'
* GUILD_UPDATE: 'guildUpdate'
* INVITE_CREATE: 'inviteCreate'
* INIVTE_DELETE: 'inviteDelete'
* MESSAGE_CREATE: 'messageCreate'
* MESSAGE_DELETE_BULK: 'messageDeleteBulk'
* MESSAGE_DELETE: 'messageDelete'
* MESSAGE_REACTION_ADD: 'messageReactionAdd'
* MESSAGE_REACTION_REMOVE_ALL: 'messageReactionRemoveAll'
* MESSAGE_REACTION_REMOVE_EMOJI: 'messageReactionRemoveEmoji'
* MESSAGE_REACTION_REMOVE: 'messageReactionRemove'
* MESSAGE_UPDATE: 'messageUpdate'
* PRESENCE_UPDATE: 'presenceUpdate'
* SHARD_DISCONNECT: 'shardDisconnect'
* SHARD_PRE_READY: 'shardPreReady'
* SHARD_READY: 'shardReady'
* SHARD_RESUME: 'shardResume'
* TYPING_START: 'typingStart'
* UNAVAILABLE_GUILD_CREATE: 'unavailableGuildCreate'
* USER_UPDATE: 'userUpdate'
* VOICE_CHANNEL_JOIN: 'voicecChannelJoin'
* VOICE_CHANNEL_LEAVE: 'voiceChannelLeave'
* VOICE_CHANNEL_SWITCH: 'voiceChannelSwitch'
* VOICE_STATE_UPDATE: 'voiceStateUpdate'
* WEBHOOKS_UPDATE: 'webhookUpdate'
* UNKNOWN: 'unknown'
* CONNECT: 'connect'
* DISCONNECT: 'disconnect'
* ERROR: 'error'
* WARN: 'warn'
* DEBUG: 'debug'
* READY: 'ready'
* HELLO: 'hello'
* RATE_LIMIT: 'rateLimit'
* RAW_WS: 'rawWS'
>>>>>>>
* HELLO: 'hello',
* READY: 'shardReady',
* RESUMED: 'shardResume',
* RECONNECT: 'shardReconnecting',
* INVALID_SESSION: 'shardDisconnect',
* CHANNEL_CREATE: 'channelCreate',
* CHANNEL_UPDATE: 'channelUpdate',
* CHANNEL_DELETE: 'channelDelete',
* CHANNEL_PINS_UPDATE: 'channelPinUpdate',
* GUILD_CREATE: 'guildCreate',
* GUILD_UPDATE: 'guildUpdate',
* GUILD_DELETE: 'guildDelete',
* GUILD_BAN_ADD: 'guildBanAdd',
* GUILD_BAN_REMOVE: 'guildBanRemove',
* GUILD_EMOJIS_UPDATE: 'guildEmojisUpdate',
* GUILD_INTEGRATIONS_UPDATE: '',
* GUILD_MEMBER_ADD: 'guildMemberAdd',
* GUILD_MEMBER_REMOVE: 'guildMemberRemove',
* GUILD_MEMBER_UPDATE: 'guildMemberUpdate',
* GUILD_MEMBERS_CHUNK: 'guildMemberChunk',
* GUILD_ROLE_CREATE: 'guildRoleCreate',
* GUILD_ROLE_UPDATE: 'guildRoleUpdate',
* GUILD_ROLE_DELETE: 'guildRoleDelete',
* INVITE_CREATE: 'inviteCreate',
* INVITE_DELETE: 'inviteDelete',
* MESSAGE_CREATE: 'messageCreate',
* MESSAGE_UPDATE: 'messageUpdate',
* MESSAGE_DELETE: 'messageDelete',
* MESSAGE_DELETE_BULK: 'messageDeleteBulk',
* MESSAGE_REACTION_ADD: 'messageReactionAdd',
* MESSAGE_REACTION_REMOVE: 'messageReactionRemove',
* MESSAGE_REACTION_REMOVE_ALL: 'messageReactionRemoveAll',
* MESSAGE_REACTION_REMOVE_EMOJI: 'messageReactionRemoveEmoji',
* PRESENCE_UPDATE: 'presenceUpdate',
* TYPING_START: 'typingStart',
* USER_UPDATE: 'userUpdate',
* VOICE_STATE_UPDATE: 'voiceStateUpdate',
* VOICE_SERVER_UPDATE: '',
* WEBHOOKS_UPDATE: 'webhooksUpdate', |
<<<<<<<
if (raw.total < prev.total) raw.total = prev.total;
if (raw.hospitalized < prev.hospitalized) raw.hospitalized = prev.hospitalized;
d.ConfirmedGrowth = raw.positive - prev.positive;
d.DailyDeaths = raw.death - prev.death;
d.DailyHospitalized = raw.hospitalized - prev.hospitalized;
d.DailyTests = raw.total - prev.total;
=======
if (raw[testStat] < prev[testStat]) raw[testStat] = prev[testStat];
if (raw[hospitalizedStat] < prev[hospitalizedStat]) raw[hospitalizedStat] = prev[hospitalizedStat];
d.ConfirmedGrowth = raw[positiveStat] - prev[positiveStat];
>>>>>>>
if (raw[testStat] < prev[testStat]) raw[testStat] = prev[testStat];
if (raw[hospitalizedStat] < prev[hospitalizedStat]) raw[hospitalizedStat] = prev[hospitalizedStat];
d.ConfirmedGrowth = raw[positiveStat] - prev[positiveStat];
d.DailyDeaths = raw.death - prev.death;
d.DailyHospitalized = raw.hospitalized - prev.hospitalized;
d.DailyTests = raw.total - prev.total; |
<<<<<<<
let scriptingEnabled = false
=======
// https://gist.github.com/timoxley/1689041
function isPortTaken (port, fn) {
const net = require('net')
const tester = net.createServer()
.once('error', function (err) {
if (err.code != 'EADDRINUSE') return fn(err)
fn(null, true)
})
.once('listening', function() {
tester.once('close', function() { fn(null, false) })
.close()
})
.listen(port)
}
>>>>>>>
let scriptingEnabled = false
// https://gist.github.com/timoxley/1689041
function isPortTaken (port, fn) {
const net = require('net')
const tester = net.createServer()
.once('error', function (err) {
if (err.code != 'EADDRINUSE') return fn(err)
fn(null, true)
})
.once('listening', function() {
tester.once('close', function() { fn(null, false) })
.close()
})
.listen(port)
}
<<<<<<<
console.warn('Consent not given to use launcher_profiles.json - online mode will not work')
}
const targetClient = mc.createClient({
host: host,
port: port,
username: client.username,
keepAlive: false,
version: version,
profilesFolder: authConsent ? minecraftFolder : undefined
})
realServer = targetClient
function handleServerboundPacket (data, meta, raw) {
// console.log('serverbound packet', meta, data)
if (targetClient.state === states.PLAY && meta.state === states.PLAY) {
const id = Object.keys(toServerMappings).find(key => toServerMappings[key] === meta.name)
// Stops standardjs from complaining (no-callback-literal)
const direction = 'serverbound'
const canUseScripting = true
// callback(direction, meta, data, id)
if (!endedTargetClient) {
// When scripting is enabled, the script sends packets
if (!scriptingEnabled) {
targetClient.write(meta.name, data)
}
callback(direction, meta, data, id, raw, canUseScripting)
=======
let srv
try {
srv = mc.createServer({
'online-mode': false,
port: listenPort,
keepAlive: false,
version: version
})
console.log('Proxy started (Java)!')
} catch (err) {
let header = 'Unable to start pakkit'
let message = err.message
if (err.message.includes('EADDRINUSE')) {
message = 'The port ' + listenPort + ' is in use. ' +
'Make sure to close any other instances of pakkit running on the same port or try a different port.'
>>>>>>>
let srv
try {
srv = mc.createServer({
'online-mode': false,
port: listenPort,
keepAlive: false,
version: version
})
console.log('Proxy started (Java)!')
} catch (err) {
let header = 'Unable to start pakkit'
let message = err.message
if (err.message.includes('EADDRINUSE')) {
message = 'The port ' + listenPort + ' is in use. ' +
'Make sure to close any other instances of pakkit running on the same port or try a different port.'
<<<<<<<
}
function handleClientboundPacket (data, meta, raw) {
if (meta.state === states.PLAY && client.state === states.PLAY) {
const id = Object.keys(toClientMappings).find(key => toClientMappings[key] === meta.name)
// Stops standardjs from complaining (no-callback-literal)
const direction = 'clientbound'
const canUseScripting = true
// callback(direction, meta, data, id)
if (!endedClient) {
// When scripting is enabled, the script sends packets
if (!scriptingEnabled) {
client.write(meta.name, data)
}
callback(direction, meta, data, id, raw, true)
if (meta.name === 'set_compression') {
client.compressionThreshold = data.threshold
} // Set compression
=======
srv.on('login', function (client) {
realClient = client
const addr = client.socket.remoteAddress
console.log('Incoming connection', '(' + addr + ')')
let endedClient = false
let endedTargetClient = false
client.on('end', function () {
endedClient = true
console.log('Connection closed by client', '(' + addr + ')')
if (!endedTargetClient) { targetClient.end('End') }
})
client.on('error', function (err) {
endedClient = true
console.log('Connection error by client', '(' + addr + ')')
console.log(err.stack)
if (!endedTargetClient) { targetClient.end('Error') }
})
if (authConsent) {
console.log('Will attempt to use launcher_profiles.json for online mode login data')
} else {
console.warn('Consent not given to use launcher_profiles.json - online mode will not work')
>>>>>>>
srv.on('login', function (client) {
realClient = client
const addr = client.socket.remoteAddress
console.log('Incoming connection', '(' + addr + ')')
let endedClient = false
let endedTargetClient = false
client.on('end', function () {
endedClient = true
console.log('Connection closed by client', '(' + addr + ')')
if (!endedTargetClient) { targetClient.end('End') }
})
client.on('error', function (err) {
endedClient = true
console.log('Connection error by client', '(' + addr + ')')
console.log(err.stack)
if (!endedTargetClient) { targetClient.end('Error') }
})
if (authConsent) {
console.log('Will attempt to use launcher_profiles.json for online mode login data')
} else {
console.warn('Consent not given to use launcher_profiles.json - online mode will not work') |
<<<<<<<
modifyPackets: true,
jsonData: true,
wikiVgPage: 'https://wiki.vg/Bedrock_Protocol'
=======
modifyPackets: false,
jsonData: false,
rawData: false
>>>>>>>
modifyPackets: true,
jsonData: true,
rawData: true,
wikiVgPage: 'https://wiki.vg/Bedrock_Protocol' |
<<<<<<<
const packetElement = document.getElementById(packet.meta.name + '-' + packet.direction)
if (packetElement) {
const checkbox = packetElement.firstElementChild
checkbox.checked = false
checkbox.readOnly = false
checkbox.indeterminate = false
}
=======
const checkbox = document.getElementById(packet.meta.name + '-' + packet.direction).firstElementChild
checkbox.checked = false
checkbox.readOnly = false
checkbox.indeterminate = false
deselectPacket()
>>>>>>>
const packetElement = document.getElementById(packet.meta.name + '-' + packet.direction)
if (packetElement) {
const checkbox = packetElement.firstElementChild
checkbox.checked = false
checkbox.readOnly = false
checkbox.indeterminate = false
}
deselectPacket() |
<<<<<<<
'flow',
'flowComments',
'jsx',
=======
'jsx',
['flow': {all: true}],
'asyncFunctions',
'classConstructorCall',
'doExpressions',
'trailingFunctionCommas',
'objectRestSpread',
['decorators', {decoratorsBeforeExport: false, legacy: true}],
'classProperties',
'exportExtensions',
'exponentiationOperator',
>>>>>>>
['flow': {all: true}],
'flowComments',
'jsx', |
<<<<<<<
onRemove: function(map) {
for (var i = 0; i < this._providers.length; i++) {
var p = this._providers[i];
if (p.active) {
this._map.attributionControl.removeAttribution(p.attrib);
p.active = false;
}
}
L.TileLayer.prototype.onRemove.apply(this, [map]);
}
});
L.bingLayer = function (key, options) {
return new L.BingLayer(key, options);
};
=======
var bounds = this._map.getBounds();
var zoom = this._map.getZoom();
for (var i = 0; i < this._providers.length; i++) {
var p = this._providers[i];
if ((zoom <= p.zoomMax && zoom >= p.zoomMin) &&
bounds.intersects(p.bounds)) {
if (!p.active) {
if (this._map.attributionControl) {
this._map.attributionControl.addAttribution(p.attrib);
}
}
p.active = true;
} else {
if (p.active) {
if (this._map.attributionControl) {
this._map.attributionControl.removeAttribution(p.attrib);
}
}
p.active = false;
}
}
},
onRemove: function(map) {
for (var i = 0; i < this._providers.length; i++) {
var p = this._providers[i];
if (p.active) {
if (this._map.attributionControl) {
this._map.attributionControl.removeAttribution(p.attrib);
}
p.active = false;
}
}
L.TileLayer.prototype.onRemove.apply(this, [map]);
}
});
>>>>>>>
var bounds = this._map.getBounds();
var zoom = this._map.getZoom();
for (var i = 0; i < this._providers.length; i++) {
var p = this._providers[i];
if ((zoom <= p.zoomMax && zoom >= p.zoomMin) &&
bounds.intersects(p.bounds)) {
if (!p.active) {
if (this._map.attributionControl) {
this._map.attributionControl.addAttribution(p.attrib);
}
}
p.active = true;
} else {
if (p.active) {
if (this._map.attributionControl) {
this._map.attributionControl.removeAttribution(p.attrib);
}
}
p.active = false;
}
}
},
onRemove: function(map) {
for (var i = 0; i < this._providers.length; i++) {
var p = this._providers[i];
if (p.active) {
if (this._map.attributionControl) {
this._map.attributionControl.removeAttribution(p.attrib);
}
p.active = false;
}
}
L.TileLayer.prototype.onRemove.apply(this, [map]);
}
});
L.bingLayer = function (key, options) {
return new L.BingLayer(key, options);
}; |
<<<<<<<
// const defaultIndexingServerUrl = `${defaultBridgeServer}/api`
=======
>>>>>>>
// const defaultIndexingServerUrl = `${defaultBridgeServer}/api`
<<<<<<<
// indexingServerUrl = defaultIndexingServerUrl,
=======
discoveryServer = defaultDiscoveryServer,
discoveryServerPort = defaultDiscoveryServerPort,
>>>>>>>
// indexingServerUrl = defaultIndexingServerUrl,
discoveryServer = defaultDiscoveryServer,
discoveryServerPort = defaultDiscoveryServerPort, |
<<<<<<<
<FormattedMessage
id={ 'listing-detail.purchaseSuccessful' }
defaultMessage={ 'Purchase was successful.' }
/>
<br />
<a href="#" onClick={e => {
e.preventDefault()
window.location.reload()
}}>
<FormattedMessage
id={ 'listing-detail.reloadPageMessage' }
defaultMessage={ 'Reload page' }
/>
</a>
=======
Purchase was successful.
<div className="button-container">
<Link to="/my-purchases" className="btn btn-clear">
Go To Purchases
</Link>
</div>
>>>>>>>
<FormattedMessage
id={ 'listing-detail.purchaseSuccessful' }
defaultMessage={ 'Purchase was successful.' }
/>
<div className="button-container">
<Link to="/my-purchases" className="btn btn-clear">
<FormattedMessage
id={ 'listing-detail.goToPurchases' }
defaultMessage={ 'Go To Purchases' }
/>
</Link>
</div>
<<<<<<<
<FormattedMessage
id={ 'listing-detail.errorPurchasingListing' }
defaultMessage={ 'There was a problem purchasing this listing.' }
/>
<br />
<FormattedMessage
id={ 'listing-detail.seeConsoleForDetails' }
defaultMessage={ 'See the console for more details.' }
/>
<br />
<a
href="#"
onClick={e => {
e.preventDefault()
this.resetToStepOne()
}}
>
<FormattedMessage
id={ 'listing-detail.OK' }
defaultMessage={ 'OK' }
/>
</a>
=======
There was a problem purchasing this listing.<br />See the console for more details.
<div className="button-container">
<a
className="btn btn-clear"
onClick={e => {
e.preventDefault()
this.resetToStepOne()
}}
>
OK
</a>
</div>
>>>>>>>
<FormattedMessage
id={ 'listing-detail.errorPurchasingListing' }
defaultMessage={ 'There was a problem purchasing this listing.' }
/>
<br />
<FormattedMessage
id={ 'listing-detail.seeConsoleForDetails' }
defaultMessage={ 'See the console for more details.' }
/>
<div className="button-container">
<a
className="btn btn-clear"
onClick={e => {
e.preventDefault()
this.resetToStepOne()
}}
>
<FormattedMessage
id={ 'listing-detail.OK' }
defaultMessage={ 'OK' }
/>
</a>
</div>
<<<<<<<
{!!this.state.unitsAvailable && this.state.unitsAvailable < 5 &&
<div className="units-available text-danger">
<FormattedMessage
id={ 'listing-detail.unitsAvailable' }
defaultMessage={ 'Just {unitsAvailable} left!' }
values={{ unitsAvailable: <FormattedNumber value={ this.state.unitsAvailable } /> }}
/>
</div>
}
=======
{/* Via Stan 5/25/2018: Hide until contracts allow for unitsAvailable > 1 */}
{/*!!unitsAvailable && unitsAvailable < 5 &&
<div className="units-available text-danger">Just {unitsAvailable.toLocaleString()} left!</div>
*/}
>>>>>>>
{/* Via Stan 5/25/2018: Hide until contracts allow for unitsAvailable > 1 */}
{/*!!unitsAvailable && unitsAvailable < 5 &&
<div className="units-available text-danger">
<FormattedMessage
id={ 'listing-detail.unitsAvailable' }
defaultMessage={ 'Just {unitsAvailable} left!' }
values={{ unitsAvailable: <FormattedNumber value={ this.state.unitsAvailable } /> }}
/>
</div>
*/}
<<<<<<<
<li>
<FormattedMessage
id={ 'listing-detail.IPFS' }
defaultMessage={ 'IPFS: {ipfsHash}' }
values={{ ipfsHash: this.state.ipfsHash }}
/>
</li>
<li>
<FormattedMessage
id={ 'listing-detail.seller' }
defaultMessage={ 'Seller: {sellerAddress}' }
values={{ sellerAddress: this.state.sellerAddress }}
/>
</li>
<li>
<FormattedMessage
id={ 'listing-detail.units' }
defaultMessage={ 'Units: {unitsAvailable}' }
values={{ unitsAvailable: this.state.unitsAvailable }}
/>
</li>
=======
<li>IPFS: {this.state.ipfsHash}</li>
<li>Seller: {this.state.sellerAddress}</li>
<li>Units: {unitsAvailable}</li>
>>>>>>>
<li>
<FormattedMessage
id={ 'listing-detail.IPFS' }
defaultMessage={ 'IPFS: {ipfsHash}' }
values={{ ipfsHash: this.state.ipfsHash }}
/>
</li>
<li>
<FormattedMessage
id={ 'listing-detail.seller' }
defaultMessage={ 'Seller: {sellerAddress}' }
values={{ sellerAddress: this.state.sellerAddress }}
/>
</li>
<li>
<FormattedMessage
id={ 'listing-detail.IPFS' }
defaultMessage={ 'IPFS: {ipfsHash}' }
values={{ ipfsHash: this.state.ipfsHash }}
/>
</li>
<<<<<<<
export default connect(undefined, mapDispatchToProps)(injectIntl(ListingsDetail))
=======
export default connect(mapStateToProps, mapDispatchToProps)(ListingsDetail)
>>>>>>>
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListingsDetail)) |
<<<<<<<
=======
const alertify = require('../../node_modules/alertify/src/alertify.js')
>>>>>>>
const alertify = require('../../node_modules/alertify/src/alertify.js') |
<<<<<<<
this.debouncedFetchUser(ETH_ADDRESS)
const scopedWelcomeMessageKeyName = `${storeKeys.messageWelcomeTimestamp}:${web3Account}`
const welcomeTimestampString = localStorage.getItem(scopedWelcomeMessageKeyName)
const welcomeTimestamp = welcomeTimestampString ?
new Date(+welcomeTimestampString) :
Date.now()
!welcomeTimestampString && localStorage.setItem(
scopedWelcomeMessageKeyName,
JSON.stringify(welcomeTimestamp)
=======
const scopedWelcomeMessageKeyName = `${
storeKeys.messageWelcomeTimestamp
}:${web3Account}`
const welcomeTimestampString = localStorage.getItem(
scopedWelcomeMessageKeyName
>>>>>>>
this.debouncedFetchUser(ETH_ADDRESS)
const scopedWelcomeMessageKeyName = `${
storeKeys.messageWelcomeTimestamp
}:${web3Account}`
const welcomeTimestampString = localStorage.getItem(
scopedWelcomeMessageKeyName
<<<<<<<
this.debouncedFetchUser(ETH_ADDRESS)
const scopedCongratsMessageKeyName = `${storeKeys.messageCongratsTimestamp}:${web3Account}`
const congratsTimestampString = localStorage.getItem(scopedCongratsMessageKeyName)
const congratsTimestamp = congratsTimestampString ?
new Date(+congratsTimestampString) :
Date.now()
!congratsTimestampString && localStorage.setItem(
scopedCongratsMessageKeyName,
JSON.stringify(congratsTimestamp)
=======
const scopedCongratsMessageKeyName = `${
storeKeys.messageCongratsTimestamp
}:${web3Account}`
const congratsTimestampString = localStorage.getItem(
scopedCongratsMessageKeyName
>>>>>>>
this.debouncedFetchUser(ETH_ADDRESS)
const scopedCongratsMessageKeyName = `${
storeKeys.messageCongratsTimestamp
}:${web3Account}`
const congratsTimestampString = localStorage.getItem(
scopedCongratsMessageKeyName |
<<<<<<<
<FormattedMessage
id={ 'listing-create.successMessage' }
defaultMessage={ 'Success' }
/>
<br />
<Link to="/">
<FormattedMessage
id={ 'listing-create.seeAllListings' }
defaultMessage={ 'See All Listings' }
/>
</Link>
=======
Success
<div className="button-container">
<Link to="/" className="btn btn-clear">See All Listings</Link>
</div>
>>>>>>>
<FormattedMessage
id={ 'listing-create.successMessage' }
defaultMessage={ 'Success' }
/>
<div className="button-container">
<Link to="/" className="btn btn-clear">
<FormattedMessage
id={ 'listing-create.seeAllListings' }
defaultMessage={ 'See All Listings' }
/>
</Link>
</div>
<<<<<<<
<FormattedMessage
id={ 'listing-create.error1' }
defaultMessage={ 'There was a problem creating this listing.' }
/>
<br />
<FormattedMessage
id={ 'listing-create.error2' }
defaultMessage={ 'See the console for more details.' }
/>
<br />
<a
href="#"
onClick={e => {
e.preventDefault()
this.resetToPreview()
}}
>
<FormattedMessage
id={ 'listing-create.OK' }
defaultMessage={ 'OK' }
/>
</a>
=======
There was a problem creating this listing.<br />See the console for more details.
<div className="button-container">
<a
className="btn btn-clear"
onClick={e => {
e.preventDefault()
this.resetToPreview()
}}
>
OK
</a>
</div>
>>>>>>>
<FormattedMessage
id={ 'listing-create.error1' }
defaultMessage={ 'There was a problem creating this listing.' }
/>
<br />
<FormattedMessage
id={ 'listing-create.error2' }
defaultMessage={ 'See the console for more details.' }
/>
<div className="button-container">
<a
className="btn btn-clear"
onClick={e => {
e.preventDefault()
this.resetToPreview()
}}
>
<FormattedMessage
id={ 'listing-create.OK' }
defaultMessage={ 'OK' }
/>
</a>
</div> |
<<<<<<<
import React, { Component } from 'react'
import { FormattedMessage } from 'react-intl'
=======
import React, { Component, Fragment } from 'react'
import { connect } from 'react-redux'
import { withRouter } from 'react-router'
>>>>>>>
import { FormattedMessage } from 'react-intl'
import React, { Component, Fragment } from 'react'
import { connect } from 'react-redux'
import { withRouter } from 'react-router'
<<<<<<<
<FormattedMessage
id={ 'web3-provider.notSignedIntoMetaMask' }
defaultMessage={ 'You are not signed in to MetaMask.' }
/>
<br />
=======
>>>>>>>
<FormattedMessage
id={ 'web3-provider.notSignedIntoMetaMask' }
defaultMessage={ 'You are not signed in to MetaMask.' }
/>
<br />
<<<<<<<
<FormattedMessage
id={ 'web3-provider.wrongNetwork' }
defaultMessage={ 'MetaMask should be on {rinkeby} Network' }
values={{ rinkeby: <strong>Rinkeby</strong> }}
/>
<br />
<FormattedMessage
id={ 'web3-provider.currentNetwork' }
defaultMessage={ 'Currently on {networkName}.' }
values={{ networkName: props.currentNetworkName }}
/>
=======
<p>
<span className="line">{ (props.onMobile) ? "Your wallet-enabled browser" : "MetaMask" } should be on </span>
<span className="line"><strong>Rinkeby Test Network</strong></span>
</p>
Currently on {props.currentNetworkName}.
>>>>>>>
<p>
<span className="line">{ (props.onMobile) ? "Your wallet-enabled browser" : "MetaMask" } should be on </span>
<span className="line"><strong>Rinkeby Test Network</strong></span>
</p>
Currently on {props.currentNetworkName}.
<<<<<<<
<FormattedMessage
id={ 'web3-provider.installMetaMask' }
defaultMessage={ 'Please use a web3-enabled browser or install the MetaMask extension.' }
/>
<br />
<a target="_blank" href="https://metamask.io/" rel="noopener noreferrer">
<FormattedMessage
id={ 'web3-provider.getMetaMask' }
defaultMessage={ 'Get MetaMask' }
/>
</a>
<br />
<a
target="_blank"
href="https://medium.com/originprotocol/origin-demo-dapp-is-now-live-on-testnet-835ae201c58"
rel="noopener noreferrer"
>
<FormattedMessage
id={ 'web3-provider.demoInstructions' }
defaultMessage={ 'Full Instructions for Demo' }
/>
</a>
=======
{(!props.onMobile || (props.onMobile === "Android")) &&
<div>Please install the MetaMask extension<br />to access this site.<br />
<a target="_blank" href="https://metamask.io/">Get MetaMask</a><br />
<a target="_blank" href="https://medium.com/originprotocol/origin-demo-dapp-is-now-live-on-testnet-835ae201c58">
Full Instructions for Demo
</a>
</div>
}
{(props.onMobile && (props.onMobile !== "Android")) &&
<div>Please access this site through <br />a wallet-enabled browser:<br />
<a target="_blank" href="https://itunes.apple.com/us/app/toshi-ethereum/id1278383455">Toshi</a> |
<a target="_blank" href="https://itunes.apple.com/us/app/cipher-browser-ethereum/id1294572970">Cipher</a> |
<a target="_blank" href="https://itunes.apple.com/ae/app/trust-ethereum-wallet/id1288339409">Trust Wallet</a>
</div>
}
>>>>>>>
{(!props.onMobile || (props.onMobile === "Android")) &&
<div>Please install the MetaMask extension<br />to access this site.<br />
<a target="_blank" href="https://metamask.io/">Get MetaMask</a><br />
<a target="_blank" href="https://medium.com/originprotocol/origin-demo-dapp-is-now-live-on-testnet-835ae201c58">
Full Instructions for Demo
</a>
</div>
}
{(props.onMobile && (props.onMobile !== "Android")) &&
<div>Please access this site through <br />a wallet-enabled browser:<br />
<a target="_blank" href="https://itunes.apple.com/us/app/toshi-ethereum/id1278383455">Toshi</a> |
<a target="_blank" href="https://itunes.apple.com/us/app/cipher-browser-ethereum/id1294572970">Cipher</a> |
<a target="_blank" href="https://itunes.apple.com/ae/app/trust-ethereum-wallet/id1288339409">Trust Wallet</a>
</div>
} |
<<<<<<<
<Link to="/my-purchases" className="nav-item nav-link">
<FormattedMessage
id={ 'navbar.buy' }
defaultMessage={ 'Buy' }
/>
</Link>
=======
<Link to="/" className="d-lg-none nav-item nav-link">Listings</Link>
<Link to="/my-purchases" className="nav-item nav-link">Buy</Link>
>>>>>>>
<Link to="/" className="d-lg-none nav-item nav-link">
<FormattedMessage
id={ 'navbar.listings' }
defaultMessage={ 'Listings' }
/>
</Link>
<Link to="/my-purchases" className="nav-item nav-link">
<FormattedMessage
id={ 'navbar.buy' }
defaultMessage={ 'Buy' }
/>
</Link>
<<<<<<<
<Link to="/my-listings" className="dropdown-item">
<FormattedMessage
id={ 'navbar.myListings' }
defaultMessage={ 'My Listings' }
/>
</Link>
<Link to="/my-sales" className="dropdown-item">
<FormattedMessage
id={ 'navbar.mySales' }
defaultMessage={ 'My Sales' }
/>
</Link>
<Link to="/create" className="dropdown-item d-none d-lg-block">
<FormattedMessage
id={ 'navbar.addListing' }
defaultMessage={ 'Add a Listing' }
/>
</Link>
=======
<Link to="/my-listings" className="dropdown-item">My Listings</Link>
<Link to="/my-sales" className="dropdown-item">My Sales</Link>
<Link to="/create" className="dropdown-item d-none d-lg-block" onClick={this.handleLink}>
Add a Listing
</Link>
>>>>>>>
<Link to="/my-listings" className="dropdown-item">
<FormattedMessage
id={ 'navbar.myListings' }
defaultMessage={ 'My Listings' }
/>
</Link>
<Link to="/my-sales" className="dropdown-item">
<Link to="/my-sales" className="dropdown-item">
<FormattedMessage
id={ 'navbar.mySales' }
defaultMessage={ 'My Sales' }
/>
</Link>
</Link>
<Link to="/create" className="dropdown-item d-none d-lg-block" onClick={this.handleLink}>
<FormattedMessage
id={ 'navbar.addListing' }
defaultMessage={ 'Add a Listing' }
/>
</Link>
<<<<<<<
<Link to="/create" className="nav-item nav-link"><img src="images/add-listing-icon.svg" alt="Add Listing" className="add-listing" />
<FormattedMessage
id={ 'navbar.addListing' }
defaultMessage={ 'Add a Listing' }
/>
</Link>
=======
<Link to="/create" className="nav-item nav-link" onClick={this.handleLink}>
<img src="images/add-listing-icon.svg" alt="Add Listing" className="add-listing" />
Add Listing
</Link>
>>>>>>>
<Link to="/create" className="nav-item nav-link" onClick={this.handleLink}>
<img src="images/add-listing-icon.svg" alt="Add Listing" className="add-listing" />
<FormattedMessage
id={ 'navbar.addListing' }
defaultMessage={ 'Add a Listing' }
/>
</Link> |
<<<<<<<
import promisify from 'util.promisify'
=======
import contract from 'truffle-contract'
>>>>>>>
import promisify from 'util.promisify'
import contract from 'truffle-contract'
<<<<<<<
//get user from from user-registry by their existing wallet ID
async get() {
const { currentProvider, eth } = window.web3;
const accounts = await promisify(eth.getAccounts.bind(eth))()
const walletId = accounts[0];
this.userRegistryContract.setProvider(currentProvider);
let instance
try {
instance = await this.userRegistryContract.deployed()
} catch (error) {
console.log('user-registry-service could not find user:', walletId)
throw error
}
const response = instance.get.call(walletId)
console.log("user-registry-service found user:", response);
return response
}
=======
>>>>>>>
//get user from from user-registry by their existing wallet ID
async get() {
const { currentProvider, eth } = window.web3;
const accounts = await promisify(eth.getAccounts.bind(eth))()
const walletId = accounts[0];
this.userRegistryContract.setProvider(currentProvider);
let instance
try {
instance = await this.userRegistryContract.deployed()
} catch (error) {
console.log('user-registry-service could not find user:', walletId)
throw error
}
const response = instance.get.call(walletId)
console.log("user-registry-service found user:", response);
return response
} |
<<<<<<<
'jsx-a11y/click-events-have-key-events': 'off',
=======
'max-len': ['error', { code: 114 }],
>>>>>>>
'jsx-a11y/click-events-have-key-events': 'off',
'max-len': ['error', { code: 114 }], |
<<<<<<<
=======
async sendBatchTransaction (transactions) {
let outputs = {}
for (const tx of transactions) {
outputs[addressToString(tx.to)] = BigNumber(tx.value).dividedBy(1e8).toNumber()
}
const rawTxOutputs = await this.createRawTransaction([], outputs)
const rawTxFunded = await this.fundRawTransaction(rawTxOutputs)
const rawTxSigned = await this.signRawTransaction(rawTxFunded.hex)
return this.sendRawTransaction(rawTxSigned.hex)
}
async dumpPrivKey (address) {
address = addressToString(address)
return this.jsonrpc('dumpprivkey', address)
}
async signRawTransaction (hexstring, prevtxs, privatekeys, sighashtype) {
return this.jsonrpc('signrawtransaction', hexstring, prevtxs, privatekeys)
}
async createRawTransaction (transactions, outputs) {
return this.jsonrpc('createrawtransaction', transactions, outputs)
}
async fundRawTransaction (hexstring) {
return this.jsonrpc('fundrawtransaction', hexstring)
}
>>>>>>> |
<<<<<<<
let nodeData = await app.getWalletPublicKey(prevPath, undefined, segwit)
var publicKey = compressPubKey(nodeData.publicKey)
publicKey = parseHexString(publicKey)
var result = sha256(Buffer.from(publicKey, 'hex'))
result = ripemd160(result)
var fingerprint =
((result[0] << 24) | (result[1] << 16) | (result[2] << 8) | result[3]) >>>
0
return finalize(fingerprint)
}
async getAddressExtendedPubKey (path) {
if (path in this._extendedPubKeyCache) {
return this._extendedPubKeyCache[path]
}
const extendedPubKey = await this._getAddressExtendedPubKey(path)
this._extendedPubKeyCache[path] = extendedPubKey
return extendedPubKey
=======
const walletPublicKey = this._getWalletPublicKey(path)
this._walletPublicKeyCache[path] = walletPublicKey
return walletPublicKey
>>>>>>>
const walletPublicKey = await this._getWalletPublicKey(path)
this._walletPublicKeyCache[path] = walletPublicKey
return walletPublicKey |
<<<<<<<
function generateRandomOp (snapshot) {
console.log('Generate', _.cloneDeep(snapshot));
var composed = new Delta(_.cloneDeep(snapshot));
var length = snapshot.reduce(function(length, op) {
if (!op.insert) {
throw new Error('Snapshot should only have inserts');
}
=======
var generateRandomOp = function (snapshot) {
var snapshot = new Delta(snapshot);
var length = snapshot.ops.reduce(function(length, op) {
if (!op.insert) {
console.error(snapshot);
throw new Error('Snapshot should only have inserts');
}
>>>>>>>
function generateRandomOp (snapshot) {
console.log('Generate', _.cloneDeep(snapshot));
var composed = new Delta(_.cloneDeep(snapshot));
var length = snapshot.reduce(function(length, op) {
if (!op.insert) {
console.error(snapshot);
throw new Error('Snapshot should only have inserts');
}
<<<<<<<
var modIndex = fuzzer.randomInt(Math.min(length, 5) + 1);
var modLength = Math.min(length, fuzzer.randomInt(4) + 1);
console.log('skip retain', modIndex)
var ops = next(snapshot, modIndex);
delta.retain(modIndex);
for (var i in ops) {
console.log('pushing', ops[i]);
result.push(ops[i]);
}
length -= modIndex;
=======
var index = fuzzer.randomInt(Math.min(length, 5) + 1);
length -= index;
var modLength = Math.min(length, fuzzer.randomInt(4) + 1);
delta.retain(index);
>>>>>>>
var modIndex = fuzzer.randomInt(Math.min(length, 5) + 1);
length -= modIndex;
var modLength = Math.min(length, fuzzer.randomInt(4) + 1);
console.log('skip retain', modIndex)
var ops = next(snapshot, modIndex);
delta.retain(modIndex);
for (var i in ops) {
console.log('pushing', ops[i]);
result.push(ops[i]);
} |
<<<<<<<
const children = [];
const editable = false;
const onRemove = () => {};
const title = 'Widget Title';
const OriginalWidgetFrame = WidgetFrame.DecoratedComponent;
const identity = (el) => el;
const settings = {
color: '#E140AD',
};
=======
let children = [];
let editable = false;
let onRemove = () => {};
let title = 'Widget Title';
let OriginalWidgetFrame = WidgetFrame.DecoratedComponent;
let identity = (el) => el;
const isDragging = false;
>>>>>>>
const children = [];
const editable = false;
const onRemove = () => {};
const title = 'Widget Title';
const OriginalWidgetFrame = WidgetFrame.DecoratedComponent;
const identity = (el) => el;
const isDragging = false;
const settings = {
color: '#E140AD',
};
<<<<<<<
expect(component.find(TestCustomFrame).first().prop('settings')).to.equal(settings);
=======
expect(component.find(TestCustomFrame).first().prop('isDragging')).to.equal(isDragging);
>>>>>>>
expect(component.find(TestCustomFrame).first().prop('settings')).to.equal(settings);
expect(component.find(TestCustomFrame).first().prop('isDragging')).to.equal(isDragging); |
<<<<<<<
import InfinityScroll from 'vue-example/pages/infinity-entry'
=======
import FormEntry from 'vue-example/pages/form-entry'
>>>>>>>
import InfinityScroll from 'vue-example/pages/infinity-entry'
import FormEntry from 'vue-example/pages/form-entry'
<<<<<<<
},
{
path: '/infinity',
component: InfinityScroll
=======
},
{
path: '/form',
component: FormEntry,
children: [
{
path: 'textarea',
component: formTextarea
}
]
>>>>>>>
},
{
path: '/infinity',
component: InfinityScroll
},
{
path: '/form',
component: FormEntry,
children: [
{
path: 'textarea',
component: formTextarea
}
] |
<<<<<<<
warningHandler: console.warn, // ability to accumulate missing messages using third party services like Sentry
escapeHtml: true // disable escape html in variable mode
=======
warningHandler: console.warn, // ability to accumulate missing messages using third party services like Sentry
commonLocaleDataUrls: COMMON_LOCALE_DATA_URLS,
>>>>>>>
warningHandler: console.warn, // ability to accumulate missing messages using third party services like Sentry
escapeHtml: true, // disable escape html in variable mode
commonLocaleDataUrls: COMMON_LOCALE_DATA_URLS,
<<<<<<<
this.options.escapeHtml === true &&
typeof value === "string" &&
=======
(typeof value === "string" || value instanceof String) &&
>>>>>>>
this.options.escapeHtml === true &&
(typeof value === "string" || value instanceof String) && |
<<<<<<<
},
{
label: 'musicase',
matches: ['*://musicase.me/*'],
js: ['connectors/v2/musicase.js'],
version: 2
},
{
label: 'Reddit Music Player',
matches: ['*://reddit.music.player.il.ly/'],
js: ['connectors/v2/redditmusicplayer.js'],
version: 2
=======
},
{
label: 'kollekt.fm',
matches: ['*://kollekt.fm/*'],
js: ['connectors/v2/kollekt.js'],
version: 2
>>>>>>>
},
{
label: 'musicase',
matches: ['*://musicase.me/*'],
js: ['connectors/v2/musicase.js'],
version: 2
},
{
label: 'Reddit Music Player',
matches: ['*://reddit.music.player.il.ly/'],
js: ['connectors/v2/redditmusicplayer.js'],
version: 2
},
{
label: 'kollekt.fm',
matches: ['*://kollekt.fm/*'],
js: ['connectors/v2/kollekt.js'],
version: 2 |
<<<<<<<
},
{
label: 'audiosplitter.fm',
matches: ['*://audiosplitter.fm/*'],
js: ['connectors/v2/audiosplitter.js'],
version: 2
=======
},
{
label: 'novoeradio.by',
matches: ['*://www.novoeradio.by/*'],
js: ['connectors/v2/novoeradio.js'],
version: 2
>>>>>>>
},
{
label: 'audiosplitter.fm',
matches: ['*://audiosplitter.fm/*'],
js: ['connectors/v2/audiosplitter.js'],
version: 2
},
{
label: 'novoeradio.by',
matches: ['*://www.novoeradio.by/*'],
js: ['connectors/v2/novoeradio.js'],
version: 2 |
<<<<<<<
},
{
label: 'Dash Radio',
matches: ['*://dashradio.com/*'],
js: ['connectors/v2/dashradio.js'],
version: 2
},
{
label: 'oplayer',
matches: ['*://oplayer.org/*'],
js: ['connectors/v2/jplayer-oplayer.js'],
version: 2
},
{
label: 'EDM.com',
matches: ['*://edm.com/*'],
js: ['connectors/v2/edm.js'],
version: 2
},
{
label: 'post-player',
matches: ['*://post-player.org/*'],
js: ['connectors/v2/jplayer-postplayer.js'],
version: 2
},
{
label: 'Dream FM',
matches: ['*://dreamfm.biz/*'],
js: ['connectors/v2/dreamfm.js'],
version: 2
},
{
label: 'Radio Paradise',
matches: ['*://*.radioparadise.com/*'],
js: ['connectors/v2/radioparadise.js'],
allFrames: true,
version: 2
},
{
label: 'beatport - www',
matches: ['*://www.beatport.com/*'],
js: ['connectors/v2/beatport-www.js'],
version: 2
},
{
label: 'themusicninja',
matches: ['*://www.themusicninja.com/*'],
js: ['connectors/v2/themusicninja.js'],
version: 2
},
{
label: 'trntbl.me',
matches: ['*://*.trntbl.me/*', '*://trntbl.me/*'],
js: ['connectors/v2/trntblme.js'],
version: 2
=======
},
{
label: 'wavo.me',
matches: ['https://wavo.me/*'],
js: ['connectors/v2/wavome.js'],
version: 2
>>>>>>>
},
{
label: 'Dash Radio',
matches: ['*://dashradio.com/*'],
js: ['connectors/v2/dashradio.js'],
version: 2
},
{
label: 'oplayer',
matches: ['*://oplayer.org/*'],
js: ['connectors/v2/jplayer-oplayer.js'],
version: 2
},
{
label: 'EDM.com',
matches: ['*://edm.com/*'],
js: ['connectors/v2/edm.js'],
version: 2
},
{
label: 'post-player',
matches: ['*://post-player.org/*'],
js: ['connectors/v2/jplayer-postplayer.js'],
version: 2
},
{
label: 'Dream FM',
matches: ['*://dreamfm.biz/*'],
js: ['connectors/v2/dreamfm.js'],
version: 2
},
{
label: 'Radio Paradise',
matches: ['*://*.radioparadise.com/*'],
js: ['connectors/v2/radioparadise.js'],
allFrames: true,
version: 2
},
{
label: 'beatport - www',
matches: ['*://www.beatport.com/*'],
js: ['connectors/v2/beatport-www.js'],
version: 2
},
{
label: 'themusicninja',
matches: ['*://www.themusicninja.com/*'],
js: ['connectors/v2/themusicninja.js'],
version: 2
},
{
label: 'trntbl.me',
matches: ['*://*.trntbl.me/*', '*://trntbl.me/*'],
js: ['connectors/v2/trntblme.js'],
version: 2
},
{
label: 'wavo.me',
matches: ['https://wavo.me/*'],
js: ['connectors/v2/wavome.js'],
version: 2 |
<<<<<<<
label: 'Jazzandrain / Relaxingbeats / Epicmusictime / Holidaychristmasmusic',
matches: ['*://www.jazzandrain.com/*', '*://relaxingbeats.com/*', '*://epicmusictime.com/*', '*://www.holidaychristmasmusic.com/*', '*://holidaychristmasmusic.com/*'],
js: ['connectors/v2/jazzandrain.js'],
version: 2
},
{
=======
label: 'RAW.FM',
matches: ['*://www.rawfm.com.au/stream/player/', '*://rawfm.com.au/stream/player/'],
js: ['connectors/v2/rawfm.js'],
version: 2
},
{
>>>>>>>
label: 'Jazzandrain / Relaxingbeats / Epicmusictime / Holidaychristmasmusic',
matches: ['*://www.jazzandrain.com/*', '*://relaxingbeats.com/*', '*://epicmusictime.com/*', '*://www.holidaychristmasmusic.com/*', '*://holidaychristmasmusic.com/*'],
js: ['connectors/v2/jazzandrain.js'],
version: 2
},
{
label: 'RAW.FM',
matches: ['*://www.rawfm.com.au/stream/player/', '*://rawfm.com.au/stream/player/'],
js: ['connectors/v2/rawfm.js'],
version: 2
},
{ |
<<<<<<<
label: 'Jazzandrain / Relaxingbeats / Epicmusictime / Holidaychristmasmusic',
matches: ['*://www.jazzandrain.com/*', '*://relaxingbeats.com/*', '*://epicmusictime.com/*', '*://www.holidaychristmasmusic.com/*', '*://holidaychristmasmusic.com/*'],
js: ['connectors/v2/jazzandrain.js'],
version: 2
},
{
label: 'AccuRadio',
matches: ['*://www.accuradio.com/*'],
js: ['connectors/v2/accuradio.js'],
version: 2
},
{
label: 'RAW.FM',
matches: ['*://www.rawfm.com.au/stream/player/', '*://rawfm.com.au/stream/player/'],
js: ['connectors/v2/rawfm.js'],
version: 2
},
{
label: 'Imusic.am',
matches: ['*://imusic.am/*'],
js: ['connectors/v2/imusic.am.js'],
version: 2
},
{
label: 'GoEar.Com',
matches: ['*://*.goear.com/*', '*://goear.com/*'],
js: ['connectors/v2/goear.com.js'],
version: 2
},
{
label: 'AccuJazz',
matches: ['*://*.slipstreamradio.com/*'],
js: ['connectors/v2/accujazz.js'],
version: 2
},
{
label: 'Wrzuta.pl',
matches: ['*://*.wrzuta.pl/*', '*://wrzuta.pl/*'],
js: ['connectors/v2/wrzuta.pl.js'],
version: 2
},
{
label: 'Earbits',
matches: ['*://www.earbits.com/*'],
js: ['connectors/v2/earbits.js'],
version: 2
},
{
label: 'Player.fm',
matches: ['*://player.fm/*'],
js: ['connectors/v2/player.fm.js'],
version: 2
},
{
label: 'SNDTST',
matches: ['*://www.sndtst.com/*', '*://sndtst.com/*'],
js: ['connectors/v2/sndtst.js'],
version: 2
},
{
label: 'TheDrop',
matches: ['*://thedrop.club/*'],
js: ['connectors/v2/thedrop.js'],
version: 2
},
{
label: 'ThisIsMyJam',
matches: ['*://www.thisismyjam.com/*'],
js: ['connectors/v2/thisismyjam.js'],
version: 2
},
{
label: 'Wonder.fm',
matches: ['*://wonder.fm/*'],
js: ['connectors/v2/wonder.fm.js'],
version: 2
},
{
label: 'RadioTunes',
matches: ['*://www.radiotunes.com/*'],
js: ['connectors/v2/radiotunes.js'],
version: 2
},
{
=======
label: 'Radio.com',
matches: ['*://player.radio.com*'],
js: ['connectors/v2/radio.com.js'],
version: 2
},
{
>>>>>>>
label: 'Jazzandrain / Relaxingbeats / Epicmusictime / Holidaychristmasmusic',
matches: ['*://www.jazzandrain.com/*', '*://relaxingbeats.com/*', '*://epicmusictime.com/*', '*://www.holidaychristmasmusic.com/*', '*://holidaychristmasmusic.com/*'],
js: ['connectors/v2/jazzandrain.js'],
version: 2
},
{
label: 'AccuRadio',
matches: ['*://www.accuradio.com/*'],
js: ['connectors/v2/accuradio.js'],
version: 2
},
{
label: 'RAW.FM',
matches: ['*://www.rawfm.com.au/stream/player/', '*://rawfm.com.au/stream/player/'],
js: ['connectors/v2/rawfm.js'],
version: 2
},
{
label: 'Imusic.am',
matches: ['*://imusic.am/*'],
js: ['connectors/v2/imusic.am.js'],
version: 2
},
{
label: 'GoEar.Com',
matches: ['*://*.goear.com/*', '*://goear.com/*'],
js: ['connectors/v2/goear.com.js'],
version: 2
},
{
label: 'AccuJazz',
matches: ['*://*.slipstreamradio.com/*'],
js: ['connectors/v2/accujazz.js'],
version: 2
},
{
label: 'Wrzuta.pl',
matches: ['*://*.wrzuta.pl/*', '*://wrzuta.pl/*'],
js: ['connectors/v2/wrzuta.pl.js'],
version: 2
},
{
label: 'Earbits',
matches: ['*://www.earbits.com/*'],
js: ['connectors/v2/earbits.js'],
version: 2
},
{
label: 'Player.fm',
matches: ['*://player.fm/*'],
js: ['connectors/v2/player.fm.js'],
version: 2
},
{
label: 'SNDTST',
matches: ['*://www.sndtst.com/*', '*://sndtst.com/*'],
js: ['connectors/v2/sndtst.js'],
version: 2
},
{
label: 'TheDrop',
matches: ['*://thedrop.club/*'],
js: ['connectors/v2/thedrop.js'],
version: 2
},
{
label: 'ThisIsMyJam',
matches: ['*://www.thisismyjam.com/*'],
js: ['connectors/v2/thisismyjam.js'],
version: 2
},
{
label: 'Wonder.fm',
matches: ['*://wonder.fm/*'],
js: ['connectors/v2/wonder.fm.js'],
version: 2
},
{
label: 'RadioTunes',
matches: ['*://www.radiotunes.com/*'],
js: ['connectors/v2/radiotunes.js'],
version: 2
},
{
label: 'Radio.com',
matches: ['*://player.radio.com*'],
js: ['connectors/v2/radio.com.js'],
version: 2
},
{ |
<<<<<<<
},
{
label: "HillyDilly",
matches: ["*://www.hillydilly.com/*"],
js: ["connectors/hillydilly.js"]
},
{
label: "Xbox Music",
matches: ["*://music.xbox.com/*"],
js: ["connectors/xboxmusic.js"]
},
{
label: "8tracks",
matches: ["*://8tracks.com/*"],
js: ["connectors/8tracks.js"]
},
{
label: "Moje Polskie Radio",
matches: ["*://moje.polskieradio.pl/station/*"],
js: ["connectors/mojepolskieradio.js"]
=======
},
{
label: "Nova Planet",
matches: ['*://www.novaplanet.com/radionova/player'],
js: ["connectors/novaplanet.js"]
>>>>>>>
},
{
label: "HillyDilly",
matches: ["*://www.hillydilly.com/*"],
js: ["connectors/hillydilly.js"]
},
{
label: "Xbox Music",
matches: ["*://music.xbox.com/*"],
js: ["connectors/xboxmusic.js"]
},
{
label: "8tracks",
matches: ["*://8tracks.com/*"],
js: ["connectors/8tracks.js"]
},
{
label: "Moje Polskie Radio",
matches: ["*://moje.polskieradio.pl/station/*"],
js: ["connectors/mojepolskieradio.js"]
},
{
label: "Nova Planet",
matches: ['*://www.novaplanet.com/radionova/player'],
js: ["connectors/novaplanet.js"] |
<<<<<<<
label: 'Jazzandrain / Relaxingbeats / Epicmusictime / Holidaychristmasmusic',
matches: ['*://www.jazzandrain.com/*', '*://relaxingbeats.com/*', '*://epicmusictime.com/*', '*://www.holidaychristmasmusic.com/*', '*://holidaychristmasmusic.com/*'],
js: ['connectors/v2/jazzandrain.js'],
version: 2
},
{
label: 'AccuRadio',
matches: ['*://www.accuradio.com/*'],
js: ['connectors/v2/accuradio.js'],
version: 2
},
{
label: 'RAW.FM',
matches: ['*://www.rawfm.com.au/stream/player/', '*://rawfm.com.au/stream/player/'],
js: ['connectors/v2/rawfm.js'],
version: 2
},
{
label: 'Imusic.am',
matches: ['*://imusic.am/*'],
js: ['connectors/v2/imusic.am.js'],
version: 2
},
{
label: 'GoEar.Com',
matches: ['*://*.goear.com/*', '*://goear.com/*'],
js: ['connectors/v2/goear.com.js'],
version: 2
},
{
label: 'AccuJazz',
matches: ['*://*.slipstreamradio.com/*'],
js: ['connectors/v2/accujazz.js'],
version: 2
},
{
label: 'Wrzuta.pl',
matches: ['*://*.wrzuta.pl/*', '*://wrzuta.pl/*'],
js: ['connectors/v2/wrzuta.pl.js'],
version: 2
},
{
label: 'Earbits',
matches: ['*://www.earbits.com/*'],
js: ['connectors/v2/earbits.js'],
version: 2
},
{
label: 'Player.fm',
matches: ['*://player.fm/*'],
js: ['connectors/v2/player.fm.js'],
version: 2
},
{
label: 'SNDTST',
matches: ['*://www.sndtst.com/*', '*://sndtst.com/*'],
js: ['connectors/v2/sndtst.js'],
version: 2
},
{
label: 'TheDrop',
matches: ['*://thedrop.club/*'],
js: ['connectors/v2/thedrop.js'],
version: 2
},
{
=======
label: 'ThisIsMyJam',
matches: ['*://www.thisismyjam.com/*'],
js: ['connectors/v2/thisismyjam.js'],
version: 2
},
{
>>>>>>>
label: 'Jazzandrain / Relaxingbeats / Epicmusictime / Holidaychristmasmusic',
matches: ['*://www.jazzandrain.com/*', '*://relaxingbeats.com/*', '*://epicmusictime.com/*', '*://www.holidaychristmasmusic.com/*', '*://holidaychristmasmusic.com/*'],
js: ['connectors/v2/jazzandrain.js'],
version: 2
},
{
label: 'AccuRadio',
matches: ['*://www.accuradio.com/*'],
js: ['connectors/v2/accuradio.js'],
version: 2
},
{
label: 'RAW.FM',
matches: ['*://www.rawfm.com.au/stream/player/', '*://rawfm.com.au/stream/player/'],
js: ['connectors/v2/rawfm.js'],
version: 2
},
{
label: 'Imusic.am',
matches: ['*://imusic.am/*'],
js: ['connectors/v2/imusic.am.js'],
version: 2
},
{
label: 'GoEar.Com',
matches: ['*://*.goear.com/*', '*://goear.com/*'],
js: ['connectors/v2/goear.com.js'],
version: 2
},
{
label: 'AccuJazz',
matches: ['*://*.slipstreamradio.com/*'],
js: ['connectors/v2/accujazz.js'],
version: 2
},
{
label: 'Wrzuta.pl',
matches: ['*://*.wrzuta.pl/*', '*://wrzuta.pl/*'],
js: ['connectors/v2/wrzuta.pl.js'],
version: 2
},
{
label: 'Earbits',
matches: ['*://www.earbits.com/*'],
js: ['connectors/v2/earbits.js'],
version: 2
},
{
label: 'Player.fm',
matches: ['*://player.fm/*'],
js: ['connectors/v2/player.fm.js'],
version: 2
},
{
label: 'SNDTST',
matches: ['*://www.sndtst.com/*', '*://sndtst.com/*'],
js: ['connectors/v2/sndtst.js'],
version: 2
},
{
label: 'TheDrop',
matches: ['*://thedrop.club/*'],
js: ['connectors/v2/thedrop.js'],
version: 2
},
{
label: 'ThisIsMyJam',
matches: ['*://www.thisismyjam.com/*'],
js: ['connectors/v2/thisismyjam.js'],
version: 2
},
{ |
<<<<<<<
},
{
label: 'RBMA Radio',
matches: ['https://www.rbmaradio.com/*'],
js: ['connectors/v2/rbmaradio.js'],
version: 2
=======
},
{
label: 'GrooveMP3',
matches: ['*://groovemp3.com/*', '*://www.groovemp3.com/*'],
js: ['connectors/v2/bemusic.js'],
version: 2
},
{
label: 'TRT Türkü',
matches: ['*://*trtturku.net/*'],
js: ['connectors/v2/trtturku.js'],
version: 2
>>>>>>>
},
{
label: 'RBMA Radio',
matches: ['https://www.rbmaradio.com/*'],
js: ['connectors/v2/rbmaradio.js'],
},
{
label: 'GrooveMP3',
matches: ['*://groovemp3.com/*', '*://www.groovemp3.com/*'],
js: ['connectors/v2/bemusic.js'],
version: 2
},
{
label: 'TRT Türkü',
matches: ['*://*trtturku.net/*'],
js: ['connectors/v2/trtturku.js'],
version: 2 |
<<<<<<<
},
{
label: "Odnoklassniki",
matches: ["*://odnoklassniki.ru/*"],
js: ["connectors/odnoklassniki.js"],
allFrames: true
=======
},
{
label: "bleep.com",
matches: ["*://bleep.com/*"],
js: ["connectors/bleep.js"]
>>>>>>>
},
{
label: "Odnoklassniki",
matches: ["*://odnoklassniki.ru/*"],
js: ["connectors/odnoklassniki.js"],
allFrames: true
},
{
label: "bleep.com",
matches: ["*://bleep.com/*"],
js: ["connectors/bleep.js"] |
<<<<<<<
var response = { valid: true, messages: [] };
for(var field in pendingValidations) {
=======
var fields = {};
for(field in pendingValidations) {
>>>>>>>
var fields = {};
for(var field in pendingValidations) {
<<<<<<<
if(!resp.valid) { response.valid = false; }
=======
>>>>>>> |
<<<<<<<
=======
}
print(run + " test run...");
>>>>>>>
print(run + " test run..."); |
<<<<<<<
var path_color = "rgb(127, 179, 228)"
=======
maps.defaults = {}
maps.defaults.path_color = "rgb(80, 80, 80)"
>>>>>>>
maps.defaults = {}
maps.defaults.path_color = "rgb(80, 80, 80)"
<<<<<<<
.range([6, 6]);
var flux_scale_fill = d3.scale.linear()
=======
.range([6, 16]);
maps.scale.flux_fill = d3.scale.linear()
>>>>>>>
.range([6, 6]);
maps.scale.flux_fill = d3.scale.linear()
<<<<<<<
.range([1, 1, 1]);
var flux_color = d3.scale.linear()
.domain([0, 1, 20, 50])
=======
.range([1, 15, 15]);
maps.scale.flux_color = d3.scale.linear()
.domain([0, 0.1, 15, 70])
>>>>>>>
.range([1, 1, 1]);
maps.scale.flux_color = d3.scale.linear()
.domain([0, 1, 20, 50])
<<<<<<<
var metabolite_concentration_scale = d3.scale.linear()
.domain([0, 10])
.range([15, 200]);
var metabolite_color_scale = d3.scale.linear()
.domain([0, 1.2])
.range(["#FEF0D9", "#B30000"]);
=======
maps.scale.metabolite_concentration = d3.scale.linear()
.domain([0, 10])
.range([15, 200]);
maps.scale.metabolite_color = d3.scale.linear()
.domain([0, 6])
.range(["red", "red"]);
>>>>>>>
maps.scale.metabolite_concentration = d3.scale.linear()
.domain([0, 10])
.range([15, 200]);
maps.scale.metabolite_color = d3.scale.linear()
.domain([0, 1.2])
.range(["#FEF0D9", "#B30000"]);
<<<<<<<
sc = metabolite_concentration_scale; // TODO: make a better scale
if (d.metabolite_concentration) {
var s;
if (d.should_size) s = scale(sc(d.metabolite_concentration));
else s = scale(sc(0));
return s;
} else if (has_metabolites) {
return scale(10);
} else {
return scale(d.r);
}
})
.attr("style", function (d) {
sc = metabolite_color_scale;
if (d.metabolite_concentration) {
var a;
if (d.should_color) a = "fill:"+sc(d.metabolite_concentration) + ";" +
"stroke:black;stroke-width:0.5;";
else a = "fill:none;stroke:black;stroke-width:0.5;";
return a;
}
else if (has_metabolites) {
return "fill:grey;stroke:none;stroke-width:0.5;";
}
else { return ""; }
})
.attr("transform", function(d){return "translate("+x_scale(d.cx)+","+y_scale(d.cy)+")";});
if (has_metabolite_deviation) {
append_deviation_arcs(svg, data.metabolite_circles,
scale, metabolite_concentration_scale,
x_scale, y_scale);
}
=======
sc = maps.scale.metabolite_concentration; // TODO: make a better scale
if (d.metabolite_concentration) {
return maps.scale.size(sc(d.metabolite_concentration));
} else if (maps.has_metabolites) {
return maps.scale.size(10);
} else {
return maps.scale.size(d.r);
}
})
.attr("style", function (d) {
sc = maps.scale.metabolite_color;
if (d.metabolite_concentration) {
a = "fill:"+sc(d.metabolite_concentration) + ";" +
"stroke:black;stroke-width:0.5;";
return a;
}
else if (maps.has_metabolites) {
return "fill:none;stroke:black;stroke-width:0.5;";
}
else { return ""; }
})
.attr("transform", function(d){return "translate("+maps.scale.x(d.cx)+","+maps.scale.y(d.cy)+")";});
if (maps.has_metabolite_deviation) {
append_deviation_arcs(data.metabolite_circles);
}
>>>>>>>
sc = maps.scale.metabolite_concentration; // TODO: make a better scale
if (d.metabolite_concentration) {
var s;
if (d.should_size) s = maps.scale.size(sc(d.metabolite_concentration));
else s = maps.scale.size(0));
return s;
} else if (maps.has_metabolites) {
return maps.scale.size(10);
} else {
return maps.scale.size(d.r);
}
})
.attr("style", function (d) {
sc = maps.scale.metabolite_color;
if (d.metabolite_concentration) {
var a;
if (d.should_color) a = "fill:"+sc(d.metabolite_concentration) + ";" +
"stroke:black;stroke-width:0.5;";
else a = "fill:none;stroke:black;stroke-width:0.5;";
return a;
}
else if (maps.has_metabolites) {
return "fill:grey;stroke:none;stroke-width:0.5;";
}
else { return ""; }
})
.attr("transform", function(d){return "translate("+maps.scale.x(d.cx)+","+maps.scale.y(d.cy)+")";});
if (maps.has_metabolite_deviation) {
append_deviation_arcs(data.metabolite_circles);
}
<<<<<<<
var t = d.text;
if (has_flux_comparison)
=======
t = d.text;
if (maps.has_flux_comparison)
>>>>>>>
var t = d.text;
if (maps.has_flux_comparison)
<<<<<<<
if (d.metabolite_concentration) return scale(30);
else if (has_metabolites) return scale(20);
else return scale(20);
})
=======
if (d.metabolite_concentration) return maps.scale.size(60);
else if (maps.has_metabolites) return maps.scale.size(30);
else return maps.scale.size(10);
})
>>>>>>>
if (d.metabolite_concentration) return maps.scale.size(30);
else if (maps.has_metabolites) return maps.scale.size(20);
else return maps.scale.size(20);
})
<<<<<<<
.startAngle(function(d) { return -d.metabolite_deviation/100/2*2*Math.PI; })
.endAngle(function(d) { return d.metabolite_deviation/100/2*2*Math.PI; })
.innerRadius(function(d) { return 0; })
.outerRadius(function(d) {
var s;
if (d.should_size) s = scale(sc(d.metabolite_concentration));
else s = scale(sc(0));
return s;
});
svg.append("g")
.attr("id", "metabolite-deviation-arcs")
.selectAll("path")
.data(arc_data)
.enter().append("path")
.attr('d', arc)
.attr('style', "fill:black;stroke:none;opacity:0.4;")
.attr("transform", function(d) {
return "translate("+x_scale(d.cx)+","+y_scale(d.cy)+")";
});
=======
.startAngle(function(d) { return -d.metabolite_deviation/100/2*2*Math.PI; })
.endAngle(function(d) { return d.metabolite_deviation/100/2*2*Math.PI; })
.innerRadius(function(d) { return 0; })
.outerRadius(function(d) { return maps.scale.size(maps.scale.metabolite_concentration(d.metabolite_concentration)); });
maps.svg.append("g")
.attr("id", "metabolite-deviation-arcs")
.selectAll("path")
.data(arc_data)
.enter().append("path")
.attr('d', arc)
.attr('style', "fill:black;stroke:none;opacity:0.4;")
.attr("transform", function(d) {
return "translate("+maps.scale.x(d.cx)+","+maps.scale.y(d.cy)+")";
});
}
function append_reaction_paths(reaction_path_data) {
maps.svg.append("g")
.attr("id", "reaction-paths")
.selectAll("path")
.data(reaction_path_data)
.enter().append("path")
.attr("d", function(d) { return scale_path(d.d); })
.attr("class", function(d) { return d.class })
.attr("style", function(d) {
var s = "", sc = maps.scale.flux;
// .fill-arrow is for simpheny maps where the path surrounds line and
// arrowhead
// .line-arrow is for bigg maps were the line is a path and the
// arrowhead is a marker
if (d.class=="fill-arrow") sc = maps.scale.flux_fill;
if (d.flux) {
s += "stroke-width:"+String(maps.scale.size(sc(Math.abs(d.flux))))+";";
s += "stroke:"+maps.scale.flux_color(Math.abs(d.flux))+";";
if (d.class=="fill-arrow") { s += "fill:"+maps.scale.flux_color(Math.abs(d.flux))+";"; }
else if (d.class=="line-arrow") { make_arrowhead_for_fill(); }
else s += "fill:none";
}
else if (maps.has_flux) {
s += "stroke-width:"+String(maps.scale.size(sc(0)))+";";
s += "stroke:"+maps.scale.flux_color(Math.abs(0))+";";
if (d.class=="fill-arrow") s += "fill:"+maps.scale.flux_color(0)+";";
else s += "fill:none";
}
else {
s += "stroke-width:"+String(maps.scale.size(10))+";";
s += "stroke:"+maps.defaults.path_color+";";
if (d.class=="fill-arrow") s += "fill:"+maps.defaults.path_color+";";
else s += "fill:none";
}
return s;
})
.style('marker-end', function (d) {
if (!/end/.test(d.class)) return '';
if (d.flux) return make_arrowhead_for_fill(maps.scale.flux_color(d.flux));
else if (maps.has_flux) return make_arrowhead_for_fill(maps.scale.flux_color(0));
else return "url(#end-triangle-path-color)";
})
.style('marker-start', function (d) {
if (!/start/.test(d.class)) return '';
if (d.flux) return make_arrowhead_for_fill(maps.scale.flux_color(d.flux));
else if (maps.has_flux) return make_arrowhead_for_fill(maps.scale.flux_color(0));
else return "url(#start-triangle-path-color)";
});
>>>>>>>
.startAngle(function(d) { return -d.metabolite_deviation/100/2*2*Math.PI; })
.endAngle(function(d) { return d.metabolite_deviation/100/2*2*Math.PI; })
.innerRadius(function(d) { return 0; })
.outerRadius(function(d) {
var s;
if (d.should_size) s = maps.scale.size(maps.scale.metabolite_concentration(d.metabolite_concentration));
else s = maps.scale.size(0);
return s;
});
maps.svg.append("g")
.attr("id", "metabolite-deviation-arcs")
.selectAll("path")
.data(arc_data)
.enter().append("path")
.attr('d', arc)
.attr('style', "fill:black;stroke:none;opacity:0.4;")
.attr("transform", function(d) {
return "translate("+maps.scale.x(d.cx)+","+maps.scale.y(d.cy)+")";
});
}
function append_reaction_paths(reaction_path_data) {
maps.svg.append("g")
.attr("id", "reaction-paths")
.selectAll("path")
.data(reaction_path_data)
.enter().append("path")
.attr("d", function(d) { return scale_path(d.d); })
.attr("class", function(d) { return d.class })
.attr("style", function(d) {
var s = "", sc = maps.scale.flux;
// .fill-arrow is for simpheny maps where the path surrounds line and
// arrowhead
// .line-arrow is for bigg maps were the line is a path and the
// arrowhead is a marker
if (d.class=="fill-arrow") sc = maps.scale.flux_fill;
if (d.flux) {
s += "stroke-width:"+String(maps.scale.size(sc(Math.abs(d.flux))))+";";
s += "stroke:"+maps.scale.flux_color(Math.abs(d.flux))+";";
if (d.class=="fill-arrow") { s += "fill:"+maps.scale.flux_color(Math.abs(d.flux))+";"; }
else if (d.class=="line-arrow") { make_arrowhead_for_fill(); }
else s += "fill:none";
}
else if (maps.has_flux) {
s += "stroke-width:"+String(maps.scale.size(sc(0)))+";";
s += "stroke:"+maps.scale.flux_color(Math.abs(0))+";";
if (d.class=="fill-arrow") s += "fill:"+maps.scale.flux_color(0)+";";
else s += "fill:none";
}
else {
s += "stroke-width:"+String(maps.scale.size(1))+";";
s += "stroke:"+maps.defaults.path_color+";";
if (d.class=="fill-arrow") s += "fill:"+maps.defaults.path_color+";";
else s += "fill:none";
}
return s;
})
.style('marker-end', function (d) {
if (!/end/.test(d.class)) return '';
if (d.flux) return make_arrowhead_for_fill(maps.scale.flux_color(d.flux));
else if (maps.has_flux) return make_arrowhead_for_fill(maps.scale.flux_color(0));
else return "url(#end-triangle-path-color)";
})
.style('marker-start', function (d) {
if (!/start/.test(d.class)) return '';
if (d.flux) return make_arrowhead_for_fill(maps.scale.flux_color(d.flux));
else if (maps.has_flux) return make_arrowhead_for_fill(maps.scale.flux_color(0));
else return "url(#start-triangle-path-color)";
}); |
<<<<<<<
gulp.task('stylelint', function() {
return gulp.src('src/**/*.css')
=======
gulp.task('htmlhint', function() {
return gulp.src(['src/content/**/*.html', '!**/third_party/*.html'])
.pipe(htmlhint())
.pipe(htmlhint.reporter())
.pipe(htmlhint.failOnError());
});
gulp.task('lintcss', function() {
return gulp
.src('src/**/*.css')
>>>>>>>
gulp.task('lintcss', function() {
return gulp
.src('src/**/*.css') |
<<<<<<<
/* globals addCodecParam, displayError, displayStatus,
gatheredIceCandidateTypes, hasTurnServer, iceCandidateType, localStream,
maybePreferAudioReceiveCodec, maybePreferAudioSendCodec,
=======
/* globals addCodecParam, channelReady:true, displayError, displayStatus,
gatheredIceCandidateTypes, goog, hasLocalStream, iceCandidateType,
localStream, maybePreferAudioReceiveCodec, maybePreferAudioSendCodec,
maybePreferVideoReceiveCodec, maybePreferVideoSendCodec,
>>>>>>>
/* globals addCodecParam, displayError, displayStatus,
gatheredIceCandidateTypes, hasTurnServer, iceCandidateType, localStream,
maybePreferAudioReceiveCodec, maybePreferAudioSendCodec,
maybePreferVideoReceiveCodec, maybePreferVideoSendCodec,
<<<<<<<
var message = {
type: 'candidate',
label: event.candidate.sdpMLineIndex,
id: event.candidate.sdpMid,
candidate: event.candidate.candidate
};
if (params.isInitiator) {
sendGAEMessage(message);
} else {
sendWSSMessage(message);
}
noteIceCandidate('Local', iceCandidateType(event.candidate.candidate));
=======
>>>>>>> |
<<<<<<<
if (isChromeApp()) {
document.cancelFullScreen = function() {
chrome.app.window.current().restore();
};
} else {
document.cancelFullScreen = document.webkitCancelFullScreen ||
document.mozCancelFullScreen || document.cancelFullScreen;
}
if (isChromeApp()) {
document.body.requestFullScreen = function() {
chrome.app.window.current().fullscreen();
};
} else {
document.body.requestFullScreen = document.body.webkitRequestFullScreen ||
document.body.mozRequestFullScreen || document.body.requestFullScreen;
}
document.onfullscreenchange = document.onwebkitfullscreenchange = document.onmozfullscreenchange;
=======
document.cancelFullScreen = document.webkitCancelFullScreen ||
document.mozCancelFullScreen || document.cancelFullScreen;
document.body.requestFullScreen = document.body.webkitRequestFullScreen ||
document.body.mozRequestFullScreen || document.body.requestFullScreen;
document.onfullscreenchange = document.onfullscreenchange ||
document.onwebkitfullscreenchange || document.onmozfullscreenchange;
>>>>>>>
if (isChromeApp()) {
document.cancelFullScreen = function() {
chrome.app.window.current().restore();
};
} else {
document.cancelFullScreen = document.webkitCancelFullScreen ||
document.mozCancelFullScreen || document.cancelFullScreen;
}
if (isChromeApp()) {
document.body.requestFullScreen = function() {
chrome.app.window.current().fullscreen();
};
} else {
document.body.requestFullScreen = document.body.webkitRequestFullScreen ||
document.body.mozRequestFullScreen || document.body.requestFullScreen;
}
document.onfullscreenchange = document.onfullscreenchange ||
document.onwebkitfullscreenchange || document.onmozfullscreenchange; |
<<<<<<<
lockDragAxis: false,
use2d: true
=======
use2d: true,
zoomStartEventName: 'pz_zoomstart',
zoomEndEventName: 'pz_zoomend',
dragStartEventName: 'pz_dragstart',
dragEndEventName: 'pz_dragend',
doubleTapEventName: 'pz_doubletap'
>>>>>>>
lockDragAxis: false,
use2d: true,
zoomStartEventName: 'pz_zoomstart',
zoomEndEventName: 'pz_zoomend',
dragStartEventName: 'pz_dragstart',
dragEndEventName: 'pz_dragend',
doubleTapEventName: 'pz_doubletap' |
<<<<<<<
=======
chain,
>>>>>>>
<<<<<<<
// selectors
import {
attribute,
chain,
getContexts,
getSetting,
getThought,
isContextViewActive,
meta,
} from '../selectors'
=======
// selectors
import attributeEquals from '../selectors/attributeEquals'
>>>>>>>
// selectors
import {
attributeEquals,
chain,
getContexts,
getSetting,
getThought,
isContextViewActive,
meta,
} from '../selectors'
<<<<<<<
const contextView = attribute(state, context, '=view')
=======
const isTableColumn1 = attributeEquals(store.getState(), context, '=view', 'Table')
>>>>>>>
const isTableColumn1 = attributeEquals(store.getState(), context, '=view', 'Table') |
<<<<<<<
=======
getContexts,
getSetting,
getStyle,
getThought,
>>>>>>>
<<<<<<<
const Editable = ({ disabled, isEditing, thoughtsRanked, contextChain, cursorOffset, showContexts, rank, dispatch }) => {
const state = store.getState()
=======
const Editable = ({ disabled, isEditing, thoughtsRanked, contextChain, cursorOffset, showContexts, rank, style, dispatch }) => {
>>>>>>>
const Editable = ({ disabled, isEditing, thoughtsRanked, contextChain, cursorOffset, showContexts, rank, style, dispatch }) => {
const state = store.getState() |
<<<<<<<
import { overlayHide, overlayReveal, scrollPrioritize } from '../action-creators/toolbar'
import { BASE_FONT_SIZE, DEFAULT_FONT_SIZE, SCROLL_PRIORITIZATION_TIMEOUT, SHORTCUT_HINT_OVERLAY_TIMEOUT, TOOLBAR_DEFAULT_SHORTCUTS } from '../constants'
import { attribute, attributeEquals, getSetting, subtree, theme } from '../selectors'
import { contextOf, pathToContext } from '../util'
=======
import {
overlayHide,
overlayReveal,
scrollPrioritize,
} from '../action-creators/toolbar'
// constants
import {
DEFAULT_FONT_SIZE,
ROOT_TOKEN,
SCROLL_PRIORITIZATION_TIMEOUT,
SHORTCUT_HINT_OVERLAY_TIMEOUT,
TOOLBAR_DEFAULT_SHORTCUTS,
} from '../constants'
// util
import {
contextOf, pathToContext,
} from '../util'
// selectors
import {
attribute,
attributeEquals,
getSetting,
subtree,
theme,
} from '../selectors'
>>>>>>>
import { overlayHide, overlayReveal, scrollPrioritize } from '../action-creators/toolbar'
import { BASE_FONT_SIZE, DEFAULT_FONT_SIZE, ROOT_TOKEN, SCROLL_PRIORITIZATION_TIMEOUT, SHORTCUT_HINT_OVERLAY_TIMEOUT, TOOLBAR_DEFAULT_SHORTCUTS } from '../constants'
import { attribute, attributeEquals, getSetting, subtree, theme } from '../selectors'
import { contextOf, pathToContext } from '../util' |
<<<<<<<
import { NavBar } from './NavBar.js'
import { Status } from './Status.js'
import { Scale } from './Scale.js'
import { Tutorial } from './Tutorial.js'
=======
import { NavBar } from './NavBar'
import { Status } from './Status'
import { Tutorial } from './Tutorial'
>>>>>>>
import { NavBar } from './NavBar'
import { Status } from './Status'
import { Scale } from './Scale'
import { Tutorial } from './Tutorial'
<<<<<<<
})((
{ dark, dataNonce, focus, search, user, dragInProgress, tutorialStep, isLoading, dispatch, showModal, scale, showSplitView }) => {
const [prevShowSplitView, setPrevShowSplitView] = useState(null)
const [isSplitting, setIsSplitting] = useState(false)
if (showSplitView !== prevShowSplitView) {
// Row changed since last render. Update isScrollingDown.
setPrevShowSplitView(showSplitView)
setIsSplitting(true)
setTimeout(() => {
setIsSplitting(false)
=======
}
const AppComponent = (
{ dark, dragInProgress, isLoading, showModal, scaleSize, showSplitView }) => {
const [splitView, updateSplitView] = useState(showSplitView)
const [isSplitting, updateIsSplitting] = useState(false)
useEffect(() => {
updateSplitView(showSplitView)
updateIsSplitting(true)
const splitAnimationTimer = setTimeout(() => {
updateIsSplitting(false)
>>>>>>>
}
const AppComponent = (
{ dark, dragInProgress, isLoading, showModal, scale, showSplitView }) => {
const [splitView, updateSplitView] = useState(showSplitView)
const [isSplitting, updateIsSplitting] = useState(false)
useEffect(() => {
updateSplitView(showSplitView)
updateIsSplitting(true)
const splitAnimationTimer = setTimeout(() => {
updateIsSplitting(false)
<<<<<<<
<Toolbar />
</Scale>
{showSplitView
? <Scale amount={scale}>
=======
</div>
{splitView
? <div className='panel-content'>
<Toolbar />
>>>>>>>
<Toolbar />
</Scale>
{showSplitView
? <Scale amount={scale}> |
<<<<<<<
// selectors
import {
getThoughtsRanked,
rankThoughtsFirstMatch,
} from '../selectors'
// SIDE EFFECTS: localStorage, syncRemote
export default (state, { key, value, local, remote }) => {
=======
export default (state, { key, value }) => {
>>>>>>>
// selectors
import {
getThoughtsRanked,
rankThoughtsFirstMatch,
} from '../selectors'
export default (state, { key, value }) => { |
<<<<<<<
expanded,
noteFocus,
...(tutorialNext
=======
...tutorialNext
>>>>>>>
expanded,
noteFocus,
...tutorialNext
<<<<<<<
: null),
=======
: null,
cursor: thoughtsResolved,
expanded
>>>>>>>
: null, |
<<<<<<<
=======
import { prevSibling } from './util/prevSibling'
import publishMode from './util/publishMode'
import { rankThoughtsFirstMatch } from './util/rankThoughtsFirstMatch'
>>>>>>>
import publishMode from './util/publishMode'
<<<<<<<
=======
import { subtree } from './util/subtree'
>>>>>>>
<<<<<<<
=======
prevSibling,
publishMode,
rankThoughtsFirstMatch,
>>>>>>>
publishMode,
<<<<<<<
=======
subtree,
>>>>>>> |
<<<<<<<
import { getChildPath } from './util/getChildPath.js'
import { getComparisonToken } from './util/getComparisonToken.js'
=======
>>>>>>>
import { getChildPath } from './util/getChildPath.js'
<<<<<<<
getChildPath,
getComparisonToken,
=======
>>>>>>>
getChildPath, |
<<<<<<<
// reducers
import alert from './alert'
import authenticate from './authenticate'
import clear from './clear'
import clearQueue from './clearQueue'
import cursorBeforeSearch from './cursorBeforeSearch'
import cursorHistory from './cursorHistory'
import deleteData from './deleteData'
import deleteSubthoughts from './deleteSubthoughts'
import dragHold from './dragHold'
import dragInProgress from './dragInProgress'
import editing from './editing'
import editingValue from './editingValue'
import error from './error'
import existingThoughtChange from './existingThoughtChange'
import existingThoughtDelete from './existingThoughtDelete'
import existingThoughtMove from './existingThoughtMove'
import expandContextThought from './expandContextThought'
import invalidState from './invalidState'
import loadLocalState from './loadLocalState'
import loadLocalThoughts from './loadLocalThoughts'
import modalComplete from './modalComplete'
import modalRemindMeLater from './modalRemindMeLater'
import newThought from './newThought'
import newThoughtSubmit from './newThoughtSubmit'
import render from './render'
import search from './search'
import searchLimit from './searchLimit'
import selectionChange from './selectionChange'
import setCursor from './setCursor'
import setFirstSubthought from './setFirstSubthought'
import setResourceCache from './setResourceCache'
import settings from './settings'
import showModal from './showModal'
import status from './status'
import subCategorizeAll from './subCategorizeAll'
import toggleCodeView from './toggleCodeView'
import toggleContextView from './toggleContextView'
import toggleHiddenThoughts from './toggleHiddenThoughts'
import toggleSidebar from './toggleSidebar'
import toggleSplitView from './toggleSplitView'
import tutorial from './tutorial'
import tutorialChoice from './tutorialChoice'
import tutorialNext from './tutorialNext'
import tutorialPrev from './tutorialPrev'
import tutorialStep from './tutorialStep'
import unknownAction from './unknownAction'
import updateSplitPosition from './updateSplitPosition'
import updateThoughts from './updateThoughts'
import { prioritizeScroll, setToolbarOverlay } from './toolbarOverlay'
import { initialState } from '../util'
const reducerMap = {
alert,
authenticate,
clear,
clearQueue,
cursorBeforeSearch,
cursorHistory,
deleteData,
deleteSubthoughts,
dragHold,
dragInProgress,
editing,
editingValue,
error,
existingThoughtChange,
existingThoughtDelete,
existingThoughtMove,
expandContextThought,
invalidState,
loadLocalState,
loadLocalThoughts,
modalComplete,
modalRemindMeLater,
newThought,
newThoughtSubmit,
prioritizeScroll,
render,
search,
searchLimit,
selectionChange,
setCursor,
setFirstSubthought,
setResourceCache,
settings,
setToolbarOverlay,
subCategorizeAll,
showModal,
status,
toggleCodeView,
toggleContextView,
toggleHiddenThoughts,
toggleSidebar,
toggleSplitView,
tutorial,
tutorialChoice,
tutorialNext,
tutorialPrev,
tutorialStep,
updateSplitPosition,
updateThoughts,
}
/**
* The main reducer.
* Use action.type to select the reducer with the same name.
* Otherwise throw an error with unknownAction.
*/
export default (state = initialState(), action) =>
(reducerMap[action.type] || unknownAction)(state, action)
=======
export { default as alert } from './alert'
export { default as archiveThought } from './archiveThought'
export { default as authenticate } from './authenticate'
export { default as bumpThoughtDown } from './bumpThoughtDown'
export { default as clear } from './clear'
export { default as clearQueue } from './clearQueue'
export { default as cursorBack } from './cursorBack'
export { default as cursorBeforeSearch } from './cursorBeforeSearch'
export { default as cursorDown } from './cursorDown'
export { default as cursorForward } from './cursorForward'
export { default as cursorHistory } from './cursorHistory'
export { default as cursorUp } from './cursorUp'
export { default as deleteAttribute } from './deleteAttribute'
export { default as deleteData } from './deleteData'
export { default as deleteEmptyThought } from './deleteEmptyThought'
export { default as deleteSubthoughts } from './deleteSubthoughts'
export { default as deleteThought } from './deleteThought'
export { default as dragInProgress } from './dragInProgress'
export { default as editing } from './editing'
export { default as editingValue } from './editingValue'
export { default as error } from './error'
export { default as existingThoughtChange } from './existingThoughtChange'
export { default as existingThoughtDelete } from './existingThoughtDelete'
export { default as existingThoughtMove } from './existingThoughtMove'
export { default as expandContextThought } from './expandContextThought'
export { default as indent } from './indent'
export { default as invalidState } from './invalidState'
export { default as loadLocalState } from './loadLocalState'
export { default as loadLocalThoughts } from './loadLocalThoughts'
export { default as modalComplete } from './modalComplete'
export { default as modalRemindMeLater } from './modalRemindMeLater'
export { default as moveThoughtDown } from './moveThoughtDown'
export { default as moveThoughtUp } from './moveThoughtUp'
export { default as newThought } from './newThought'
export { default as newThoughtSubmit } from './newThoughtSubmit'
export { default as outdent } from './outdent'
export { default as prependRevision } from './prependRevision'
export { default as render } from './render'
export { default as search } from './search'
export { default as searchLimit } from './searchLimit'
export { default as selectionChange } from './selectionChange'
export { default as setAttribute } from './setAttribute'
export { default as setCursor } from './setCursor'
export { default as setFirstSubthought } from './setFirstSubthought'
export { default as setResourceCache } from './setResourceCache'
export { default as settings } from './settings'
export { default as showModal } from './showModal'
export { default as splitThought } from './splitThought'
export { default as status } from './status'
export { default as subCategorizeAll } from './subCategorizeAll'
export { default as subCategorizeOne } from './subCategorizeOne'
export { default as toggleAttribute } from './toggleAttribute'
export { default as toggleCodeView } from './toggleCodeView'
export { default as toggleContextView } from './toggleContextView'
export { default as toggleHiddenThoughts } from './toggleHiddenThoughts'
export { default as toggleSidebar } from './toggleSidebar'
export { default as toggleSplitView } from './toggleSplitView'
export { default as tutorial } from './tutorial'
export { default as tutorialChoice } from './tutorialChoice'
export { default as tutorialNext } from './tutorialNext'
export { default as tutorialPrev } from './tutorialPrev'
export { default as tutorialStep } from './tutorialStep'
export { default as undoArchive } from './undoArchive'
export { default as unknownAction } from './unknownAction'
export { default as updateSplitPosition } from './updateSplitPosition'
export { default as updateThoughts } from './updateThoughts'
export { prioritizeScroll, setToolbarOverlay } from './toolbarOverlay'
>>>>>>>
export { default as alert } from './alert'
export { default as archiveThought } from './archiveThought'
export { default as authenticate } from './authenticate'
export { default as bumpThoughtDown } from './bumpThoughtDown'
export { default as clear } from './clear'
export { default as clearQueue } from './clearQueue'
export { default as cursorBack } from './cursorBack'
export { default as cursorBeforeSearch } from './cursorBeforeSearch'
export { default as cursorDown } from './cursorDown'
export { default as cursorForward } from './cursorForward'
export { default as cursorHistory } from './cursorHistory'
export { default as cursorUp } from './cursorUp'
export { default as deleteAttribute } from './deleteAttribute'
export { default as deleteData } from './deleteData'
export { default as deleteEmptyThought } from './deleteEmptyThought'
export { default as deleteSubthoughts } from './deleteSubthoughts'
export { default as deleteThought } from './deleteThought'
export { default as dragHold } from './dragHold'
export { default as dragInProgress } from './dragInProgress'
export { default as editing } from './editing'
export { default as editingValue } from './editingValue'
export { default as error } from './error'
export { default as existingThoughtChange } from './existingThoughtChange'
export { default as existingThoughtDelete } from './existingThoughtDelete'
export { default as existingThoughtMove } from './existingThoughtMove'
export { default as expandContextThought } from './expandContextThought'
export { default as indent } from './indent'
export { default as invalidState } from './invalidState'
export { default as loadLocalState } from './loadLocalState'
export { default as loadLocalThoughts } from './loadLocalThoughts'
export { default as modalComplete } from './modalComplete'
export { default as modalRemindMeLater } from './modalRemindMeLater'
export { default as moveThoughtDown } from './moveThoughtDown'
export { default as moveThoughtUp } from './moveThoughtUp'
export { default as newThought } from './newThought'
export { default as newThoughtSubmit } from './newThoughtSubmit'
export { default as outdent } from './outdent'
export { default as prependRevision } from './prependRevision'
export { default as render } from './render'
export { default as search } from './search'
export { default as searchLimit } from './searchLimit'
export { default as selectionChange } from './selectionChange'
export { default as setAttribute } from './setAttribute'
export { default as setCursor } from './setCursor'
export { default as setFirstSubthought } from './setFirstSubthought'
export { default as setResourceCache } from './setResourceCache'
export { default as settings } from './settings'
export { default as showModal } from './showModal'
export { default as splitThought } from './splitThought'
export { default as status } from './status'
export { default as subCategorizeAll } from './subCategorizeAll'
export { default as subCategorizeOne } from './subCategorizeOne'
export { default as toggleAttribute } from './toggleAttribute'
export { default as toggleCodeView } from './toggleCodeView'
export { default as toggleContextView } from './toggleContextView'
export { default as toggleHiddenThoughts } from './toggleHiddenThoughts'
export { default as toggleSidebar } from './toggleSidebar'
export { default as toggleSplitView } from './toggleSplitView'
export { default as tutorial } from './tutorial'
export { default as tutorialChoice } from './tutorialChoice'
export { default as tutorialNext } from './tutorialNext'
export { default as tutorialPrev } from './tutorialPrev'
export { default as tutorialStep } from './tutorialStep'
export { default as undoArchive } from './undoArchive'
export { default as unknownAction } from './unknownAction'
export { default as updateSplitPosition } from './updateSplitPosition'
export { default as updateThoughts } from './updateThoughts'
export { prioritizeScroll, setToolbarOverlay } from './toolbarOverlay' |
<<<<<<<
isDivider,
checkIfPathShareSubcontext,
} from '../util.js'
=======
isDivider
} from '../util'
>>>>>>>
} from '../util' |
<<<<<<<
=======
import { attribute } from './util/attribute'
import { canShowModal } from './util/canShowModal'
import { chain } from './util/chain'
>>>>>>>
<<<<<<<
=======
import { getRankAfter } from './util/getRankAfter'
import { getRankBefore } from './util/getRankBefore'
import { getSetting } from './util/getSetting'
import { getStyle } from './util/getStyle'
import { getThought } from './util/getThought'
import { getThoughtAfter } from './util/getThoughtAfter'
import { getThoughtBefore } from './util/getThoughtBefore'
import { getThoughts } from './util/getThoughts'
import { getThoughtsRanked } from './util/getThoughtsRanked'
import { getThoughtsSorted } from './util/getThoughtsSorted'
import { getSortPreference } from './util/getSortPreference'
import { hasAttribute } from './util/hasAttribute'
>>>>>>>
import { hasAttribute } from './util/hasAttribute'
<<<<<<<
=======
attribute,
canShowModal,
chain,
>>>>>>>
<<<<<<<
=======
getRankAfter,
getRankBefore,
getSetting,
getStyle,
getThought,
getThoughtAfter,
getThoughtBefore,
getThoughts,
getThoughtsRanked,
getThoughtsSorted,
getSortPreference,
hasAttribute,
>>>>>>>
hasAttribute, |
<<<<<<<
self._server._fiber(function() {
try {
=======
Fiber(function() {
try {
if(!self._beforeHandling('DELETE', self._requestPath.collectionId, self._requestCollection.findOne(self._requestPath.collectionId))) {
return self._rejectedResponse("Could not delete that object.");
}
>>>>>>>
self._server._fiber(function() {
try {
if(!self._beforeHandling('DELETE', self._requestPath.collectionId, self._requestCollection.findOne(self._requestPath.collectionId))) {
return self._rejectedResponse("Could not delete that object.");
} |
<<<<<<<
es: 'agrupamiento por k-medians',
ar: 'الخوارزمية التصنيفية (k-means)'
=======
es: 'agrupamiento por k-medians',
// TRANSLATE ar
>>>>>>>
es: 'agrupamiento por k-medians',
<<<<<<<
es: 'X %1 Y %2 numero %3 etiqueta %4',
ar: 'س %1 ص %2 الرقم %3 الفئه %4'
=======
es: 'X %1 Y %2 numero %3 etiqueta %4',
// TRANSLATE ar
>>>>>>>
es: 'X %1 Y %2 numero %3 etiqueta %4',
<<<<<<<
ar: 'حساب IDs لصنف الخوارزميه التصنيفية'
// TRANSLATE es
=======
es: 'calculate k-means cluster IDs',
// TRANSLATE ar
>>>>>>>
// TRANSLATE es
<<<<<<<
es: 'silueta',
ar: 'رسم صورة ظلية'
=======
es: 'silueta',
// TRANSLATE ar
>>>>>>>
es: 'silueta',
<<<<<<<
es: 'X %1 Y %2 etiqueta %3 puntuación %4',
ar: 'س %1 ص %2 الفئه %3 النتيجه\المعدل %4'
=======
es: 'X %1 Y %2 etiqueta %3 puntuación %4',
// TRANSLATE ar
>>>>>>>
es: 'X %1 Y %2 etiqueta %3 puntuación %4',
<<<<<<<
es: 'puntuación',
ar: 'المعدل\النتيجه'
=======
es: 'puntuación',
// TRANSLATE ar
>>>>>>>
es: 'puntuación',
<<<<<<<
es: 'calcular la puntuación de la silueta de los clústeres 2D',
ar: 'حساب معدل رسم الصورة الظلية لتصنيف ذو بعدين'
=======
es: 'calcular la puntuación de la silueta de los clústeres 2D',
>>>>>>>
es: 'calcular la puntuación de la silueta de los clústeres 2D', |
<<<<<<<
en: 'Running %1 %2',
ar: 'جاري التنفيذ %1 %2'
=======
en: 'Running %1 %2',
// TRANSLATE ar
>>>>>>>
ar: 'جاري التنفيذ %1 %2',
en: 'Running %1 %2', |
<<<<<<<
ko: '색깔',
it: 'Colori'
=======
ko: '색깔',
pt: 'Cores'
>>>>>>>
it: 'Colori',
ko: '색깔',
pt: 'Cores'
<<<<<<<
ko: '11개의 색',
it: 'undici colori'
=======
ko: '11개의 색',
pt: 'onze cores'
>>>>>>>
it: 'undici colori',
ko: '11개의 색',
pt: 'onze cores'
<<<<<<<
ko: '지진',
it: 'Terremoti'
=======
ko: '지진',
pt: 'Terremotos'
>>>>>>>
it: 'Terremoti',
ko: '지진',
pt: 'Terremotos'
<<<<<<<
ko: '지진 데이터',
it: 'dati sui terremoti'
=======
ko: '지진 데이터',
pt: 'dados de terremotos'
>>>>>>>
it: 'dati sui terremoti',
ko: '지진 데이터',
pt: 'dados de terremotos'
<<<<<<<
ko: '펭귄',
it: 'Pinguini'
=======
ko: '펭귄',
pt: 'Penguins'
>>>>>>>
it: 'Pinguini',
ko: '펭귄',
pt: 'Penguins'
<<<<<<<
ko: '펭귄 데이터',
it: 'dati sui pinguini'
=======
ko: '펭귄 데이터',
pt: 'dados de penguins'
>>>>>>>
it: 'dati sui pinguini',
ko: '펭귄 데이터',
pt: 'dados de penguins'
<<<<<<<
ko: '피시',
it: 'Phish'
=======
ko: '피시',
pt: 'Phish'
>>>>>>>
it: 'Phish',
ko: '피시',
pt: 'Phish'
<<<<<<<
ko: '피시 콘서트 데이터',
it: 'dati sui concerti dei Phish'
=======
ko: '피시 콘서트 데이터',
pt: 'dados de shows do Phish'
>>>>>>>
it: 'dati sui concerti dei Phish',
ko: '피시 콘서트 데이터',
pt: 'dados de shows do Phish'
<<<<<<<
ko: '배열 %1 %2',
it: 'sequenza %1 %2'
=======
ko: '배열 %1 %2',
pt: 'Sequência %1 %2'
>>>>>>>
it: 'sequenza %1 %2',
ko: '배열 %1 %2',
pt: 'Sequência %1 %2'
<<<<<<<
ko: '이름',
it: 'nome'
=======
ko: '이름',
pt: 'nome'
>>>>>>>
it: 'nome',
ko: '이름',
pt: 'nome'
<<<<<<<
ko: '배열 실행 1..N',
it: 'genera una sequenza 1..N'
=======
ko: '배열 실행 1..N',
pt: 'Gerar uma sequencia 1..N'
>>>>>>>
it: 'genera una sequenza 1..N',
ko: '배열 실행 1..N',
pt: 'Gerar uma sequencia 1..N'
<<<<<<<
ko: '사용자 데이터 %1',
it: 'Dati utenti %1'
=======
ko: '사용자 데이터 %1',
pt: 'Dados de usuario %1'
>>>>>>>
it: 'Dati utenti %1',
ko: '사용자 데이터 %1',
pt: 'Dados de usuario %1'
<<<<<<<
ko: '이름',
it: 'nome'
=======
ko: '이름',
pt: 'nome'
>>>>>>>
it: 'nome',
ko: '이름',
pt: 'nome'
<<<<<<<
ko: '이전에 로드된 데이터 사용',
it: 'usa i dati caricati in precedenza'
=======
ko: '이전에 로드된 데이터 사용',
pt: 'use dados carregados previamente'
>>>>>>>
it: 'usa i dati caricati in precedenza',
ko: '이전에 로드된 데이터 사용',
pt: 'use dados carregados previamente' |
<<<<<<<
=======
const Running = require('./running')
const {
kMeansCluster,
silhouette
} = require('./stats')
>>>>>>>
const Running = require('./running') |
<<<<<<<
mixins: ["enyo.ApplicationSupport"],
=======
__jobs: {},
>>>>>>>
mixins: ["enyo.ApplicationSupport"],
__jobs: {},
<<<<<<<
this.inherited(arguments);
=======
this.stopAllJobs();
// JS objects are never truly destroyed (GC'd) until all references are gone,
// we might have some delayed action on this object that needs to have access
// to this flag.
this.destroyed = true;
>>>>>>>
this.inherited(arguments);
this.stopAllJobs();
// JS objects are never truly destroyed (GC'd) until all references are gone,
// we might have some delayed action on this object that needs to have access
// to this flag.
this.destroyed = true;
<<<<<<<
},
//*@protected
_silenced: false,
//*@protected
_silence_count: 0,
//*@public
/**
Sets a flag that will disable event propagation for this
component. Increments the internal counter ensuring that the
_unsilence_ method must be called that many times before
event propagation will continue.
*/
silence: function () {
this._silenced = true;
this._silence_count += 1;
},
//*@public
/**
If the internal silence counter is 0 this method will allow
event propagation for this component. It will decrement the counter
by one otherwise. This method must be called one-time for each
_silence_ call.
*/
unsilence: function () {
if (0 !== this._silence_count) --this._silence_count;
if (0 === this._silence_count) {
this._silenced = false;
}
}
=======
},
/**
Create a new job tied to this instance of the component. If the component is
destroyed, any jobs associated it will also be stopped. If you start a job
that is pending with the same name, the original job will be stopped, making this
useful for timeouts that need to be reset.
*/
startJob: function(inJobName, inJob, inWait) {
// allow strings as job names, they map to local method names
if (enyo.isString(inJob)) {
inJob = this[inJob];
}
// stop any existing jobs with same name
this.stopJob(inJobName);
this.__jobs[inJobName] = setTimeout(enyo.bind(this, function() {
this.stopJob(inJobName);
// call "inJob" with this bound to the component.
inJob.call(this);
}), inWait);
},
/**
Stop a component-specific job before it has been activated.
*/
stopJob: function(inJobName) {
if (this.__jobs[inJobName]) {
clearTimeout(this.__jobs[inJobName]);
delete this.__jobs[inJobName];
}
}
>>>>>>>
},
//*@protected
_silenced: false,
//*@protected
_silence_count: 0,
//*@public
/**
Sets a flag that will disable event propagation for this
component. Increments the internal counter ensuring that the
_unsilence_ method must be called that many times before
event propagation will continue.
*/
silence: function () {
this._silenced = true;
this._silence_count += 1;
},
//*@public
/**
If the internal silence counter is 0 this method will allow
event propagation for this component. It will decrement the counter
by one otherwise. This method must be called one-time for each
_silence_ call.
*/
unsilence: function () {
if (0 !== this._silence_count) --this._silence_count;
if (0 === this._silence_count) {
this._silenced = false;
}
},
/**
Create a new job tied to this instance of the component. If the component is
destroyed, any jobs associated it will also be stopped. If you start a job
that is pending with the same name, the original job will be stopped, making this
useful for timeouts that need to be reset.
*/
startJob: function(inJobName, inJob, inWait) {
// allow strings as job names, they map to local method names
if (enyo.isString(inJob)) {
inJob = this[inJob];
}
// stop any existing jobs with same name
this.stopJob(inJobName);
this.__jobs[inJobName] = setTimeout(enyo.bind(this, function() {
this.stopJob(inJobName);
// call "inJob" with this bound to the component.
inJob.call(this);
}), inWait);
},
/**
Stop a component-specific job before it has been activated.
*/
stopJob: function(inJobName) {
if (this.__jobs[inJobName]) {
clearTimeout(this.__jobs[inJobName]);
delete this.__jobs[inJobName];
}
} |
<<<<<<<
/**
* Read CSV from a URL and parse to create TidyBlocks data frame.
* @param {string} url - URL to read from.
*/
=======
//
// Control whether logging is on or off.
//
let LoggingEnabled = true
/**
* Turn logging on and off (used by tbLog).
*/
const toggleLogging = () => {
LoggingEnabled = !LoggingEnabled
}
/**
* Log a message (or not).
*/
const tbLog = (...args) => {
if (LoggingEnabled) {
console.log(...args)
}
}
//
// Create function to synchronously parse CSV to JSON
// Convert JSON to TidyBlocksDataFrame object
//
>>>>>>>
/**
* Control whether logging is on or off.
*/
let LoggingEnabled = true
/**
* Turn logging on and off (used by tbLog).
*/
const toggleLogging = () => {
LoggingEnabled = !LoggingEnabled
}
/**
* Log a message (or not).
*/
const tbLog = (...args) => {
if (LoggingEnabled) {
console.log(...args)
}
}
/**
* Read CSV from a URL and parse to create TidyBlocks data frame.
* @param {string} url - URL to read from.
*/ |
<<<<<<<
es: 'nombre',
ar: 'الإسم'
=======
es: 'nombre',
ko: '이름'
>>>>>>>
es: 'nombre',
ar: 'الإسم',
ko: '이름'
<<<<<<<
es: 'eje X',
ar: 'المحور الأفقي'
=======
es: 'eje X',
ko: 'X축'
>>>>>>>
es: 'eje X',
ar: 'المحور الأفقي',
ko: 'X축'
<<<<<<<
es: 'eje Y',
ar: 'المحور الرأسي'
=======
es: 'eje Y',
ko: 'Y축'
>>>>>>>
es: 'eje Y',
ar: 'المحور الرأسي',
ko: 'Y축'
<<<<<<<
es: 'Barras %1 %2 %3',
ar: 'الأعمده %1 %2 %3'
=======
es: 'Barras %1 %2 %3',
ko: '막대 %1 %2 %3'
>>>>>>>
es: 'Barras %1 %2 %3',
ar: 'الأعمده %1 %2 %3',
ko: '막대 %1 %2 %3'
<<<<<<<
es: 'crear grafico barras',
ar: 'إنشاء رسم الأعمده البيانيه'
=======
es: 'crear grafico barras',
ko: '막대 그래프 만들기'
>>>>>>>
es: 'crear grafico barras',
ar: 'إنشاء رسم الأعمده البيانيه',
ko: '막대 그래프 만들기'
<<<<<<<
es: 'Cajas %1 %2 %3',
ar: 'الصندوق %1 %2 %3'
=======
es: 'Cajas %1 %2 %3',
ko: '박스 %1 %2 %3'
>>>>>>>
es: 'Cajas %1 %2 %3',
ar: 'الصندوق %1 %2 %3',
ko: '박스 %1 %2 %3'
<<<<<<<
es: 'crear grafico cajas',
ar: 'إنشاء مخطط الصندوق ذو العارضتين'
=======
es: 'crear grafico cajas',
ko: '박스 그래프 만들기'
>>>>>>>
es: 'crear grafico cajas',
ar: 'إنشاء مخطط الصندوق ذو العارضتين',
ko: '박스 그래프 만들기'
<<<<<<<
es: 'Puntos %1 %2',
ar: 'النقطه %1 %2'
=======
es: 'Puntos %1 %2',
ko: '도트 %1 %2'
>>>>>>>
es: 'Puntos %1 %2',
ar: 'النقطه %1 %2',
ko: '도트 %1 %2'
<<<<<<<
es: 'crear grafico puntos',
ar: 'إنشاء المخطط النقطي'
=======
es: 'crear grafico puntos',
ko: '도트 그래프 만들기'
>>>>>>>
es: 'crear grafico puntos',
ar: 'إنشاء المخطط النقطي',
ko: '도트 그래프 만들기'
<<<<<<<
es: 'Histograma %1 %2 %3',
ar: 'المدرج التكراري %1 %2 %3'
=======
es: 'Histograma %1 %2 %3',
ko: '히스토그램 %1 %2 %3'
>>>>>>>
es: 'Histograma %1 %2 %3',
ar: 'المدرج التكراري %1 %2 %3',
ko: '히스토그램 %1 %2 %3'
<<<<<<<
es: 'columna',
ar: 'العمود'
=======
es: 'columna',
ko: '열'
>>>>>>>
es: 'columna',
ar: 'العمود',
ko: '열'
<<<<<<<
es: 'crear histograma',
ar: 'إنشاء المدرج التكراري'
=======
es: 'crear histograma',
ko: '히스토그램 만들기'
>>>>>>>
es: 'crear histograma',
ar: 'إنشاء المدرج التكراري',
ko: '히스토그램 만들기'
<<<<<<<
es: 'Dispersion %1 %2 %3 Color %4 Añadir linea? %5',
ar: 'التشتت %1 %2 %3 اللون %4 إضافه خط؟ %5'
=======
es: 'Dispersion %1 %2 %3 Color %4 Añadir linea? %5',
ko: '분산 %1 %2 %3 색깔 %4 선 추가? %5'
>>>>>>>
es: 'Dispersion %1 %2 %3 Color %4 Añadir linea? %5',
ar: 'التشتت %1 %2 %3 اللون %4 إضافه خط؟ %5',
ko: '분산 %1 %2 %3 색깔 %4 선 추가? %5'
<<<<<<<
en: 'crear grafico dispersion',
ar: 'إنشاء مخطط الإنتشار'
=======
en: 'crear grafico dispersion',
ko: '분산 그래프 만들기'
>>>>>>>
en: 'crear grafico dispersion',
ar: 'إنشاء مخطط الإنتشار',
ko: '분산 그래프 만들기' |
<<<<<<<
const tbAdd = (rowId, row, getLeft, getRight) => {
const left = tbIsNumber(getLeft(row))
const right = tbIsNumber(getRight(row))
=======
const tbAdd = (row, getLeft, getRight) => {
const left = tbAssertNumber(getLeft(row))
const right = tbAssertNumber(getRight(row))
>>>>>>>
const tbAdd = (rowId, row, getLeft, getRight) => {
const left = tbAssertNumber(getLeft(row))
const right = tbAssertNumber(getRight(row))
<<<<<<<
const tbDiv = (rowId, row, getLeft, getRight) => {
const left = tbIsNumber(getLeft(row))
const right = tbIsNumber(getRight(row))
=======
const tbDiv = (row, getLeft, getRight) => {
const left = tbAssertNumber(getLeft(row))
const right = tbAssertNumber(getRight(row))
>>>>>>>
const tbDiv = (rowId, row, getLeft, getRight) => {
const left = tbAssertNumber(getLeft(row))
const right = tbAssertNumber(getRight(row))
<<<<<<<
const tbExp = (rowId, row, getLeft, getRight) => {
const left = tbIsNumber(getLeft(row))
const right = tbIsNumber(getRight(row))
=======
const tbExp = (row, getLeft, getRight) => {
const left = tbAssertNumber(getLeft(row))
const right = tbAssertNumber(getRight(row))
>>>>>>>
const tbExp = (rowId, row, getLeft, getRight) => {
const left = tbAssertNumber(getLeft(row))
const right = tbAssertNumber(getRight(row))
<<<<<<<
const tbMod = (rowId, row, getLeft, getRight) => {
const left = tbIsNumber(getLeft(row))
const right = tbIsNumber(getRight(row))
=======
const tbMod = (row, getLeft, getRight) => {
const left = tbAssertNumber(getLeft(row))
const right = tbAssertNumber(getRight(row))
>>>>>>>
const tbMod = (rowId, row, getLeft, getRight) => {
const left = tbAssertNumber(getLeft(row))
const right = tbAssertNumber(getRight(row))
<<<<<<<
const tbMul = (rowId, row, getLeft, getRight) => {
const left = tbIsNumber(getLeft(row))
const right = tbIsNumber(getRight(row))
=======
const tbMul = (row, getLeft, getRight) => {
const left = tbAssertNumber(getLeft(row))
const right = tbAssertNumber(getRight(row))
>>>>>>>
const tbMul = (rowId, row, getLeft, getRight) => {
const left = tbAssertNumber(getLeft(row))
const right = tbAssertNumber(getRight(row))
<<<<<<<
const tbNeg = (rowId, row, getValue) => {
const value = tbIsNumber(getValue(row))
=======
const tbNeg = (row, getValue) => {
const value = tbAssertNumber(getValue(row))
>>>>>>>
const tbNeg = (rowId, row, getValue) => {
const value = tbAssertNumber(getValue(row))
<<<<<<<
const tbSub = (rowId, row, getLeft, getRight) => {
const left = tbIsNumber(getLeft(row))
const right = tbIsNumber(getRight(row))
=======
const tbSub = (row, getLeft, getRight) => {
const left = tbAssertNumber(getLeft(row))
const right = tbAssertNumber(getRight(row))
>>>>>>>
const tbSub = (rowId, row, getLeft, getRight) => {
const left = tbAssertNumber(getLeft(row))
const right = tbAssertNumber(getRight(row))
<<<<<<<
/**
* Choosing a value based on a logical condition.
* @param {number} rowId The ID of the block.
* @param {Object} row The row to get values from.
* @param {function} getCond How to get the condition's value.
* @param {function} getLeft How to get the left value from the row.
* @param {function} getRight How to get the right value from the row.
* @returns The left (right) value if the condition is true (false).
*/
const tbIfElse = (rowId, row, getCond, getLeft, getRight) => {
const cond = tbToBoolean(row, getCond)
return cond ? getLeft(row) : getRight(row)
}
=======
/**
* Choosing a value based on a logical condition.
* @param {Object} row The row to get values from.
* @param {function} getCond How to get the condition's value.
* @param {function} getLeft How to get the left value from the row.
* @param {function} getRight How to get the right value from the row.
* @returns The left (right) value if the condition is true (false).
*/
const tbIfElse = (row, getCond, getLeft, getRight) => {
const cond = tbToBoolean(row, getCond)
return cond ? getLeft(row) : getRight(row)
}
>>>>>>>
/**
* Choosing a value based on a logical condition.
* @param {number} rowId The ID of the block.
* @param {Object} row The row to get values from.
* @param {function} getCond How to get the condition's value.
* @param {function} getLeft How to get the left value from the row.
* @param {function} getRight How to get the right value from the row.
* @returns The left (right) value if the condition is true (false).
*/
const tbIfElse = (rowId, row, getCond, getLeft, getRight) => {
const cond = tbToBoolean(row, getCond)
return cond ? getLeft(row) : getRight(row)
} |
<<<<<<<
ko: '왼쪽에 붙이기 %1 오른쪽 %2 라벨 %3',
it: 'incolla sinistra %1 destra %2 etichette %3'
=======
ko: '왼쪽에 붙이기 %1 오른쪽 %2 라벨 %3',
pt: 'Juntar esquerda %1 direita %2 etiquetas %3'
>>>>>>>
it: 'incolla sinistra %1 destra %2 etichette %3',
ko: '왼쪽에 붙이기 %1 오른쪽 %2 라벨 %3',
pt: 'Juntar esquerda %1 direita %2 etiquetas %3'
<<<<<<<
ko: '이름',
it: 'nome'
=======
ko: '이름',
pt: 'nome'
>>>>>>>
it: 'nome',
ko: '이름',
pt: 'nome'
<<<<<<<
ko: '라벨',
it: 'etichetta'
=======
ko: '라벨',
pt: 'etiqueta'
>>>>>>>
it: 'etichetta',
ko: '라벨',
pt: 'etiqueta'
<<<<<<<
ko: '두 테이블의 행을 붙이기',
it: 'incolla le righe di due tabelle insieme'
=======
ko: '두 테이블의 행을 붙이기',
pt: 'juntar linhas de duas tabelas'
>>>>>>>
it: 'incolla le righe di due tabelle insieme',
ko: '두 테이블의 행을 붙이기',
pt: 'juntar linhas de duas tabelas'
<<<<<<<
ko: '연결',
it: 'unisci'
=======
ko: '연결',
pt: 'Unir'
>>>>>>>
it: 'unisci',
ko: '연결',
pt: 'Unir'
<<<<<<<
ko: '왼쪽 %1 %2',
it: 'sinistra %1 %2'
=======
ko: '왼쪽 %1 %2',
pt: 'esquerda %1 %2'
>>>>>>>
it: 'sinistra %1 %2',
ko: '왼쪽 %1 %2',
pt: 'esquerda %1 %2'
<<<<<<<
ko: '오른쪽 %1 %2',
it: 'destra %1 %2'
=======
ko: '오른쪽 %1 %2',
pt: 'direita %1 %2'
>>>>>>>
it: 'destra %1 %2',
ko: '오른쪽 %1 %2',
pt: 'direita %1 %2'
<<<<<<<
ko: '테이블',
it: 'tabella'
=======
ko: '테이블',
pt: 'tabela'
>>>>>>>
it: 'tabella',
ko: '테이블',
pt: 'tabela'
<<<<<<<
ko: '열',
it: 'colonna'
=======
ko: '열',
pt: 'coluna'
>>>>>>>
it: 'colonna',
ko: '열',
pt: 'coluna'
<<<<<<<
ko: '일치하는 값으로 두 테이블 연결',
it: 'unisce due tabelle con valori corrispondenti'
=======
ko: '일치하는 값으로 두 테이블 연결',
pt: 'unir duas tabelas usando valores coincidentes'
>>>>>>>
it: 'unisce due tabelle con valori corrispondenti',
ko: '일치하는 값으로 두 테이블 연결',
pt: 'unir duas tabelas usando valores coincidentes' |
<<<<<<<
ko: '공백',
it: 'Assente'
=======
ko: '공백',
pt: 'Ausente'
>>>>>>>
it: 'Assente',
ko: '공백',
pt: 'Ausente'
<<<<<<<
ko: '홀을 나타내기',
it: 'rappresenta un buco'
=======
ko: '홀을 나타내기',
pt: 'representa um buraco'
>>>>>>>
it: 'rappresenta un buco',
ko: '홀을 나타내기',
pt: 'representa um buraco'
<<<<<<<
ko: '열',
it: 'colonna'
=======
ko: '열',
pt: 'coluna'
>>>>>>>
it: 'colonna',
ko: '열',
pt: 'coluna'
<<<<<<<
ko: '열의 값 가져오기',
it: 'ottieni il valore di una colonna'
=======
ko: '열의 값 가져오기',
pt: 'obtém o valor de uma coluna'
>>>>>>>
it: 'ottieni il valore di una colonna',
ko: '열의 값 가져오기',
pt: 'obtém o valor de uma coluna'
<<<<<<<
ko: '연도-월-일',
it: 'AAAA-MM-GG'
=======
ko: '연도-월-일',
pt: 'AAAA-MM-DD'
>>>>>>>
it: 'AAAA-MM-GG',
ko: '연도-월-일',
pt: 'AAAA-MM-DD'
<<<<<<<
ko: '날짜/시간 유지',
it: 'data/ora costanti'
=======
ko: '날짜/시간 유지',
pt: 'constante data/tempo'
>>>>>>>
it: 'data/ora costanti',
ko: '날짜/시간 유지',
pt: 'constante data/tempo'
<<<<<<<
ko: '논리 상수',
it: 'constante logica'
=======
ko: '논리 상수',
pt: 'constante lógica'
>>>>>>>
it: 'constante logica',
ko: '논리 상수',
pt: 'constante lógica'
<<<<<<<
ko: '상수',
it: 'constante numerica'
=======
ko: '상수',
pt: 'número constante'
>>>>>>>
it: 'constante numerica',
ko: '상수',
pt: 'número constante'
<<<<<<<
ko: '텍스트',
it: 'testo'
=======
ko: '텍스트',
pt: 'texto'
>>>>>>>
it: 'testo',
ko: '텍스트',
pt: 'texto'
<<<<<<<
ko: '상수 텍스트',
it: 'testo costante'
=======
ko: '상수 텍스트',
pt: 'texto constante '
>>>>>>>
it: 'testo costante',
ko: '상수 텍스트',
pt: 'texto constante '
<<<<<<<
ko: '행 번호',
it: 'Numero della riga'
=======
ko: '행 번호',
pt: 'Número da linha'
>>>>>>>
it: 'Numero della riga',
ko: '행 번호',
pt: 'Número da linha'
<<<<<<<
ko: '행 번호',
it: 'numero della riga'
=======
ko: '행 번호',
pt: 'numero da linha'
>>>>>>>
it: 'numero della riga',
ko: '행 번호',
pt: 'numero da linha'
<<<<<<<
ko: '\u03BB %1 지수로 표현',
it: 'Esponenziale \u03BB %1'
=======
ko: '\u03BB %1 지수로 표현',
pt: 'Exponencial \u03BB %1'
>>>>>>>
it: 'Esponenziale \u03BB %1',
ko: '\u03BB %1 지수로 표현',
pt: 'Exponencial \u03BB %1'
<<<<<<<
ko: '지수 랜덤 값',
it: 'valore aleatorio esponenziale'
=======
ko: '지수 랜덤 값',
pt: 'valor aleatório exponencial'
>>>>>>>
it: 'valore aleatorio esponenziale',
ko: '지수 랜덤 값',
pt: 'valor aleatório exponencial'
<<<<<<<
ko: '\u03BC %1 \u03C3 %2 정규화',
it: 'Normale \u03BC %1 \u03C3 %2'
=======
ko: '\u03BC %1 \u03C3 %2 정규화',
pt: 'Normal \u03BC %1 \u03C3 %2'
>>>>>>>
it: 'Normale \u03BC %1 \u03C3 %2',
ko: '\u03BC %1 \u03C3 %2 정규화',
pt: 'Normal \u03BC %1 \u03C3 %2'
<<<<<<<
ko: '정규 랜덤 값',
it: 'valore aleatorio normale'
=======
ko: '정규 랜덤 값',
pt: 'valor aleatório normal'
>>>>>>>
it: 'valore aleatorio normale',
ko: '정규 랜덤 값',
pt: 'valor aleatório normal'
<<<<<<<
ko: '\u03B1 %1 \u03B2 %2 균등화',
it: 'Uniforme \u03B1 %1 \u03B2 %2'
=======
ko: '\u03B1 %1 \u03B2 %2 균등화',
pt: 'Uniforme \u03B1 %1 \u03B2 %2'
>>>>>>>
it: 'Uniforme \u03B1 %1 \u03B2 %2',
ko: '\u03B1 %1 \u03B2 %2 균등화',
pt: 'Uniforme \u03B1 %1 \u03B2 %2'
<<<<<<<
ko: '균등 랜덤 값',
it: 'valore aleatorio uniforme'
=======
ko: '균등 랜덤 값',
pt: 'valor aleatório uniforme',
>>>>>>>
it: 'valore aleatorio uniforme',
ko: '균등 랜덤 값',
pt: 'valor aleatório uniforme' |
<<<<<<<
es: 'Colores',
ar: 'الألوان'
=======
es: 'Colores',
ko: '색깔'
>>>>>>>
es: 'Colores',
ar: 'الألوان',
ko: '색깔'
<<<<<<<
es: 'once colores',
ar: 'احد عشر لون'
=======
es: 'once colores',
ko: '11개의 색'
>>>>>>>
es: 'once colores',
ar: 'احد عشر لون',
ko: '11개의 색'
<<<<<<<
es: 'Terremotos',
ar: 'الزلزال'
=======
es: 'Terremotos',
ko: '지진'
>>>>>>>
es: 'Terremotos',
ar: 'الزلزال',
ko: '지진'
<<<<<<<
es: 'datos de terremotos',
ar: 'بيانات الزلزال'
=======
es: 'datos de terremotos',
ko: '지진 데이터'
>>>>>>>
es: 'datos de terremotos',
ar: 'بيانات الزلزال',
ko: '지진 데이터'
<<<<<<<
es: 'Pingüinos',
ar: 'طيور البطريق'
=======
es: 'Pingüinos',
ko: '펭귄'
>>>>>>>
es: 'Pingüinos',
ar: 'طيور البطريق',
ko: '펭귄'
<<<<<<<
es: 'datos de pingüinos',
ar: 'بيانات طيور البطريق'
=======
es: 'datos de pingüinos',
ko: '펭귄 데이터'
>>>>>>>
es: 'datos de pingüinos',
ar: 'بيانات طيور البطريق',
ko: '펭귄 데이터'
<<<<<<<
es: 'Phish',
ar: 'فرقه الفيش الموسيقيه'
=======
es: 'Phish',
ko: '피시'
>>>>>>>
es: 'Phish',
ar: 'فرقه الفيش الموسيقيه',
ko: '피시'
<<<<<<<
es: 'datos de conciertos Phish',
ar: 'بيانات فرقه الفيش الموسيقيه'
=======
es: 'datos de conciertos Phish',
ko: '피시 콘서트 데이터'
>>>>>>>
es: 'datos de conciertos Phish',
ar: 'بيانات فرقه الفيش الموسيقيه',
ko: '피시 콘서트 데이터'
<<<<<<<
es: 'Sequencia %1 %2',
ar: 'المتسلسله %1 %2'
=======
es: 'Sequencia %1 %2',
ko: '배열 %1 %2'
>>>>>>>
es: 'Sequencia %1 %2',
ar: 'المتسلسله %1 %2',
ko: '배열 %1 %2'
<<<<<<<
es: 'nombre',
ar: 'اﻹسم'
=======
es: 'nombre',
ko: '이름'
>>>>>>>
es: 'nombre',
ar: 'اﻹسم',
ko: '이름'
<<<<<<<
es: 'Generar una sequencia 1..N',
ar: 'إنشاء متسلسله ١..ن'
=======
es: 'Generar una sequencia 1..N',
ko: '배열 실행 1..N'
>>>>>>>
es: 'Generar una sequencia 1..N',
ar: 'إنشاء متسلسله ١..ن',
ko: '배열 실행 1..N'
<<<<<<<
es: 'Datos de usuario %1',
ar: 'بيانات المسته %1'
=======
es: 'Datos de usuario %1',
ko: '사용자 데이터 %1'
>>>>>>>
es: 'Datos de usuario %1',
ar: 'بيانات المسته %1',
ko: '사용자 데이터 %1'
<<<<<<<
es: 'nombre',
ar: 'الإسم'
=======
es: 'nombre',
ko: '이름'
>>>>>>>
es: 'nombre',
ar: 'الإسم',
ko: '이름'
<<<<<<<
es: 'usa datos previamente cargados',
ar: 'إستخدام بيانات محمله مسبقا'
=======
es: 'usa datos previamente cargados',
ko: '이전에 로드된 데이터 사용'
>>>>>>>
es: 'usa datos previamente cargados',
ar: 'إستخدام بيانات محمله مسبقا',
ko: '이전에 로드된 데이터 사용' |
<<<<<<<
exports = module.exports =
/** @lends module:enyo/platform~platform */ {
//* `true` if the platform has native single-finger [events]{@glossary event}.
touch: Boolean(('ontouchstart' in window) || window.navigator.msMaxTouchPoints || window.navigator.maxTouchPoints),
//* `true` if the platform has native double-finger [events]{@glossary event}.
gesture: Boolean(('ongesturestart' in window) || window.navigator.msMaxTouchPoints || window.navigator.maxTouchPoints)
=======
exports = module.exports = {
/**
* `true` if the platform has native single-finger [events]{@glossary event}.
* @public
*/
touch: Boolean(('ontouchstart' in window) || window.navigator.msMaxTouchPoints),
/**
* `true` if the platform has native double-finger [events]{@glossary event}.
* @public
*/
gesture: Boolean(('ongesturestart' in window) || window.navigator.msMaxTouchPoints)
/**
* The name of the platform that was detected or `undefined` if the platform
* was unrecognized. This value is the key name for the major version of the
* platform on the exported object.
* @member {String} platformName
* @public
*/
>>>>>>>
exports = module.exports = {
/**
* `true` if the platform has native single-finger [events]{@glossary event}.
* @public
*/
touch: Boolean(('ontouchstart' in window) || window.navigator.msMaxTouchPoints || window.navigator.maxTouchPoints),
/**
* `true` if the platform has native double-finger [events]{@glossary event}.
* @public
*/
gesture: Boolean(('ongesturestart' in window) || window.navigator.msMaxTouchPoints || window.navigator.maxTouchPoints)
/**
* The name of the platform that was detected or `undefined` if the platform
* was unrecognized. This value is the key name for the major version of the
* platform on the exported object.
* @member {String} platformName
* @public
*/ |
<<<<<<<
this.angle = 90 - (30 + 60 * this.lane);
this.width = 2 * this.distFromHex / Math.sqrt(3);
this.widthswag = this.width + this.height + 3;
=======
this.width = 2 * this.distFromHex / Math.sqrt(3);
this.widthswag = this.width + this.height + 5;
>>>>>>>
this.width = 2 * this.distFromHex / Math.sqrt(3);
this.widthswag = this.width + this.height + 3;
<<<<<<<
this.angle = 30 + this.position * 60;
=======
this.position = this.position % this.sides;
this.blocks.forEach(function(blocks){
blocks.forEach(function(block){
block.angle = block.angle - steps * 60;
});
})
this.angle = this.angle + steps * 60;
>>>>>>>
this.position = this.position % this.sides;
this.blocks.forEach(function(blocks){
blocks.forEach(function(block){
block.angle = block.angle - steps * 60;
});
});
this.angle = this.angle + steps * 60; |
<<<<<<<
if (gameState == 0 || gameState == 2) {
init();
}
=======
init();
>>>>>>>
init();
<<<<<<<
=======
if (gameState == 1) {
requestAnimFrame(animLoop);
}
>>>>>>> |
<<<<<<<
for (var i = 0; i < 1; i++) {
blocks.push(new Block(i, 'green'));
}
=======
>>>>>>>
<<<<<<<
var iter = 1;
=======
var iter = 1/100;
var lastGen = Date.now();
var nextGen = 1000;
var colors = ["green", "red"];
>>>>>>>
var iter = 1/100;
var lastGen = Date.now();
var nextGen = 1000;
var colors = ["green", "red"];
<<<<<<<
var objectsToRemove = [];
MainClock.blocks.forEach(function(hexBlocks){
for (var i = 0; i < hexBlocks.length; i++) {
MainClock.doesBlockCollide(hexBlocks[i], iter, i);
if (!hexBlocks[i].settled) {
hexBlocks[i].distFromHex -= iter;
}
hexBlocks[i].draw();
}
});
for (var i in blocks) {
MainClock.doesBlockCollide(blocks[i], iter);
if (!blocks[i].settled) {
blocks[i].distFromHex -= iter;
} else {
objectsToRemove.push(blocks[i]);
=======
for(var i=0; i<MainClock.blocks.length; i++) {
for(var j=0; j<MainClock.blocks[i].length; j++) {
MainClock.blocks[i][j].draw();
}
}
blocks.forEach(function(o){
MainClock.doesBlockCollide(o, iter);
if (!o.settled) {
o.distFromHex -= iter;
>>>>>>>
var objectsToRemove = [];
MainClock.blocks.forEach(function(hexBlocks){
for (var i = 0; i < hexBlocks.length; i++) {
MainClock.doesBlockCollide(hexBlocks[i], iter, i);
if (!hexBlocks[i].settled) {
hexBlocks[i].distFromHex -= iter;
}
hexBlocks[i].draw();
}
});
for (var i in blocks) {
MainClock.doesBlockCollide(blocks[i], iter);
if (!blocks[i].settled) {
blocks[i].distFromHex -= iter;
} else {
objectsToRemove.push(blocks[i]);
<<<<<<<
=======
}
function Block(lane, color, distFromHex, settled) {
this.settled = (settled == undefined) ? 0 : 1;
this.height = 20;
this.width = 65;
this.lane = lane;
this.angle = 90 - (30 + 60 * lane);
if (this.angle < 0) {
this.angle += 360;
}
this.color = color;
if (distFromHex) {
this.distFromHex = distFromHex;
}
else {
this.distFromHex = 300;
}
this.draw = function() {
this.angle = 90 - (30 + 60 * this.lane);
this.width = 2 * this.distFromHex / Math.sqrt(3);
this.widthswag = this.width + this.height + 5;
var p1 = rotatePoint(-this.width/2, this.height/2, this.angle);
var p2 = rotatePoint(this.width/2, this.height/2, this.angle);
var p3 = rotatePoint(this.widthswag/2, -this.height/2, this.angle);
var p4 = rotatePoint(-this.widthswag/2, -this.height/2, this.angle);
ctx.fillStyle=this.color;
var baseX = canvas.width/2 + Math.sin((this.angle) * (Math.PI/180)) * (this.distFromHex + this.height/2);
var baseY = canvas.height/2 - Math.cos((this.angle) * (Math.PI/180)) * (this.distFromHex + this.height/2);
ctx.beginPath();
ctx.moveTo(Math.round(baseX + p1.x), Math.round(baseY + p1.y));
ctx.lineTo(Math.round(baseX + p2.x), Math.round(baseY + p2.y));
ctx.lineTo(Math.round(baseX + p3.x), Math.round(baseY + p3.y));
ctx.lineTo(Math.round(baseX + p4.x), Math.round(baseY + p4.y));
ctx.lineTo(Math.round(baseX + p1.x), Math.round(baseY + p1.y));
ctx.closePath();
ctx.fill();
// ctx.strokeStyle = '#322'
// ctx.beginPath();
// ctx.moveTo(canvas.width/2, canvas.height/2);
// ctx.lineTo(canvas.width/2 + Math.sin((this.angle) * (Math.PI/180)) * (this.distFromHex + this.height), canvas.height/2 - Math.cos((this.angle) * (Math.PI/180)) * (this.distFromHex + this.height));
// ctx.closePath();
// ctx.stroke();
};
>>>>>>>
}
function Block(lane, color, distFromHex, settled) {
this.settled = (settled == undefined) ? 0 : 1;
this.height = 20;
this.width = 65;
this.lane = lane;
this.angle = 90 - (30 + 60 * lane);
if (this.angle < 0) {
this.angle += 360;
}
this.color = color;
if (distFromHex) {
this.distFromHex = distFromHex;
}
else {
this.distFromHex = 300;
}
this.draw = function() {
this.angle = 90 - (30 + 60 * this.lane);
this.width = 2 * this.distFromHex / Math.sqrt(3);
this.widthswag = this.width + this.height + 5;
var p1 = rotatePoint(-this.width/2, this.height/2, this.angle);
var p2 = rotatePoint(this.width/2, this.height/2, this.angle);
var p3 = rotatePoint(this.widthswag/2, -this.height/2, this.angle);
var p4 = rotatePoint(-this.widthswag/2, -this.height/2, this.angle);
ctx.fillStyle=this.color;
var baseX = canvas.width/2 + Math.sin((this.angle) * (Math.PI/180)) * (this.distFromHex + this.height/2);
var baseY = canvas.height/2 - Math.cos((this.angle) * (Math.PI/180)) * (this.distFromHex + this.height/2);
ctx.beginPath();
ctx.moveTo(Math.round(baseX + p1.x), Math.round(baseY + p1.y));
ctx.lineTo(Math.round(baseX + p2.x), Math.round(baseY + p2.y));
ctx.lineTo(Math.round(baseX + p3.x), Math.round(baseY + p3.y));
ctx.lineTo(Math.round(baseX + p4.x), Math.round(baseY + p4.y));
ctx.lineTo(Math.round(baseX + p1.x), Math.round(baseY + p1.y));
ctx.closePath();
ctx.fill();
// ctx.strokeStyle = '#322'
// ctx.beginPath();
// ctx.moveTo(canvas.width/2, canvas.height/2);
// ctx.lineTo(canvas.width/2 + Math.sin((this.angle) * (Math.PI/180)) * (this.distFromHex + this.height), canvas.height/2 - Math.cos((this.angle) * (Math.PI/180)) * (this.distFromHex + this.height));
// ctx.closePath();
// ctx.stroke();
}; |
<<<<<<<
settings.comboTime = waveone.nextGen/16 * 2;
=======
//settings.comboTime = settings.creationSpeedModifier * 4;
settings.comboTime = (1/settings.creationSpeedModifier) * (waveone.nextGen/16.666667) * 1.75;
>>>>>>>
settings.comboTime = (1/settings.creationSpeedModifier) * (waveone.nextGen/16.666667) * 1.75; |
<<<<<<<
var blocks = [];
=======
clock = new Clock(6);
var blocks = [];
>>>>>>>
var clock = new Clock(6);
var blocks = []; |
<<<<<<<
// no-useless-constructor interference fix.
'no-useless-constructor': 'off',
'@typescript-eslint/no-useless-constructor': 'error',
=======
// semi interference fix.
'semi': 'off',
'@typescript-eslint/semi': 'warn',
>>>>>>>
// no-useless-constructor interference fix.
'no-useless-constructor': 'off',
'@typescript-eslint/no-useless-constructor': 'error',
// semi interference fix.
'semi': 'off',
'@typescript-eslint/semi': 'warn', |
<<<<<<<
test('simple decode base64', async (cb) => {
const script = `
addEventListener('fetch', event => {
event.respondWith(new Response(atob('SGVsbG8gV29ybGQh'), {status: 200}))
})
`
const server = new Cloudworker(script).listen(8080)
const res = await axios.get('http://localhost:8080', defaultAxiosOpts)
expect(res.status).toEqual(200)
expect(res.data).toEqual('Hello World!')
await server.close()
cb()
})
test('simple encode base64', async (cb) => {
const script = `
addEventListener('fetch', event => {
event.respondWith(new Response(btoa('Hello World!'), {status: 200}))
})
`
const server = new Cloudworker(script).listen(8080)
const res = await axios.get('http://localhost:8080', defaultAxiosOpts)
expect(res.status).toEqual(200)
expect(res.data).toEqual('SGVsbG8gV29ybGQh')
await server.close()
cb()
})
=======
test('github issue 32', async (cb) => {
const script = utils.read(path.join(__dirname, 'fixtures/github-issue-32.js'))
const server = new Cloudworker(script).listen(8080)
const res = await axios.get('http://localhost:8080', defaultAxiosOpts)
expect(res.status).toEqual(200)
await server.close()
cb()
})
test('github issue 33', async (cb) => {
const script = utils.read(path.join(__dirname, 'fixtures/github-issue-33.js'))
const server = new Cloudworker(script).listen(8080)
const res = await axios.get('http://localhost:8080', defaultAxiosOpts)
expect(res.status).toEqual(200)
await server.close()
cb()
})
>>>>>>>
test('github issue 32', async (cb) => {
const script = utils.read(path.join(__dirname, 'fixtures/github-issue-32.js'))
const server = new Cloudworker(script).listen(8080)
const res = await axios.get('http://localhost:8080', defaultAxiosOpts)
expect(res.status).toEqual(200)
await server.close()
cb()
})
test('github issue 33', async (cb) => {
const script = utils.read(path.join(__dirname, 'fixtures/github-issue-33.js'))
const server = new Cloudworker(script).listen(8080)
const res = await axios.get('http://localhost:8080', defaultAxiosOpts)
expect(res.status).toEqual(200)
await server.close()
cb()
})
test('simple decode base64', async (cb) => {
const script = `
addEventListener('fetch', event => {
event.respondWith(new Response(atob('SGVsbG8gV29ybGQh'), {status: 200}))
})
`
const server = new Cloudworker(script).listen(8080)
const res = await axios.get('http://localhost:8080', defaultAxiosOpts)
expect(res.status).toEqual(200)
expect(res.data).toEqual('Hello World!')
await server.close()
cb()
})
test('simple encode base64', async (cb) => {
const script = `
addEventListener('fetch', event => {
event.respondWith(new Response(btoa('Hello World!'), {status: 200}))
})
`
const server = new Cloudworker(script).listen(8080)
const res = await axios.get('http://localhost:8080', defaultAxiosOpts)
expect(res.status).toEqual(200)
expect(res.data).toEqual('SGVsbG8gV29ybGQh')
await server.close()
cb()
}) |
<<<<<<<
const { crypto } = require('./runtime/crypto')
=======
const { atob, btoa } = require('./runtime/base64')
>>>>>>>
const { crypto } = require('./runtime/crypto')
const { atob, btoa } = require('./runtime/base64')
<<<<<<<
this.crypto = crypto
=======
this.atob = atob
this.btoa = btoa
>>>>>>>
this.crypto = crypto
this.atob = atob
this.btoa = btoa |
<<<<<<<
test('simple text encoder', async (cb) => {
const script = `
addEventListener('fetch', event => {
const encoder = new TextEncoder()
const { readable, writable } = new TransformStream()
const writer = writable.getWriter()
writer.write(encoder.encode('hello')).then(() => writer.close())
event.respondWith(new Response(readable, {status: 200}))
})
`
const server = new Cloudworker(script).listen(8080)
const res = await axios.get('http://localhost:8080', defaultAxiosOpts)
expect(res.status).toEqual(200)
expect(res.data).toEqual('hello')
await server.close()
cb()
})
test('simple text encoder and decoder', async (cb) => {
const script = `
addEventListener('fetch', event => {
const helloBytes = new Uint8Array([104, 101, 108, 108, 111])
const decoder = new TextDecoder()
const { readable, writable } = new TransformStream()
const writer = writable.getWriter()
writer.write(new TextEncoder().encode(decoder.decode(helloBytes))).then(() => writer.close())
event.respondWith(new Response(readable, {status: 200}))
})
`
const server = new Cloudworker(script).listen(8080)
const res = await axios.get('http://localhost:8080', defaultAxiosOpts)
expect(res.status).toEqual(200)
expect(res.data).toEqual('hello')
await server.close()
cb()
})
test('test ascii decoder can be specified', async (cb) => {
const script = `
addEventListener('fetch', event => {
const euroSymbol = new Uint8Array([226, 130, 172])
const decoder = new TextDecoder()
const asciiDecoder = new TextDecoder('ascii')
const sameDecodedValues = (decoder.decode(euroSymbol)) === (asciiDecoder.decode(euroSymbol))
const { readable, writable } = new TransformStream()
const writer = writable.getWriter()
writer.write(new TextEncoder().encode(sameDecodedValues)).then(() => writer.close())
event.respondWith(new Response(readable, {status: 200}))
})
`
const server = new Cloudworker(script).listen(8080)
const res = await axios.get('http://localhost:8080', defaultAxiosOpts)
expect(res.status).toEqual(200)
expect(res.data).toEqual(false)
await server.close()
cb()
})
=======
test('github issue 41', async cb => {
const script = `
addEventListener('fetch', async event => {
const response = await fetch("https://example.com")
event.respondWith(new Response(response))
})
`
const customFetch = () => Promise.resolve('mocked response')
const server = new Cloudworker(script, {
bindings: { fetch: customFetch },
}).listen(8080)
const res = await axios.get('http://localhost:8080', defaultAxiosOpts)
expect(res.data).toEqual('mocked response')
await server.close()
cb()
})
>>>>>>>
test('github issue 41', async cb => {
const script = `
addEventListener('fetch', async event => {
const response = await fetch("https://example.com")
event.respondWith(new Response(response))
})
`
const customFetch = () => Promise.resolve('mocked response')
const server = new Cloudworker(script, {
bindings: { fetch: customFetch },
}).listen(8080)
const res = await axios.get('http://localhost:8080', defaultAxiosOpts)
expect(res.data).toEqual('mocked response')
await server.close()
cb()
})
test('simple text encoder', async (cb) => {
const script = `
addEventListener('fetch', event => {
const encoder = new TextEncoder()
const { readable, writable } = new TransformStream()
const writer = writable.getWriter()
writer.write(encoder.encode('hello')).then(() => writer.close())
event.respondWith(new Response(readable, {status: 200}))
})
`
const server = new Cloudworker(script).listen(8080)
const res = await axios.get('http://localhost:8080', defaultAxiosOpts)
expect(res.status).toEqual(200)
expect(res.data).toEqual('hello')
await server.close()
cb()
})
test('simple text encoder and decoder', async (cb) => {
const script = `
addEventListener('fetch', event => {
const helloBytes = new Uint8Array([104, 101, 108, 108, 111])
const decoder = new TextDecoder()
const { readable, writable } = new TransformStream()
const writer = writable.getWriter()
writer.write(new TextEncoder().encode(decoder.decode(helloBytes))).then(() => writer.close())
event.respondWith(new Response(readable, {status: 200}))
})
`
const server = new Cloudworker(script).listen(8080)
const res = await axios.get('http://localhost:8080', defaultAxiosOpts)
expect(res.status).toEqual(200)
expect(res.data).toEqual('hello')
await server.close()
cb()
})
test('test ascii decoder can be specified', async (cb) => {
const script = `
addEventListener('fetch', event => {
const euroSymbol = new Uint8Array([226, 130, 172])
const decoder = new TextDecoder()
const asciiDecoder = new TextDecoder('ascii')
const sameDecodedValues = (decoder.decode(euroSymbol)) === (asciiDecoder.decode(euroSymbol))
const { readable, writable } = new TransformStream()
const writer = writable.getWriter()
writer.write(new TextEncoder().encode(sameDecodedValues)).then(() => writer.close())
event.respondWith(new Response(readable, {status: 200}))
})
`
const server = new Cloudworker(script).listen(8080)
const res = await axios.get('http://localhost:8080', defaultAxiosOpts)
expect(res.status).toEqual(200)
expect(res.data).toEqual(false)
await server.close()
cb()
}) |
<<<<<<<
const { TextDecoder, TextEncoder } = require('./runtime/text-encoder')
=======
const { atob, btoa } = require('./runtime/base64')
>>>>>>>
const { TextDecoder, TextEncoder } = require('./runtime/text-encoder')
const { atob, btoa } = require('./runtime/base64')
<<<<<<<
this.TextDecoder = TextDecoder
this.TextEncoder = TextEncoder
=======
this.atob = atob
this.btoa = btoa
>>>>>>>
this.TextDecoder = TextDecoder
this.TextEncoder = TextEncoder
this.atob = atob
this.btoa = btoa |
<<<<<<<
if (ch === "x" || ch === "X") {
this.input();
=======
if (ch === 'x' || ch === 'X') {
ch = this.input();
>>>>>>>
if (ch === "x" || ch === "X") {
ch = this.input();
<<<<<<<
while (this.offset < this.size) {
this.input();
=======
while(this.offset < this.size) {
var ch = this.input();
>>>>>>>
while (this.offset < this.size) {
var ch = this.input();
<<<<<<<
while (this.offset < this.size) {
this.input();
=======
while(this.offset < this.size) {
var ch = this.input();
>>>>>>>
while (this.offset < this.size) {
var ch = this.input(); |
<<<<<<<
if (typeof id !== "number") {
if (token === "yield") {
if (this.tryMatch(" from")) {
=======
if (typeof id !== 'number') {
if (token === 'yield') {
if (this.php7 && this.tryMatch(' from')) {
>>>>>>>
if (typeof id !== "number") {
if (token === "yield") {
if (this.php7 && this.tryMatch(' from')) {
<<<<<<<
"?": function() {
if (this._input[this.offset] === "?") {
=======
'?': function() {
if (this.php7 && this._input[this.offset] === '?') {
>>>>>>>
"?": function() {
if (this.php7 && this._input[this.offset] === "?") {
<<<<<<<
if (this._input[this.offset] === ">") {
=======
if (this.php7 && this._input[this.offset] === '>') {
>>>>>>>
if (this.php7 && this._input[this.offset] === ">") { |
<<<<<<<
test('xAxisTickValues', function(assert) {
assert.expect(4);
const getModelDataFor = (start, end, timeGrain) => {
return {
response: {
rows: [
{
dateTime: start,
uniqueIdentifier: 172933788
},
{
dateTime: end,
uniqueIdentifier: 183206656
}
]
},
request: {
logicalTable: {
timeGrain
},
intervals: [
{
start,
end
}
]
}
};
};
let component = this.owner.factoryFor('component:navi-visualizations/line-chart').create();
component.set('options', {
axis: {
y: {
series: {
type: 'metric',
config: {
timeGrain: 'year'
}
}
}
}
});
const allMonths = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
let grain = 'day';
component.set('model', A([getModelDataFor('2018-01-01T00:00:00.000Z', '2019-06-01T00:00:00.000Z', grain)]));
let xAxisTickValues = component.get('xAxisTickValues');
assert.deepEqual(
xAxisTickValues.axis.x.tick.values.map(x => GROUP[grain].by.year.getXDisplay(x + 1)),
allMonths,
`Create label for each month on ${grain} grain year chart`
);
grain = 'week';
component.set('model', A([getModelDataFor('2018-01-01 00:00:00.000', '2019-06-01 00:00:00.000', grain)]));
xAxisTickValues = component.get('xAxisTickValues');
assert.deepEqual(
xAxisTickValues.axis.x.tick.values.map(x => GROUP[grain].by.year.getXDisplay(x + 1)),
allMonths,
`Create label for each month on ${grain} grain year chart`
);
grain = 'month';
component.set('model', A([getModelDataFor('2018-01-01 00:00:00.000', '2019-06-01 00:00:00.000', grain)]));
xAxisTickValues = component.get('xAxisTickValues');
assert.deepEqual(
xAxisTickValues.axis.x.tick.values.map(x => GROUP[grain].by.year.getXDisplay(x + 1)),
allMonths,
`Create label for each month on ${grain} grain year chart`
);
component.set('options', {
axis: {
y: {
series: {
type: 'metric'
}
}
}
});
grain = 'day';
component.set('model', A([getModelDataFor('2018-01-01T00:00:00.000Z', '2019-06-01T00:00:00.000Z', grain)]));
xAxisTickValues = component.get('xAxisTickValues');
assert.deepEqual(xAxisTickValues, {}, 'Does not generate custom values for non-year timeGrain series');
});
=======
test('line chart styles', function(assert) {
let component = this.owner.factoryFor('component:navi-visualizations/line-chart').create({
model: A([
{
response: {
rows: [
{
dateTime: '2016-05-30 00:00:00.000',
uniqueIdentifier: 172933788,
totalPageViews: 3669828357
}
]
},
request: {
logicalTable: {
timeGrain: 'day'
},
intervals: [
{
start: '2016-05-30 00:00:00.000',
end: '2016-06-04 00:00:00.000'
}
]
}
}
])
});
assert.equal(component.config.data.type, 'line');
component.set('options', { style: { curve: 'line', area: true } });
assert.equal(component.config.data.type, 'area', 'default of line returns as configured');
component.set('options', { style: { curve: 'spline', area: false } });
assert.equal(component.config.data.type, 'spline', 'adding spline passes a spline config');
component.set('options', { style: { curve: 'spline', area: true } });
assert.equal(component.config.data.type, 'area-spline', 'spline with area true returns a area spline config');
component.set('options', { style: { curve: 'step', area: false } });
assert.equal(component.config.data.type, 'step', 'step returns a step config');
component.set('options', { style: { curve: 'step', area: true } });
assert.equal(component.config.data.type, 'area-step', 'step with area true returns a area step config');
component.set('options', { style: { curve: 'moose', area: false } });
assert.equal(component.config.data.type, 'line', 'bad config uses default line');
});
>>>>>>>
test('line chart styles', function(assert) {
let component = this.owner.factoryFor('component:navi-visualizations/line-chart').create({
model: A([
{
response: {
rows: [
{
dateTime: '2016-05-30 00:00:00.000',
uniqueIdentifier: 172933788,
totalPageViews: 3669828357
}
]
},
request: {
logicalTable: {
timeGrain: 'day'
},
intervals: [
{
start: '2016-05-30 00:00:00.000',
end: '2016-06-04 00:00:00.000'
}
]
}
}
])
});
assert.equal(component.config.data.type, 'line');
component.set('options', { style: { curve: 'line', area: true } });
assert.equal(component.config.data.type, 'area', 'default of line returns as configured');
component.set('options', { style: { curve: 'spline', area: false } });
assert.equal(component.config.data.type, 'spline', 'adding spline passes a spline config');
component.set('options', { style: { curve: 'spline', area: true } });
assert.equal(component.config.data.type, 'area-spline', 'spline with area true returns a area spline config');
component.set('options', { style: { curve: 'step', area: false } });
assert.equal(component.config.data.type, 'step', 'step returns a step config');
component.set('options', { style: { curve: 'step', area: true } });
assert.equal(component.config.data.type, 'area-step', 'step with area true returns a area step config');
component.set('options', { style: { curve: 'moose', area: false } });
assert.equal(component.config.data.type, 'line', 'bad config uses default line');
});
test('xAxisTickValues', function(assert) {
assert.expect(4);
const getModelDataFor = (start, end, timeGrain) => {
return {
response: {
rows: [
{
dateTime: start,
uniqueIdentifier: 172933788
},
{
dateTime: end,
uniqueIdentifier: 183206656
}
]
},
request: {
logicalTable: {
timeGrain
},
intervals: [
{
start,
end
}
]
}
};
};
let component = this.owner.factoryFor('component:navi-visualizations/line-chart').create();
component.set('options', {
axis: {
y: {
series: {
type: 'metric',
config: {
timeGrain: 'year'
}
}
}
}
});
const allMonths = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
let grain = 'day';
component.set('model', A([getModelDataFor('2018-01-01T00:00:00.000Z', '2019-06-01T00:00:00.000Z', grain)]));
let xAxisTickValues = component.get('xAxisTickValues');
assert.deepEqual(
xAxisTickValues.axis.x.tick.values.map(x => GROUP[grain].by.year.getXDisplay(x + 1)),
allMonths,
`Create label for each month on ${grain} grain year chart`
);
grain = 'week';
component.set('model', A([getModelDataFor('2018-01-01 00:00:00.000', '2019-06-01 00:00:00.000', grain)]));
xAxisTickValues = component.get('xAxisTickValues');
assert.deepEqual(
xAxisTickValues.axis.x.tick.values.map(x => GROUP[grain].by.year.getXDisplay(x + 1)),
allMonths,
`Create label for each month on ${grain} grain year chart`
);
grain = 'month';
component.set('model', A([getModelDataFor('2018-01-01 00:00:00.000', '2019-06-01 00:00:00.000', grain)]));
xAxisTickValues = component.get('xAxisTickValues');
assert.deepEqual(
xAxisTickValues.axis.x.tick.values.map(x => GROUP[grain].by.year.getXDisplay(x + 1)),
allMonths,
`Create label for each month on ${grain} grain year chart`
);
component.set('options', {
axis: {
y: {
series: {
type: 'metric'
}
}
}
});
grain = 'day';
component.set('model', A([getModelDataFor('2018-01-01T00:00:00.000Z', '2019-06-01T00:00:00.000Z', grain)]));
xAxisTickValues = component.get('xAxisTickValues');
assert.deepEqual(xAxisTickValues, {}, 'Does not generate custom values for non-year timeGrain series');
}); |
<<<<<<<
Bespin.Canvas.Fix(ctx);
=======
fixCanvas(ctx);
ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
>>>>>>>
Bespin.Canvas.Fix(ctx);
ctx.clearRect(0, 0, this.canvas.width, this.canvas.height); |
<<<<<<<
=======
components: [
{name: "clientContainer", classes: "enyo-touch-scroller", components: [
{name: "client"}
]}
],
rendered: function() {
this.inherited(arguments);
enyo.makeBubble(this.$.clientContainer, "scroll");
},
>>>>>>> |
<<<<<<<
console.log("Syntax-Check");
=======
>>>>>>>
<<<<<<<
bespin.unsubscribe(onChange);
=======
bespin.unsubscribe(onChange)
>>>>>>>
bespin.unsubscribe(onChange);
bespin.unsubscribe(run); |
<<<<<<<
store: new bespin.command.Store()
});
//** {{{Command: help}}} **
bespin.command.store.addCommand({
name: 'help',
takes: ['search'],
preview: 'show commands',
description: 'The <u>help</u> gives you access to the various commands in the Bespin system.<br/><br/>You can narrow the search of a command by adding an optional search params.<br/><br/>If you pass in the magic <em>hidden</em> parameter, you will find subtle hidden commands.<br/><br/>Finally, pass in the full name of a command and you can get the full description, which you just did to see this!',
completeText: 'optionally, narrow down the search',
execute: function(instruction, extra) {
var output = this.parent.getHelp(extra, {
prefix: "<h2>Welcome to Bespin - Code in the Cloud</h2><ul>" +
"<li><a href='http://labs.mozilla.com/projects/bespin' target='_blank'>Home Page</a>" +
"<li><a href='https://wiki.mozilla.org/Labs/Bespin' target='_blank'>Wiki</a>" +
"<li><a href='https://wiki.mozilla.org/Labs/Bespin/UserGuide' target='_blank'>User Guide</a>" +
"<li><a href='https://wiki.mozilla.org/Labs/Bespin/Tips' target='_blank'>Tips and Tricks</a>" +
"<li><a href='https://wiki.mozilla.org/Labs/Bespin/FAQ' target='_blank'>FAQ</a>" +
"<li><a href='https://wiki.mozilla.org/Labs/Bespin/DeveloperGuide' target='_blank'>Developers Guide</a>" +
"</ul>",
suffix: "For more information, see the <a href='https://wiki.mozilla.org/Labs/Bespin'>Bespin Wiki</a>."
});
instruction.addOutput(output);
}
=======
store: new bespin.command.Store(),
executeExtensionCommand: function() {
var args = arguments;
var self = this;
this.load(function(execute) {
execute.apply(self, args);
});
}
});
bespin.subscribe("extension:loaded:bespin.command", function(ext) {
ext.execute = bespin.command.executeExtensionCommand;
bespin.command.store.addCommand(ext);
});
bespin.subscribe("extension:removed:bespin.command", function(ext) {
bespin.command.store.removeCommand(ext);
>>>>>>>
store: new bespin.command.Store(),
executeExtensionCommand: function() {
var args = arguments;
var self = this;
this.load(function(execute) {
execute.apply(self, args);
});
}
});
bespin.subscribe("extension:loaded:bespin.command", function(ext) {
ext.execute = bespin.command.executeExtensionCommand;
bespin.command.store.addCommand(ext);
});
bespin.subscribe("extension:removed:bespin.command", function(ext) {
bespin.command.store.removeCommand(ext);
});
//** {{{Command: help}}} **
bespin.command.store.addCommand({
name: 'help',
takes: ['search'],
preview: 'show commands',
description: 'The <u>help</u> gives you access to the various commands in the Bespin system.<br/><br/>You can narrow the search of a command by adding an optional search params.<br/><br/>If you pass in the magic <em>hidden</em> parameter, you will find subtle hidden commands.<br/><br/>Finally, pass in the full name of a command and you can get the full description, which you just did to see this!',
completeText: 'optionally, narrow down the search',
execute: function(instruction, extra) {
var output = this.parent.getHelp(extra, {
prefix: "<h2>Welcome to Bespin - Code in the Cloud</h2><ul>" +
"<li><a href='http://labs.mozilla.com/projects/bespin' target='_blank'>Home Page</a>" +
"<li><a href='https://wiki.mozilla.org/Labs/Bespin' target='_blank'>Wiki</a>" +
"<li><a href='https://wiki.mozilla.org/Labs/Bespin/UserGuide' target='_blank'>User Guide</a>" +
"<li><a href='https://wiki.mozilla.org/Labs/Bespin/Tips' target='_blank'>Tips and Tricks</a>" +
"<li><a href='https://wiki.mozilla.org/Labs/Bespin/FAQ' target='_blank'>FAQ</a>" +
"<li><a href='https://wiki.mozilla.org/Labs/Bespin/DeveloperGuide' target='_blank'>Developers Guide</a>" +
"</ul>",
suffix: "For more information, see the <a href='https://wiki.mozilla.org/Labs/Bespin'>Bespin Wiki</a>."
});
instruction.addOutput(output);
} |
<<<<<<<
if ( callbacks ) {
for (var a = 0; a < callbacks.length; a++) {
callbacks[a]( el )
}
}
})
=======
var callbacks = _this._initCallbacks;
if ( callbacks )
for ( var a = 0; a < callbacks.length; a++)
callbacks[a]();
>>>>>>>
if ( callbacks )
for ( var a = 0; a < callbacks.length; a++ )
callbacks[a]( el )
})
<<<<<<<
fieldItem.remove();
});
/**
* Initialize color picker
*/
$('input:text.cmb_colorpicker').each(function (i) {
$(this).after('<div id="picker-' + i + '" style="z-index: 1000; background: #EEE; border: 1px solid #CCC; position: absolute; display: block;"></div>');
$('#picker-' + i).hide().farbtastic($(this));
})
.focus(function() {
$(this).next().show();
})
.blur(function() {
$(this).next().hide();
});
/**
* File and image upload handling
*/
$('.cmb_upload_file').change(function () {
formfield = $(this).attr('id');
formfieldobj = $(this).siblings( '.cmb_upload_file_id' );
$('#' + formfield + '_id').val("");
});
$('.cmb_upload_button').live('click', function () {
var buttonLabel;
formfield = $(this).prev('input').attr('id');
formfieldobj = $(this).siblings( '.cmb_upload_file_id' );
if ( formfieldobj.siblings( 'label' ).length )
buttonLabel = 'Use as ' + formfieldobj.siblings( 'label' ).text();
else
buttonLabel = 'Use as ' + $('label[for=' + formfield + ']').text();
tb_show('', 'media-upload.php?post_id=' + $('#post_ID').val() + '&type=file&cmb_force_send=true&cmb_send_label=' + buttonLabel + '&TB_iframe=true');
return false;
});
$('.cmb_remove_file_button').live('click', function () {
formfield = $(this).attr('rel');
formfieldobj = $(this).closest('.cmb_upload_status').siblings( '.cmb_upload_file_id' );
$('input#' + formfield).val('');
$('input#' + formfield + '_id').val('');
$(this).parent().remove();
return false;
});
window.original_send_to_editor = window.send_to_editor;
window.send_to_editor = function (html) {
var itemurl, itemclass, itemClassBits, itemid, htmlBits, itemtitle,
image, uploadStatus = true;
if (formfield) {
if ($(html).html(html).find('img').length > 0) {
itemurl = $(html).html(html).find('img').attr('src'); // Use the URL to the size selected.
itemclass = $(html).html(html).find('img').attr('class'); // Extract the ID from the returned class name.
itemClassBits = itemclass.split(" ");
itemid = itemClassBits[itemClassBits.length - 1];
itemid = itemid.replace('wp-image-', '');
} else {
// It's not an image. Get the URL to the file instead.
htmlBits = html.split("'"); // jQuery seems to strip out XHTML when assigning the string to an object. Use alternate method.
itemurl = htmlBits[1]; // Use the URL to the file.
itemtitle = htmlBits[2];
itemtitle = itemtitle.replace('>', '');
itemtitle = itemtitle.replace('</a>', '');
itemid = itemurl; // TO DO: Get ID for non-image attachments.
}
image = /(jpe?g|png|gif|ico)$/gi;
if (itemurl.match(image)) {
uploadStatus = '<div class="img_status"><img src="' + itemurl + '" alt="" /><a href="#" class="cmb_remove_file_button" rel="' + formfield + '">Remove Image</a></div>';
} else {
// No output preview if it's not an image
// Standard generic output if it's not an image.
html = '<a href="' + itemurl + '" target="_blank" rel="external">View File</a>';
uploadStatus = '<div class="no_image"><span class="file_link">' + html + '</span> <a href="#" class="cmb_remove_file_button" rel="' + formfield + '">Remove</a></div>';
}
if ( formfieldobj ) {
$(formfieldobj).val(itemid);
$(formfieldobj).siblings('.cmb_upload_status').slideDown().html(uploadStatus);
} else {
$('#' + formfield).val(itemurl);
$('#' + formfield + '_id').val(itemid);
$('#' + formfield).siblings('.cmb_upload_status').slideDown().html(uploadStatus);
}
tb_remove();
} else {
window.original_send_to_editor(html);
}
formfield = '';
};
=======
>>>>>>>
fieldItem.remove();
} );
<<<<<<<
});
CMB.addCallbackForClonedField( ['CMB_Date_Field', 'CMB_Time_Field', 'CMB_Date_Timestamp_Field', 'CMB_Datetime_Timestamp_Field' ], function( newT ) {
// Reinitialize all the datepickers
newT.find('.cmb_datepicker' ).each(function () {
jQuery(this).attr( 'id', '' ).removeClass( 'hasDatepicker' ).removeData( 'datepicker' ).unbind().datepicker();
});
// Reinitialize all the timepickers.
newT.find('.cmb_timepicker' ).each(function () {
jQuery(this).timePicker({
startTime: "07:00",
endTime: "22:00",
show24Hours: false,
separator: ':',
step: 30
});
});
} );
CMB.addCallbackForInit( function() {
/**
* Initialize jQuery UI datepicker (this will be moved inline in a future release)
*/
jQuery('.cmb_datepicker' ).each(function () {
jQuery(this).datepicker();
});
// Wrap date picker in class to narrow the scope of jQuery UI CSS and prevent conflicts
jQuery("#ui-datepicker-div").wrap('<div class="cmb_element" />');
/**
* Initialize timepicker
*/
jQuery('.cmb_timepicker' ).each(function () {
jQuery(this).timePicker({
startTime: "07:00",
endTime: "22:00",
show24Hours: false,
separator: ':',
step: 30
});
});
} );
=======
});
>>>>>>>
}); |
<<<<<<<
$('#watch-discussion').show();
=======
$('#watch-discussion').show();
$('#show_comment_btn').hide();
$('#hb_logo').hide();
>>>>>>>
$('#watch-discussion').show();
$('#watch-discussion').show();
$('#show_comment_btn').hide();
$('#hb_logo').hide(); |
<<<<<<<
* This is a [delegate]{@glossary delegate} (strategy) used by {@link enyo.DataList}
* for vertically-oriented lists. This is used by all lists for this strategy; it
* does not get copied, but is called directly from the list.
=======
* This is a [delegate]{@glossary delegate} (strategy) used by
* [`enyo.DataList`]{@link enyo.DataList} for vertically oriented lists. This is used by all
* lists for this strategy and does not get copied but called directly from the list.
>>>>>>>
* This is a [delegate]{@glossary delegate} (strategy) used by {@link enyo.DataList}
* for vertically-oriented lists. This is used by all lists for this strategy; it
* does not get copied, but is called directly from the list.
<<<<<<<
<<<<<<< HEAD
* @param {enyo.DataList} list The [list]{@link enyo.DataList} to perform this action on.
=======
* @param {enyo.DataList} list - The list to perform this action on.
>>>>>>> ENYO-43: Re-review Enyo docs
=======
* @param {enyo.DataList} list - The list to perform this action on.
>>>>>>>
* @param {enyo.DataList} list - The [list]{@link enyo.DataList} to perform this action on.
<<<<<<<
<<<<<<< HEAD
* @param {enyo.DataList} list The [list]{@link enyo.DataList} to perform this action on.
=======
* @param {enyo.DataList} list - The list to perform this action on.
>>>>>>> ENYO-43: Re-review Enyo docs
=======
* @param {enyo.DataList} list - The list to perform this action on.
>>>>>>>
* @param {enyo.DataList} list - The [list]{@link enyo.DataList} to perform this action on.
<<<<<<<
<<<<<<< HEAD
* @param {enyo.DataList} list The [list]{@link enyo.DataList} to perform this action on.
=======
* @param {enyo.DataList} list - The list to perform this action on.
>>>>>>> ENYO-43: Re-review Enyo docs
=======
* @param {enyo.DataList} list - The list to perform this action on.
>>>>>>>
* @param {enyo.DataList} list - The [list]{@link enyo.DataList} to perform this action on.
<<<<<<<
<<<<<<< HEAD
* @param {enyo.DataList} list The [list]{@link enyo.DataList} to perform this action on.
=======
* @param {enyo.DataList} list - The list to perform this action on.
>>>>>>> ENYO-43: Re-review Enyo docs
=======
* @param {enyo.DataList} list - The list to perform this action on.
>>>>>>>
* @param {enyo.DataList} list - The [list]{@link enyo.DataList} to perform this action on.
<<<<<<<
<<<<<<< HEAD
* @param {enyo.DataList} list The [list]{@link enyo.DataList} to perform this action on.
=======
* @param {enyo.DataList} list - The list to perform this action on.
>>>>>>> ENYO-43: Re-review Enyo docs
=======
* @param {enyo.DataList} list - The list to perform this action on.
>>>>>>>
* @param {enyo.DataList} list - The [list]{@link enyo.DataList} to perform this action on.
<<<<<<<
<<<<<<< HEAD
* @param {enyo.DataList} list The [list]{@link enyo.DataList} to perform this action on.
* @param {Number} i The index to scroll to.
=======
* @param {enyo.DataList} list - The list to perform this action on.
* @param {Number} i - The index to scroll to.
>>>>>>> ENYO-43: Re-review Enyo docs
=======
* @param {enyo.DataList} list - The list to perform this action on.
* @param {Number} i - The index to scroll to.
>>>>>>>
* @param {enyo.DataList} list - The [list]{@link enyo.DataList} to perform this action on.
* @param {Number} i - The index to scroll to. |
<<<<<<<
<<<<<<< HEAD
* @param {String} nom The name of the {@glossary event}.
* @param {Object} [event] The event object to pass along.
* @param {enyo.Component} [sender=this] The event's originator.
=======
* @param {String} nom - The name of the [event]{@glossary event}.
* @param {Object} [event] - The event object to pass along.
* @param {enyo.Component} [sender=this] - The event's originator.
>>>>>>> ENYO-43: Re-review Enyo docs
=======
* @param {String} nom - The name of the [event]{@glossary event}.
* @param {Object} [event] - The event object to pass along.
* @param {enyo.Component} [sender=this] - The event's originator.
>>>>>>>
* @param {String} nom - The name of the {@glossary event}.
* @param {Object} [event] - The event object to pass along.
* @param {enyo.Component} [sender=this] - The event's originator. |
<<<<<<<
=======
toSetting:function(pluginId){
$("#loadMsg").text(Label.loadingLabel);
var requestJSONObject = {
"oId": pluginId
};
$.ajax({
url: latkeConfig.servePath + "/console/plugin/toSetting",
type: "POST",
cache: false,
data: JSON.stringify(requestJSONObject),
success: function(result, textStatus){
$("#tipMsg").text(result.msg);
$("#PluginSetting").html(result);
$("#PluginSetting").dialog({
width: 700,
height: 190,
"modal": true,
"hideFooter": true
});
$("#PluginSetting").dialog("open");
$("#loadMsg").text("");
}
});
},
>>>>>>> |
<<<<<<<
* @param {String} type - The type of {@glossary event} to make.
* @param {(Event|Object)} evt - The event you'd like to clone or an object that looks like it.
=======
* @param {String} type - The type of [event]{@glossary event} to make.
* @param {(Event|Object)} evt - The event you'd like to clone or an object that looks like it.
>>>>>>>
* @param {String} type - The type of {@glossary event} to make.
* @param {(Event|Object)} evt - The event you'd like to clone or an object that looks like it.
<<<<<<<
<<<<<<< HEAD
* @param {Event} evt The standard {@glossary event} [object]{glossary Object}.
=======
* @param {Event} evt - The standard [event]{@glossary event} [object]{glossary Object}.
>>>>>>> ENYO-43: Re-review Enyo docs
=======
* @param {Event} evt - The standard [event]{@glossary event} [object]{glossary Object}.
>>>>>>>
* @param {Event} evt - The standard {@glossary event} [object]{glossary Object}.
<<<<<<<
<<<<<<< HEAD
* @param {Event} evt The standard {@glossary event} [object]{glossary Object}.
=======
* @param {Event} evt - The standard [event]{@glossary event} [object]{glossary Object}.
>>>>>>> ENYO-43: Re-review Enyo docs
=======
* @param {Event} evt - The standard [event]{@glossary event} [object]{glossary Object}.
>>>>>>>
* @param {Event} evt - The standard {@glossary event} [object]{glossary Object}.
<<<<<<<
<<<<<<< HEAD
* @param {Event} evt The standard {@glossary event} [object]{glossary Object}.
=======
* @param {Event} evt - The standard [event]{@glossary event} [object]{glossary Object}.
>>>>>>> ENYO-43: Re-review Enyo docs
=======
* @param {Event} evt - The standard [event]{@glossary event} [object]{glossary Object}.
>>>>>>>
* @param {Event} evt - The standard {@glossary event} [object]{glossary Object}.
<<<<<<<
<<<<<<< HEAD
* @param {Event} evt The standard {@glossary event} [object]{glossary Object}.
=======
* @param {Event} evt - The standard [event]{@glossary event} [object]{glossary Object}.
>>>>>>> ENYO-43: Re-review Enyo docs
=======
* @param {Event} evt - The standard [event]{@glossary event} [object]{glossary Object}.
>>>>>>>
* @param {Event} evt - The standard {@glossary event} [object]{glossary Object}.
<<<<<<<
<<<<<<< HEAD
* @param {Event} evt The standard {@glossary event} [object]{glossary Object}.
=======
* @param {Event} evt - The standard [event]{@glossary event} [object]{glossary Object}.
>>>>>>> ENYO-43: Re-review Enyo docs
=======
* @param {Event} evt - The standard [event]{@glossary event} [object]{glossary Object}.
>>>>>>>
* @param {Event} evt - The standard {@glossary event} [object]{glossary Object}.
<<<<<<<
<<<<<<< HEAD
* @param {Event} evt The standard {@glossary event} [object]{glossary Object}.
=======
* @param {Event} evt - The standard [event]{@glossary event} [object]{glossary Object}.
>>>>>>> ENYO-43: Re-review Enyo docs
=======
* @param {Event} evt - The standard [event]{@glossary event} [object]{glossary Object}.
>>>>>>>
* @param {Event} evt - The standard {@glossary event} [object]{glossary Object}. |
<<<<<<<
'lib/*.js'
=======
'lib/*.js',
'test/*.js'
>>>>>>>
'lib/*.js',
'test/*.js'
<<<<<<<
},
inclusion_error: {
options: {
dot_it_object: {
partial_border: '2px dashed #dfdfdf',
page_border: '2px solid #red',
file_lists: {
stylesheets: [{cwd: '.'},'test/data/styles/*.css'],
partials: [{}, 'test/data/partials/*']
}
},
templates_folder: 'test/data/templates',
partials_folder: 'test/data/partials'
},
files: [
{
expand: true,
cwd: 'test/data/pages',
src: ['infinite.html'],
dest: 'tmp/',
ext: '.html'
}
]
}
}
=======
}
}
>>>>>>>
},
inclusion_error: {
options: {
dot_it_object: {
partial_border: '2px dashed #dfdfdf',
page_border: '2px solid #red',
file_lists: {
stylesheets: [{cwd: '.'},'test/data/styles/*.css'],
partials: [{}, 'test/data/partials/*']
}
},
templates_folder: 'test/data/templates',
partials_folder: 'test/data/partials'
},
files: [
{
expand: true,
cwd: 'test/data/pages',
src: ['infinite.html'],
dest: 'tmp/',
ext: '.html'
}
]
}
}
<<<<<<<
=======
// Whenever the "test" task is run, first clean the "tmp" dir, then run this
// plugin's task(s), then test the result.
//grunt.registerTask('test', ['clean', 'stencil', 'nodeunit']);
>>>>>>>
<<<<<<<
grunt.registerTask('default', ['clean', 'stencil', 'jshint']);
=======
grunt.registerTask('default', ['clean', 'jshint', 'stencil']);
>>>>>>>
grunt.registerTask('default', ['clean', 'stencil', 'jshint']); |
<<<<<<<
export {DefaultRepository} from './default-repository';
export {Repository} from './repository';
export {Entity} from './entity';
export {OrmMetadata} from './orm-metadata';
export {association} from './decorator/association';
export {resource} from './decorator/resource';
export {endpoint} from './decorator/endpoint';
export {name} from './decorator/name';
export {repository} from './decorator/repository';
export {validation} from './decorator/validation';
export {type} from './decorator/type';
export {validatedResource} from './decorator/validated-resource';
=======
import './component/paged';
>>>>>>>
import './component/paged';
export {DefaultRepository} from './default-repository';
export {Repository} from './repository';
export {Entity} from './entity';
export {OrmMetadata} from './orm-metadata';
export {association} from './decorator/association';
export {resource} from './decorator/resource';
export {endpoint} from './decorator/endpoint';
export {name} from './decorator/name';
export {repository} from './decorator/repository';
export {validation} from './decorator/validation';
export {type} from './decorator/type';
export {validatedResource} from './decorator/validated-resource'; |
<<<<<<<
new RegExp('https://next.suttacentral.net/api/(.*)'),
sw.strategies.staleWhileRevaliate()
=======
new RegExp('https://(?:staging.)suttacentral.net/api/(.*)'),
sw.strategies.networkFirst()
>>>>>>>
new RegExp('https://(?:staging.)suttacentral.net/api/(.*)'),
sw.strategies.staleWhileRevaliate() |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.