conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
incidences: 'boards',
'program-increment':'programIncrement',
=======
bugs: 'boards'
>>>>>>>
incidences: 'boards',
'program-increment':'programIncrement',
bugs: 'boards' |
<<<<<<<
let responseTimeTendency;
=======
let infraCost = 0;
let metricsMap = {};
>>>>>>>
let responseTimeTendency;
let infraCost = 0;
let metricsMap = {};
<<<<<<<
responseTimeTendency: responseTimeTendency,
errorsRateTendency: errorsRateTendency,
=======
infraCost: parseFloat(infraCost.toFixed(2))
>>>>>>>
responseTimeTendency: responseTimeTendency,
errorsRateTendency: errorsRateTendency,
infraCost: parseFloat(infraCost.toFixed(2)) |
<<<<<<<
notifications: new ServiceType(Timer.never, 'notifications')
=======
programincrement: new ServiceType(Timer.eventually, 'programincrement'),
>>>>>>>
programincrement: new ServiceType(Timer.eventually, 'programincrement'),
notifications: new ServiceType(Timer.never, 'notifications') |
<<<<<<<
bugs: 'boards',
notifications: 'slackTeam'
=======
incidences: 'boards',
'program-increment':'programIncrement',
bugs: 'boards'
>>>>>>>
incidences: 'boards',
'program-increment':'programIncrement',
bugs: 'boards',
notifications: 'slackTeam' |
<<<<<<<
var apply = function(value) {
doc.getSelection().removeAllRanges();
doc.getSelection().addRange(that._range);
that._actions(action, value);
that._range = doc.getSelection().getRangeAt(0);
}
=======
var apply = function(value) {
doc.getSelection().removeAllRanges();
doc.getSelection().addRange(that._range);
that._actions(action, value);
that.config.editor.focus();
that._range = doc.getSelection().getRangeAt(0);
}
>>>>>>>
var apply = function(value) {
doc.getSelection().removeAllRanges();
doc.getSelection().addRange(that._range);
that._actions(action, value);
that._range = doc.getSelection().getRangeAt(0); |
<<<<<<<
const eosTypes = {
evt_address: ()=> [EvtAddress],
=======
const evtTypes = {
>>>>>>>
const evtTypes = {
evt_address: ()=> [EvtAddress], |
<<<<<<<
if (str === "0".repeat(50)) return Buffer.from([0, 0]);
else if (str[0] === "0") return encodeGeneratedAddressToBin("EVT" + str);
buf = Buffer.concat([Buffer.from([1, 0]), new Buffer(base58.decode(str))]);
=======
if (str === "0".repeat(50)) return Buffer.from([0, 0]); // 0000
else if (str[0] === "0") return encodeGeneratedAddressToBin("EVT" + str); // generated address
let buf = Buffer.concat([Buffer.from([1, 0]), base58.decode(str)]); // normal
//console.log(buf)
>>>>>>>
if (str === "0".repeat(50)) return Buffer.from([0, 0]); // 0000
else if (str[0] === "0") return encodeGeneratedAddressToBin("EVT" + str); // generated address
let buf = Buffer.concat([Buffer.from([1, 0]), new Buffer(base58.decode(str))]); // normal
//console.log(buf) |
<<<<<<<
if (str === "0".repeat(50)) return Buffer.from([0, 0]); // 0000
else if (str[0] === "0") return encodeGeneratedAddressToBin("EVT" + str); // generated address
let buf = Buffer.concat([Buffer.from([1, 0]), base58.decode(str)]); // normal
//console.log(buf)
=======
if (str === "0".repeat(50)) return Buffer.from([0, 0]);
else if (str[0] === "0") return encodeGeneratedAddressToBin("EVT" + str);
buf = Buffer.concat([Buffer.from([1, 0]), new Buffer(base58.decode(str))]);
>>>>>>>
if (str === "0".repeat(50)) return Buffer.from([0, 0]); // 0000
else if (str[0] === "0") return encodeGeneratedAddressToBin("EVT" + str); // generated address
let buf = Buffer.concat([Buffer.from([1, 0]), new Buffer(base58.decode(str))]); // normal
//console.log(buf) |
<<<<<<<
var revisionObj = queryUtils.snapshot(obj)
// TODO: use datastore plugin's internal fields
delete revisionObj._id
delete revisionObj.meta
delete revisionObj.$loki
=======
var revisionObj = _.clone(obj)
revisionObj._id = new ObjectID()
revisionObj.originalDocumentId = obj._id
>>>>>>>
var revisionObj = queryUtils.snapshot(obj)
revisionObj.originalDocumentId = obj._id
// TODO: use datastore plugin's internal fields
delete revisionObj._id
delete revisionObj.meta
delete revisionObj.$loki
<<<<<<<
History.prototype.createEach = function (objs, model) {
return new Promise((resolve, reject) => {
if (objs.length === 0) return resolve()
=======
History.prototype.createEach = function (objs, action, model, done) {
var self = this
var updatedDocs = []
objs.forEach(function (obj, index, array) {
obj.action = action
self.create(obj, model, function (err, doc) {
if (err) return done(err)
>>>>>>>
History.prototype.createEach = function (objs, action, model, done) {
return new Promise((resolve, reject) => {
if (objs.length === 0) return resolve() |
<<<<<<<
query.split("&").forEach(function(part) {
var item = part.split("=");
if (!result[item[0]]) {
result[item[0]] = [];
=======
query.forEach(function(part, i) {
if (i === 0 || i % 2 === 0) {
var key = part.replace(/&|=/g, '');
if (!result[key]) {
result[key] = [];
}
result[key].push(decodeURIComponent(query[i + 1]));
>>>>>>>
query.forEach(function(part, i) {
if (i === 0 || i % 2 === 0) {
var key = part.replace(/&|=/g, '');
if (!result[key]) {
result[key] = [];
}
result[key].push(decodeURIComponent(query[i + 1]));
<<<<<<<
dc.util.corsSupport = function() {
return 'XMLHttprequest' in window && 'withCredentials' in new window.XMLHttpRequest();
};
dc.util.welcome = function() {
var welcome = '\nWelcome to Dropchop!\n';
welcome += 'Once you drop, the chop don\'t stop.\n\n';
welcome += 'This project is brought to you by the great people of CUGOS, the Cascadian chapter of OSGeo. If you are ever in Seattle, hit us up\[email protected]\n\n';
welcome += 'You can learn more about this project at dropchop.io/about.'
console.log(welcome);
=======
dc.util.error = function(err) {
var error = new Error(err);
throw error;
>>>>>>>
dc.util.corsSupport = function() {
return 'XMLHttprequest' in window && 'withCredentials' in new window.XMLHttpRequest(); |
<<<<<<<
var Controller = require(path.join(__dirname, '/controller'))
=======
var Controller = require(path.join(__dirname, '/controller'))
var HooksController = require(path.join(__dirname, '/controller/hooks'))
>>>>>>>
var Controller = require(path.join(__dirname, '/controller'))
var HooksController = require(path.join(__dirname, '/controller/hooks'))
<<<<<<<
var Model = require(path.join(__dirname, '/model'))
=======
var log = require('@dadi/logger')
var Model = require(path.join(__dirname, '/model'))
var mediaModel = require(path.join(__dirname, '/model/media'))
>>>>>>>
var Model = require(path.join(__dirname, '/model'))
var mediaModel = require(path.join(__dirname, '/model/media')) |
<<<<<<<
/**
* Generate a folder hierarchy for a file, based on a configuration property
*
* @param {string} fileName - the name of the file being uploaded
*/
MediaController.prototype.getPath = function (fileName) {
var reSplitter
switch (config.get('media.pathFormat')) {
case 'sha1/4':
reSplitter = new RegExp('.{1,4}', 'g')
return sha1(fileName).match(reSplitter).join('/')
case 'sha1/5':
reSplitter = new RegExp('.{1,5}', 'g')
return sha1(fileName).match(reSplitter).join('/')
case 'sha1/8':
reSplitter = new RegExp('.{1,8}', 'g')
return sha1(fileName).match(reSplitter).join('/')
case 'date':
return formatDate()
case 'datetime':
return formatDate(true)
default:
return ''
}
}
=======
MediaController.prototype.put = function (req, res, next) {
return this.post(req, res, next)
}
>>>>>>>
/**
* Generate a folder hierarchy for a file, based on a configuration property
*
* @param {string} fileName - the name of the file being uploaded
*/
MediaController.prototype.getPath = function (fileName) {
var reSplitter
switch (config.get('media.pathFormat')) {
case 'sha1/4':
reSplitter = new RegExp('.{1,4}', 'g')
return sha1(fileName).match(reSplitter).join('/')
case 'sha1/5':
reSplitter = new RegExp('.{1,5}', 'g')
return sha1(fileName).match(reSplitter).join('/')
case 'sha1/8':
reSplitter = new RegExp('.{1,8}', 'g')
return sha1(fileName).match(reSplitter).join('/')
case 'date':
return formatDate()
case 'datetime':
return formatDate(true)
default:
return ''
}
}
MediaController.prototype.put = function (req, res, next) {
return this.post(req, res, next)
}
<<<<<<<
this.model.create(obj, internals, callback, req)
=======
this.model.create(obj, internals, help.sendBackJSON(201, res, next), req)
})
>>>>>>>
this.model.create(obj, internals, callback, req) |
<<<<<<<
var Composer = require(path.join(__dirname, '/composer')).Composer
var config = require(path.join(__dirname, '/../../../config'))
var Connection = require(path.join(__dirname, '/connection'))
=======
var config = require(path.join(__dirname, '/../../../config'))
var connection = require(path.join(__dirname, '/connection'))
>>>>>>>
var Composer = require(path.join(__dirname, '/composer')).Composer
var config = require(path.join(__dirname, '/../../../config'))
var Connection = require(path.join(__dirname, '/connection'))
<<<<<<<
=======
var logger = require('@dadi/logger')
var Validator = require(path.join(__dirname, '/validator'))
>>>>>>>
<<<<<<<
document.forEach(function (doc) {
=======
documents.forEach(function (doc) {
>>>>>>>
documents.forEach(function (doc) {
<<<<<<<
document.forEach(function (doc) {
=======
documents.forEach(function (doc) {
>>>>>>>
documents.forEach(function (doc) {
<<<<<<<
document.forEach((doc) => {
=======
documents.forEach((doc) => {
>>>>>>>
documents.forEach((doc) => {
<<<<<<<
document.forEach((doc) => {
=======
documents.forEach((doc) => {
>>>>>>>
documents.forEach((doc) => {
<<<<<<<
// // ObjectIDs
// document.forEach(function (doc) {
// doc = self.convertObjectIdsForSave(self.schema, doc)
// })
=======
// ObjectIDs
documents.forEach(function (doc) {
doc = self.convertObjectIdsForSave(self.schema, doc)
})
>>>>>>>
// ObjectIDs
// documents.forEach(function (doc) {
// doc = self.convertObjectIdsForSave(self.schema, doc)
// })
<<<<<<<
document.forEach(function (doc) {
=======
documents.forEach(function (doc) {
>>>>>>>
documents.forEach(function (doc) {
<<<<<<<
document.forEach((doc, docIndex) => {
=======
documents.forEach((doc, docIndex) => {
>>>>>>>
documents.forEach((doc, docIndex) => {
<<<<<<<
if (processedDocs === document.length) {
=======
if (processedDocs === documents.length) {
>>>>>>>
if (processedDocs === documents.length) {
<<<<<<<
done(null, returnData)
}).catch((err) => {
return done(err)
=======
return done(null, results)
})
>>>>>>>
done(null, returnData)
}).catch((err) => {
return done(err)
})
<<<<<<<
=======
// Run the queued tasks
>>>>>>>
<<<<<<<
database.find(query, self.name, options, self.schema).then((results) => {
var returnData = {}
// TODO: metadata
var count = 10 // TODO: get an actual count!
if (self.compose) {
self.composer.setApiVersion(query.apiVersion)
self.composer.compose(results, (obj) => {
returnData.results = obj
returnData.metadata = getMetadata(options, count)
runDoneQueue(null, returnData)
=======
var queryOptions = _.clone(options)
delete queryOptions.historyFilters
database.collection(self.name).find(query, queryOptions, function (err, cursor) {
if (err) return done(err)
var results = {}
cursor.count(false, {}, function (err, count) {
if (err) return done(err)
cursor.toArray(function (err, result) {
if (err) return done(err)
if (compose) {
self.composer.setApiVersion(query.apiVersion)
self.composer.compose(result, function (obj) {
results.results = obj
results.metadata = getMetadata(options, count)
runDoneQueue(null, results)
})
} else {
results.results = result
results.metadata = getMetadata(options, count)
runDoneQueue(null, results)
}
>>>>>>>
var queryOptions = _.clone(options)
delete queryOptions.historyFilters
database.find(query, self.name, queryOptions, self.schema).then((results) => {
var returnData = {}
// TODO: metadata
var count = 10 // TODO: get an actual count!
if (self.compose) {
self.composer.setApiVersion(query.apiVersion)
self.composer.compose(results, (obj) => {
returnData.results = obj
returnData.metadata = getMetadata(options, count)
runDoneQueue(null, returnData)
<<<<<<<
var setUpdate = { $set: update, $inc: { v: 1 } }
=======
this.composer.setApiVersion(internals.apiVersion)
var setUpdate = {$set: update}
var updateOptions = {
multi: true
}
>>>>>>>
this.composer.setApiVersion(internals.apiVersion)
var setUpdate = { $set: update, $inc: { v: 1 } }
<<<<<<<
database.update(query, this.name, setUpdate, { multi: true }, this.schema).then((result) => {
if (result.matchedCount === 0) {
=======
database.collection(this.name).updateMany(query, setUpdate, updateOptions, (err, result) => {
if (err) return done(err)
if (result.matchedCount === 0) {
>>>>>>>
database.update(query, this.name, setUpdate, { multi: true }, this.schema).then((result) => {
if (result.matchedCount === 0) {
<<<<<<<
=======
var incrementRevisionNumber = (docs) => {
return new Promise((resolve, reject) => {
var idx = 0
_.each(docs, (doc) => {
database.collection(this.name).findOneAndUpdate(
{ _id: new ObjectID(doc._id.toString()) },
{ $inc: { v: 1 } },
{
returnOriginal: false,
sort: [['_id', 'asc']],
upsert: false
}, (err, doc) => {
if (err) return done(err)
if (++idx === docs.length) {
return resolve()
}
}
)
})
})
}
>>>>>>>
// var incrementRevisionNumber = (docs) => {
// return new Promise((resolve, reject) => {
// _.each(docs, (doc, idx) => {
// database.collection(this.name).findOneAndUpdate(
// { _id: new ObjectID(doc._id.toString()) },
// { $inc: { v: 1 } },
// {
// returnOriginal: false,
// sort: [['_id', 'asc']],
// upsert: false
// }, (err, doc) => {
// if (err) return done(err)
//
// if (idx === docs.length - 1) {
// return resolve()
// }
// }
// )
// })
// })
// }
<<<<<<<
database.delete(query, this.name, this.schema).then((result) => {
if (!err && (result.deletedCount > 0)) {
=======
database.collection(this.name).deleteMany(query, (err, result) => {
if (!err && (result.deletedCount > 0)) {
>>>>>>>
database.delete(query, this.name, this.schema).then((result) => {
if (!err && (result.deletedCount > 0)) {
<<<<<<<
done(null, result.deletedCount)
}).catch((err) => {
done(err)
=======
done(err, result.deletedCount)
>>>>>>>
done(null, result.deletedCount)
}).catch((err) => {
done(err) |
<<<<<<<
$rootScope[config.user] = payload.user;
if (config.loginRedirect) {
$location.path(config.loginRedirect);
}
deferred.resolve(payload.user);
=======
$rootScope[config.user] = user;
$location.path(config.loginRedirect);
deferred.resolve(user);
>>>>>>>
$rootScope[config.user] = user;
if (config.loginRedirect) {
$location.path(config.loginRedirect);
}
deferred.resolve(user); |
<<<<<<<
platform: 'browser',
=======
withCredentials: true,
>>>>>>>
withCredentials: true,
platform: 'browser',
<<<<<<<
},
platform: {
get: function() { return config.platform; },
set: function(value) { config.platform = value; }
=======
},
withCredentials: {
get: function() { return config.withCredentials; },
set: function(value) { config.withCredentials = value; }
},
unlinkMethod: {
get: function() { return config.unlinkMethod; },
set: function(value) { config.unlinkMethod = value; }
>>>>>>>
},
withCredentials: {
get: function() { return config.withCredentials; },
set: function(value) { config.withCredentials = value; }
},
unlinkMethod: {
get: function() { return config.unlinkMethod; },
set: function(value) { config.unlinkMethod = value; }
},
platform: {
get: function() { return config.platform; },
set: function(value) { config.platform = value; } |
<<<<<<<
},
tin: {
minFeatures: 1,
maxFeatures: 1,
description: 'Triangulated irregular network, interpolation method',
createsLayer: true
=======
},
bezier: {
minFeatures: 1,
description: 'Takes a line and returns a curved version by applying a Bezier spline algorithm.',
parameters: [
{
name: 'resolution',
description :'Time in milliseconds between points',
type: 'number',
default: 10000
},
{
name: 'sharpness',
description :'a measure of how curvy the path should be between splines',
type: 'number',
default: 0.85
}
],
createsLayer: true
>>>>>>>
},
tin: {
minFeatures: 1,
maxFeatures: 1,
description: 'Triangulated irregular network, interpolation method',
},
bezier: {
minFeatures: 1,
description: 'Takes a line and returns a curved version by applying a Bezier spline algorithm.',
parameters: [
{
name: 'resolution',
description :'Time in milliseconds between points',
type: 'number',
default: 10000
},
{
name: 'sharpness',
description :'a measure of how curvy the path should be between splines',
type: 'number',
default: 0.85
}
],
createsLayer: true |
<<<<<<<
items: ['bezier', 'buffer', 'union', 'tin']
=======
items: ['buffer', 'center', 'centroid', 'envelope', 'union'] // Items in menu
>>>>>>>
items: ['bezier', 'buffer', 'center', 'centroid', 'envelope', 'union', 'tin'] |
<<<<<<<
},
icons: {
cwd: 'node_modules/geoglyphs/dist',
src: '**/*.svg',
dest: 'dist/icons',
expand: true
=======
},
assets: {
expand: true,
cwd: 'src/assets/',
src: ['*.*', '**/*.*'],
dest: 'dist/assets/'
>>>>>>>
},
icons: {
cwd: 'node_modules/geoglyphs/dist',
src: '**/*.svg',
dest: 'dist/icons',
expand: true
},
assets: {
expand: true,
cwd: 'src/assets/',
src: ['*.*', '**/*.*'],
dest: 'dist/assets/' |
<<<<<<<
OmniScript.prototype.hashSObjectData = async function(input) {
var sobject = input.sobject;
if (sobject && sobject['%vlocity_namespace%__PropertySet__c']) {
sobject['%vlocity_namespace%__PropertySet__c'] = sobject['%vlocity_namespace%__PropertySet__c'].replace(/id=01.+?&/g, 'id=<SalesforceId>').replace(/oid=00.+?\\/g, 'oid=<SalesforceId>\\').replace(/oid=00.+?"/g, 'oid=<SalesforceId>"').replace(/file=015.+?&/g, 'file=<SalesforceId>&');
}
};
=======
OmniScript.prototype.getBulkJobObjectName = function() {
return this.vlocity.namespacePrefix + "Element__c";
}
OmniScript.prototype.getBulkJobObjectKey = function () {
return this.vlocity.namespacePrefix + "OmniScriptId__c";
}
>>>>>>>
OmniScript.prototype.hashSObjectData = async function(input) {
var sobject = input.sobject;
if (sobject && sobject['%vlocity_namespace%__PropertySet__c']) {
sobject['%vlocity_namespace%__PropertySet__c'] = sobject['%vlocity_namespace%__PropertySet__c'].replace(/id=01.+?&/g, 'id=<SalesforceId>').replace(/oid=00.+?\\/g, 'oid=<SalesforceId>\\').replace(/oid=00.+?"/g, 'oid=<SalesforceId>"').replace(/file=015.+?&/g, 'file=<SalesforceId>&');
}
};
OmniScript.prototype.getBulkJobObjectName = function() {
return this.vlocity.namespacePrefix + "Element__c";
}
OmniScript.prototype.getBulkJobObjectKey = function () {
return this.vlocity.namespacePrefix + "OmniScriptId__c";
} |
<<<<<<<
"upgradeDataPackFields": Boolean,
"inlcudeDependencies": Boolean
=======
"upgradeDataPackFields": Boolean,
"testKeys": Array
>>>>>>>
"upgradeDataPackFields": Boolean,
"inlcudeDependencies": Boolean,
"testKeys": Array |
<<<<<<<
var version = this.vlocity.buildToolsVersionSettings[this.vlocity.namespace][i];
if (this.vlocity.PackageMajorVersion > version.PackageMajorVersion) {
this.vlocity.BuildToolSettingVersion = version.version;
break;
} else if (this.vlocity.PackageMajorVersion == version.PackageMajorVersion) {
if (this.vlocity.PackageMinorVersion >= version.PackageMinorVersion) {
this.vlocity.BuildToolSettingVersion = version.version;
break;
}
}
}
if (!this.vlocity.BuildToolSettingVersion) {
this.vlocity.BuildToolSettingVersion = "latest";
}
}
}
}
=======
resolve(result);
});
});
};
UtilityService.prototype.describeSObject = async function(sObjectName) {
var self = this;
return await new Promise(function(resolve, reject) {
self.vlocity.jsForceConnection.sobject(sObjectName).describe(function(err, result) {
if (err) {
VlocityUtils.error('Not found', err.message);
}
resolve(result);
});
});
};
UtilityService.prototype.getFieldsDefinitionsMap = function(sObjectDescribe) {
var fieldsDefinitionMap = {};
for (var i = 0; i < sObjectDescribe.fields.length; i++) {
fieldsDefinitionMap[sObjectDescribe.fields[i].name] = sObjectDescribe.fields[i];
}
return fieldsDefinitionMap;
>>>>>>>
var version = this.vlocity.buildToolsVersionSettings[this.vlocity.namespace][i];
if (this.vlocity.PackageMajorVersion > version.PackageMajorVersion) {
this.vlocity.BuildToolSettingVersion = version.version;
break;
} else if (this.vlocity.PackageMajorVersion == version.PackageMajorVersion) {
if (this.vlocity.PackageMinorVersion >= version.PackageMinorVersion) {
this.vlocity.BuildToolSettingVersion = version.version;
break;
}
}
}
if (!this.vlocity.BuildToolSettingVersion) {
this.vlocity.BuildToolSettingVersion = "latest";
}
}
}
}
};
UtilityService.prototype.describeSObject = async function(sObjectName) {
var self = this;
return await new Promise(function(resolve, reject) {
self.vlocity.jsForceConnection.sobject(sObjectName).describe(function(err, result) {
if (err) {
VlocityUtils.error('Not found', err.message);
}
resolve(result);
});
});
};
UtilityService.prototype.getFieldsDefinitionsMap = function(sObjectDescribe) {
var fieldsDefinitionMap = {};
for (var i = 0; i < sObjectDescribe.fields.length; i++) {
fieldsDefinitionMap[sObjectDescribe.fields[i].name] = sObjectDescribe.fields[i];
}
return fieldsDefinitionMap; |
<<<<<<<
"gitCheck": Boolean,
"checkStaleObjects": Boolean
=======
"gitCheck": Boolean,
"deleteSfdxProject": Boolean
>>>>>>>
"gitCheck": Boolean,
"checkStaleObjects": Boolean,
"deleteSfdxProject": Boolean
<<<<<<<
checkStaleObjects: {
name: 'CheckStaleObjects',
description: 'CheckStaleObjects'
}
=======
retrieveSalesforce: {
name: 'RetrieveSalesforce',
description: 'None'
}
>>>>>>>
checkStaleObjects: {
name: 'CheckStaleObjects',
description: 'CheckStaleObjects'
},
retrieveSalesforce: {
name: 'RetrieveSalesforce',
description: 'None'
} |
<<<<<<<
for (var queryData of jobInfo.queries) {
=======
if (!jobInfo.fullManifest[queryData.VlocityDataPackType][record.Id]) {
if (jobInfo.specificManifestKeys
&& jobInfo.specificManifestKeys.indexOf(queryData.VlocityDataPackType) == -1
&& jobInfo.specificManifestKeys.indexOf(record.VlocityDataPackKeyForManifest) == -1
&& jobInfo.specificManifestKeys.indexOf(self.vlocity.datapacksexpand.sanitizeDataPackKey(record.VlocityDataPackKeyForManifest)) == -1
&& jobInfo.specificManifestKeys.indexOf(record.Id) == -1) {
return;
}
>>>>>>>
for (var queryData of jobInfo.queries) {
if (!jobInfo.fullManifest[queryData.VlocityDataPackType][record.Id]) {
if (jobInfo.specificManifestKeys
&& jobInfo.specificManifestKeys.indexOf(queryData.VlocityDataPackType) == -1
&& jobInfo.specificManifestKeys.indexOf(record.VlocityDataPackKeyForManifest) == -1
&& jobInfo.specificManifestKeys.indexOf(self.vlocity.datapacksexpand.sanitizeDataPackKey(record.VlocityDataPackKeyForManifest)) == -1
&& jobInfo.specificManifestKeys.indexOf(record.Id) == -1) {
return;
}
} |
<<<<<<<
try {
if (this.vlocity.sessionId || this.vlocity.accessToken) {
await this.getNamespace();
} else if (this.vlocity.sfdxUsername) {
await this.sfdxLogin();
await this.getNamespace();
} else if (this.vlocity.username && this.vlocity.password) {
await this.login();
await this.getNamespace();
=======
if (this.vlocity.sessionId || this.vlocity.accessToken) {
await this.getNamespace();
await this.checkRequiredVersion();
} else if (this.vlocity.sfdxUsername) {
await this.sfdxLogin();
await this.getNamespace();
await this.checkRequiredVersion();
} else if (this.vlocity.username && this.vlocity.password) {
await this.login();
await this.getNamespace();
await this.checkRequiredVersion();
} else {
if (this.vlocity.passedInNamespace) {
this.vlocity.namespace = this.vlocity.passedInNamespace;
>>>>>>>
try {
if (this.vlocity.sessionId || this.vlocity.accessToken) {
await this.getNamespace();
await this.checkRequiredVersion();
} else if (this.vlocity.sfdxUsername) {
await this.sfdxLogin();
await this.getNamespace();
await this.checkRequiredVersion();
} else if (this.vlocity.username && this.vlocity.password) {
await this.login();
await this.getNamespace();
await this.checkRequiredVersion(); |
<<<<<<<
jobInfo.errorHandling = jobInfo.errorHandling || {};
jobInfo.relationshipKeyToChildKeys = jobInfo.relationshipKeyToChildKeys || {};
=======
// Means that Continue or Retry will not work
if (jobInfo.jobAction == 'Continue' || jobInfo.jobAction == 'Retry') {
throw jobInfo.jobAction + ' initialization failed. Please use another Command';
}
>>>>>>>
jobInfo.errorHandling = jobInfo.errorHandling || {};
jobInfo.relationshipKeyToChildKeys = jobInfo.relationshipKeyToChildKeys || {};
// Means that Continue or Retry will not work
if (jobInfo.jobAction == 'Continue' || jobInfo.jobAction == 'Retry') {
throw jobInfo.jobAction + ' initialization failed. Please use another Command';
} |
<<<<<<<
await new Promise(resolve => setTimeout(resolve, 15000));
=======
await new Promise(resolve => setTimeout(resolve, 20000));
>>>>>>>
await new Promise(resolve => setTimeout(resolve, 20000));
<<<<<<<
=======
var dataPackType = dataJson.dataPacks[0].VlocityDataPackType;
while (this.runningParallel[dataPackType]) {
await new Promise(resolve => setTimeout(resolve, 5000));
}
if (!this.vlocity.datapacksutils.isAllowParallel(dataPackType, dataJson.dataPacks[0])) {
this.runningParallel[dataPackType] = true;
}
>>>>>>> |
<<<<<<<
},
{
loader: 'style!css',
test: /\.css$/
},
{
loader: 'url',
test: /\.(eot|svg|ttf|woff(2)?)(\?v=\d+\.\d+\.\d+)?/
=======
},
{
loader: 'style!css',
test: /\.css$/
},
{
loader: 'file',
test: /\.png$/
>>>>>>>
},
{
loader: 'style!css',
test: /\.css$/
},
{
loader: 'url',
test: /\.(eot|svg|ttf|woff(2)?)(\?v=\d+\.\d+\.\d+)?/
},
{
loader: 'file',
test: /\.png$/ |
<<<<<<<
{test: /\.json$/, loader: 'json', include: [path.resolve('src')]},
{test: /\.js$/, loaders: ['react-hot', babelLoader], include: [path.resolve('src')]}
=======
{test: /\.js$/, loader: 'babel', include: [path.resolve('src')]}
>>>>>>>
{test: /\.json$/, loader: 'json', include: [path.resolve('src')]},
{test: /\.js$/, loader: 'babel', include: [path.resolve('src')]} |
<<<<<<<
},
'AutoRemediateRds-006': {
'enabled': false
=======
},
'AutoRemediateRDS-006': {
'enabled': false
},
'AutoRemediateRDS-023': {
'enabled': false
}
'AutoRemediateKMS-004': {
'enabled': false
>>>>>>>
},
'AutoRemediateRds-006': {
'enabled': false
},
'AutoRemediateRDS-006': {
'enabled': false
},
'AutoRemediateRDS-023': {
'enabled': false
}
'AutoRemediateKMS-004': {
'enabled': false |
<<<<<<<
connect(addr, cb)
}, 'string|object'),
=======
// look up the peer
var peer = u.find(peers, function (a) {
return (
addr.port === a.port
&& addr.host === a.host
&& addr.key === a.key
)
})
connect(peer, cb)
},
>>>>>>>
// look up the peer
var peer = u.find(peers, function (a) {
return (
addr.port === a.port
&& addr.host === a.host
&& addr.key === a.key
)
})
connect(peer, cb)
}, 'string|object'), |
<<<<<<<
var pull = require('pull-stream')
=======
var ssbKeys = require('ssb-keys')
var u = require('./util')
var toAddr = require('../lib/util').toAddress
>>>>>>>
var pull = require('pull-stream')
var ssbKeys = require('ssb-keys')
var u = require('./util')
var toAddr = require('../lib/util').toAddress
<<<<<<<
=======
var apub = cont(dbA.publish)
var bpub = cont(dbB.publish)
var cpub = cont(dbC.publish)
>>>>>>>
var apub = cont(dbA.publish)
var bpub = cont(dbB.publish)
var cpub = cont(dbC.publish) |
<<<<<<<
.use(require('./plugins/logging'))
.use(require('./plugins/replicate'))
=======
>>>>>>>
.use(require('./plugins/logging'))
.use(require('./plugins/replicate'))
<<<<<<<
.use(require('./plugins/logging'))
=======
.use(require('./plugins/friends'))
>>>>>>>
.use(require('./plugins/friends')) |
<<<<<<<
symbolUrl = "./images/pins/" + this.config.pushpinColor + ".png";
pictureMarkerSymbol = new PictureMarkerSymbol(symbolUrl, 36, 36).setOffset(10, 0);
=======
symbolUrl = "./images/pins/purple.png";
// create symbol and offset 10 to the left and 17 to the bottom so it points correctly
pictureMarkerSymbol = new PictureMarkerSymbol(symbolUrl, 36, 36).setOffset(9, 18);
>>>>>>>
symbolUrl = "./images/pins/" + this.config.pushpinColor + ".png";
// create symbol and offset 10 to the left and 17 to the bottom so it points correctly
pictureMarkerSymbol = new PictureMarkerSymbol(symbolUrl, 36, 36).setOffset(9, 18); |
<<<<<<<
var isWindows = /Windows /.test(navigator.userAgent); // Windows (8.1)
var isAndroid = !isWindows && /Android/.test(navigator.userAgent);
var isIE = isWindows || isWP8;
var isWebKit = !isIE; // TBD [Android or iOS]
// NOTE: In the core-master branch there is no difference between the default
// implementation and implementation #2. But the test will also apply
// the androidLockWorkaround: 1 option in the case of implementation #2.
=======
var isWindows = /Windows /.test(navigator.userAgent);
var isAndroid = !isWindows && /Android/.test(navigator.userAgent);
// NOTE: While in certain version branches there is no difference between
// the default Android implementation and implementation #2,
// this test script will also apply the androidLockWorkaround: 1 option
// in case of implementation #2.
>>>>>>>
var isWindows = /Windows /.test(navigator.userAgent);
var isAndroid = !isWindows && /Android/.test(navigator.userAgent);
// NOTE: While in certain version branches there is no difference between
// the default Android implementation and implementation #2,
// this test script will also apply the androidLockWorkaround: 1 option
// in case of implementation #2.
<<<<<<<
describe('Plugin - BASIC sqlitePlugin.openDatabase parameter check test(s)', function() {
=======
describe('Basic sqlitePlugin.openDatabase parameter test(s)', function() {
>>>>>>>
describe('Basic sqlitePlugin.openDatabase parameter test(s)', function() {
<<<<<<<
window.sqlitePlugin.openDatabase({ name: p1, location: 'default' }, function(db) {
// NOT EXPECTED:
expect(false).toBe(true);
done();
}, function(error) {
// OK but NOT EXPECTED:
expect('Behavior changed, please update this test').toBe('--');
done();
});
} catch (e) {
// stopped by the implementation:
expect(true).toBe(true);
done();
}
}, MYTIMEOUT);
it(suiteName + 'Open with no location setting (REJECTED with exception)', function(done) {
try {
window.sqlitePlugin.openDatabase({ name: 'open-with-no-location-setting.db' }, function(db) {
// NOT EXPECTED:
expect(false).toBe(true);
// Close (plugin) & finish:
db.close(done, done);
}, function(error) {
// OK but NOT EXPECTED:
expect('Behavior changed, please update this test').toBe('--');
done();
});
} catch (e) {
// EXPECTED RESULT: stopped by the implementation
expect(true).toBe(true);
done();
}
}, MYTIMEOUT);
it(suiteName + 'Open with both location & iosDatabaseLocation settings (REJECTED with exception)', function(done) {
try {
window.sqlitePlugin.openDatabase({
name: 'open-with-both-location-and-iosDatabaseLocation.db',
location: 'default',
iosDatabaseLocation: 2
}, function(db) {
// NOT EXPECTED:
expect(false).toBe(true);
// Close (plugin) & finish:
db.close(done, done);
}, function(error) {
// OK but NOT EXPECTED:
expect('Behavior changed, please update this test').toBe('--');
done();
});
} catch (e) {
// EXPECTED RESULT: stopped by the implementation
expect(true).toBe(true);
done();
}
}, MYTIMEOUT);
it(suiteName + 'Open with location: -1 (REJECTED with exception)', function(done) {
try {
window.sqlitePlugin.openDatabase({ name: 'open-with-location--1.db', location: -1 }, function(db) {
// NOT EXPECTED:
expect(false).toBe(true);
// Close (plugin) & finish:
db.close(done, done);
}, function(error) {
// OK but NOT EXPECTED:
expect('Behavior changed, please update this test').toBe('--');
done();
});
} catch (e) {
// EXPECTED RESULT: stopped by the implementation
expect(true).toBe(true);
done();
}
}, MYTIMEOUT);
it(suiteName + 'Open with iosDatabaseLocation: -1 (REJECTED with exception)', function(done) {
try {
window.sqlitePlugin.openDatabase({
name: 'open-iosDatabaseLocation--1.db',
iosDatabaseLocation: -1
}, function(db) {
// NOT EXPECTED:
=======
window.sqlitePlugin.openDatabase({ name: p1, location: 'default' }, function(db) {
// NOT EXPECTED:
>>>>>>>
window.sqlitePlugin.openDatabase({ name: p1, location: 'default' }, function(db) {
// NOT EXPECTED:
expect(false).toBe(true);
done();
}, function(error) {
// OK but NOT EXPECTED:
expect('Behavior changed, please update this test').toBe('--');
done();
});
} catch (e) {
// stopped by the implementation:
expect(true).toBe(true);
done();
}
}, MYTIMEOUT);
it(suiteName + 'Open with no location setting (REJECTED with exception)', function(done) {
try {
window.sqlitePlugin.openDatabase({ name: 'open-with-no-location-setting.db' }, function(db) {
// NOT EXPECTED:
expect(false).toBe(true);
// Close (plugin) & finish:
db.close(done, done);
}, function(error) {
// OK but NOT EXPECTED:
expect('Behavior changed, please update this test').toBe('--');
done();
});
} catch (e) {
// EXPECTED RESULT: stopped by the implementation
expect(true).toBe(true);
done();
}
}, MYTIMEOUT);
it(suiteName + 'Open with both location & iosDatabaseLocation settings (REJECTED with exception)', function(done) {
try {
window.sqlitePlugin.openDatabase({
name: 'open-with-both-location-and-iosDatabaseLocation.db',
location: 'default',
iosDatabaseLocation: 2
}, function(db) {
// NOT EXPECTED:
expect(false).toBe(true);
// Close (plugin) & finish:
db.close(done, done);
}, function(error) {
// OK but NOT EXPECTED:
expect('Behavior changed, please update this test').toBe('--');
done();
});
} catch (e) {
// EXPECTED RESULT: stopped by the implementation
expect(true).toBe(true);
done();
}
}, MYTIMEOUT);
it(suiteName + 'Open with location: -1 (REJECTED with exception)', function(done) {
try {
window.sqlitePlugin.openDatabase({ name: 'open-with-location--1.db', location: -1 }, function(db) {
// NOT EXPECTED:
expect(false).toBe(true);
// Close (plugin) & finish:
db.close(done, done);
}, function(error) {
// OK but NOT EXPECTED:
expect('Behavior changed, please update this test').toBe('--');
done();
});
} catch (e) {
// EXPECTED RESULT: stopped by the implementation
expect(true).toBe(true);
done();
}
}, MYTIMEOUT);
it(suiteName + 'Open with iosDatabaseLocation: -1 (REJECTED with exception)', function(done) {
try {
window.sqlitePlugin.openDatabase({
name: 'open-iosDatabaseLocation--1.db',
iosDatabaseLocation: -1
}, function(db) {
// NOT EXPECTED:
<<<<<<<
// XXX POSSIBLY BROKEN on iOS/macOS due to current background processing implementation
if (!(isAndroid || isIE)) pending('POSSIBLY BROKEN on iOS/macOS (background processing implementation)');
=======
// TBD POSSIBLY BROKEN on iOS/macOS due to current background processing implementation:
if (!isAndroid && !isWindows && !isWP8) pending('POSSIBLY BROKEN on iOS/macOS (background processing implementation)');
>>>>>>>
// TBD POSSIBLY BROKEN on iOS/macOS due to current background processing implementation:
if (!isAndroid && !isWindows && !isWP8) pending('POSSIBLY BROKEN on iOS/macOS (background processing implementation)');
<<<<<<<
var dbName = "Database-Close-and-Reopen";
=======
>>>>>>>
<<<<<<<
// XXX POSSIBLY BROKEN on iOS/macOS due to current background processing implementation
if (!(isAndroid || isIE)) pending('POSSIBLY BROKEN on iOS/macOS (background processing implementation)');
=======
// TBD POSSIBLY BROKEN on iOS/macOS due to current background processing implementation:
if (!isAndroid && !isWindows && !isWP8) pending('POSSIBLY BROKEN on iOS/macOS (background processing implementation)');
>>>>>>>
// TBD POSSIBLY BROKEN on iOS/macOS ...
// if (!isAndroid && !isWindows && !isWP8) pending(...);
// TBD CURRENTLY BROKEN IN THIS VERSION BRANCH
// due to a hack needed to solve problem with workaround solution to
// litehelpers/Cordova-sqlite-storage#666 & pre-populated database on Windows
pending('CURRENTLY BROKEN DUE TO HACK in this version branch');
<<<<<<<
// XXX CURRENTLY BROKEN on iOS/macOS due to current background processing implementation
if (!(isAndroid || isIE)) pending('CURRENTLY BROKEN on iOS/macOS (background processing implementation)');
=======
// TBD CURRENTLY BROKEN on iOS/macOS due to current background processing implementation:
if (!isAndroid && !isWindows && !isWP8) pending('CURRENTLY BROKEN on iOS/macOS (background processing implementation)');
>>>>>>>
// TBD CURRENTLY BROKEN on iOS/macOS due to current background processing implementation:
if (!isAndroid && !isWindows && !isWP8) pending('CURRENTLY BROKEN on iOS/macOS (background processing implementation)');
<<<<<<<
// XXX CURRENTLY BROKEN on iOS/macOS due to current background processing implementation
if (!(isAndroid || isIE)) pending('CURRENTLY BROKEN on iOS/macOS (background processing implementation)');
=======
// TBD CURRENTLY BROKEN on iOS/macOS due to current background processing implementation:
if (!isAndroid && !isWindows && !isWP8) pending('CURRENTLY BROKEN on iOS/macOS (background processing implementation)');
>>>>>>>
// TBD CURRENTLY BROKEN on iOS/macOS ...
// if (!isAndroid && !isWindows && !isWP8) pending(...);
// TBD CURRENTLY BROKEN IN THIS VERSION BRANCH
// due to a hack needed to solve problem with workaround solution to
// litehelpers/Cordova-sqlite-storage#666 & pre-populated database on Windows
pending('CURRENTLY BROKEN DUE TO HACK in this version branch'); |
<<<<<<<
var isAndroid = !isWindows && /Android/.test(navigator.userAgent);
// The following openDatabase settings are used for Plugin-implementation-2
// on Android:
// - androidDatabaseImplementation: 2
// - androidLockWorkaround: 1
=======
// NOTE: While in certain version branches there is no difference between
// the default Android implementation and implementation #2,
// this test script will also apply the androidLockWorkaround: 1 option
// in case of implementation #2.
>>>>>>>
var isAndroid = !isWindows && /Android/.test(navigator.userAgent);
// NOTE: While in certain version branches there is no difference between
// the default Android implementation and implementation #2,
// this test script will also apply the androidLockWorkaround: 1 option
// in case of implementation #2.
// The following openDatabase settings are used for Plugin-implementation-2
// on Android:
// - androidDatabaseImplementation: 2
// - androidLockWorkaround: 1
<<<<<<<
var isImpl2 = (i === 2);
// NOTE 1: MUST be defined in proper describe function scope, NOT outer scope.
// NOTE 2: Using same database name in this script to avoid issue with
// "Too many open files" on iOS with WKWebView engine plugin.
// (FUTURE TBD NEEDS INVESTIGATION)
var openDatabase = function(name_ignored, ignored1, ignored2, ignored3) {
var name = 'string-test.db';
if (isImpl2) {
=======
var isImpl2 = (i === 2);
// NOTE: MUST be defined in function scope, NOT outer scope:
var openDatabase = function(name, ignored1, ignored2, ignored3) {
if (isImpl2) {
>>>>>>>
var isImpl2 = (i === 2);
// NOTE 1: MUST be defined in proper describe function scope, NOT outer scope.
// NOTE 2: Using same database name in this script to avoid issue with
// "Too many open files" on iOS with WKWebView engine plugin.
// (FUTURE TBD NEEDS INVESTIGATION)
var openDatabase = function(name_ignored, ignored1, ignored2, ignored3) {
var name = 'string-test.db';
if (isImpl2) {
<<<<<<<
androidLockWorkaround: 1,
location: 'default'
=======
androidLockWorkaround: 1
>>>>>>>
androidLockWorkaround: 1
<<<<<<<
return window.sqlitePlugin.openDatabase({name: name, location: 'default'});
=======
// explicit database location:
return window.sqlitePlugin.openDatabase({name: name, location: 'default'});
>>>>>>>
// explicit database location:
return window.sqlitePlugin.openDatabase({name: name, location: 'default'});
<<<<<<<
it(suiteName + 'US-ASCII String binding test', function(done) {
var db = openDatabase("ASCII-string-binding-test.db", "1.0", "Demo", DEFAULT_SIZE);
=======
it(suiteName + ' string encoding test with UNICODE \\u0000', function (done) {
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
if (isWindows) pending('BROKEN on Windows'); // TBD (truncates on Windows)
// TBD NOT BROKEN for Android (no Android-sqlite-connector implementation) in this version branch:
//if (!isWebSql && !isWindows && isAndroid && !isImpl2) pending('BROKEN on Android-sqlite-connector implementation)');
>>>>>>>
it(suiteName + 'US-ASCII String binding test', function(done) {
var db = openDatabase("ASCII-string-binding-test.db", "1.0", "Demo", DEFAULT_SIZE);
<<<<<<<
it(suiteName + "INLINE string vertical tab test", function(done) {
if (isWP8) pending('BROKEN for WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
=======
it(suiteName + "String vertical tab test", function(done) {
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
>>>>>>>
it(suiteName + "INLINE string vertical tab test", function(done) {
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
<<<<<<<
it(suiteName + "INLINE string form feed test", function(done) {
if (isWP8) pending('BROKEN for WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
=======
it(suiteName + "String form feed test", function(done) {
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
>>>>>>>
it(suiteName + "INLINE string form feed test", function(done) {
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
<<<<<<<
it(suiteName + "INLINE string backspace test", function(done) {
if (isWP8) pending('BROKEN for WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
=======
it(suiteName + "String backspace test", function(done) {
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
>>>>>>>
it(suiteName + "INLINE string backspace test", function(done) {
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
<<<<<<<
=======
// NOTE: the next 2 tests show that for iOS/macOS/Android:
// - UNICODE \u2028 line separator from JavaScript to native (Objective-C/Java) is working OK
// - UNICODE \u2028 line separator from native (Objective-C/Java) to JavaScript is BROKEN
// For reference:
// - litehelpers/Cordova-sqlite-storage#147
// - Apache Cordova CB-9435 (issue with cordova-ios, also affects macOS)
// - cordova/cordova-discuss#57 (issue with cordova-android)
>>>>>>>
<<<<<<<
it(suiteName + 'HEX value of string with UNICODE \\u2028 line separator', function(done) {
// NOTE: this test verifies that the UNICODE line separator (\u2028)
// is seen by the sqlite implementation OK:
var db = openDatabase("UNICODE-line-separator-hex-value-test.db", "1.0", "Demo", DEFAULT_SIZE);
expect(db).toBeDefined();
db.transaction(function(tx) {
expect(tx).toBeDefined();
tx.executeSql('SELECT HEX(?) AS myresult', ['1\u2028'], function (tx_ignored, rs) {
if (isWindows)
expect(rs.rows.item(0).myresult).toBe('31002820'); // (UTF-16le)
else
expect(rs.rows.item(0).myresult).toBe('31E280A8'); // (UTF-8)
// Close (plugin only) & finish:
(isWebSql) ? done() : db.close(done, done);
});
}, function(error) {
// NOT EXPECTED:
expect(false).toBe(true);
expect(error.message).toBe('--');
// Close (plugin only) & finish:
(isWebSql) ? done() : db.close(done, done);
});
}, MYTIMEOUT);
it(suiteName + ' handles UNICODE \\u2028 line separator correctly [string test]', function (done) {
if (isWP8) pending('BROKEN for WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
if (!isWebSql && isAndroid) pending('BROKEN for Android plugin (cordova-android 6.x'); // see cordova/cordova-discuss#57
if (!isWebSql && !isAndroid && !isWindows && !isWP8) pending('BROKEN for iOS/macOS plugin'); // [BUG #147] (no callback received)
=======
it(suiteName + ' handles UNICODE \\u2028 line separator correctly [string test]', function (done) {
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
if (!isWebSql && !isWindows && isAndroid) pending('SKIP for Android plugin (cordova-android 6.x BUG: cordova/cordova-discuss#57)');
if (!isWebSql && !isWindows && !isAndroid && !isWP8) pending('SKIP for iOS/macOS plugin (Cordova BUG: CB-9435)');
>>>>>>>
it(suiteName + 'HEX value of string with UNICODE \\u2028 line separator', function(done) {
// NOTE: this test verifies that the UNICODE line separator (\u2028)
// is seen by the sqlite implementation OK:
var db = openDatabase("UNICODE-line-separator-hex-value-test.db", "1.0", "Demo", DEFAULT_SIZE);
expect(db).toBeDefined();
db.transaction(function(tx) {
expect(tx).toBeDefined();
tx.executeSql('SELECT HEX(?) AS myresult', ['1\u2028'], function (tx_ignored, rs) {
if (isWindows)
expect(rs.rows.item(0).myresult).toBe('31002820'); // (UTF-16le)
else
expect(rs.rows.item(0).myresult).toBe('31E280A8'); // (UTF-8)
// Close (plugin only) & finish:
(isWebSql) ? done() : db.close(done, done);
});
}, function(error) {
// NOT EXPECTED:
expect(false).toBe(true);
expect(error.message).toBe('--');
// Close (plugin only) & finish:
(isWebSql) ? done() : db.close(done, done);
});
}, MYTIMEOUT);
it(suiteName + ' handles UNICODE \\u2028 line separator correctly [string test]', function (done) {
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
if (!isWebSql && !isWindows && isAndroid) pending('SKIP for Android plugin (cordova-android 6.x BUG: cordova/cordova-discuss#57)');
if (!isWebSql && !isWindows && !isAndroid && !isWP8) pending('SKIP for iOS/macOS plugin (Cordova BUG: CB-9435)');
<<<<<<<
}, MYTIMEOUT);
// NOTE: the next 3 tests repeat the above for UNICODE \u2029 paragraph separator
// on iOS/macOS/Android:
// - UNICODE \u2029 paragraph separator from JavaScript to native (Objective-C/Java) is working OK
// - UNICODE \u2029 paragraph separator from native (Objective-C/Java) to JavaScript is BROKEN
// For reference:
// - litehelpers/Cordova-sqlite-storage#147
// - Apache Cordova CB-9435 (issue with cordova-ios, also affects macOS)
// - cordova/cordova-discuss#57 (issue with cordova-android)
it(suiteName + "UNICODE \\u2029 paragraph separator string length", function(done) {
if (isWP8) pending('BROKEN for WP(8)'); // [BUG #202] Certain UNICODE characters not working with WP(8)
=======
});
// NOTE: the next 2 tests repeat the above for UNICODE \u2029 paragraph separator
// on iOS/macOS/Android:
// - UNICODE \u2029 paragraph separator from JavaScript to native (Objective-C/Java) is working OK
// - UNICODE \u2029 paragraph separator from native (Objective-C/Java) to JavaScript is BROKEN
// For reference:
// - litehelpers/Cordova-sqlite-storage#147
// - Apache Cordova CB-9435 (issue with cordova-ios, also affects macOS)
// - cordova/cordova-discuss#57 (issue with cordova-android)
it(suiteName + "UNICODE \\u2029 line separator string length", function(done) {
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] Certain UNICODE characters not working with WP(8)
>>>>>>>
}, MYTIMEOUT);
// NOTE: the next 3 tests repeat the above for UNICODE \u2029 paragraph separator
// on iOS/macOS/Android:
// - UNICODE \u2029 paragraph separator from JavaScript to native (Objective-C/Java) is working OK
// - UNICODE \u2029 paragraph separator from native (Objective-C/Java) to JavaScript is BROKEN
// For reference:
// - litehelpers/Cordova-sqlite-storage#147
// - Apache Cordova CB-9435 (issue with cordova-ios, also affects macOS)
// - cordova/cordova-discuss#57 (issue with cordova-android)
it(suiteName + "UNICODE \\u2029 paragraph separator string length", function(done) {
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] Certain UNICODE characters not working with WP(8)
<<<<<<<
db.transaction(function(tx) {
expect(tx).toBeDefined();
tx.executeSql('SELECT HEX(?) AS myresult', ['1\u2029'], function (tx_ignored, rs) {
if (isWindows)
expect(rs.rows.item(0).myresult).toBe('31002920'); // (UTF-16le)
else
expect(rs.rows.item(0).myresult).toBe('31E280A9'); // (UTF-8)
// Close (plugin only) & finish:
(isWebSql) ? done() : db.close(done, done);
});
}, function(error) {
// NOT EXPECTED:
expect(false).toBe(true);
expect(error.message).toBe('--');
// Close (plugin only) & finish:
(isWebSql) ? done() : db.close(done, done);
});
}, MYTIMEOUT);
it(suiteName + ' handles UNICODE \\u2029 paragraph separator correctly [string test]', function (done) {
if (isWP8) pending('BROKEN for WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
if (!isWebSql && isAndroid) pending('BROKEN for Android plugin (cordova-android 6.x'); // see cordova/cordova-discuss#57
if (!isWebSql && !isAndroid && !isWindows && !isWP8) pending('BROKEN for iOS/macOS plugin'); // [BUG #147] (no callback received)
=======
it(suiteName + ' handles UNICODE \\u2029 line separator correctly [string test]', function (done) {
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
if (!isWebSql && !isWindows && isAndroid) pending('SKIP for Android plugin (cordova-android 6.x BUG: cordova/cordova-discuss#57)');
if (!isWebSql && !isWindows && !isAndroid && !isWP8) pending('SKIP for iOS/macOS plugin (Cordova BUG: CB-9435)');
>>>>>>>
db.transaction(function(tx) {
expect(tx).toBeDefined();
tx.executeSql('SELECT HEX(?) AS myresult', ['1\u2029'], function (tx_ignored, rs) {
if (isWindows)
expect(rs.rows.item(0).myresult).toBe('31002920'); // (UTF-16le)
else
expect(rs.rows.item(0).myresult).toBe('31E280A9'); // (UTF-8)
// Close (plugin only) & finish:
(isWebSql) ? done() : db.close(done, done);
});
}, function(error) {
// NOT EXPECTED:
expect(false).toBe(true);
expect(error.message).toBe('--');
// Close (plugin only) & finish:
(isWebSql) ? done() : db.close(done, done);
});
}, MYTIMEOUT);
it(suiteName + ' handles UNICODE \\u2029 paragraph separator correctly [string test]', function (done) {
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
if (!isWebSql && !isWindows && isAndroid) pending('SKIP for Android plugin (cordova-android 6.x BUG: cordova/cordova-discuss#57)');
if (!isWebSql && !isWindows && !isAndroid && !isWP8) pending('SKIP for iOS/macOS plugin (Cordova BUG: CB-9435)'); |
<<<<<<<
if (!readTransactionFinished) {
SelfTest.finishWithError(errorcb, 'readTransaction did not finish');
return;
}
return db.transaction(function(tx3) {
tx3.executeSql('DELETE FROM TestTable');
return tx3.executeSql('INSERT INTO TestTable (data) VALUES(?)', [123]);
}, function(tx3_err) {
return SelfTest.finishWithError(errorcb, "DELETE transaction error: " + tx3_err);
}, function() {
var secondReadTransactionFinished;
secondReadTransactionFinished = false;
return db.readTransaction(function(tx4) {
return tx4.executeSql('SELECT id, data FROM TestTable', [], function(ignored, resutSet3) {
if (!resutSet3.rows) {
throw newSQLError('Missing resutSet3.rows');
}
if (!resutSet3.rows.length) {
throw newSQLError('Missing resutSet3.rows.length');
}
if (resutSet3.rows.length !== 1) {
throw newSQLError("Incorrect resutSet3.rows.length value: " + resutSet3.rows.length + " (expected: 1)");
}
if (!resutSet3.rows.item(0).id) {
throw newSQLError('Missing resutSet3.rows.item(0).id');
}
if (resutSet3.rows.item(0).id === firstid) {
throw newSQLError("resutSet3.rows.item(0).id value " + (resutSet3.rows.item(0).id) + " incorrectly matches previous unique key id value value (" + firstid + ")");
}
if (!resutSet3.rows.item(0).data) {
throw newSQLError('Missing resutSet3.rows.item(0).data');
}
if (resutSet3.rows.item(0).data !== 123) {
throw newSQLError("Incorrect resutSet3.rows.item(0).data value: " + (resutSet3.rows.item(0).data) + " (expected 123)");
}
return secondReadTransactionFinished = true;
});
}, function(tx4_err) {
return SelfTest.finishWithError(errorcb, "second readTransaction error: " + tx4_err);
}, function() {
if (!secondReadTransactionFinished) {
SelfTest.finishWithError(errorcb, 'second readTransaction did not finish');
return;
}
return db.close(function() {
return SQLiteFactory.deleteDatabase({
name: SelfTest.DBNAME,
location: 'default'
}, successcb, function(cleanup_err) {
if (/Windows /.test(navigator.userAgent) || /IEMobile/.test(navigator.userAgent)) {
console.log("IGNORE CLEANUP (DELETE) ERROR: " + (JSON.stringify(cleanup_err)) + " (Windows/WP8)");
successcb();
return;
}
return SelfTest.finishWithError(errorcb, "Cleanup error: " + cleanup_err);
});
}, function(close_err) {
if (/Windows /.test(navigator.userAgent) || /IEMobile/.test(navigator.userAgent)) {
console.log("IGNORE close ERROR: " + (JSON.stringify(close_err)) + " (Windows/WP8)");
SQLiteFactory.deleteDatabase({
name: SelfTest.DBNAME,
location: 'default'
}, successcb, successcb);
return;
}
return SelfTest.finishWithError(errorcb, "close error: " + close_err);
});
});
=======
db.close(function() {
SelfTest.cleanupAndFinish(successcb, errorcb);
}, function(close_err) {
SelfTest.finishWithError(errorcb, "close error: " + close_err);
>>>>>>>
if (!readTransactionFinished) {
SelfTest.finishWithError(errorcb, 'readTransaction did not finish');
return;
}
return db.transaction(function(tx3) {
tx3.executeSql('DELETE FROM TestTable');
return tx3.executeSql('INSERT INTO TestTable (data) VALUES(?)', [123]);
}, function(tx3_err) {
return SelfTest.finishWithError(errorcb, "DELETE transaction error: " + tx3_err);
}, function() {
var secondReadTransactionFinished;
secondReadTransactionFinished = false;
return db.readTransaction(function(tx4) {
return tx4.executeSql('SELECT id, data FROM TestTable', [], function(ignored, resutSet3) {
if (!resutSet3.rows) {
throw newSQLError('Missing resutSet3.rows');
}
if (!resutSet3.rows.length) {
throw newSQLError('Missing resutSet3.rows.length');
}
if (resutSet3.rows.length !== 1) {
throw newSQLError("Incorrect resutSet3.rows.length value: " + resutSet3.rows.length + " (expected: 1)");
}
if (!resutSet3.rows.item(0).id) {
throw newSQLError('Missing resutSet3.rows.item(0).id');
}
if (resutSet3.rows.item(0).id === firstid) {
throw newSQLError("resutSet3.rows.item(0).id value " + (resutSet3.rows.item(0).id) + " incorrectly matches previous unique key id value value (" + firstid + ")");
}
if (!resutSet3.rows.item(0).data) {
throw newSQLError('Missing resutSet3.rows.item(0).data');
}
if (resutSet3.rows.item(0).data !== 123) {
throw newSQLError("Incorrect resutSet3.rows.item(0).data value: " + (resutSet3.rows.item(0).data) + " (expected 123)");
}
return secondReadTransactionFinished = true;
});
}, function(tx4_err) {
return SelfTest.finishWithError(errorcb, "second readTransaction error: " + tx4_err);
}, function() {
if (!secondReadTransactionFinished) {
SelfTest.finishWithError(errorcb, 'second readTransaction did not finish');
return;
}
db.close(function() {
SelfTest.cleanupAndFinish(successcb, errorcb);
}, function(close_err) {
SelfTest.finishWithError(errorcb, "close error: " + close_err);
});
}); |
<<<<<<<
=======
// FUTURE TODO replace in test(s):
function ok(test, desc) { expect(test).toBe(true); }
function equal(a, b, desc) { expect(a).toEqual(b); } // '=='
function strictEqual(a, b, desc) { expect(a).toBe(b); } // '==='
// XXX TODO REFACTOR OUT OF OLD TESTS:
var wait = 0;
var test_it_done = null;
function xtest_it(desc, fun) { xit(desc, fun); }
function test_it(desc, fun) {
wait = 0;
it(desc, function(done) {
test_it_done = done;
fun();
}, MYTIMEOUT);
}
function stop(n) {
if (!!n) wait += n
else ++wait;
}
function start(n) {
if (!!n) wait -= n;
else --wait;
if (wait == 0) test_it_done();
}
>>>>>>>
<<<<<<<
var isWindows = /Windows /.test(navigator.userAgent); // Windows 8.1/Windows Phone 8.1/Windows 10
var isAndroid = !isWindows && /Android/.test(navigator.userAgent);
var isMac = /Macintosh/.test(navigator.userAgent);
var isWKWebView = !isWindows && !isAndroid && !isWP8 && !isMac && !!window.webkit && !!window.webkit.messageHandlers;
// The following openDatabase settings are used for Plugin-implementation-2
// on Android:
// - androidDatabaseImplementation: 2
// - androidLockWorkaround: 1
=======
var isWindows = /Windows /.test(navigator.userAgent); // Windows (8.1)
var isAndroid = !isWindows && /Android/.test(navigator.userAgent);
var isMac = /Macintosh/.test(navigator.userAgent);
var isWKWebView = !isWindows && !isAndroid && !isWP8 && !isMac && !!window.webkit && !!window.webkit.messageHandlers;
// NOTE: While in certain version branches there is no difference between
// the default Android implementation and implementation #2,
// this test script will also apply the androidLockWorkaround: 1 option
// in case of implementation #2.
>>>>>>>
var isWindows = /Windows /.test(navigator.userAgent); // Windows 8.1/Windows Phone 8.1/Windows 10
var isAndroid = !isWindows && /Android/.test(navigator.userAgent);
var isMac = /Macintosh/.test(navigator.userAgent);
var isWKWebView = !isWindows && !isAndroid && !isWP8 && !isMac && !!window.webkit && !!window.webkit.messageHandlers;
// NOTE: While in certain version branches there is no difference between
// the default Android implementation and implementation #2,
// this test script will also apply the androidLockWorkaround: 1 option
// in case of implementation #2.
// The following openDatabase settings are used for Plugin-implementation-2
// on Android:
// - androidDatabaseImplementation: 2
// - androidLockWorkaround: 1
<<<<<<<
androidLockWorkaround: 1,
location: 'default'
=======
androidLockWorkaround: 1
>>>>>>>
androidLockWorkaround: 1
<<<<<<<
it(suiteName + 'BIG INTEGER INSERT value bindings', function(done) {
var db = openDatabase("BIG-INTEGER-INSERT-value-bindings.db", "1.0", "Demo", DEFAULT_SIZE);
=======
it(suiteName + "Big [integer] value bindings", function(done) {
if (isWP8) pending('BROKEN on WP(8)'); // XXX [BUG #195]
>>>>>>>
it(suiteName + 'BIG INTEGER INSERT value bindings', function(done) {
var db = openDatabase("BIG-INTEGER-INSERT-value-bindings.db", "1.0", "Demo", DEFAULT_SIZE);
<<<<<<<
// NOTE: big number apparently stored in field with TEXT affinity with slightly
// different conversion in plugin vs. WebKit Web SQL!
if (isWebSql || isMac || isWKWebView)
=======
// NOTE: big number stored in field with TEXT affinity with different conversion
// in case of plugin (certain platforms) vs. Android/iOS WebKit Web SQL
if (isWebSql || isMac || isWKWebView)
>>>>>>>
// NOTE: big number stored in field with TEXT affinity with different conversion
// in case of plugin (certain platforms) vs. Android/iOS WebKit Web SQL
if (isWebSql || isMac || isWKWebView)
<<<<<<<
db.transaction(function(tx) {
tx.executeSql('DROP TABLE IF EXISTS test_table');
// CREATE columns with no type affinity
tx.executeSql('CREATE TABLE IF NOT EXISTS test_table (id integer primary key, data1, data2)');
}, function(error) {
expect(false).toBe(true);
expect(error.message).toBe('---');
// Close (plugin only) & finish:
(isWebSql) ? done() : db.close(done, done);
}, function() {
db.transaction(function(tx) {
tx.executeSql("INSERT INTO test_table (data1, data2) VALUES (?,?)", ['first', 'second', 789], function(ignored1, ignored2) {
// NOT EXPECTED:
expect(false).toBe(true);
// Close (plugin only) & finish:
(isWebSql) ? done() : db.close(done, done);
}, function(ignored, error) {
// EXPECTED RESULT:
expect(error).toBeDefined();
expect(error.code).toBeDefined();
expect(error.message).toBeDefined();
// PLUGIN BROKEN: reports INCORRECT error code: 0 (SQLite.UNKNOWN_ERR)
// WebKit Web SQL reports correct error code: 5 (SQLite.SYNTAX_ERR) in this case.
// ref: https://www.w3.org/TR/webdatabase/#dom-sqlexception-code-syntax
if (isWebSql)
expect(error.code).toBe(5);
else
expect(error.code).toBe(0);
// WebKit Web SQL vs plugin error message
// FUTURE TBD plugin error message subject to change
if (isWebSql)
expect(error.message).toMatch(/number of '\?'s in statement string does not match argument count/);
else if (isWP8)
expect(true).toBe(true); // SKIP for now
else if (isWindows)
expect(error.message).toMatch(/Error 25 when binding argument to SQL query/);
else
expect(error.message).toMatch(/index.*out of range/);
// Close (plugin only) & finish:
(isWebSql) ? done() : db.close(done, done);
});
});
});
}, MYTIMEOUT);
it(suiteName + 'executeSql with too many parameters [extra NULL value]', function(done) {
if (isWP8) pending('SKIP for WP8'); // TBD BROKEN on WP8
=======
test_it(suiteName + ' stores [Unicode] string with \\u0000 correctly', function () {
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
if (isWindows) pending('BROKEN on Windows'); // TBD (truncates on Windows)
// TBD NOT BROKEN for Android (no Android-sqlite-connector implementation) in this version branch:
//if (!isWebSql && !isWindows && isAndroid && !isImpl2) pending('BROKEN on Android-sqlite-connector implementation)');
>>>>>>>
db.transaction(function(tx) {
tx.executeSql('DROP TABLE IF EXISTS test_table');
// CREATE columns with no type affinity
tx.executeSql('CREATE TABLE IF NOT EXISTS test_table (id integer primary key, data1, data2)');
}, function(error) {
expect(false).toBe(true);
expect(error.message).toBe('---');
// Close (plugin only) & finish:
(isWebSql) ? done() : db.close(done, done);
}, function() {
db.transaction(function(tx) {
tx.executeSql("INSERT INTO test_table (data1, data2) VALUES (?,?)", ['first', 'second', 789], function(ignored1, ignored2) {
// NOT EXPECTED:
expect(false).toBe(true);
// Close (plugin only) & finish:
(isWebSql) ? done() : db.close(done, done);
}, function(ignored, error) {
// EXPECTED RESULT:
expect(error).toBeDefined();
expect(error.code).toBeDefined();
expect(error.message).toBeDefined();
// PLUGIN BROKEN: reports INCORRECT error code: 0 (SQLite.UNKNOWN_ERR)
// WebKit Web SQL reports correct error code: 5 (SQLite.SYNTAX_ERR) in this case.
// ref: https://www.w3.org/TR/webdatabase/#dom-sqlexception-code-syntax
if (isWebSql)
expect(error.code).toBe(5);
else
expect(error.code).toBe(0);
// WebKit Web SQL vs plugin error message
// FUTURE TBD plugin error message subject to change
if (isWebSql)
expect(error.message).toMatch(/number of '\?'s in statement string does not match argument count/);
else if (isWP8)
expect(true).toBe(true); // SKIP for now
else if (isWindows)
expect(error.message).toMatch(/Error 25 when binding argument to SQL query/);
else
expect(error.message).toMatch(/index.*out of range/);
// Close (plugin only) & finish:
(isWebSql) ? done() : db.close(done, done);
});
});
});
}, MYTIMEOUT);
it(suiteName + 'executeSql with too many parameters [extra NULL value]', function(done) {
if (isWP8) pending('SKIP for WP8'); // TBD BROKEN on WP8
<<<<<<<
it(suiteName + ' returns [Unicode] string with \\u0000 (same as \\0) correctly [BROKEN: TRUNCATES on Windows]', function (done) {
if (isWP8) pending('BROKEN for WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
=======
test_it(suiteName + ' returns [Unicode] string with \\u0000 correctly', function () {
if (isWindows) pending('BROKEN on Windows'); // XXX
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
>>>>>>>
it(suiteName + ' returns [Unicode] string with \\u0000 (same as \\0) correctly [BROKEN: TRUNCATES on Windows]', function (done) {
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
<<<<<<<
}, MYTIMEOUT);
// Issue with iOS/macOS/Android
// For reference:
// - litehelpers/Cordova-sqlite-storage#147
// - Apache Cordova CB-9435 (issue with cordova-ios, also affects macOS)
// - cordova/cordova-discuss#57 (issue with cordova-android)
it(suiteName +
' handles UNICODE \\u2028 line separator correctly in database', function (done) {
if (isWP8) pending('BROKEN for WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
if (!isWebSql && !isWindows && isAndroid) pending('SKIP for Android plugin (cordova-android 6.x BUG)'); // see cordova/cordova-discuss#57
if (!isWebSql && !isAndroid && !isWindows && !isWP8) pending('SKIP for iOS/macOS plugin (Cordova BUG: CB-9435)');
=======
});
// Issue with iOS/macOS/Android
// For reference:
// - litehelpers/Cordova-sqlite-storage#147
// - Apache Cordova CB-9435 (issue with cordova-ios, also affects macOS)
// - cordova/cordova-discuss#57 (issue with cordova-android)
test_it(suiteName +
' handles UNICODE \\u2028 line separator correctly [in database]', function () {
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
if (!isWebSql && !isWindows && isAndroid) pending('SKIP for Android plugin (cordova-android 6.x BUG: cordova/cordova-discuss#57)');
if (!isWebSql && !isWindows && !isAndroid && !isWP8) pending('SKIP for iOS/macOS plugin (Cordova BUG: CB-9435)');
>>>>>>>
}, MYTIMEOUT);
// Issue with iOS/macOS/Android
// For reference:
// - litehelpers/Cordova-sqlite-storage#147
// - Apache Cordova CB-9435 (issue with cordova-ios, also affects macOS)
// - cordova/cordova-discuss#57 (issue with cordova-android)
it(suiteName +
' handles UNICODE \\u2028 line separator correctly in database', function (done) {
if (isWP8) pending('BROKEN on WP(8)'); // [BUG #202] UNICODE characters not working with WP(8)
if (!isWebSql && !isWindows && isAndroid) pending('SKIP for Android plugin (cordova-android 6.x BUG: cordova/cordova-discuss#57)');
if (!isWebSql && !isWindows && !isAndroid && !isWP8) pending('SKIP for iOS/macOS plugin (Cordova BUG: CB-9435)'); |
<<<<<<<
, expected = [ 'mm', 'cm', 'm', 'km', 'in', 'yd', 'ft', 'mi', 'mm2', 'cm2', 'm2', 'ha', 'km2', 'in2', 'ft2', 'ac', 'mi2', 'mcg', 'mg', 'g', 'kg', 'oz', 'lb', 'mm3', 'cm3', 'ml', 'l', 'm3', 'km3', 'tsp', 'Tbs', 'in3', 'fl-oz', 'cup', 'pnt', 'qt', 'gal', 'ft3', 'yd3', 'ea', 'C', 'K', 'F', 'ms', 's', 'min', 'h','d', 'week', 'month', 'year', 'b', 'Kb', 'Mb', 'Gb', 'Tb', 'B', 'KB', 'MB', 'GB', 'TB', 'ppm', 'ppb', 'ppt', 'ppq', 'm/s', 'km/h', 'mph', 'knot', 'ft/s', 'Pa', 'kPa', 'MPa', 'hPa', 'bar', 'torr', 'psi', 'ksi' ];
assert.deepEqual(actual, expected);
=======
, expected = [ 'mm', 'cm', 'm', 'km', 'in', 'yd', 'ft', 'mi', 'mm2', 'cm2', 'm2', 'ha', 'km2', 'in2', 'ft2', 'ac', 'mi2', 'mcg', 'mg', 'g', 'kg', 'oz', 'lb', 'mm3', 'cm3', 'ml', 'cl', 'dl', 'l', 'm3', 'km3', 'krm', 'tsk', 'msk', 'kkp', 'glas', 'kanna', 'tsp', 'Tbs', 'in3', 'fl-oz', 'cup', 'pnt', 'qt', 'gal', 'ft3', 'yd3', 'ea', 'C', 'K', 'F', 'ns', 'mu', 'ms', 's', 'min', 'h','d', 'week', 'month', 'year', 'b', 'Kb', 'Mb', 'Gb', 'Tb', 'B', 'KB', 'MB', 'GB', 'TB', 'ppm', 'ppb', 'ppt', 'ppq' ];
try {
assert.deepEqual(actual, expected)
}
catch (e) {
// This gets too long, and gets truncated
process.stderr.write(e + '\n');
throw e;
}
>>>>>>>
, expected = [ 'mm', 'cm', 'm', 'km', 'in', 'yd', 'ft', 'mi', 'mm2', 'cm2', 'm2', 'ha', 'km2', 'in2', 'ft2', 'ac', 'mi2', 'mcg', 'mg', 'g', 'kg', 'oz', 'lb', 'mm3', 'cm3', 'ml', 'cl', 'dl', 'l', 'm3', 'km3', 'krm', 'tsk', 'msk', 'kkp', 'glas', 'kanna', 'tsp', 'Tbs', 'in3', 'fl-oz', 'cup', 'pnt', 'qt', 'gal', 'ft3', 'yd3', 'ea', 'C', 'K', 'F', 'ns', 'mu', 'ms', 's', 'min', 'h','d', 'week', 'month', 'year', 'b', 'Kb', 'Mb', 'Gb', 'Tb', 'B', 'KB', 'MB', 'GB', 'TB', 'ppm', 'ppb', 'ppt', 'ppq', 'm/s', 'km/h', 'mph', 'knot', 'ft/s', 'Pa', 'kPa', 'MPa', 'hPa', 'bar', 'torr', 'psi', 'ksi' ];
try {
assert.deepEqual(actual, expected)
}
catch (e) {
// This gets too long, and gets truncated
process.stderr.write(e + '\n');
throw e;
} |
<<<<<<<
, expected = [ 'mm', 'cm', 'm', 'km', 'in', 'yd', 'ft', 'mi', 'mm2', 'cm2', 'm2', 'ha', 'km2', 'in2', 'ft2', 'ac', 'mi2', 'mcg', 'mg', 'g', 'kg', 'oz', 'lb', 'mm3', 'cm3', 'ml', 'cl', 'dl', 'l', 'm3', 'km3', 'krm', 'tsk', 'msk', 'kkp', 'glas', 'kanna', 'tsp', 'Tbs', 'in3', 'fl-oz', 'cup', 'pnt', 'qt', 'gal', 'ft3', 'yd3', 'ea', 'C', 'K', 'F', 'ms', 's', 'min', 'h','d', 'week', 'month', 'year', 'b', 'Kb', 'Mb', 'Gb', 'Tb', 'B', 'KB', 'MB', 'GB', 'TB', 'ppm', 'ppb', 'ppt', 'ppq' ];
=======
, expected = [ 'mm', 'cm', 'm', 'km', 'in', 'yd', 'ft', 'mi', 'mm2', 'cm2', 'm2', 'ha', 'km2', 'in2', 'ft2', 'ac', 'mi2', 'mcg', 'mg', 'g', 'kg', 'oz', 'lb', 'mm3', 'cm3', 'ml', 'l', 'm3', 'km3', 'tsp', 'Tbs', 'in3', 'fl-oz', 'cup', 'pnt', 'qt', 'gal', 'ft3', 'yd3', 'ea', 'C', 'K', 'F', 'ns', 'mu', 'ms', 's', 'min', 'h','d', 'week', 'month', 'year', 'b', 'Kb', 'Mb', 'Gb', 'Tb', 'B', 'KB', 'MB', 'GB', 'TB', 'ppm', 'ppb', 'ppt', 'ppq' ];
>>>>>>>
, expected = [ 'mm', 'cm', 'm', 'km', 'in', 'yd', 'ft', 'mi', 'mm2', 'cm2', 'm2', 'ha', 'km2', 'in2', 'ft2', 'ac', 'mi2', 'mcg', 'mg', 'g', 'kg', 'oz', 'lb', 'mm3', 'cm3', 'ml', 'l', 'm3', 'km3', 'krm', 'tsk', 'msk', 'kkp', 'glas', 'kanna', 'tsp', 'Tbs', 'in3', 'fl-oz', 'cup', 'pnt', 'qt', 'gal', 'ft3', 'yd3', 'ea', 'C', 'K', 'F', 'ns', 'mu', 'ms', 's', 'min', 'h','d', 'week', 'month', 'year', 'b', 'Kb', 'Mb', 'Gb', 'Tb', 'B', 'KB', 'MB', 'GB', 'TB', 'ppm', 'ppb', 'ppt', 'ppq' ]; |
<<<<<<<
var ie = /msie/i.test(navigator.userAgent),
px = 'px',
rgbOhex = /^rgb\(|#/,
=======
var px = 'px',
>>>>>>>
var px = 'px',
rgbOhex = /^rgb\(|#/, |
<<<<<<<
const google = require('googleapis');
const GCal = require('./src/gcal');
const path = require('path');
=======
const gcal = require('./src/gcal');
>>>>>>>
const google = require('googleapis');
const gcal = require('./src/gcal');
const path = require('path'); |
<<<<<<<
title: 'Circle',
uid: 'circle',
},
{
=======
title: 'Clusterer',
uid: 'clusterer',
},
{
>>>>>>>
title: 'Circle',
uid: 'circle',
},
{
title: 'Clusterer',
uid: 'clusterer',
},
{ |
<<<<<<<
const icon = argv.icon || argv.i || 'build/icon';
if (icon) {
DEFAULT_OPTS.icon = icon;
}
=======
const icon = argv.icon || argv.i || 'app/app';
if (icon) DEFAULT_OPTS.icon = icon;
>>>>>>>
const icon = argv.icon || argv.i || 'build/icon';
if (icon) DEFAULT_OPTS.icon = icon; |
<<<<<<<
// Expose the global `gh` variable, through which every API method is
// accessed, but keep a local variable around so we can reference it easily.
=======
// Get around how the GH team haven't migrated all the API to version 2, and
// how gists use a different api root.
withTempApiRoot = function (tempApiRoot, fn) {
return function () {
var oldRoot = apiRoot;
apiRoot = tempApiRoot;
fn.apply(this, arguments);
apiRoot = oldRoot;
};
},
// Expose global gh variable and keep a local variable.
>>>>>>>
// Get around how the GH team haven't migrated all the API to version 2, and
// how gists use a different api root.
withTempApiRoot = function (tempApiRoot, fn) {
return function () {
var oldRoot = apiRoot;
apiRoot = tempApiRoot;
fn.apply(this, arguments);
apiRoot = oldRoot;
};
},
// Expose the global `gh` variable, through which every API method is
// accessed, but keep a local variable around so we can reference it easily. |
<<<<<<<
'dojo/text!phpr/template/bookingList/bookingCreator.html',
'phpr/ProjectChooser',
'dijit/form/Textarea',
'dijit/form/ValidationTextBox',
'phpr/DateTextBox',
'dijit/form/Form'
], function(
declare,
lang,
array,
on,
number,
all,
topic,
json,
topic,
JsonRest,
Memory,
Tooltip,
BookingBlock,
api,
time,
templateString
) {
=======
'phpr/models/Project',
'dojo/text!phpr/template/bookingList/bookingCreator.html',
'phpr/TimeBox'
], function(
declare,
lang,
array,
on,
number,
all,
topic,
json,
topic,
JsonRest,
Memory,
Tooltip,
BookingBlock,
api,
timehelper,
projects,
templateString
) {
>>>>>>>
'dojo/text!phpr/template/bookingList/bookingCreator.html',
'phpr/TimeBox'
], function(
declare,
lang,
array,
on,
number,
all,
topic,
json,
topic,
JsonRest,
Memory,
Tooltip,
BookingBlock,
api,
timehelper,
templateString
) {
<<<<<<<
this.project.set('value', '' + booking.projectId);
var startDatetime = time.datetimeToJsDate(booking.startDatetime);
=======
this.projectDeferred.then(lang.hitch(this, function() {
this.project.set('value', '' + booking.projectId);
}));
var startDatetime = timehelper.datetimeToJsDate(booking.startDatetime);
>>>>>>>
this.project.set('value', '' + booking.projectId);
var startDatetime = timehelper.datetimeToJsDate(booking.startDatetime); |
<<<<<<<
'dojo/dom-construct',
=======
'dojo/json',
'dojo/io-query',
>>>>>>>
'dojo/dom-construct',
'dojo/json',
'dojo/io-query',
<<<<<<<
'phpr/Statistics/WorktimeMonthTable',
'phpr/ProjectChooser',
'dijit/layout/ContentPane'
=======
'phpr/Statistics/WorktimeMonthTable',
'phpr/Timehelper',
'phpr/Statistics/ProjectUserTimeTable'
>>>>>>>
'phpr/Statistics/WorktimeMonthTable',
'phpr/ProjectChooser',
'phpr/Timehelper',
'dijit/layout/ContentPane',
'phpr/Statistics/ProjectUserTimeTable'
<<<<<<<
domConstruct,
=======
json,
ioQuery,
>>>>>>>
domConstruct,
json,
ioQuery,
<<<<<<<
monthTable,
projectChooser
=======
monthTable,
timehelper
>>>>>>>
monthTable,
projectChooser,
timehelper
<<<<<<<
this.own(on(this.projectChooser, 'change', lang.hitch(this, '_updateMonthWidget')));
=======
this.own(this.exportForm.on('submit', lang.hitch(this, this._openExport)));
>>>>>>>
this.own(on(this.projectChooser, 'change', lang.hitch(this, '_updateMonthWidget')));
this.own(this.exportForm.on('submit', lang.hitch(this, this._openExport)));
<<<<<<<
this._setMonthWidget(new monthGraph({ projects: this._getSelectedProjects() }), 'graph');
},
_setMonthWidget: function(widget, state) {
if (this.activeMonthWidget !== null) {
this.activeMonthWidget.destroyRecursive();
this.activeMonthWidget = null;
}
this.activeMonthWidget = widget;
this.monthContainer.set('content', this.activeMonthWidget);
this.monthState = state;
},
_getSelectedProjects: function() {
var project = this.projectChooser.get('value');
if (project === '-1' || project === '') {
return [];
} else {
return [project];
}
},
_updateMonthWidget: function() {
switch (this.monthState) {
case 'table':
this._setMonthTable();
break;
case 'graph':
this._setMonthGraph();
break;
}
=======
this.monthContainer.set('content', new monthGraph());
this.monthViewState = 'graph';
},
_openExport: function(evt) {
if (evt) {
evt.stopPropagation();
}
if (this.exportForm.validate()) {
var url = 'index.php/Timecard/Timecard/index';
var data = this.exportForm.get('value');
var query = {format: 'csv'};
query.filter = json.stringify({
startDatetime: {
'!ge': timehelper.jsDateToIsoDatetime(data.start),
'!lt': timehelper.jsDateToIsoDatetime(data.end)
}
});
window.open(url + '?' + ioQuery.objectToQuery(query));
}
return false;
>>>>>>>
this._setMonthWidget(new monthGraph({ projects: this._getSelectedProjects() }), 'graph');
},
_setMonthWidget: function(widget, state) {
if (this.activeMonthWidget !== null) {
this.activeMonthWidget.destroyRecursive();
this.activeMonthWidget = null;
}
this.activeMonthWidget = widget;
this.monthContainer.set('content', this.activeMonthWidget);
this.monthState = state;
},
_getSelectedProjects: function() {
var project = this.projectChooser.get('value');
if (project === '-1' || project === '') {
return [];
} else {
return [project];
}
},
_updateMonthWidget: function() {
switch (this.monthState) {
case 'table':
this._setMonthTable();
break;
case 'graph':
this._setMonthGraph();
break;
}
},
_openExport: function(evt) {
if (evt) {
evt.stopPropagation();
}
if (this.exportForm.validate()) {
var url = 'index.php/Timecard/Timecard/index';
var data = this.exportForm.get('value');
var query = {format: 'csv'};
query.filter = json.stringify({
startDatetime: {
'!ge': timehelper.jsDateToIsoDatetime(data.start),
'!lt': timehelper.jsDateToIsoDatetime(data.end)
}
});
window.open(url + '?' + ioQuery.objectToQuery(query));
}
return false; |
<<<<<<<
this._currentTarget = null;
this._opacityDirty = true;
this._sizeDirty = true;
this._originDirty = true;
this._transformDirty = true;
this._isVisible = true;
=======
>>>>>>>
this._currentTarget = null;
this._opacityDirty = true;
this._sizeDirty = true;
this._originDirty = true;
this._transformDirty = true;
this._isVisible = true; |
<<<<<<<
events : {},
initialize : function initialize(){
this.ratios = new Transitionable(this.options.ratios);
this.nodes = [];
var stateStream = Stream.lift(
function(ratios, parentSize){
var direction = this.options.direction;
// calculate remaining size after true-sized nodes are accounted for
var flexLength = parentSize[direction];
var ratioSum = 0;
for (var i = 0; i < ratios.length; i++) {
var ratio = ratios[i];
var node = this.nodes[i];
(typeof ratio !== 'number')
? flexLength -= node.getSize()[direction] || 0
: ratioSum += ratio;
}
// calculate sizes and displacements of nodes
var displacement = 0;
var transforms = [];
var sizes = [];
for (var i = 0; i < ratios.length; i++) {
node = this.nodes[i];
ratio = ratios[i];
var nodeLength = (typeof ratio === 'number')
? flexLength * ratio / ratioSum
: node.getSize()[direction];
var transform = (direction == CONSTANTS.DIRECTION.X)
? Transform.translate(displacement, 0, 0)
: Transform.translate(0, displacement, 0);
var size = (direction == CONSTANTS.DIRECTION.X)
? [nodeLength, undefined]
: [undefined, nodeLength];
sizes.push(size);
transforms.push(transform);
displacement += nodeLength;
}
return {
transforms : transforms,
sizes : sizes
};
}.bind(this),
[this.ratios, this.sizeStream]
);
this.transforms = stateStream.pluck('transforms');
this.sizes = stateStream.pluck('sizes');
=======
events : {},
initialize : function initialize(){
this.ratios = new Transitionable(this.options.ratios);
this.nodes = [];
var stateStream = Stream.lift(
function(ratios, parentSize){
var direction = this.options.direction;
// calculate remaining size after true-sized nodes are accounted for
var flexLength = parentSize[this.options.direction];
var ratioSum = 0;
for (var i = 0; i < ratios.length; i++) {
var ratio = ratios[i];
var node = this.nodes[i];
if (!node || node.getSize === undefined) continue;
(typeof ratio !== 'number')
? flexLength -= node.getSize()[direction] || 0
: ratioSum += ratio;
}
// calculate sizes and displacements of nodes
var displacement = 0;
var transforms = [];
var sizes = [];
for (var i = 0; i < ratios.length; i++) {
node = this.nodes[i];
ratio = ratios[i];
if (!node || node.getSize === undefined) continue;
var nodeLength = (typeof ratio === 'number')
? flexLength * ratio / ratioSum
: node.getSize()[direction];
var transform = (direction == CONSTANTS.DIRECTION.X)
? Transform.translate(displacement, 0, 0)
: Transform.translate(0, displacement, 0);
var size = (direction == CONSTANTS.DIRECTION.X)
? [nodeLength, undefined]
: [undefined, nodeLength];
sizes.push(size);
transforms.push(transform);
displacement += nodeLength;
}
return {
transforms : transforms,
sizes : sizes
};
}.bind(this),
[this.ratios, this.size]
);
this.transforms = stateStream.pluck('transforms');
this.sizes = stateStream.pluck('sizes');
>>>>>>>
events : {},
initialize : function initialize(){
this.ratios = new Transitionable(this.options.ratios);
this.nodes = [];
var stateStream = Stream.lift(
function(ratios, parentSize){
var direction = this.options.direction;
// calculate remaining size after true-sized nodes are accounted for
var flexLength = parentSize[direction];
var ratioSum = 0;
for (var i = 0; i < ratios.length; i++) {
var ratio = ratios[i];
var node = this.nodes[i];
if (!node || node.getSize === undefined) continue;
(typeof ratio !== 'number')
? flexLength -= node.getSize()[direction] || 0
: ratioSum += ratio;
}
// calculate sizes and displacements of nodes
var displacement = 0;
var transforms = [];
var sizes = [];
for (var i = 0; i < ratios.length; i++) {
node = this.nodes[i];
ratio = ratios[i];
var nodeLength = (typeof ratio === 'number')
? flexLength * ratio / ratioSum
: node.getSize()[direction];
var transform = (direction == CONSTANTS.DIRECTION.X)
? Transform.translate(displacement, 0, 0)
: Transform.translate(0, displacement, 0);
var size = (direction == CONSTANTS.DIRECTION.X)
? [nodeLength, undefined]
: [undefined, nodeLength];
sizes.push(size);
transforms.push(transform);
displacement += nodeLength;
}
return {
transforms : transforms,
sizes : sizes
};
}.bind(this),
[this.ratios, this.sizeStream]
);
this.transforms = stateStream.pluck('transforms');
this.sizes = stateStream.pluck('sizes');
<<<<<<<
this.nodes = sequence;
for (var i = 0; i < this.nodes.length; i++){
var node = this.nodes[i];
var modifier = new Modifier({
transform : this.transforms.pluck(i),
size : this.sizes.pluck(i)
});
this.add(modifier).add(node);
}
=======
this.nodes = sequence;
for (var i = 0; i < this.options.ratios.length; i++){
var node = this.nodes[i];
var modifier = new Modifier({
transform : this.transforms.pluck(i),
size : this.sizes.pluck(i)
});
this.add(modifier).add(node);
}
>>>>>>>
this.nodes = sequence;
for (var i = 0; i < this.nodes.length; i++){
var node = this.nodes[i];
var modifier = new Modifier({
transform : this.transforms.pluck(i),
size : this.sizes.pluck(i)
});
this.add(modifier).add(node);
}
<<<<<<<
module.exports = FlexibleLayout;
=======
>>>>>>>
module.exports = FlexibleLayout; |
<<<<<<<
exports.sound = function(filename, callback){
//sys.puts('playing'.grey + ' -> '.yellow + filename.toString().magenta);
player.play(filename);
/*
var commands = [text];
var childD = spawn("afplay", commands);
childD.stdout.setEncoding('ascii');
childD.stderr.setEncoding('ascii');
childD.stderr.addListener('data', function(data){});
childD.stdout.addListener('data', function(data){});
childD.addListener('exit', function (code, signal) {
if(code == null || signal != null) {
sys.puts('couldnt talk, had an error ' + '[code: '+ code + '] ' + '[signal: ' + signal + ']');
}
//sys.puts( 'completed'.green + '=>'.yellow + text.toString().magenta);
//callback(); // i think i have to apply / call the arguments here
});
*/
=======
exports.sound = function(filename, volume){
sys.puts('playing'.grey + ' -> '.yellow + filename.toString().magenta);
player.play(filename, volume);
>>>>>>>
exports.sound = function(filename, volume){
player.play(filename, volume); |
<<<<<<<
<Link
to={`/blog/author/${author._id}`}
className="text-primary font-bold no-underline hover:underline"
>
{author.name}
</Link>
=======
{author && author.name ? (
<Link
to={`/blog/author/${author._id}`}
className="text-red-600 font-bold no-underline hover:underline"
>
{author.name}
</Link>
) : (
'unknown'
)}
>>>>>>>
{author && author.name ? (
<Link
to={`/blog/author/${author._id}`}
className="text-primary font-bold no-underline hover:underline"
>
{author.name}
</Link>
) : (
'unknown'
)}
<<<<<<<
<Link
className="text-blue-700 no-underline article-tag"
to={`/blog/${each.slug_url}`}
>
<span> {tags.join(', ') || ''} </span>
</Link>{' '}
{short_description &&
<Link
className="text-grey-darker text-base no-underline"
to={`/blog/${slug_url}`}
>
<div
className="leading-normal text-sm text-gray-600 overflow-hidden"
dangerouslySetInnerHTML={{ __html: short_description }}
/>
</Link>
}
=======
{tags && tags.length > 0 ? (
<Link
className="text-indigo-600 no-underline"
to={`/blog/${each.slug_url}`}
>
<span> {tags.join(', ') || ''} </span>
</Link>
) : (
''
)}
<Link
className="text-grey-darker text-base no-underline"
to={`/blog/${slug_url}`}
>
<div
className="leading-normal text-sm text-gray-600 font-light overflow-hidden"
style={{ height: '130px' }}
dangerouslySetInnerHTML={{ __html: description }}
/>
</Link>
>>>>>>>
{tags && tags.length > 0 ? (<Link
className="text-blue-700 no-underline article-tag"
to={`/blog/${each.slug_url}`}
>
<span> {tags.join(', ') || ''} </span>
</Link> ) : (
''
)}
{short_description &&
<Link
className="text-grey-darker text-base no-underline"
to={`/blog/${slug_url}`}
>
<div
className="leading-normal text-sm text-gray-600 overflow-hidden"
dangerouslySetInnerHTML={{ __html: short_description }}
/>
</Link>
} |
<<<<<<<
function add(file, cb) {
var cwd = opt.cwd || file.cwd;
var cmd = "git add " + escape([file.path]) + " " + opt.args;
exec(cmd, {cwd: cwd}, function(err, stdout, stderr){
if(err) cb(err);
=======
function add(file, enc, cb) {
var that = this;
var cmd = "git add " + opt.args + " " + escape([file.path]);
exec(cmd, {cwd: file.cwd}, function(err, stdout, stderr){
if(err) return cb(err);
>>>>>>>
function add(file, enc, cb) {
var cmd = "git add " + opt.args + " " + escape([file.path]);
exec(cmd, {cwd: file.cwd}, function(err, stdout, stderr){
if(err) return cb(err); |
<<<<<<<
<div class="flex justify-between mt-1 mb-1">
<PageHeader>
<IconButton className="cursor-pointer" onClick={this.handleBack} aria-label="Back">
<BackIcon />
</IconButton> Subscribe Details</PageHeader>
</div>
=======
<Helmet>
<title> Subscriber Details </title>
</Helmet>
<PageHeader>Subscribe Details</PageHeader>
>>>>>>>
<Helmet>
<title> Subscriber Details </title>
</Helmet>
<div class="flex justify-between mt-1 mb-1">
<PageHeader>
<IconButton className="cursor-pointer" onClick={this.handleBack} aria-label="Back">
<BackIcon />
</IconButton> Subscribe Details</PageHeader>
</div> |
<<<<<<<
path: '/admin/content-manage/edit/:id',
name: 'Content Manage',
component: ContentManageAddEdit,
},
{
=======
path: '/admin/role-manage/add',
name: 'Role Manage',
component: RoleManageEditPage,
exact: true,
},
{
>>>>>>>
path: '/admin/content-manage/edit/:id',
name: 'Content Manage',
component: ContentManageAddEdit,
},
{
path: '/admin/role-manage/add',
name: 'Role Manage',
component: RoleManageEditPage,
exact: true,
},
{ |
<<<<<<<
import Dashboard from '@material-ui/icons/Dashboard';
import DashboardPage from '../containers/Dashboard';
import ContentManagePage from '../containers/ContentListingPage';
=======
import DashboardPage from '../containers/AdminDashboard';
>>>>>>>
import Dashboard from '@material-ui/icons/Dashboard';
import DashboardPage from '../containers/Dashboard';
import ContentManagePage from '../containers/ContentListingPage';
import DashboardPage from '../containers/AdminDashboard';
<<<<<<<
{
path: '/admin/dashboard',
name: 'Dashboard',
icon: Dashboard,
component: DashboardPage,
},
{
path: '/admin/content-manage',
name: 'Content Manage',
icon: Dashboard,
component: ContentManagePage,
},
=======
{
path: '/admin/dashboard',
name: 'Dashboard',
component: DashboardPage,
},
>>>>>>>
{
path: '/admin/dashboard',
name: 'Dashboard',
icon: Dashboard,
component: DashboardPage,
},
{
path: '/admin/content-manage',
name: 'Content Manage',
icon: Dashboard,
component: ContentManagePage,
}, |
<<<<<<<
import MediaManagePage from '../containers/AdminMediaManagePage/Loadable';
=======
import SliderManagePage from '../containers/SliderManagePage/Loadable';
import SliderManageAddEdit from '../containers/SliderManagePage/AddEditPage/Loadable';
>>>>>>>
import MediaManagePage from '../containers/AdminMediaManagePage/Loadable';
import SliderManagePage from '../containers/SliderManagePage/Loadable';
import SliderManageAddEdit from '../containers/SliderManagePage/AddEditPage/Loadable';
<<<<<<<
{
path: '/admin/media-manage',
component: MediaManagePage,
exact: true,
},
=======
{
path: '/admin/slider-manage/edit/:id',
name: 'Slider Manage',
component: SliderManageAddEdit,
exact: true,
},
{
path: '/admin/slider-manage/add',
name: 'Slider Manage',
component: SliderManageAddEdit,
exact: true,
},
{
path: '/admin/slider-manage',
name: 'Slider Manage',
component: SliderManagePage,
exact: true,
},
>>>>>>>
{
path: '/admin/media-manage',
component: MediaManagePage,
},
{
path: '/admin/slider-manage/edit/:id',
component: SliderManageAddEdit,
exact: true,
},
{
path: '/admin/slider-manage/add',
component: SliderManageAddEdit,
exact: true,
},
{
path: '/admin/slider-manage',
component: SliderManagePage,
exact: true,
}, |
<<<<<<<
field: 'gender',
validate: [
{
condition: 'IsEmpty',
msg: userConfig.validationMessage.genderRequired,
},
{
condition: 'Contains',
msg: userConfig.validationMessage.genderInvalid,
options: ['Male', 'Female', 'Other'],
},
],
},
{
=======
field: 'Gender',
validate: [
{
condition: 'IsEmpty',
msg: LeaveTypeConfig.ValidationMessage.GenderRequired,
},
{
condition: 'Contains',
msg: LeaveTypeConfig.ValidationMessage.GenderInvalid,
options: ['Male', 'Female', 'Other'],
},
],
},
{
>>>>>>>
field: 'gender',
validate: [
{
condition: 'IsEmpty',
msg: LeaveTypeConfig.ValidationMessage.GenderRequired,
},
{
condition: 'Contains',
msg: LeaveTypeConfig.ValidationMessage.GenderInvalid,
options: ['Male', 'Female', 'Other'],
},
],
},
{ |
<<<<<<<
<div className="flex justify-between mt-3 mb-3">
=======
<Helmet>
<title>User Listing</title>
</Helmet>
>>>>>>>
<Helmet>
<title>User Listing</title>
</Helmet>
<div className="flex justify-between mt-3 mb-3">
<<<<<<<
<Fab
color="primary"
aria-label="Add"
className={classes.fab}
onClick={this.handleAdd}
=======
<PageContent>
<Paper style={{ padding: 20, overflow: 'auto', display: 'flex' }}>
<Input
name="find_name"
id="user-name"
fullWidth
placeholder="Search Cat"
value={query.find_name}
onChange={this.handleQueryChange}
/>
<Divider
style={{
width: 1,
height: 40,
margin: 4,
}}
/>
<IconButton aria-label="Search" onClick={this.handleSearch}>
<SearchIcon />
</IconButton>
</Paper>
<Paper
style={{
padding: 0,
overflow: 'auto',
borderRadius: 4,
boxShadow: '0 0 0 1px rgba(0,0,0,.2)',
display: 'flex',
}}
elevation={0}
>>>>>>>
<Fab
color="primary"
aria-label="Add"
className={classes.fab}
onClick={this.handleAdd}
<<<<<<<
<AddIcon />
</Fab>
</div>
<PageContent>
<Table
tableHead={['Email', 'Name', 'Roles', 'Email verified', 'Action']}
tableData={tableData}
pagination={tablePagination}
handlePagination={this.handlePagination}
/>
=======
<Table
tableHead={['Email', 'Name', 'Roles', 'Email verified', 'Action']}
tableData={tableData}
pagination={tablePagination}
handlePagination={this.handlePagination}
/>
<Fab
color="primary"
aria-label="Add"
className={classes.fab}
onClick={this.handleAdd}
>
<AddIcon />
</Fab>
</Paper>
>>>>>>>
<AddIcon />
</Fab>
</div>
<PageContent>
<div className="flex justify-end">
<div className="waftformgroup flex relative mr-2">
<input type="text"
name="find_name"
id="user-name"
placeholder="Search User"
className="m-auto Waftinputbox"
value={query.find_name}
onChange={this.handleQueryChange}
/>
<IconButton aria-label="Search" className={[classes.waftsrch, 'waftsrchstyle']} onClick={this.handleSearch}>
<SearchIcon />
</IconButton>
</div>
</div>
<Table
tableHead={['Email', 'Name', 'Roles', 'Email verified', 'Action']}
tableData={tableData}
pagination={tablePagination}
handlePagination={this.handlePagination}
/> |
<<<<<<<
import StaticContentDiv from '../../components/StaticContentDiv';
=======
import mainImage from './home.png';
>>>>>>>
import StaticContentDiv from '../../components/StaticContentDiv';
import mainImage from './home.png';
<<<<<<<
<h1>
<FormattedMessage {...messages.header} />
<StaticContentDiv contentKey="aboutusheader" />
</h1>
=======
<img style={{ width: '100%', maxWidth: '1440px' }} src={mainImage} />
>>>>>>>
<>
<h1>
<FormattedMessage {...messages.header} />
</h1>
<img
style={{ width: '100%', maxWidth: '1440px' }}
src={mainImage}
alt="template"
/>
<StaticContentDiv contentKey="aboutusheader" />
</> |
<<<<<<<
import WECkEditior from '../../../../components/CkEditor';
import Input from '../../../../components/customComponents/Input';
import SaveAltIcon from '@material-ui/icons/SaveAlt';
=======
import WECkEditior from '../../../../components/CkEditor';
>>>>>>>
import WECkEditior from '../../../../components/CkEditor'
import Input from '../../../../components/customComponents/Input';
<<<<<<<
<Input
label="Content Title"
inputclassName="inputbox"
inputid="grid-last-name"
inputType="text"
value={one.name}
onChange={this.handleChange('name')}
error={errors.name}
/>
=======
<label className="label" htmlFor="grid-last-name">
Content Title
</label>
<input
className="inputbox"
id="grid-last-name"
type="text"
value={one.name}
onChange={this.handleChange('name')}
/>
<div id="component-error-text">{errors.name}</div>
>>>>>>>
<Input
label="Content Title"
inputclassName="inputbox"
inputid="grid-last-name"
inputType="text"
value={one.name}
onChange={this.handleChange('name')}
error={errors.name}
/>
<<<<<<<
<div className="flex w-full justify-between md:w-1/2 px-2">
<div className="w-full md:w-1/2 -ml-2">
<div margin="normal" className={classes.formControl}>
<label
className="font-bold text-gray-700"
htmlFor="grid-last-name"
>
=======
<div className="w-full md:w-1/2">
<FormControl margin="normal" className={classes.formControl}>
<label className="label" htmlFor="grid-last-name">
>>>>>>>
<div className="flex w-full justify-between md:w-1/2 px-2">
<div className="w-full md:w-1/2 -ml-2">
<div margin="normal" className={classes.formControl}>
<label
className="font-bold text-gray-700"
htmlFor="grid-last-name"
> |
<<<<<<<
<PageContent>
<div class="w-full md:w-1/2 pb-4">
<label class="block uppercase tracking-wide text-grey-darker text-xs mb-2" for="grid-last-name">
Slider Name
</label>
<input class="Waftinputbox" id="slider-name" type="text" value= {one.slider_name} name="slider_name"
onChange= {this.handleChange('slider_name')} />
</div>
<div class="w-full md:w-1/2 pb-4">
<label class="block uppercase tracking-wide text-grey-darker text-xs mb-2" for="grid-last-name">
Slider Key
</label>
<input class="Waftinputbox" id="slider-key" type="text" value= {one.slider_key} name="slider_key"
onChange= {this.handleChange('slider_key')} />
</div>
<div class="w-full md:w-1/2 pb-4">
<label class="block uppercase tracking-wide text-grey-darker text-xs mb-2" for="grid-last-name">
Slider Settings
</label>
=======
<Helmet>
<title>
{match && match.params && match.params.id
? 'Edit Slider'
: 'Add Slider'}
</title>
</Helmet>
<Card>
<CardHeader color="primary" title="Slider" subheader={subheader} />
<CardBody>
<div>
<TextField
variant="outlined"
name="slider_name"
id="slider-name"
fullWidth
margin="normal"
label="Slider Name"
InputLabelProps={{
shrink: true,
}}
inputProps={{
value: one.slider_name,
onChange: this.handleChange('slider_name'),
}}
/>
</div>
<div>
<TextField
variant="outlined"
name="slider_key"
id="slider-key"
fullWidth
margin="normal"
label="Slider Key"
InputLabelProps={{
shrink: true,
}}
inputProps={{
value: one.slider_key,
onChange: this.handleChange('slider_key'),
}}
/>
</div>
<div>
>>>>>>>
<Helmet>
<title>
{match && match.params && match.params.id
? 'Edit Slider'
: 'Add Slider'}
</title>
</Helmet>
<PageContent>
<div class="w-full md:w-1/2 pb-4">
<label class="block uppercase tracking-wide text-grey-darker text-xs mb-2" for="grid-last-name">
Slider Name
</label>
<input class="Waftinputbox" id="slider-name" type="text" value= {one.slider_name} name="slider_name"
onChange= {this.handleChange('slider_name')} />
</div>
<div class="w-full md:w-1/2 pb-4">
<label class="block uppercase tracking-wide text-grey-darker text-xs mb-2" for="grid-last-name">
Slider Key
</label>
<input class="Waftinputbox" id="slider-key" type="text" value= {one.slider_key} name="slider_key"
onChange= {this.handleChange('slider_key')} />
</div>
<div class="w-full md:w-1/2 pb-4">
<label class="block uppercase tracking-wide text-grey-darker text-xs mb-2" for="grid-last-name">
Slider Settings
</label> |
<<<<<<<
import MediaManagePage from '../containers/AdminMediaManagePage/Loadable';
=======
import SliderManagePage from '../containers/SliderManagePage/Loadable';
import SliderManageAddEdit from '../containers/SliderManagePage/AddEditPage/Loadable';
>>>>>>>
import MediaManagePage from '../containers/AdminMediaManagePage/Loadable';
import SliderManagePage from '../containers/SliderManagePage/Loadable';
import SliderManageAddEdit from '../containers/SliderManagePage/AddEditPage/Loadable';
<<<<<<<
{
path: '/admin/media-manage',
component: MediaManagePage,
exact: true,
},
=======
{
path: '/admin/slider-manage/edit/:id',
name: 'Slider Manage',
component: SliderManageAddEdit,
exact: true,
},
{
path: '/admin/slider-manage/add',
name: 'Slider Manage',
component: SliderManageAddEdit,
exact: true,
},
{
path: '/admin/slider-manage',
name: 'Slider Manage',
component: SliderManagePage,
exact: true,
},
>>>>>>>
{
path: '/admin/media-manage',
component: MediaManagePage,
},
{
path: '/admin/slider-manage/edit/:id',
component: SliderManageAddEdit,
exact: true,
},
{
path: '/admin/slider-manage/add',
component: SliderManageAddEdit,
exact: true,
},
{
path: '/admin/slider-manage',
component: SliderManagePage,
exact: true,
}, |
<<<<<<<
//data[field] = !isEmpty(data[field]) ? data[field] : '';
// console.log(field);
// console.log(field.split('.').length);
//console.log(`loop ${i}: `, data);
if (field && field.split('.').length > 1) {
for (let k = 0; k < field.split('.').length; k++) {
// console.log(data);
// data = data[field.split('.')[k]];
data = !isEmpty(data[field.split('.')[k]]) ? data[field.split('.')[k]] : '';
}
fdata = data;
} else {
fdata = !isEmpty(data[field]) ? data[field] : '';
}
//console.log(field, validate, fdata);
// if (typeof data[field] == 'object') {
// data = data[field];
// }
=======
if (field && field.split('.').length > 1) {
for (let k = 0; k < field.split('.').length; k++) {
data = !isEmpty(data[field.split('.')[k]]) ? data[field.split('.')[k]] : '';
}
fdata = data;
} else {
fdata = !isEmpty(data[field]) ? data[field] : '';
}
>>>>>>>
if (field && field.split('.').length > 1) {
for (let k = 0; k < field.split('.').length; k++) {
data = !isEmpty(data[field.split('.')[k]]) ? data[field.split('.')[k]] : '';
}
fdata = data;
} else {
fdata = !isEmpty(data[field]) ? data[field] : '';
}
<<<<<<<
//console.log('for mongoid: ', fdata);
//console.log(isEmpty(fdata));
if (!isEmpty(fdata)) {
!Validator.isMongoId(fdata) ? (errors[field] = validate[j].msg) : null;
}
=======
!Validator.isMongoId(fdata) ? (errors[field] = validate[j].msg) : null;
>>>>>>>
if (!isEmpty(fdata)) {
!Validator.isMongoId(fdata) ? (errors[field] = validate[j].msg) : null;
} |
<<<<<<<
import Logo from '../../images/logo.png';
=======
import SliderIcon from '@material-ui/icons/Slideshow';
>>>>>>>
import Logo from '../../images/logo.png';
import SliderIcon from '@material-ui/icons/Slideshow'; |
<<<<<<<
<div class="flex justify-between mt-1 mb-1">
=======
<Helmet>
<title>
{match && match.params && match.params.id
? 'Edit Blog'
: 'Add Blog'}
</title>
</Helmet>
>>>>>>>
<Helmet>
<title>
{match && match.params && match.params.id
? 'Edit Blog'
: 'Add Blog'}
</title>
</Helmet>
<div class="flex justify-between mt-1 mb-1">
<<<<<<<
<IconButton className="cursor-pointer" onClick={this.handleGoBack} aria-label="Back">
<BackIcon />
</IconButton></PageHeader>
</div>
=======
<IconButton
className="cursor-pointer"
onClick={this.handleGoBack}
aria-label="Back"
>
<BackIcon />
</IconButton>
{match && match.params && match.params.id
? 'Edit Blog'
: 'Add Blog'}
</PageHeader>
>>>>>>>
<IconButton
className="cursor-pointer"
onClick={this.handleGoBack}
aria-label="Back"
>
<BackIcon />
</IconButton>
{match && match.params && match.params.id
? 'Edit Blog'
: 'Add Blog'}
</PageHeader>
</div> |
<<<<<<<
import React from "react";
import { compose } from "redux";
import { connect } from "react-redux";
import classNames from "classnames";
import { createStructuredSelector } from "reselect";
=======
import React from 'react';
import { compose } from 'redux';
import { connect } from 'react-redux';
import classNames from 'classnames';
>>>>>>>
import React from 'react';
import { compose } from 'redux';
import { connect } from 'react-redux';
import classNames from 'classnames';
import { createStructuredSelector } from 'reselect';
<<<<<<<
{allLinksObj.map(each => (
<MenuItem
key={each._id}
onClick={this.handleClose}
className={classes.dropdownItem}
>
{each.Description}
</MenuItem>
))}
=======
<MenuItem onClick={this.handleClose} className={classes.dropdownItem}>
Mike John responded to your email
</MenuItem>
<MenuItem onClick={this.handleClose} className={classes.dropdownItem}>
You have 5 new tasks
</MenuItem>
<MenuItem onClick={this.handleClose} className={classes.dropdownItem}>
You're now friend with Andrew
</MenuItem>
<MenuItem onClick={this.handleClose} className={classes.dropdownItem}>
Another Notification
</MenuItem>
<MenuItem onClick={this.handleClose} className={classes.dropdownItem}>
Another One
</MenuItem>
>>>>>>>
{allLinksObj.map(each => (
<MenuItem
key={each._id}
onClick={this.handleClose}
className={classes.dropdownItem}
>
{each.Description}
</MenuItem>
))}
<<<<<<<
logout: () => dispatch(logout()),
loadNotification: () => dispatch(loadAllRequest())
=======
logout: () => dispatch(logout()),
>>>>>>>
logout: () => dispatch(logout()),
loadNotification: () => dispatch(loadAllRequest()),
<<<<<<<
mapStateToProps,
mapDispatchToProps
=======
null,
mapDispatchToProps,
>>>>>>>
mapStateToProps,
mapDispatchToProps, |
<<<<<<<
let update = await LeaveTypeModel.findByIdAndUpdate(LeaveType._id, {
$set: LeaveType
});
return otherHelper.sendResponse(
res,
HttpStatus.OK,
true,
update,
null,
"Leave Type Saved Success !!",
null
);
=======
let update = await LeaveTypeModel.findByIdAndUpdate(LeaveType._id, { $set: LeaveType });
return otherHelper.sendResponse(res, HttpStatus.OK, true, update, null, 'Leave Type Edit Success !!', null);
>>>>>>>
let update = await LeaveTypeModel.findByIdAndUpdate(LeaveType._id, {
$set: LeaveType
});
return otherHelper.sendResponse(
res,
HttpStatus.OK,
true,
update,
null,
"Leave Type Edit Success !!",
null
); |
<<<<<<<
<div className="flex justify-between mt-3 mb-3">
=======
<Helmet>
<title>FAQ Listing</title>
</Helmet>
>>>>>>>
<Helmet>
<title>FAQ Listing</title>
</Helmet>
<div className="flex justify-between mt-3 mb-3"> |
<<<<<<<
};
/* prompt */
Selenium.prototype.doChooseCancelOnNextPrompt = function() {
return this.browserbot.cancelNextPrompt();
}
Selenium.prototype.doAnswerOnNextPrompt = function (answer) {
return this.browserbot.setNextPromptResult(answer);
}
Selenium.prototype.doAssertPrompt = function (message) {
return this.browserbot.getPromptMessage().then(function(actualMessage) {
if (message != actualMessage)
return Promise.reject("Prompt message doesn't match actual message");
else
return Promise.resolve(true);
});
}
=======
};
// show element
Selenium.prototype.doShowElement = function(locator){
try{
var element = this.browserbot.findElement(locator);
var origin_backgroundColor = element.style.backgroundColor;
//element.setAttribute("style","background-color: yellow");
element.style.backgroundColor = "yellow";
setTimeout(function() {
element.style.backgroundColor = origin_backgroundColor;
}, 500);
//console.log("set yellow");
return "element found"
} catch (e) {
console.error(e);
return "element not found";
}
}
>>>>>>>
};
/* prompt */
Selenium.prototype.doChooseCancelOnNextPrompt = function() {
return this.browserbot.cancelNextPrompt();
}
Selenium.prototype.doAnswerOnNextPrompt = function (answer) {
return this.browserbot.setNextPromptResult(answer);
}
Selenium.prototype.doAssertPrompt = function (message) {
return this.browserbot.getPromptMessage().then(function(actualMessage) {
if (message != actualMessage)
return Promise.reject("Prompt message doesn't match actual message");
else
return Promise.resolve(true);
});
// show element
Selenium.prototype.doShowElement = function(locator){
try{
var element = this.browserbot.findElement(locator);
var origin_backgroundColor = element.style.backgroundColor;
//element.setAttribute("style","background-color: yellow");
element.style.backgroundColor = "yellow";
setTimeout(function() {
element.style.backgroundColor = origin_backgroundColor;
}, 500);
//console.log("set yellow");
return "element found"
} catch (e) {
console.error(e);
return "element not found";
}
} |
<<<<<<<
import DeleteDialog from '../../components/DeleteDialog';
=======
import Loading from '../../components/loading';
>>>>>>>
import DeleteDialog from '../../components/DeleteDialog';
import Loading from '../../components/loading'; |
<<<<<<<
LeaveName: "",
LeaveNameNepali: "",
ApplicableGender: "Female",
=======
LeaveName: '',
ApplicableGender: 'Female',
>>>>>>>
LeaveName: '',
LeaveNameNepali: '',
ApplicableGender: 'Female',
<<<<<<<
NoOfDays: null,
ApplicableReligion: "",
IsCarryOver: ""
=======
NoOfDays: null,
>>>>>>>
NoOfDays: null,
ApplicableReligion: '',
IsCarryOver: '',
<<<<<<<
<GridItem xs={4} sm={4} md={4}>
<FormControl
component="fieldset"
className={classes.formControl}
>
=======
<GridItem xs={12} sm={12} md={12}>
<FormControl component="fieldset" className={classes.formControl}>
>>>>>>>
<GridItem xs={4} sm={4} md={4}>
<FormControl component="fieldset" className={classes.formControl}> |
<<<<<<<
import DeleteDialog from '../../components/DeleteDialog';
=======
import Loading from '../../components/loading';
>>>>>>>
import DeleteDialog from '../../components/DeleteDialog';
import Loading from '../../components/loading'; |
<<<<<<<
ltrim: true
}
}
// {
// field: "IsActive",
// sanitize: {
// rtrim: true,
// toBoolean: true
// }
// }
=======
ltrim: true,
},
},
>>>>>>>
ltrim: true
}
}
<<<<<<<
option: { min: 4, max: 10 }
},
{
condition: "IsUppercase",
msg: fiscalConfig.validateFiscal.Uppercase
}
]
}
// {
// field: "From",
// validate: [
// {
// condition: "IsEmpty",
// msg: fiscalConfig.validateFiscal.EmptyFrom
// },
// {
// condition: "IsLength",
// msg: fiscalConfig.validateFiscal.FromLength,
// option: { min: 3, max: 4 }
// },
// {
// condition: "IsAfter",
// msg: fiscalConfig.validateFiscal.IsAfter,
// option: { date: "1971" }
// }
// ]
// },
// {
// field: "To",
// validate: [
// {
// condition: "IsEmpty",
// msg: fiscalConfig.validateFiscal.EmptyTo
// },
// {
// condition: "IsLength",
// msg: fiscalConfig.validateFiscal.ToLength,
// option: { min: 3, max: 4 }
// },
// {
// condition: "IsDate",
// msg: fiscalConfig.validateFiscal.InvalidTo
// }
// ]
// }
// {
// field: "Email",
// validate: [
// {
// condition: "IsEmail",
// msg: fiscalConfig.validateFiscal.IsEmail
// }
// ]
// },
// {
// field: "Link",
// validate: [
// {
// condition: "IsURL",
// msg: fiscalConfig.validateFiscal.IsURL,
// option: { protocols: ["http", "https", "ftp"] }
// }
// ]
// },
// {
// field: "IsActive",
// validate: [
// {
// condition: "IsBoolean",
// msg: fiscalConfig.validateFiscal.IsBoolean
// }
// ]
// },
// {
// field: "PhoneNumber",
// validate: [
// {
// condition: "IsPhone",
// msg: fiscalConfig.validateFiscal.IsPhone,
// option: { isMobile: true, isLandLine: false }
// }
// ]
// }
=======
option: { min: 4, max: 10 },
},
{
condition: 'IsUppercase',
msg: fiscalConfig.validateFiscal.Uppercase,
},
],
},
{
field: 'From',
validate: [
{
condition: 'IsEmpty',
msg: fiscalConfig.validateFiscal.EmptyFrom,
},
{
condition: 'IsLength',
msg: fiscalConfig.validateFiscal.FromLength,
option: { min: 3, max: 4 },
},
{
condition: 'IsAfter',
msg: fiscalConfig.validateFiscal.IsAfter,
option: { date: '1971' },
},
],
},
{
field: 'To',
validate: [
{
condition: 'IsEmpty',
msg: fiscalConfig.validateFiscal.EmptyTo,
},
{
condition: 'IsLength',
msg: fiscalConfig.validateFiscal.ToLength,
option: { min: 3, max: 4 },
},
{
condition: 'IsDate',
msg: fiscalConfig.validateFiscal.InvalidTo,
},
],
},
// {
// field: 'Email',
// validate: [
// {
// condition: 'IsEmail',
// msg: fiscalConfig.validateFiscal.IsEmail,
// },
// ],
// },
// {
// field: 'Link',
// validate: [
// {
// condition: 'IsURL',
// msg: fiscalConfig.validateFiscal.IsURL,
// option: { protocols: ['http', 'https', 'ftp'] },
// },
// ],
// },
// {
// field: 'IsActive',
// validate: [
// {
// condition: 'IsBoolean',
// msg: fiscalConfig.validateFiscal.IsBoolean,
// },
// ],
// },
// {
// field: 'PhoneNumber',
// validate: [
// {
// condition: 'IsPhone',
// msg: fiscalConfig.validateFiscal.IsPhone,
// option: { isMobile: true, isLandLine: false },
// },
// ],
// },
>>>>>>>
option: { min: 4, max: 10 }
},
{
condition: "IsUppercase",
msg: fiscalConfig.validateFiscal.Uppercase
}
]
}
// {
// field: "From",
// validate: [
// {
// condition: "IsEmpty",
// msg: fiscalConfig.validateFiscal.EmptyFrom
// },
// {
// condition: "IsLength",
// msg: fiscalConfig.validateFiscal.FromLength,
// option: { min: 3, max: 4 }
// },
// {
// condition: "IsAfter",
// msg: fiscalConfig.validateFiscal.IsAfter,
// option: { date: "1971" }
// }
// ]
// },
// {
// field: "To",
// validate: [
// {
// condition: "IsEmpty",
// msg: fiscalConfig.validateFiscal.EmptyTo
// },
// {
// condition: "IsLength",
// msg: fiscalConfig.validateFiscal.ToLength,
// option: { min: 3, max: 4 }
// },
// {
// condition: "IsDate",
// msg: fiscalConfig.validateFiscal.InvalidTo
// }
// ]
// }
// {
// field: 'Email',
// validate: [
// {
// condition: 'IsEmail',
// msg: fiscalConfig.validateFiscal.IsEmail,
// },
// ],
// },
// {
// field: 'Link',
// validate: [
// {
// condition: 'IsURL',
// msg: fiscalConfig.validateFiscal.IsURL,
// option: { protocols: ['http', 'https', 'ftp'] },
// },
// ],
// },
// {
// field: 'IsActive',
// validate: [
// {
// condition: 'IsBoolean',
// msg: fiscalConfig.validateFiscal.IsBoolean,
// },
// ],
// },
// {
// field: 'PhoneNumber',
// validate: [
// {
// condition: 'IsPhone',
// msg: fiscalConfig.validateFiscal.IsPhone,
// option: { isMobile: true, isLandLine: false },
// },
// ],
// }, |
<<<<<<<
import DashboardPage from '../containers/AdminDashboard/Loadable';
import RoleManagePage from '../containers/AdminRoleManage/Loadable';
import RoleManageEditPage from '../containers/AdminRoleManage/AddEditPage';
=======
import Dashboard from '@material-ui/icons/Dashboard';
import ContentManagePage from '../containers/ContentListingPage';
import DashboardPage from '../containers/AdminDashboard';
>>>>>>>
import DashboardPage from '../containers/AdminDashboard/Loadable';
import RoleManagePage from '../containers/AdminRoleManage/Loadable';
import RoleManageEditPage from '../containers/AdminRoleManage/AddEditPage';
import ContentManagePage from '../containers/ContentListingPage/Loadable';
<<<<<<<
{
path: '/admin/role-manage',
name: 'Role Manage',
component: RoleManagePage,
exact: true,
},
{
path: '/admin/role-manage/edit/:id',
name: 'Role Manage',
component: RoleManageEditPage,
exact: true,
},
=======
{
path: '/admin/content-manage',
name: 'Content Manage',
icon: Dashboard,
component: ContentManagePage,
},
// {
// path: '/admin/role-manage',
// name: 'Role Manage',
// icon: Dashboard,
// component: RoleManagePage,
// },
>>>>>>>
{
path: '/admin/role-manage',
name: 'Role Manage',
component: RoleManagePage,
exact: true,
},
{
path: '/admin/role-manage/edit/:id',
name: 'Role Manage',
component: RoleManageEditPage,
exact: true,
},
{
path: '/admin/content-manage',
name: 'Content Manage',
component: ContentManagePage,
}, |
<<<<<<<
that.clear = function () {
// Clear the environment's node list.
that.nodes.length = 0;
// And clear out all named nodes.
var nodeNames = Object.keys(that.namedNodes),
i,
nodeName;
for (i = 0; i < nodeNames.length; i++) {
nodeName = nodeNames[i];
delete that.namedNodes[nodeName];
}
};
=======
that.clearAll = function () {
while (that.nodes.length > 0) {
that.nodes.pop();
}
};
>>>>>>>
that.clearAll = function () {
// Clear the environment's node list.
that.nodes.length = 0;
// And clear out all named nodes.
var nodeNames = Object.keys(that.namedNodes),
i,
nodeName;
for (i = 0; i < nodeNames.length; i++) {
nodeName = nodeNames[i];
delete that.namedNodes[nodeName];
}
};
<<<<<<<
that.clear();
=======
that.clearAll();
>>>>>>>
that.clearAll();
<<<<<<<
rate: flock.rates.AUDIO,
addToEnvironment: "tail"
=======
listeners: {
onDestroy: {
"func": "{that}.pause"
}
}
>>>>>>>
listeners: {
onDestroy: {
"func": "{that}.pause"
}
} |
<<<<<<<
// For companydepartments
const departmentroutes = require('./api/department');
router.use('/department', departmentroutes);
=======
// For Branch
const BranchRoutes = require('./api/Branch');
router.use('/Branch', BranchRoutes);
>>>>>>>
// For companydepartments
const departmentroutes = require('./api/department');
router.use('/department', departmentroutes);
// For Branch
const BranchRoutes = require('./api/Branch');
router.use('/Branch', BranchRoutes); |
<<<<<<<
}, {
code: [
'var Hello = React.createClass({',
' propTypes: {',
' firstname: CustomValidator.string',
' },',
' render: function() {',
' return <div>{this.props.firstname}</div>;',
' }',
'});'
].join('\n'),
args: [1, {customValidators: ['CustomValidator']}],
ecmaFeatures: {
jsx: true
}
}, {
code: [
'var Hello = React.createClass({',
' propTypes: {',
' outer: CustomValidator.shape({',
' inner: CustomValidator.map',
' })',
' },',
' render: function() {',
' return <div>{this.props.outer.inner}</div>;',
' }',
'});'
].join('\n'),
args: [1, {customValidators: ['CustomValidator']}],
ecmaFeatures: {
jsx: true
}
}, {
code: [
'var Hello = React.createClass({',
' propTypes: {',
' outer: React.PropTypes.shape({',
' inner: CustomValidator.string',
' })',
' },',
' render: function() {',
' return <div>{this.props.outer.inner}</div>;',
' }',
'});'
].join('\n'),
args: [1, {customValidators: ['CustomValidator']}],
ecmaFeatures: {
jsx: true
}
}, {
code: [
'var Hello = React.createClass({',
' propTypes: {',
' outer: CustomValidator.shape({',
' inner: React.PropTypes.string',
' })',
' },',
' render: function() {',
' return <div>{this.props.outer.inner}</div>;',
' }',
'});'
].join('\n'),
args: [1, {customValidators: ['CustomValidator']}],
ecmaFeatures: {
jsx: true
}
}, {
code: [
'var Hello = React.createClass({',
' propTypes: {',
' name: React.PropTypes.string',
' },',
' render: function() {',
' return <div>{this.props.name.get("test")}</div>;',
' }',
'});'
].join('\n'),
args: [1, {customValidators: ['CustomValidator']}],
ecmaFeatures: {
jsx: true
}
=======
}, {
code: [
'class Comp1 extends Component {',
' render() {',
' return <span />;',
' }',
'}',
'Comp1.propTypes = {',
' prop1: PropTypes.number',
'};',
'class Comp2 extends Component {',
' render() {',
' return <span />;',
' }',
'}',
'Comp2.propTypes = {',
' prop2: PropTypes.arrayOf(Comp1.propTypes.prop1)',
'};'
].join('\n'),
parser: 'babel-eslint'
>>>>>>>
}, {
code: [
'var Hello = React.createClass({',
' propTypes: {',
' firstname: CustomValidator.string',
' },',
' render: function() {',
' return <div>{this.props.firstname}</div>;',
' }',
'});'
].join('\n'),
args: [1, {customValidators: ['CustomValidator']}],
ecmaFeatures: {
jsx: true
}
}, {
code: [
'var Hello = React.createClass({',
' propTypes: {',
' outer: CustomValidator.shape({',
' inner: CustomValidator.map',
' })',
' },',
' render: function() {',
' return <div>{this.props.outer.inner}</div>;',
' }',
'});'
].join('\n'),
args: [1, {customValidators: ['CustomValidator']}],
ecmaFeatures: {
jsx: true
}
}, {
code: [
'var Hello = React.createClass({',
' propTypes: {',
' outer: React.PropTypes.shape({',
' inner: CustomValidator.string',
' })',
' },',
' render: function() {',
' return <div>{this.props.outer.inner}</div>;',
' }',
'});'
].join('\n'),
args: [1, {customValidators: ['CustomValidator']}],
ecmaFeatures: {
jsx: true
}
}, {
code: [
'var Hello = React.createClass({',
' propTypes: {',
' outer: CustomValidator.shape({',
' inner: React.PropTypes.string',
' })',
' },',
' render: function() {',
' return <div>{this.props.outer.inner}</div>;',
' }',
'});'
].join('\n'),
args: [1, {customValidators: ['CustomValidator']}],
ecmaFeatures: {
jsx: true
}
}, {
code: [
'var Hello = React.createClass({',
' propTypes: {',
' name: React.PropTypes.string',
' },',
' render: function() {',
' return <div>{this.props.name.get("test")}</div>;',
' }',
'});'
].join('\n'),
args: [1, {customValidators: ['CustomValidator']}],
ecmaFeatures: {
jsx: true
}
}, {
code: [
'class Comp1 extends Component {',
' render() {',
' return <span />;',
' }',
'}',
'Comp1.propTypes = {',
' prop1: PropTypes.number',
'};',
'class Comp2 extends Component {',
' render() {',
' return <span />;',
' }',
'}',
'Comp2.propTypes = {',
' prop2: PropTypes.arrayOf(Comp1.propTypes.prop1)',
'};'
].join('\n'),
parser: 'babel-eslint' |
<<<<<<<
return <Component ref={typicalRef} className={classNames.join(' ')}/>;
}
=======
return <Component ref={typicalRef} className={styles.typicalWrapper}/>;
}
export default memo(Typical)
>>>>>>>
return <Component ref={typicalRef} className={classNames.join(' ')}/>;
}
export default memo(Typical) |
<<<<<<<
var params = {
apiVersion: '1.1',
path: '/sites/' + this._sid + '/media/' + this._id
};
this.wpcom.sendRequest(params, query, null, fn);
=======
var path = '/sites/' + this._sid + '/media/' + this._id;
return this.wpcom.sendRequest(path, query, null, fn);
>>>>>>>
var params = {
apiVersion: '1.1',
path: '/sites/' + this._sid + '/media/' + this._id
};
return this.wpcom.sendRequest(params, query, null, fn);
<<<<<<<
var params = {
apiVersion: '1.1',
path: '/sites/' + this._sid + '/media/' + this._id,
method: 'post'
};
this.wpcom.sendRequest(params, null, body, fn);
=======
var path = '/sites/' + this._sid + '/media/' + this._id;
return this.wpcom.sendRequest({ path: path, method: 'post' }, null, body, fn);
>>>>>>>
var params = {
apiVersion: '1.1',
path: '/sites/' + this._sid + '/media/' + this._id,
method: 'post'
};
return this.wpcom.sendRequest(params, null, body, fn);
<<<<<<<
var params = {
apiVersion: '1.1',
path: '/sites/' + this._sid + '/media/' + this._id + '/delete',
method: 'post'
};
this.wpcom.sendRequest(params, null, null, fn);
=======
var path = '/sites/' + this._sid + '/media/' + this._id + '/delete';
return this.wpcom.sendRequest({ path: path, method: 'post' }, null, null, fn);
>>>>>>>
var params = {
apiVersion: '1.1',
path: '/sites/' + this._sid + '/media/' + this._id + '/delete',
method: 'post'
};
return this.wpcom.sendRequest(params, null, null, fn); |
<<<<<<<
/*
Used in by the Creep method "display stats" to
support constantly updated hp for the specific
selected creep. Conceivably one might move into
another state immediately without transitioning
into normal state before that. Preferably some
kind of state cleanup function will be added to
the state API, but at the moment it will function
correctly anyway, because the creep div will either
be invisible, or the most recent creephpupdater
will be the last one called, meaning that the
correct hp will be displayed even if there are
multiple existing creephpupdaters in the
system rendering level.
*/
var CreepHpUpdater = function(creep) {
var chp = new Object();
Object.extend(chp, InertDrawable);
chp.update = function() {
WIDGETS.creep_hp.innerHTML = creep.hp;
}
chp.should_die = false;
chp.is_dead = function() {
if (chp.should_die || !creep || !SET.state || SET.state.name() != "CreepSelectMode" || creep.is_dead()) {
if (SET.state) {
SET.state.tear_down();
SET.state = undefined;
}
if (chp.kz)
chp.kz.is_dead = function() { return true; };
return true;
}
else return false;
}
chp.draw = function() {
if (chp.kz) chp.kz.is_dead = function() { return true; };
chp.kz = KillZone(creep.x,creep.y,15);
}
assign_to_depth(chp, SET.system_render_level);
return chp;
}
=======
var pp = function(obj, depth) {
if (depth == undefined) depth = 4;
depth -= 1;
if (depth <= 0)
return '' + obj;
if (obj instanceof Array) {
var str = "[";
obj.forEach(function(i){
str += pp(i,depth) + ", ";
});
return str + "]";
}
if (obj instanceof String)
return '"'+str+'"';
if (obj instanceof Object){
var str="{"; //variable which will hold property values
for(prop in obj){
if (prop == "ancestor")
depth = 0;
str+= pp(prop,depth) + ":" + pp(obj[prop],depth) +", ";
}
return str + "}";
}
return '' + obj;
}
var log = function(label, thing) {
$('#log').append(label + ": " + pp(thing) + "<br/>");
}
Array.prototype.equals = function(testArr) {
if (this.length != testArr.length) return false;
for (var i = 0; i < testArr.length; i++) {
if (this[i].equals) {
if (!this[i].equals(testArr[i])) return false;
}
if (this[i] != testArr[i]) return false;
}
return true;
}
var insert_sorted = function(array, value, sortKey) {
var vkey = sortKey(value);
var min=0;
var max=array.length;
var mid=-1;
while(true){
if (max<=min) {
break;
}
mid = Math.floor((max+min)/2);
if (mid >= array.length || mid < 0) {
log("outofbounds in insert sorted");
break;
}
if (vkey <= sortKey(array[mid]))
max = mid-1;
else
min = mid+1;
}
mid = Math.floor((max+min)/2);
if (array[mid])
if (vkey > sortKey(array[mid]))
mid += 1;
mid = Math.max(0,mid);
var result = array.slice(0,mid).concat([value]).concat(array.slice(mid))
// log("inserting", [mid,vkey,array.map(sortKey), result.map(sortKey)]);
// var rm = result.map(sortKey);
// if (!rm.equals(rm.slice().sort(function(a,b){return a-b})))
// log("insert_sorted failed inserting",[vkey,rm]);
return result;
}
var known_best_paths = {}
var reset_pathfinding = function() {
log("pathfinding reset!");
known_best_paths = {};
}
var pathfind = function(start_block) {
// log("pathfinding started", start_block);
if ([start_block.gx, start_block.gy] in known_best_paths) {
// log("path found from cache", known_best_paths[start_block]);
return known_best_paths[[start_block.gx, start_block.gy]].next_block.gpos;
}
var successors = function(block) {
var candidates = [];
var normal_dist = 10;
[[0,1],[1,0],[-1,0],[0,-1]].forEach(function(pair) {
var gpos = {gx:block.gpos.gx + pair[0], gy: block.gpos.gy + pair[1], dist:normal_dist};
if (get_tower_at(gpos.gx, gpos.gy) != false) return;
if (gpos.gx < 0 || gpos.gx >= SET.gwidth) return;
if (gpos.gy < 0 || gpos.gy >= SET.gheight) return;
candidates.push(gpos);
});
var diag_dist = 14; //sqrt(2) * 10
[[1,1],[-1,-1],[1,-1],[-1,1]].forEach(function(pair){
var gpos = {gx:block.gpos.gx + pair[0], gy: block.gpos.gy + pair[1], dist:diag_dist};
if (get_tower_at(gpos.gx, gpos.gy) || get_tower_at(block.gpos.gx, gpos.gy) || get_tower_at(gpos.gx, block.gpos.gy) != false) return;
if (gpos.gx < 0 || gpos.gx >= SET.gwidth) return;
if (gpos.gy < 0 || gpos.gy >= SET.gheight) return;
candidates.push(gpos);
})
return candidates;
}
//straight-line distance as our heuristic
var heuristic = function(gpos) {
var dx = Math.abs(gpos.gx - SET.exit.gx);
var dy = Math.abs(gpos.gy - SET.exit.gy);
var dist = Math.min(dx,dy) * 14;
dist += (Math.max(dx,dy) - Math.min(dx,dy)) * 10
return dist
}
var closed = {};
var pqueue = [{gpos:start_block, f:heuristic(start_block), g:0}];
while (pqueue.length > 0) {
var block = pqueue[0];
pqueue = pqueue.slice(1);
// log("looking at", block)
if (closed[[block.gpos.gx, block.gpos.gy]] == true){
// log("in closed, skipping", closed)
continue;
}
if (block.gpos.gx == SET.exit.gx && block.gpos.gy == SET.exit.gy){
known_best_paths[[block.gpos.gx, block.gpos.gy]] = block;
while ("ancestor" in block) {
block.ancestor.next_block = block;
known_best_paths[[block.ancestor.gpos.gx, block.ancestor.gpos.gy]] = block.ancestor
block = block.ancestor;
}
// log("known_best_paths", known_best_paths);
var result = known_best_paths[[start_block.gx, start_block.gy]].next_block.gpos;
// log("path found!", result);
return result;
}
closed[[block.gpos.gx, block.gpos.gy]] = true;
// log("closed", closed);
successors(block).forEach(function(s) {
var suc = {gpos:s, g:s.dist + block.g, ancestor:block};
suc.f = suc.g + heuristic(suc.gpos);
pqueue = insert_sorted(pqueue, suc, function(bl) {
return bl.f
});
})
// log("pqueue", pqueue);
}
log("---------pathfinding failed!----------");
}
>>>>>>>
var pp = function(obj, depth) {
if (depth == undefined) depth = 4;
depth -= 1;
if (depth <= 0)
return '' + obj;
if (obj instanceof Array) {
var str = "[";
obj.forEach(function(i){
str += pp(i,depth) + ", ";
});
return str + "]";
}
if (obj instanceof String)
return '"'+str+'"';
if (obj instanceof Object){
var str="{"; //variable which will hold property values
for(prop in obj){
if (prop == "ancestor")
depth = 0;
str+= pp(prop,depth) + ":" + pp(obj[prop],depth) +", ";
}
return str + "}";
}
return '' + obj;
}
var log = function(label, thing) {
$('#log').append(label + ": " + pp(thing) + "<br/>");
}
Array.prototype.equals = function(testArr) {
if (this.length != testArr.length) return false;
for (var i = 0; i < testArr.length; i++) {
if (this[i].equals) {
if (!this[i].equals(testArr[i])) return false;
}
if (this[i] != testArr[i]) return false;
}
return true;
}
var insert_sorted = function(array, value, sortKey) {
var vkey = sortKey(value);
var min=0;
var max=array.length;
var mid=-1;
while(true){
if (max<=min) {
break;
}
mid = Math.floor((max+min)/2);
if (mid >= array.length || mid < 0) {
log("outofbounds in insert sorted");
break;
}
if (vkey <= sortKey(array[mid]))
max = mid-1;
else
min = mid+1;
}
mid = Math.floor((max+min)/2);
if (array[mid])
if (vkey > sortKey(array[mid]))
mid += 1;
mid = Math.max(0,mid);
var result = array.slice(0,mid).concat([value]).concat(array.slice(mid))
// log("inserting", [mid,vkey,array.map(sortKey), result.map(sortKey)]);
// var rm = result.map(sortKey);
// if (!rm.equals(rm.slice().sort(function(a,b){return a-b})))
// log("insert_sorted failed inserting",[vkey,rm]);
return result;
}
var known_best_paths = {}
var reset_pathfinding = function() {
log("pathfinding reset!");
known_best_paths = {};
}
var pathfind = function(start_block) {
// log("pathfinding started", start_block);
if ([start_block.gx, start_block.gy] in known_best_paths) {
// log("path found from cache", known_best_paths[start_block]);
return known_best_paths[[start_block.gx, start_block.gy]].next_block.gpos;
}
var successors = function(block) {
var candidates = [];
var normal_dist = 10;
[[0,1],[1,0],[-1,0],[0,-1]].forEach(function(pair) {
var gpos = {gx:block.gpos.gx + pair[0], gy: block.gpos.gy + pair[1], dist:normal_dist};
if (get_tower_at(gpos.gx, gpos.gy) != false) return;
if (gpos.gx < 0 || gpos.gx >= SET.gwidth) return;
if (gpos.gy < 0 || gpos.gy >= SET.gheight) return;
candidates.push(gpos);
});
var diag_dist = 14; //sqrt(2) * 10
[[1,1],[-1,-1],[1,-1],[-1,1]].forEach(function(pair){
var gpos = {gx:block.gpos.gx + pair[0], gy: block.gpos.gy + pair[1], dist:diag_dist};
if (get_tower_at(gpos.gx, gpos.gy) || get_tower_at(block.gpos.gx, gpos.gy) || get_tower_at(gpos.gx, block.gpos.gy) != false) return;
if (gpos.gx < 0 || gpos.gx >= SET.gwidth) return;
if (gpos.gy < 0 || gpos.gy >= SET.gheight) return;
candidates.push(gpos);
})
return candidates;
}
//straight-line distance as our heuristic
var heuristic = function(gpos) {
var dx = Math.abs(gpos.gx - SET.exit.gx);
var dy = Math.abs(gpos.gy - SET.exit.gy);
var dist = Math.min(dx,dy) * 14;
dist += (Math.max(dx,dy) - Math.min(dx,dy)) * 10
return dist
}
var closed = {};
var pqueue = [{gpos:start_block, f:heuristic(start_block), g:0}];
while (pqueue.length > 0) {
var block = pqueue[0];
pqueue = pqueue.slice(1);
// log("looking at", block)
if (closed[[block.gpos.gx, block.gpos.gy]] == true){
// log("in closed, skipping", closed)
continue;
}
if (block.gpos.gx == SET.exit.gx && block.gpos.gy == SET.exit.gy){
known_best_paths[[block.gpos.gx, block.gpos.gy]] = block;
while ("ancestor" in block) {
block.ancestor.next_block = block;
known_best_paths[[block.ancestor.gpos.gx, block.ancestor.gpos.gy]] = block.ancestor
block = block.ancestor;
}
// log("known_best_paths", known_best_paths);
var result = known_best_paths[[start_block.gx, start_block.gy]].next_block.gpos;
// log("path found!", result);
return result;
}
closed[[block.gpos.gx, block.gpos.gy]] = true;
// log("closed", closed);
successors(block).forEach(function(s) {
var suc = {gpos:s, g:s.dist + block.g, ancestor:block};
suc.f = suc.g + heuristic(suc.gpos);
pqueue = insert_sorted(pqueue, suc, function(bl) {
return bl.f
});
})
// log("pqueue", pqueue);
}
log("---------pathfinding failed!----------");
}
/*
Used in by the Creep method "display stats" to
support constantly updated hp for the specific
selected creep. Conceivably one might move into
another state immediately without transitioning
into normal state before that. Preferably some
kind of state cleanup function will be added to
the state API, but at the moment it will function
correctly anyway, because the creep div will either
be invisible, or the most recent creephpupdater
will be the last one called, meaning that the
correct hp will be displayed even if there are
multiple existing creephpupdaters in the
system rendering level.
*/
var CreepHpUpdater = function(creep) {
var chp = new Object();
Object.extend(chp, InertDrawable);
chp.update = function() {
WIDGETS.creep_hp.innerHTML = creep.hp;
}
chp.should_die = false;
chp.is_dead = function() {
if (chp.should_die || !creep || !SET.state || SET.state.name() != "CreepSelectMode" || creep.is_dead()) {
if (SET.state) {
SET.state.tear_down();
SET.state = undefined;
}
if (chp.kz)
chp.kz.is_dead = function() { return true; };
return true;
}
else return false;
}
chp.draw = function() {
if (chp.kz) chp.kz.is_dead = function() { return true; };
chp.kz = KillZone(creep.x,creep.y,15);
}
assign_to_depth(chp, SET.system_render_level);
return chp;
}
<<<<<<<
var elapsed = SET.now - this.last;
var speed = (elapsed/1000) * this.speed;
this.last = SET.now;
var path = calc_path(this.x,this.y,SET.exit.x_mid,SET.exit.y_mid,speed);
=======
var next_block = pathfind(gpos);
var coords = center_of_square(next_block.gx, next_block.gy)
var path = calc_path(this.x,this.y,coords.x,coords.y,this.speed);
>>>>>>>
var elapsed = SET.now - this.last;
var speed = (elapsed/1000) * this.speed;
this.last = SET.now;
var next_block = pathfind(gpos);
var coords = center_of_square(next_block.gx, next_block.gy)
var path = calc_path(this.x,this.y,coords.x,coords.y,speed);
<<<<<<<
attempt_to_enter_ui_mode(new BuildMissileTowerMode());
=======
var cost = 100;
if (SET.gold >= cost) {
build_tower_mode();
SET.state_action = function(x,y) {
var gpos = pixel_to_grid(x,y);
MissileTower(gpos.gx,gpos.gy);
SET.gold -= cost;
set_state_normal();
reset_pathfinding();
}
}
else {error("Not enough gold, you need at least 100")}
>>>>>>>
attempt_to_enter_ui_mode(new BuildMissileTowerMode());
<<<<<<<
attempt_to_enter_ui_mode(new BuildLaserTowerMode());
};
var BuildGattlingTowerMode = function() {
this.cost = 50;
this.action = function(x,y) {
var gpos = pixel_to_grid(x,y);
GattlingTower(gpos.gx,gpos.gy);
SET.gold -= this.cost;
};
this.name = function() {
return "BuildGattlingTowerMode";
}
};
BuildGattlingTowerMode.prototype = new BuildTowerMode();
var build_gattling_tower = function() {
attempt_to_enter_ui_mode(new BuildGattlingTowerMode());
}
/* TowerSelectMode */
var TowerSelectMode = function() {
this.set_up = function(x,y) {
var gpos = pixel_to_grid(x,y);
this.tower = get_tower_at(gpos.gx,gpos.gy);
if (this.tower) {
this.tower.display_stats();
this.killzone = KillZone(this.tower.x_mid,
this.tower.y_mid,
this.tower.range*SET.pixels_per_square);
WIDGETS.tower.style.display = "block";
=======
if (SET.gold >= 50) {
build_tower_mode();
SET.state_action = function(x,y) {
var gpos = pixel_to_grid(x,y);
LaserTower(gpos.gx,gpos.gy);
SET.gold -= 50;
set_state_normal();
reset_pathfinding();
>>>>>>>
attempt_to_enter_ui_mode(new BuildLaserTowerMode());
};
var BuildGattlingTowerMode = function() {
this.cost = 50;
this.action = function(x,y) {
var gpos = pixel_to_grid(x,y);
GattlingTower(gpos.gx,gpos.gy);
SET.gold -= this.cost;
reset_pathfinding();
};
this.name = function() {
return "BuildGattlingTowerMode";
}
};
BuildGattlingTowerMode.prototype = new BuildTowerMode();
var build_gattling_tower = function() {
attempt_to_enter_ui_mode(new BuildGattlingTowerMode());
}
/* TowerSelectMode */
var TowerSelectMode = function() {
this.set_up = function(x,y) {
var gpos = pixel_to_grid(x,y);
this.tower = get_tower_at(gpos.gx,gpos.gy);
if (this.tower) {
this.tower.display_stats();
this.killzone = KillZone(this.tower.x_mid,
this.tower.y_mid,
this.tower.range*SET.pixels_per_square);
WIDGETS.tower.style.display = "block"; |
<<<<<<<
var substitutions = require("./substitutions");
=======
/**
* @constructor
* @param {Object} config the configuration of the bridge.
* See ../config/slack-config-schema.yaml for the schema to which this must conform.
* @param {Rooms} rooms mapping of all known slack channels to matrix rooms.
* @param {Bridge} bridge the matrix-appservice-bridge bridge through which to
* communicate with matrix.
*/
>>>>>>>
var substitutions = require("./substitutions");
/**
* @constructor
* @param {Object} config the configuration of the bridge.
* See ../config/slack-config-schema.yaml for the schema to which this must conform.
* @param {Rooms} rooms mapping of all known slack channels to matrix rooms.
* @param {Bridge} bridge the matrix-appservice-bridge bridge through which to
* communicate with matrix.
*/ |
<<<<<<<
const Datastore = require('nedb');
=======
const path = require("path");
>>>>>>>
const Datastore = require('nedb');
const path = require("path"); |
<<<<<<<
var substitutions = require("./substitutions");
=======
const log = require("matrix-appservice-bridge").Logging.get("SlackGhost");
>>>>>>>
const substitutions = require("./substitutions");
const log = require("matrix-appservice-bridge").Logging.get("SlackGhost"); |
<<<<<<<
var Promise = require('bluebird');
var bridgeLib = require("matrix-appservice-bridge");
var Bridge = bridgeLib.Bridge;
var Metrics = bridgeLib.PrometheusMetrics;
var StateLookup = bridgeLib.StateLookup;
var SlackHookHandler = require("./SlackHookHandler");
var BridgedRoom = require("./BridgedRoom");
var SlackGhost = require("./SlackGhost");
var MatrixUser = require("./MatrixUser"); // NB: this is not bridgeLib.MatrixUser !
var AdminCommands = require("./AdminCommands");
var OAuth2 = require("./OAuth2");
var Provisioning = require("./Provisioning");
var randomstring = require("randomstring");
const rp = require('request-promise');
=======
const Promise = require('bluebird');
const BridgeLib = require("matrix-appservice-bridge");
const Bridge = BridgeLib.Bridge;
const Metrics = BridgeLib.PrometheusMetrics;
const StateLookup = BridgeLib.StateLookup;
const SlackHookHandler = require("./SlackHookHandler");
const BridgedRoom = require("./BridgedRoom");
const SlackGhost = require("./SlackGhost");
const MatrixUser = require("./MatrixUser"); // NB: this is not BridgeLib.MatrixUser !
const AdminCommands = require("./AdminCommands");
const OAuth2 = require("./OAuth2");
const Provisioning = require("./Provisioning");
const randomstring = require("randomstring");
const log = require("matrix-appservice-bridge").Logging.get("Main");
>>>>>>>
const Promise = require('bluebird');
const BridgeLib = require("matrix-appservice-bridge");
const Bridge = BridgeLib.Bridge;
const Metrics = BridgeLib.PrometheusMetrics;
const StateLookup = BridgeLib.StateLookup;
const SlackHookHandler = require("./SlackHookHandler");
const BridgedRoom = require("./BridgedRoom");
const SlackGhost = require("./SlackGhost");
const MatrixUser = require("./MatrixUser"); // NB: this is not BridgeLib.MatrixUser !
const AdminCommands = require("./AdminCommands");
const OAuth2 = require("./OAuth2");
const Provisioning = require("./Provisioning");
const randomstring = require("randomstring");
const log = require("matrix-appservice-bridge").Logging.get("Main");
const rp = require('request-promise'); |
<<<<<<<
=======
gridSettings[SETTINGS_IGNORE_PANEL] = false; //Set this to true if you have the top panel hidden
>>>>>>>
gridSettings[SETTINGS_IGNORE_PANEL] = false; //Set this to true if you have the top panel hidden
<<<<<<<
let offsetY = (isPrimaryMonitor(monitor)) ? Main.panel.actor.height : 0;
=======
let offsetY = (isPrimaryMonitor(monitor) && !gridSettings[SETTINGS_IGNORE_PANEL]) ? Main.panel.actor.height : 0;
>>>>>>>
let offsetY = (isPrimaryMonitor(monitor) && !gridSettings[SETTINGS_IGNORE_PANEL]) ? Main.panel.actor.height : 0;
<<<<<<<
},
refreshGrid: function(fromGridElement, toGridElement) {
this._resetGrid();
let minX,maxX,minY,maxY;
[minX,maxX,minY,maxY] = this._getVarFromGridElement(fromGridElement, toGridElement);
let key = getMonitorKey(fromGridElement.monitor);
let grid = grids[key];
for (let r=minY; r <= maxY; r++) {
for (let c=minX; c <= maxX; c++) {
let element = grid.elements[r][c];
element._activate();
this.activatedActors.push(element);
}
}
this._displayArea(fromGridElement, toGridElement);
},
_computeAreaPositionSize: function(fromGridElement, toGridElement) {
let minX,maxX,minY,maxY;
[minX,maxX,minY,maxY] = this._getVarFromGridElement(fromGridElement,toGridElement);
let monitor = fromGridElement.monitor;
let offsetY = (isPrimaryMonitor(monitor)) ? Main.panel.actor.height : 0;
let areaWidth = (monitor.width/nbCols)*((maxX-minX)+1);
let areaHeight = ((monitor.height-offsetY)/nbRows)*((maxY-minY)+1);
let areaX = monitor.x + (minX*(monitor.width/nbCols));
let areaY = offsetY+monitor.y + (minY*((monitor.height-offsetY)/nbRows));
return [areaX,areaY,areaWidth,areaHeight];
},
_displayArea: function(fromGridElement, toGridElement) {
let areaWidth,areaHeight,areaX,areaY;
[areaX,areaY,areaWidth,areaHeight] = this._computeAreaPositionSize(fromGridElement,toGridElement);
area.add_style_pseudo_class('activate');
if (gridSettings[SETTINGS_ANIMATION]) {
Tweener.addTween(area, {
time: 0.2,
x:areaX,
y:areaY,
width:areaWidth,
height: areaHeight,
transition: 'easeOutQuad'
});
}
else {
area.width = areaWidth;
area.height = areaHeight;
area.x = areaX;
area.y = areaY;
}
},
_hideArea: function() {
area.remove_style_pseudo_class('activate');
},
_onHoverChanged: function(gridElement) {
if(this.activated) {
this.refreshGrid(this.first,gridElement);
}
else if (!this.currentElement || gridElement.id != this.currentElement.id) {
if (this.currentElement) {
this.currentElement._deactivate();
}
this.currentElement = gridElement;
this.currentElement._activate();
this._displayArea(gridElement,gridElement);
}
},
_destroy: function() {
this.activated = null;
=======
},
refreshGrid : function(fromGridElement,toGridElement)
{
this._resetGrid();
let minX,maxX,minY,maxY;
[minX,maxX,minY,maxY] = this._getVarFromGridElement(fromGridElement,toGridElement);
let key = getMonitorKey(fromGridElement.monitor);
let grid = grids[key];
for(let r=minY; r <= maxY; r++)
{
for(let c=minX; c <= maxX; c++)
{
let element = grid.elements[r][c];
element._activate();
this.activatedActors.push(element);
}
}
this._displayArea(fromGridElement,toGridElement);
},
_computeAreaPositionSize : function (fromGridElement,toGridElement)
{
let minX,maxX,minY,maxY;
[minX,maxX,minY,maxY] = this._getVarFromGridElement(fromGridElement,toGridElement);
let monitor = fromGridElement.monitor;
let offsetY = (isPrimaryMonitor(monitor) && !gridSettings[SETTINGS_IGNORE_PANEL]) ? Main.panel.actor.height : 0;
let areaWidth = (monitor.width/nbCols)*((maxX-minX)+1);
let areaHeight = ((monitor.height-offsetY)/nbRows)*((maxY-minY)+1);
let areaX = monitor.x + (minX*(monitor.width/nbCols));
let areaY = offsetY+monitor.y + (minY*((monitor.height-offsetY)/nbRows));
return [areaX,areaY,areaWidth,areaHeight];
},
_displayArea : function (fromGridElement, toGridElement)
{
let areaWidth,areaHeight,areaX,areaY;
[areaX,areaY,areaWidth,areaHeight] = this._computeAreaPositionSize(fromGridElement,toGridElement);
area.add_style_pseudo_class('activate');
if(gridSettings[SETTINGS_ANIMATION])
{
Tweener.addTween(area,
{
time: 0.2,
x:areaX,
y:areaY,
width:areaWidth,
height: areaHeight,
transition: 'easeOutQuad'});
}
else
{
area.width = areaWidth;
area.height = areaHeight;
area.x = areaX;
area.y = areaY;
}
},
_hideArea : function()
{
area.remove_style_pseudo_class('activate');
},
_onHoverChanged : function(gridElement)
{
if(this.activated)
{
this.refreshGrid(this.first,gridElement);
}
else if(!this.currentElement || gridElement.id != this.currentElement.id)
{
if(this.currentElement)
this.currentElement._deactivate();
this.currentElement = gridElement;
this.currentElement._activate();
this._displayArea(gridElement,gridElement);
}
},
_destroy : function()
{
this.activated = null;
>>>>>>>
},
refreshGrid: function(fromGridElement, toGridElement) {
this._resetGrid();
let minX,maxX,minY,maxY;
[minX,maxX,minY,maxY] = this._getVarFromGridElement(fromGridElement, toGridElement);
let key = getMonitorKey(fromGridElement.monitor);
let grid = grids[key];
for (let r=minY; r <= maxY; r++) {
for (let c=minX; c <= maxX; c++) {
let element = grid.elements[r][c];
element._activate();
this.activatedActors.push(element);
}
}
this._displayArea(fromGridElement, toGridElement);
},
_computeAreaPositionSize: function(fromGridElement, toGridElement) {
let minX,maxX,minY,maxY;
[minX,maxX,minY,maxY] = this._getVarFromGridElement(fromGridElement,toGridElement);
let monitor = fromGridElement.monitor;
let offsetY = (isPrimaryMonitor(monitor) && !gridSettings[SETTINGS_IGNORE_PANEL]) ? Main.panel.actor.height : 0;
let areaWidth = (monitor.width/nbCols)*((maxX-minX)+1);
let areaHeight = ((monitor.height-offsetY)/nbRows)*((maxY-minY)+1);
let areaX = monitor.x + (minX*(monitor.width/nbCols));
let areaY = offsetY+monitor.y + (minY*((monitor.height-offsetY)/nbRows));
return [areaX,areaY,areaWidth,areaHeight];
},
_displayArea: function(fromGridElement, toGridElement) {
let areaWidth,areaHeight,areaX,areaY;
[areaX,areaY,areaWidth,areaHeight] = this._computeAreaPositionSize(fromGridElement,toGridElement);
area.add_style_pseudo_class('activate');
if (gridSettings[SETTINGS_ANIMATION]) {
Tweener.addTween(area, {
time: 0.2,
x:areaX,
y:areaY,
width:areaWidth,
height: areaHeight,
transition: 'easeOutQuad'
});
}
else {
area.width = areaWidth;
area.height = areaHeight;
area.x = areaX;
area.y = areaY;
}
},
_hideArea: function() {
area.remove_style_pseudo_class('activate');
},
_onHoverChanged: function(gridElement) {
if(this.activated) {
this.refreshGrid(this.first,gridElement);
}
else if (!this.currentElement || gridElement.id != this.currentElement.id) {
if (this.currentElement) {
this.currentElement._deactivate();
}
this.currentElement = gridElement;
this.currentElement._activate();
this._displayArea(gridElement,gridElement);
}
},
_destroy: function() {
this.activated = null; |
<<<<<<<
logout: require('./commands/logout'),
=======
login: require('./commands/login'),
>>>>>>>
logout: require('./commands/logout'),
login: require('./commands/login'), |
<<<<<<<
const pkg = require('../package.json');
const {
DEBUG,
LAMBDA_VERSION,
UPDATE_NOTIFICATION_INTERVAL
} = require('./constants');
=======
const { LAMBDA_VERSION, UPDATE_NOTIFICATION_INTERVAL } = require('./constants');
>>>>>>>
const pkg = require('../package.json');
const { LAMBDA_VERSION, UPDATE_NOTIFICATION_INTERVAL } = require('./constants');
<<<<<<<
// wait here, because it looks weird to print the "wrong flag" message and then wait another second
analyticsPromise.then(() => {
=======
context.line();
context.line(
colors.red(
'Errors running command `' + ['zapier'].concat(argv).join(' ') + '`:'
)
);
context.line();
errors.forEach(error => context.line(colors.red(`!!! ${error}`)));
context.line();
context.line(`For more information, run \`zapier help ${command}\`.`);
context.line();
process.exit(1);
}
commandFunc(context, ...args).catch(err => {
utils.endSpinner(false);
if (global.argOpts.debug) {
>>>>>>>
// wait here, because it looks weird to print the "wrong flag" message and then wait another second
analyticsPromise.then(() => { |
<<<<<<<
describe: require('./describe'),
help: require('./help')
=======
help: require('./help'),
link: require('./link')
>>>>>>>
help: require('./help') |
<<<<<<<
hide: true
}
},
firehoseWebhooks: {
description:
'**INTERNAL USE ONLY**. Zapier uses this for internal webhook app configurations.',
$ref: FirehoseWebhookSchema.id,
docAnnotation: {
hide: true
}
}
=======
hide: true,
},
},
>>>>>>>
hide: true,
},
},
firehoseWebhooks: {
description:
'**INTERNAL USE ONLY**. Zapier uses this for internal webhook app configurations.',
$ref: FirehoseWebhookSchema.id,
docAnnotation: {
hide: true,
},
},
<<<<<<<
AppFlagsSchema,
FirehoseWebhookSchema
=======
AppFlagsSchema,
>>>>>>>
AppFlagsSchema,
FirehoseWebhookSchema, |
<<<<<<<
describe: require('./describe'),
help: require('./help'),
link: require('./link')
=======
convert: require('./convert'),
help: require('./help')
>>>>>>>
help: require('./help') |
<<<<<<<
var xmlHttp = new XMLHttpRequest()
xmlHttp.open('GET', chrome.extension.getURL('lib/hibernationPage/index.html'), true)
xmlHttp.onreadystatechange = function () {
if (xmlHttp.readyState === 4) {
var html = xmlHttp.responseText
sleepTab(html, tab, 100)
}
}
xmlHttp.send(null)
})
=======
var xmlHttp = new XMLHttpRequest();
xmlHttp.open('GET', chrome.extension.getURL('lib/hibernationPage/index.html'), true);
xmlHttp.onload = function () {
var html = xmlHttp.responseText;
sleepTab(html, tab, 100);
};
xmlHttp.send(null);
});
>>>>>>>
var xmlHttp = new XMLHttpRequest()
xmlHttp.open('GET', chrome.extension.getURL('lib/hibernationPage/index.html'), true)
xmlHttp.onload = function () {
var html = xmlHttp.responseText
sleepTab(html, tab, 100)
}
xmlHttp.send(null)
})
<<<<<<<
var xmlHttp = new XMLHttpRequest()
xmlHttp.open('GET', chrome.extension.getURL('lib/hibernationPage/index.html'), true)
xmlHttp.onreadystatechange = function () {
if (xmlHttp.readyState === 4) {
var html = xmlHttp.responseText
sleepTab(html, tab[0], 100)
}
}
xmlHttp.send(null)
=======
var xmlHttp = new XMLHttpRequest();
xmlHttp.open('GET', chrome.extension.getURL('lib/hibernationPage/index.html'), true);
xmlHttp.onload = function () {
var html = xmlHttp.responseText;
sleepTab(html, tab[0], 100);
};
xmlHttp.send(null);
>>>>>>>
var xmlHttp = new XMLHttpRequest()
xmlHttp.open('GET', chrome.extension.getURL('lib/hibernationPage/index.html'), true)
xmlHttp.onload = function () {
var html = xmlHttp.responseText
sleepTab(html, tab[0], 100)
}
xmlHttp.send(null) |
<<<<<<<
var GCC = process.env['CC'] || 'gcc';
var LOG_LEVEL = process.env['Log_LEVEL'] || 'DEBUG';
=======
var GCC = process.env['CC'];
if (!GCC) {
if (SYSTEM === 'freebsd') {
GCC = 'gcc47';
} else {
GCC = 'gcc';
}
}
var BUILDDIR = process.env['BUILDDIR'];
if (BUILDDIR === undefined) {
BUILDDIR = 'build_'+SYSTEM;
}
>>>>>>>
var LOG_LEVEL = process.env['Log_LEVEL'] || 'DEBUG';
var GCC = process.env['CC'];
if (!GCC) {
if (SYSTEM === 'freebsd') {
GCC = 'gcc47';
} else {
GCC = 'gcc';
}
}
var BUILDDIR = process.env['BUILDDIR'];
if (BUILDDIR === undefined) {
BUILDDIR = 'build_'+SYSTEM;
}
<<<<<<<
=======
var logLevel = process.env['Log_LEVEL'] || 'DEBUG';
builder.config.cflags.push('-D','Log_'+logLevel);
var usePie = process.env['NO_PIE'] === undefined && SYSTEM !== 'freebsd';
if (usePie) {
builder.config.cflags.push('-fPIE');
}
>>>>>>>
<<<<<<<
if (process.env['NO_PIE'] === undefined && SYSTEM !== 'win32') {
builder.config.cflags.push('-fPIE');
builder.config.ldflags.push('-pie');
=======
if (usePie) {
builder.config.ldflags.push(
'-pie'
);
>>>>>>>
if (process.env['NO_PIE'] === undefined && SYSTEM !== 'freebsd' && SYSTEM !== 'win32') {
builder.config.cflags.push('-fPIE');
builder.config.ldflags.push('-pie'); |
<<<<<<<
GiftedAvatar,
=======
utils
>>>>>>>
GiftedAvatar,
utils |
<<<<<<<
import {setLocale} from './Locale';
import _ from 'lodash';
=======
import deepEqual from 'deep-equal';
>>>>>>>
import {setLocale} from './Locale';
import deepEqual from 'deep-equal'; |
<<<<<<<
/*! Flocking 0.1.0 (March 24, 2014), Copyright 2014 Colin Clark | flockingjs.org */
=======
/*! Flocking 0.1.0 (March 28, 2014), Copyright 2014 Colin Clark | flockingjs.org */
>>>>>>>
/*! Flocking 0.1.0 (March 28, 2014), Copyright 2014 Colin Clark | flockingjs.org */
<<<<<<<
=======
/**
* Gets the value of the ugen at the specified path.
*
* @param {String} path the ugen's path within the synth graph
* @return {Number|UGen} a scalar value in the case of a value ugen, otherwise the ugen itself
*/
that.get = function (path) {
return flock.input.get(that.namedNodes, path);
};
>>>>>>>
<<<<<<<
=======
* @param {String} path the ugen's path within the synth graph
* @param {Number || UGenDef} val a scalar value (for Value ugens) or a UGenDef object
* @return {UGen} the newly created UGen that was set at the specified path
*/
that.set = function (path, val, swap) {
return flock.input.set(that.namedNodes, path, val, undefined, function (ugenDef, path, target, prev) {
return flock.synth.ugenValueParser(that, ugenDef, prev, swap);
});
};
/**
>>>>>>>
<<<<<<<
// TODO: At the moment, flock.synth.group attempts to act as a proxy for
// a collection of synths, allowing users to address it as if it were
// a single synth. However, it does nothing to ensure that its contained synths
// are managed properly with the environment. As a result, it will double-generate
// output from each synth unless the user has manually specified their synths with the
// "addToEnvironment: false" option.
// It's also not IoC-enabled, which makes it very diffult to use it in IoC-based
// contexts.
// At very least, it should override the essential flock.nodeList methods and ensure
// that synths added to the group are actively removed from the environment's node list.
=======
>>>>>>>
// TODO: At the moment, flock.synth.group attempts to act as a proxy for
// a collection of synths, allowing users to address it as if it were
// a single synth. However, it does nothing to ensure that its contained synths
// are managed properly with the environment. As a result, it will double-generate
// output from each synth unless the user has manually specified their synths with the
// "addToEnvironment: false" option.
// It's also not IoC-enabled, which makes it very diffult to use it in IoC-based
// contexts.
// At very least, it should override the essential flock.nodeList methods and ensure
// that synths added to the group are actively removed from the environment's node list.
<<<<<<<
=======
>>>>>>>
<<<<<<<
/**
* flock.band provides an IoC-friendly interface for a collection of named synths.
*/
// TODO: Unit tests.
fluid.defaults("flock.band", {
gradeNames: ["fluid.eventedComponent", "autoInit"],
invokers: {
play: {
func: "{that}.events.onPlay.fire"
},
pause: {
func: "{that}.events.onPause.fire"
},
set: {
func: "{that}.events.onSet.fire"
}
},
events: {
onPlay: null,
onPause: null,
onSet: null
},
distributeOptions: {
source: "{that}.options.synthListeners",
removeSource: true,
target: "{that flock.synth}.options.listeners"
},
synthListeners: {
"{band}.events.onPlay": {
func: "{that}.play"
},
"{band}.events.onPause": {
func: "{that}.pause"
},
"{band}.events.onSet": {
func: "{that}.set"
}
}
});
=======
/**
* flock.band provides an IoC-friendly interface for a collection of named synths.
*/
// TODO: Unit tests.
fluid.defaults("flock.band", {
gradeNames: ["fluid.eventedComponent", "autoInit"],
invokers: {
play: {
func: "{that}.events.onPlay.fire"
},
pause: {
func: "{that}.events.onPause.fire"
},
set: {
func: "{that}.events.onSet.fire"
}
},
events: {
onPlay: null,
onPause: null,
onSet: null
},
distributeOptions: {
source: "{that}.options.synthListeners",
removeSource: true,
target: "{that flock.synth}.options.listeners"
},
synthListeners: {
"{band}.events.onPlay": {
func: "{that}.play"
},
"{band}.events.onPause": {
func: "{that}.pause"
}
}
});
>>>>>>>
/**
* flock.band provides an IoC-friendly interface for a collection of named synths.
*/
// TODO: Unit tests.
fluid.defaults("flock.band", {
gradeNames: ["fluid.eventedComponent", "autoInit"],
invokers: {
play: {
func: "{that}.events.onPlay.fire"
},
pause: {
func: "{that}.events.onPause.fire"
},
set: {
func: "{that}.events.onSet.fire"
}
},
events: {
onPlay: null,
onPause: null,
onSet: null
},
distributeOptions: {
source: "{that}.options.synthListeners",
removeSource: true,
target: "{that flock.synth}.options.listeners"
},
synthListeners: {
"{band}.events.onPlay": {
func: "{that}.play"
},
"{band}.events.onPause": {
func: "{that}.pause"
},
"{band}.events.onSet": {
func: "{that}.set"
}
}
}); |
<<<<<<<
case "ordinal-time":
ordinalTimeAxis(axisNode, obj, scale, axis, axisSettings);
break;
=======
case "ordinal-time":
ordinalTimeAxis(axisNode, obj, scale, axis, axisSettings);
break;
>>>>>>>
case "ordinal-time":
ordinalTimeAxis(axisNode, obj, scale, axis, axisSettings);
break;
<<<<<<<
setTickFormatX: setTickFormatX,
=======
ordinalTimeAxis: ordinalTimeAxis,
formatText: formatText,
>>>>>>>
ordinalTimeAxis: ordinalTimeAxis,
setTickFormatX: setTickFormatX, |
<<<<<<<
require('./reconnect');
=======
require('./events');
>>>>>>>
require('./reconnect');
require('./events'); |
<<<<<<<
constructor: Array,
every: require('./every')(Array.prototype.every),
fill: require('./fill')(Array.prototype.fill),
filter: require('./filter')(Array.prototype.filter),
forEach: require('./forEach')(Array.prototype.forEach),
map: require('./map')(Array.prototype.map),
reduce: require('./reduce')(Array.prototype.reduce),
reduceRight: require('./reduceRight')(Array.prototype.reduceRight),
reverse: require('./reverse')(Array.prototype.reverse),
some: require('./some')(Array.prototype.some)
=======
constructor: Array,
prototypeFunctions: {
every: require('./every')(Array.prototype.every),
fill: require('./fill')(Array.prototype.fill),
filter: require('./filter')(Array.prototype.filter),
forEach: require('./forEach')(Array.prototype.forEach),
map: require('./map')(Array.prototype.map),
reduce: require('./reduce')(Array.prototype.reduce),
reverse: require('./reverse')(Array.prototype.reverse),
some: require('./some')(Array.prototype.some),
},
>>>>>>>
constructor: Array,
prototypeFunctions: {
every: require('./every')(Array.prototype.every),
fill: require('./fill')(Array.prototype.fill),
filter: require('./filter')(Array.prototype.filter),
forEach: require('./forEach')(Array.prototype.forEach),
map: require('./map')(Array.prototype.map),
reduce: require('./reduce')(Array.prototype.reduce),
reduceRight: require('./reduceRight')(Array.prototype.reduceRight),
reverse: require('./reverse')(Array.prototype.reverse),
some: require('./some')(Array.prototype.some),
}, |
<<<<<<<
=======
updatePosition = throttle(() => {
const {desktop} = this.state
if (!desktop) return
const {pageYOffset, innerHeight} = window
const {offsetHeight, offsetTop} = this.rootNode
if (offsetHeight >= document.body.clientHeight) return
let position
let top
if (
(this.pageY > pageYOffset && pageYOffset <= (offsetTop || pageYOffset)) ||
innerHeight === offsetHeight
) {
position = 'fixed'
top = 0
} else if (
this.pageY < pageYOffset &&
pageYOffset + innerHeight >= offsetTop + offsetHeight
) {
position = 'fixed'
top = innerHeight - offsetHeight
} else {
position = 'absolute'
top = pageYOffset + offsetTop
}
this.pageY = pageYOffset
if (position === this.position) return
this.position = position
this.setState({
top,
position
})
})
>>>>>>> |
<<<<<<<
export * as SideNav from './SideNav'
export Hint from './Hint'
=======
export * as SideNav from './SideNav'
export Textarea from './Textarea'
>>>>>>>
export * as SideNav from './SideNav'
export Hint from './Hint'
export Textarea from './Textarea' |
<<<<<<<
webpack: {
=======
webpack: { //kind of a copy of your webpack config
devtool: 'inline-source-map',
>>>>>>>
webpack: {
devtool: 'inline-source-map', |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.