conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
=======
>>>>>>> |
<<<<<<<
export {
InlineNotification,
NotificationActionButton,
NotificationButton,
NotificationTextDetails,
} from './components/Notification';
=======
export {
ToastNotification,
InlineNotification,
NotificationActionButton,
NotificationButton,
NotificationTextDetails
} from './components/Notification/Notification';
>>>>>>>
export {
ToastNotification,
InlineNotification,
NotificationActionButton,
NotificationButton,
NotificationTextDetails,
} from './components/Notification'; |
<<<<<<<
const { copyDeepObject } = require('../modules/copyData.js');
const { dialog } = require('electron').remote
? require('electron').remote
: require('electron');
=======
const { copyDeepObject } = require('../modules/copyData.js');
const { dialog } = require('electron').remote;
>>>>>>>
const { copyDeepObject } = require('../modules/copyData.js');
<<<<<<<
const styles = {
closeButton: {
background: '#ef5350'
},
libraryStyles: {
marginTop: '64px',
maxHeight: 'calc(90vh - 64px)',
overflowY: 'auto'
}
};
=======
const styles = {
closeButton: {
background: '#ef5350',
},
libraryStyles: {
marginTop: '64px',
maxHeight: 'calc(90vh - 64px)',
overflowY: 'auto',
},
};
>>>>>>>
const { dialog } = electron.remote ? electron.remote : electron;
const styles = {
closeButton: {
background: '#ef5350',
},
libraryStyles: {
marginTop: '64px',
maxHeight: 'calc(90vh - 64px)',
overflowY: 'auto',
},
};
<<<<<<<
root: ''
=======
root: '',
contents: [],
>>>>>>>
root: '',
<<<<<<<
onClick = ({ fullpath, isDirectory }) => {
if (isDirectory) {
this.updateContent(fullpath);
=======
renderButtons = () => (
<div>
{this.renderFolderOpen()}
{this.renderLevelUp()}
{this.renderClose()}
</div>
);
renderClose = () => (
<IconButton
onClick={this.props.closeLibrary}
color="primary"
style={styles.closeButton}
>
<FaClose />
</IconButton>
);
renderFolderOpen = () => (
<IconButton onClick={this.openDirectory} color="primary">
<FaFolderOpen />
</IconButton>
);
renderLevelUp = () => (
<IconButton onClick={this.setParentAsLibrary} color="primary">
<FaLevelUp />
</IconButton>
);
renderLibary = () => {
const { basename, bookmark, contents, dirname, fullpath, id } = this.state;
return (
<LibraryTable
key={id}
basename={basename}
bookmark={bookmark}
dirname={dirname}
fullpath={fullpath}
isDirectory
contents={contents}
onContentClick={this.onClick}
saveContentDataToParent={this.saveContentDataToParent}
saveContentsDataToParent={this.saveContentsDataToParent}
/>
);
};
onClick = (content) => {
if (content.isDirectory) {
this.onDirectoryClick(content);
>>>>>>>
onClick = ({ fullpath, isDirectory }) => {
if (isDirectory) {
this.updateContent(fullpath);
<<<<<<<
=======
onDirectoryClick = (content) => {
this.updateContent(content.fullpath);
};
onFileClick = (content) => {
this.props.openComic(content.fullpath);
};
>>>>>>>
<<<<<<<
const properties = ['openDirectory'];
dialog.showOpenDialog({ properties }, filepaths => {
if (Array.isArray(filepaths)) {
const filepath = filepaths[0];
updateRoot(filepath);
this.updateContent(filepath);
}
});
=======
dialog.showOpenDialog(
{
properties: ['openDirectory'],
},
(filepaths) => {
if (Array.isArray(filepaths)) {
const filepath = filepaths[0];
updateRoot(filepath);
this.updateContent(filepath);
}
},
);
>>>>>>>
const properties = ['openDirectory'];
dialog.showOpenDialog({ properties }, (filepaths) => {
if (Array.isArray(filepaths)) {
const filepath = filepaths[0];
updateRoot(filepath);
this.updateContent(filepath);
}
});
<<<<<<<
updateContent = fullpath => {
generateNestedContentFromFilepath(fullpath, content => {
=======
updateContent = (fullpath) => {
generateNestedContentFromFilepath(fullpath, (content) => {
>>>>>>>
updateContent = (filepath) => {
generateNestedContentFromFilepath(filepath, (content) => {
<<<<<<<
updateRoot: PropTypes.func.isRequired
};
=======
updateRoot: PropTypes.func.isRequired,
};
>>>>>>>
updateRoot: PropTypes.func.isRequired,
}; |
<<<<<<<
const { getInterestDetail } = require('./interest.lib')
=======
const { TOPIC_INTEREST__UPDATE, TOPIC_INTEREST__DELETE } = require('../../services/pubsub/topic.constants')
const PubSub = require('pubsub-js')
>>>>>>>
const { getInterestDetail } = require('./interest.lib')
const { TOPIC_INTEREST__UPDATE, TOPIC_INTEREST__DELETE } = require('../../services/pubsub/topic.constants')
const PubSub = require('pubsub-js')
<<<<<<<
=======
const getInterestDetail = async (interestID) => {
// Get the interest and populate out key information needed for emailing
const interestDetail = await Interest.findById(interestID)
.populate({ path: 'person', select: 'nickname name email pronoun language sendEmailNotifications' })
.populate({ path: 'opportunity', select: 'name requestor imgUrl date duration' })
.exec()
const requestorDetail = await Person.findById(interestDetail.opportunity.requestor, 'name nickname email imgUrl sendEmailNotifications')
interestDetail.opportunity.requestor = requestorDetail
interestDetail.opportunity.href = `${config.appUrl}/ops/${interestDetail.opportunity._id}`
interestDetail.opportunity.imgUrl = new URL(interestDetail.opportunity.imgUrl, config.appUrl).href
interestDetail.person.href = `${config.appUrl}/people/${interestDetail.person._id}`
return interestDetail
}
>>>>>>> |
<<<<<<<
for (var i = 0; i < collection.length; i++) {
callback.call(scope, collection[i], i, collection);
=======
for (var i = 0, len = collection.length; i < len; i++) {
callback.call(scope, i, collection[i]);
>>>>>>>
for (var i = 0, len = collection.length; i < len; i++) {
callback.call(scope, collection[i], i, collection); |
<<<<<<<
, FreeList = require('freelist').FreeList
, fabricate = require('fabricator')
=======
>>>>>>>
, fabricate = require('fabricator') |
<<<<<<<
<link rel='stylesheet' href='//cdn.quilljs.com/1.2.6/quill.snow.css' />
<script type='text/javascript' src='https://voluntarily.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e-T/-bgykhu/b/10/a44af77267a987a660377e5c46e0fb64/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?locale=en-US&collectorId=6cd14dc4' />
=======
<script type='text/javascript' src='https://voluntarily.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e-T/-t2deah/b/11/a44af77267a987a660377e5c46e0fb64/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?locale=en-US&collectorId=2e085869' />
>>>>>>>
<link rel='stylesheet' href='//cdn.quilljs.com/1.2.6/quill.snow.css' />
<script type='text/javascript' src='https://voluntarily.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e-T/-t2deah/b/11/a44af77267a987a660377e5c46e0fb64/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?locale=en-US&collectorId=2e085869' /> |
<<<<<<<
import Crypto from './crypto';
import { isCryptoAvailable } from './crypto';
import { encodeRecoveryKey, decodeRecoveryKey } from './crypto/recoverykey';
=======
// Disable warnings for now: we use deprecated bluebird functions
// and need to migrate, but they spam the console with warnings.
Promise.config({warnings: false});
>>>>>>>
import Crypto from './crypto';
import { isCryptoAvailable } from './crypto';
import { encodeRecoveryKey, decodeRecoveryKey } from './crypto/recoverykey';
// Disable warnings for now: we use deprecated bluebird functions
// and need to migrate, but they spam the console with warnings.
Promise.config({warnings: false}); |
<<<<<<<
import VerificationRequest, {
REQUEST_TYPE,
READY_TYPE,
START_TYPE,
} from "./VerificationRequest";
=======
import {REQUEST_TYPE, START_TYPE, VerificationRequest} from "./VerificationRequest";
>>>>>>>
import {
VerificationRequest,
REQUEST_TYPE,
READY_TYPE,
START_TYPE,
} from "./VerificationRequest"; |
<<<<<<<
// XXX: what if the cache is stale, and the user left the room we had in common
// and then added new devices before joining this one? --Matthew
var self = this;
return self._crypto.downloadKeys(roomMembers, false).then(function(devices) {
// remove any blocked (aka blacklisted) devices
=======
// XXX: what if the cache is stale, and the user left the room we had in
// common and then added new devices before joining this one? --Matthew
//
// yup, see https://github.com/vector-im/riot-web/issues/2305 --richvdh
return this._crypto.downloadKeys(roomMembers, false).then(function(devices) {
// remove any blocked devices
>>>>>>>
// XXX: what if the cache is stale, and the user left the room we had in
// common and then added new devices before joining this one? --Matthew
//
// yup, see https://github.com/vector-im/riot-web/issues/2305 --richvdh
var self = this;
return self._crypto.downloadKeys(roomMembers, false).then(function(devices) {
// remove any blocked devices |
<<<<<<<
import Crypto from './crypto';
import { isCryptoAvailable } from './crypto';
=======
// Disable warnings for now: we use deprecated bluebird functions
// and need to migrate, but they spam the console with warnings.
Promise.config({warnings: false});
>>>>>>>
import Crypto from './crypto';
import { isCryptoAvailable } from './crypto';
// Disable warnings for now: we use deprecated bluebird functions
// and need to migrate, but they spam the console with warnings.
Promise.config({warnings: false}); |
<<<<<<<
utils.checkObjectHasNoAdditionalKeys(opts, [
"baseUrl", "request", "accessToken", "userId", "store", "scheduler",
"sessionStore", "deviceId"
]);
=======
utils.checkObjectHasNoAdditionalKeys(opts,
["baseUrl", "idBaseUrl", "request", "accessToken", "userId", "store", "scheduler"]
);
>>>>>>>
utils.checkObjectHasNoAdditionalKeys(opts, [
"baseUrl", "idBaseUrl", "request", "accessToken", "userId", "store",
"scheduler", "sessionStore", "deviceId"
]); |
<<<<<<<
export default class DeviceList extends EventEmitter {
constructor(baseApis, cryptoStore, sessionStore, olmDevice) {
super();
=======
export default class DeviceList {
constructor(baseApis, cryptoStore, olmDevice) {
>>>>>>>
export default class DeviceList extends EventEmitter {
constructor(baseApis, cryptoStore, olmDevice) {
super();
<<<<<<<
if (deviceData === null) {
logger.log("Migrating e2e device data...");
this._devices = this._sessionStore.getAllEndToEndDevices() || {};
this._deviceTrackingStatus = (
this._sessionStore.getEndToEndDeviceTrackingStatus() || {}
);
this._syncToken = this._sessionStore.getEndToEndDeviceSyncToken();
this._cryptoStore.storeEndToEndDeviceData({
devices: this._devices,
self_signing_keys: this._ssks,
trackingStatus: this._deviceTrackingStatus,
syncToken: this._syncToken,
}, txn);
shouldDeleteSessionStore = true;
} else {
this._devices = deviceData ? deviceData.devices : {},
this._ssks = deviceData ? deviceData.self_signing_keys || {} : {};
this._deviceTrackingStatus = deviceData ?
deviceData.trackingStatus : {};
this._syncToken = deviceData ? deviceData.syncToken : null;
}
=======
this._devices = deviceData ? deviceData.devices : {},
this._deviceTrackingStatus = deviceData ?
deviceData.trackingStatus : {};
this._syncToken = deviceData ? deviceData.syncToken : null;
>>>>>>>
this._devices = deviceData ? deviceData.devices : {},
this._ssks = deviceData ? deviceData.self_signing_keys || {} : {};
this._deviceTrackingStatus = deviceData ?
deviceData.trackingStatus : {};
this._syncToken = deviceData ? deviceData.syncToken : null; |
<<<<<<<
const sigInfo = {};
// Could be an SSK but just say this is the device ID for backwards compat
sigInfo.deviceId = keyId.split(':')[1];
// first check to see if it's from our SSK
const ssk = this._deviceList.getStoredSskForUser(this._userId);
if (ssk && ssk.getKeyId() === keyId) {
sigInfo.self_signing_key = ssk;
try {
await olmlib.verifySignature(
this._olmDevice,
backupInfo.auth_data,
this._userId,
sigInfo.deviceId,
ssk.getFingerprint(),
);
sigInfo.valid = true;
} catch (e) {
console.log("Bad signature from ssk " + ssk.getKeyId(), e);
sigInfo.valid = false;
}
ret.sigs.push(sigInfo);
continue;
}
// Now look for a sig from a device
// At some point this can probably go away and we'll just support
// it being signed by the SSK
=======
const keyIdParts = keyId.split(':');
if (keyIdParts[0] !== 'ed25519') {
console.log("Ignoring unknown signature type: " + keyIdParts[0]);
continue;
}
const sigInfo = { deviceId: keyIdParts[1] }; // XXX: is this how we're supposed to get the device ID?
>>>>>>>
const keyIdParts = keyId.split(':');
if (keyIdParts[0] !== 'ed25519') {
console.log("Ignoring unknown signature type: " + keyIdParts[0]);
continue;
}
// Could be an SSK but just say this is the device ID for backwards compat
const sigInfo = { deviceId: keyIdParts[1] }; // XXX: is this how we're supposed to get the device ID?
// first check to see if it's from our SSK
const ssk = this._deviceList.getStoredSskForUser(this._userId);
if (ssk && ssk.getKeyId() === keyId) {
sigInfo.self_signing_key = ssk;
try {
await olmlib.verifySignature(
this._olmDevice,
backupInfo.auth_data,
this._userId,
sigInfo.deviceId,
ssk.getFingerprint(),
);
sigInfo.valid = true;
} catch (e) {
console.log("Bad signature from ssk " + ssk.getKeyId(), e);
sigInfo.valid = false;
}
ret.sigs.push(sigInfo);
continue;
}
// Now look for a sig from a device
// At some point this can probably go away and we'll just support
// it being signed by the SSK
<<<<<<<
ret.usable = ret.sigs.some((s) => {
return (
s.valid && (
(s.device && s.device.isVerified()) ||
(s.self_signing_key && s.self_signing_key.isVerified())
)
);
});
=======
ret.usable = (
ret.sigs.some((s) => s.valid && s.device.isVerified()) ||
ret.trusted_locally
);
>>>>>>>
ret.usable = ret.sigs.some((s) => {
return (
s.valid && (
(s.device && s.device.isVerified()) ||
(s.self_signing_key && s.self_signing_key.isVerified())
)
);
}); |
<<<<<<<
// Olm Sessions
=======
countEndToEndSessions(txn, func) {
let count = 0;
for (let i = 0; i < this.store.length; ++i) {
if (this.store.key(i).startsWith(keyEndToEndSessions(''))) ++count;
}
func(count);
}
>>>>>>>
// Olm Sessions
countEndToEndSessions(txn, func) {
let count = 0;
for (let i = 0; i < this.store.length; ++i) {
if (this.store.key(i).startsWith(keyEndToEndSessions(''))) ++count;
}
func(count);
} |
<<<<<<<
// list of IncomingRoomKeyRequests/IncomingRoomKeyRequestCancellations
// we received in the current sync.
this._receivedRoomKeyRequests = [];
this._receivedRoomKeyRequestCancellations = [];
=======
this._outgoingRoomKeyRequestManager = new OutgoingRoomKeyRequestManager(
baseApis, this._deviceId, this._cryptoStore,
);
>>>>>>>
this._outgoingRoomKeyRequestManager = new OutgoingRoomKeyRequestManager(
baseApis, this._deviceId, this._cryptoStore,
);
// list of IncomingRoomKeyRequests/IncomingRoomKeyRequestCancellations
// we received in the current sync.
this._receivedRoomKeyRequests = [];
this._receivedRoomKeyRequestCancellations = [];
<<<<<<<
/**
* Represents a received m.room_key_request event
*
* @property {string} userId user requesting the key
* @property {string} deviceId device requesting the key
* @property {string} requestId unique id for the request
* @property {RoomKeyRequestBody} requestBody
* @property {Function} share callback which, when called, will ask
* the relevant crypto algorithm implementation to share the keys for
* this request.
*/
class IncomingRoomKeyRequest {
constructor(event) {
const content = event.getContent();
this.userId = event.getSender();
this.deviceId = content.requesting_device_id;
this.requestId = content.request_id;
this.requestBody = content.body || {};
this.share = () => {
throw new Error("don't know how to share keys for this request yet");
};
}
}
/**
* Represents a received m.room_key_request cancellation
*
* @property {string} userId user requesting the cancellation
* @property {string} deviceId device requesting the cancellation
* @property {string} requestId unique id for the request to be cancelled
*/
class IncomingRoomKeyRequestCancellation {
constructor(event) {
const content = event.getContent();
this.userId = event.getSender();
this.deviceId = content.requesting_device_id;
this.requestId = content.request_id;
}
}
/**
* Fires when we receive a room key request
*
* @event module:client~MatrixClient#"crypto.roomKeyRequest"
* @param {module:crypto~IncomingRoomKeyRequest} req request details
*/
/**
* Fires when we receive a room key request cancellation
*
* @event module:client~MatrixClient#"crypto.roomKeyRequestCancellation"
* @param {module:crypto~IncomingRoomKeyRequestCancellation} req
*/
=======
/**
* The parameters of a room key request. The details of the request may
* vary with the crypto algorithm, but the management and storage layers for
* outgoing requests expect it to have 'room_id' and 'session_id' properties.
*
* @typedef {Object} RoomKeyRequestBody
*/
>>>>>>>
/**
* The parameters of a room key request. The details of the request may
* vary with the crypto algorithm, but the management and storage layers for
* outgoing requests expect it to have 'room_id' and 'session_id' properties.
*
* @typedef {Object} RoomKeyRequestBody
*/
/**
* Represents a received m.room_key_request event
*
* @property {string} userId user requesting the key
* @property {string} deviceId device requesting the key
* @property {string} requestId unique id for the request
* @property {RoomKeyRequestBody} requestBody
* @property {Function} share callback which, when called, will ask
* the relevant crypto algorithm implementation to share the keys for
* this request.
*/
class IncomingRoomKeyRequest {
constructor(event) {
const content = event.getContent();
this.userId = event.getSender();
this.deviceId = content.requesting_device_id;
this.requestId = content.request_id;
this.requestBody = content.body || {};
this.share = () => {
throw new Error("don't know how to share keys for this request yet");
};
}
}
/**
* Represents a received m.room_key_request cancellation
*
* @property {string} userId user requesting the cancellation
* @property {string} deviceId device requesting the cancellation
* @property {string} requestId unique id for the request to be cancelled
*/
class IncomingRoomKeyRequestCancellation {
constructor(event) {
const content = event.getContent();
this.userId = event.getSender();
this.deviceId = content.requesting_device_id;
this.requestId = content.request_id;
}
}
/**
* Fires when we receive a room key request
*
* @event module:client~MatrixClient#"crypto.roomKeyRequest"
* @param {module:crypto~IncomingRoomKeyRequest} req request details
*/
/**
* Fires when we receive a room key request cancellation
*
* @event module:client~MatrixClient#"crypto.roomKeyRequestCancellation"
* @param {module:crypto~IncomingRoomKeyRequestCancellation} req
*/ |
<<<<<<<
MatrixClient.prototype._restoreKeyBackup = async function(
privKey, targetRoomId, targetSessionId, backupInfo,
=======
MatrixClient.prototype._restoreKeyBackup = function(
privKey, targetRoomId, targetSessionId, backupInfo,
>>>>>>>
MatrixClient.prototype._restoreKeyBackup = async function(
privKey, targetRoomId, targetSessionId, backupInfo,
<<<<<<<
=======
const path = this._makeKeyBackupPath(
targetRoomId, targetSessionId, backupInfo.version,
);
>>>>>>>
<<<<<<<
decryption.init_with_private_key(privKey);
// decrypt the account keys from the backup info if there are any
// fetch the old ones first so we don't lose info if only one of them is in the backup
let accountKeys;
await this._cryptoStore.doTxn(
'readonly', [IndexedDBCryptoStore.STORE_ACCOUNT],
(txn) => {
this._cryptoStore.getAccountKeys(txn, (keys) => {
accountKeys = keys || {};
});
},
);
if (backupInfo.auth_data.self_signing_key_seed) {
accountKeys.self_signing_key_seed = decryption.decrypt(
backupInfo.auth_data.self_signing_key_seed.ephemeral,
backupInfo.auth_data.self_signing_key_seed.mac,
backupInfo.auth_data.self_signing_key_seed.ciphertext,
);
}
if (backupInfo.auth_data.user_signing_key_seed) {
accountKeys.user_signing_key_seed = decryption.decrypt(
backupInfo.auth_data.user_signing_key_seed.ephemeral,
backupInfo.auth_data.user_signing_key_seed.mac,
backupInfo.auth_data.user_signing_key_seed.ciphertext,
);
}
await this._cryptoStore.doTxn(
'readwrite', [IndexedDBCryptoStore.STORE_ACCOUNT],
(txn) => {
this._cryptoStore.storeAccountKeys(txn, accountKeys);
},
);
await this._crypto.checkOwnSskTrust();
=======
backupPubKey = decryption.init_with_private_key(privKey);
>>>>>>>
backupPubKey = decryption.init_with_private_key(privKey);
// decrypt the account keys from the backup info if there are any
// fetch the old ones first so we don't lose info if only one of them is in the backup
let accountKeys;
await this._cryptoStore.doTxn(
'readonly', [IndexedDBCryptoStore.STORE_ACCOUNT],
(txn) => {
this._cryptoStore.getAccountKeys(txn, (keys) => {
accountKeys = keys || {};
});
},
);
if (backupInfo.auth_data.self_signing_key_seed) {
accountKeys.self_signing_key_seed = decryption.decrypt(
backupInfo.auth_data.self_signing_key_seed.ephemeral,
backupInfo.auth_data.self_signing_key_seed.mac,
backupInfo.auth_data.self_signing_key_seed.ciphertext,
);
}
if (backupInfo.auth_data.user_signing_key_seed) {
accountKeys.user_signing_key_seed = decryption.decrypt(
backupInfo.auth_data.user_signing_key_seed.ephemeral,
backupInfo.auth_data.user_signing_key_seed.mac,
backupInfo.auth_data.user_signing_key_seed.ciphertext,
);
}
await this._cryptoStore.doTxn(
'readwrite', [IndexedDBCryptoStore.STORE_ACCOUNT],
(txn) => {
this._cryptoStore.storeAccountKeys(txn, accountKeys);
},
);
await this._crypto.checkOwnSskTrust();
<<<<<<<
// start by signing this device from the SSK now we have it
return this._crypto.uploadDeviceKeySignatures().then(() => {
// Now fetch the encrypted keys
const path = this._makeKeyBackupPath(
targetRoomId, targetSessionId, backupInfo.version,
);
return this._http.authedRequest(
undefined, "GET", path.path, path.queryData,
);
}).then((res) => {
=======
// If the pubkey computed from the private data we've been given
// doesn't match the one in the auth_data, the user has enetered
// a different recovery key / the wrong passphrase.
if (backupPubKey !== backupInfo.auth_data.public_key) {
return Promise.reject({errcode: MatrixClient.RESTORE_BACKUP_ERROR_BAD_KEY});
}
return this._http.authedRequest(
undefined, "GET", path.path, path.queryData,
).then((res) => {
>>>>>>>
// If the pubkey computed from the private data we've been given
// doesn't match the one in the auth_data, the user has enetered
// a different recovery key / the wrong passphrase.
if (backupPubKey !== backupInfo.auth_data.public_key) {
return Promise.reject({errcode: MatrixClient.RESTORE_BACKUP_ERROR_BAD_KEY});
}
// start by signing this device from the SSK now we have it
return this._crypto.uploadDeviceKeySignatures().then(() => {
// Now fetch the encrypted keys
const path = this._makeKeyBackupPath(
targetRoomId, targetSessionId, backupInfo.version,
);
return this._http.authedRequest(
undefined, "GET", path.path, path.queryData,
);
}).then((res) => { |
<<<<<<<
import DeviceInfo from '../deviceinfo';
=======
import {newTimeoutError} from "./Error";
const timeoutException = new Error("Verification timed out");
>>>>>>>
import DeviceInfo from '../deviceinfo';
import {newTimeoutError} from "./Error";
const timeoutException = new Error("Verification timed out"); |
<<<<<<<
import { Button, Input } from 'antd'
import Router from 'next/router'
=======
import { Button, Input, Icon } from 'antd'
>>>>>>>
import Router from 'next/router'
import { Button, Input, Icon } from 'antd' |
<<<<<<<
if (AscCommon.c_oNotifyType.Shift == notifyType) {
var bHor = 0 != offset.col;
=======
if (c_oNotifyType.Shift === notifyType) {
var bHor = 0 !== offset.offsetCol;
>>>>>>>
if (c_oNotifyType.Shift === notifyType) {
var bHor = 0 !== offset.col;
<<<<<<<
this.getRange3(r1, c1, r2, c2)._foreachNoEmpty(function(cell){
var newNRow = cell.nRow + offset.row;
var newNCol = cell.nCol + offset.col;
var formula = cell.getFormulaParsed();
if (formula) {
var cellWithFormula = formula.getParent();
cellWithFormula.nRow = newNRow;
cellWithFormula.nCol = newNCol;
t.workbook.dependencyFormulas.addToChangedCell(cellWithFormula);
=======
var cellWithFormula;
this.getRange3(r1, c1, r2, c2)._foreachNoEmpty(function(cell) {
var newNRow = cell.nRow + offset.offsetRow;
var newNCol = cell.nCol + offset.offsetCol;
var bHor = 0 !== offset.offsetCol;
var toDelete = offset.offsetCol < 0 || offset.offsetRow < 0;
if (cell.isFormula()) {
var processed = c_oSharedShiftType.NeedTransform;
var parsed = cell.getFormulaParsed();
var shared = parsed.getShared();
if (shared) {
processed = shiftedShared[parsed.getListenerId()];
var isPreProcessed = c_oSharedShiftType.PreProcessed === processed;
if (!processed || isPreProcessed) {
if (!processed) {
var bboxShift = AscCommonExcel.shiftGetBBox(bbox, bHor);
//if shared not completly in shift range - transform
//if shared intersect delete range - transform
if (bboxShift.containsRange(shared.ref) && (!toDelete || !bbox.isIntersect(shared.ref))) {
processed = c_oSharedShiftType.Processed;
} else {
processed = c_oSharedShiftType.NeedTransform;
}
} else if(isPreProcessed) {
//At PreProcessed stage all required formula was transformed. here we need to shift shared
processed = c_oSharedShiftType.Processed;
}
if (c_oSharedShiftType.Processed === processed) {
var newRef = shared.ref.clone();
newRef.forShift(bbox, offset, t.workbook.bUndoChanges);
parsed.setSharedRef(newRef, !isPreProcessed);
t.workbook.dependencyFormulas.addToChangedRange2(t.getId(), newRef);
}
shiftedShared[parsed.getListenerId()] = processed;
}
}
if (c_oSharedShiftType.NeedTransform === processed) {
var isTransform = cell.transformSharedFormula();
parsed = cell.getFormulaParsed();
if (isTransform) {
parsed.buildDependencies();
}
cellWithFormula = parsed.getParent();
cellWithFormula.nRow = newNRow;
cellWithFormula.nCol = newNCol;
t.workbook.dependencyFormulas.addToChangedCell(cellWithFormula);
}
>>>>>>>
var cellWithFormula;
this.getRange3(r1, c1, r2, c2)._foreachNoEmpty(function(cell){
var newNRow = cell.nRow + offset.row;
var newNCol = cell.nCol + offset.col;
var bHor = 0 !== offset.col;
var toDelete = offset.col < 0 || offset.row < 0;
if (cell.isFormula()) {
var processed = c_oSharedShiftType.NeedTransform;
var parsed = cell.getFormulaParsed();
var shared = parsed.getShared();
if (shared) {
processed = shiftedShared[parsed.getListenerId()];
var isPreProcessed = c_oSharedShiftType.PreProcessed === processed;
if (!processed || isPreProcessed) {
if (!processed) {
var bboxShift = AscCommonExcel.shiftGetBBox(bbox, bHor);
//if shared not completly in shift range - transform
//if shared intersect delete range - transform
if (bboxShift.containsRange(shared.ref) && (!toDelete || !bbox.isIntersect(shared.ref))) {
processed = c_oSharedShiftType.Processed;
} else {
processed = c_oSharedShiftType.NeedTransform;
}
} else if(isPreProcessed) {
//At PreProcessed stage all required formula was transformed. here we need to shift shared
processed = c_oSharedShiftType.Processed;
}
if (c_oSharedShiftType.Processed === processed) {
var newRef = shared.ref.clone();
newRef.forShift(bbox, offset, t.workbook.bUndoChanges);
parsed.setSharedRef(newRef, !isPreProcessed);
t.workbook.dependencyFormulas.addToChangedRange2(t.getId(), newRef);
}
shiftedShared[parsed.getListenerId()] = processed;
}
}
if (c_oSharedShiftType.NeedTransform === processed) {
var isTransform = cell.transformSharedFormula();
parsed = cell.getFormulaParsed();
if (isTransform) {
parsed.buildDependencies();
}
cellWithFormula = parsed.getParent();
cellWithFormula.nRow = newNRow;
cellWithFormula.nCol = newNCol;
t.workbook.dependencyFormulas.addToChangedCell(cellWithFormula);
}
<<<<<<<
Range.prototype.setOffset=function(offset){
this.bbox.setOffset(offset);
};
Range.prototype.setOffsetFirst=function(offset){
this.bbox.setOffsetFirst(offset);
};
Range.prototype.setOffsetLast=function(offset){
this.bbox.setOffsetLast(offset);
=======
Range.prototype.setOffset=function(offset){//offset = AscCommonExcel.CRangeOffset
this.bbox.setOffset(offset);
};
Range.prototype.setOffsetFirst=function(offset){//offset = {offsetCol:intNumber, offsetRow:intNumber}
this.bbox.c1 += offset.offsetCol;
if( this.bbox.c1 < 0 )
this.bbox.c1 = 0;
this.bbox.r1 += offset.offsetRow;
if( this.bbox.r1 < 0 )
this.bbox.r1 = 0;
};
Range.prototype.setOffsetLast=function(offset){//offset = {offsetCol:intNumber, offsetRow:intNumber}
this.bbox.c2 += offset.offsetCol;
if( this.bbox.c2 < 0 )
this.bbox.c2 = 0;
this.bbox.r2 += offset.offsetRow;
if( this.bbox.r2 < 0 )
this.bbox.r2 = 0;
>>>>>>>
Range.prototype.setOffset=function(offset){
this.bbox.setOffset(offset);
};
Range.prototype.setOffsetFirst=function(offset){
this.bbox.setOffsetFirst(offset);
};
Range.prototype.setOffsetLast=function(offset){
this.bbox.setOffsetLast(offset);
<<<<<<<
cell.changeOffset(new AscCommon.CellBase(nTo - nFrom, 0), true, true);
=======
cell.changeOffset({offsetCol: 0, offsetRow: nTo - nFrom}, true, true);
formula = cell.getFormulaParsed();
cellWithFormula = formula.getParent();
>>>>>>>
cell.changeOffset(new AscCommon.CellBase(nTo - nFrom, 0), true, true);
formula = cell.getFormulaParsed();
cellWithFormula = formula.getParent(); |
<<<<<<<
parserFormula.prototype.calculateCycleError = function () {
this.value = new cError(cErrorType.bad_reference);
this._endCalculate();
return this.value;
};
parserFormula.prototype.calculate = function (opt_defName, opt_bbox, opt_offset) {
=======
parserFormula.prototype.calculate = function (opt_defName, opt_bbox, opt_offset, opt_forceCalculate) {
if (!this.incRecursionLevel()) {
return this.value || new cError(cErrorType.bad_reference);
}
if ((this.isCalculate && !opt_forceCalculate) &&
(!this.calculateDefName || this.calculateDefName[opt_bbox ? opt_bbox.getName() : opt_bbox])) {
//cycle
this.value = new cError(cErrorType.bad_reference);
this._endCalculate();
return this.value;
}
this.isCalculate = true;
if (opt_defName) {
if (!this.calculateDefName) {
this.calculateDefName = {};
}
this.calculateDefName[opt_bbox ? opt_bbox.getName() : opt_bbox] = 1;
}
>>>>>>>
parserFormula.prototype.calculate = function (opt_defName, opt_bbox, opt_offset, opt_forceCalculate) {
if (!this.incRecursionLevel()) {
return this.value || new cError(cErrorType.bad_reference);
}
if ((this.isCalculate && !opt_forceCalculate) &&
(!this.calculateDefName || this.calculateDefName[opt_bbox ? opt_bbox.getName() : opt_bbox])) {
//cycle
this.value = new cError(cErrorType.bad_reference);
this._endCalculate();
return this.value;
};
parserFormula.prototype.calculate = function (opt_defName, opt_bbox, opt_offset) {
<<<<<<<
=======
this.calculateDefName = null;
this.decRecursionLevel();
};
parserFormula.prototype.incRecursionLevel = function() {
return !g_cCalcRecursion.getIsForceBacktracking() && g_cCalcRecursion.incLevel();
};
parserFormula.prototype.decRecursionLevel = function() {
g_cCalcRecursion.decLevel();
if (g_cCalcRecursion.getIsForceBacktracking()) {
g_cCalcRecursion.insert(this);
if (0 === g_cCalcRecursion.getLevel() && !g_cCalcRecursion.getIsProcessRecursion()) {
g_cCalcRecursion.setIsProcessRecursion(true);
do {
g_cCalcRecursion.setIsForceBacktracking(false);
g_cCalcRecursion.foreachInReverse(function(parsed){
if (parsed.getIsDirty()) {
parsed.calculate(undefined, undefined, undefined, true);
}
});
} while (g_cCalcRecursion.getIsForceBacktracking());
g_cCalcRecursion.setIsProcessRecursion(false);
}
} else {
this.isCalculate = false;
this.isDirty = false;
}
>>>>>>>
this.calculateDefName = null;
this.decRecursionLevel();
};
parserFormula.prototype.incRecursionLevel = function() {
return !g_cCalcRecursion.getIsForceBacktracking() && g_cCalcRecursion.incLevel();
};
parserFormula.prototype.decRecursionLevel = function() {
g_cCalcRecursion.decLevel();
if (g_cCalcRecursion.getIsForceBacktracking()) {
g_cCalcRecursion.insert(this);
if (0 === g_cCalcRecursion.getLevel() && !g_cCalcRecursion.getIsProcessRecursion()) {
g_cCalcRecursion.setIsProcessRecursion(true);
do {
g_cCalcRecursion.setIsForceBacktracking(false);
g_cCalcRecursion.foreachInReverse(function(parsed){
if (parsed.getIsDirty()) {
parsed.calculate(undefined, undefined, undefined, true);
}
});
} while (g_cCalcRecursion.getIsForceBacktracking());
g_cCalcRecursion.setIsProcessRecursion(false);
}
} else {
this.isCalculate = false;
this.isDirty = false;
} |
<<<<<<<
var bbox = AscCommonExcel.g_oRangeCache.getActiveRange(this.options.cellName);
this._formula = new AscCommonExcel.parserFormula( s.substr( 1 ), null, ws );
=======
this._formula = new AscCommonExcel.parserFormula(s.substr(1), this.options.cellName, ws);
>>>>>>>
var bbox = AscCommonExcel.g_oRangeCache.getActiveRange(this.options.cellName);
this._formula = new AscCommonExcel.parserFormula(s.substr(1), null, ws);
<<<<<<<
case cElementType.name :
{
var nameRef = r.oper.toRef(bbox);
if( nameRef instanceof AscCommonExcel.cError ) continue;
switch ( nameRef.type ) {
=======
case cElementType.name : {
var nameRef = r.oper.toRef();
if (nameRef instanceof AscCommonExcel.cError) {
continue;
}
switch (nameRef.type) {
>>>>>>>
case cElementType.name : {
var nameRef = r.oper.toRef(bbox);
if (nameRef instanceof AscCommonExcel.cError) {
continue;
}
switch (nameRef.type) { |
<<<<<<<
this.oReadResult.sheetData.push({ws: oWorksheet, pos: this.stream.GetCurPos(), len: length});
res = c_oSerConstants.ReadUnknown;
=======
var tempRow = new AscCommonExcel.Row(oWorksheet);
var tmpData = {pos: null, len: null, prevRow: -1, prevCol: -1};
res = this.bcr.Read1(length, function(t,l){
return oThis.ReadSheetData(t,l, oWorksheet, tempRow, tmpData);
});
>>>>>>>
this.oReadResult.sheetData.push({ws: oWorksheet, pos: this.stream.GetCurPos(), len: length});
res = c_oSerConstants.ReadUnknown;
<<<<<<<
this.ReadSheetData = function(type, length, tmp)
=======
this.ReadSheetData = function(type, length, ws, tempRow, tmpData)
>>>>>>>
this.ReadSheetData = function(type, length, tmp)
<<<<<<<
tmp.row.setIndex(index);
if(index >= tmp.ws.nRowsCount)
tmp.ws.nRowsCount = index + 1;
=======
oRow.setIndex(index);
>>>>>>>
tmp.row.setIndex(index);
<<<<<<<
tmp.pos = this.stream.GetCurPos();
tmp.len = length;
=======
tmpData.pos = this.stream.GetCurPos();
tmpData.len = length;
>>>>>>>
tmp.pos = this.stream.GetCurPos();
tmp.len = length;
<<<<<<<
this.ReadCells = function(type, length, tmp, index)
=======
this.ReadCells = function(type, length, ws, tempCell, tmpData)
>>>>>>>
this.ReadCells = function(type, length, tmp, index)
<<<<<<<
if(oCell.nCol >= tmp.ws.nColsCount)
tmp.ws.nColsCount = oCell.nCol + 1;
=======
>>>>>>>
<<<<<<<
if(oCell.nCol >= tmp.ws.nColsCount)
tmp.ws.nColsCount = oCell.nCol + 1;
=======
>>>>>>> |
<<<<<<<
cArea.prototype.getRange = function () {
return this.range;
};
=======
cArea.prototype.getRange = function () {
if (!this.range) {
this.range = this.ws.getRange2(this._cells);
}
return this.range;
};
>>>>>>>
cArea.prototype.getRange = function () {
if (!this.range) {
this.range = this.ws.getRange2(this._cells);
}
return this.range;
};
<<<<<<<
/** @constructor */
function cRef( val, ws ) {/*Ref means A1 for example*/
this.constructor.call( this, val, cElementType.cell );
this.ws = ws;
this.range = null;
if (val) {
this.range = ws.getRange2(val.replace(AscCommon.rx_space_g, ""));
}
}
=======
/** @constructor */
function cRef(val, ws) {/*Ref means A1 for example*/
this.constructor.call(this, val, cElementType.cell);
this._cells = val;
this.ws = ws;
this.wb = this._wb = ws.workbook;
this.isAbsolute = false;
this.isAbsoluteCol1 = false;
this.isAbsoluteRow1 = false;
var ca = g_oCellAddressUtils.getCellAddress(val.replace(AscCommon.rx_space_g, ""));
this.range = null;
this._valid = ca.isValid();
if (this._valid) {
this.range = this.ws.getRange3(ca.getRow0(), ca.getCol0(), ca.getRow0(), ca.getCol0());
} else {
this.range = this.ws.getRange3(0, 0, 0, 0);
}
}
>>>>>>>
/** @constructor */
function cRef(val, ws) {/*Ref means A1 for example*/
this.constructor.call(this, val, cElementType.cell);
this.ws = ws;
this.range = null;
if (val) {
this.range = ws.getRange2(val.replace(AscCommon.rx_space_g, ""));
}
}
<<<<<<<
/** @constructor */
function cRef3D( val, _wsFrom, wb ) {/*Ref means Sheat1!A1 for example*/
this.constructor.call( this, val, cElementType.cell3D );
this.ws = null;
if (_wsFrom) {
this.ws = wb.getWorksheetByName(_wsFrom);
}
this.range = null;
if (val && this.ws) {
this.range = this.ws.getRange2(val);
}
}
=======
/** @constructor */
function cRef3D(val, _wsFrom, wb) {/*Ref means Sheat1!A1 for example*/
this.constructor.call(this, val, cElementType.cell3D);
this.wb = this._wb = wb;
this._cells = val;
this.isAbsolute = false;
this.isAbsoluteCol1 = false;
this.isAbsoluteRow1 = false;
this.ws = this._wb.getWorksheetByName(_wsFrom);
this.range = null;
}
>>>>>>>
/** @constructor */
function cRef3D( val, _wsFrom, wb ) {/*Ref means Sheat1!A1 for example*/
this.constructor.call( this, val, cElementType.cell3D );
this.ws = null;
this.range = null;
if (val && this.ws) {
this.range = this.ws.getRange2(val);
}
}
<<<<<<<
cRef3D.prototype.getRange = function () {
return this.range;
};
=======
cRef3D.prototype.getRange = function () {
if (this.ws) {
if (this.range) {
return this.range;
}
return this.range = this.ws.getRange2(this._cells);
} else {
return this.range = null;
}
};
>>>>>>>
cRef3D.prototype.getRange = function () {
if (this.ws) {
if (this.range) {
return this.range;
}
return this.range = this.ws.getRange2(this._cells);
} else {
return this.range = null;
}
}; |
<<<<<<<
import RichTextEditor from '../Editor/RichTextEditor'
import { Button, Checkbox, Form, Input } from 'antd'
=======
import ImageUpload from '../UploadComponent/ImageUploadComponent'
import { Button, Col, Checkbox, Form, Input, Row } from 'antd'
>>>>>>>
import RichTextEditor from '../Editor/RichTextEditor'
import ImageUpload from '../UploadComponent/ImageUploadComponent'
import { Button, Checkbox, Form, Input } from 'antd'
<<<<<<<
state = {
about: ''
}
constructor (props) {
super(props)
this.handleChange = this.handleChange.bind(this)
}
=======
constructor (props) {
super(props)
this.setImgUrl = this.setImgUrl.bind(this)
}
>>>>>>>
state = {
about: ''
}
constructor (props) {
super(props)
this.handleChange = this.handleChange.bind(this)
this.setImgUrl = this.setImgUrl.bind(this)
}
<<<<<<<
<Form.Item
label={orgName}
validateStatus={orgNameError ? 'error' : ''}
help={orgNameError || ''}
>
{getFieldDecorator('name', {
rules: [
{ required: true, message: 'A name is required' }
]
})(
<Input placeholder='Organisation Name' />
)}
</Form.Item>
<Form.Item label={orgAbout}>
{getFieldDecorator('about', {
rules: [
]
})(
// <TextArea rows={20} placeholder='Tell us about your organisation. You can use markdown here. and include links' />
<RichTextEditor value={this.state.about} onChange={this.handleChange} />
)}
</Form.Item>
<Form.Item label={orgImgUrl}>
{getFieldDecorator('imgUrl', {
rules: [
{ type: 'url', message: 'a URL is required' }
]
})(
<Input placeholder='http://example.com/image.jpg' />
)}
</Form.Item>
<Form.Item label={orgType}>
{getFieldDecorator('type', {
rules: [
{ required: true, message: 'type is required' }
]
})(
<Checkbox.Group
options={typeOptions}
/>
)}
</Form.Item>
<Button
type='secondary'
htmlType='button'
shape='round'
onClick={this.props.onCancel}
>
<FormattedMessage
id='org.cancel'
defaultMessage='Cancel'
about='Label for cancel button on organisation details form'
/>
</Button>
<Button
type='primary'
htmlType='submit'
shape='round'
disabled={hasErrors(getFieldsError())}
style={{ marginLeft: 8 }}
>
<FormattedMessage
id='org.save'
defaultMessage='Save'
shape='round'
about='Label for submit button on organisation details form'
/>
</Button>
=======
<Row>
<Col
xs={{ span: 24 }}
md={{ span: 16 }}
>
<Form.Item
label={orgName}
validateStatus={orgNameError ? 'error' : ''}
help={orgNameError || ''}
>
{getFieldDecorator('name', {
rules: [
{ required: true, message: 'A name is required' }
]
})(
<Input placeholder='Organisation Name' />
)}
</Form.Item>
<Form.Item label={orgAbout}>
{getFieldDecorator('about', {
rules: [
]
})(
<TextArea rows={20} placeholder='Tell us about your organisation. You can use markdown here. and include links' />
)}
</Form.Item>
</Col>
</Row>
<Row>
<Col
xs={{ span: 24 }}
md={{ span: 16 }}
>
<Form.Item label={orgImgUrl}>
{getFieldDecorator('imgUrl', {
rules: []
})(
<Input />
)}
<ImageUpload setImgUrl={this.setImgUrl} />
</Form.Item>
<Form.Item label={orgType}>
{getFieldDecorator('type', {
rules: [
{ required: true, message: 'type is required' }
]
})(
<Checkbox.Group
options={typeOptions}
/>
)}
</Form.Item>
</Col>
</Row>
<Row>
<Col
style={{ textAlign: 'right' }}
xs={{ span: 24, offset: 0 }}
md={{ span: 8, offset: 12 }}
>
<Button
type='secondary'
htmlType='button'
onClick={this.props.onCancel}
>
<FormattedMessage
id='org.cancel'
defaultMessage='Cancel'
about='Label for cancel button on organisation details form'
/>
</Button>
<Button
type='primary'
htmlType='submit'
disabled={hasErrors(getFieldsError())}
style={{ marginLeft: 8 }}
>
<FormattedMessage
id='org.save'
defaultMessage='Save'
about='Label for submit button on organisation details form'
/>
</Button>
</Col>
</Row>
>>>>>>>
<Form.Item
label={orgName}
validateStatus={orgNameError ? 'error' : ''}
help={orgNameError || ''}
>
{getFieldDecorator('name', {
rules: [
{ required: true, message: 'A name is required' }
]
})(
<Input placeholder='Organisation Name' />
)}
</Form.Item>
<Form.Item label={orgAbout}>
{getFieldDecorator('about', {
rules: [
]
})(
// <TextArea rows={20} placeholder='Tell us about your organisation. You can use markdown here. and include links' />
<RichTextEditor value={this.state.about} onChange={this.handleChange} />
)}
</Form.Item>
<Form.Item label={orgImgUrl}>
{getFieldDecorator('imgUrl', {
rules: []
})(
<Input />
)}
<ImageUpload setImgUrl={this.setImgUrl} />
</Form.Item>
<Form.Item label={orgType}>
{getFieldDecorator('type', {
rules: [
{ required: true, message: 'type is required' }
]
})(
<Checkbox.Group
options={typeOptions}
/>
)}
</Form.Item>
<Button
type='secondary'
htmlType='button'
shape='round'
onClick={this.props.onCancel}
>
<FormattedMessage
id='org.cancel'
defaultMessage='Cancel'
about='Label for cancel button on organisation details form'
/>
</Button>
<Button
type='primary'
htmlType='submit'
shape='round'
disabled={hasErrors(getFieldsError())}
style={{ marginLeft: 8 }}
>
<FormattedMessage
id='org.save'
defaultMessage='Save'
shape='round'
about='Label for submit button on organisation details form'
/>
</Button> |
<<<<<<<
_getOptionsForDrawing: function (ser, point, onlyLessNull) {
var seria = this.chart.series[ser];
var pt = seria.val.numRef.numCache.getPtByIndex(point);
if (!seria || !this.paths.series[ser] || !this.paths.series[ser][point] || !pt) {
=======
_getOptionsForDrawing: function(ser, point, onlyLessNull)
{
var seria = this.chartProp.series[ser];
var numCache = this.cChartDrawer.getNumCache(seria.val);
if(!numCache) {
return null;
}
var pt = numCache.getPtByIndex(point);
if(!seria || !this.paths.series[ser] || !this.paths.series[ser][point] || !pt)
>>>>>>>
_getOptionsForDrawing: function (ser, point, onlyLessNull) {
var seria = this.chart.series[ser];
var numCache = this.cChartDrawer.getNumCache(seria.val);
if(!numCache) {
return null;
}
var pt = numCache.getPtByIndex(point);
if (!seria || !this.paths.series[ser] || !this.paths.series[ser][point] || !pt) {
<<<<<<<
_getOptionsForDrawing: function (ser, point, onlyLessNull) {
var seria = this.chart.series[ser];
var pt = seria.val.numRef.numCache.getPtByIndex(point);
if (!seria || !this.paths.series[ser] || !this.paths.series[ser][point] || !pt) {
=======
_getOptionsForDrawing: function(ser, point, onlyLessNull)
{
var seria = this.chartProp.series[ser];
var numCache = this.cChartDrawer.getNumCache(seria.val);
if(!numCache) {
return null;
}
var pt = numCache.getPtByIndex(point);
if(!seria || !this.paths.series[ser] || !this.paths.series[ser][point] || !pt)
>>>>>>>
_getOptionsForDrawing: function (ser, point, onlyLessNull) {
var seria = this.chart.series[ser];
var numCache = this.cChartDrawer.getNumCache(seria.val);
if(!numCache) {
return null;
}
var pt = numCache.getPtByIndex(point);
if (!seria || !this.paths.series[ser] || !this.paths.series[ser][point] || !pt) { |
<<<<<<<
idxPoint = this.cChartDrawer.getIdxPoint(this.chart.series[n], k);
=======
if(!this.paths.series[n] || !this.paths.series[n][k]) {
continue;
}
idxPoint = this.cChartDrawer.getIdxPoint(this.chartProp.series[n], k);
>>>>>>>
if(!this.paths.series[n] || !this.paths.series[n][k]) {
continue;
}
idxPoint = this.cChartDrawer.getIdxPoint(this.chart.series[n], k); |
<<<<<<<
className={className}
=======
aria-label='choose an organisation you want to run this activity for'
>>>>>>>
className={className}
aria-label='choose an organisation you want to run this activity for' |
<<<<<<<
=======
MinPageLeftField : 0.17,
MinPageRightField : 0.17,
MinPageTopField : 0.17,
MinPageBottomField : 0.17,
>>>>>>>
MinPageLeftField : 0.17,
MinPageRightField : 0.17,
MinPageTopField : 0.17,
MinPageBottomField : 0.17, |
<<<<<<<
org.type = values.type
org.website = values.website
=======
org.contactEmail = values.contactEmail
org.category = values.type
>>>>>>>
org.website = values.website
org.contactEmail = values.contactEmail
org.category = values.type
<<<<<<<
const orgType = <FormattedMessage id='orgType' defaultMessage='Type' about='school, business or activity provider' />
const orgWebsite = <FormattedMessage id='orgWebsite' defaultMessage='Website' about='organisation website URL' />
=======
const orgContactEmail = <FormattedMessage id='orgContactEmail' defaultMessage='Contact Email' about='contact Email labek in OrgDetails Form' />
const orgCategory = <FormattedMessage id='orgCategory' defaultMessage='Category' about='school, business or activity provider' />
>>>>>>>
const orgWebsite = <FormattedMessage id='orgWebsite' defaultMessage='Website' about='organisation website URL' />
const orgContactEmail = <FormattedMessage id='orgContactEmail' defaultMessage='Contact Email' about='contact Email labek in OrgDetails Form' />
const orgCategory = <FormattedMessage id='orgCategory' defaultMessage='Category' about='school, business or activity provider' />
<<<<<<<
<Form.Item
label={orgWebsite}
>
{getFieldDecorator('website', {
rules: [
{ pattern: /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w.-]+)+[\w\-._~:/?#[\]@!$&'()*+,;=.]+$/,
message: 'Enter valid URL' }
]
})(
<Input placeholder='Organisation Website' />
)}
</Form.Item>
<Form.Item label={orgType}>
{getFieldDecorator('type', {
=======
<Form.Item label={orgContactEmail}>
{getFieldDecorator('contactEmail', {
rules: [
]
})(
// <TextArea rows={20} placeholder='Enter email address for organisations contact person' />
<Input placeholder='[email protected]' />
)}
</Form.Item>
<Form.Item label={orgCategory}>
{getFieldDecorator('category', {
>>>>>>>
<Form.Item
label={orgWebsite}
>
{getFieldDecorator('website', {
rules: [
{ pattern: /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w.-]+)+[\w\-._~:/?#[\]@!$&'()*+,;=.]+$/,
message: 'Enter valid URL' }
]
})(
<Input placeholder='Organisation Website' />
)}
</Form.Item>
<Form.Item label={orgContactEmail}>
{getFieldDecorator('contactEmail', {
rules: [
]
})(
// <TextArea rows={20} placeholder='Enter email address for organisations contact person' />
<Input placeholder='[email protected]' />
)}
</Form.Item>
<Form.Item label={orgCategory}>
{getFieldDecorator('category', {
<<<<<<<
website: PropTypes.string,
=======
contactEmail: PropTypes.string,
>>>>>>>
website: PropTypes.string,
contactEmail: PropTypes.string,
<<<<<<<
type: Form.createFormField({ ...props.org.type, value: props.org.type }),
website: Form.createFormField({ ...props.org.website, value: props.org.website })
=======
contactEmail: Form.createFormField({ ...props.org.contactEmail, value: props.org.contactEmail }),
category: Form.createFormField({ ...props.org.category, value: props.org.category })
>>>>>>>
website: Form.createFormField({ ...props.org.website, value: props.org.website }),
contactEmail: Form.createFormField({ ...props.org.contactEmail, value: props.org.contactEmail }),
category: Form.createFormField({ ...props.org.category, value: props.org.category }) |
<<<<<<<
CShape.prototype.getCopyWithSourceFormatting = function(){
var oCopy = this.copy();
if(oCopy.spPr){
if(this.brush){
oCopy.spPr.setFill(this.brush.createDuplicate());
}
if(this.pen){
oCopy.spPr.setLn(this.pen.createDuplicate());
}
}
return oCopy;
};
=======
CShape.prototype.getSignatureLineGuid = function()
{
if(this.signatureLine){
return this.signatureLine.id;
}
return null;
};
>>>>>>>
CShape.prototype.getCopyWithSourceFormatting = function(){
var oCopy = this.copy();
if(oCopy.spPr){
if(this.brush){
oCopy.spPr.setFill(this.brush.createDuplicate());
}
if(this.pen){
oCopy.spPr.setLn(this.pen.createDuplicate());
}
}
return oCopy;
};
CShape.prototype.getSignatureLineGuid = function()
{
if(this.signatureLine){
return this.signatureLine.id;
}
return null;
}; |
<<<<<<<
Set_DefaultParaPr : function(ParaPr)
{
History.Add(this, {Type : AscDFH.historyitem_Styles_ChangeDefaultParaPr, Old : this.Default.ParaPr, New : ParaPr});
this.Default.ParaPr.Init_Default();
this.Default.ParaPr.Merge(ParaPr);
=======
Set_DefaultParaPr : function(ParaPr)
{
History.Add(new CChangesStylesChangeDefaultParaPr(this, this.Default.ParaPr, ParaPr));
this.Default.ParaPr = ParaPr;
>>>>>>>
Set_DefaultParaPr : function(ParaPr)
{
History.Add(new CChangesStylesChangeDefaultParaPr(this, this.Default.ParaPr, ParaPr));
this.Default.ParaPr.Init_Default();
this.Default.ParaPr.Merge(ParaPr);
<<<<<<<
Set_DefaultTextPr : function(TextPr)
{
History.Add(this, {Type : AscDFH.historyitem_Styles_ChangeDefaultTextPr, Old : this.Default.TextPr, New : TextPr});
this.Default.TextPr.Init_Default();
this.Default.TextPr.Merge(TextPr);
=======
Set_DefaultTextPr : function(TextPr)
{
History.Add(new CChangesStylesChangeDefaultTextPr(this, this.Default.TextPr, TextPr));
this.Default.TextPr = TextPr;
>>>>>>>
Set_DefaultTextPr : function(TextPr)
{
History.Add(new CChangesStylesChangeDefaultTextPr(this, this.Default.TextPr, TextPr));
this.Default.TextPr.Init_Default();
this.Default.TextPr.Merge(TextPr);
<<<<<<<
Undo : function(Data)
{
var Type = Data.Type;
switch ( Type )
{
case AscDFH.historyitem_Styles_Add:
{
delete this.Style[Data.Id];
this.Update_Interface(Data.Id);
break;
}
case AscDFH.historyitem_Styles_Remove:
{
this.Style[Data.Id] = Data.Style;
this.Update_Interface(Data.Id);
break;
}
case AscDFH.historyitem_Styles_ChangeDefaultParaPr:
{
this.Default.ParaPr.Init_Default();
this.Default.ParaPr.Merge(Data.Old);
break;
}
case AscDFH.historyitem_Styles_ChangeDefaultTextPr:
{
this.Default.TextPr.Init_Default();
this.Default.TextPr.Merge(Data.Old);
break;
}
}
},
Redo : function(Data)
{
var Type = Data.Type;
switch ( Type )
{
case AscDFH.historyitem_Styles_Add:
{
this.Style[Data.Id] = Data.Style;
this.Update_Interface(Data.Id);
break;
}
case AscDFH.historyitem_Styles_Remove:
{
delete this.Style[Data.Id];
this.Update_Interface(Data.Id);
break;
}
case AscDFH.historyitem_Styles_ChangeDefaultParaPr:
{
this.Default.ParaPr.Init_Default();
this.Default.ParaPr.Merge(Data.New);
break;
}
case AscDFH.historyitem_Styles_ChangeDefaultTextPr:
{
this.Default.TextPr.Init_Default();
this.Default.TextPr.Merge(Data.New);
break;
}
}
},
=======
>>>>>>>
<<<<<<<
Save_Changes : function(Data, Writer)
{
// Сохраняем изменения из тех, которые используются для Undo/Redo в бинарный файл.
// Long : тип класса
// Long : тип изменений
Writer.WriteLong( AscDFH.historyitem_type_Styles );
var Type = Data.Type;
// Пишем тип
Writer.WriteLong( Type );
switch ( Type )
{
case AscDFH.historyitem_Styles_Add:
case AscDFH.historyitem_Styles_Remove:
{
// String : Id стиля
Writer.WriteString2( Data.Id );
break;
}
case AscDFH.historyitem_Styles_ChangeDefaultParaPr:
case AscDFH.historyitem_Styles_ChangeDefaultTextPr:
{
// Variable : ParaPr | TextPr
Data.New.Write_ToBinary(Writer);
break;
}
}
return Writer;
},
Load_Changes : function(Reader)
{
// Сохраняем изменения из тех, которые используются для Undo/Redo в бинарный файл.
// Long : тип класса
// Long : тип изменений
var ClassType = Reader.GetLong();
if ( AscDFH.historyitem_type_Styles != ClassType )
return;
var Type = Reader.GetLong();
switch ( Type )
{
case AscDFH.historyitem_Styles_Add:
{
// String : Id стиля
// Спокойно добавляем стиль по Id, т.к. сначала стиль создается и только
// потом он добавляется в список стилей.
var Id = Reader.GetString2();
this.Style[Id] = g_oTableId.Get_ById( Id );
this.Update_Interface(Id);
AscCommon.CollaborativeEditing.Add_LinkData(this, {UpdateStyleId : Id});
break;
}
case AscDFH.historyitem_Styles_Remove:
{
// String : Id стиля
var Id = Reader.GetString2();
delete this.Style[Id];
this.Update_Interface(Id);
AscCommon.CollaborativeEditing.Add_LinkData(this, {UpdateStyleId : Id});
break;
}
case AscDFH.historyitem_Styles_ChangeDefaultParaPr:
{
// Variable : ParaPr
var oParaPr = new CParaPr();
oParaPr.Read_FromBinary(Reader);
this.Default.ParaPr.Init_Default();
this.Default.ParaPr.Merge(oParaPr);
break;
}
case AscDFH.historyitem_Styles_ChangeDefaultTextPr:
{
// Variable : TextPr
var oTextPr = new CTextPr();
oTextPr.Read_FromBinary(Reader);
this.Default.TextPr.Init_Default();
this.Default.TextPr.Merge(oTextPr);
break;
}
}
},
=======
>>>>>>> |
<<<<<<<
search: null,
datePickerType: DatePickerType.IndividualDate,
showDatePickerModal: false,
filter: {
date: []
}
=======
search: null,
filterValue: null
>>>>>>>
search: null,
datePickerType: DatePickerType.IndividualDate,
showDatePickerModal: false,
filter: {
date: []
},
filterValue: null
<<<<<<<
handleDateChange = change => {
// When user clear date picker value it the date value in the state will becom null which is not an array anymore.
// By checking if the data changed is null then we instead make it an empty array
if (change) this.setState({ filter: { ...this.state.filter, date: Array.isArray(change) ? change : [change] } })
else this.setState({ filter: { ...this.state.fitler, date: [] } })
}
changePickerType = type => {
this.setState({ datePickerType: type })
}
=======
locFilterChanged = location => {
this.setState({ filterValue: location })
}
>>>>>>>
handleDateChange = change => {
// When user clear date picker value it the date value in the state will becom null which is not an array anymore.
// By checking if the data changed is null then we instead make it an empty array
if (change) this.setState({ filter: { ...this.state.filter, date: Array.isArray(change) ? change : [change] } })
else this.setState({ filter: { ...this.state.fitler, date: [] } })
}
changePickerType = type => {
this.setState({ datePickerType: type })
}
locFilterChanged = location => {
this.setState({ filterValue: location })
}
<<<<<<<
<BigSearch search={search} onSearch={this.handleSearch} onClickDateFilter={this.handleOpenDatePickperModal} />
<Modal title='Pick date' visible={this.state.showDatePickerModal}
onCancel={() => this.setState({ showDatePickerModal: !this.state.showDatePickerModal })}
onOk={() => this.setState({ showDatePickerModal: !this.state.showDatePickerModal })}>
<Dropdown overlay={DatePickerOption} placement='bottomCenter'>
<Button>{ this.state.datePickerType === '' ? 'Date' : this.state.datePickerType}</Button>
</Dropdown>
<DatePickerComponent datePickerType={this.state.datePickerType} onDateChange={this.handleDateChange} dateValue={this.state.filter.date} />
</Modal>
=======
<BigSearch
search={search}
onSearch={this.handleSearch}
locations={existingLocations}
onFilterChange={this.locFilterChanged}
/>
>>>>>>>
<BigSearch search={search} onSearch={this.handleSearch} onClickDateFilter={this.handleOpenDatePickperModal} locations={existingLocations} onFilterChange={this.locFilterChanged} />
<Modal title='Pick date' visible={this.state.showDatePickerModal}
onCancel={() => this.setState({ showDatePickerModal: !this.state.showDatePickerModal })}
onOk={() => this.setState({ showDatePickerModal: !this.state.showDatePickerModal })}>
<Dropdown overlay={DatePickerOption} placement='bottomCenter'>
<Button>{ this.state.datePickerType === '' ? 'Date' : this.state.datePickerType}</Button>
</Dropdown>
<DatePickerComponent datePickerType={this.state.datePickerType} onDateChange={this.handleDateChange} dateValue={this.state.filter.date} />
</Modal>
<<<<<<<
<OpListSection search={search} filter={this.state.filter} dateFilterType={this.state.datePickerType} />
=======
<OpListSection search={search} location={filterValue} />
>>>>>>>
<OpListSection search={search} filter={this.state.filter} dateFilterType={this.state.datePickerType} location={filterValue} /> |
<<<<<<<
if (Item.Data && Item.Data.IsChangesClass && Item.Data.IsChangesClass())
{
Item.Data.Undo();
Item.Data.RefreshRecalcData();
}
else
{
Item.Class.Undo(Item.Data);
Item.Class.Refresh_RecalcData(Item.Data);
}
=======
Item.Class.Undo(Item.Data);
Item.Class.Refresh_RecalcData(Item.Data);
this.private_UpdateContentChangesOnUndo(Item);
>>>>>>>
if (Item.Data && Item.Data.IsChangesClass && Item.Data.IsChangesClass())
{
Item.Data.Undo();
Item.Data.RefreshRecalcData();
}
else
{
Item.Class.Undo(Item.Data);
Item.Class.Refresh_RecalcData(Item.Data);
}
this.private_UpdateContentChangesOnUndo(Item);
<<<<<<<
if (Item.Data && Item.Data.IsChangesClass && Item.Data.IsChangesClass())
{
Item.Data.Undo();
Item.Data.RefreshRecalcData();
}
else
{
Item.Class.Undo(Item.Data);
Item.Class.Refresh_RecalcData(Item.Data);
}
=======
Item.Class.Undo(Item.Data);
Item.Class.Refresh_RecalcData(Item.Data);
this.private_UpdateContentChangesOnUndo(Item);
>>>>>>>
if (Item.Data && Item.Data.IsChangesClass && Item.Data.IsChangesClass())
{
Item.Data.Undo();
Item.Data.RefreshRecalcData();
}
else
{
Item.Class.Undo(Item.Data);
Item.Class.Refresh_RecalcData(Item.Data);
}
this.private_UpdateContentChangesOnUndo(Item);
<<<<<<<
if (Item.Data && Item.Data.IsChangesClass && Item.Data.IsChangesClass())
{
Item.Data.Redo();
Item.Data.RefreshRecalcData();
}
else
{
Item.Class.Redo(Item.Data);
Item.Class.Refresh_RecalcData(Item.Data);
}
=======
Item.Class.Redo( Item.Data );
Item.Class.Refresh_RecalcData( Item.Data );
this.private_UpdateContentChangesOnRedo(Item);
>>>>>>>
if (Item.Data && Item.Data.IsChangesClass && Item.Data.IsChangesClass())
{
Item.Data.Redo();
Item.Data.RefreshRecalcData();
}
else
{
Item.Class.Redo(Item.Data);
Item.Class.Refresh_RecalcData(Item.Data);
}
this.private_UpdateContentChangesOnRedo(Item); |
<<<<<<<
tags: [ { tag: 'awesome' } ]
=======
date: [
null,
null
],
tags: []
>>>>>>>
tags: [ { tag: 'awesome' } ]
date: [
null,
null
],
tags: []
<<<<<<<
tags: [ { tag: 'awesome' } ]
=======
date: [
null,
null
],
tags: []
>>>>>>>
tags: [ { tag: 'awesome' } ]
date: [
null,
null
],
tags: []
<<<<<<<
tags: [ { tag: 'awesome' } ]
=======
date: [
null,
null
],
tags: []
>>>>>>>
tags: [ { tag: 'awesome' } ]
date: [
null,
null
],
tags: []
<<<<<<<
tags: [ { tag: 'awesome' } ]
=======
date: [
null,
null
],
tags: []
>>>>>>>
tags: [ { tag: 'awesome' } ]
date: [
null,
null
],
tags: [] |
<<<<<<<
this._initCellsArea( true );
this.model.setTableStyleAfterOpen();
=======
this._initCellsArea(true);
this.af_setStyleAfterOpen();
>>>>>>>
this._initCellsArea(true);
this.model.setTableStyleAfterOpen();
<<<<<<<
WorksheetView.prototype.prepareDepCells = function ( se ) {
=======
WorksheetView.prototype.prepareDepCells = function (se) {
var activeCell = this.model.selectionRange, mc = this.model.getMergedByCell(activeCell.startRow,
activeCell.startCol), c1 = mc ? mc.c1 : activeCell.startCol, r1 = mc ? mc.r1 :
activeCell.startRow, c = this._getVisibleCell(c1, r1), nodes = (se ==
AscCommonExcel.c_oAscDrawDepOptions.Master) ?
this.model.workbook.dependencyFormulas.getMasterNodes(this.model.getId(), c.getName()) :
this.model.workbook.dependencyFormulas.getSlaveNodes(this.model.getId(), c.getName());
if (!nodes) {
return;
}
if (!this.depDrawCells) {
this.depDrawCells = {};
}
if (se == AscCommonExcel.c_oAscDrawDepOptions.Master) {
c = c.getCells()[0];
var id = AscCommonExcel.getVertexId(this.model.getId(), c.getName());
this.depDrawCells[id] = {from: c, to: nodes};
} else {
var to = {}, to1, id = AscCommonExcel.getVertexId(this.model.getId(), c.getName());
to[AscCommonExcel.getVertexId(this.model.getId(), c.getName())] =
this.model.workbook.dependencyFormulas.getNode(this.model.getId(), c.getName());
to1 = this.model.workbook.dependencyFormulas.getNode(this.model.getId(), c.getName());
for (var id2 in nodes) {
if (this.depDrawCells[id2]) {
// remove extend
//$.extend( this.depDrawCells[id2].to, to )
} else {
this.depDrawCells[id2] = {};
this.depDrawCells[id2].from = nodes[id2].returnCell();
this.depDrawCells[id2].to = {};
this.depDrawCells[id2].to[id] = to1;
}
}
}
>>>>>>>
WorksheetView.prototype.prepareDepCells = function (se) {
<<<<<<<
WorksheetView.prototype.setSelectionInfo = function ( prop, val, onlyActive, fromBinary, sortColor ) {
=======
WorksheetView.prototype.setSelectionInfo = function (prop, val, onlyActive, isLocal, sortColor) {
>>>>>>>
WorksheetView.prototype.setSelectionInfo = function (prop, val, onlyActive, fromBinary, sortColor) {
<<<<<<<
case "empty":
if ( isLargeRange ) {
callTrigger = true;
t.handlers.trigger( "slowOperation", true );
}
/* отключаем отрисовку на случай необходимости пересчета ячеек, заносим ячейку, при необходимости в список перерисовываемых */
t.model.workbook.dependencyFormulas.lockRecal();
=======
case "sort":
if (isLargeRange) {
callTrigger = true;
t.handlers.trigger("slowOperation", true);
}
t.cellCommentator.sortComments(range.sort(val, activeCell.col, sortColor, true));
break;
>>>>>>>
case "sort":
if (isLargeRange) {
callTrigger = true;
t.handlers.trigger("slowOperation", true);
}
t.cellCommentator.sortComments(range.sort(val, activeCell.col, sortColor, true));
break;
<<<<<<<
if ( prop !== "paste" || (prop === "paste" && fromBinary) ) {
=======
if (prop !== "paste" || (prop === "paste" && isLocal)) {
>>>>>>>
if (prop !== "paste" || (prop === "paste" && fromBinary)) {
<<<<<<<
if ( fromBinary ) {
checkRange = t._pasteFromBinary( val, true );
}
else {
checkRange = t._pasteFromHTML( val, true );
=======
var newRange;
if (isLocal === "binary") {
newRange = this._pasteFromBinary(val, true);
} else {
newRange = this._pasteFromHTML(val, true);
>>>>>>>
var newRange;
if (fromBinary) {
newRange = this._pasteFromBinary(val, true);
} else {
newRange = this._pasteFromHTML(val, true);
<<<<<<<
WorksheetView.prototype._pasteData = function ( isLargeRange, fromBinary, val, bIsUpdate, canChangeColWidth ) {
=======
WorksheetView.prototype._pasteData = function (isLargeRange, isLocal, val, bIsUpdate, canChangeColWidth) {
>>>>>>>
WorksheetView.prototype._pasteData = function (isLargeRange, fromBinary, val, bIsUpdate, canChangeColWidth) {
<<<<<<<
if ( fromBinary )
{
selectData = t._pasteFromBinary( val, null, tablesMap );
}
else
{
selectData = t._pasteFromHTML( val );
=======
if (isLocal === 'binary') {
selectData = t._pasteFromBinary(val);
} else {
selectData = t._pasteFromHTML(val);
>>>>>>>
if (fromBinary) {
selectData = t._pasteFromBinary(val, null, tablesMap);
} else {
selectData = t._pasteFromHTML(val);
<<<<<<<
t.model.workbook.dependencyFormulas.unlockRecal();
if ( callTrigger )
{
t.handlers.trigger( "slowOperation", false );
=======
t.model.workbook.unLockDraw();
t.model.workbook.buildRecalc();
if (callTrigger) {
t.handlers.trigger("slowOperation", false);
>>>>>>>
t.model.workbook.dependencyFormulas.unlockRecal();
if (callTrigger) {
t.handlers.trigger("slowOperation", false);
<<<<<<<
if ( bIsUpdate )
{
if ( callTrigger )
{
t.handlers.trigger( "slowOperation", false );
=======
//добавляем автофильтры и форматированные таблицы
if (isLocal === 'binary' && val.TableParts && val.TableParts.length) {
var aFilters = val.TableParts;
var range;
var tablePartRange;
var activeRange = window["Asc"]["editor"].wb.clipboard.pasteProcessor.activeRange;
var refInsertBinary = AscCommonExcel.g_oRangeCache.getAscRange(activeRange);
var diffRow;
var diffCol;
for (var aF = 0; aF < aFilters.length; aF++) {
tablePartRange = aFilters[aF].Ref;
diffRow = tablePartRange.r1 - refInsertBinary.r1;
diffCol = tablePartRange.c1 - refInsertBinary.c1;
range = t.model.getRange3(diffRow + selectionRange.r1, diffCol + selectionRange.c1,
diffRow + selectionRange.r1 + (tablePartRange.r2 - tablePartRange.r1),
diffCol + selectionRange.c1 + (tablePartRange.c2 - tablePartRange.c1));
//если область вставки содержит форматированную таблицу, которая пересекается с вставляемой форматированной таблицей
var intersectionRangeWithTableParts = t.model.autoFilters._intersectionRangeWithTableParts(range.bbox);
if (intersectionRangeWithTableParts) {
continue;
}
if (aFilters[aF].style) {
range.cleanFormat();
}
var bWithoutFilter = false;
if (!aFilters[aF].AutoFilter) {
bWithoutFilter = true;
}
var stylePasteObj = {
ShowColumnStripes: aFilters[aF].TableStyleInfo.ShowColumnStripes,
ShowFirstColumn: aFilters[aF].TableStyleInfo.ShowFirstColumn,
ShowLastColumn: aFilters[aF].TableStyleInfo.ShowLastColumn,
ShowRowStripes: aFilters[aF].TableStyleInfo.ShowRowStripes,
HeaderRowCount: aFilters[aF].HeaderRowCount,
TotalsRowCount: aFilters[aF].TotalsRowCount
};
t.model.autoFilters.addAutoFilter(aFilters[aF].TableStyleInfo.Name, range.bbox, true, true,
bWithoutFilter, null, stylePasteObj);
}
}
//делаем unmerge ф/т
var arnToRange = t.model.selectionRange.getLast();
var intersectionRangeWithTableParts = t.model.autoFilters._intersectionRangeWithTableParts(arnToRange);
if (intersectionRangeWithTableParts && intersectionRangeWithTableParts.length) {
var tablePart;
for (var i = 0; i < intersectionRangeWithTableParts.length; i++) {
tablePart = intersectionRangeWithTableParts[i];
this.model.getRange3(tablePart.Ref.r1, tablePart.Ref.c1, tablePart.Ref.r2, tablePart.Ref.c2).unmerge();
}
}
if (bIsUpdate) {
if (callTrigger) {
t.handlers.trigger("slowOperation", false);
>>>>>>>
if (bIsUpdate) {
if (callTrigger) {
t.handlers.trigger("slowOperation", false);
<<<<<<<
WorksheetView.prototype._pasteFromBinary = function ( val, isCheckSelection, tablesMap ) {
=======
WorksheetView.prototype._pasteFromBinary = function (val, isCheckSelection) {
>>>>>>>
WorksheetView.prototype._pasteFromBinary = function (val, isCheckSelection, tablesMap) { |
<<<<<<<
var paragraph = oDoc.Content[oDoc.CurPos.ContentPos];
if (null != paragraph && type_Paragraph === paragraph.GetType()) {
=======
var paragraph = oDoc.GetCurrentParagraph();
if (null != paragraph) {
>>>>>>>
var paragraph = oDoc.GetCurrentParagraph();
if (null != paragraph) {
<<<<<<<
element.Get_AllDrawingObjects(drawings);
if(type_Paragraph === element.GetType())//paragraph
=======
element.GetAllDrawingObjects(drawings);
if(type_Paragraph == element.GetType())//paragraph
>>>>>>>
element.GetAllDrawingObjects(drawings);
if(type_Paragraph === element.GetType())//paragraph
<<<<<<<
if ("always" === pPr["mso-column-break-before"])
this._Paragraph_Add(new ParaNewLine(break_Page));
=======
if ("always" == pPr["mso-column-break-before"])
this._AddToParagraph(new ParaNewLine(break_Page));
>>>>>>>
if ("always" === pPr["mso-column-break-before"])
this._AddToParagraph(new ParaNewLine(break_Page));
<<<<<<<
this.nBrCount++;//this._Paragraph_Add( new ParaNewLine( break_Line ) );
if("line-break" === pPr["mso-special-character"] || "always" === pPr["mso-column-break-before"])
=======
this.nBrCount++;//this._AddToParagraph( new ParaNewLine( break_Line ) );
if("line-break" == pPr["mso-special-character"] || "always" == pPr["mso-column-break-before"])
>>>>>>>
this.nBrCount++;//this._AddToParagraph( new ParaNewLine( break_Line ) );
if("line-break" === pPr["mso-special-character"] || "always" === pPr["mso-column-break-before"]) |
<<<<<<<
this.Document.Set_SelectionState( Point.State );
if(!window['AscCommon'].g_clipboardBase.pasteStart)
{
window['AscCommon'].g_clipboardBase.SpecialPasteButton_Hide();
}
=======
this.Document.SetSelectionState( Point.State );
>>>>>>>
this.Document.SetSelectionState( Point.State );
if(!window['AscCommon'].g_clipboardBase.pasteStart)
{
window['AscCommon'].g_clipboardBase.SpecialPasteButton_Hide();
}
<<<<<<<
this.Document.Set_SelectionState( State );
if(!window['AscCommon'].g_clipboardBase.pasteStart)
{
window['AscCommon'].g_clipboardBase.SpecialPasteButton_Hide();
}
=======
this.Document.SetSelectionState( State );
>>>>>>>
this.Document.SetSelectionState( State );
if(!window['AscCommon'].g_clipboardBase.pasteStart)
{
window['AscCommon'].g_clipboardBase.SpecialPasteButton_Hide();
} |
<<<<<<<
const shadowStyle = { overflow: 'visible', textAlign: 'center' }
const handleTabChange = (key, e) => {
if (key === '5') {
onEditClicked()
}
}
=======
const creator = `@${requestor.name || ''}`
const appUrl = `${config.appUrl}${router.asPath}`
>>>>>>>
const shadowStyle = { overflow: 'visible', textAlign: 'center' }
const handleTabChange = (key, e) => {
if (key === '5') {
onEditClicked()
}
}
const creator = `@${requestor.name || ''}`
const appUrl = `${config.appUrl}${router.asPath}`
<<<<<<<
=======
<Divider />
<ItemIdLine item={op.offerOrg} path='orgs' />
<ItemIdLine item={requestor} path='people' />
>>>>>>>
<<<<<<<
<Button shape='round' size='large' type='secondary'>
Share
</Button>
</ActionContainer>
=======
</ItemDescription>
<ShareLinks url={appUrl} />
</Left>
<Right>
<Spacer />
<img style={{ width: '100%' }} src={img} alt={op.name} />
<TagContainer>
<TagDisplay tags={op.tags} />
</TagContainer>
>>>>>>>
<Button shape='round' size='large' type='secondary'>
Share
</Button>
<ShareLinks url={appUrl} />
</ActionContainer> |
<<<<<<<
{
locale: 'kk-KZ',
valid: [
'+77254716212',
'77254716212',
'87254716212',
'7254716212',
],
invalid: [
'12345',
'',
'ASDFGJKLmZXJtZtesting123',
'010-38238383',
'+9676338855',
'19676338855',
'6676338855',
'+99676338855',
],
},
{
locale: 'be-BY',
valid: [
'+375241234567',
'+375251234567',
'+375291234567',
'+375331234567',
'+375441234567',
'375331234567',
],
invalid: [
'12345',
'',
'ASDFGJKLmZXJtZtesting123',
'010-38238383',
'+9676338855',
'19676338855',
'6676338855',
'+99676338855',
],
},
=======
{
locale: 'th-TH',
valid: [
'0912345678',
'+66912345678',
'66912345678',
],
invalid: [
'99123456789',
'12345',
'67812345623',
'081234567891',
],
},
>>>>>>>
{
locale: 'kk-KZ',
valid: [
'+77254716212',
'77254716212',
'87254716212',
'7254716212',
],
invalid: [
'12345',
'',
'ASDFGJKLmZXJtZtesting123',
'010-38238383',
'+9676338855',
'19676338855',
'6676338855',
'+99676338855',
],
},
{
locale: 'be-BY',
valid: [
'+375241234567',
'+375251234567',
'+375291234567',
'+375331234567',
'+375441234567',
'375331234567',
],
invalid: [
'12345',
'',
'ASDFGJKLmZXJtZtesting123',
'010-38238383',
'+9676338855',
'19676338855',
'6676338855',
'+99676338855',
],
},
{
locale: 'th-TH',
valid: [
'0912345678',
'+66912345678',
'66912345678',
],
invalid: [
'99123456789',
'12345',
'67812345623',
'081234567891',
],
}, |
<<<<<<<
const { SchemaName, OpportunityRoutes } = require('./opportunity.constants')
const { authorizeActions, authorizeFields } = require('../../middleware/authorize/authorizeRequest')
const convertRequestToAction = (req) => {
switch (req.method) {
case 'GET':
return req.route.path === OpportunityRoutes[Action.READ] ? Action.READ : Action.LIST
case 'POST':
return Action.CREATE
case 'PUT':
return Action.UPDATE
case 'DELETE':
return Action.DELETE
default:
return Action.READ
}
}
=======
const { authorizeOpportunityActions, authorizeOpportunityFields } = require('./opportunity.authorize')
const initializeTags = require('../../util/initTags')
>>>>>>>
const { SchemaName, OpportunityRoutes } = require('./opportunity.constants')
const { authorizeActions, authorizeFields } = require('../../middleware/authorize/authorizeRequest')
const initializeTags = require('../../util/initTags')
const convertRequestToAction = (req) => {
switch (req.method) {
case 'GET':
return req.route.path === OpportunityRoutes[Action.READ] ? Action.READ : Action.LIST
case 'POST':
return Action.CREATE
case 'PUT':
return Action.UPDATE
case 'DELETE':
return Action.DELETE
default:
return Action.READ
}
}
<<<<<<<
middlewares: [authorizeActions(SchemaName, convertRequestToAction)]
=======
middlewares: [authorizeOpportunityActions]
},
{
middlewares: [initializeTags],
only: ['create', 'update']
>>>>>>>
middlewares: [authorizeActions(SchemaName, convertRequestToAction)]
}, {
middlewares: [initializeTags],
only: ['create', 'update'] |
<<<<<<<
// import RouteChangeScroller from 'Interface/RouteChangeScroller';
import DocumentTitleUpdater from 'Interface/DocumentTitleUpdater';
=======
import RouteChangeScroller from 'Interface/RouteChangeScroller';
>>>>>>>
// import RouteChangeScroller from 'Interface/RouteChangeScroller';
<<<<<<<
{/*<RouteChangeScroller />*/}
<DocumentTitleUpdater />
=======
<RouteChangeScroller />
>>>>>>>
{/*<RouteChangeScroller />*/} |
<<<<<<<
if (this._shape._map) {
this._map = this._shape._map;
=======
var shape = this._shape;
shape.setStyle(shape.options.editing);
if (shape._map) {
this._map = shape._map;
>>>>>>>
var shape = this._shape;
if (this._shape._map) {
this._map = this._shape._map;
shape.setStyle(shape.options.editing);
if (shape._map) {
this._map = shape._map; |
<<<<<<<
=======
// const { DefaultAliasSet } = require('./tagUI.constants')
>>>>>>>
<<<<<<<
if (!(await AliasSet.exists({ tag: tagToDelete }))) { // tagToDelete))) {
=======
if (!(await AliasSet.exists({ tag: tagToDelete }))) {
>>>>>>>
if (!(await AliasSet.exists({ tag: tagToDelete }))) {
<<<<<<<
const otherAliases = tagWithAliases.aliases // List of aliases of which the tag to delete is a part of
=======
if (tagWithAliases === null) {
return res.status(404).send({ error: 'An alias is not found as a tag' })
}
const otherAliases = tagWithAliases.aliases // List of aliases of which the tag to delete is a part of
>>>>>>>
if (tagWithAliases === null) {
return res.status(404).send({ error: 'An alias is not found as a tag' })
}
const otherAliases = tagWithAliases.aliases // List of aliases of which the tag to delete is a part of |
<<<<<<<
.on('mouseout', this._onMouseOut, this)
=======
.on('mouseup', this._onMouseUp, this) // Necessary for 0.8 compatibility
.on('mousemove', this._onMouseMove, this) // Necessary to prevent 0.8 stutter
>>>>>>>
.on('mouseout', this._onMouseOut, this)
.on('mouseup', this._onMouseUp, this) // Necessary for 0.8 compatibility
.on('mousemove', this._onMouseMove, this) // Necessary to prevent 0.8 stutter
<<<<<<<
.on('mouseup', this._onMouseUp, this)
.on('zoomlevelschange', this._onZoomEnd, this)
.on('click', this._onTouch, this);
=======
.on('zoomend', this._onZoomEnd, this);
>>>>>>>
.on('zoomlevelschange', this._onZoomEnd, this)
.on('click', this._onTouch, this)
.on('zoomend', this._onZoomEnd, this);
<<<<<<<
.off('mouseout', this._onMouseOut, this)
.off('mouseup', this._onMouseUp, this);
=======
.off('mouseup', this._onMouseUp, this)
.off('mousemove', this._onMouseMove, this);
>>>>>>>
.off('mouseout', this._onMouseOut, this)
.off('mouseup', this._onMouseUp, this)
.off('mousemove', this._onMouseMove, this); |
<<<<<<<
}),
drawError: {
color: '#b00b00',
timeout: 1000
},
=======
}),
touchIcon: new L.DivIcon({
iconSize: new L.Point(20, 20),
className: 'leaflet-div-icon leaflet-editing-icon leaflet-touch-icon'
}),
>>>>>>>
}),
touchIcon: new L.DivIcon({
iconSize: new L.Point(20, 20),
className: 'leaflet-div-icon leaflet-editing-icon leaflet-touch-icon'
}),
drawError: {
color: '#b00b00',
timeout: 1000
}
<<<<<<<
if (options && options.drawError) {
options.drawError = L.Util.extend({}, this.options.drawError, options.drawError);
}
=======
this._latlngs = latlngs;
>>>>>>>
if (options && options.drawError) {
options.drawError = L.Util.extend({}, this.options.drawError, options.drawError);
}
this._latlngs = latlngs; |
<<<<<<<
=======
_vertexChanged: function (latlng, added) {
this._map.fire('draw:drawvertex', { layers: this._markerGroup });
this._updateFinishHandler();
this._updateRunningMeasure(latlng, added);
this._clearGuides();
this._updateTooltip();
},
>>>>>>>
_vertexChanged: function (latlng, added) {
this._map.fire('draw:drawvertex', { layers: this._markerGroup });
this._updateFinishHandler();
this._updateRunningMeasure(latlng, added);
this._clearGuides();
this._updateTooltip();
},
<<<<<<<
this._map
.on('mousemove', this._onMouseMove, this)
.on('touchmove', this._onMouseMove, this)
.on('MSPointerMove', this._onMouseMove, this)
.on('click', this._editStyle, this);
=======
this._map.on('mousemove', this._onMouseMove, this);
this._map.on('draw:editvertex', this._updateTooltip, this);
>>>>>>>
this._map
.on('mousemove', this._onMouseMove, this)
.on('touchmove', this._onMouseMove, this)
.on('MSPointerMove', this._onMouseMove, this)
.on('click', this._editStyle, this)
.on('draw:editvertex', this._updateTooltip, this); |
<<<<<<<
.on('mouseout', this._onMouseOut, this)
=======
.on('mouseup', this._onMouseUp, this) // Necessary for 0.8 compatibility
.on('mousemove', this._onMouseMove, this) // Necessary to prevent 0.8 stutter
>>>>>>>
.on('mouseout', this._onMouseOut, this)
.on('mouseup', this._onMouseUp, this) // Necessary for 0.8 compatibility
.on('mousemove', this._onMouseMove, this) // Necessary to prevent 0.8 stutter
<<<<<<<
.on('mouseup', this._onMouseUp, this)
.on('zoomlevelschange', this._onZoomEnd, this)
.on('click', this._onTouch, this);
=======
.on('zoomend', this._onZoomEnd, this);
>>>>>>>
.on('zoomlevelschange', this._onZoomEnd, this)
.on('click', this._onTouch, this)
.on('zoomend', this._onZoomEnd, this);
<<<<<<<
.off('mouseout', this._onMouseOut, this)
.off('mouseup', this._onMouseUp, this);
=======
.off('mouseup', this._onMouseUp, this)
.off('mousemove', this._onMouseMove, this);
>>>>>>>
.off('mouseout', this._onMouseOut, this)
.off('mouseup', this._onMouseUp, this)
.off('mousemove', this._onMouseMove, this); |
<<<<<<<
.off('zoomend', this._onZoomEnd, this)
.off('click', this._onTouch, this);
=======
.off('mouseup', this._onMouseUp, this)
.off('zoomend', this._onZoomEnd, this);
>>>>>>>
.off('mouseup', this._onMouseUp, this)
.off('zoomend', this._onZoomEnd, this)
.off('click', this._onTouch, this); |
<<<<<<<
import Dropdown from './Dropdown';
=======
import TextArea from './TextArea';
>>>>>>>
import Dropdown from './Dropdown';
import TextArea from './TextArea';
<<<<<<<
Dropdown,
=======
TextArea,
>>>>>>>
Dropdown,
TextArea, |
<<<<<<<
import Text from './Text';
=======
import { Container, Row, Col, Hide } from './Grid';
>>>>>>>
import { Container, Row, Col, Hide } from './Grid';
import Text from './Text';
<<<<<<<
Text,
=======
Container,
Row,
Col,
Hide,
>>>>>>>
Container,
Row,
Col,
Hide,
Text, |
<<<<<<<
import Dropdown from './Dropdown';
=======
import TextArea from './TextArea';
>>>>>>>
import Dropdown from './Dropdown';
import TextArea from './TextArea';
<<<<<<<
Dropdown,
=======
TextArea,
>>>>>>>
Dropdown,
TextArea, |
<<<<<<<
// Version this js was shipped with
var SDK_VERSION = "2.0";
var SERVICE = "com.salesforce.oauth";
var exec = require("salesforce/util/exec").exec;
=======
/**
* Whether or not logout has already been initiated. Can only be initiated once
* per page load.
*/
var logoutInitiated = false;
>>>>>>>
// Version this js was shipped with
var SDK_VERSION = "2.0";
var SERVICE = "com.salesforce.oauth";
var exec = require("salesforce/util/exec").exec;
/**
* Whether or not logout has already been initiated. Can only be initiated once
* per page load.
*/
var logoutInitiated = false;
<<<<<<<
exec(SDK_VERSION, null, null, SERVICE, "logoutCurrentUser", []);
=======
if (!logoutInitiated) {
logoutInitiated = true;
cordova.exec(null, null, "com.salesforce.oauth", "logoutCurrentUser", []);
}
>>>>>>>
if (!logoutInitiated) {
logoutInitiated = true;
exec(SDK_VERSION, null, null, SERVICE, "logoutCurrentUser", []);
} |
<<<<<<<
=======
* Get a readable stream of a remote file
* @param {String} remoteFilename The file to stream
* @param {OptionsHeadersAndFormat=} options Options for the request
* @memberof ClientInterface
* @returns {Promise.<Readable>} A promise that resolves with a readable stream
*/
getFileStream: function getFileStream(remoteFilename, options) {
var getOptions = deepmerge(
baseOptions,
options || {}
);
return getAdapter.getFileStream(__url, remoteFilename, getOptions);
},
/**
* Get quota information
* @param {OptionsHeadersAndFormat=} options Options for the request
* @returns {null|Object} Returns null if failed, or an object with `used` and `available`
*/
getQuota: function getQuota(options) {
var getOptions = deepmerge(
baseOptions,
options || {}
);
return getAdapter.getQuota(__url, getOptions);
},
/**
>>>>>>>
* Get quota information
* @param {OptionsHeadersAndFormat=} options Options for the request
* @returns {null|Object} Returns null if failed, or an object with `used` and `available`
*/
getQuota: function getQuota(options) {
var getOptions = deepmerge(
baseOptions,
options || {}
);
return getAdapter.getQuota(__url, getOptions);
},
/** |
<<<<<<<
import { Button, DatePicker, Divider, Form, Icon, Input, Tooltip } from 'antd'
=======
import {
Button,
Col,
DatePicker,
Divider,
Form,
Icon,
Input,
Row,
Tooltip
} from 'antd'
>>>>>>>
import { Button, DatePicker, Divider, Form, Icon, Input, Tooltip } from 'antd'
<<<<<<<
import {
DescriptionContainer,
FormGrid,
InputContainer,
MediumInputContainer,
ShortInputContainer,
TitleContainer
} from '../VTheme/FormStyles'
=======
import PageTitle from '../../components/LandingPageComponents/PageTitle.js'
const { TextArea } = Input
// custom form components go here
const FormGrid = styled.div`
display: grid;
grid-template-columns: 40fr 60fr;
@media only screen and (min-width: 375px) and (max-width: 812px) and (-webkit-device-pixel-ratio: 3) {
/* iPhone X */
grid-template-columns: calc(100vw - 2rem);
}
`
const DescriptionContainer = styled.div`
margin-right: 2rem;
@media only screen and (min-width: 375px) and (max-width: 812px) and (-webkit-device-pixel-ratio: 3) {
/* iPhone X */
margin: initial;
}
` // end descriptionContainer
const TitleContainer = styled.div`
margin-bottom: 0.5rem;
` // end titleContainer
const InputContainer = styled.div`
height: auto;
margin-left: 2rem;
margin-bottom: 2rem;
@media only screen and (min-width: 375px) and (max-width: 812px) and (-webkit-device-pixel-ratio: 3) {
/* iPhone X */
margin: 1rem 0 0 0;
}
@media (min-width: 320px) and (max-width: 480px) {
/* ##Device = Most of the Smartphones Mobiles (Portrait) ##Screen = B/w 320px to 479px */
margin: 1rem 0 0 0;
}
` // end inputContainer
const ShortInputContainer = styled.div`
width: 25rem;
@media only screen and (min-width: 375px) and (max-width: 812px) and (-webkit-device-pixel-ratio: 3) {
/* iPhone X */
width: auto;
}
@media (min-width: 320px) and (max-width: 480px) {
/* ##Device = Most of the Smartphones Mobiles (Portrait) ##Screen = B/w 320px to 479px */
width: auto;
}
`
>>>>>>>
import {
DescriptionContainer,
FormGrid,
InputContainer,
MediumInputContainer,
ShortInputContainer,
TitleContainer
} from '../VTheme/FormStyles'
import PageTitle from '../../components/LandingPageComponents/PageTitle.js' |
<<<<<<<
app.set('views', path.join(__dirname, '/public'));
app.set('view engine', 'ejs');
app.use(require('cookie-parser')());
app.get('/', csrfProtection, async (req, res) => res.render('index', { csrfToken: req.csrfToken() }));
app.post('/private/cloudflare', require('body-parser').urlencoded({ extended: true }), csrfProtection, async (req, res) => {
const zoneTag = 'b2070162162124e2d5414cee23dfe861';
let response;
try {
response = await axios.get('https://api.cloudflare.com/client/v4/graphql', {
method: 'POST',
headers: {
'x-auth-key': config.cfApiKey,
'x-auth-email': '[email protected]'
},
body: `"{"query":"{\n viewer {\n zones(filter: { zoneTag: ${zoneTag} }) {\n
httpRequests1dGroups(\n orderBy: [date_ASC]\n limit: 1000\n
filter: { date_gt: "2019-07-15" }\n ) {\n date: dimensions {\n
date\n }\n sum {\n cachedBytes\n bytes\n }\n }\n }\n }\n}","variables":{}}"`
});
} catch (err) {
logger.err('Error: Requesting private/cloudflare failed', err);
res.send(err);
return;
}
if (response.status === 200) {
res.send(await response.data);
} else {
// return some kinda of error if you like
res.send(response.error);
}
});
=======
app.use(require('./routes/api_worldometers'));
app.use(require('./routes/api_historical'));
app.use(require('./routes/api_jhucsse'));
app.use(require('./routes/api_deprecated'));
app.use(require('./routes/api_nyt'));
>>>>>>>
app.set('views', path.join(__dirname, '/public'));
app.set('view engine', 'ejs');
app.use(require('cookie-parser')());
app.get('/', csrfProtection, async (req, res) => res.render('index', { csrfToken: req.csrfToken() }));
app.post('/private/cloudflare', require('body-parser').urlencoded({ extended: true }), csrfProtection, async (req, res) => {
const zoneTag = 'b2070162162124e2d5414cee23dfe861';
let response;
try {
response = await axios.get('https://api.cloudflare.com/client/v4/graphql', {
method: 'POST',
headers: {
'x-auth-key': config.cfApiKey,
'x-auth-email': '[email protected]'
},
body: `"{"query":"{\n viewer {\n zones(filter: { zoneTag: ${zoneTag} }) {\n
httpRequests1dGroups(\n orderBy: [date_ASC]\n limit: 1000\n
filter: { date_gt: "2019-07-15" }\n ) {\n date: dimensions {\n
date\n }\n sum {\n cachedBytes\n bytes\n }\n }\n }\n }\n}","variables":{}}"`
});
} catch (err) {
logger.err('Error: Requesting private/cloudflare failed', err);
res.send(err);
return;
}
if (response.status === 200) {
res.send(await response.data);
} else {
// return some kinda of error if you like
res.send(response.error);
}
});
app.use(require('./routes/api_worldometers'));
app.use(require('./routes/api_historical'));
app.use(require('./routes/api_jhucsse'));
app.use(require('./routes/api_deprecated'));
app.use(require('./routes/api_nyt')); |
<<<<<<<
const execAll = async () => {
await scraper.getWorldometers.getCountries(keys, redis);
await scraper.getWorldometers.getYesterday(keys, redis);
await scraper.getAll(keys, redis);
await scraper.getStates(keys, redis);
await scraper.jhuLocations.jhudataV2(keys, redis);
await scraper.historical.historicalV2(keys, redis);
app.emit('scrapper_finished');
=======
const execAll = () => {
scraper.getWorldometers.getCountries(keys, redis);
scraper.getWorldometers.getYesterday(keys, redis);
scraper.getStates(keys, redis);
scraper.jhuLocations.jhudataV2(keys, redis);
scraper.historical.historicalV2(keys, redis);
>>>>>>>
const execAll = async () => {
await scraper.getWorldometers.getCountries(keys, redis);
await scraper.getWorldometers.getYesterday(keys, redis);
await scraper.getStates(keys, redis);
await scraper.jhuLocations.jhudataV2(keys, redis);
await scraper.historical.historicalV2(keys, redis);
app.emit('scrapper_finished'); |
<<<<<<<
const { config, port } = require('./routes/instances');
const { updateNYTCache } = require('./utils/nyt_cache');
const { updateAppleCache } = require('./utils/apple_cache');
=======
const { config, port, redis, scraper, keys } = require('./routes/instances');
const { updateCache } = require('./utils/nyt_cache');
>>>>>>>
const { config, port, redis, scraper, keys } = require('./routes/instances');
const { updateNYTCache } = require('./utils/nyt_cache');
const { updateAppleCache } = require('./utils/apple_cache'); |
<<<<<<<
// loop cases, deaths for each province
Object.keys(countryData[provinceIndex].timeline).forEach(specifier => {
Object.keys(countryData[provinceIndex].timeline[specifier]).forEach(date => {
if (timeline[specifier][date]) {
timeline[specifier][date] += parseInt(countryData[provinceIndex].timeline[specifier][date]);
} else {
timeline[specifier][date] = parseInt(countryData[provinceIndex].timeline[specifier][date]);
}
=======
// loop cases, recovered, deaths for each province
for (var tProp in timeline) {
Object.assign(timeline, {
[tProp]: [provinceIndex ? countryData[provinceIndex].timeline[tProp] : countryData.map(cData => cData.timeline[tProp])].reduce((acc, cur) => {
Object.keys(cur).map(type => (acc[type] = (acc[type] || 0) + cur[type]));
return acc;
})
>>>>>>>
// loop cases, deaths for each province
for (var tProp in timeline) {
Object.assign(timeline, {
[tProp]: [provinceIndex ? countryData[provinceIndex].timeline[tProp] : countryData.map(cData => cData.timeline[tProp])].reduce((acc, cur) => {
Object.keys(cur).map(type => (acc[type] = (acc[type] || 0) + cur[type]));
return acc;
}) |
<<<<<<<
var JSON5 = require('json5');
=======
var Prism = require('prismjs');
>>>>>>>
var JSON5 = require('json5');
var Prism = require('prismjs'); |
<<<<<<<
"title": "v4.0.4 (2018.05.22)",
"url": "/documents/release.html#v4.0.4-2018.05.22",
"content": "v4.0.4 (2018.05.22)修复部分侧栏目录无法高亮的 bug\n新增插件： ydoc-plugin-edit-page 支持在页面尾部添加 ‘编辑此页面’ 的链接\n文档梳理与优化\n"
},
{
=======
"title": "v4.0.4",
"url": "/documents/release.html#v4.0.4",
"content": "v4.0.4优化 markdown 外链，现在点击外链将会在新的页面打开\n修复上下页相对路径\n"
},
{
>>>>>>>
"title": "v4.0.4",
"url": "/documents/release.html#v4.0.4",
"content": "v4.0.4优化 markdown 外链，现在点击外链将会在新的页面打开\n修复上下页相对路径\n"
},
{
"title": "v4.0.4 (2018.05.22)",
"url": "/documents/release.html#v4.0.4-2018.05.22",
"content": "v4.0.4 (2018.05.22)修复部分侧栏目录无法高亮的 bug\n新增插件： ydoc-plugin-edit-page 支持在页面尾部添加 ‘编辑此页面’ 的链接\n文档梳理与优化\n"
},
{ |
<<<<<<<
},
set: function(value){
if (value !== this.value)
{
this.value = value;
if (this.template)
this.template.setSource(processMarkup(value));
this.apply();
}
},
setType: function(type){
if (this.type != type)
{
if (this.template)
{
this.template.destroy();
this.template = null;
this.tmpl = null;
}
if (type == 'markup')
{
this.template = new basis.template.html.Template(processMarkup(this.value));
this.tmpl = {};
}
this.type = type;
this.apply();
}
},
attachTemplate: function(object){
var template = this.template;
var tmpl = this.tmpl;
var id = object.basisObjectId;
return tmpl[id] = template.createInstance(object, null, function tmplSync(){
if (tmpl)
template.clearInstance(tmpl[id]);
tmpl[id] = template.createInstance(object, null, tmplSync);
});
},
detachTemplate: function(object){
var template = this.template;
var id = object.basisObjectId;
if (template && id in this.tmpl)
{
template.clearInstance(this.tmpl[id]);
delete this.tmpl[id];
}
},
attach: function(fn, context){
basis.Token.prototype.attach.call(this, fn, context);
if (this.template && context && context.object && context.object instanceof Emitter)
this.attachTemplate(context.object);
},
detach: function(fn, context){
basis.Token.prototype.detach.call(this, fn, context);
if (this.template && context && context.object)
this.detachTemplate(context.object);
},
apply: function(){
var value = this.get();
var cursor = this;
while (cursor = cursor.handlers)
{
var object = cursor.context && cursor.context.object;
if (this.template && object && object instanceof Emitter)
{
var id = object.basisObjectId;
if (id in this.tmpl == false)
this.attachTemplate(object);
cursor.fn.call(cursor.context, this.tmpl[id].element);
}
else
cursor.fn.call(cursor.context, value);
}
},
compute: function(events, getter){
if (arguments.length == 1)
{
getter = events;
events = '';
}
getter = basis.getter(getter);
events = String(events).trim().split(/\s+|\s*,\s*/).sort();
var enumId = events.concat(getter.basisGetterId_).join('_');
if (tokenEnums[enumId])
return tokenEnums[enumId];
var token = this;
var computeTokenMap = {};
var updateValue = function(){
this.evaluate();
};
var handler = {
destroy: function(object){
delete computeTokenMap[object.basisObjectId];
this.destroy();
}
};
for (var i = 0, eventName; eventName = events[i]; i++)
if (eventName != 'destroy')
handler[eventName] = updateValue;
return tokenEnums[enumId] = function(object){
if (object instanceof Emitter == false)
throw 'basis.l10n.Token#compute: object must be an instanceof Emitter';
var objectId = object.basisObjectId;
var computeToken = computeTokenMap[objectId];
if (!computeToken)
computeToken = computeTokenMap[objectId] = new ComputeToken(token, object, handler, getter);
return computeToken;
}
},
/**
* @destructor
*/
destroy: function(){
this.value = null;
this.tmpl = null;
if (this.template)
{
this.template.destroy();
this.template = null;
}
basis.Token.prototype.destroy.call(this);
=======
>>>>>>>
},
set: function(value){
if (value !== this.value)
{
this.value = value;
if (this.template)
this.template.setSource(processMarkup(value));
this.apply();
}
},
setType: function(type){
if (this.type != type)
{
if (this.template)
{
this.template.destroy();
this.template = null;
this.tmpl = null;
}
if (type == 'markup')
{
this.template = new basis.template.html.Template(processMarkup(this.value));
this.tmpl = {};
}
this.type = type;
this.apply();
}
},
attachTemplate: function(object){
var template = this.template;
var tmpl = this.tmpl;
var id = object.basisObjectId;
return tmpl[id] = template.createInstance(object, null, function tmplSync(){
if (tmpl)
template.clearInstance(tmpl[id]);
tmpl[id] = template.createInstance(object, null, tmplSync);
});
},
detachTemplate: function(object){
var template = this.template;
var id = object.basisObjectId;
if (template && id in this.tmpl)
{
template.clearInstance(this.tmpl[id]);
delete this.tmpl[id];
}
},
attach: function(fn, context){
basis.Token.prototype.attach.call(this, fn, context);
if (this.template && context && context.object && context.object instanceof Emitter)
this.attachTemplate(context.object);
},
detach: function(fn, context){
basis.Token.prototype.detach.call(this, fn, context);
if (this.template && context && context.object)
this.detachTemplate(context.object);
},
apply: function(){
var value = this.get();
var cursor = this;
while (cursor = cursor.handlers)
{
var object = cursor.context && cursor.context.object;
if (this.template && object && object instanceof Emitter)
{
var id = object.basisObjectId;
if (id in this.tmpl == false)
this.attachTemplate(object);
cursor.fn.call(cursor.context, this.tmpl[id].element);
}
else
cursor.fn.call(cursor.context, value);
}
},
compute: function(events, getter){
if (arguments.length == 1)
{
getter = events;
events = '';
}
getter = basis.getter(getter);
events = String(events).trim().split(/\s+|\s*,\s*/).sort();
var enumId = events.concat(getter.basisGetterId_).join('_');
if (tokenEnums[enumId])
return tokenEnums[enumId];
var token = this;
var computeTokenMap = {};
var updateValue = function(){
this.evaluate();
};
var handler = {
destroy: function(object){
delete computeTokenMap[object.basisObjectId];
this.destroy();
}
};
for (var i = 0, eventName; eventName = events[i]; i++)
if (eventName != 'destroy')
handler[eventName] = updateValue;
return tokenEnums[enumId] = function(object){
if (object instanceof Emitter == false)
throw 'basis.l10n.Token#compute: object must be an instanceof Emitter';
var objectId = object.basisObjectId;
var computeToken = computeTokenMap[objectId];
if (!computeToken)
computeToken = computeTokenMap[objectId] = new ComputeToken(token, object, handler, getter);
return computeToken;
}
},
/**
* @destructor
*/
destroy: function(){
this.value = null;
this.tmpl = null;
if (this.template)
{
this.template.destroy();
this.template = null;
}
basis.Token.prototype.destroy.call(this); |
<<<<<<<
'date': date,
'candidate': item.cumulative_candidate_receipts,
'pac': item.cumulative_pac_receipts,
'party': item.cumulative_party_receipts
=======
date: date,
candidate: item.cumulative_candidate_receipts,
pac: item.cumulative_pac_receipts,
party: item.cumulative_party_receipts
>>>>>>>
date: date,
candidate: item.cumulative_candidate_receipts,
pac: item.cumulative_pac_receipts,
party: item.cumulative_party_receipts
<<<<<<<
amount = amount || MAX_RANGE;
var y = d3.scale.linear()
.domain([0, Math.ceil(amount / 100000000) * 100000000])
.range([this.height, 0]);
=======
var y = d3.scale
.linear()
.domain([0, Math.ceil(MAX_RANGE / 1000000000) * 1000000000])
.range([this.height, 0]);
>>>>>>>
amount = amount || MAX_RANGE;
var y = d3.scale
.linear()
.domain([0, Math.ceil(amount / 100000000) * 100000000])
.range([this.height, 0]);
<<<<<<<
var y = this.setYScale(maxY);
var xAxis = d3.svg.axis()
.scale(x)
.ticks(d3.time.month)
.tickFormat(this.xAxisFormatter())
.orient('bottom');
var yAxis = d3.svg.axis()
.scale(y)
.orient('right')
.tickSize(this.width)
.tickFormat(function(d) {
return numeral(d).format('($0.0a)');
});
=======
var y = this.setYScale();
var xAxis = d3.svg
.axis()
.scale(x)
.ticks(d3.time.month)
.tickFormat(this.xAxisFormatter())
.orient('bottom');
var yAxis = d3.svg
.axis()
.scale(y)
.orient('right')
.tickSize(this.width)
.tickFormat(function(d) {
return numeral(d).format('($0.0a)');
});
>>>>>>>
var y = this.setYScale(maxY);
var xAxis = d3.svg
.axis()
.scale(x)
.ticks(d3.time.month)
.tickFormat(this.xAxisFormatter())
.orient('bottom');
var yAxis = d3.svg
.axis()
.scale(y)
.orient('right')
.tickSize(this.width)
.tickFormat(function(d) {
return numeral(d).format('($0.0a)');
});
<<<<<<<
svg.append('g')
.attr('class', 'y axis')
.call(yAxis)
.selectAll('text')
.attr('y', -4)
.attr('x', -4)
.attr('dy', '.71em')
.style('text-anchor', 'end');
var lineBuilder = d3.svg.line()
.x(function(d) {
var myDate = new Date(parseMY(d.date));
return x(myDate);
})
.y(function(d) { return y(d.amount); });
=======
svg
.append('g')
.attr('class', 'y axis')
.call(yAxis)
.selectAll('text')
.attr('y', -4)
.attr('x', -4)
.attr('dy', '.71em')
.style('text-anchor', 'end');
var lineBuilder = d3.svg
.line()
.x(function(d) {
return x(d.date);
})
.y(function(d) {
return y(d.amount);
});
>>>>>>>
svg
.append('g')
.attr('class', 'y axis')
.call(yAxis)
.selectAll('text')
.attr('y', -4)
.attr('x', -4)
.attr('dy', '.71em')
.style('text-anchor', 'end');
var lineBuilder = d3.svg
.line()
.x(function(d) {
var myDate = new Date(parseMY(d.date));
return x(myDate);
})
.y(function(d) {
return y(d.amount);
});
<<<<<<<
var myDate = new Date(parseMY(d.date));
return x(myDate);
=======
return x(d.date);
})
.attr('cy', function(d) {
return y(d.amount);
>>>>>>>
var myDate = new Date(parseMY(d.date));
return x(myDate);
})
.attr('cy', function(d) {
return y(d.amount);
<<<<<<<
.attr('x1', 10).attr('x2', 10)
.attr('y1', 0).attr('y2', this.height - 2);
=======
.attr('x1', 10)
.attr('x2', 10)
.attr('y1', 0)
.attr('y2', this.height);
>>>>>>>
.attr('x1', 10)
.attr('x2', 10)
.attr('y1', 0)
.attr('y2', this.height - 2);
<<<<<<<
var myDate = new Date(parseMY(target.date));
this.cursor.attr('x1', this.x(myDate)).attr('x2', this.x(myDate));
this.nextDatum = this.chartData[i+1] || false;
this.prevDatum = this.chartData[i-1] || false;
=======
this.cursor.attr('x1', this.x(target.date)).attr('x2', this.x(target.date));
this.nextDatum = this.chartData[i + 1] || false;
this.prevDatum = this.chartData[i - 1] || false;
>>>>>>>
var myDate = new Date(parseMY(target.date));
this.cursor.attr('x1', this.x(myDate)).attr('x2', this.x(myDate));
this.nextDatum = this.chartData[i + 1] || false;
this.prevDatum = this.chartData[i - 1] || false; |
<<<<<<<
it("bytes()", function () {
var _ = jpacks;
var _schema = jpacks.bytes(6);
print(String(_schema));
assert.equal(printValue, 'array(uint8,6)'); printValue = undefined;
var value = [0, 1, 2, 3, 4, 5];
var buffer = jpacks.pack(_schema, value);
print(buffer.join(' '));
assert.equal(printValue, '0 1 2 3 4 5'); printValue = undefined;
print(JSON.stringify(_.unpack(_schema, buffer)));
assert.equal(printValue, '[0,1,2,3,4,5]'); printValue = undefined;
});
=======
printValue = undefined;
>>>>>>>
printValue = undefined;
it("bytes()", function () {
var _ = jpacks;
var _schema = jpacks.bytes(6);
print(String(_schema));
assert.equal(printValue, 'array(uint8,6)'); printValue = undefined;
var value = [0, 1, 2, 3, 4, 5];
var buffer = jpacks.pack(_schema, value);
print(buffer.join(' '));
assert.equal(printValue, '0 1 2 3 4 5'); printValue = undefined;
print(JSON.stringify(_.unpack(_schema, buffer)));
assert.equal(printValue, '[0,1,2,3,4,5]'); printValue = undefined;
}); |
<<<<<<<
Template.createEvent.events({
'click button': function() {
var nameInput = $("#nameInput");
var name = nameInput.val();
var lineInput = $("#lineInput");
var line = lineInput.val();
var locationInput = $("#locationInput");
var location = locationInput.val();
var votes = 0;
new Event(name, line, location, votes).save();
}
});
=======
Template.event.events({
// Upvote the current event
"click .upvote": function () {
Events.update(this._id, {$inc: {votes: 1}});
},
// Downvote the current event
"click .downvote": function () {
Events.update(this._id, {$inc: {votes: -1}});
}
});
>>>>>>>
Template.createEvent.events({
'click button': function() {
var nameInput = $("#nameInput");
var name = nameInput.val();
var lineInput = $("#lineInput");
var line = lineInput.val();
var locationInput = $("#locationInput");
var location = locationInput.val();
var votes = 0;
new Event(name, line, location, votes).save();
}
});
Template.event.events({
// Upvote the current event
"click .upvote": function () {
Events.update(this._id, {$inc: {votes: 1}});
},
// Downvote the current event
"click .downvote": function () {
Events.update(this._id, {$inc: {votes: -1}});
}
}); |
<<<<<<<
router.get('/forgotusername', function(req, res, next) {
if(req.user) {
res.redirect('/users/me');
}
else {
res.render('forgotusername/forgotusername', {title: "Resetusername | OneAuth"});
}
});
router.get('/forgotusername/inter', function(req, res, next) {
if(req.user) {
res.redirect('/users/me');
}
else {
res.render('forgotusername/inter', {title: "Resetusername | OneAuth"});
}
});
=======
router.get('/forgotpassword' , function (req , res , next) {
if(req.user) {
res.redirect('/');
}
else {
res.render('resetpassword/resetpassword',{title: "Resetpassword | OneAuth"});
}
});
router.get('/forgotpassword/inter' , function (req , res , next) {
if(req.user) {
res.redirect('/');
}
else {
res.render('resetpassword/inter',{title: "Resetinter | OneAuth"});
}
});
router.get('/setnewpassword/:key' , function (req , res , next) {
if(req.user) {
res.redirect('/');
}
else {
res.render('resetpassword/setnewpassword',{title: "Setnewpassword | OneAuth" , key:req.params.key});
}
});
>>>>>>>
router.get('/forgotusername', function(req, res, next) {
if(req.user) {
res.redirect('/users/me');
}
else {
res.render('forgotusername/forgotusername', {title: "Resetusername | OneAuth"});
}
});
router.get('/forgotusername/inter', function(req, res, next) {
if(req.user) {
res.redirect('/users/me');
}
else {
res.render('forgotusername/inter', {title: "Resetusername | OneAuth"});
}
});
router.get('/forgotpassword' , function (req , res , next) {
if(req.user) {
res.redirect('/');
}
else {
res.render('resetpassword/resetpassword',{title: "Resetpassword | OneAuth"});
}
});
router.get('/forgotpassword/inter' , function (req , res , next) {
if(req.user) {
res.redirect('/');
}
else {
res.render('resetpassword/inter',{title: "Resetinter | OneAuth"});
}
});
router.get('/setnewpassword/:key' , function (req , res , next) {
if(req.user) {
res.redirect('/');
}
else {
res.render('resetpassword/setnewpassword',{title: "Setnewpassword | OneAuth" , key:req.params.key});
}
}); |
<<<<<<<
if (req.user && req.user.id && req.params.id === req.user.id) {
return res.send(req.user)
=======
if (req.user) {
if (req.params.id == req.user.id) {
return res.send(req.user)
}
>>>>>>>
if (req.user && req.user.id) {
if (req.params.id == req.user.id) {
return res.send(req.user)
}
<<<<<<<
// But for trusted clients we will pull down our pants
attributes: trustedClient ? undefined: ['id', 'username', 'photo'],
where: {id: req.params.id}
=======
attributes: ['id', 'username', 'photo'],
where: {id: req.params.id},
>>>>>>>
// But for trusted clients we will pull down our pants
attributes: trustedClient ? undefined: ['id', 'username', 'photo'],
where: {id: req.params.id} |
<<<<<<<
=======
var filterTags = require('fec-style/js/filter-tags');
var helpers = require('fec-style/js/helpers');
>>>>>>>
var filterTags = require('fec-style/js/filter-tags');
<<<<<<<
var filterPanel = new FilterPanel('#filters');
=======
var filterPanel = new FilterPanel();
// Initialize filter tags
var $widgets = $('.js-data-widgets');
var $tagList = new filterTags.TagList({title: 'All records'}).$body;
$widgets.prepend($tagList);
>>>>>>>
var filterPanel = new FilterPanel();
// Initialize filter tags
var $widgets = $('.js-data-widgets');
var $tagList = new filterTags.TagList({title: 'All records'}).$body;
$widgets.prepend($tagList); |
<<<<<<<
25-10-2017 - Adjust t202p to account for nerfs
=======
22-10-2017 - Updated suggestions overall, added avatar, removed Cyclonic Burst Impact from cooldown tracker, added suggestion to TimeFocusCapped, updated AlwaysBeCasting and CastEfficiency. (by Putro)
>>>>>>>
25-10-2017 - Adjust t202p to account for nerfs
22-10-2017 - Updated suggestions overall, added avatar, removed Cyclonic Burst Impact from cooldown tracker, added suggestion to TimeFocusCapped, updated AlwaysBeCasting and CastEfficiency. (by Putro) |
<<<<<<<
Object.entries(state.messages.cache).forEach(e => {
newState.messages.cache[e[0]] = Array.from(e[1].values());
});
// Encrypt state
=======
// Object.entries(state.messages.cache).forEach(e => {
// newState.messages.cache[e[0]] = Array.from(e[1].values());
// });
>>>>>>>
// Object.entries(state.messages.cache).forEach(e => {
// newState.messages.cache[e[0]] = Array.from(e[1].values());
// });
// Encrypt state |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
this.setState({type: this.props.schema.type})
>>>>>>>
<<<<<<<
this.props.changeTypeAction([key], value)
=======
this.setState({type: value})
this.props.changeTypeAction([key], value)
>>>>>>>
this.props.changeTypeAction([key], value) |
<<<<<<<
var cache$2, compile, expression, parent;
{
cache$2 = param$;
expression = cache$2.expression;
compile = cache$2.compile;
}
parent = arguments[0].ancestry[0];
this.isFunctionContext = parent['instanceof'](CS.FunctionApplications) && parent['function'] === this;
if (hasSoak(this)) {
return expr(compile(generateSoak(this)));
} else if (this.isAssignment || this.isFunctionContext || expression['instanceof'](JS.Literal) || parent['instanceof'](CS.DeleteOp) || expression.name === 'Ember') {
return memberAccess(expression, this.memberName);
} else {
return helpers.get(expression, new JS.Literal(this.memberName));
}
}
],
[
CS.NativeMemberAccessOp,
function (param$) {
var cache$2, compile, expression;
=======
var access, cache$2, compile, expression, offset;
>>>>>>>
var cache$2, compile, expression, parent;
{
cache$2 = param$;
expression = cache$2.expression;
compile = cache$2.compile;
}
parent = arguments[0].ancestry[0];
this.isFunctionContext = parent['instanceof'](CS.FunctionApplications) && parent['function'] === this;
if (hasSoak(this)) {
return expr(compile(generateSoak(this)));
} else if (this.isAssignment || this.isFunctionContext || expression['instanceof'](JS.Literal) || parent['instanceof'](CS.DeleteOp) || expression.name === 'Ember') {
return memberAccess(expression, this.memberName);
} else {
return helpers.get(expression, new JS.Literal(this.memberName));
}
}
],
[
CS.NativeMemberAccessOp,
function (param$) {
var access, cache$2, compile, expression, offset; |
<<<<<<<
- RQ-4: RFAI referencing Independent Expenditure filer
=======
Exclude quarterly report_types so F5 quarterlies don't appear
>>>>>>>
- RQ-4: RFAI referencing Independent Expenditure filer
Exclude quarterly report_types so F5 quarterlies don't appear |
<<<<<<<
// Generated by CoffeeScript 2.0.0-beta8-dev
var any, assignment, beingDeclared, collectIdentifiers, concat, concatMap, CS, declarationsNeeded, declarationsNeededRecursive, difference, divMod, dynamicMemberAccess, emberComputedProperty, enabledHelpers, envEnrichments, exports, expr, fn, fn, foldl1, forceBlock, forceComputedProperty, generateMutatingWalker, generateSoak, genSym, h, h, hasSoak, helperNames, helpers, inlineHelpers, isIdentifierName, JS, jsReserved, makeReturn, makeVarDeclaration, map, memberAccess, needsCaching, nub, owns, partition, span, stmt, union, usedAsExpression;
=======
// Generated by CoffeeScript 2.0.0-beta9-dev
var any, assignment, beingDeclared, collectIdentifiers, concat, concatMap, CS, declarationsNeeded, declarationsNeededRecursive, defaultRules, difference, divMod, dynamicMemberAccess, enabledHelpers, envEnrichments, exports, expr, fn, fn, foldl1, forceBlock, generateMutatingWalker, generateSoak, genSym, h, h, hasSoak, helperNames, helpers, inlineHelpers, intersect, isIdentifierName, JS, jsReserved, makeReturn, makeVarDeclaration, map, memberAccess, needsCaching, nub, owns, partition, span, stmt, union, usedAsExpression, variableDeclarations;
>>>>>>>
// Generated by CoffeeScript 2.0.0-beta9-dev
var any, assignment, beingDeclared, collectIdentifiers, concat, concatMap, CS, declarationsNeeded, declarationsNeededRecursive, defaultRules, difference, divMod, dynamicMemberAccess, emberComputedProperty, enabledHelpers, envEnrichments, exports, expr, fn, fn, foldl1, forceBlock, forceComputedProperty, generateMutatingWalker, generateSoak, genSym, h, h, hasSoak, helperNames, helpers, inlineHelpers, intersect, isIdentifierName, JS, jsReserved, makeReturn, makeVarDeclaration, map, memberAccess, needsCaching, nub, owns, partition, span, stmt, union, usedAsExpression, variableDeclarations;
<<<<<<<
var args, cache$2, computed, expression, key, keyName, observes, volatile;
=======
var cache$2, expression, keyName;
var key;
>>>>>>>
var args, cache$2, computed, keyName, observes, volatile;
var expression, key;
<<<<<<<
var alternate, ancestry, block, body, cache$2, chains, consequent, i, index, last, newThis, numArgs, numParams, p, parameters, parameters_, paramName, performedRewrite, pIndex, reassignments, rewriteThis, test;
=======
var alternate, ancestry, block, cache$2, consequent, i, index, inScope, last, newThis, numArgs, numParams, p, parameters_, paramName, performedRewrite, pIndex, reassignments, rewriteThis, test;
var body, parameters;
>>>>>>>
var alternate, ancestry, block, cache$2, chains, consequent, i, index, inScope, last, newThis, numArgs, numParams, p, parameters_, paramName, performedRewrite, pIndex, reassignments, rewriteThis, test;
var body, parameters;
<<<<<<<
var args, body, cache$2, compile, ctor, extendArgs, iife, mixins, name, nameAssignee, params, parent, parentExpr, parentRef;
=======
var _, args, block, body, c, cache$2, compile, ctorBody, ctorIndex, ctorRef, i, iife, instance, member, memberName, nameAssignee, params, parent, parentRef, protoAssignOp, protoMember, ps, rewriteThis;
var ctor, name;
>>>>>>>
var args, body, cache$2, compile, ctor, extendArgs, iife, mixins, name, nameAssignee, params, parent, parentExpr, parentRef;
<<<<<<<
extendArgs = mixins;
if (body)
extendArgs.push(body);
parentExpr = null != parent ? parent : memberAccess(new JS.Identifier('Ember'), 'Object');
iife = new JS.CallExpression(memberAccess(parentExpr, 'extend'), extendArgs);
=======
block = forceBlock(body);
if (name['instanceof'](JS.Identifier) && in$(name.name, jsReserved))
name = genSym(name.name);
if (null != ctor) {
for (var i$ = 0, length$ = block.body.length; i$ < length$; ++i$) {
c = block.body[i$];
i = i$;
if (!c['instanceof'](JS.FunctionDeclaration))
continue;
ctorIndex = i;
break;
}
block.body.splice(ctorIndex, 1, ctor);
} else {
ctorBody = new JS.BlockStatement([]);
if (null != parent)
ctorBody.body.push(stmt(new JS.CallExpression(memberAccess(parentRef, 'apply'), [
new JS.ThisExpression,
new JS.Identifier('arguments')
])));
ctor = new JS.FunctionDeclaration(name, [], ctorBody);
ctorIndex = 0;
block.body.unshift(ctor);
}
ctor.id = name;
if (null != this.ctor && !this.ctor.expression['instanceof'](CS.Functions)) {
ctorRef = genSym('externalCtor');
ctor.body.body.push(makeReturn(new JS.CallExpression(memberAccess(ctorRef, 'apply'), [
new JS.ThisExpression,
new JS.Identifier('arguments')
])));
block.body.splice(ctorIndex, 0, stmt(new JS.AssignmentExpression('=', ctorRef, expr(compile(this.ctor.expression)))));
}
if (this.boundMembers.length > 0) {
instance = genSym('instance');
for (var i$1 = 0, length$1 = this.boundMembers.length; i$1 < length$1; ++i$1) {
protoAssignOp = this.boundMembers[i$1];
memberName = protoAssignOp.assignee.data.toString();
ps = function (accum$) {
for (var i$2 = 0, length$2 = protoAssignOp.expression.parameters.length; i$2 < length$2; ++i$2) {
_ = protoAssignOp.expression.parameters[i$2];
accum$.push(genSym());
}
return accum$;
}.call(this, []);
member = memberAccess(new JS.ThisExpression, memberName);
protoMember = memberAccess(memberAccess(name, 'prototype'), memberName);
fn = new JS.FunctionExpression(null, ps, new JS.BlockStatement([makeReturn(new JS.CallExpression(memberAccess(protoMember, 'apply'), [
instance,
new JS.Identifier('arguments')
]))]));
ctor.body.body.unshift(stmt(new JS.AssignmentExpression('=', member, fn)));
}
ctor.body.body.unshift(stmt(new JS.AssignmentExpression('=', instance, new JS.ThisExpression)));
}
if (null != parent) {
params.push(parentRef);
args.push(parent);
block.body.unshift(stmt(helpers['extends'](name, parentRef)));
}
block.body.push(new JS.ReturnStatement(new JS.ThisExpression));
rewriteThis = generateMutatingWalker(function () {
if (this['instanceof'](JS.ThisExpression)) {
return name;
} else if (this['instanceof'](JS.FunctionExpression, JS.FunctionDeclaration)) {
return this;
} else {
return rewriteThis(this);
}
});
rewriteThis(block);
iife = new JS.CallExpression(new JS.FunctionExpression(null, params, block).g(), args);
>>>>>>>
extendArgs = mixins;
if (body)
extendArgs.push(body);
parentExpr = null != parent ? parent : memberAccess(new JS.Identifier('Ember'), 'Object');
iife = new JS.CallExpression(memberAccess(parentExpr, 'extend'), extendArgs);
<<<<<<<
var child, childName, children, jsNode;
if ((null != ancestry[0] ? ancestry[0]['instanceof'](CS.Function, CS.BoundFunction, CS.ComputedProperty) : void 0) && this === ancestry[0].body)
=======
var child, childName, children, jsNode, member;
if ((null != ancestry[0] ? ancestry[0]['instanceof'](CS.Function, CS.BoundFunction) : void 0) && this === ancestry[0].body)
>>>>>>>
var child, childName, children, jsNode, member;
if ((null != ancestry[0] ? ancestry[0]['instanceof'](CS.Function, CS.BoundFunction, CS.ComputedProperty) : void 0) && this === ancestry[0].body) |
<<<<<<<
[CS.ArrayInitialiser, CS.Mixin, CS.Class, CS.DeleteOp, CS.ForIn, CS.ForOf, CS.Function, CS.BoundFunction, CS.HeregExp, CS.ObjectInitialiser, CS.Range, CS.RegExp, CS.Slice, CS.TypeofOp, CS.While], function() {
=======
CS.ArrayInitialiser,
CS.Class,
CS.DeleteOp,
CS.ForIn,
CS.ForOf,
CS.Function,
CS.BoundFunction,
CS.HeregExp,
CS.ObjectInitialiser,
CS.Range,
CS.RegExp,
CS.Slice,
CS.TypeofOp,
CS.While,
function () {
>>>>>>>
CS.ArrayInitialiser,
CS.Mixin,
CS.Class,
CS.DeleteOp,
CS.ForIn,
CS.ForOf,
CS.Function,
CS.BoundFunction,
CS.HeregExp,
CS.ObjectInitialiser,
CS.Range,
CS.RegExp,
CS.Slice,
CS.TypeofOp,
CS.While,
function () {
<<<<<<<
], [
[CS.Mixin], function(inScope) {
return (this.nameAssignee != null) && (this.name || (beingDeclared(this.nameAssignee)).length > 0);
}
], [
[CS.Class], function(inScope) {
return (mayHaveSideEffects(this.parent, inScope)) || (this.nameAssignee != null) && (this.name || (beingDeclared(this.nameAssignee)).length > 0);
=======
],
[
CS.Class,
function (inScope) {
return mayHaveSideEffects(this.parent, inScope) || null != this.nameAssignee && (this.name || beingDeclared(this.nameAssignee).length > 0);
>>>>>>>
],
[
CS.Class,
CS.Mixin,
function (inScope) {
return mayHaveSideEffects(this.parent, inScope) || null != this.nameAssignee && (this.name || beingDeclared(this.nameAssignee).length > 0); |
<<<<<<<
// Generated by CoffeeScript 2.0.0-dev
var any, assignment, beingDeclared, collectIdentifiers, concat, concatMap, CS, declarationsNeeded, declarationsNeededRecursive, difference, divMod, dynamicMemberAccess, emberComputedProperty, enabledHelpers, envEnrichments, exports, expr, fn, fn, foldl1, forceBlock, forceComputedProperty, generateMutatingWalker, generateSoak, genSym, h, h, hasSoak, helperNames, helpers, inlineHelpers, isIdentifierName, JS, jsReserved, makeReturn, makeVarDeclaration, map, memberAccess, needsCaching, nub, owns, partition, span, stmt, union, usedAsExpression;
=======
// Generated by CoffeeScript 2.0.0-beta8-dev
var any, assignment, beingDeclared, collectIdentifiers, concat, concatMap, CS, declarationsNeeded, declarationsNeededRecursive, difference, divMod, dynamicMemberAccess, enabledHelpers, envEnrichments, exports, expr, fn, fn, foldl1, forceBlock, generateMutatingWalker, generateSoak, genSym, h, h, hasSoak, helperNames, helpers, inlineHelpers, isIdentifierName, JS, jsReserved, makeReturn, makeVarDeclaration, map, memberAccess, needsCaching, nub, owns, partition, span, stmt, union, usedAsExpression;
>>>>>>>
// Generated by CoffeeScript 2.0.0-dev
var any, assignment, beingDeclared, collectIdentifiers, concat, concatMap, CS, declarationsNeeded, declarationsNeededRecursive, difference, divMod, dynamicMemberAccess, emberComputedProperty, enabledHelpers, envEnrichments, exports, expr, fn, fn, foldl1, forceBlock, forceComputedProperty, generateMutatingWalker, generateSoak, genSym, h, h, hasSoak, helperNames, helpers, inlineHelpers, isIdentifierName, JS, jsReserved, makeReturn, makeVarDeclaration, map, memberAccess, needsCaching, nub, owns, partition, span, stmt, union, usedAsExpression;
<<<<<<<
if (performedRewrite)
fn = new JS.SequenceExpression([
new JS.AssignmentExpression('=', newThis, new JS.ThisExpression),
fn
]);
if (this['instanceof'](CS.ComputedProperty)) {
chains = Ember.A(this.dependentKeys().map(function (c) {
return c.join('.');
})).uniq();
return emberComputedProperty(fn, chains);
=======
if (performedRewrite) {
return new JS.CallExpression(new JS.FunctionExpression(null, [newThis], new JS.BlockStatement([new JS.ReturnStatement(fn)])), [new JS.ThisExpression]);
>>>>>>>
if (performedRewrite)
new JS.CallExpression(new JS.FunctionExpression(null, [newThis], new JS.BlockStatement([new JS.ReturnStatement(fn)])), [new JS.ThisExpression]);
if (this['instanceof'](CS.ComputedProperty)) {
chains = Ember.A(this.dependentKeys().map(function (c) {
return c.join('.');
})).uniq();
return emberComputedProperty(fn, chains);
<<<<<<<
var args, body, cache$2, compile, ctor, extendArgs, iife, mixins, name, nameAssignee, params, parent, parentExpr, parentRef;
=======
var args, block, body, c, cache$2, compile, ctor, ctorBody, ctorIndex, ctorRef, i, iife, instance, member, memberName, name, nameAssignee, params, parent, parentRef, protoAssignOp, protoMember, ps, rewriteThis;
>>>>>>>
var args, body, cache$2, compile, ctor, extendArgs, iife, mixins, name, nameAssignee, params, parent, parentExpr, parentRef;
<<<<<<<
extendArgs = mixins;
if (body)
extendArgs.push(body);
parentExpr = null != parent ? parent : memberAccess(new JS.Identifier('Ember'), 'Object');
iife = new JS.CallExpression(memberAccess(parentExpr, 'extend'), extendArgs);
=======
block = forceBlock(body);
if (name['instanceof'](JS.Identifier) && in$(name.name, jsReserved))
name = genSym(name.name);
if (null != ctor) {
for (var i$ = 0, length$ = block.body.length; i$ < length$; ++i$) {
c = block.body[i$];
i = i$;
if (!c['instanceof'](JS.FunctionDeclaration))
continue;
ctorIndex = i;
break;
}
block.body.splice(ctorIndex, 1, ctor);
} else {
ctorBody = new JS.BlockStatement([]);
if (null != parent)
ctorBody.body.push(stmt(new JS.CallExpression(memberAccess(parentRef, 'apply'), [
new JS.ThisExpression,
new JS.Identifier('arguments')
])));
ctor = new JS.FunctionDeclaration(name, [], ctorBody);
ctorIndex = 0;
block.body.unshift(ctor);
}
ctor.id = name;
if (null != this.ctor && !this.ctor.expression['instanceof'](CS.Functions)) {
ctorRef = genSym('externalCtor');
ctor.body.body.push(makeReturn(new JS.CallExpression(memberAccess(ctorRef, 'apply'), [
new JS.ThisExpression,
new JS.Identifier('arguments')
])));
block.body.splice(ctorIndex, 0, stmt(new JS.AssignmentExpression('=', ctorRef, expr(compile(this.ctor.expression)))));
}
if (this.boundMembers.length > 0) {
instance = genSym('instance');
for (var i$1 = 0, length$1 = this.boundMembers.length; i$1 < length$1; ++i$1) {
protoAssignOp = this.boundMembers[i$1];
memberName = protoAssignOp.assignee.data.toString();
ps = function (accum$) {
var _;
for (var i$2 = 0, length$2 = protoAssignOp.expression.parameters.length; i$2 < length$2; ++i$2) {
_ = protoAssignOp.expression.parameters[i$2];
accum$.push(genSym());
}
return accum$;
}.call(this, []);
member = memberAccess(new JS.ThisExpression, memberName);
protoMember = memberAccess(memberAccess(name, 'prototype'), memberName);
fn = new JS.FunctionExpression(null, ps, new JS.BlockStatement([makeReturn(new JS.CallExpression(memberAccess(protoMember, 'apply'), [
instance,
new JS.Identifier('arguments')
]))]));
ctor.body.body.unshift(stmt(new JS.AssignmentExpression('=', member, fn)));
}
ctor.body.body.unshift(stmt(new JS.AssignmentExpression('=', instance, new JS.ThisExpression)));
}
if (null != parent) {
params.push(parentRef);
args.push(parent);
block.body.unshift(stmt(helpers['extends'](name, parentRef)));
}
block.body.push(new JS.ReturnStatement(new JS.ThisExpression));
rewriteThis = generateMutatingWalker(function () {
if (this['instanceof'](JS.ThisExpression)) {
return name;
} else if (this['instanceof'](JS.FunctionExpression, JS.FunctionDeclaration)) {
return this;
} else {
return rewriteThis(this);
}
});
rewriteThis(block);
iife = new JS.CallExpression(new JS.FunctionExpression(null, params, block), args);
>>>>>>>
extendArgs = mixins;
if (body)
extendArgs.push(body);
parentExpr = null != parent ? parent : memberAccess(new JS.Identifier('Ember'), 'Object');
iife = new JS.CallExpression(memberAccess(parentExpr, 'extend'), extendArgs); |
<<<<<<<
// Generated by CoffeeScript 1.3.3
var CS, JS, any, assignment, beingDeclared, collectIdentifiers, concat, concatMap, declarationsNeeded, declarationsNeededRecursive, difference, divMod, dynamicMemberAccess, emberSet, enabledHelpers, envEnrichments, exports, expr, fn, foldl1, forceBlock, genSym, generateMutatingWalker, h, helperNames, helpers, inlineHelpers, jsReserved, makeReturn, makeVarDeclaration, map, memberAccess, needsCaching, nub, owns, span, stmt, union, usedAsExpression, _ref, _ref1, _ref2,
__slice = [].slice,
__indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
__hasProp = {}.hasOwnProperty;
_ref = require('./functional-helpers'), any = _ref.any, concat = _ref.concat, concatMap = _ref.concatMap, difference = _ref.difference, divMod = _ref.divMod, foldl1 = _ref.foldl1, map = _ref.map, nub = _ref.nub, owns = _ref.owns, span = _ref.span, union = _ref.union;
_ref1 = require('./helpers'), beingDeclared = _ref1.beingDeclared, usedAsExpression = _ref1.usedAsExpression, envEnrichments = _ref1.envEnrichments;
=======
// Generated by CoffeeScript 2.0.0-dev
var any, assignment, beingDeclared, collectIdentifiers, concat, concatMap, CS, declarationsNeeded, declarationsNeededRecursive, difference, divMod, dynamicMemberAccess, enabledHelpers, envEnrichments, exports, expr, fn, fn, foldl1, forceBlock, generateMutatingWalker, generateSoak, genSym, h, h, hasSoak, helperNames, helpers, inlineHelpers, JS, jsReserved, makeReturn, makeVarDeclaration, map, memberAccess, needsCaching, nub, owns, span, stmt, union, usedAsExpression;
cache$ = require('./functional-helpers');
any = cache$.any;
concat = cache$.concat;
concatMap = cache$.concatMap;
difference = cache$.difference;
divMod = cache$.divMod;
foldl1 = cache$.foldl1;
map = cache$.map;
nub = cache$.nub;
owns = cache$.owns;
span = cache$.span;
union = cache$.union;
cache$1 = require('./helpers');
beingDeclared = cache$1.beingDeclared;
usedAsExpression = cache$1.usedAsExpression;
envEnrichments = cache$1.envEnrichments;
>>>>>>>
// Generated by CoffeeScript 2.0.0-dev
var any, assignment, beingDeclared, collectIdentifiers, concat, concatMap, CS, declarationsNeeded, declarationsNeededRecursive, difference, divMod, dynamicMemberAccess, emberSet, enabledHelpers, envEnrichments, exports, expr, fn, fn, foldl1, forceBlock, generateMutatingWalker, generateSoak, genSym, h, h, hasSoak, helperNames, helpers, inlineHelpers, JS, jsReserved, makeReturn, makeVarDeclaration, map, memberAccess, needsCaching, nub, owns, span, stmt, union, usedAsExpression;
cache$ = require('./functional-helpers');
any = cache$.any;
concat = cache$.concat;
concatMap = cache$.concatMap;
difference = cache$.difference;
divMod = cache$.divMod;
foldl1 = cache$.foldl1;
map = cache$.map;
nub = cache$.nub;
owns = cache$.owns;
span = cache$.span;
union = cache$.union;
cache$1 = require('./helpers');
beingDeclared = cache$1.beingDeclared;
usedAsExpression = cache$1.usedAsExpression;
envEnrichments = cache$1.envEnrichments;
<<<<<<<
emberSet = function(assignee, property, expression) {
return new JS.CallExpression(memberAccess(new JS.Identifier('Ember'), 'set'), [assignee, property, expression]);
};
assignment = function(assignee, expression, valueUsed) {
var alternate, assignments, consequent, e, elements, i, index, m, numElements, p, propName, property, restName, size, test, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref3, _ref4;
if (valueUsed == null) {
=======
assignment = function (assignee, expression, valueUsed) {
var alternate, assignments, consequent, e, elements, i, index, m, numElements, p, propName, restName, size, test;
if (null == valueUsed)
>>>>>>>
emberSet = function (assignee, property, expression) {
return new JS.CallExpression(memberAccess(new JS.Identifier('Ember'), 'set'), [
assignee,
property,
expression
]);
};
assignment = function (assignee, expression, valueUsed) {
var alternate, assignments, consequent, e, elements, i, index, m, numElements, p, property, propName, restName, size, test;
if (null == valueUsed)
<<<<<<<
}))) {
throw new Error('Positional destructuring assignments may not have more than one rest operator');
}
}
break;
case !assignee["instanceof"](JS.ObjectExpression):
e = expression;
if (valueUsed || assignee.properties.length > 1) {
e = genSym('cache');
assignments.push(new JS.AssignmentExpression('=', e, expression));
}
_ref4 = assignee.properties;
for (_l = 0, _len3 = _ref4.length; _l < _len3; _l++) {
m = _ref4[_l];
propName = m.key["instanceof"](JS.Identifier) ? new JS.Literal(m.key.name) : m.key;
assignments.push(assignment(m.value, dynamicMemberAccess(e, propName), valueUsed));
}
break;
case !assignee["instanceof"](JS.Identifier, JS.GenSym):
assignments.push(new JS.AssignmentExpression('=', assignee, expr(expression)));
break;
case !assignee["instanceof"](JS.MemberExpression):
property = assignee.computed ? assignee.property : new JS.Literal(assignee.property.name);
assignments.push(emberSet(assignee.object, property, expr(expression)));
break;
default:
throw new Error("compile: assignment: unassignable assignee: " + assignee.type);
=======
}))
throw new Error('Positional destructuring assignments may not have more than one rest operator');
}
break;
case !assignee['instanceof'](JS.ObjectExpression):
e = expression;
if (valueUsed || assignee.properties.length > 1) {
e = genSym('cache');
assignments.push(new JS.AssignmentExpression('=', e, expression));
}
for (var i$3 = 0, length$3 = assignee.properties.length; i$3 < length$3; ++i$3) {
m = assignee.properties[i$3];
propName = m.key['instanceof'](JS.Identifier) ? new JS.Literal(m.key.name) : m.key;
assignments.push(assignment(m.value, dynamicMemberAccess(e, propName), valueUsed));
}
break;
case !assignee['instanceof'](JS.Identifier, JS.GenSym, JS.MemberExpression):
assignments.push(new JS.AssignmentExpression('=', assignee, expr(expression)));
break;
default:
throw new Error('compile: assignment: unassignable assignee: ' + assignee.type);
>>>>>>>
}))
throw new Error('Positional destructuring assignments may not have more than one rest operator');
}
break;
case !assignee['instanceof'](JS.ObjectExpression):
e = expression;
if (valueUsed || assignee.properties.length > 1) {
e = genSym('cache');
assignments.push(new JS.AssignmentExpression('=', e, expression));
}
for (var i$3 = 0, length$3 = assignee.properties.length; i$3 < length$3; ++i$3) {
m = assignee.properties[i$3];
propName = m.key['instanceof'](JS.Identifier) ? new JS.Literal(m.key.name) : m.key;
assignments.push(assignment(m.value, dynamicMemberAccess(e, propName), valueUsed));
}
break;
case !assignee['instanceof'](JS.Identifier, JS.GenSym):
assignments.push(new JS.AssignmentExpression('=', assignee, expr(expression)));
break;
case !assignee['instanceof'](JS.MemberExpression):
property = assignee.computed ? assignee.property : new JS.Literal(assignee.property.name);
assignments.push(emberSet(assignee.object, property, expr(expression)));
break;
default:
throw new Error('compile: assignment: unassignable assignee: ' + assignee.type);
<<<<<<<
], [
CS.Mixin, function(_arg) {
var body, compile, createArgs, iife, mixinExpr, name, nameAssignee;
nameAssignee = _arg.nameAssignee, name = _arg.name, body = _arg.body, compile = _arg.compile;
createArgs = this.mixins.map(function(mixin) {
return new JS.Identifier(mixin);
});
if (body) {
createArgs.push(body);
}
mixinExpr = memberAccess(new JS.Identifier('Ember'), 'Mixin');
iife = new JS.CallExpression(memberAccess(mixinExpr, 'create'), createArgs);
if (nameAssignee != null) {
return assignment(nameAssignee, iife);
} else {
return iife;
}
}
], [
CS.Class, function(_arg) {
var args, body, compile, ctor, extendArgs, iife, name, nameAssignee, params, parent, parentExpr, parentRef;
nameAssignee = _arg.nameAssignee, parent = _arg.parent, name = _arg.name, ctor = _arg.ctor, body = _arg.body, compile = _arg.compile;
=======
],
[
CS.Class,
function (param$) {
var args, block, body, c, cache$2, compile, ctor, ctorIndex, ctorRef, i, iife, instance, member, memberName, name, nameAssignee, params, parent, parentRef, protoAssignOp, protoMember, ps, rewriteThis;
{
cache$2 = param$;
nameAssignee = cache$2.nameAssignee;
parent = cache$2.parent;
name = cache$2.name;
ctor = cache$2.ctor;
body = cache$2.body;
compile = cache$2.compile;
}
>>>>>>>
],
[
CS.Mixin,
function (param$) {
var body, cache$2, compile, createArgs, iife, mixinExpr, name, nameAssignee;
{
cache$2 = param$;
nameAssignee = cache$2.nameAssignee;
name = cache$2.name;
body = cache$2.body;
compile = cache$2.compile;
}
createArgs = this.mixins.map(function (mixin) {
return new JS.Identifier(mixin);
});
if (body)
createArgs.push(body);
mixinExpr = memberAccess(new JS.Identifier('Ember'), 'Mixin');
iife = new JS.CallExpression(memberAccess(mixinExpr, 'create'), createArgs);
if (null != nameAssignee) {
return assignment(nameAssignee, iife);
} else {
return iife;
}
}
],
[
CS.Class,
function (param$) {
var args, body, cache$2, compile, ctor, extendArgs, iife, name, nameAssignee, params, parent, parentExpr, parentRef;
{
cache$2 = param$;
nameAssignee = cache$2.nameAssignee;
parent = cache$2.parent;
name = cache$2.name;
ctor = cache$2.ctor;
body = cache$2.body;
compile = cache$2.compile;
} |
<<<<<<<
this.formatParserError = function(input, e) {
var currentLineOffset, found, lines, message, numLinesOfContext, numberedLines, padSize, postLines, preLines, startLine;
numLinesOfContext = 3;
if (e.found != null) {
lines = input.split('\n');
currentLineOffset = e.line - 1;
startLine = currentLineOffset - numLinesOfContext;
if (startLine < 0) {
startLine = 0;
}
preLines = lines.slice(startLine, currentLineOffset + 1 || 9e9);
postLines = lines.slice(currentLineOffset + 1, (currentLineOffset + numLinesOfContext) + 1 || 9e9);
numberedLines = (numberLines(cleanMarkers(__slice.call(preLines).concat(__slice.call(postLines)).join('\n')), startLine + 1)).split('\n');
preLines = numberedLines.slice(0, preLines.length);
postLines = numberedLines.slice(preLines.length);
e.column = (cleanMarkers(("" + lines[currentLineOffset] + "\n").slice(0, e.column))).length;
}
found = e.found != null ? "'" + ((((JSON.stringify(humanReadable(e.found))).replace(/^"|"$/g, '')).replace(/'/g, '\\\'')).replace(/\\"/g, '"')) + "'" : 'end of input';
message = "Syntax error on line " + e.line + ", column " + e.column + ": unexpected " + found;
if (e.found != null) {
padSize = ((currentLineOffset + 1 + postLines.length).toString(10)).length;
message = [message].concat(__slice.call(preLines), ["" + ((Array(padSize + 1)).join('^')) + " :~" + ((Array(e.column)).join('~')) + "^"], __slice.call(postLines)).join('\n');
}
return message;
=======
this.formatParserError = function (input, e) {
var found, message, realColumn, unicode;
realColumn = cleanMarkers(('' + input.split('\n')[e.line - 1] + '\n').slice(0, e.column)).length;
if (!(null != e.found))
return 'Syntax error on line ' + e.line + ', column ' + realColumn + ': unexpected end of input';
found = JSON.stringify(humanReadable(e.found));
found = found.replace(/^"|"$/g, '').replace(/'/g, "\\'").replace(/\\"/g, '"');
unicode = e.found.charCodeAt(0).toString(16).toUpperCase();
unicode = '\\u' + '0000'.slice(unicode.length) + unicode;
message = 'Syntax error on line ' + e.line + ', column ' + realColumn + ": unexpected '" + found + "' (" + unicode + ')';
return '' + message + '\n' + pointToErrorLocation(input, e.line, realColumn);
};
this.pointToErrorLocation = pointToErrorLocation = function (source, line, column, numLinesOfContext) {
var currentLineOffset, lines, numberedLines, padSize, postLines, preLines, startLine;
if (null == numLinesOfContext)
numLinesOfContext = 3;
lines = source.split('\n');
currentLineOffset = line - 1;
startLine = currentLineOffset - numLinesOfContext;
if (startLine < 0)
startLine = 0;
preLines = lines.slice(startLine, +currentLineOffset + 1);
postLines = lines.slice(currentLineOffset + 1, +(currentLineOffset + numLinesOfContext) + 1);
numberedLines = numberLines(cleanMarkers([].slice.call(preLines).concat([].slice.call(postLines)).join('\n')), startLine + 1).split('\n');
preLines = numberedLines.slice(0, preLines.length);
postLines = numberedLines.slice(preLines.length);
column = cleanMarkers(('' + lines[currentLineOffset] + '\n').slice(0, column)).length;
padSize = (currentLineOffset + 1 + postLines.length).toString(10).length;
return [].slice.call(preLines).concat(['' + Array(padSize + 1).join('^') + ' :~' + Array(column).join('~') + '^'], [].slice.call(postLines)).join('\n');
>>>>>>>
this.formatParserError = function (input, e) {
var found, message, realColumn, unicode;
realColumn = cleanMarkers(('' + input.split('\n')[e.line - 1] + '\n').slice(0, e.column)).length;
if (!(null != e.found))
return 'Syntax error on line ' + e.line + ', column ' + realColumn + ': unexpected end of input';
found = JSON.stringify(humanReadable(e.found));
found = found.replace(/^"|"$/g, '').replace(/'/g, "\\'").replace(/\\"/g, '"');
unicode = e.found.charCodeAt(0).toString(16).toUpperCase();
unicode = '\\u' + '0000'.slice(unicode.length) + unicode;
message = 'Syntax error on line ' + e.line + ', column ' + realColumn + ": unexpected '" + found + "' (" + unicode + ')';
return '' + message + '\n' + pointToErrorLocation(input, e.line, realColumn);
};
this.pointToErrorLocation = pointToErrorLocation = function (source, line, column, numLinesOfContext) {
var currentLineOffset, lines, numberedLines, padSize, postLines, preLines, startLine;
if (null == numLinesOfContext)
numLinesOfContext = 3;
lines = source.split('\n');
currentLineOffset = line - 1;
startLine = currentLineOffset - numLinesOfContext;
if (startLine < 0)
startLine = 0;
preLines = lines.slice(startLine, +currentLineOffset + 1);
postLines = lines.slice(currentLineOffset + 1, +(currentLineOffset + numLinesOfContext) + 1);
numberedLines = numberLines(cleanMarkers([].slice.call(preLines).concat([].slice.call(postLines)).join('\n')), startLine + 1).split('\n');
preLines = numberedLines.slice(0, preLines.length);
postLines = numberedLines.slice(preLines.length);
column = cleanMarkers(('' + lines[currentLineOffset] + '\n').slice(0, column)).length;
padSize = (currentLineOffset + 1 + postLines.length).toString(10).length;
return [].slice.call(preLines).concat(['' + Array(padSize + 1).join('^') + ' :~' + Array(column).join('~') + '^'], [].slice.call(postLines)).join('\n');
<<<<<<<
case !!(parent != null):
return true;
case !parent["instanceof"](CS.Program, CS.Mixin, CS.Class):
return false;
case !parent["instanceof"](CS.SeqOp):
return this === parent.right && usedAsExpression(parent, ancestors.slice(1));
case !((parent["instanceof"](CS.Block)) && (parent.statements.indexOf(this)) !== parent.statements.length - 1):
return false;
case !((parent["instanceof"](CS.Functions)) && parent.body === this && (grandparent != null ? grandparent["instanceof"](CS.Constructor) : void 0)):
return false;
default:
return true;
=======
case !!(null != parent):
return true;
case !parent['instanceof'](CS.Program, CS.Class):
return false;
case !parent['instanceof'](CS.SeqOp):
return this === parent.right && usedAsExpression(parent, ancestors.slice(1));
case !(parent['instanceof'](CS.Block) && parent.statements.indexOf(this) !== parent.statements.length - 1):
return false;
case !(parent['instanceof'](CS.Functions) && parent.body === this && null != grandparent && grandparent['instanceof'](CS.Constructor)):
return false;
default:
return true;
>>>>>>>
case !!(null != parent):
return true;
case !parent['instanceof'](CS.Program, CS.Mixin, CS.Class):
return false;
case !parent['instanceof'](CS.SeqOp):
return this === parent.right && usedAsExpression(parent, ancestors.slice(1));
case !(parent['instanceof'](CS.Block) && parent.statements.indexOf(this) !== parent.statements.length - 1):
return false;
case !(parent['instanceof'](CS.Functions) && parent.body === this && null != grandparent && grandparent['instanceof'](CS.Constructor)):
return false;
default:
return true;
<<<<<<<
case !this["instanceof"](CS.AssignOp):
return nub(beingDeclared(this.assignee));
case !this["instanceof"](CS.Mixin):
return nub(concat([beingDeclared(this.nameAssignee), typeof name !== "undefined" && name !== null ? [name] : []]));
case !this["instanceof"](CS.Class):
return nub(concat([beingDeclared(this.nameAssignee), envEnrichments(this.parent), typeof name !== "undefined" && name !== null ? [name] : []]));
case !this["instanceof"](CS.ForIn, CS.ForOf):
return nub(concat([
concatMap(this.childNodes, function(child) {
if (__indexOf.call(_this.listMembers, child) >= 0) {
return concatMap(_this[child], function(m) {
return envEnrichments(m, inScope);
});
} else {
return envEnrichments(_this[child], inScope);
}
}), beingDeclared(this.keyAssignee), beingDeclared(this.valAssignee)
]));
default:
return nub(concatMap(this.childNodes, function(child) {
if (__indexOf.call(_this.listMembers, child) >= 0) {
return concatMap(_this[child], function(m) {
=======
case !this['instanceof'](CS.AssignOp):
return nub(beingDeclared(this.assignee));
case !this['instanceof'](CS.Class):
return nub(concat([
beingDeclared(this.nameAssignee),
envEnrichments(this.parent),
'undefined' !== typeof name && null != name ? [name] : []
]));
case !this['instanceof'](CS.ForIn, CS.ForOf):
return nub(concat([
concatMap(this.childNodes, (this$ = this, function (child) {
if (in$(child, this$.listMembers)) {
return concatMap(this$[child], function (m) {
>>>>>>>
case !this['instanceof'](CS.AssignOp):
return nub(beingDeclared(this.assignee));
case !this['instanceof'](CS.Mixin):
return nub(concat([
beingDeclared(this.nameAssignee),
'undefined' !== typeof name && null != name ? [name] : []
]));
case !this['instanceof'](CS.Class):
return nub(concat([
beingDeclared(this.nameAssignee),
envEnrichments(this.parent),
'undefined' !== typeof name && null != name ? [name] : []
]));
case !this['instanceof'](CS.ForIn, CS.ForOf):
return nub(concat([
concatMap(this.childNodes, (this$ = this, function (child) {
if (in$(child, this$.listMembers)) {
return concatMap(this$[child], function (m) { |
<<<<<<<
$select.prepend('<option selected value="">Choose a sub-category</option>');
=======
$select.prepend('<option selected value="all">Choose a sub-category</option>');
>>>>>>>
$select.prepend('<option selected value="all">Choose a sub-category</option>');
<<<<<<<
if ($("#primary_category_id").val() == -1){
$("#sub_category_id").val("-2");
}
=======
>>>>>>> |
<<<<<<<
/*ROBERT, NEXT UP IS THE VARIOUS EXPORT BUTTONS*/
=======
>>>>>>>
/* ROBERT, NEXT UP IS THE VARIOUS EXPORT BUTTONS */
<<<<<<<
this.current_electionState = e.detail.abbr;
this.current_electionStateName = e.detail.name;
this.loadCandidatesList();
console.log(e.detail.abb);
=======
e.stopImmediatePropagation(); // Keep it from bubbling outside of this app
// maybe this.current_electionState = e.detail;
// maybe this.loadCandidatesList();
// tell the breadcrumbs to update—or maybe that should be a different listener?
// then focus the map?
// Simply clicking a state shouldn't change that state's color or value
>>>>>>>
this.current_electionState = e.detail.abbr;
this.current_electionStateName = e.detail.name;
this.loadCandidatesList();
console.log(e.detail.abb);
e.stopImmediatePropagation(); // Keep it from bubbling outside of this app
// maybe this.current_electionState = e.detail;
// maybe this.loadCandidatesList();
// tell the breadcrumbs to update—or maybe that should be a different listener?
// then focus the map?
// Simply clicking a state shouldn't change that state's color or value |
<<<<<<<
$try,
defaultClearValue,
parseFieldValue,
=======
parseFieldValue,
>>>>>>>
$try,
defaultClearValue,
parseFieldValue,
<<<<<<<
this.$initial = parseFieldValue({
parser: this.$parser,
separated: val,
});
=======
this.$initial = parseFieldValue({ separated: val });
>>>>>>>
this.$initial = parseFieldValue({
parser: this.$parser,
separated: val,
});
<<<<<<<
this.$default = parseFieldValue({
parser: this.$parser,
separated: val,
});
=======
this.$default = parseFieldValue({ separated: val });
>>>>>>>
this.$default = parseFieldValue({
parser: this.$parser,
separated: val,
});
<<<<<<<
this.$type = $type || type || 'text';
this.$parser = $try($parse, parse, this.$parser);
this.$formatter = $try($format, format, this.$formatter);
this.$initial = parseFieldValue({
parser: this.$parser,
type: this.type,
unified: value,
=======
this.$initial = parseFieldValue({
unified: isEmptyArray ? [] : value,
>>>>>>>
this.$type = $type || type || 'text';
this.$parser = $try($parse, parse, this.$parser);
this.$formatter = $try($format, format, this.$formatter);
this.$initial = parseFieldValue({
parser: this.$parser,
type: this.type,
unified: isEmptyArray ? [] : value,
<<<<<<<
this.$default = parseFieldValue({
parser: this.$parser,
type: this.type,
=======
this.$default = parseFieldValue({
>>>>>>>
this.$default = parseFieldValue({
parser: this.$parser,
type: this.type,
<<<<<<<
this.$initial = parseFieldValue({
parser: this.$parser,
type: this.type,
unified: $data,
=======
this.$initial = parseFieldValue({
unified: isEmptyArray ? [] : $data,
>>>>>>>
this.$initial = parseFieldValue({
parser: this.$parser,
type: this.type,
unified: isEmptyArray ? [] : $data,
<<<<<<<
this.$default = parseFieldValue({
parser: this.$parser,
type: this.type,
=======
this.$default = parseFieldValue({
>>>>>>>
this.$default = parseFieldValue({
parser: this.$parser,
type: this.type, |
<<<<<<<
if (!process.env.UI_AUTH_ENDPOINT) {
process.env.UI_AUTH_ENDPOINT = 'http://localhost:3000/auth';
}
=======
if (!process.env.UI_SERVER_API_ENDPOINT) {
process.env.UI_SERVER_API_ENDPOINT = process.env.UI_API_ENDPOINT;
}
>>>>>>>
if (!process.env.UI_SERVER_API_ENDPOINT) {
process.env.UI_SERVER_API_ENDPOINT = process.env.UI_API_ENDPOINT;
}
if (!process.env.UI_AUTH_ENDPOINT) {
process.env.UI_AUTH_ENDPOINT = 'http://localhost:3000/auth';
} |
<<<<<<<
const newIssue = Object.assign({}, issue);
newIssue.created = new Date();
newIssue.id = await getNextSequence('issues');
=======
}
async function issueAdd(_, { issue }) {
issueValidate(issue);
issue.created = new Date();
issue.id = await getNextSequence('issues');
>>>>>>>
}
async function issueAdd(_, { issue }) {
issueValidate(issue);
const newIssue = Object.assign({}, issue);
newIssue.created = new Date();
newIssue.id = await getNextSequence('issues'); |
<<<<<<<
if (data instanceof Array)
{
return Object.each(data, function(model) { this.add(model) }, this);
}
var model = data.__is_model ? data : new this.model(data);
=======
>>>>>>>
if (data instanceof Array)
{
return Object.each(data, function(model) { this.add(model) }, this);
}
var model = data.__is_model ? data : new this.model(data); |
<<<<<<<
import {enableLiveReload} from './live-reload';
import {watchPath} from './pathwatcher-rx';
import {addBypassChecker} from './protocol-hook';
=======
//import {enableLiveReload} from './live-reload';
//import {watchPath} from './pathwatcher-rx';
>>>>>>>
import {addBypassChecker} from './protocol-hook';
//import {enableLiveReload} from './live-reload';
//import {watchPath} from './pathwatcher-rx';
<<<<<<<
{ enableLiveReload, watchPath, CompilerHost, FileChangedCache, CompileCache, addBypassChecker }
=======
{ CompilerHost, FileChangedCache, CompileCache }
>>>>>>>
{ CompilerHost, FileChangedCache, CompileCache, addBypassChecker } |
<<<<<<<
}
class SimpleNamespace extends Namespace {
constructor(args) {
super(args);
this.inputs = args || {};
this.numSegments = 1;
this.segmentAllocations = {};
this.currentExperiments = {};
this._experiment = null;
this._defaultExperiment = null;
this.defaultExperimentClass = DefaultExperiment
this._inExperiment = false;
this.setupDefaults();
this.setup();
if (!this.name) {
throw "setup() must set a namespace name via this.setName()";
}
this.availableSegments = range(this.numSegments);
this.setupExperiments();
}
=======
>>>>>>>
<<<<<<<
var a = new Assignment(this.name);
a.set('sampled_segments', new Sample({'choices': this.availableSegments, 'draws': segments, 'unit': name}));
var sample = a.get('sampled_segments');
for(var i = 0; i < sample.length; i++) {
this.segmentAllocations[sample[i]] = name;
var currentIndex = this.availableSegments.indexOf(sample[i]);
this.availableSegments[currentIndex] = this.availableSegments[numberAvailable - 1];
this.availableSegments.splice(numberAvailable - 1, 1);
numberAvailable -= 1;
}
this.currentExperiments[name] = expObject
}
=======
>>>>>>>
<<<<<<<
this._experiment.logEvent(eventType, extras);
}
}
=======
//helper function to return the class name of the current experiment class
getDefaultNamespaceName() {
if (isObject(this) && this.constructor && this !== this.window) {
var arr = this.constructor.toString().match(/function\s*(\w+)/);
if (arr && arr.length === 2) {
return arr[1];
}
}
return "GenericNamespace";
}
}
>>>>>>>
} |
<<<<<<<
module.exports = {
entry: ['./demo/exampleContainer.jsx'],
output: {
path: './demo',
filename: 'examples.js'
},
devServer: {
contentBase: './demo',
hot: true,
inline: true
},
module: {
loaders: [
{ test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader?optional=runtime'},
{ test: /\.jsx$/, exclude: /node_modules/, loader: 'babel-loader?optional=runtime'}
]
}
};
=======
module.exports = {
entry: ['./demo/demo.jsx'],
output: {
path: './demo',
filename: 'demo.js'
},
devServer: {
contentBase: './demo',
hot: true,
inline: true
},
module: {
loaders: [{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
loader: 'babel',
query: {
stage: 0
}
}]
}
};
>>>>>>>
module.exports = {
entry: ['./demo/exampleContainer.jsx'],
output: {
path: './demo',
filename: 'examples.js'
},
devServer: {
contentBase: './demo',
hot: true,
inline: true
},
module: {
loaders: [{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
loader: 'babel',
query: {
stage: 0
}
}]
}
}; |
<<<<<<<
name,
gitInit
=======
templatePath,
name
>>>>>>>
name,
templatePath,
gitInit |
<<<<<<<
console.log(this.classes);
this.orderedPool = this.orderedPool.filter(function(element){// We filter out all classes that name of JHipster entity User
return this.classes[element].name.toLowerCase() != 'User'.toLowerCase();
}, this);
=======
>>>>>>> |
<<<<<<<
const {name, type, config = {}} = card;
=======
const defaultTransformer = function (payload) {
return payload;
};
const {
name,
type,
absoluteToRelative = defaultTransformer,
relativeToAbsolute = defaultTransformer
} = card;
>>>>>>>
const defaultTransformer = function (payload) {
return payload;
};
const {
name,
type,
config = {},
absoluteToRelative = defaultTransformer,
relativeToAbsolute = defaultTransformer
} = card;
<<<<<<<
return fragment;
}
return cardOutput;
=======
return fragment;
},
absoluteToRelative() {
// it's necessary to wait until the method is called to require
// urlUtils to ensure the class has actually been instantiated
// as cards are passed in as an arg to the class instantiation
if (!urlUtils) {
urlUtils = require('../url-utils');
}
return absoluteToRelative(urlUtils, ...arguments);
},
relativeToAbsolute() {
// it's necessary to wait until the method is called to require
// urlUtils to ensure the class has actually been instantiated
// as cards are passed in as an arg to the class instantiation
if (!urlUtils) {
urlUtils = require('../url-utils');
}
return relativeToAbsolute(urlUtils, ...arguments);
>>>>>>>
return fragment;
}
return cardOutput;
},
absoluteToRelative() {
// it's necessary to wait until the method is called to require
// urlUtils to ensure the class has actually been instantiated
// as cards are passed in as an arg to the class instantiation
if (!urlUtils) {
urlUtils = require('../url-utils');
}
return absoluteToRelative(urlUtils, ...arguments);
},
relativeToAbsolute() {
// it's necessary to wait until the method is called to require
// urlUtils to ensure the class has actually been instantiated
// as cards are passed in as an arg to the class instantiation
if (!urlUtils) {
urlUtils = require('../url-utils');
}
return relativeToAbsolute(urlUtils, ...arguments); |
<<<<<<<
emberTemplates: {
files: 'core/client/templates/**/*.hbs',
tasks: ['emberTemplates']
},
ember: {
files: [
'core/client/**/*.js'
],
tasks: ['transpile', 'concat_sourcemap']
},
sass: {
files: ['<%= paths.adminOldAssets %>/sass/**/*'],
tasks: ['sass:admin']
},
=======
>>>>>>>
<<<<<<<
// Admin CSS
'<%= paths.adminOldAssets %>/css/*.css',
=======
>>>>>>>
<<<<<<<
// ### Config for grunt-contrib-sass
// Compile all the SASS!
sass: {
admin: {
files: {
'<%= paths.adminOldAssets %>/css/screen.css': '<%= paths.adminOldAssets %>/sass/screen.scss'
}
},
compress: {
options: {
style: 'compressed'
},
files: {
'<%= paths.adminOldAssets %>/css/screen.css': '<%= paths.adminOldAssets %>/sass/screen.scss'
}
}
},
=======
>>>>>>>
<<<<<<<
// run bundle
bundle: {
command: 'bundle install'
},
// install bourbon
bourbon: {
command: 'bourbon install --path <%= paths.adminOldAssets %>/sass/modules/'
},
=======
>>>>>>>
<<<<<<<
grunt.registerTask('default', 'Build CSS, JS & templates for development', ['update_submodules', 'sass:compress', 'handlebars', 'concat', 'copy:dev', 'emberBuild']);
=======
grunt.registerTask('default', 'Build JS & templates for development', ['update_submodules', 'handlebars', 'concat', 'copy:dev']);
>>>>>>>
grunt.registerTask('default', 'Build JS & templates for development', ['update_submodules', 'handlebars', 'concat', 'copy:dev', 'emberBuild']); |
<<<<<<<
grunt.loadNpmTasks("grunt-mocha-test");
grunt.loadNpmTasks("grunt-contrib-compass");
=======
grunt.loadNpmTasks("grunt-contrib-sass");
grunt.loadNpmTasks("grunt-shell");
>>>>>>>
grunt.loadNpmTasks("grunt-mocha-test");
grunt.loadNpmTasks("grunt-contrib-sass");
grunt.loadNpmTasks("grunt-shell"); |
<<<<<<<
=======
member: _(schema.members)
.keys()
,
accesstoken: _(schema.accesstokens)
.keys()
,
>>>>>>>
member: _(schema.members)
.keys()
, |
<<<<<<<
models = require('./shared/models'),
=======
JsonDataProvider = require('./shared/models/dataProvider.json'),
jsonDataProvider = new JsonDataProvider(),
BookshelfDataProvider = require('./shared/models/dataProvider.bookshelf'),
bookshelfDataProvider = new BookshelfDataProvider(),
ExampleFilter = require('../content/plugins/exampleFilters'),
>>>>>>>
models = require('./shared/models'),
ExampleFilter = require('../content/plugins/exampleFilters'),
<<<<<<<
=======
globals,
plugin,
>>>>>>>
plugin, |
<<<<<<<
src: 'core/client/**/*.js'
},
exclude: [
'core/client/templates/**/*.js'
]
=======
src: [
'core/client/**/*.js',
// Ignore files
'!core/client/assets/vendor/**/*.js',
'!core/client/tpl/**/*.js'
]
}
>>>>>>>
src: [
'core/client/**/*.js',
// Ignore files
'!core/client/assets/vendor/**/*.js',
'!core/client/tpl/**/*.js'
]
}
<<<<<<<
'core/shared/vendor/jquery/jquery.js',
'core/shared/vendor/jquery/jquery-ui-1.10.3.custom.min.js',
'core/clientold/assets/lib/jquery-utils.js',
'core/clientold/assets/lib/uploader.js',
'core/shared/vendor/lodash.underscore.js',
'core/shared/vendor/backbone/backbone.js',
'core/shared/vendor/handlebars/handlebars-runtime.js',
'core/shared/vendor/moment.js',
'core/shared/vendor/jquery/jquery.ui.widget.js',
'core/shared/vendor/jquery/jquery.iframe-transport.js',
'core/shared/vendor/jquery/jquery.fileupload.js',
'core/clientold/assets/vendor/codemirror/codemirror.js',
'core/clientold/assets/vendor/codemirror/addon/mode/overlay.js',
'core/clientold/assets/vendor/codemirror/mode/markdown/markdown.js',
'core/clientold/assets/vendor/codemirror/mode/gfm/gfm.js',
'core/clientold/assets/vendor/showdown/showdown.js',
'core/clientold/assets/vendor/showdown/extensions/ghostdown.js',
'core/shared/vendor/showdown/extensions/github.js',
'core/clientold/assets/vendor/shortcuts.js',
'core/clientold/assets/vendor/validator-client.js',
'core/clientold/assets/vendor/countable.js',
'core/clientold/assets/vendor/to-title-case.js',
'core/clientold/assets/vendor/packery.pkgd.min.js',
'core/clientold/assets/vendor/fastclick.js',
'core/clientold/assets/vendor/nprogress.js'
=======
'bower_components/jquery/dist/jquery.js',
'bower_components/jquery-ui/ui/jquery-ui.js',
'core/client/assets/lib/jquery-utils.js',
'core/client/assets/lib/uploader.js',
'bower_components/lodash/dist/lodash.underscore.js',
'bower_components/backbone/backbone.js',
'bower_components/handlebars.js/dist/handlebars.runtime.js',
'bower_components/moment/moment.js',
'bower_components/jquery-file-upload/js/jquery.fileupload.js',
'bower_components/codemirror/lib/codemirror.js',
'bower_components/codemirror/addon/mode/overlay.js',
'bower_components/codemirror/mode/markdown/markdown.js',
'bower_components/codemirror/mode/gfm/gfm.js',
'bower_components/showdown/src/showdown.js',
'bower_components/validator-js/validator.js',
'core/client/assets/lib/showdown/extensions/ghostdown.js',
'core/shared/lib/showdown/extensions/typography.js',
'core/shared/lib/showdown/extensions/github.js',
// ToDo: Remove or replace
'core/client/assets/vendor/shortcuts.js',
'core/client/assets/vendor/to-title-case.js',
'bower_components/Countable/Countable.js',
'bower_components/fastclick/lib/fastclick.js',
'bower_components/nprogress/nprogress.js'
>>>>>>>
'bower_components/jquery/dist/jquery.js',
'bower_components/jquery-ui/ui/jquery-ui.js',
'core/clientold/assets/lib/jquery-utils.js',
'core/clientold/assets/lib/uploader.js',
'bower_components/lodash/dist/lodash.underscore.js',
'bower_components/backbone/backbone.js',
'bower_components/handlebars.js/dist/handlebars.runtime.js',
'bower_components/moment/moment.js',
'bower_components/jquery-file-upload/js/jquery.fileupload.js',
'bower_components/codemirror/lib/codemirror.js',
'bower_components/codemirror/addon/mode/overlay.js',
'bower_components/codemirror/mode/markdown/markdown.js',
'bower_components/codemirror/mode/gfm/gfm.js',
'bower_components/showdown/src/showdown.js',
'bower_components/validator-js/validator.js',
'core/clientold/assets/lib/showdown/extensions/ghostdown.js',
'core/shared/lib/showdown/extensions/typography.js',
'core/shared/lib/showdown/extensions/github.js',
// ToDo: Remove or replace
'core/clientold/assets/vendor/shortcuts.js',
'core/clientold/assets/vendor/to-title-case.js',
'bower_components/Countable/Countable.js',
'bower_components/fastclick/lib/fastclick.js',
'bower_components/nprogress/nprogress.js'
<<<<<<<
'core/shared/vendor/jquery/jquery.js',
'core/shared/vendor/jquery/jquery-ui-1.10.3.custom.min.js',
'core/clientold/assets/lib/jquery-utils.js',
'core/clientold/assets/lib/uploader.js',
'core/shared/vendor/lodash.underscore.js',
'core/shared/vendor/backbone/backbone.js',
'core/shared/vendor/handlebars/handlebars-runtime.js',
'core/shared/vendor/moment.js',
'core/shared/vendor/jquery/jquery.ui.widget.js',
'core/shared/vendor/jquery/jquery.iframe-transport.js',
'core/shared/vendor/jquery/jquery.fileupload.js',
'core/clientold/assets/vendor/codemirror/codemirror.js',
'core/clientold/assets/vendor/codemirror/addon/mode/overlay.js',
'core/clientold/assets/vendor/codemirror/mode/markdown/markdown.js',
'core/clientold/assets/vendor/codemirror/mode/gfm/gfm.js',
'core/clientold/assets/vendor/showdown/showdown.js',
'core/clientold/assets/vendor/showdown/extensions/ghostdown.js',
'core/shared/vendor/showdown/extensions/github.js',
'core/clientold/assets/vendor/shortcuts.js',
'core/clientold/assets/vendor/validator-client.js',
'core/clientold/assets/vendor/countable.js',
'core/clientold/assets/vendor/to-title-case.js',
'core/clientold/assets/vendor/packery.pkgd.min.js',
'core/clientold/assets/vendor/fastclick.js',
'core/clientold/assets/vendor/nprogress.js',
=======
'bower_components/jquery/dist/jquery.js',
'bower_components/jquery-ui/ui/jquery-ui.js',
'core/client/assets/lib/jquery-utils.js',
'core/client/assets/lib/uploader.js',
'bower_components/lodash/dist/lodash.underscore.js',
'bower_components/backbone/backbone.js',
'bower_components/handlebars.js/dist/handlebars.runtime.js',
'bower_components/moment/moment.js',
'bower_components/jquery-file-upload/js/jquery.fileupload.js',
'bower_components/codemirror/lib/codemirror.js',
'bower_components/codemirror/addon/mode/overlay.js',
'bower_components/codemirror/mode/markdown/markdown.js',
'bower_components/codemirror/mode/gfm/gfm.js',
'bower_components/showdown/src/showdown.js',
'bower_components/validator-js/validator.js',
'core/client/assets/lib/showdown/extensions/ghostdown.js',
'core/shared/lib/showdown/extensions/typography.js',
'core/shared/lib/showdown/extensions/github.js',
// ToDo: Remove or replace
'core/client/assets/vendor/shortcuts.js',
'core/client/assets/vendor/to-title-case.js',
'bower_components/Countable/Countable.js',
'bower_components/fastclick/lib/fastclick.js',
'bower_components/nprogress/nprogress.js',
>>>>>>>
'bower_components/jquery/dist/jquery.js',
'bower_components/jquery-ui/ui/jquery-ui.js',
'core/clientold/assets/lib/jquery-utils.js',
'core/clientold/assets/lib/uploader.js',
'bower_components/lodash/dist/lodash.underscore.js',
'bower_components/backbone/backbone.js',
'bower_components/handlebars.js/dist/handlebars.runtime.js',
'bower_components/moment/moment.js',
'bower_components/jquery-file-upload/js/jquery.fileupload.js',
'bower_components/codemirror/lib/codemirror.js',
'bower_components/codemirror/addon/mode/overlay.js',
'bower_components/codemirror/mode/markdown/markdown.js',
'bower_components/codemirror/mode/gfm/gfm.js',
'bower_components/showdown/src/showdown.js',
'bower_components/validator-js/validator.js',
'core/clientold/assets/lib/showdown/extensions/ghostdown.js',
'core/shared/lib/showdown/extensions/typography.js',
'core/shared/lib/showdown/extensions/github.js',
// ToDo: Remove or replace
'core/clientold/assets/vendor/shortcuts.js',
'core/clientold/assets/vendor/to-title-case.js',
'bower_components/Countable/Countable.js',
'bower_components/fastclick/lib/fastclick.js',
'bower_components/nprogress/nprogress.js',
<<<<<<<
'emberBuild',
=======
'copy:dev',
>>>>>>>
'emberBuild',
'copy:dev',
<<<<<<<
grunt.registerTask('default', 'Build CSS, JS & templates for development', ['update_submodules', 'sass:compress', 'handlebars', 'concat', 'emberBuild']);
=======
grunt.registerTask('default', 'Build CSS, JS & templates for development', ['update_submodules', 'sass:compress', 'handlebars', 'concat', 'copy:dev']);
>>>>>>>
grunt.registerTask('default', 'Build CSS, JS & templates for development', ['update_submodules', 'sass:compress', 'handlebars', 'concat', 'copy:dev', 'emberBuild']); |
<<<<<<<
if (!is(businessObject, 'bpmn:EndEvent') && !businessObject.triggeredByEvent) {
=======
if (element.type === 'label') {
return filteredActions;
}
if (!is(businessObject, 'bpmn:EndEvent')) {
>>>>>>>
if (element.type === 'label') {
return filteredActions;
}
if (!is(businessObject, 'bpmn:EndEvent') && !businessObject.triggeredByEvent) { |
<<<<<<<
=======
this.stalked_threads = {};
this.step_info = {};
>>>>>>>
this.step_info = {}; |
<<<<<<<
/**
* Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
* under one or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information regarding copyright
* ownership.
*
* Camunda licenses this file to you under the MIT; you may not use this file
* except in compliance with the MIT License.
*/
import React, { PureComponent } from 'react';
import Slot from './slot-fill/Slot';
import css from './EmptyTab.less';
import {
Tab
} from './primitives';
export default class EmptyTab extends PureComponent {
componentDidMount() {
this.props.onShown();
}
triggerAction() {}
render() {
const {
onAction
} = this.props;
return (
<Tab className={ css.EmptyTab }>
<p className="create-buttons">
<span>Create a </span>
<button className="create-bpmn" onClick={
() => onAction('create-bpmn-diagram') }
>BPMN diagram</button>
</p>
<Slot name="empty-tab-buttons" />
</Tab>
);
}
=======
/**
* Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
* under one or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information regarding copyright
* ownership.
*
* Camunda licenses this file to you under the MIT; you may not use this file
* except in compliance with the MIT License.
*/
import React, { PureComponent, Fragment } from 'react';
import Slot from './slot-fill/Slot';
import css from './EmptyTab.less';
import {
Tab
} from './primitives';
import Flags, { DISABLE_DMN } from '../util/Flags';
export default class EmptyTab extends PureComponent {
componentDidMount() {
this.props.onShown();
}
triggerAction() {}
render() {
const {
onAction
} = this.props;
return (
<Tab className={ css.EmptyTab }>
<p className="create-buttons">
<span>Create a </span>
<button className="create-bpmn" onClick={ () => onAction('create-bpmn-diagram') }>BPMN diagram</button>
{
!Flags.get(DISABLE_DMN) && (
<Fragment>
<span> or </span>
<button onClick={ () => onAction('create-dmn-diagram') }>DMN diagram</button>
</Fragment>
)
}
</p>
<Slot name="empty-tab-buttons" />
</Tab>
);
}
>>>>>>>
/**
* Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
* under one or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information regarding copyright
* ownership.
*
* Camunda licenses this file to you under the MIT; you may not use this file
* except in compliance with the MIT License.
*/
import React, { PureComponent } from 'react';
import Slot from './slot-fill/Slot';
import css from './EmptyTab.less';
import {
Tab
} from './primitives';
export default class EmptyTab extends PureComponent {
componentDidMount() {
this.props.onShown();
}
triggerAction() {}
render() {
const {
onAction
} = this.props;
return (
<Tab className={ css.EmptyTab }>
<p className="create-buttons">
<span>Create a </span>
<button className="create-bpmn" onClick={ () => onAction('create-bpmn-diagram') }>BPMN diagram</button>
</p>
<Slot name="empty-tab-buttons" />
</Tab>
);
} |
<<<<<<<
case "startProServer": {
proServer.startProServer();
break;
}
case "stopProServer": {
proServer.stopProServer();
break;
}
case "generateProToken": {
tokenManager.generateToken(gid);
break;
}
case "revokeProToken": {
tokenManager.revokeToken(gid);
break;
}
=======
case "host:delete": {
(async () => {
const hostMac = msg.data.value.mac;
const macExists = await hostTool.macExists(hostMac);
if (macExists) {
let ips = await hostTool.getIPsByMac(hostMac);
ips.forEach(async (ip) => {
const latestMac = await hostTool.getMacByIP(ip);
if (latestMac && latestMac === hostMac) {
// double check to ensure ip address is not taken over by other device
await hostTool.deleteHost(ip);
}
});
await hostTool.deleteMac(hostMac);
// Since HostManager.getHosts() is resource heavy, it is not invoked here. It will be invoked once every 5 minutes.
this.simpleTxData(msg, {}, null, callback);
} else {
let resp = {
type: 'jsonmsg',
mtype: 'cmd',
id: uuid.v4(),
expires: Math.floor(Date.now() / 1000) + 60 * 5,
replyid: msg.id,
code: 404,
data: {"error": "device not found"}
};
this.txData(this.primarygid, "host:delete", resp, "jsondata", "", null, callback);
}
})().catch((err) => {
this.simpleTxData(msg, {}, err, callback);
})
break;
}
>>>>>>>
case "startProServer": {
proServer.startProServer();
break;
}
case "stopProServer": {
proServer.stopProServer();
break;
}
case "generateProToken": {
tokenManager.generateToken(gid);
break;
}
case "revokeProToken": {
tokenManager.revokeToken(gid);
}
case "host:delete": {
(async () => {
const hostMac = msg.data.value.mac;
const macExists = await hostTool.macExists(hostMac);
if (macExists) {
let ips = await hostTool.getIPsByMac(hostMac);
ips.forEach(async (ip) => {
const latestMac = await hostTool.getMacByIP(ip);
if (latestMac && latestMac === hostMac) {
// double check to ensure ip address is not taken over by other device
await hostTool.deleteHost(ip);
}
});
await hostTool.deleteMac(hostMac);
// Since HostManager.getHosts() is resource heavy, it is not invoked here. It will be invoked once every 5 minutes.
this.simpleTxData(msg, {}, null, callback);
} else {
let resp = {
type: 'jsonmsg',
mtype: 'cmd',
id: uuid.v4(),
expires: Math.floor(Date.now() / 1000) + 60 * 5,
replyid: msg.id,
code: 404,
data: {"error": "device not found"}
};
this.txData(this.primarygid, "host:delete", resp, "jsondata", "", null, callback);
}
})().catch((err) => {
this.simpleTxData(msg, {}, err, callback);
})
break;
} |
<<<<<<<
'MAINTAIN_STRUCTURES': ECONOMY_DEVELOPING,
=======
'REMOTE_MINES': ECONOMY_DEVELOPING,
>>>>>>>
'MAINTAIN_STRUCTURES': ECONOMY_DEVELOPING,
'REMOTE_MINES': ECONOMY_DEVELOPING, |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.