conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
});
test( 'name applies property to input', function( assert ) {
this.render( hbs`
{{sl-checkbox}}
` );
assert.strictEqual(
this.$( '>:first-child' ).find( 'input' ).prop( 'name' ),
'',
'Rendered input has empty name'
);
this.render( hbs`
{{sl-checkbox name="testname"}}
` );
assert.strictEqual(
this.$( '>:first-child' ).find( 'input' ).prop( 'name' ),
'testname',
'Rendered input has name set'
);
=======
});
test( 'Tooltip properties are set correctly when title parameter is set', function( assert ) {
const title = 'test title';
this.set( 'title', title );
this.render( hbs`
{{sl-checkbox title=title}}
` );
const data = this.$( '>:first-child' ).data();
const tooltipData = data[ 'bs.tooltip' ];
const options = tooltipData.getOptions();
assert.strictEqual(
tooltipData.enabled,
true,
'tooltip is enabled'
);
assert.strictEqual(
tooltipData.getTitle(),
title,
'Title text is set correctly'
);
assert.strictEqual(
options.trigger,
'hover focus',
'Default trigger is "hover focus"'
);
});
test( 'Popover properties are set correctly when popover parameter is set', function( assert ) {
const title = 'test title';
const popover = 'popover text';
this.set( 'title', title );
this.set( 'popover', popover );
this.render( hbs`
{{sl-checkbox title=title popover=popover}}
` );
const data = this.$( '>:first-child' ).data();
const popoverData = data[ 'bs.popover' ];
const options = popoverData.getOptions();
assert.strictEqual(
popoverData.enabled,
true,
'Popover is enabled'
);
assert.strictEqual(
popoverData.getTitle(),
title,
'Popover title was set correctly'
);
assert.strictEqual(
popoverData.getContent(),
popover,
'Popover text is set correctly'
);
assert.strictEqual(
options.trigger,
'click',
'Default trigger is "click"'
);
>>>>>>>
});
test( 'name applies property to input', function( assert ) {
this.render( hbs`
{{sl-checkbox}}
` );
assert.strictEqual(
this.$( '>:first-child' ).find( 'input' ).prop( 'name' ),
'',
'Rendered input has empty name'
);
this.render( hbs`
{{sl-checkbox name="testname"}}
` );
assert.strictEqual(
this.$( '>:first-child' ).find( 'input' ).prop( 'name' ),
'testname',
'Rendered input has name set'
);
});
test( 'Tooltip properties are set correctly when title parameter is set', function( assert ) {
const title = 'test title';
this.set( 'title', title );
this.render( hbs`
{{sl-checkbox title=title}}
` );
const data = this.$( '>:first-child' ).data();
const tooltipData = data[ 'bs.tooltip' ];
const options = tooltipData.getOptions();
assert.strictEqual(
tooltipData.enabled,
true,
'tooltip is enabled'
);
assert.strictEqual(
tooltipData.getTitle(),
title,
'Title text is set correctly'
);
assert.strictEqual(
options.trigger,
'hover focus',
'Default trigger is "hover focus"'
);
});
test( 'Popover properties are set correctly when popover parameter is set', function( assert ) {
const title = 'test title';
const popover = 'popover text';
this.set( 'title', title );
this.set( 'popover', popover );
this.render( hbs`
{{sl-checkbox title=title popover=popover}}
` );
const data = this.$( '>:first-child' ).data();
const popoverData = data[ 'bs.popover' ];
const options = popoverData.getOptions();
assert.strictEqual(
popoverData.enabled,
true,
'Popover is enabled'
);
assert.strictEqual(
popoverData.getTitle(),
title,
'Popover title was set correctly'
);
assert.strictEqual(
popoverData.getContent(),
popover,
'Popover text is set correctly'
);
assert.strictEqual(
options.trigger,
'click',
'Default trigger is "click"'
); |
<<<<<<<
ariaRole: 'dialog',
classNames: [ 'fade', 'modal' ],
=======
/**
* Class names for the containing element
*
* @property {Ember.Array} classNames
*/
classNames: [ 'modal' ],
/**
* Bindings for the component's element's class names
*
* @property {Ember.Array} classNameBindings
*/
classNameBindings: [ 'animated:fade' ],
>>>>>>>
ariaRole: 'dialog',
classNameBindings: [ 'animated:fade' ],
classNames: [ 'modal' ], |
<<<<<<<
/** @type {String[]} */
=======
/**
* Root element HTML tag type
*
* @property {Ember.String} tagName
* @default "div"
*/
tagName: 'div',
/** @type {String[]} */
classNameBindings: [ 'extraClassNamesString' ],
/**
* Class names for the root element
*
* @property {Ember.Array} classNames
*/
>>>>>>>
/** @type {String[]} */
classNameBindings: [ 'extraClassNamesString' ],
/** @type {String[]} */
<<<<<<<
* @type {Boolean}
=======
* Array of classes to be added to the element's class attribute
*
* @type {String[]}
*/
extraClassNames: [],
/**
* @property {boolean} isRoot
* @default true
>>>>>>>
* Array of classes to be added to the element's class attribute
*
* @type {String[]}
*/
extraClassNames: [],
/**
* @type {Boolean} |
<<<<<<<
var componentClassPrefix;
=======
var fingerprintDefaults = require( 'broccoli-asset-rev/lib/default-options' );
/**
* Traverses an array and removes duplicate elements
*
* @param {Array} array
* @returns {Array}
*/
var unique = function( array ) {
var isDuplicateElement = {};
var uniqueArray = [];
var arrayLength = array.length;
for( var i = 0; i < arrayLength; i++ ) {
if ( !isDuplicateElement[ array[ i ] ] ) {
isDuplicateElement[ array[ i ] ] = true;
uniqueArray.push( array[ i ] );
}
}
return uniqueArray;
};
/**
* Determines whether the ember-cli-less addon is employed by the consuming application
*
* @param {Object} this.project
* @returns {Boolean}
*/
var isLessAddonInstalled = function( project ) {
var addonName = 'ember-cli-less';
var isInstalled = false;
if (
( project.pkg.dependencies && project.pkg.dependencies[ addonName ] ) ||
( project.pkg.devDependencies && project.pkg.devDependencies[ addonName ] )
) {
isInstalled = true;
}
return isInstalled;
};
>>>>>>>
var componentClassPrefix;
var fingerprintDefaults = require( 'broccoli-asset-rev/lib/default-options' );
/**
* Traverses an array and removes duplicate elements
*
* @param {Array} array
* @returns {Array}
*/
var unique = function( array ) {
var isDuplicateElement = {};
var uniqueArray = [];
var arrayLength = array.length;
for( var i = 0; i < arrayLength; i++ ) {
if ( !isDuplicateElement[ array[ i ] ] ) {
isDuplicateElement[ array[ i ] ] = true;
uniqueArray.push( array[ i ] );
}
}
return uniqueArray;
};
/**
* Determines whether the ember-cli-less addon is employed by the consuming application
*
* @param {Object} this.project
* @returns {Boolean}
*/
var isLessAddonInstalled = function( project ) {
var addonName = 'ember-cli-less';
var isInstalled = false;
if (
( project.pkg.dependencies && project.pkg.dependencies[ addonName ] ) ||
( project.pkg.devDependencies && project.pkg.devDependencies[ addonName ] )
) {
isInstalled = true;
}
return isInstalled;
}; |
<<<<<<<
=======
it('should warn about missing user on initial flush', () => {
const warnSpy = sandbox.spy(console, 'warn');
const processor = EventProcessor(eventsUrl, {}, mockEventSender);
processor.flush(null);
warnSpy.restore();
expect(warnSpy.called).toEqual(true);
});
>>>>>>>
<<<<<<<
const processor = EventProcessor({}, eventsUrl, null, mockEventSender);
=======
const processor = EventProcessor(eventsUrl, {}, mockEventSender);
>>>>>>>
const processor = EventProcessor(eventsUrl, {}, null, mockEventSender);
<<<<<<<
const processor = EventProcessor({}, eventsUrl, null, mockEventSender);
=======
const processor = EventProcessor(eventsUrl, {}, mockEventSender);
>>>>>>>
const processor = EventProcessor(eventsUrl, {}, null, mockEventSender);
<<<<<<<
const ep = EventProcessor({}, eventsUrl, null, mockEventSender);
=======
const ep = EventProcessor(eventsUrl, {}, mockEventSender);
>>>>>>>
const ep = EventProcessor(eventsUrl, {}, null, mockEventSender);
<<<<<<<
const config = { all_attributes_private: true };
const ep = EventProcessor(config, eventsUrl, null, mockEventSender);
=======
const config = { allAttributesPrivate: true };
const ep = EventProcessor(eventsUrl, config, mockEventSender);
>>>>>>>
const config = { allAttributesPrivate: true };
const ep = EventProcessor(eventsUrl, config, null, mockEventSender);
<<<<<<<
it('queues individual feature event when trackEvents is true', done => {
const ep = EventProcessor({}, eventsUrl, null, mockEventSender);
=======
it('queues individual feature event', done => {
const ep = EventProcessor(eventsUrl, {}, mockEventSender);
>>>>>>>
it('queues individual feature event', done => {
const ep = EventProcessor(eventsUrl, {}, null, mockEventSender);
<<<<<<<
const ep = EventProcessor(config, eventsUrl, null, mockEventSender);
=======
const ep = EventProcessor(eventsUrl, config, mockEventSender);
>>>>>>>
const ep = EventProcessor(eventsUrl, config, null, mockEventSender);
<<<<<<<
const config = { all_attributes_private: true, inlineUsersInEvents: true };
const ep = EventProcessor(config, eventsUrl, null, mockEventSender);
=======
const config = { allAttributesPrivate: true, inlineUsersInEvents: true };
const ep = EventProcessor(eventsUrl, config, mockEventSender);
>>>>>>>
const config = { allAttributesPrivate: true, inlineUsersInEvents: true };
const ep = EventProcessor(eventsUrl, config, null, mockEventSender);
<<<<<<<
it('sets event kind to debug if event is temporarily in debug mode', done => {
const ep = EventProcessor({}, eventsUrl, null, mockEventSender);
const futureTime = new Date().getTime() + 1000000;
const e = { kind: 'feature', creationDate: 1000, user: user, key: 'flagkey',
version: 11, variation: 1, value: 'value', trackEvents: false, debugEventsUntilDate: futureTime };
ep.enqueue(e);
ep.flush().then(() => {
expect(mockEventSender.calls.length).toEqual(1);
const output = mockEventSender.calls[0].events;
expect(output.length).toEqual(2);
checkFeatureEvent(output[0], e, true, user);
checkSummaryEvent(output[1]);
done();
});
});
it('can both track and debug an event', done => {
const ep = EventProcessor({}, eventsUrl, null, mockEventSender);
const futureTime = new Date().getTime() + 1000000;
const e = { kind: 'feature', creationDate: 1000, user: user, key: 'flagkey',
version: 11, variation: 1, value: 'value', trackEvents: true, debugEventsUntilDate: futureTime };
ep.enqueue(e);
ep.flush().then(() => {
expect(mockEventSender.calls.length).toEqual(1);
const output = mockEventSender.calls[0].events;
expect(output.length).toEqual(3);
checkFeatureEvent(output[0], e, false);
checkFeatureEvent(output[1], e, true, user);
checkSummaryEvent(output[2]);
done();
});
});
it('expires debug mode based on client time if client time is later than server time', done => {
const ep = EventProcessor({}, eventsUrl, null, mockEventSender);
// Pick a server time that is somewhat behind the client time
const serverTime = new Date().getTime() - 20000;
mockEventSender.serverTime = serverTime;
// Send and flush an event we don't care about, just to set the last server time
ep.enqueue({ kind: 'identify', user: { key: 'otherUser' } });
ep.flush().then(() => {
// Now send an event with debug mode on, with a "debug until" time that is further in
// the future than the server time, but in the past compared to the client.
const debugUntil = serverTime + 1000;
const e = { kind: 'feature', creationDate: 1000, user: user, key: 'flagkey',
version: 11, variation: 1, value: 'value', trackEvents: false, debugEventsUntilDate: debugUntil };
ep.enqueue(e);
// Should get a summary event only, not a full feature event
ep.flush().then(() => {
expect(mockEventSender.calls.length).toEqual(2);
const output = mockEventSender.calls[1].events;
expect(output.length).toEqual(1);
checkSummaryEvent(output[0]);
done();
});
});
});
it('expires debug mode based on server time if server time is later than client time', done => {
const ep = EventProcessor({}, eventsUrl, null, mockEventSender);
// Pick a server time that is somewhat ahead of the client time
const serverTime = new Date().getTime() + 20000;
mockEventSender.serverTime = serverTime;
// Send and flush an event we don't care about, just to set the last server time
ep.enqueue({ kind: 'identify', user: { key: 'otherUser' } });
ep.flush().then(() => {
// Now send an event with debug mode on, with a "debug until" time that is further in
// the future than the client time, but in the past compared to the server.
const debugUntil = serverTime - 1000;
const e = { kind: 'feature', creationDate: 1000, user: user, key: 'flagkey',
version: 11, variation: 1, value: 'value', trackEvents: false, debugEventsUntilDate: debugUntil };
ep.enqueue(e);
// Should get a summary event only, not a full feature event
ep.flush().then(() => {
expect(mockEventSender.calls.length).toEqual(2);
const output = mockEventSender.calls[1].events;
expect(output.length).toEqual(1);
checkSummaryEvent(output[0]);
done();
});
});
});
it('summarizes nontracked events', done => {
const ep = EventProcessor({}, eventsUrl, null, mockEventSender);
=======
it('summarizes events', done => {
const ep = EventProcessor(eventsUrl, {}, mockEventSender);
>>>>>>>
it('sets event kind to debug if event is temporarily in debug mode', done => {
const ep = EventProcessor(eventsUrl, {}, null, mockEventSender);
const futureTime = new Date().getTime() + 1000000;
const e = { kind: 'feature', creationDate: 1000, user: user, key: 'flagkey',
version: 11, variation: 1, value: 'value', trackEvents: false, debugEventsUntilDate: futureTime };
ep.enqueue(e);
ep.flush().then(() => {
expect(mockEventSender.calls.length).toEqual(1);
const output = mockEventSender.calls[0].events;
expect(output.length).toEqual(2);
checkFeatureEvent(output[0], e, true, user);
checkSummaryEvent(output[1]);
done();
});
});
it('can both track and debug an event', done => {
const ep = EventProcessor(eventsUrl, {}, null, mockEventSender);
const futureTime = new Date().getTime() + 1000000;
const e = { kind: 'feature', creationDate: 1000, user: user, key: 'flagkey',
version: 11, variation: 1, value: 'value', trackEvents: true, debugEventsUntilDate: futureTime };
ep.enqueue(e);
ep.flush().then(() => {
expect(mockEventSender.calls.length).toEqual(1);
const output = mockEventSender.calls[0].events;
expect(output.length).toEqual(3);
checkFeatureEvent(output[0], e, false);
checkFeatureEvent(output[1], e, true, user);
checkSummaryEvent(output[2]);
done();
});
});
it('expires debug mode based on client time if client time is later than server time', done => {
const ep = EventProcessor(eventsUrl, {}, null, mockEventSender);
// Pick a server time that is somewhat behind the client time
const serverTime = new Date().getTime() - 20000;
mockEventSender.serverTime = serverTime;
// Send and flush an event we don't care about, just to set the last server time
ep.enqueue({ kind: 'identify', user: { key: 'otherUser' } });
ep.flush().then(() => {
// Now send an event with debug mode on, with a "debug until" time that is further in
// the future than the server time, but in the past compared to the client.
const debugUntil = serverTime + 1000;
const e = { kind: 'feature', creationDate: 1000, user: user, key: 'flagkey',
version: 11, variation: 1, value: 'value', trackEvents: false, debugEventsUntilDate: debugUntil };
ep.enqueue(e);
// Should get a summary event only, not a full feature event
ep.flush().then(() => {
expect(mockEventSender.calls.length).toEqual(2);
const output = mockEventSender.calls[1].events;
expect(output.length).toEqual(1);
checkSummaryEvent(output[0]);
done();
});
});
});
it('expires debug mode based on server time if server time is later than client time', done => {
const ep = EventProcessor(eventsUrl, {}, null, mockEventSender);
// Pick a server time that is somewhat ahead of the client time
const serverTime = new Date().getTime() + 20000;
mockEventSender.serverTime = serverTime;
// Send and flush an event we don't care about, just to set the last server time
ep.enqueue({ kind: 'identify', user: { key: 'otherUser' } });
ep.flush().then(() => {
// Now send an event with debug mode on, with a "debug until" time that is further in
// the future than the client time, but in the past compared to the server.
const debugUntil = serverTime - 1000;
const e = { kind: 'feature', creationDate: 1000, user: user, key: 'flagkey',
version: 11, variation: 1, value: 'value', trackEvents: false, debugEventsUntilDate: debugUntil };
ep.enqueue(e);
// Should get a summary event only, not a full feature event
ep.flush().then(() => {
expect(mockEventSender.calls.length).toEqual(2);
const output = mockEventSender.calls[1].events;
expect(output.length).toEqual(1);
checkSummaryEvent(output[0]);
done();
});
});
});
it('summarizes nontracked events', done => {
const ep = EventProcessor(eventsUrl, {}, null, mockEventSender);
<<<<<<<
it('queues custom event when trackEvents is true', done => {
const ep = EventProcessor({}, eventsUrl, null, mockEventSender);
=======
it('queues custom event', done => {
const ep = EventProcessor(eventsUrl, {}, mockEventSender);
>>>>>>>
it('queues custom event when trackEvents is true', done => {
const ep = EventProcessor(eventsUrl, {}, null, mockEventSender);
<<<<<<<
const ep = EventProcessor(config, eventsUrl, null, mockEventSender);
=======
const ep = EventProcessor(eventsUrl, config, mockEventSender);
>>>>>>>
const ep = EventProcessor(eventsUrl, config, null, mockEventSender);
<<<<<<<
const config = { all_attributes_private: true, inlineUsersInEvents: true };
const ep = EventProcessor(config, eventsUrl, null, mockEventSender);
=======
const config = { allAttributesPrivate: true, inlineUsersInEvents: true };
const ep = EventProcessor(eventsUrl, config, mockEventSender);
>>>>>>>
const config = { allAttributesPrivate: true, inlineUsersInEvents: true };
const ep = EventProcessor(eventsUrl, config, null, mockEventSender);
<<<<<<<
it('sends nothing if there are no events to flush', done => {
const ep = EventProcessor({}, '/fake-url', null, mockEventSender);
ep.flush().then(() => {
expect(mockEventSender.calls.length).toEqual(0);
done();
});
});
it('stops sending events after a 401 error', done => {
const ep = EventProcessor({}, '/fake-url', null, mockEventSender);
const e = { kind: 'identify', creationDate: 1000, user: user };
ep.enqueue(e);
mockEventSender.status = 401;
ep.flush().then(() => {
expect(mockEventSender.calls.length).toEqual(1);
ep.enqueue(e);
ep.flush().then(() => {
expect(mockEventSender.calls.length).toEqual(1); // still the one from our first flush
done();
});
});
=======
it('sends nothing if there are no events to flush', () => {
const processor = EventProcessor(eventsUrl, {}, mockEventSender);
processor.flush(user, false);
expect(mockEventSender.calls.length).toEqual(0);
>>>>>>>
it('sends nothing if there are no events to flush', done => {
const ep = EventProcessor(eventsUrl, {}, null, mockEventSender);
ep.flush().then(() => {
expect(mockEventSender.calls.length).toEqual(0);
done();
});
});
it('stops sending events after a 401 error', done => {
const ep = EventProcessor(eventsUrl, {}, null, mockEventSender);
const e = { kind: 'identify', creationDate: 1000, user: user };
ep.enqueue(e);
mockEventSender.status = 401;
ep.flush().then(() => {
expect(mockEventSender.calls.length).toEqual(1);
ep.enqueue(e);
ep.flush().then(() => {
expect(mockEventSender.calls.length).toEqual(1); // still the one from our first flush
done();
});
}); |
<<<<<<<
/**
* Takes a map of flag keys to values, and returns the more verbose structure used by the
* client stream.
*/
function transformValuesToVersionedValues(flags) {
var ret = {};
for (var key in flags) {
if (flags.hasOwnProperty(key)) {
ret[key] = { value: flags[key], version: 0 };
}
}
return ret;
}
/**
* Takes a map obtained from the client stream and converts it to the briefer format used in
* bootstrap data or local storagel
*/
function transformValuesToUnversionedValues(flags) {
var ret = {};
for (var key in flags) {
if (flags.hasOwnProperty(key)) {
ret[key] = flags[key].value;
}
}
return ret;
}
=======
/**
* Returns an array of event groups each of which can be safely URL-encoded
* without hitting the safe maximum URL length of certain browsers.
*
* @param {number} maxLength maximum URL length targeted
* @param {Array[Object}]} events queue of events to divide
* @returns Array[Array[Object]]
*/
function chunkUserEventsForUrl(maxLength, events) {
var allEvents = events.slice(0);
var remainingSpace = maxLength;
var allChunks = [];
var chunk;
while (allEvents.length > 0) {
chunk = [];
while (remainingSpace > 0) {
var event = allEvents.pop();
if (!event) { break; }
remainingSpace = remainingSpace - base64URLEncode(JSON.stringify(event)).length;
// If we are over the max size, put this one back on the queue
// to try in the next round, unless this event alone is larger
// than the limit, in which case, screw it, and try it anyway.
if (remainingSpace < 0 && chunk.length > 0) {
allEvents.push(event);
} else {
chunk.push(event);
}
}
remainingSpace = maxLength;
allChunks.push(chunk);
}
return allChunks;
}
>>>>>>>
/**
* Takes a map of flag keys to values, and returns the more verbose structure used by the
* client stream.
*/
function transformValuesToVersionedValues(flags) {
var ret = {};
for (var key in flags) {
if (flags.hasOwnProperty(key)) {
ret[key] = { value: flags[key], version: 0 };
}
}
return ret;
}
/**
* Takes a map obtained from the client stream and converts it to the briefer format used in
* bootstrap data or local storagel
*/
function transformValuesToUnversionedValues(flags) {
var ret = {};
for (var key in flags) {
if (flags.hasOwnProperty(key)) {
ret[key] = flags[key].value;
}
}
return ret;
}
/**
* Returns an array of event groups each of which can be safely URL-encoded
* without hitting the safe maximum URL length of certain browsers.
*
* @param {number} maxLength maximum URL length targeted
* @param {Array[Object}]} events queue of events to divide
* @returns Array[Array[Object]]
*/
function chunkUserEventsForUrl(maxLength, events) {
var allEvents = events.slice(0);
var remainingSpace = maxLength;
var allChunks = [];
var chunk;
while (allEvents.length > 0) {
chunk = [];
while (remainingSpace > 0) {
var event = allEvents.pop();
if (!event) { break; }
remainingSpace = remainingSpace - base64URLEncode(JSON.stringify(event)).length;
// If we are over the max size, put this one back on the queue
// to try in the next round, unless this event alone is larger
// than the limit, in which case, screw it, and try it anyway.
if (remainingSpace < 0 && chunk.length > 0) {
allEvents.push(event);
} else {
chunk.push(event);
}
}
remainingSpace = maxLength;
allChunks.push(chunk);
}
return allChunks;
}
<<<<<<<
transformValuesToVersionedValues: transformValuesToVersionedValues,
transformValuesToUnversionedValues: transformValuesToUnversionedValues,
wrapPromiseCallback: wrapPromiseCallback
=======
wrapPromiseCallback: wrapPromiseCallback,
chunkUserEventsForUrl: chunkUserEventsForUrl
>>>>>>>
transformValuesToVersionedValues: transformValuesToVersionedValues,
transformValuesToUnversionedValues: transformValuesToUnversionedValues,
wrapPromiseCallback: wrapPromiseCallback,
chunkUserEventsForUrl: chunkUserEventsForUrl |
<<<<<<<
const userKeysCache = LRU(options.userKeysCapacity || 1000);
=======
>>>>>>>
<<<<<<<
// Decide whether to add the event to the payload. Feature events may be added twice, once for
// the event (if tracked) and once for debugging.
if (event.kind === 'feature') {
if (shouldSampleEvent()) {
addFullEvent = !!event.trackEvents;
addDebugEvent = shouldDebugEvent(event);
}
} else {
addFullEvent = shouldSampleEvent();
}
// For each user we haven't seen before, we add an index event - unless this is already
// an identify event for that user.
if (!addFullEvent || !inlineUsers) {
if (event.user && !userKeysCache.get(event.user.key)) {
userKeysCache.set(event.user.key, true);
if (event.kind !== 'identify') {
addIndexEvent = true;
}
}
}
if (addIndexEvent) {
queue.push({
kind: 'index',
creationDate: event.creationDate,
user: userFilter.filterUser(event.user),
});
}
if (addFullEvent) {
queue.push(makeOutputEvent(event));
}
if (addDebugEvent) {
const debugEvent = Object.assign({}, event, { kind: 'debug' });
delete debugEvent['trackEvents'];
delete debugEvent['debugEventsUntilDate'];
delete debugEvent['variation'];
queue.push(debugEvent);
}
=======
queue.push(makeOutputEvent(event));
>>>>>>>
// Decide whether to add the event to the payload. Feature events may be added twice, once for
// the event (if tracked) and once for debugging.
if (event.kind === 'feature') {
if (shouldSampleEvent()) {
addFullEvent = !!event.trackEvents;
addDebugEvent = shouldDebugEvent(event);
}
} else {
addFullEvent = shouldSampleEvent();
}
if (addFullEvent) {
queue.push(makeOutputEvent(event));
}
if (addDebugEvent) {
const debugEvent = Object.assign({}, event, { kind: 'debug' });
delete debugEvent['trackEvents'];
delete debugEvent['debugEventsUntilDate'];
delete debugEvent['variation'];
queue.push(debugEvent);
} |
<<<<<<<
class ModelNotFoundError extends Error {
constructor() {
const message = 'Model not found'
super(message);
this.message = message;
this.name = "ModelNotFoundError";
}
}
class InvalidFogNodeIdError extends Error {
constructor() {
const message = 'Invalid Fog Node Id'
super(message);
this.message = message;
this.name = "InvalidFogNodeIdError";
}
}
=======
class NotFoundError extends Error {
constructor(message) {
super(message);
this.message = message;
this.name = "NotFoundError";
}
}
>>>>>>>
class ModelNotFoundError extends Error {
constructor() {
const message = 'Model not found'
super(message);
this.message = message;
this.name = "ModelNotFoundError";
}
}
class InvalidFogNodeIdError extends Error {
constructor() {
const message = 'Invalid Fog Node Id'
super(message);
this.message = message;
this.name = "InvalidFogNodeIdError";
}
}
class NotFoundError extends Error {
constructor(message) {
super(message);
this.message = message;
this.name = "NotFoundError";
}
}
<<<<<<<
InvalidCredentialsError: InvalidCredentialsError,
ModelNotFoundError: ModelNotFoundError,
InvalidFogNodeIdError: InvalidFogNodeIdError
=======
InvalidCredentialsError: InvalidCredentialsError,
NotFoundError: NotFoundError
>>>>>>>
InvalidCredentialsError: InvalidCredentialsError,
NotFoundError: NotFoundError,
ModelNotFoundError: ModelNotFoundError,
InvalidFogNodeIdError: InvalidFogNodeIdError |
<<<<<<<
const bodyParser = require('body-parser')
const cookieParser = require('cookie-parser')
const express = require('express')
const fs = require('fs')
const helmet = require('helmet')
const https = require('https')
const path = require('path')
const { renderFile } = require('ejs')
const xss = require('xss-clean')
=======
const bodyParser = require('body-parser');
const cookieParser = require('cookie-parser');
const express = require('express');
const fs = require('fs');
const helmet = require('helmet');
const path = require('path');
const {renderFile} = require('ejs');
const xss = require('xss-clean');
const morgan = require('morgan');
>>>>>>>
const bodyParser = require('body-parser');
const cookieParser = require('cookie-parser');
const express = require('express');
const fs = require('fs');
const helmet = require('helmet');
const https = require('https')
const path = require('path');
const {renderFile} = require('ejs');
const xss = require('xss-clean');
const morgan = require('morgan');
<<<<<<<
app.use(helmet())
app.use(xss())
=======
const Sequelize = require('./sequelize/models/index');
app.use(helmet());
app.use(xss());
app.use(morgan('combined'));
>>>>>>>
app.use(helmet());
app.use(xss());
app.use(morgan('combined')); |
<<<<<<<
const bodyParser = require('body-parser');
const cookieParser = require('cookie-parser');
const express = require('express');
const fs = require('fs');
const helmet = require('helmet');
const path = require('path');
const {renderFile} = require('ejs');
const xss = require('xss-clean');
const morgan = require('morgan');
=======
const bodyParser = require('body-parser')
const cookieParser = require('cookie-parser')
const express = require('express')
const fs = require('fs')
const helmet = require('helmet')
const https = require('https')
const path = require('path')
const { renderFile } = require('ejs')
const xss = require('xss-clean')
>>>>>>>
const bodyParser = require('body-parser');
const cookieParser = require('cookie-parser');
const express = require('express');
const fs = require('fs');
const helmet = require('helmet');
const path = require('path');
const {renderFile} = require('ejs');
const xss = require('xss-clean');
const morgan = require('morgan');
<<<<<<<
const Sequelize = require('./sequelize/models/index');
app.use(helmet());
app.use(xss());
app.use(morgan('combined'));
=======
app.use(helmet())
app.use(xss())
>>>>>>>
app.use(helmet());
app.use(xss());
app.use(morgan('combined')); |
<<<<<<<
getForbidden: (message: string = "can't use this filename") => {
=======
getUnauthorized: (message: string = 'no credentials provided') => {
return createError(HTTP_STATUS.UNAUTHORIZED, message);
},
getForbidden: (message: string = 'can\'t use this filename') => {
>>>>>>>
getUnauthorized: (message: string = 'no credentials provided') => {
return createError(HTTP_STATUS.UNAUTHORIZED, message);
},
getForbidden: (message: string = "can't use this filename") => { |
<<<<<<<
var express = require('express')
var fs = require('fs')
var Error = require('http-errors')
var compression = require('compression')
var Auth = require('./auth')
var Logger = require('./logger')
var Config = require('./config')
var Middleware = require('./middleware')
var Cats = require('./status-cats')
var Storage = require('./storage')
var PackageProvider = require('./packages')
=======
var express = require('express')
var Error = require('http-errors')
var compression = require('compression')
var Auth = require('./auth')
var Logger = require('./logger')
var Config = require('./config')
var Middleware = require('./middleware')
var Cats = require('./status-cats')
var Storage = require('./storage')
>>>>>>>
var express = require('express')
var Error = require('http-errors')
var compression = require('compression')
var Auth = require('./auth')
var Logger = require('./logger')
var Config = require('./config')
var Middleware = require('./middleware')
var Cats = require('./status-cats')
var Storage = require('./storage')
var PackageProvider = require('./packages')
<<<<<<<
var config = Config(config_hash)
var storage = Storage(config)
var auth = Auth(config)
var packages = PackageProvider(config)
var app = express()
var can = Middleware.allow(config, packages)
=======
var config = Config(config_hash)
var storage = Storage(config)
var auth = Auth(config)
var app = express()
>>>>>>>
var config = Config(config_hash)
var storage = Storage(config)
var auth = Auth(config)
var packages = PackageProvider(config)
var app = express() |
<<<<<<<
import { addScope, addGravatarSupport, deleteProperties, sortByName, parseReadme } from '../../../lib/utils';
import { allow } from '../../middleware';
import { DIST_TAGS, HEADER_TYPE, HEADERS, HTTP_STATUS } from '../../../lib/constants';
import type { Router } from 'express';
import type { IAuth, $ResponseExtend, $RequestExtend, $NextFunctionVer, IStorageHandler, $SidebarPackage } from '../../../../types';
import type { Config } from '@verdaccio/types';
=======
import {addScope, addGravatarSupport, deleteProperties, sortByName, DIST_TAGS, parseReadme} from '../../../lib/utils';
import {allow} from '../../middleware';
import logger from '../../../lib/logger';
import type {Router} from 'express';
import type {
IAuth,
$ResponseExtend,
$RequestExtend,
$NextFunctionVer,
IStorageHandler,
$SidebarPackage} from '../../../../types';
>>>>>>>
import { addScope, addGravatarSupport, deleteProperties, sortByName, parseReadme } from '../../../lib/utils';
import { allow } from '../../middleware';
import { DIST_TAGS, HEADER_TYPE, HEADERS, HTTP_STATUS } from '../../../lib/constants';
import logger from '../../../lib/logger';
import type { Router } from 'express';
import type { IAuth, $ResponseExtend, $RequestExtend, $NextFunctionVer, IStorageHandler, $SidebarPackage } from '../../../../types';
import type { Config } from '@verdaccio/types'; |
<<<<<<<
addVersion(name: string, version: string, metadata: Version, tag: StringValue, callback: Callback) {
this._updatePackage(
name,
(data, cb) => {
// keep only one readme per package
data.readme = metadata.readme;
// TODO: lodash remove
metadata = cleanUpReadme(metadata);
metadata.contributors = normalizeContributors(metadata.contributors);
if (data.versions[version] != null) {
return cb(ErrorCode.getConflict());
}
=======
addVersion(name: string,
version: string,
metadata: Version,
tag: StringValue,
callback: Callback) {
this._updatePackage(name, (data, cb) => {
// keep only one readme per package
data.readme = metadata.readme;
// TODO: lodash remove
metadata = cleanUpReadme(metadata);
metadata.contributors = normalizeContributors(metadata.contributors);
const hasVersion = data.versions[version] != null;
if (hasVersion) {
return cb( ErrorCode.getConflict() );
}
>>>>>>>
addVersion(name: string, version: string, metadata: Version, tag: StringValue, callback: Callback) {
this._updatePackage(
name,
(data, cb) => {
// keep only one readme per package
data.readme = metadata.readme;
// TODO: lodash remove
metadata = cleanUpReadme(metadata);
metadata.contributors = normalizeContributors(metadata.contributors);
const hasVersion = data.versions[version] != null;
if (hasVersion) {
return cb(ErrorCode.getConflict());
} |
<<<<<<<
mix: mix(),
mesh: mesh(40, 8),
=======
mix: mix("multiply"),
mesh: "40 8",
>>>>>>>
mix: mix("multiply"),
mesh: mesh(40, 8), |
<<<<<<<
var queue = [];
return {
=======
var batch = {
>>>>>>>
var queue = [];
var batch = {
<<<<<<<
queue.push({ method: 'set', args: [doc, data, opts] });
=======
var _opts = _.assign({}, { merge: false }, opts);
if (_opts.merge) {
doc._update(data, { setMerge: true });
}
else {
doc.set(data);
}
return batch;
},
create: function(doc, data) {
doc.create(data);
>>>>>>>
queue.push({ method: 'set', args: [doc, data, opts] });
return batch;
},
create: function(doc, data) {
queue.push({ method: 'create', args: [doc, data] });
return batch;
<<<<<<<
queue.push({ method: 'update', args: [doc, data] });
=======
doc.update(data);
return batch;
>>>>>>>
queue.push({ method: 'update', args: [doc, data] });
return batch;
<<<<<<<
queue.push({ method: 'delete', args: [doc] });
=======
doc.delete();
return batch;
>>>>>>>
queue.push({ method: 'delete', args: [doc] });
return batch; |
<<<<<<<
const { dispatch, pagination, paginationServer, sortColumn, sortDirection, persistSelectedOnSort } = useTableContext();
=======
const { dispatch, pagination, paginationServer, sortColumn, sortDirection, sortServer, selectableRowsVisibleOnly } = useTableContext();
>>>>>>>
const { dispatch, pagination, paginationServer, sortColumn, sortDirection, sortServer, selectableRowsVisibleOnly, persistSelectedOnSort } = useTableContext();
<<<<<<<
persistSelectedOnSort,
=======
visibleOnly: selectableRowsVisibleOnly,
>>>>>>>
visibleOnly: selectableRowsVisibleOnly,
persistSelectedOnSort, |
<<<<<<<
forcetk.Client.prototype.blob = function (path, fields, filename, payloadField, payload, callback, error, retry) {
'use strict';
var that = this,
url = (this.visualforce ? '' : this.instanceUrl) + '/services/data' + path,
boundary = randomString(),
blob = new Blob([
"--boundary_" + boundary + '\n'
+ "Content-Disposition: form-data; name=\"entity_content\";" + "\n"
+ "Content-Type: application/json" + "\n\n"
+ JSON.stringify(fields)
+ "\n\n"
+ "--boundary_" + boundary + "\n"
+ "Content-Type: application/octet-stream" + "\n"
+ "Content-Disposition: form-data; name=\"" + payloadField
+ "\"; filename=\"" + filename + "\"\n\n",
payload,
"\n\n"
+ "--boundary_" + boundary + "--"
], {type : 'multipart/form-data; boundary=\"boundary_' + boundary + '\"'}),
request = new XMLHttpRequest();
request.open("POST", (this.proxyUrl !== null && !this.visualforce) ? this.proxyUrl : url, this.asyncAjax);
=======
forcetk.Client.prototype.blob = function(path, fields, filename, payloadField, payload, callback, error, retry) {
var that = this;
var url = (this.visualforce ? '' : this.instanceUrl) + '/services/data' + path;
var boundary = randomString();
var blob = new Blob([
"--boundary_" + boundary + '\n'
+ "Content-Disposition: form-data; name=\"entity_content\";" + "\n"
+ "Content-Type: application/json" + "\n\n"
+ JSON.stringify(fields)
+ "\n\n"
+ "--boundary_" + boundary + "\n"
+ "Content-Type: application/octet-stream" + "\n"
+ "Content-Disposition: form-data; name=\"" + payloadField
+ "\"; filename=\"" + filename + "\"\n\n",
payload,
"\n"
+ "--boundary_" + boundary + "--"
], {type : 'multipart/form-data; boundary=\"boundary_' + boundary + '\"'});
var request = new XMLHttpRequest();
request.open("POST", (this.proxyUrl !== null && ! this.visualforce) ? this.proxyUrl: url, this.asyncAjax);
>>>>>>>
forcetk.Client.prototype.blob = function (path, fields, filename, payloadField, payload, callback, error, retry) {
'use strict';
var that = this,
url = (this.visualforce ? '' : this.instanceUrl) + '/services/data' + path,
boundary = randomString(),
blob = new Blob([
"--boundary_" + boundary + '\n'
+ "Content-Disposition: form-data; name=\"entity_content\";" + "\n"
+ "Content-Type: application/json" + "\n\n"
+ JSON.stringify(fields)
+ "\n\n"
+ "--boundary_" + boundary + "\n"
+ "Content-Type: application/octet-stream" + "\n"
+ "Content-Disposition: form-data; name=\"" + payloadField
+ "\"; filename=\"" + filename + "\"\n\n",
payload,
"\n\n"
+ "--boundary_" + boundary + "--"
], {type : 'multipart/form-data; boundary=\"boundary_' + boundary + '\"'}),
request = new XMLHttpRequest();
request.open("POST", (this.proxyUrl !== null && !this.visualforce) ? this.proxyUrl : url, this.asyncAjax);
<<<<<<<
if (this.proxyUrl !== null && !this.visualforce) {
=======
request.setRequestHeader('Content-Type', 'multipart/form-data; boundary=\"boundary_' + boundary + '\"');
if (this.proxyUrl !== null && ! this.visualforce) {
>>>>>>>
request.setRequestHeader('Content-Type', 'multipart/form-data; boundary=\"boundary_' + boundary + '\"');
if (this.proxyUrl !== null && !this.visualforce) { |
<<<<<<<
// pages 目录下 支持子文件夹
const reqPages = require.context('../pages', true, /\.js$/);
reqPages.keys().forEach(key => {
if (!key.endsWith('model.js')) return;
const model = reqPages(key);
const name = getModelName(key);
result[name] = model.default;
});
=======
>>>>>>>
// pages 目录下 支持子文件夹
const reqPages = require.context('../pages', true, /\.js$/);
reqPages.keys().forEach(key => {
if (!key.endsWith('model.js')) return;
const model = reqPages(key);
const name = getModelName(key);
result[name] = model.default;
}); |
<<<<<<<
GLOBE.BridgeDetailController = Em.ObjectController.extend(Em.Evented, {
bandwidthData: {},
weightData: {},
content: {},
showContent: false,
explain: {
flags: false
},
actions: {
/**
* toggles explainFlags property
*/
toggleExplain: function (what) {
this.toggleProperty('explain.' + what);
}
},
/**
* Function that is called if the controller content is changed.
*/
contentChanged: function(){
var content = this.get('content'),
title = '';
if($.isEmptyObject(content)){
// content is empty, hide content
this.set('showContent', false);
title = GLOBE.static.messages.detailsNotFound;
}else{
// content not empty, show content
this.set('showContent', true);
title = 'Details for ' + content.nickname + ' | Bridge';
}
// set app title
GLOBE.set('title', title);
// trigger event after render
// useful for 3rd party plugins (i.e. qtip)
Em.run.scheduleOnce('afterRender', this, function(){
this.trigger('content-ready');
});
}.observes('content')
=======
GLOBE.BridgeDetailController = Em.ObjectController.extend(
GLOBE.PeriodsMixin, {
>>>>>>>
GLOBE.BridgeDetailController = Em.ObjectController.extend(
GLOBE.PeriodsMixin, {
bandwidthData: {},
weightData: {}, |
<<<<<<<
'public/js/vendor/dygraph/dygraph-combined.js',
=======
'public/js/vendor/datatables/jquery.dataTables.min.js',
'public/js/vendor/d3/d3.v3.min.js',
>>>>>>>
'public/js/vendor/datatables/jquery.dataTables.min.js',
'public/js/vendor/dygraph/dygraph-combined.js',
<<<<<<<
'public/js/vendor/dygraph/dygraph-combined.js',
=======
'public/js/vendor/datatables/jquery.dataTables.js',
'public/js/vendor/d3/d3.v3.js',
>>>>>>>
'public/js/vendor/datatables/jquery.dataTables.js',
'public/js/vendor/dygraph/dygraph-combined.js', |
<<<<<<<
{ name: "Android", released: new Date(2008, 8, 23), icon: "android" },
{ name: "Angular", released: new Date(2016, 8, 14), icon: "angular" },
{ name: "AngularJS", released: new Date(2010, 9, 20), icon: "angular" },
=======
{ name: "Amazon Web Services", released: new Date(2004, 2, 15) },
{ name: "Android", released: new Date(2008, 8, 23) },
{ name: "Angular", released: new Date(2016, 8, 14) },
{ name: "AngularJS", released: new Date(2010, 9, 20) },
{ name: "Ansible", released: new Date(2012, 2, 20) },
{ name: "Apache Mesos", released: new Date(2016, 7, 27) },
>>>>>>>
{ name: "Amazon Web Services", released: new Date(2004, 2, 15) },
{ name: "Android", released: new Date(2008, 8, 23), icon: "android" },
{ name: "Angular", released: new Date(2016, 8, 14), icon: "angular" },
{ name: "AngularJS", released: new Date(2010, 9, 20), icon: "angular" },
{ name: "Ansible", released: new Date(2012, 2, 20) },
{ name: "Apache Mesos", released: new Date(2016, 7, 27) },
<<<<<<<
{ name: "CSS", released: new Date(1996, 11, 17), icon: "css" },
=======
{ name: "Crystal", released: new Date(2014, 6, 18) },
{ name: "CSS", released: new Date(1996, 11, 17) },
>>>>>>>
{ name: "Crystal", released: new Date(2014, 6, 18) },
{ name: "CSS", released: new Date(1996, 11, 17), icon: "css" },
<<<<<<<
{ name: "Java", released: new Date(1996, 9, 10), icon: "java" },
{ name: "JavaScript", released: new Date(1995, 11, 4), icon: "javaScript"},
{ name: "Jekyll", released: new Date(2008, 10, 17), icon: "jekyll" },
{ name: "jQuery", released: new Date(2006, 7, 26), icon: "jquery" },
=======
{ name: "IBM Notes", released: new Date(1989, 11, 7) },
{ name: "Java", released: new Date(1996, 9, 10) },
{ name: "JavaScript", released: new Date(1995, 11, 4) },
{ name: "Jekyll", released: new Date(2008, 10, 17) },
{ name: "jQuery", released: new Date(2006, 7, 26) },
>>>>>>>
{ name: "IBM Notes", released: new Date(1989, 11, 7) },
{ name: "Java", released: new Date(1996, 9, 10), icon: "java" },
{ name: "JavaScript", released: new Date(1995, 11, 4), icon: "javaScript"},
{ name: "Jekyll", released: new Date(2008, 10, 17), icon: "jekyll" },
{ name: "jQuery", released: new Date(2006, 7, 26), icon: "jquery" },
<<<<<<<
{ name: "Laravel", released: new Date(2011, 8, 9), icon: "laravel" },
{ name: "Laravel 4", released: new Date(2013, 5, 28), icon: "laravel" },
{ name: "Laravel 5", released: new Date(2015, 2, 4), icon: "laravel" },
{ name: "Lua", released: new Date(1993, 6, 28), icon: "lua" },
=======
{ name: "Laravel", released: new Date(2011, 8, 9) },
{ name: "Laravel 4", released: new Date(2013, 5, 28) },
{ name: "Laravel 5", released: new Date(2015, 2, 4) },
{ name: "Lisp", released: new Date(1958, 7, 1) },
{ name: "Lua", released: new Date(1993, 6, 28) },
>>>>>>>
{ name: "Laravel", released: new Date(2011, 8, 9), icon: "laravel" },
{ name: "Laravel 4", released: new Date(2013, 5, 28), icon: "laravel" },
{ name: "Laravel 5", released: new Date(2015, 2, 4), icon: "laravel" },
{ name: "Lisp", released: new Date(1958, 7, 1) },
{ name: "Lua", released: new Date(1993, 6, 28), icon: "lua" },
<<<<<<<
{ name: "React", released: new Date(2013, 4, 29), icon: "react" },
{ name: "React Native", released: new Date(2016, 2, 24), icon: "react" },
{ name: "Ruby", released: new Date(1995, 11, 21), icon:"ruby" },
{ name: "Ruby on Rails", released: new Date(2005, 11, 21), icon:"rails" },
{ name: "Rust", released: new Date(2015, 5, 5), icon:"rust" },
{ name: "Sass", released: new Date(2006, 10, 28), icon:"sass" },
=======
{ name: "React", released: new Date(2013, 4, 29) },
{ name: "React Native", released: new Date(2016, 2, 24) },
{ name: "Ruby", released: new Date(1995, 11, 21) },
{ name: "Ruby on Rails", released: new Date(2005, 11, 21) },
{ name: "Redis", released: new Date(2009, 5, 10) },
{ name: "Rust", released: new Date(2015, 5, 5) },
{ name: "Sass", released: new Date(2006, 10, 28) },
>>>>>>>
{ name: "React", released: new Date(2013, 4, 29), icon: "react" },
{ name: "React Native", released: new Date(2016, 2, 24), icon: "react" },
{ name: "Ruby", released: new Date(1995, 11, 21), icon:"ruby" },
{ name: "Ruby on Rails", released: new Date(2005, 11, 21), icon:"rails" },
{ name: "Redis", released: new Date(2009, 5, 10) },
{ name: "Rust", released: new Date(2015, 5, 5), icon:"rust" },
{ name: "Sass", released: new Date(2006, 10, 28), icon:"sass" },
<<<<<<<
{ name: "The World Wide Web", released: new Date(1990, 11, 25), icon: "www" },
=======
{ name: "Terraform", released: new Date(2014, 7, 28) },
{ name: "The World Wide Web", released: new Date(1990, 11, 25) },
>>>>>>>
{ name: "Terraform", released: new Date(2014, 7, 28) },
{ name: "The World Wide Web", released: new Date(1990, 11, 25), icon: "www" }, |
<<<<<<<
{ name: "Materialize CSS", released: new Date("2018-09-09"), link: "https://materializecss.com/" },
=======
{ name: "MariaDB", released: new Date("2009-10-29"), link: "https://mariadb.org/" },
>>>>>>>
{ name: "MariaDB", released: new Date("2009-10-29"), link: "https://mariadb.org/" },
{ name: "Materialize CSS", released: new Date("2018-09-09"), link: "https://materializecss.com/" },
<<<<<<<
{ name: "Quasar", released: new Date("2019-07-03"), link: "https://quasar.dev/" },
=======
{ name: "Qt", released: new Date("1995-05-20"), link: "https://www.qt.io/" },
>>>>>>>
{ name: "Qt", released: new Date("1995-05-20"), link: "https://www.qt.io/" },
{ name: "Quasar", released: new Date("2019-07-03"), link: "https://quasar.dev/" }, |
<<<<<<<
{ name: "Preact", released: new Date(2015, 8, 11) },
{ name: "Python 2", released: new Date(1991, 1, 20) },
=======
{ name: "Python 1", released: new Date(1991, 1, 20) },
{ name: "Python 2", released: new Date(2000, 10, 16) },
>>>>>>>
{ name: "Preact", released: new Date(2015, 8, 11) },
{ name: "Python 1", released: new Date(1991, 1, 20) },
{ name: "Python 2", released: new Date(2000, 10, 16) }, |
<<<<<<<
{ name: "Laravel 4", released: new Date(2013, 5, 28) },
{ name: "Laravel 5", released: new Date(2015, 2, 4) },
=======
{ name: "Lua", released: new Date(1993, 6, 28) },
{ name: "MS-DOS", released: new Date(1981, 7, 12) },
>>>>>>>
{ name: "Laravel 4", released: new Date(2013, 5, 28) },
{ name: "Laravel 5", released: new Date(2015, 2, 4) },
{ name: "Lua", released: new Date(1993, 6, 28) },
{ name: "MS-DOS", released: new Date(1981, 7, 12) }, |
<<<<<<<
{ name: "XAML", released: new Date(2008, 6, 1) },
=======
{ name: "XML", released: new Date(1998,1,10), icon: "xml" },
>>>>>>>
{ name: "XAML", released: new Date(2008, 6, 1) },
{ name: "XML", released: new Date(1998,1,10), icon: "xml" }, |
<<<<<<<
{ name: "ABAP", released: new Date("1983-01-01"), icon: "abap", link: "https://en.wikipedia.org/wiki/ABAP" },
{ name: "Ada", released: new Date("1980-01-01"), link: "https://en.wikipedia.org/wiki/Ada_(programming_language)" },
{ name: "AdonisJs", released: new Date("2015-08-15"), link: "https://adonisjs.com/" },
{ name: "Airflow (Apache)", released: new Date("2017-04-19"), link: "https://airflow.apache.org/" },
{ name: "Amazon Web Services", released: new Date("2004-03-15"), link: "https://aws.amazon.com/" },
{ name: "Android", released: new Date("2008-09-23"), icon: "android", link: "https://www.android.com/" },
{ name: "Angular", released: new Date("2016-09-14"), icon: "angular", link: "https://angular.io/" },
{ name: "AngularJS", released: new Date("2010-10-20"), icon: "angular", link: "https://angularjs.org/" },
{ name: "Ansible", released: new Date("2012-03-20"), link: "https://www.ansible.com/" },
{ name: "Assembly", released: new Date("1949-01-01"), icon: "asm", link: "https://en.wikipedia.org/wiki/Assembly_language" },
{ name: "Babbage Assembly", released: new Date("1971-01-01"), link: "https://en.wikipedia.org/wiki/Babbage_(programming_language)" },
{ name: "Babel", released: new Date("2014-09-28"), link: "https://babeljs.io/" },
{ name: "BackBoneJS", released: new Date("2010-10-13"), icon: "backbone", link: "https://backbonejs.org/" },
{ name: "Bash", released: new Date("1989-06-08"), link: "https://en.wikipedia.org/wiki/Bash_(Unix_shell)" },
{ name: "BASIC", released: new Date("1964-05-01"), link: "https://en.wikipedia.org/wiki/BASIC" },
{ name: "Bootstrap 4", released: new Date("2018-01-18"), icon: "bootstrap", link: "https://getbootstrap.com/" },
{ name: "Brainfuck", released: new Date("1993-09-01"), link: "https://en.wikipedia.org/wiki/Brainfuck" },
{ name: "C", released: new Date("1972-01-01"), icon: "c", link: "https://en.wikipedia.org/wiki/C_(programming_language)" },
{ name: "C#", released: new Date("2001-12-01"), icon: "cSharp", link: "https://en.wikipedia.org/wiki/C_Sharp_(programming_language)" },
{ name: "C++", released: new Date("1985-10-01"), icon: "cPlusPlus", link: "http://www.cplusplus.com/" },
{ name: "CakePHP", released: new Date("2005-04-01"), icon: "cakePHP", link: "https://cakephp.org/" },
{ name: "Clojure", released: new Date("2007-10-16"), link: "https://clojure.org/" },
{ name: "COBOL", released: new Date("1959-01-01"), link: "https://en.wikipedia.org/wiki/COBOL" },
{ name: "CodeIgniter", released: new Date("2006-03-28"), icon: "codeIgniter", link: "https://codeigniter.com/" },
{ name: "CouchDB", released: new Date("2005-03-01"), link: "http://couchdb.apache.org/" },
{ name: "Crystal", released: new Date("2014-07-18"), link: "https://crystal-lang.org/" },
{ name: "CSS", released: new Date("1996-12-17"), icon: "css", link: "https://en.wikipedia.org/wiki/Cascading_Style_Sheets" },
{ name: "Dart", released: new Date("2011-11-10"), link: "https://www.dartlang.org/" },
{ name: "Direct3D", released: new Date("1996-06-02"), link: "https://docs.microsoft.com/en-us/windows/desktop/direct3d" },
{ name: "Django", released: new Date("2005-07-15"), icon: "django", link: "https://www.djangoproject.com/" },
{ name: "Docker", released: new Date("2013-03-13"), icon: "docker", link: "https://www.docker.com/" },
{ name: "Drupal", released: new Date("2000-05-18"), icon: "drupal", link: "https://www.drupal.org/" },
{ name: "D3", released: new Date("2010-09-27"), link: "https://d3js.org/" },
{ name: "Electron", released: new Date("2013-04-12"), link: "https://electronjs.org/" },
{ name: "Elixir", released: new Date("2011-01-01"), link: "https://elixir-lang.org/" },
{ name: "Elm", released: new Date("2012-04-01"), link: "https://elm-lang.org/" },
{ name: "Ember.js", released: new Date("2011-12-08"), link: "https://www.emberjs.com/" },
{ name: "Erlang", released: new Date("1986-01-01"), icon: "erlang", link: "https://www.erlang.org/" },
{ name: "F#", released: new Date("2005-06-21"), link: "https://fsharp.org/" },
{ name: "Flask", released: new Date("2010-04-01"), link: "https://en.wikipedia.org/wiki/Flask_(web_framework)" },
=======
{ name: "ABAP", released: new Date("1983-01-01"), icon: "abap" },
{ name: "Ada", released: new Date("1980-01-01") },
{ name: "AdonisJs", released: new Date("2015-08-15") },
{ name: "Airflow (Apache)", released: new Date("2017-04-19") },
{ name: "Amazon Web Services", released: new Date("2004-03-15") },
{ name: "Android", released: new Date("2008-09-23"), icon: "android" },
{ name: "Angular", released: new Date("2016-09-14"), icon: "angular" },
{ name: "AngularJS", released: new Date("2010-10-20"), icon: "angular" },
{ name: "Ansible", released: new Date("2012-03-20") },
{ name: "Assembly", released: new Date("1949-01-01"), icon: "asm" },
{ name: "Babbage Assembly", released: new Date("1971-01-01") },
{ name: "Babel", released: new Date("2014-09-28") },
{ name: "BackBoneJS", released: new Date("2010-10-13"), icon: "backbone" },
{ name: "Bash", released: new Date("1989-06-08") },
{ name: "BASIC", released: new Date("1964-05-01") },
{ name: "Bootstrap 4", released: new Date("2018-01-18"), icon: "bootstrap" },
{ name: "Brainfuck", released: new Date("1993-09-01") },
{ name: "C", released: new Date("1972-01-01"), icon: "c" },
{ name: "C#", released: new Date("2001-12-01"), icon: "cSharp" },
{ name: "C++", released: new Date("1985-10-01"), icon: "cPlusPlus" },
{ name: "CakePHP", released: new Date("2005-04-01"), icon: "cakePHP" },
{ name: "Chef", released: new Date("2009-01-15"), icon: "chef" },
{ name: "Clojure", released: new Date("2007-10-16") },
{ name: "COBOL", released: new Date("1959-01-01") },
{ name: "CodeIgniter", released: new Date("2006-03-28"), icon: "codeIgniter" },
{ name: "Concourse", released: new Date("2014-04-19"), icon: "concourseci" },
{ name: "CouchDB", released: new Date("2005-03-01") },
{ name: "Crystal", released: new Date("2014-07-18") },
{ name: "CSS", released: new Date("1996-12-17"), icon: "css" },
{ name: "Dart", released: new Date("2011-11-10") },
{ name: "Direct3D", released: new Date("1996-06-02") },
{ name: "Django", released: new Date("2005-07-15"), icon: "django" },
{ name: "Docker", released: new Date("2013-03-13"), icon: "docker" },
{ name: "Drupal", released: new Date("2000-05-18"), icon: "drupal" },
{ name: "D3", released: new Date("2010-09-27") },
{ name: "Electron", released: new Date("2013-04-12"), icon: "electron" },
{ name: "Elixir", released: new Date("2011-01-01") },
{ name: "Elm", released: new Date("2012-04-01") },
{ name: "Ember.js", released: new Date("2011-12-08") },
{ name: "Erlang", released: new Date("1986-01-01"), icon: "erlang" },
{ name: "F#", released: new Date("2005-06-21") },
{ name: "Flask", released: new Date("2010-04-01") },
>>>>>>>
{ name: "ABAP", released: new Date("1983-01-01"), icon: "abap", link: "https://en.wikipedia.org/wiki/ABAP" },
{ name: "Ada", released: new Date("1980-01-01"), link: "https://en.wikipedia.org/wiki/Ada_(programming_language)" },
{ name: "AdonisJs", released: new Date("2015-08-15"), link: "https://adonisjs.com/" },
{ name: "Airflow (Apache)", released: new Date("2017-04-19"), link: "https://airflow.apache.org/" },
{ name: "Amazon Web Services", released: new Date("2004-03-15"), link: "https://aws.amazon.com/" },
{ name: "Android", released: new Date("2008-09-23"), icon: "android", link: "https://www.android.com/" },
{ name: "Angular", released: new Date("2016-09-14"), icon: "angular", link: "https://angular.io/" },
{ name: "AngularJS", released: new Date("2010-10-20"), icon: "angular", link: "https://angularjs.org/" },
{ name: "Ansible", released: new Date("2012-03-20"), link: "https://www.ansible.com/" },
{ name: "Assembly", released: new Date("1949-01-01"), icon: "asm", link: "https://en.wikipedia.org/wiki/Assembly_language" },
{ name: "Babbage Assembly", released: new Date("1971-01-01"), link: "https://en.wikipedia.org/wiki/Babbage_(programming_language)" },
{ name: "Babel", released: new Date("2014-09-28"), link: "https://babeljs.io/" },
{ name: "BackBoneJS", released: new Date("2010-10-13"), icon: "backbone", link: "https://backbonejs.org/" },
{ name: "Bash", released: new Date("1989-06-08"), link: "https://en.wikipedia.org/wiki/Bash_(Unix_shell)" },
{ name: "BASIC", released: new Date("1964-05-01"), link: "https://en.wikipedia.org/wiki/BASIC" },
{ name: "Bootstrap 4", released: new Date("2018-01-18"), icon: "bootstrap", link: "https://getbootstrap.com/" },
{ name: "Brainfuck", released: new Date("1993-09-01"), link: "https://en.wikipedia.org/wiki/Brainfuck" },
{ name: "C", released: new Date("1972-01-01"), icon: "c", link: "https://en.wikipedia.org/wiki/C_(programming_language)" },
{ name: "C#", released: new Date("2001-12-01"), icon: "cSharp", link: "https://en.wikipedia.org/wiki/C_Sharp_(programming_language)" },
{ name: "C++", released: new Date("1985-10-01"), icon: "cPlusPlus", link: "http://www.cplusplus.com/" },
{ name: "CakePHP", released: new Date("2005-04-01"), icon: "cakePHP", link: "https://cakephp.org/" },
{ name: "Chef", released: new Date("2009-01-15"), icon: "chef" },
{ name: "Clojure", released: new Date("2007-10-16"), link: "https://clojure.org/" },
{ name: "COBOL", released: new Date("1959-01-01"), link: "https://en.wikipedia.org/wiki/COBOL" },
{ name: "CodeIgniter", released: new Date("2006-03-28"), icon: "codeIgniter", link: "https://codeigniter.com/" },
{ name: "Concourse", released: new Date("2014-04-19"), icon: "concourseci" },
{ name: "CouchDB", released: new Date("2005-03-01"), link: "http://couchdb.apache.org/" },
{ name: "Crystal", released: new Date("2014-07-18"), link: "https://crystal-lang.org/" },
{ name: "CSS", released: new Date("1996-12-17"), icon: "css", link: "https://en.wikipedia.org/wiki/Cascading_Style_Sheets" },
{ name: "Dart", released: new Date("2011-11-10"), link: "https://www.dartlang.org/" },
{ name: "Direct3D", released: new Date("1996-06-02"), link: "https://docs.microsoft.com/en-us/windows/desktop/direct3d" },
{ name: "Django", released: new Date("2005-07-15"), icon: "django", link: "https://www.djangoproject.com/" },
{ name: "Docker", released: new Date("2013-03-13"), icon: "docker", link: "https://www.docker.com/" },
{ name: "Drupal", released: new Date("2000-05-18"), icon: "drupal", link: "https://www.drupal.org/" },
{ name: "D3", released: new Date("2010-09-27"), link: "https://d3js.org/" },
{ name: "Electron", released: new Date("2013-04-12"), link: "https://electronjs.org/" },
{ name: "Elixir", released: new Date("2011-01-01"), link: "https://elixir-lang.org/" },
{ name: "Elm", released: new Date("2012-04-01"), link: "https://elm-lang.org/" },
{ name: "Ember.js", released: new Date("2011-12-08"), link: "https://www.emberjs.com/" },
{ name: "Erlang", released: new Date("1986-01-01"), icon: "erlang", link: "https://www.erlang.org/" },
{ name: "F#", released: new Date("2005-06-21"), link: "https://fsharp.org/" },
{ name: "Flask", released: new Date("2010-04-01"), link: "https://en.wikipedia.org/wiki/Flask_(web_framework)" }, |
<<<<<<<
{ name: "Symfony", released: new Date("2011-07-28"), icon: "symfony" },
{ name: "Tensorflow", released: new Date("2015-12-09") },
=======
{ name: "Symfony 2", released: new Date("2011-07-00"), icon: "symfony" },
{ name: "Tensorflow", released: new Date("2015-12-09"), icon: "tensorflow" },
>>>>>>>
{ name: "Symfony", released: new Date("2011-07-28"), icon: "symfony" },
{ name: "Tensorflow", released: new Date("2015-12-09"), icon: "tensorflow" }, |
<<<<<<<
import { TrustWeb3 } from "../network/TrustWeb3";
import DAppsDisabled from './DAppsDisabled';
import { getTrsutBrowserVersion } from "../components/systemchecks/BrowserVersion";
=======
import getWeb3 from '../utils/provider';
import DAppsDisabled from './DAppsDisabled';
import { getTrsutBrowserVersion } from "../components/systemchecks/BrowserVersion";
>>>>>>>
import { TrustWeb3 } from "../network/TrustWeb3";
import getWeb3 from '../utils/provider';
import DAppsDisabled from './DAppsDisabled';
import { getTrsutBrowserVersion } from "../components/systemchecks/BrowserVersion"; |
<<<<<<<
Col
} from 'reactstrap'
import logo from './logo_solid_square_blue.svg'
import './App.css'
import DApps from './components/DApps'
import MarketsList from './components/MarketsList'
import SandBox from './components/Sandbox'
=======
Container,
} from 'reactstrap';
import './App.css';
import DApps from './components/DApps.js';
import DAppsCategory from './components/DAppsCategory.js';
import ContactUs from "./components/ContactUs.js"
import GetEther from "./dapps/GetEther/index"
>>>>>>>
Container,
} from 'reactstrap';
import './App.css';
import DApps from './components/DApps.js';
import DAppsCategory from './components/DAppsCategory.js';
import ContactUs from "./components/ContactUs.js"
import GetEther from "./dapps/GetEther/index"
import SandBox from './components/Sandbox'
<<<<<<<
<Switch location={isModal ? this.previousLocation : location}>
<Route exact path='/' component={Home}/>
<Route path='/browser' component={Browser}/>
<Route path='/listings' component={Listings}/>
<Route path='/sandbox' component={SystemChecks}/>
</Switch>
=======
<Container>
<header className="App-header">
<Switch location={isModal ? this.previousLocation : location}>
<Route exact path='/' component={Browser} />
<Route path='/browser' component={Browser} />
<Route path='/category/:id' component={DAppsCategoryComponent} />
<Route path='/contact-us' component={ContactUs} />
<Route path='/ether' component={GetEther} />
</Switch>
</header>
</Container>
>>>>>>>
<Switch location={isModal ? this.previousLocation : location}>
<Route exact path='/' component={Home}/>
<Route path='/browser' component={Browser}/>
<Route path='/listings' component={Listings}/>
<Route path='/sandbox' component={SystemChecks}/>
<Route path='/category/:id' component={DAppsCategoryComponent} />
<Route path='/contact-us' component={ContactUs} />
<Route path='/ether' component={GetEther} />
</Switch>
<<<<<<<
const Home = () => (
<div>
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<h1 className="App-title">What is DApps Browser?</h1>
<Col sm="12" md={{ size: 8, offset: 2 }}>
<p className="App-intro">
It is a browser that interacts with decentralized applications on Ethereum blockchain via Web3 infrastructure.
</p>
</Col>
<header className="App-btn">
<Link to='/browser'><button id="btn">Get Started</button></Link>
</header>
</header>
</div>
</div>
)
=======
>>>>>>> |
<<<<<<<
"use strict";
const discord = require("discord.js");
const Command = require("../script");
const { api: { LastFM } } = require("../../utils");
const config = require("../../../config.json");
const lastfm = new LastFM(config.fm_key);
const fm = new Command({
name: "last.fm",
description: "Check your last.fm stats",
help: "```\n[prefix]fm <username> <selection> <time>```\n\n*Replace items in brackets with:*\n\n**username:** Your last.fm username (Required!)\n\n**selection:** recent/artists/albums/music/tracks (Optional)\n\n**time:** all/week/month (Optional)\n\n*Recent does not require a time*\n*(Must have a last.fm account.)*",
thumbnail: "https://cdn.discordapp.com/attachments/209040403918356481/509092391467352065/t29.png",
marketplace_enabled: true,
type: "js",
match_type: "command",
match: "fm",
featured: false,
preload: true,
cb: function (client, message) {
const args = message.content.split(" ");
if (args[1] === undefined) {
message.reply("youre missing the username to look up");
return;
}
if (args[2] === undefined && args[3] === undefined) {
args[2] = "recent";
args[3] = null;
} else {
if (args[2] === undefined) {
message.reply("youre missing either 'artists', 'albums', or 'tracks'");
return;
}
if (args[3] === undefined) {
message.reply("youre missing the time frame to look up, either 'week', 'month', or 'all'");
return;
}
}
let method;
switch (args[2]) {
case "recent":
method = "user.getrecenttracks";
break;
case "artists":
method = "user.gettopartists";
break;
case "albums":
method = "user.gettopalbums";
break;
case "tracks":
method = "user.gettoptracks";
break;
default:
message.reply(`'${args[2]}' is not a valid argument, choose either 'artists', 'albums', or 'tracks'`);
break;
}
let period;
switch (args[3]) {
case null:
period = null;
break;
case "all":
period = "overall";
break;
case "month":
period = "1month";
break;
case "week":
period = "7day";
break;
default:
message.reply(`'${args[3]}' is not a valid argument, choose either 'week', 'month', or 'all'`);
break;
}
let options = {};
options.user = args[1];
options.method = method;
options.limit = 5;
if (period !== null) {
options.period = period;
}
lastfm.makeApiRequest(options).then(response => {
if (response.data.error !== undefined) {
message.reply("error making lastfm api request, check if you entered the user correctly");
return;
}
let topFieldName;
if (args[2] === "recent") {
topFieldName = "recenttracks";
} else {
topFieldName = `top${args[2]}`;
}
let scopeName;
if (args[3] === null) {
scopeName = "track";
} else {
scopeName = args[2].substring(0, args[2].length - 1);
}
let embed = new discord.RichEmbed()
.setColor(0xff594f)
.setAuthor("AWESOM-O // Last.fm", "https://cdn.discordapp.com/attachments/437671103536824340/462653108636483585/a979694bf250f2293d929278328b707c.png")
.setThumbnail(response.data[topFieldName][scopeName][0].image[response.data[topFieldName][scopeName][0].image.length - 1]["#text"])
.setTitle(`last.fm ${args[2] === "recent" ? "" : "top"} ${args[3] === null ? "" : args[3]} ${args[2]}`)
.setFooter("View full stats on last.fm")
.setURL(`https://last.fm/user/${args[1]}`);
for (let i = 0; i < response.data[topFieldName][scopeName].length; i++) {
embed.addField(response.data[topFieldName][scopeName][i].name, `${response.data[topFieldName][scopeName][i].playcount === undefined ? response.data[topFieldName][scopeName][i].artist["#text"] : response.data[topFieldName][scopeName][i].playcount + " plays"}`);
}
message.channel.send(embed);
}).catch(() => {
message.reply("error making lastfm api request");
});
}
});
module.exports = fm;
=======
"use strict";
const discord = require("discord.js");
const Command = require("../script");
const { api: { LastFM } } = require("../../utils");
const config = require("../config.json");
const lastfm = new LastFM(config.fm_key);
const fm = new Command({
name: "last.fm",
description: "Check your last.fm stats",
help: "```\n[prefix]fm <username> <selection> <time>```\n\n*Replace items in brackets with:*\n\n**username:** Your last.fm username (Required!)\n\n**selection:** recent/artists/albums/music/tracks (Optional)\n\n**time:** all/week/month (Optional)\n\n*Recent does not require a time*\n*(Must have a last.fm account.)*",
thumbnail: "https://cdn.discordapp.com/attachments/209040403918356481/509092391467352065/t29.png",
marketplace_enabled: true,
type: "js",
match_type: "command",
match: "fm",
featured: false,
preload: true,
cb: function (client, message, guildDoc) {
const args = message.content.split(" ");
if (args[1] === undefined) {
message.reply("youre missing the username to look up");
return;
}
if (args[2] === undefined && args[3] === undefined) {
args[2] = "recent";
args[3] = null;
} else {
if (args[2] === undefined) {
message.reply("youre missing either 'artists', 'albums', or 'tracks'");
return;
}
if (args[3] === undefined && args[2]) {
message.reply("youre missing the time frame to look up, either 'week', 'month', or 'all'");
return;
}
}
let method;
switch (args[2]) {
case "recent":
method = "user.getrecenttracks";
break;
case "artists":
method = "user.gettopartists";
break;
case "albums":
method = "user.gettopalbums";
break;
case "tracks":
method = "user.gettoptracks";
break;
default:
message.reply(`'${args[2]}' is not a valid argument, choose either 'artists', 'albums', or 'tracks'`);
break;
}
let period;
switch (args[3]) {
case null:
period = null;
break;
case "all":
period = "overall";
break;
case "month":
period = "1month";
break;
case "week":
period = "7day";
break;
default:
message.reply(`'${args[3]}' is not a valid argument, choose either 'week', 'month', or 'all'`);
break;
}
let options = {};
options.user = args[1];
options.method = method;
options.limit = 5;
if (period !== null) {
options.period = period;
}
lastfm.makeApiRequest(options).then(response => {
response = JSON.parse(response);
if (response.error !== undefined) {
message.reply("error making lastfm api request, check if you entered the user correctly");
return;
}
let topFieldName;
if (args[2] === "recent") {
topFieldName = "recenttracks";
} else {
topFieldName = `top${args[2]}`;
}
let scopeName;
if (args[3] === null) {
scopeName = "track";
} else {
scopeName = args[2].substring(0, args[2].length - 1);
}
let embed = new discord.RichEmbed()
.setColor(0xff594f)
.setAuthor("AWESOM-O // Last.fm", "https://cdn.discordapp.com/attachments/437671103536824340/462653108636483585/a979694bf250f2293d929278328b707c.png")
.setThumbnail(response[topFieldName][scopeName][0].image[response[topFieldName][scopeName][0].image.length - 1]["#text"])
.setTitle(`View ${args[1]}'s profile'`)
.setFooter("View full stats on last.fm")
.setURL(`https://last.fm/user/${args[1]}`);
for (let i = 0; i < response[topFieldName][scopeName].length; i++) {
embed.addField(response[topFieldName][scopeName][i].name, `${response[topFieldName][scopeName][i].playcount === undefined ? response[topFieldName][scopeName][i].artist["#text"] : response[topFieldName][scopeName][i].playcount + " plays"}`);
}
message.channel.send(embed);
}).catch(error => {
message.reply("error making lastfm api request");
});
}
});
module.exports = fm;
>>>>>>>
"use strict";
const discord = require("discord.js");
const Command = require("../script");
const { api: { LastFM } } = require("../../utils");
const config = require("../config.json");
const lastfm = new LastFM(config.fm_key);
const fm = new Command({
name: "last.fm",
description: "Check your last.fm stats",
help: "```\n[prefix]fm <username> <selection> <time>```\n\n*Replace items in brackets with:*\n\n**username:** Your last.fm username (Required!)\n\n**selection:** recent/artists/albums/music/tracks (Optional)\n\n**time:** all/week/month (Optional)\n\n*Recent does not require a time*\n*(Must have a last.fm account.)*",
thumbnail: "https://cdn.discordapp.com/attachments/209040403918356481/509092391467352065/t29.png",
marketplace_enabled: true,
type: "js",
match_type: "command",
match: "fm",
featured: false,
preload: true,
cb: function (client, message) {
const args = message.content.split(" ");
if (args[1] === undefined) {
message.reply("youre missing the username to look up");
return;
}
if (args[2] === undefined && args[3] === undefined) {
args[2] = "recent";
args[3] = null;
} else {
if (args[2] === undefined) {
message.reply("youre missing either 'artists', 'albums', or 'tracks'");
return;
}
if (args[3] === undefined && args[2]) {
message.reply("youre missing the time frame to look up, either 'week', 'month', or 'all'");
return;
}
}
let method;
switch (args[2]) {
case "recent":
method = "user.getrecenttracks";
break;
case "artists":
method = "user.gettopartists";
break;
case "albums":
method = "user.gettopalbums";
break;
case "tracks":
method = "user.gettoptracks";
break;
default:
message.reply(`'${args[2]}' is not a valid argument, choose either 'artists', 'albums', or 'tracks'`);
break;
}
let period;
switch (args[3]) {
case null:
period = null;
break;
case "all":
period = "overall";
break;
case "month":
period = "1month";
break;
case "week":
period = "7day";
break;
default:
message.reply(`'${args[3]}' is not a valid argument, choose either 'week', 'month', or 'all'`);
break;
}
let options = {};
options.user = args[1];
options.method = method;
options.limit = 5;
if (period !== null) {
options.period = period;
}
lastfm.makeApiRequest(options).then(response => {
response = JSON.parse(response);
if (response.error !== undefined) {
message.reply("error making lastfm api request, check if you entered the user correctly");
return;
}
let topFieldName;
if (args[2] === "recent") {
topFieldName = "recenttracks";
} else {
topFieldName = `top${args[2]}`;
}
let scopeName;
if (args[3] === null) {
scopeName = "track";
} else {
scopeName = args[2].substring(0, args[2].length - 1);
}
let embed = new discord.RichEmbed()
.setColor(0xff594f)
.setAuthor("AWESOM-O // Last.fm", "https://cdn.discordapp.com/attachments/437671103536824340/462653108636483585/a979694bf250f2293d929278328b707c.png")
.setThumbnail(response[topFieldName][scopeName][0].image[response[topFieldName][scopeName][0].image.length - 1]["#text"])
.setTitle(`View ${args[1]}'s profile'`)
.setFooter("View full stats on last.fm")
.setURL(`https://last.fm/user/${args[1]}`);
for (let i = 0; i < response[topFieldName][scopeName].length; i++) {
embed.addField(response[topFieldName][scopeName][i].name, `${response[topFieldName][scopeName][i].playcount === undefined ? response[topFieldName][scopeName][i].artist["#text"] : response[topFieldName][scopeName][i].playcount + " plays"}`);
}
message.channel.send(embed);
}).catch(() => {
message.reply("error making lastfm api request");
});
}
});
module.exports = fm; |
<<<<<<<
const routeData = this.extractRouteData();
=======
const routeData = this.extractRouteData();
>>>>>>>
const routeData = this.extractRouteData();
<<<<<<<
if (
routeData &&
routeData.sitecore &&
routeData.sitecore.context &&
routeData.sitecore.context.language
) {
this.state.defaultLanguage = routeData.sitecore.context.language;
=======
if (routeData && routeData.context && routeData.context.language) {
this.state.defaultLanguage = routeData.context.language;
>>>>>>>
if (
routeData &&
routeData.sitecore &&
routeData.sitecore.context &&
routeData.sitecore.context.language
) {
this.state.defaultLanguage = routeData.sitecore.context.language;
<<<<<<<
const routeData = this.extractRouteData();
// if no existing routeData is present (from SSR), get Layout Service fetching the route data or ssr render complete
if (!routeData || this.props.ssrRenderComplete) {
=======
const routeData = this.extractRouteData();
// if no existing routeData is present (from SSR), get Layout Service fetching the route data or SSR render is complete
if (!routeData || this.props.ssrRenderComplete) {
>>>>>>>
const routeData = this.extractRouteData();
// if no existing routeData is present (from SSR), get Layout Service fetching the route data or ssr render complete
if (!routeData || this.props.ssrRenderComplete) {
<<<<<<<
=======
// once we initialize the route handler, we've "used up" the SSR data,
// if it existed, so we want to clear it now that it's in react state.
// future route changes that might destroy/remount this component should ignore any SSR data.
// EXCEPTION: Unless we are still SSR-ing. Because SSR can re-render the component twice
// (once to find GraphQL queries that need to run, the second time to refresh the view with
// GraphQL query results)
// We test for SSR by checking for Node-specific process.env variable.
if (typeof window !== "undefined" && !this.props.ssrRenderComplete && this.props.setSsrRenderComplete) {
this.props.setSsrRenderComplete(true);
}
this.componentIsMounted = true;
>>>>>>>
<<<<<<<
/**
=======
export default withSitecoreContext({ updatable: true })(RouteHandler)
/**
>>>>>>>
/** |
<<<<<<<
const config = { keyword: '@todo', blobLines: 5 }
=======
const config = { keyword: '@todo', bodyKeyword: '@body', blobLines: 2 }
>>>>>>>
const config = { keyword: '@todo', bodyKeyword: '@body', blobLines: 5 }
<<<<<<<
const config = { keyword: '@todo', autoAssign: true, blobLines: 5 }
=======
const config = { keyword: '@todo', bodyKeyword: '@body', autoAssign: true, blobLines: 2 }
>>>>>>>
const config = { keyword: '@todo', bodyKeyword: '@body', autoAssign: true, blobLines: 5 }
<<<<<<<
const config = { keyword: '@todo', autoAssign: false, blobLines: 5 }
const body = generateBody(context, config, title, file, contents, author, sha)
=======
const config = { keyword: '@todo', bodyKeyword: '@body', autoAssign: false, blobLines: 2 }
const body = generateBody(context, config, title, file, contents, author, sha, 10)
>>>>>>>
const config = { keyword: '@todo', bodyKeyword: '@body', autoAssign: false, blobLines: 5 }
const body = generateBody(context, config, title, file, contents, author, sha)
<<<<<<<
const config = { keyword: '@todo', autoAssign: '@matchai', blobLines: 5 }
const body = generateBody(context, config, title, file, contents, author, sha)
=======
const config = { keyword: '@todo', bodyKeyword: '@body', autoAssign: '@matchai', blobLines: 2 }
const body = generateBody(context, config, title, file, contents, author, sha, 10)
>>>>>>>
const config = { keyword: '@todo', bodyKeyword: '@body', autoAssign: '@matchai', blobLines: 5 }
const body = generateBody(context, config, title, file, contents, author, sha)
<<<<<<<
const config = { keyword: '@todo', autoAssign: ['@JasonEtco', 'matchai', 'defunkt'], blobLines: 5 }
const body = generateBody(context, config, title, file, contents, author, sha)
=======
const config = { keyword: '@todo', bodyKeyword: '@body', autoAssign: ['@JasonEtco', 'matchai', 'defunkt'], blobLines: 2 }
const body = generateBody(context, config, title, file, contents, author, sha, 10)
>>>>>>>
const config = { keyword: '@todo', bodyKeyword: '@body', autoAssign: ['@JasonEtco', 'matchai', 'defunkt'], blobLines: 5 }
const body = generateBody(context, config, title, file, contents, author, sha)
<<<<<<<
const config = { keyword: '@todo', blobLines: 5 }
=======
const config = { keyword: '@todo', bodyKeyword: '@body', blobLines: 2 }
>>>>>>>
const config = { keyword: '@todo', bodyKeyword: '@body', blobLines: 5 } |
<<<<<<<
if (options.nameConflict) {
this.nameConflict = options.nameConflict;
}
=======
if (options.maxFieldsSize) {
this.maxFieldsSize = options.maxFieldsSize;
}
>>>>>>>
if (options.nameConflict) {
this.nameConflict = options.nameConflict;
}
if (options.maxFieldsSize) {
this.maxFieldsSize = options.maxFieldsSize;
}
<<<<<<<
if (this.nameConflict && !options.nameConflict) {
options.nameConflict = this.nameConflict;
}
=======
if (this.maxFieldsSize && !options.maxFieldsSize) {
options.maxFieldsSize = this.maxFieldsSize;
}
>>>>>>>
if (this.nameConflict && !options.nameConflict) {
options.nameConflict = this.nameConflict;
if (this.maxFieldsSize && !options.maxFieldsSize) {
options.maxFieldsSize = this.maxFieldsSize;
} |
<<<<<<<
=======
var options
, defaults;
function setOptions(opt) {
if (!opt) opt = defaults;
if (options === opt) return;
options = opt;
if (options.gfm) {
block.fences = block.gfm.fences;
block.paragraph = block.gfm.paragraph;
block.table = block.gfm.table;
block.nptable = block.gfm.nptable;
inline.text = inline.gfm.text;
inline.url = inline.gfm.url;
} else {
block.fences = block.normal.fences;
block.paragraph = block.normal.paragraph;
block.table = block.normal.table;
block.nptable = block.normal.nptable;
inline.text = inline.normal.text;
inline.url = inline.normal.url;
}
if (options.pedantic) {
inline.em = inline.pedantic.em;
inline.strong = inline.pedantic.strong;
} else {
inline.em = inline.normal.em;
inline.strong = inline.normal.strong;
}
}
>>>>>>> |
<<<<<<<
{messages.map((message, index) => {
const user = props.getUsers({ addr: props.addr })[message.key]
// Hide messages from hidden users
if (user && user.isHidden()) return null
=======
{messages.map((message) => {
>>>>>>>
{messages.map((message) => {
const user = props.getUsers({ addr: props.addr })[message.key]
// Hide messages from hidden users
if (user && user.isHidden()) return null
<<<<<<<
previousDate = printDate
printDate = enriched.time.full
const nextMessageTime = messages[index + 1] && messages[index + 1].enriched.time.full
const showDivider = previousDate && previousDate !== printDate && nextMessageTime === printDate
=======
const printDate = moment(enriched.time)
const formattedTime = {
short: printDate.format('h:mm A'),
long: printDate.format('LL')
}
// divider only needs to be added if its a normal message
// and if day has changed since the last divider
const showDivider = message.content && !lastDividerDate.isSame(printDate, 'day')
if (showDivider) {
lastDividerDate = printDate
}
const user = {
key: message.key,
name: message.author
}
>>>>>>>
const printDate = moment(enriched.time)
const formattedTime = {
short: printDate.format('h:mm A'),
long: printDate.format('LL')
}
// divider only needs to be added if its a normal message
// and if day has changed since the last divider
const showDivider = message.content && !lastDividerDate.isSame(printDate, 'day')
if (showDivider) {
lastDividerDate = printDate
}
<<<<<<<
{!repeatedAuthor &&
<div onClick={onClickProfile.bind(this, user)} className='messages__item__metadata__name'>
{message.author || message.key.substr(0, 6)}
{user.isAdmin() && <span className='sigil admin' title='Admin'>@</span>}
{user.isModerator() && <span className='sigil moderator' title='Moderator'>%</span>}
{renderDate(enriched.time)}
</div>}
=======
{repeatedAuthor ? null : <div onClick={onClickProfile.bind(this, user)} className='messages__item__metadata__name'>{message.author || message.key.substr(0, 6)}{renderDate(formattedTime)}</div>}
>>>>>>>
{!repeatedAuthor &&
<div onClick={onClickProfile.bind(this, user)} className='messages__item__metadata__name'>
{message.author || message.key.substr(0, 6)}
{user.isAdmin() && <span className='sigil admin' title='Admin'>@</span>}
{user.isModerator() && <span className='sigil moderator' title='Moderator'>%</span>}
{renderDate(formattedTime)}
</div>} |
<<<<<<<
return (
<div key={message.time + message.key}>
{previousDate && previousDate !== printDate && (
<div className='messages__date__divider'>
<h2> {printDate} </h2>
</div>
)}
{item}
</div>
)
=======
return (<div >
{previousDate && previousDate !== printDate && (
<div className='messages__date__divider'>
<h2> {printDate} <span>({enriched.time.diff})</span> </h2>
</div>
)}
{item}
</div>)
>>>>>>>
return (
<div key={message.time + message.key}>
{previousDate && previousDate !== printDate && (
<div className='messages__date__divider'>
<h2> {printDate} <span>({enriched.time.diff})</span> </h2>
</div>
)}
{item}
</div>
) |
<<<<<<<
'apps/notes/form/formView'
], function (_, App, Marionette, NotesCollection, TagsCollection, NotebooksCollection, FilesCollection, NoteModel, View) {
=======
'apps/notes/form/formView',
'checklist',
'tags'
], function (_, App, Marionette, NotesCollection, TagsCollection, NotebooksCollection, NoteModel, View, Checklist, Tags) {
>>>>>>>
'apps/notes/form/formView',
'checklist',
'tags'
], function (_, App, Marionette, NotesCollection, TagsCollection, NotebooksCollection, FilesCollection, NoteModel, View, Checklist, Tags) {
<<<<<<<
view.on('redirect', this.redirect, this);
view.on('uploadImages', this.uploadImages, this);
view.trigger('shown');
=======
this.view.on('redirect', this.redirect, this);
this.view.trigger('shown');
>>>>>>>
this.view.on('redirect', this.redirect, this);
this.view.on('uploadImages', this.uploadImages, this);
this.view.trigger('shown'); |
<<<<<<<
for (var subprop in value) {
if (value.hasOwnProperty(subprop)) {
result[subprop] = value[subprop];
}
}
return props;
};
}
exports.unsafeUnfoldProps = unsafeUnfoldProps;
=======
return props;
};
};
function unsafeFromPropsArray(props) {
var result = {};
for (var i = 0, len = props.length; i < len; i++) {
var prop = props[i];
for (var key in prop) {
if (prop.hasOwnProperty(key)) {
result[key] = prop[key];
}
}
}
return result;
};
exports.unsafeFromPropsArray = unsafeFromPropsArray;
>>>>>>>
for (var subprop in value) {
if (value.hasOwnProperty(subprop)) {
result[subprop] = value[subprop];
}
}
return props;
};
}
exports.unsafeUnfoldProps = unsafeUnfoldProps;
function unsafeFromPropsArray(props) {
var result = {};
for (var i = 0, len = props.length; i < len; i++) {
var prop = props[i];
for (var key in prop) {
if (prop.hasOwnProperty(key)) {
result[key] = prop[key];
}
}
}
return result;
};
exports.unsafeFromPropsArray = unsafeFromPropsArray; |
<<<<<<<
import TimePicker from './TimePicker.san';
=======
import Toast from './Toast.san';
import Chip from './Chip.san';
>>>>>>>
import Toast from './Toast.san';
import TimePicker from './TimePicker.san';
import Chip from './Chip.san';
<<<<<<<
'/SubHeader': SubHeader,
'/ExpansionPanel': ExpansionPanel,
'/TimePicker': TimePicker
=======
'/subHeader': SubHeader,
'/ExpansionPanel': ExpansionPanel,
'/Snackbar & Toast': Toast,
'/Chip': Chip
>>>>>>>
'/SubHeader': SubHeader,
'/ExpansionPanel': ExpansionPanel,
'/TimePicker': TimePicker,
'/Snackbar & Toast': Toast,
'/Chip': Chip |
<<<<<<<
import DatePicker from './DatePicker.san';
=======
import Table from './Table.san';
>>>>>>>
import DatePicker from './DatePicker.san';
import Table from './Table.san';
<<<<<<<
let routes = {
'/': Main,
'/button': Button,
'/textfield': TextField,
'/menu': Menu,
'/tabs': Tabs,
'/pagination': Pagination,
'/popover': Popover,
'/drawer': Drawer,
'/progress': Progress,
'/datepicker': DatePicker,
'/dialog': Dialog
};
Object.keys(routes).forEach(rule => router.add({
rule,
Component: routes[rule],
target: '#root'
}));
=======
router.add({rule: '/', Component: Main, target: '#root'});
router.add({rule: '/button', Component: Button, target: '#root'});
router.add({rule: '/textfield', Component: TextField, target: '#root'});
router.add({rule: '/textfield', Component: TextField, target: '#root'});
router.add({rule: '/menu', Component: Menu, target: '#root'});
router.add({rule: '/tabs', Component: Tabs, target: '#root'});
router.add({rule: '/pagination', Component: Pagination, target: '#root'});
router.add({rule: '/popover', Component: Popover, target: '#root'});
router.add({rule: '/drawer', Component: Drawer, target: '#root'});
router.add({rule: '/progress', Component: Progress, target: '#root'});
router.add({rule: '/table', Component: Table, target: '#root'});
>>>>>>>
let routes = {
'/': Main,
'/button': Button,
'/textfield': TextField,
'/menu': Menu,
'/tabs': Tabs,
'/pagination': Pagination,
'/popover': Popover,
'/drawer': Drawer,
'/progress': Progress,
'/datepicker': DatePicker,
'/dialog': Dialog,
'/table': Table
};
Object.keys(routes).forEach(rule => router.add({
rule,
Component: routes[rule],
target: '#root'
})); |
<<<<<<<
'sm-icon': icon,
underline,
'enhanced-textarea': enhancedTextarea,
'text-field-label': textFieldLabel,
=======
'icon': Icon,
'underline': Underline,
'enhanced-textarea': EnhancedTextarea,
'text-field-label': TextFieldLabel,
>>>>>>>
'sm-icon': Icon,
'underline': Underline,
'enhanced-textarea': EnhancedTextarea,
'text-field-label': TextFieldLabel, |
<<<<<<<
import TextField from './TextField.san';
import TimePicker from './TimePicker.md';
=======
import TextField from './TextField.md';
import TimePicker from './TimePicker.san';
>>>>>>>
import TextField from './TextField.md';
import TimePicker from './TimePicker.md'; |
<<<<<<<
target[prop] = msg.entry.file;
if (extractCallback !== undefined) {
setTimeout(extractCallback.bind(null,{
file: msg.entry.file,
path: msg.entry.path,
}));
}
=======
target[prop] = new File([msg.entry.fileData], msg.entry.fileName, {
type: 'application/octet-stream'
});
setTimeout(extractCallback.bind(null,{
file: target[prop],
path: msg.entry.path,
}));
>>>>>>>
target[prop] = new File([msg.entry.fileData], msg.entry.fileName, {
type: 'application/octet-stream'
});
if (extractCallback !== undefined) {
setTimeout(extractCallback.bind(null,{
file: target[prop],
path: msg.entry.path,
}));
} |
<<<<<<<
'CruiseDevice',
'jianweichuah',
'andreabadesso',
'johnynogueira',
'karlpatrickespiritu',
'Molax',
'chroda',
'Adejair',
'gkal19',
'naltun',
'shyam12860',
'snaka',
'jeanbauer',
'PabloDinella',
'matheus-manoel',
'onlurking',
'lazarofl',
'ricardosllm',
'Dborah',
'cstipkovic',
'matheuswd',
'hevertoncastro',
'alexwbuschle',
'diogomoretti',
'willianschenkel'
=======
'CruiseDevice',
'hammy25'
>>>>>>>
'CruiseDevice',
'jianweichuah',
'andreabadesso',
'johnynogueira',
'karlpatrickespiritu',
'Molax',
'chroda',
'Adejair',
'gkal19',
'naltun',
'shyam12860',
'snaka',
'jeanbauer',
'PabloDinella',
'matheus-manoel',
'onlurking',
'lazarofl',
'ricardosllm',
'Dborah',
'cstipkovic',
'matheuswd',
'hevertoncastro',
'alexwbuschle',
'diogomoretti',
'willianschenkel'
'hammy25' |
<<<<<<<
=======
group_check: {
keys: function keys(id) {
return [`b_${id}_settings`];
},
libs: [],
code: lua["group_check.lua"]
},
group_delete_key: {
keys: function keys(id) {
return [`b_${id}_settings`, `b_${id}_running`, `b_${id}_executing`];
},
libs: [],
code: lua["group_delete_key.lua"]
},
>>>>>>> |
<<<<<<<
if (!this.hasPublishedLink[linkData.signature]) {
// Don't want to publish on every call to _linkProfile
this.hasPublishedLink[linkData.signature] = true
try {
// Send consentSignature to 3box-address-server to link profile with ethereum address
await utils.fetchJson(this._serverUrl + '/link', linkData)
} catch (err) {
throw new Error('An error occured while publishing link:', err)
}
}
=======
>>>>>>>
<<<<<<<
await this._ipfs.pin.add(data)
=======
utils.fetchJson(this._serverUrl + '/link', proof).catch(console.error)
>>>>>>>
await this._ipfs.pin.add(data) |
<<<<<<<
template: "databases/list",
dbLimit: 10,
=======
template: "templates/databases/list",
>>>>>>>
dbLimit: 10,
template: "templates/databases/list", |
<<<<<<<
account_storage_get(auth_request.account_email, ['google_token_access', 'google_token_expires', 'google_token_refresh', 'google_token_scopes'], function (storage) {
if (typeof storage.google_token_access === 'undefined' || typeof storage.google_token_refresh === 'undefined' || api_google_has_new_scope(auth_request.scopes, storage.google_token_scopes, auth_request.omit_read_scope)) {
if(!env_is_background_script()) {
google_auth_window_show_and_respond_to_auth_request(auth_request, storage.google_token_scopes, respond);
} else {
respond({success: false, error: 'Cannot produce auth window from background script'});
}
=======
storage.get(auth_request.account_email, ['google_token_access', 'google_token_expires', 'google_token_refresh', 'google_token_scopes'], function (s) {
if (typeof s.google_token_access === 'undefined' || typeof s.google_token_refresh === 'undefined' || api_google_has_new_scope(auth_request.scopes, s.google_token_scopes, auth_request.omit_read_scope)) {
google_auth_window_show_and_respond_to_auth_request(auth_request, s.google_token_scopes, respond);
>>>>>>>
storage.get(auth_request.account_email, ['google_token_access', 'google_token_expires', 'google_token_refresh', 'google_token_scopes'], function (s) {
if (typeof s.google_token_access === 'undefined' || typeof s.google_token_refresh === 'undefined' || api_google_has_new_scope(auth_request.scopes, s.google_token_scopes, auth_request.omit_read_scope)) {
if(!env_is_background_script()) {
google_auth_window_show_and_respond_to_auth_request(auth_request, s.google_token_scopes, respond);
} else {
respond({success: false, error: 'Cannot produce auth window from background script'});
}
<<<<<<<
} else if(!env_is_background_script()) {
google_auth_window_show_and_respond_to_auth_request(auth_request, storage.google_token_scopes, respond);
} else {
respond({success: false, error: 'Cannot show auth window from background script'});
=======
} else {
google_auth_window_show_and_respond_to_auth_request(auth_request, s.google_token_scopes, respond);
>>>>>>>
} else if(!env_is_background_script()) {
google_auth_window_show_and_respond_to_auth_request(auth_request, s.google_token_scopes, respond);
} else {
respond({success: false, error: 'Cannot show auth window from background script'}); |
<<<<<<<
response.setHeader('Content-Type', 'text/html; charset=utf-8');
response.write(data);
response.end();
=======
response.setHeader('Content-Type', 'text/html');
response.end(data);
>>>>>>>
response.setHeader('Content-Type', 'text/html; charset=utf-8');
response.end(data);
<<<<<<<
response.setHeader('Content-Type', 'application/json; charset=utf-8');
response.write(data);
response.end();
=======
response.setHeader('Content-Type', 'application/json');
response.end(data);
>>>>>>>
response.setHeader('Content-Type', 'application/json; charset=utf-8');
response.end(data); |
<<<<<<<
//cc.ProgressTimer.extend = cc.Class.extend;
cc.Scale9Sprite.extend = cc.Class.extend;
//cc.ParallaxNode.extend = cc.Class.extend;
=======
cc.ProgressTimer.extend = cc.Class.extend;
//cc.Scale9Sprite.extend = cc.Class.extend;
cc.ParallaxNode.extend = cc.Class.extend;
>>>>>>>
cc.Scale9Sprite.extend = cc.Class.extend;
cc.ProgressTimer.extend = cc.Class.extend;
cc.ParallaxNode.extend = cc.Class.extend; |
<<<<<<<
this.addChild(backMenu, 1000);
this._listMenu = pMenu;
this._backMenu = backMenu;
=======
this.addChild(backMenu);
this._pMenu = pMenu;
this._backMenu = backMenu;
>>>>>>>
this._listMenu = pMenu;
this._backMenu = backMenu;
this.addChild(backMenu);
<<<<<<<
var listMenu = this._listMenu;
var backMenu = this._backMenu;
=======
>>>>>>>
<<<<<<<
layer.removeChild(child);
listMenu.setVisible(true);
backMenu.setVisible(true);
}, this);
=======
layer.removeChild(child);
layer._pMenu.setVisible(true);
layer._backMenu.setVisible(true);
});
>>>>>>>
layer.removeChild(child);
layer._listMenu.setVisible(true);
layer._backMenu.setVisible(true);
}); |
<<<<<<<
{selectedCityRank && (<div>
<p>
{selectedCity} ranks <strong className={emphasis}>{selectedCityRank.rank}/{selectedCityRank.total} </strong>
This ranking is based on the number of AAA (adequate, affordable, and available) units per 100 ELI
(extremely low income) renters. A ranking of 1 indicates there are a lot of AAA units per 100 ELI
households, and a ranking of 3142 represents the least number of AAA units per 100 ELI households.
</p>
<strong className={gradientLabel}>More units available</strong>
<GradientScale
domain={[1, selectedCityRank.total]}
primary={selectedCityRank.rank}
height={50}
/>
</div>)}
{selectedCityData && (<div>
<LineChart
data={selectedCityData}
dataKey="year"
dataValue="eli_renters"
title={`Extremely Low-Income Renter Households, ${selectedCity}`}
yLabel="# of Households"
xLabel="Year"
xNumberFormatter={year => year}
/>
<BarChart
domain={{ x: [2000, 2014], y: [0, 100] }}
data={selectedCityData}
dataKey="year"
dataValue="aaa_units_per_100"
title={`Adequate, Affordable, and Available Units, ${selectedCity}`}
yLabel="Units per 100 ELI Households"
xLabel="Year"
xNumberFormatter={year => year}
/>
</div>)}
=======
{selectedCityRank && (
<div>
<p>
{selectedCity} ranks{" "}
<strong className={emphasis}>
{selectedCityRank.rank}/{selectedCityRank.total}{" "}
</strong>
This ranking is based on the number of AAA (adequate,
affordable, and available) units per 100 ELI (extremely
low income) renters. A ranking of 1 indicates there are a
lot of AAA units per 100 ELI households, and a ranking of
3142 represents the least number of AAA units per 100 ELI
households.
</p>
<strong className={gradientLabel}>
More units available
</strong>
<GradientScale
domain={[1, selectedCityRank.total]}
primary={selectedCityRank.rank}
height={50}
colorScale="ocean"
/>
</div>
)}
{selectedCityData && (
<div>
<LineChart
data={selectedCityData}
dataKey="year"
dataValue="eli_renters"
title={`Extremely Low-Income Renter Households, ${selectedCity}`}
yLabel="# of Households"
xLabel="Year"
xNumberFormatter={year => year}
/>
<BarChart
domain={{ x: [2000, 2014], y: [0, 100] }}
data={selectedCityData}
dataKey="year"
dataValue="aaa_units_per_100"
title={`Adequate, Affordable, and Available Units, ${selectedCity}`}
yLabel="Units per 100 ELI Households"
xLabel="Year"
xNumberFormatter={year => year}
/>
</div>
)}
>>>>>>>
{selectedCityRank && (
<div>
<p>
{selectedCity} ranks{" "}
<strong className={emphasis}>
{selectedCityRank.rank}/{selectedCityRank.total}{" "}
</strong>
This ranking is based on the number of AAA (adequate,
affordable, and available) units per 100 ELI (extremely
low income) renters. A ranking of 1 indicates there are a
lot of AAA units per 100 ELI households, and a ranking of
3142 represents the least number of AAA units per 100 ELI
households.
</p>
<strong className={gradientLabel}>
More units available
</strong>
<GradientScale
domain={[1, selectedCityRank.total]}
primary={selectedCityRank.rank}
height={50}
/>
</div>
)}
{selectedCityData && (
<div>
<LineChart
data={selectedCityData}
dataKey="year"
dataValue="eli_renters"
title={`Extremely Low-Income Renter Households, ${selectedCity}`}
yLabel="# of Households"
xLabel="Year"
xNumberFormatter={year => year}
/>
<BarChart
domain={{ x: [2000, 2014], y: [0, 100] }}
data={selectedCityData}
dataKey="year"
dataValue="aaa_units_per_100"
title={`Adequate, Affordable, and Available Units, ${selectedCity}`}
yLabel="Units per 100 ELI Households"
xLabel="Year"
xNumberFormatter={year => year}
/>
</div>
)} |
<<<<<<<
test("Basic Strict Import through Dataset API", 47, function() {
var ds = new DS.Dataset({
data : DS.alphabet_strict,
=======
module("Strict Importer");
test("Basic Strict Import", 53, function() {
var importer = new Miso.Importers.Local({
parser : Miso.Parsers.Strict,
data : Miso.alphabet_strict
});
importer.fetch({
success : function(strictData) {
verifyImport(Miso.alphabet_strict, strictData);
}
});
});
test("Basic Strict Import through Dataset API", 54, function() {
var ds = new Miso.Dataset({
data : Miso.alphabet_strict,
>>>>>>>
test("Basic Strict Import through Dataset API", 47, function() {
var ds = new Miso.Dataset({
data : Miso.alphabet_strict,
<<<<<<<
var ds = new DS.Dataset({
data : DS.alphabet_strict,
strict : true,
columns : [
{ name : 'name', type : 'number' }
]
=======
var ds = new Miso.Dataset({
data : Miso.alphabet_strict,
strict: true,
columnTypes : {
name : 'number'
}
>>>>>>>
var ds = new Miso.Dataset({
data : Miso.alphabet_strict,
strict : true,
columns : [
{ name : 'name', type : 'number' }
]
<<<<<<<
test("Convert object to dataset", 46, function() {
var ds = new DS.Dataset({ data : DS.alphabet_obj });
=======
test("Convert object to dataset", 57, function() {
var importer = new Miso.Importers.Local({
parser : Miso.Parsers.Obj,
data : Miso.alphabet_obj
});
importer.fetch({
success : function(strictData) {
verifyImport(Miso.alphabet_obj, strictData);
// check all data
var keys = _.keys(Miso.alphabet_obj[0]);
_.each(keys, function(key) {
// get all row values
var values = _.pluck(Miso.alphabet_obj, key);
// get column values
var pos = strictData._columnPositionByName[key];
var colVals = strictData._columns[pos].data;
ok(_.isEqual(values, colVals),
"data is correct for column " +
strictData._columnPositionByName[key].name
);
});
}
});
});
test("Convert object to dataset through dataset API", 53, function() {
var ds = new Miso.Dataset({ data : Miso.alphabet_obj });
>>>>>>>
test("Convert object to dataset", 46, function() {
var ds = new Miso.Dataset({ data : Miso.alphabet_obj });
<<<<<<<
// module("Remote Importer");
// test("Basic json url fetch", 53, function() {
// var url = "data/alphabet_strict.json";
// var importer = new DS.Importers.Remote({
// url : url,
// parser : DS.Parsers.Strict,
// jsonp : false
// });
// stop();
// var data = importer.fetch({
// success: function(strictData) {
// verifyImport({}, strictData);
// start();
// }
// });
// });
test("Basic json url fetch through Dataset API", 46, function() {
=======
module("Remote Importer");
test("Basic json url fetch", 53, function() {
var url = "data/alphabet_strict.json";
var importer = new Miso.Importers.Remote({
url : url,
parser : Miso.Parsers.Strict,
jsonp : false
});
stop();
var data = importer.fetch({
success: function(strictData) {
verifyImport({}, strictData);
start();
}
});
});
test("Basic json url fetch through Dataset API", 53, function() {
>>>>>>>
// module("Remote Importer");
// test("Basic json url fetch", 53, function() {
// var url = "data/alphabet_strict.json";
// var importer = new Miso.Importers.Remote({
// url : url,
// parser : Miso.Parsers.Strict,
// jsonp : false
// });
// stop();
// var data = importer.fetch({
// success: function(strictData) {
// verifyImport({}, strictData);
// start();
// }
// });
// });
test("Basic json url fetch through Dataset API", 46, function() {
<<<<<<<
// test("Basic jsonp url fetch", 53, function() {
// var url = "data/alphabet_obj.json?callback=";
// var importer = new DS.Importers.Remote({
// url : url,
// parser : DS.Parsers.Obj,
// jsonp : true,
// extract : function(raw) {
// return raw.data;
// }
// });
// stop();
// var data = importer.fetch({
// success: function(strictData) {
// verifyImport({}, strictData);
// start();
// }
// });
// });
test("Basic jsonp url fetch with Dataset API", 46, function() {
=======
test("Basic jsonp url fetch", 53, function() {
var url = "data/alphabet_obj.json?callback=";
var importer = new Miso.Importers.Remote({
url : url,
parser : Miso.Parsers.Obj,
jsonp : true,
extract : function(raw) {
return raw.data;
}
});
stop();
var data = importer.fetch({
success: function(strictData) {
verifyImport({}, strictData);
start();
}
});
});
test("Basic jsonp url fetch with Dataset API", 53, function() {
>>>>>>>
// test("Basic jsonp url fetch", 53, function() {
// var url = "data/alphabet_obj.json?callback=";
// var importer = new Miso.Importers.Remote({
// url : url,
// parser : Miso.Parsers.Obj,
// jsonp : true,
// extract : function(raw) {
// return raw.data;
// }
// });
// stop();
// var data = importer.fetch({
// success: function(strictData) {
// verifyImport({}, strictData);
// start();
// }
// });
// });
test("Basic jsonp url fetch with Dataset API", 46, function() { |
<<<<<<<
test("Time Min Product Non Syncable", 2, function() {
var ds = new Miso.Dataset({
=======
test("Time Min Product Non Syncable", function() {
var ds = new Dataset({
>>>>>>>
test("Time Min Product Non Syncable", 2, function() {
var ds = new Dataset({ |
<<<<<<<
DS.Column = function(options) {
_.extend(this, options);
=======
Miso.Column = function(options) {
>>>>>>>
Miso.Column = function(options) {
// copy over:
// type
// name
// format (for "time" type)
// anyOtherTypeOptions... (optional)
_.extend(this, options);
<<<<<<<
=======
this.name = options.name;
this.type = options.type;
this.typeOptions = options.typeOptions || {};
>>>>>>>
<<<<<<<
return DS.types[this.type].coerce(datum, this);
=======
return Miso.types[this.type].coerce(datum, this.typeOptions);
>>>>>>>
return Miso.types[this.type].coerce(datum, this); |
<<<<<<<
// construct the functionName and functionFileName
const { functionConfig, containerConfig } = input;
const fileExtension = getRuntimeFileExtension(functionConfig.runtime);
const handler = functionConfig.handler;
const functionName = handler.split('.')[1];
=======
// construct the functionPropPath and functionFileName
const fileExtension = getRuntimeFileExtension(input.functionConfig.runtime);
const handler = input.functionConfig.handler;
const functionPropPath = handler.split('.')[1];
>>>>>>>
// construct the functionPropPath and functionFileName
const { functionConfig, containerConfig } = input;
const fileExtension = getRuntimeFileExtension(functionConfig.runtime);
const handler = functionConfig.handler;
const functionPropPath = handler.split('.')[1]; |
<<<<<<<
/** BTC *******************************************************************/
if (!zBTC.address) {
await deployer.deploy(zBTC, "Shifted Bitcoin", "zBTC", 8);
}
const zbtc = await zBTC.at(zBTC.address);
if (!BTCShifter.address) {
await deployer.deploy(
BTCShifter,
zBTC.address,
_feeRecipient,
_mintAuthority,
config.shiftInFee,
config.shiftOutFee,
config.zBTCMinShiftOutAmount,
);
}
const btcShifter = await BTCShifter.at(BTCShifter.address);
if (await zbtc.owner() !== BTCShifter.address) {
await zbtc.transferOwnership(BTCShifter.address);
await btcShifter.claimTokenOwnership();
=======
try {
deployer.logger.log("Attempting to change cycle");
await darknodePayment.changeCycle();
} catch (error) {
deployer.logger.log("Unable to call darknodePayment.changeCycle()");
>>>>>>>
try {
deployer.logger.log("Attempting to change cycle");
await darknodePayment.changeCycle();
} catch (error) {
deployer.logger.log("Unable to call darknodePayment.changeCycle()");
<<<<<<<
zBTCRegistered = (await darknodePayment.registeredTokenIndex(zBTC.address)).toString() !== "0";
}
if (!zBTCRegistered) {
deployer.logger.log(`Registering token zBTC in DarknodePayment`);
await darknodePayment.registerToken(zBTC.address);
}
if ((await registry.getShifterByToken(zBTC.address)) === NULL) {
deployer.logger.log(`Registering BTC shifter`);
await registry.setShifter(zBTC.address, BTCShifter.address);
} else {
deployer.logger.log(`BTC shifter is already registered: ${await registry.getShifterByToken(zBTC.address)}`);
}
/** ZEC *******************************************************************/
if (!zZEC.address) {
await deployer.deploy(zZEC, "Shifted ZCash", "zZEC", 8);
}
const zzec = await zZEC.at(zZEC.address);
if (!ZECShifter.address) {
await deployer.deploy(
ZECShifter,
zZEC.address,
_feeRecipient,
_mintAuthority,
config.shiftInFee,
config.shiftOutFee,
config.zZECMinShiftOutAmount,
);
}
const zecShifter = await ZECShifter.at(ZECShifter.address);
if (await zzec.owner() !== ZECShifter.address) {
await zzec.transferOwnership(ZECShifter.address);
await zecShifter.claimTokenOwnership();
}
// Try to change the payment cycle in case the token is pending registration
let zZECRegistered = (await darknodePayment.registeredTokenIndex(zZEC.address)).toString() !== "0";
if (zBTCRegistered && !zZECRegistered) {
try {
deployer.logger.log("Attempting to change cycle");
await darknodePayment.changeCycle();
} catch (error) {
deployer.logger.log("Unable to call darknodePayment.changeCycle()");
=======
const token = await Token.at(Token.address);
if (!Shifter.address) {
await deployer.deploy(
Shifter,
Token.address,
_feeRecipient,
_mintAuthority,
config.shifterFees,
minShiftOutAmount,
);
>>>>>>>
const token = await Token.at(Token.address);
if (!Shifter.address) {
await deployer.deploy(
Shifter,
Token.address,
_feeRecipient,
_mintAuthority,
config.shiftInFee,
config.shiftOutFee,
minShiftOutAmount,
);
<<<<<<<
if (!zZECRegistered) {
deployer.logger.log(`Registering token zZEC in DarknodePayment`);
await darknodePayment.registerToken(zZEC.address);
}
if ((await registry.getShifterByToken(zZEC.address)) === NULL) {
deployer.logger.log(`Registering ZEC shifter`);
await registry.setShifter(zZEC.address, ZECShifter.address);
} else {
deployer.logger.log(`ZEC shifter is already registered: ${await registry.getShifterByToken(zZEC.address)}`);
}
/** BCH *******************************************************************/
if (!zBCH.address) {
await deployer.deploy(zBCH, "Shifted Bitcoin Cash", "zBCH", 8);
}
const zbch = await zBCH.at(zBCH.address);
if (!BCHShifter.address) {
await deployer.deploy(
BCHShifter,
zBCH.address,
_feeRecipient,
_mintAuthority,
config.shiftInFee,
config.shiftOutFee,
config.zBCHMinShiftOutAmount,
);
}
const bchShifter = await BCHShifter.at(BCHShifter.address);
=======
const shifterAuthority = await tokenShifter.mintAuthority();
if (shifterAuthority.toLowerCase() !== _mintAuthority.toLowerCase()) {
deployer.logger.log(`Updating fee recipient for ${symbol} shifter. Was ${shifterAuthority.toLowerCase()}, now is ${_mintAuthority.toLowerCase()}`);
deployer.logger.log(`Updating mint authority in ${symbol} shifter`);
await tokenShifter.updateMintAuthority(_mintAuthority);
}
>>>>>>>
const shifterAuthority = await tokenShifter.mintAuthority();
if (shifterAuthority.toLowerCase() !== _mintAuthority.toLowerCase()) {
deployer.logger.log(`Updating fee recipient for ${symbol} shifter. Was ${shifterAuthority.toLowerCase()}, now is ${_mintAuthority.toLowerCase()}`);
deployer.logger.log(`Updating mint authority in ${symbol} shifter`);
await tokenShifter.updateMintAuthority(_mintAuthority);
} |
<<<<<<<
var _ = require('lodash');
=======
>>>>>>>
<<<<<<<
var emitter = new EventEmitter();
_.extend(this, _.defaults(options, {
handlers: {},
waitFor: waitFor,
setState: setState,
getState: getState,
initialize: initialize,
hasChanged: hasChanged,
handlePayload: handlePayload,
getInitialState: getInitialState,
addChangeListener: addChangeListener,
removeChangeListener: removeChangeListener
}));
this.dispatchToken = options.dispatcher.register(_.bind(this.handlePayload, this));
this.initialize.apply(this, arguments);
=======
var defaultState = {};
var emitter = new EventEmitter();
this.handlers = {};
this.waitFor = waitFor;
this.setState = setState;
this.getState = getState;
this.hasChanged = hasChanged;
this.handleAction = handleAction;
this.getInitialState = getInitialState;
this.addChangeListener = addChangeListener;
_.extend(this, options);
this.dispatchToken = options.dispatcher.register(_.bind(this.handleAction, this));
>>>>>>>
var defaultState = {};
var emitter = new EventEmitter();
this.handlers = {};
this.waitFor = waitFor;
this.setState = setState;
this.getState = getState;
this.hasChanged = hasChanged;
this.handleAction = handleAction;
this.getInitialState = getInitialState;
this.addChangeListener = addChangeListener;
_.extend(this, options);
this.dispatchToken = options.dispatcher.register(_.bind(this.handleAction, this));
<<<<<<<
Object.defineProperty(this, 'state', {
get: function () {
return state;
},
set: function (value) {
this.setState(value);
}
});
=======
if (_.isNull(state) || _.isUndefined(state)) {
state = defaultState;
}
if (Object.defineProperty) {
Object.defineProperty(this, 'state', {
get: function () {
return getState();
},
set: function (value) {
this.setState(value);
}
});
} else {
this.state = state;
}
>>>>>>>
if (_.isNull(state) || _.isUndefined(state)) {
state = defaultState;
}
Object.defineProperty(this, 'state', {
get: function () {
return getState();
},
set: function (value) {
this.setState(value);
}
}); |
<<<<<<<
version: '0.6.0'
=======
version: '0.6.4',
getAction: getAction,
Diagnostics: Diagnostics,
ActionPayload: ActionPayload,
Dispatcher: Dispatcher.getCurrent(),
Stores: {
Actions: ActionStore
}
>>>>>>>
version: '0.6.4', |
<<<<<<<
function createInstance() {
return _.extend(new EventEmitter(), {
dispose: dispose,
version: '0.8.10',
Diagnostics: Diagnostics,
container: new Container(),
renderToString: renderToString,
createInstance: createInstance
}, state, create);
}
=======
var Marty = _.extend({
version: '0.8.12',
Diagnostics: Diagnostics,
Dispatcher: Dispatcher.getCurrent()
}, state, create);
>>>>>>>
function createInstance() {
return _.extend(new EventEmitter(), {
dispose: dispose,
version: '0.8.12',
Diagnostics: Diagnostics,
container: new Container(),
renderToString: renderToString,
createInstance: createInstance
}, state, create);
} |
<<<<<<<
require('es6-promise').polyfill();
describe('HttpAPI', function () {
this.timeout(10000);
=======
describe('HttpAPIRepository', function () {
>>>>>>>
require('es6-promise').polyfill();
describe('HttpAPIRepository', function () {
this.timeout(10000); |
<<<<<<<
import barChartStory from './BarChart.story';
import ScatterPlotStory from './ScatterPlot.story';
=======
import horizontalBarChartStory from './HorizontalBarChart.story';
>>>>>>>
import ScatterPlotStory from './ScatterPlot.story';
import horizontalBarChartStory from './HorizontalBarChart.story';
<<<<<<<
barChartStory();
ScatterPlotStory();
=======
horizontalBarChartStory();
>>>>>>>
horizontalBarChartStory();
ScatterPlotStory(); |
<<<<<<<
"./src/microbit/*.*",
"./src/microbit/!(test)/**/*",
"./src/clue/*.*",
"./src/clue/!(test)/**/*",
=======
"./src/micropython/*.*",
"./src/micropython/microbit/*.*",
"./src/micropython/microbit/!(test)/**/*",
>>>>>>>
"./src/clue/*.*",
"./src/clue/!(test)/**/*",
"./src/micropython/*.*",
"./src/micropython/microbit/*.*",
"./src/micropython/microbit/!(test)/**/*", |
<<<<<<<
this.token = await StdDaoToken.new("StdToken","STDT",18, true, false, ETH);
await this.token.mint(web3.eth.accounts[1], 1000, {from: web3.eth.accounts[1]}).should.be.rejectedWith('revert');
=======
this.token = await StdDaoToken.new("StdToken","STDT",18, true, false, false, ETH);
await this.token.mintFor(web3.eth.accounts[1], 1000, {from: web3.eth.accounts[1]}).should.be.rejectedWith('revert');
>>>>>>>
this.token = await StdDaoToken.new("StdToken","STDT",18, true, false, ETH);
await this.token.mintFor(web3.eth.accounts[1], 1000, {from: web3.eth.accounts[1]}).should.be.rejectedWith('revert');
<<<<<<<
this.token = await StdDaoToken.new("StdToken","STDT",18, false, false, ETH);
await this.token.mint(web3.eth.accounts[1], 1000);
=======
this.token = await StdDaoToken.new("StdToken","STDT",18, false, false, false, ETH);
await this.token.mintFor(web3.eth.accounts[1], 1000).should.be.rejectedWith('revert');
>>>>>>>
this.token = await StdDaoToken.new("StdToken","STDT",18, false, false, ETH);
await this.token.mintFor(web3.eth.accounts[1], 1000);
<<<<<<<
this.token = await StdDaoToken.new("StdToken","STDT",18, true, false, 100);
await this.token.mint(web3.eth.accounts[1], 1000).should.be.rejectedWith('revert');
});
it('should fail due to finishMinting() not owner call', async function () {
this.token = await StdDaoToken.new("StdToken","STDT",18, true, false, 100);
await this.token.finishMinting({from: web3.eth.accounts[1]}).should.be.rejectedWith('revert');
});
it('should fail due to finishMinting() call', async function () {
this.token = await StdDaoToken.new("StdToken","STDT",18, true, false, 100);
await this.token.finishMinting();
await this.token.mint(web3.eth.accounts[1], 1000).should.be.rejectedWith('revert');
=======
this.token = await StdDaoToken.new("StdToken","STDT",18, true, false, false, 100);
await this.token.mintFor(web3.eth.accounts[1], 1000).should.be.rejectedWith('revert');
>>>>>>>
this.token = await StdDaoToken.new("StdToken","STDT",18, true, false, 100);
await this.token.mintFor(web3.eth.accounts[1], 1000).should.be.rejectedWith('revert');
});
it('should fail due to finishMinting() not owner call', async function () {
this.token = await StdDaoToken.new("StdToken","STDT",18, true, false, 100);
await this.token.finishMinting({from: web3.eth.accounts[1]}).should.be.rejectedWith('revert');
});
it('should fail due to finishMinting() call', async function () {
this.token = await StdDaoToken.new("StdToken","STDT",18, true, false, 100);
await this.token.finishMinting();
await this.token.mintFor(web3.eth.accounts[1], 1000).should.be.rejectedWith('revert');
<<<<<<<
this.token = await StdDaoToken.new("StdToken","STDT",18, true, false, ETH);
await this.token.mint(web3.eth.accounts[0], 1000);
=======
this.token = await StdDaoToken.new("StdToken","STDT",18, true, false, false, ETH);
await this.token.mintFor(web3.eth.accounts[0], 1000).should.be.fulfilled;
>>>>>>>
this.token = await StdDaoToken.new("StdToken","STDT",18, true, false, ETH);
await this.token.mintFor(web3.eth.accounts[0], 1000);
<<<<<<<
this.token = await StdDaoToken.new("StdToken","STDT",18, true, false, ETH);
await this.token.burn(web3.eth.accounts[1], 1000, {from: web3.eth.accounts[1]}).should.be.rejectedWith('revert');
=======
this.token = await StdDaoToken.new("StdToken","STDT",18, false, true, false, ETH);
await this.token.burnFor(web3.eth.accounts[1], 1000, {from: web3.eth.accounts[1]}).should.be.rejectedWith('revert');
>>>>>>>
this.token = await StdDaoToken.new("StdToken","STDT",18, true, false, ETH);
await this.token.burnFor(web3.eth.accounts[1], 1000, {from: web3.eth.accounts[1]}).should.be.rejectedWith('revert');
<<<<<<<
this.token = await StdDaoToken.new("StdToken","STDT",18, false, false, ETH);
await this.token.burn(web3.eth.accounts[0], 1000).should.be.rejectedWith('revert');
=======
this.token = await StdDaoToken.new("StdToken","STDT",18, false, false, false, ETH);
await this.token.burnFor(web3.eth.accounts[0], 1000).should.be.rejectedWith('revert');
>>>>>>>
this.token = await StdDaoToken.new("StdToken","STDT",18, false, false, ETH);
await this.token.burnFor(web3.eth.accounts[0], 1000).should.be.rejectedWith('revert');
<<<<<<<
this.token = await StdDaoToken.new("StdToken","STDT",18, false, true, ETH);
await this.token.pause();
await this.token.mint(web3.eth.accounts[0], 1000);
=======
this.token = await StdDaoToken.new("StdToken","STDT",18, true, false, true, ETH);
await this.token.pause().should.be.fulfilled;
await this.token.mintFor(web3.eth.accounts[0], 1000).should.be.fulfilled;
>>>>>>>
this.token = await StdDaoToken.new("StdToken","STDT",18, false, true, ETH);
await this.token.pause();
await this.token.mintFor(web3.eth.accounts[0], 1000); |
<<<<<<<
token = await StdDaoToken.new("StdToken","STDT",18, true, true, 1000000000);
await token.mint(creator, 1000);
=======
token = await StdDaoToken.new("StdToken","STDT",18, true, true, true, 1000000000);
await token.mintFor(creator, 1000);
>>>>>>>
token = await StdDaoToken.new("StdToken","STDT",18, true, true, 1000000000);
await token.mintFor(creator, 1000); |
<<<<<<<
formResponseMngr.loadResponseData({});
refreshHexOverLay();
=======
fields = getBootstrapFields();
formResponseMngr.loadResponseData({}, 0, null, fields)
>>>>>>>
fields = getBootstrapFields();
formResponseMngr.loadResponseData({}, 0, null, fields)
formResponseMngr.loadResponseData({});
refreshHexOverLay();
<<<<<<<
function loadFormJSONCallback()
{
var idx;
// get geoJSON data to setup points - relies on questions having been parsed so has to be in/after the callback
var geoJSON = formResponseMngr.getAsGeoJSON();
_rebuildMarkerLayer(geoJSON);
// just to make sure the nav container exists
var navContainer = $(navContainerSelector);
if(navContainer.length == 1)
{
// check if we have select one questions
if(formJSONMngr.getNumSelectOneQuestions() > 0)
{
var dropdownLabel = _createElementAndSetAttrs('li');
var dropdownLink = _createElementAndSetAttrs('a', {"href": "#"}, "View By");
dropdownLabel.appendChild(dropdownLink);
navContainer.append(dropdownLabel);
var dropDownContainer = _createElementAndSetAttrs('li', {"class":"dropdown"});
var dropdownCaretLink = _createElementAndSetAttrs('a', {"href":"#", "class":"dropdown-toggle",
"data-toggle":"dropdown"});
var dropdownCaret = _createElementAndSetAttrs('b', {"class":"caret"});
dropdownCaretLink.appendChild(dropdownCaret);
dropDownContainer.appendChild(dropdownCaretLink);
var questionUlContainer = _createElementAndSetAttrs("ul", {"class":"dropdown-menu"});
// create an "All" link to reset the map
var questionLi = _createSelectOneLi({"name":"", "label":"None"});
questionUlContainer.appendChild(questionLi);
// create links for select one questions
selectOneQuestions = this.getSelectOneQuestions();
for(idx in selectOneQuestions)
{
var question = selectOneQuestions[idx];
questionLi = _createSelectOneLi(question);
questionUlContainer.appendChild(questionLi);
}
dropDownContainer.appendChild(questionUlContainer);
navContainer.append(dropDownContainer);
/*$('.select-one-anchor').click(function(){
// rel contains the question's unique name
var questionName = $(this).attr("rel");
viewByChanged(questionName);
})*/
}
}
else
throw "Container '" + navContainerSelector + "' not found";
// Bind a callback that executes when document.location.hash changes.
$(window).bind( "hashchange", function(e) {
var hash = e.fragment;
viewByChanged(hash);
});
// Since the event is only triggered when the hash changes, we need
// to trigger the event now, to handle the hash the page may have
// loaded with.
$(window).trigger( "hashchange" );
}
=======
>>>>>>>
function loadFormJSONCallback()
{
var idx;
// get geoJSON data to setup points - relies on questions having been parsed so has to be in/after the callback
var geoJSON = formResponseMngr.getAsGeoJSON();
_rebuildMarkerLayer(geoJSON);
// just to make sure the nav container exists
var navContainer = $(navContainerSelector);
if(navContainer.length == 1)
{
// check if we have select one questions
if(formJSONMngr.getNumSelectOneQuestions() > 0)
{
var dropdownLabel = _createElementAndSetAttrs('li');
var dropdownLink = _createElementAndSetAttrs('a', {"href": "#"}, "View By");
dropdownLabel.appendChild(dropdownLink);
navContainer.append(dropdownLabel);
var dropDownContainer = _createElementAndSetAttrs('li', {"class":"dropdown"});
var dropdownCaretLink = _createElementAndSetAttrs('a', {"href":"#", "class":"dropdown-toggle",
"data-toggle":"dropdown"});
var dropdownCaret = _createElementAndSetAttrs('b', {"class":"caret"});
dropdownCaretLink.appendChild(dropdownCaret);
dropDownContainer.appendChild(dropdownCaretLink);
var questionUlContainer = _createElementAndSetAttrs("ul", {"class":"dropdown-menu"});
// create an "All" link to reset the map
var questionLi = _createSelectOneLi({"name":"", "label":"None"});
questionUlContainer.appendChild(questionLi);
// create links for select one questions
selectOneQuestions = this.getSelectOneQuestions();
for(idx in selectOneQuestions)
{
var question = selectOneQuestions[idx];
questionLi = _createSelectOneLi(question);
questionUlContainer.appendChild(questionLi);
}
dropDownContainer.appendChild(questionUlContainer);
navContainer.append(dropDownContainer);
/*$('.select-one-anchor').click(function(){
// rel contains the question's unique name
var questionName = $(this).attr("rel");
viewByChanged(questionName);
})*/
}
}
else
throw "Container '" + navContainerSelector + "' not found";
// Bind a callback that executes when document.location.hash changes.
$(window).bind( "hashchange", function(e) {
var hash = e.fragment;
viewByChanged(hash);
});
// Since the event is only triggered when the hash changes, we need
// to trigger the event now, to handle the hash the page may have
// loaded with.
$(window).trigger( "hashchange" );
} |
<<<<<<<
.css({
height: 110,
width: 1000
});
if(hasClickAction(column, 'piechart_truefalse')) {
=======
.css({'height':110});
if(hasClickAction(column, 'piechart_true') || hasClickAction(column, 'piechart_false')) {
>>>>>>>
.css({
height: 110,
width: 1000
});
if(hasClickAction(column, 'piechart_true') || hasClickAction(column, 'piechart_false')) { |
<<<<<<<
const { pinLength, showInputs, inputTextStyle, keyboardViewStyle, keyboardViewTextStyle, inputViewStyle, buttonTextColor, returnType, buttonBgColor, inputBgColor, onComplete, disabled, inputActiveBgColor, inputBgOpacity, deleteText, onPress, keyboardContainerStyle, buttonDeletePosition, buttonDeleteStyle } = this.props;
=======
const {pinLength, showInputs, inputTextStyle, keyboardViewStyle, keyboardViewTextStyle, inputViewStyle, buttonTextColor, returnType, buttonBgColor, inputBgColor, onComplete, disabled, inputActiveBgColor, inputBgOpacity, deleteText, keyboardContainerStyle, onPress} = this.props;
>>>>>>>
const {pinLength, showInputs, inputTextStyle, keyboardViewStyle, keyboardViewTextStyle, inputViewStyle, buttonTextColor, returnType, buttonBgColor, inputBgColor, onComplete, disabled, inputActiveBgColor, inputBgOpacity, deleteText, keyboardContainerStyle, onPress, buttonDeletePosition, buttonDeleteStyle} = this.props;
<<<<<<<
onPress: undefined,
buttonDeletePosition: "left",
buttonDeleteStyle: StyleSheet.create({}),
=======
onPress : undefined,
>>>>>>>
onPress: undefined,
buttonDeletePosition: "left",
buttonDeleteStyle: StyleSheet.create({}),
<<<<<<<
onPress: PropTypes.func,
buttonDeletePosition: PropTypes.string,
buttonDeleteStyle: PropTypes.object,
=======
inputViewStyle : PropTypes.object,
keyboardViewStyle : PropTypes.object,
onPress : PropTypes.func,
>>>>>>>
onPress: PropTypes.func,
buttonDeletePosition: PropTypes.string,
buttonDeleteStyle: PropTypes.object,
onPress : PropTypes.func, |
<<<<<<<
import React from 'react';
import { DemoJSONLoader } from '../src';
import { storiesOf } from '@storybook/react';
import { withKnobs, boolean } from '@storybook/addon-knobs';
import { checkA11y } from '@storybook/addon-a11y';
import { css } from 'emotion';
import { BaseMap } from '../src';
import { CivicSandboxMap } from '../src';
import { CivicSandboxDashboard } from '../src';
import { wallOfText } from './shared';
=======
import React from "react";
import * as d3 from "d3";
import { storiesOf } from "@storybook/react";
import { withKnobs, boolean } from "@storybook/addon-knobs";
import { checkA11y } from "@storybook/addon-a11y";
import { css } from "emotion";
import { BaseMap } from "../src";
import { CivicSandboxMap } from "../src";
import { CivicSandboxDashboard } from "../src";
import { wallOfText } from "./shared";
>>>>>>>
import React from "react";
import { storiesOf } from "@storybook/react";
import { withKnobs, boolean } from "@storybook/addon-knobs";
import { checkA11y } from "@storybook/addon-a11y";
import { css } from "emotion";
import { BaseMap } from "../src";
import { CivicSandboxMap } from "../src";
import { CivicSandboxDashboard } from "../src";
import { wallOfText } from "./shared";
import { DemoJSONLoader } from "../src";
<<<<<<<
=======
class LoadData extends React.Component {
constructor(props) {
super(props);
this.state = {
foundation1: null,
slide1: null,
error: null
};
}
componentDidMount() {
const cmp = this;
d3.queue()
.defer(d3.json, this.props.urls[0])
.defer(d3.json, this.props.urls[1])
.await((error, foundation1, slide1) => {
if (error) {
cmp.setState({ error });
}
cmp.setState({ foundation1, slide1 });
});
}
render() {
if (this.state.foundation1 === null) {
return null;
}
const { foundation1, slide1 } = this.state;
return this.props.children(foundation1, slide1);
}
}
>>>>>>>
<<<<<<<
'https://service.civicpdx.org/neighborhood-development/sandbox/foundations/population/?format=json',
'https://service.civicpdx.org/neighborhood-development/sandbox/slides/retailgrocers/?format=json',
=======
"https://gist.githubusercontent.com/mendozaline/f78b076ce13a9fd484f6b8a004065a95/raw/ff8bd893ba1890a6f6c20265f720587f9595a9c4/pop.json",
"https://gist.githubusercontent.com/mendozaline/b3a75b40c9a60781b6adc77cebb9b400/raw/fa0aa13c75bfcc2fd92ccf1f3cc612af83d5d704/010-grocery.json"
>>>>>>>
"https://service.civicpdx.org/neighborhood-development/sandbox/foundations/population/?format=json",
"https://service.civicpdx.org/neighborhood-development/sandbox/slides/retailgrocers/?format=json",
<<<<<<<
=======
const mapboxToken =
"pk.eyJ1IjoidGhlbWVuZG96YWxpbmUiLCJhIjoiY2o1aXdoem1vMWtpNDJ3bnpqaGF1bnlhNSJ9.sjTrNKLW9daDBIGvP3_W0w";
const mapboxStyle = "mapbox://styles/hackoregon/cjiazbo185eib2srytwzleplg";
>>>>>>>
<<<<<<<
=======
updateTriggers: { getFillColor: populationGetColor }
>>>>>>>
<<<<<<<
mapType: 'PolygonPlotMap',
id: 'boundary-layer-grocery',
data: groceryData.slide_meta.boundary,
=======
mapType: "PolygonPlotMap",
id: "boundary-layer-grocery",
data: slideData1.slide_meta.boundary,
>>>>>>>
mapType: "PolygonPlotMap",
id: "boundary-layer-grocery",
data: groceryData.slide_meta.boundary,
<<<<<<<
=======
const legendData = {
visualizationType: "Legend",
title: "Map Legend",
min: 2500,
max: 32000,
colors: [
"rgba(247,244,249,1.0)",
"rgba(231,225,239,1.0)",
"rgba(212,185,218,1.0)",
"rgba(201,148,199,1.0)",
"rgba(223,101,176,1.0)",
"rgba(231,41,138,1.0)",
"rgba(206,18,86,1.0)",
"rgba(152,0,67,1.0)",
"rgba(103,0,31,1.0)"
]
};
>>>>>>>
<<<<<<<
const textVisible = boolean('Text:', true);
const comarpisonBarsVisible = boolean('Comparison Bars:', true);
const donutVisible = boolean('Percent Donut:', true);
=======
const legnendVisible = boolean("Legend:", true);
const textVisible = boolean("Text:", true);
const comarpisonBarsVisible = boolean("Comparison Bars:", true);
const donutVisible = boolean("Percent Donut:", true);
>>>>>>>
const textVisible = boolean("Text:", true);
const comarpisonBarsVisible = boolean("Comparison Bars:", true);
const donutVisible = boolean("Percent Donut:", true);
<<<<<<<
=======
data: legendData,
visible: legnendVisible
},
{
>>>>>>>
<<<<<<<
<div style={{ margin: '0 2%' }}>
=======
<div style={{ margin: "0 4%" }}>
>>>>>>>
<div style={{ margin: "0 2%" }}> |
<<<<<<<
// Boosted mod
let $active = $(container).find('> .active')
$active.find('[data-toggle=tab], [data-toggle=pill]').attr({
tabIndex : '-1',
'aria-selected' : false
})
$active.filter('.tab-pane').attr({
'aria-hidden' : true,
tabIndex : '-1'
})
// end mod
=======
>>>>>>>
<<<<<<<
// Boosted mod
$(element).filter('.nav-link.active').attr({
tabIndex : '0',
'aria-selected' : true
})
$(element).filter('.tab-pane.active').attr({
'aria-hidden' : false,
tabIndex : '0'
})
// end mod
=======
>>>>>>>
'aria-selected' : true
})
$(element).filter('.tab-pane.active').attr({
'aria-hidden' : false,
tabIndex : '0'
}) |
<<<<<<<
if (command["commandType"] == "notUndoable" || command['historyType'] == "normal") {
historyLabelDiv = $("<div>")
.text(title);
}
=======
>>>>>>>
<<<<<<<
.append(historyLabelDiv)
.append($("<div>")
.addClass("iconDiv")
.bind('click', clickUndoButton)
)
.hover(
// hover in function
commandDivHoverIn,
// hover out function
commandDivHoverOut);
if (command["commandType"] == "notUndoable" || command['historyType'] == "normal")
$("div.iconDiv", commandDiv).remove();
if (command.historyType == "redo") {
$(commandDiv).addClass("redo-state");
$("div.iconDiv", commandDiv).append($("<img>").attr("src", "images/edit_redo.png")).qtip({
content: {
text: 'Redo'
},
style: {
classes: 'ui-tooltip-light ui-tooltip-shadow'
}
});
} else if (command.historyType == "undo" || command.historyType == "optimized") {
$(commandDiv).addClass("undo-state");
$("div.iconDiv", commandDiv).append($("<img>").attr("src", "images/edit_undo.png")).qtip({
content: {
text: 'Undo'
},
style: {
classes: 'ui-tooltip-light ui-tooltip-shadow'
}
});;
}
=======
.append(historyLabelDiv).addClass("undo-state");
>>>>>>>
.append(historyLabelDiv).addClass("undo-state");
if (command.historyType == "undo" || command.historyType == "optimized") {
commandDiv.addClass("lastRun");
}
if (command.historyType == "redo") {
commandDiv.append($("<div>").addClass("iconDiv").bind('click', clickUndoButton));
$("div.iconDiv", commandDiv).append($("<img>").attr("src", "images/edit_redo.png")).qtip({
content: {
text: 'Redo'
},
style: {
classes: 'ui-tooltip-light ui-tooltip-shadow'
}
});
} else if ((command.historyType == "undo" || command.historyType == "optimized") && command.commandType != "notUndoable") {
commandDiv.append($("<div>").addClass("iconDiv").bind('click', clickUndoButton));
$("div.iconDiv", commandDiv).append($("<img>").attr("src", "images/edit_undo.png")).qtip({
content: {
text: 'Undo'
},
style: {
classes: 'ui-tooltip-light ui-tooltip-shadow'
}
});;
} |
<<<<<<<
function publishRDFFunction() {
$("div#PublishRDFDialogBox").dialog("close");
var info = new Object();
info["worksheetId"] = $("div#WorksheetOptionsDiv").data("worksheetId");
info["workspaceId"] = $.workspaceGlobalInformation.id;
info["command"] = "PublishRDFCommand";
info["addInverseProperties"] = $("input#addInverseProperties").is(":checked");
info["rdfPrefix"] = $("input#rdfPrefix").val();
info["rdfNamespace"] = $("input#rdfNamespace").val();
info["saveToStore"] = $("input#saveToStore").is(":checked");
info["hostName"] = $("input#hostName").val();
info["dbName"] = $("input#dbName").val();
info["userName"] = $("input#userName").val();
info["password"] = $("input#password").val();
info["modelName"] = $("input#modelName").val();
info["tripleStoreUrl"] = $("input#rdfSPAQRLEndPoint").val();
info["graphUri"] = $("input#rdfSPAQRLGraph").val();
info["replaceContext"] = $('#modelGraphList').val();
if( $("input#saveToRDFStore").is(":checked")) {
publishRDFToStore(info);
=======
function testSparqlEndPoint(url) {
var info = new Object();
info["vWorksheetId"] = $("div#WorksheetOptionsDiv").data("worksheetId");
info["workspaceId"] = $.workspaceGlobalInformation.id;
info["command"] = "TestSPARQLEndPointCommand";
info["tripleStoreUrl"] = url;
window.conncetionStat = false;
var returned = $.ajax({
url: "RequestController",
type: "POST",
data : info,
dataType : "json",
async : false,
complete :
function (xhr, textStatus) {
var json = $.parseJSON(xhr.responseText);
if(json['elements'] && json['elements'][0]['connectionStatus'] && json['elements'][0]['connectionStatus'] == 1) {
window.conncetionStat = true;
}
},
error :
function (xhr, textStatus) {
alert("Error occured while testing connection to sparql endpoint!" + textStatus);
}
});
return window.conncetionStat;
}
function validateAndPublishRDF() {
var expression = /(^|\s)((https?:\/\/)?[\w-]+(\.[\w-]+)+\.?(:\d+)?(\/\S*)?)/gi;
// /[-a-zA-Z0-9@:%_\+.~#?&//=]{2,256}\.[a-z]{2,4}\b(\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?/gi;
var regex = new RegExp(expression);
var graphUri = "";
var needsValidation = false;
if($('#modelGraphList').val() == "create_new_context") {
graphUri = $("input#rdfSPAQRLGraph").val();
needsValidation = true;
} else {
graphUri = $('#modelGraphList').val();
}
// validate the sparql endpoint
if(!testSparqlEndPoint($("input#rdfSPAQRLEndPoint").val())) {
alert("Invalid sparql end point. Could not establish connection.");
return;
}
// validate the graph uri
if(needsValidation) {
if(graphUri.length < 3) {
alert("Context field is empty");
return;
}
if(!graphUri.match(regex) ) {
alert("Invalid Url format for context");
return;
}
var newUri = getUniqueGraphUri(graphUri);
if(graphUri != newUri) {
var rdfDialogBox = $("div#confirmPublishRDFDialogBox");
rdfDialogBox.find('span').html('The context you provided already exists. <br /> You can either publish to the same \
context or use the one that is suggested below. <br /> ' + newUri);
rdfDialogBox.dialog({ title:'Confirmation', width: 700 , buttons: {
"Use Old": function() { publishRDFFunction(graphUri) },
"Use New": function() { publishRDFFunction(newUri) },
"Cancel": function() { $(this).dialog("close"); }
}});
>>>>>>>
function testSparqlEndPoint(url) {
var info = new Object();
info["worksheetId"] = $("div#WorksheetOptionsDiv").data("worksheetId");
info["workspaceId"] = $.workspaceGlobalInformation.id;
info["command"] = "TestSPARQLEndPointCommand";
info["tripleStoreUrl"] = url;
window.conncetionStat = false;
var returned = $.ajax({
url: "RequestController",
type: "POST",
data : info,
dataType : "json",
async : false,
complete :
function (xhr, textStatus) {
var json = $.parseJSON(xhr.responseText);
if(json['elements'] && json['elements'][0]['connectionStatus'] && json['elements'][0]['connectionStatus'] == 1) {
window.conncetionStat = true;
}
},
error :
function (xhr, textStatus) {
alert("Error occured while testing connection to sparql endpoint!" + textStatus);
}
});
return window.conncetionStat;
}
function validateAndPublishRDF() {
var expression = /(^|\s)((https?:\/\/)?[\w-]+(\.[\w-]+)+\.?(:\d+)?(\/\S*)?)/gi;
// /[-a-zA-Z0-9@:%_\+.~#?&//=]{2,256}\.[a-z]{2,4}\b(\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?/gi;
var regex = new RegExp(expression);
var graphUri = "";
var needsValidation = false;
if($('#modelGraphList').val() == "create_new_context") {
graphUri = $("input#rdfSPAQRLGraph").val();
needsValidation = true;
} else {
graphUri = $('#modelGraphList').val();
}
// validate the sparql endpoint
if(!testSparqlEndPoint($("input#rdfSPAQRLEndPoint").val())) {
alert("Invalid sparql end point. Could not establish connection.");
return;
}
// validate the graph uri
if(needsValidation) {
if(graphUri.length < 3) {
alert("Context field is empty");
return;
}
if(!graphUri.match(regex) ) {
alert("Invalid Url format for context");
return;
}
var newUri = getUniqueGraphUri(graphUri);
if(graphUri != newUri) {
var rdfDialogBox = $("div#confirmPublishRDFDialogBox");
rdfDialogBox.find('span').html('The context you provided already exists. <br /> You can either publish to the same \
context or use the one that is suggested below. <br /> ' + newUri);
rdfDialogBox.dialog({ title:'Confirmation', width: 700 , buttons: {
"Use Old": function() { publishRDFFunction(graphUri) },
"Use New": function() { publishRDFFunction(newUri) },
"Cancel": function() { $(this).dialog("close"); }
}}); |
<<<<<<<
var options = [
{name:"View model using straight lines", func:viewStraightLineModel, showCheckbox:true, defaultChecked:true, initFunc:initStrightLineModel},
{name:"Organize Columns", func:organizeColumns},
{name:"divider"},
{name: "Suggest Model", func:undefined, addLevel:true, levels: [
{name:"Using Current Ontology" , func:showModel},
{name:"Generate New Ontology", func:showAutoModel},
]},
{name:"Set Properties", func:setProperties},
{name:"Apply R2RML Model", func: undefined, addLevel:true, levels: [
{name:"From File" , func:applyR2RMLModel, useFileUpload:true, uploadDiv:"applyWorksheetHistory"},
{name:"From Repository" , func:applyModel}
]},
{name:"Add Node", func:addNode},
{name:"Add Liternal Node", func:addLiteralNode},
{name:"divider"},
{name: "Publish", func:undefined, addLevel:true, levels: [
{name:"RDF" , func:publishRDF},
{name:"Model" , func:publishModel},
{name:"Service Model", func:publishServiceModel},
{name:"Report", func:publishReport},
{name:"JSON", func:saveAsJson},
]},
{name: "Export", func:undefined, addLevel:true, levels:[
{name:"To CSV", func:exportToCSV},
{name:"To Database", func:exportToDatabase},
{name:"To MDB", func:exportToMDB},
{name:"To SpatialData", func:exportToSpatial},
]},
{name:"divider"},
{name:"Populate Source", func:populateSource},
{name:"Invoke Service", func:invokeService},
{name:"divider"},
{name:"Fold" , func:Fold},
{name:"GroupBy" , func:GroupBy},
{name:"Glue Columns" , func:Glue},
{name:"Delete", func:deleteWorksheet}
=======
var options = [{
name: "View model using straight lines",
func: viewStraightLineModel,
showCheckbox: true,
defaultChecked: true,
initFunc: initStrightLineModel
}, {
name: "Organize Columns",
func: organizeColumns
}, {
name: "divider"
},
{
name: "Suggest Model",
func: undefined,
addLevel: true,
levels: [{
name: "Using Current Ontology",
func: showModel
}, {
name: "Generate New Ontology",
func: showAutoModel
}, ]
},
{
name: "Set Properties",
func: setProperties
},
{
name: "Apply R2RML Model",
func: undefined,
addLevel: true,
levels: [{
name: "From File",
func: applyR2RMLModel,
useFileUpload: true,
uploadDiv: "applyWorksheetHistory"
}, {
name: "From Repository",
func: applyModel
}]
}, {
name: "Add Node",
func: addNode
}, {
name: "divider"
},
{
name: "Publish",
func: undefined,
addLevel: true,
levels: [{
name: "RDF",
func: publishRDF
}, {
name: "Model",
func: publishModel
}, {
name: "Service Model",
func: publishServiceModel
}, {
name: "Report",
func: publishReport
}, {
name: "JSON",
func: saveAsJson
}, ]
}, {
name: "Export",
func: undefined,
addLevel: true,
levels: [{
name: "To CSV",
func: exportToCSV
}, {
name: "To Database",
func: exportToDatabase
}, {
name: "To MDB",
func: exportToMDB
}, {
name: "To SpatialData",
func: exportToSpatial
}, ]
}, {
name: "divider"
},
{
name: "Populate Source",
func: populateSource
}, {
name: "Invoke Service",
func: invokeService
}, {
name: "divider"
},
{
name: "Fold",
func: Fold
}, {
name: "GroupBy",
func: GroupBy
}, {
name: "Glue Columns",
func: Glue
}, {
name: "Delete",
func: deleteWorksheet
}, {
name: "divider"
}, {
name: "Selection",
func: undefined,
addLevel: true,
levels: [{
name: "Add Rows",
func: addRows
}, {
name: "Intersect Rows",
func: intersectRows
}, {
name: "Subtract Rows",
func: subtractRows
}, {
name: "Invert",
func: invertRows
}, {
name: "Clear",
func: undefined,
addLevel: true,
levels: [{
name: "In All Nested Tables",
func: clearAll
}, {
name: "In This Column",
func: clearThis
}]
}]
}
>>>>>>>
var options = [{
name: "View model using straight lines",
func: viewStraightLineModel,
showCheckbox: true,
defaultChecked: true,
initFunc: initStrightLineModel
}, {
name: "Organize Columns",
func: organizeColumns
}, {
name: "divider"
},
{
name: "Suggest Model",
func: undefined,
addLevel: true,
levels: [{
name: "Using Current Ontology",
func: showModel
}, {
name: "Generate New Ontology",
func: showAutoModel
}, ]
},
{
name: "Set Properties",
func: setProperties
},
{
name: "Apply R2RML Model",
func: undefined,
addLevel: true,
levels: [{
name: "From File",
func: applyR2RMLModel,
useFileUpload: true,
uploadDiv: "applyWorksheetHistory"
}, {
name: "From Repository",
func: applyModel
}]
}, {
name: "Add Node",
func: addNode
}, {
name:"Add Liternal Node",
func:addLiteralNode
}, {
name: "divider"
},
{
name: "Publish",
func: undefined,
addLevel: true,
levels: [{
name: "RDF",
func: publishRDF
}, {
name: "Model",
func: publishModel
}, {
name: "Service Model",
func: publishServiceModel
}, {
name: "Report",
func: publishReport
}, {
name: "JSON",
func: saveAsJson
}, ]
}, {
name: "Export",
func: undefined,
addLevel: true,
levels: [{
name: "To CSV",
func: exportToCSV
}, {
name: "To Database",
func: exportToDatabase
}, {
name: "To MDB",
func: exportToMDB
}, {
name: "To SpatialData",
func: exportToSpatial
}, ]
}, {
name: "divider"
},
{
name: "Populate Source",
func: populateSource
}, {
name: "Invoke Service",
func: invokeService
}, {
name: "divider"
},
{
name: "Fold",
func: Fold
}, {
name: "GroupBy",
func: GroupBy
}, {
name: "Glue Columns",
func: Glue
}, {
name: "Delete",
func: deleteWorksheet
}, {
name: "divider"
}, {
name: "Selection",
func: undefined,
addLevel: true,
levels: [{
name: "Add Rows",
func: addRows
}, {
name: "Intersect Rows",
func: intersectRows
}, {
name: "Subtract Rows",
func: subtractRows
}, {
name: "Invert",
func: invertRows
}, {
name: "Clear",
func: undefined,
addLevel: true,
levels: [{
name: "In All Nested Tables",
func: clearAll
}, {
name: "In This Column",
func: clearThis
}]
}]
}
<<<<<<<
=======
>>>>>>>
<<<<<<<
function addLiteralNode() {
console.log("Add Literal Node");
hideDropdown();
AddLiteralNodeDialog.getInstance().show(worksheetId);
return false;
}
=======
>>>>>>>
function addLiteralNode() {
console.log("Add Literal Node");
hideDropdown();
AddLiteralNodeDialog.getInstance().show(worksheetId);
return false;
} |
<<<<<<<
{name:"View model using straight lines", func:viewStraightLineModel, showCheckbox:true, defaultChecked:true, initFunc:initStrightLineModel},
{name:"Organize Columns", func:organizeColumns},
{name:"divider"},
{name:"Show Model" , func:showModel},
=======
{name:"View model using straight lines", func:viewStraightLineModel, showCheckbox:true, defaultChecked:true, initFunc:initStrightLineModel},
{name:"Organize Columns", func:organizeColumns},
{name:"divider"},
{name: "Suggest Model", func:undefined, addLevel:true, levels: [
{name:"Using Current Ontology" , func:showModel},
{name:"Generate New Ontology", func:showAutoModel},
]},
>>>>>>>
{name:"View model using straight lines", func:viewStraightLineModel, showCheckbox:true, defaultChecked:true, initFunc:initStrightLineModel},
{name:"Organize Columns", func:organizeColumns},
{name:"divider"},
{name: "Suggest Model", func:undefined, addLevel:true, levels: [
{name:"Using Current Ontology" , func:showModel},
{name:"Generate New Ontology", func:showAutoModel},
]},
<<<<<<<
{name:"Export to CSV", func:exportToCSV},
{name:"Export to Database", func:exportToDatabase},
{name:"Export to MDB", func:exportToMDB},
{name:"Export to SpatialData", func:exportToSpatial},
{name:"divider"},
=======
>>>>>>> |
<<<<<<<
=======
return lineLayout.getLinkX1(d.id);
})
.attr("y1", function(d) {
if (d.linkType == "DataPropertyOfColumnLink" || d.linkType == "ObjectPropertySpecializationLink") {
return d.source.y + 18;
}
if (viewStraightLineModel)
return d.source.y;
return d.source.y + 10; //Height is 20
})
.attr("x2", function(d) {
if (viewStraightLineModel) {
if (d.linkType == "horizontalDataPropertyLink") {
return d.target.x;
}
if (d.calculateOverlap) {
return d.overlapx;
}
var x2;
if (d.source.y > d.target.y)
x2 = d.source.x;
else
x2 = d.target.x;
var minX2 = d.target.x - d.target.width / 2;
var maxX2 = d.target.x + d.target.width / 2;
if (!(x2 >= minX2 && x2 <= maxX2)) { //Arrow is not wihin the box now
console.log("x2 of Arrow not in limits: " + x2 + ", Source:" + d.source.x + "," + d.source.width + " Target:" + d.target.x + "," + d.target.y);
x2 = d.target.x;
}
return x2;
} else {
return lineLayout.getLinkX2(d.id);
}
})
.attr("y2", function(d) {
if (viewStraightLineModel) {
return d.target.y;
}
if (d.target.nodeType == "InternalNode" || d.target.nodeType == "LiteralNode") {
var slope = Math.abs(lineLayout.getLinkSlope(d.id));
//console.log(d.source.id + "->" + d.target.id + ": slope=" + slope);
if (slope <= 0.2) return d.target.y - 10;
if (slope <= 1.0) return d.target.y - 5;
}
return d.target.y;
});
//Hanlde drawing of the link labels
svg.selectAll("text")
.data(json.links)
.enter().append("text")
.text(function(d) {
if (d.label == "classLink")
return "uri";
return d.label;
})
.attr("class", function(d) {
if (d.id != "FakeRootLink")
return "LinkLabel " + worksheetId + " " + d.linkStatus;
else
return "LinkLabel FakeRootLink " + worksheetId;
})
.attr("x", function(d) {
if (viewStraightLineModel) {
if (d.calculateOverlap) {
return d.overlapx;
}
if (d.source.y > d.target.y)
return d.source.x;
else
return d.target.x;
}
return lineLayout.getLinkLabelPosition(d.id)[0];
})
.attr("y", function(d) {
if (viewStraightLineModel)
return d.target.y - 20;
return h - lineLayout.getLinkLabelPosition(d.id)[1];
})
.attr("transform", function(d) {
var X = 0;
var Y = 0;
if (d.source.y > d.target.y)
X = d.source.x;
else
X = d.target.x;
Y = (d.source.y + d.target.y) / 2;
return "translate(" + (this.getComputedTextLength() / 2 * -1) + ")";
// return "translate(" + (this.getComputedTextLength()/2 * -1) + ") rotate(-8 " +X+","+Y+ ")";
}).on("click", function(d) {
//showAlternativeLinksDialog(d, svg, d3.event);
PropertyDropdownMenu.getInstance().show(
$(svg).data("worksheetId"),
$(svg).data("alignmentId"),
d["id"],
d["linkUri"],
d["sourceNodeId"],
d.source.nodeType,
d.source.label,
d.source.nodeDomain,
d.source.id,
d.source.isUri,
d["targetNodeId"],
d.target.nodeType,
d.target.label,
d.target.nodeDomain,
d.target.id,
d.target.isUri,
d3.event);
}).on("mouseover", function(d) {
d3.selectAll("g.InternalNode, g.LiteralNode").each(function(d2, i) {
if (d2 == d.source || d2 == d.target) {
var newRect = $(this).clone();
newRect.attr("class", "InternalNode highlightOverlay");
$("div#svgDiv_" + json["worksheetId"] + " svg").append(newRect);
return false;
}
});
})
.on("mouseout", function(d) {
// d3.selectAll("g.Class").classed("highlight", false);
$("g.highlightOverlay").remove();
});
//Handle drawing of nodes
var node = svg.selectAll("g.node")
.data(json.nodes);
node.enter().append("svg:g")
.attr("class", function(d) {
return d["nodeType"];
});
node.append("text")
.attr("dy", ".32em")
.text(function(d) {
$(this).data("text", d.label);
if (d.nodeType == "ColumnNode" || d.nodeType == "Unassigned" || d.nodeType == "FakeRoot")
return "";
else
return d.label;
})
.attr("width", function(d) {
var newText = $(this).text();
if (this.getComputedTextLength() > d["width"]) {
if (d.nodeType == "ColumnNode" || d.nodeType == "Unassigned" || d.nodeType == "FakeRoot")
return 0;
$(this).qtip({
content: {
text: $(this).data("text")
}
});
// Trim the string to make it fit inside the rectangle
while (this.getComputedTextLength() > d["width"]) {
if (newText.length > 6) {
newText = newText.substring(0, newText.length / 2 - 2) + "..." + newText.substring(newText.length / 2 + 2, newText.length);
$(this).text(newText);
} else
break;
}
} else
return this.getComputedTextLength();
})
.attr("x", function(d) {
return this.getComputedTextLength() / 2 * -1;
})
.on("click", function(d) {
if (d["nodeType"] == "InternalNode" || d["nodeType"] == "LiteralNode") {
var nodeCategory = "";
if (d.isForcedByUser)
nodeCategory = "forcedAdded";
ClassDropdownMenu.getInstance().show(worksheetId, d.id, d.label, d["id"], d.nodeDomain, nodeCategory,
$(svg).data("alignmentId"), d["nodeType"], d["isUri"], d3.event);
}
});
node.insert("rect", "text")
.attr("ry", 6)
.attr("rx", 6)
.attr("class", function(d) {
if (d.nodeType != "ColumnNode" && d.nodeType != "Unassigned" && d.nodeType != "FakeRoot")
return worksheetId;
})
.attr("y", function(d) {
if (d.nodeType == "ColumnNode" || d.nodeType == "Unassigned" || d.nodeType == "FakeRoot") {
return -2;
} else if (d.nodeType == "DataPropertyOfColumnHolder")
return 0;
else
return -10;
})
.attr("height", function(d) {
if (d.nodeType == "ColumnNode" || d.nodeType == "Unassigned" || d.nodeType == "FakeRoot")
return 6;
else if (d.nodeType == "DataPropertyOfColumnHolder")
return 0;
else
return 20;
})
.attr("width", function(d) {
if (d.nodeType == "ColumnNode" || d.nodeType == "Unassigned" || d.nodeType == "FakeRoot")
return 6;
else if (d.nodeType == "DataPropertyOfColumnHolder")
return 0;
else
return d["width"];
}).attr("x", function(d) {
if (d.nodeType == "ColumnNode" || d.nodeType == "Unassigned" || d.nodeType == "FakeRoot") {
return -3;
} else if (d.nodeType == "DataPropertyOfColumnHolder")
return 0;
else
return d.width / 2 * -1;
})
.style("fill", function(d) {
if (d.isForcedByUser) return "rgb(217,234,242)";
})
.on("click", function(d) {
if (d["nodeType"] == "InternalNode" || d["nodeType"] == "LiteralNode") {
var nodeCategory = "";
if (d.isForcedByUser)
nodeCategory = "forcedAdded";
ClassDropdownMenu.getInstance().show(worksheetId, d.id, d.label, d["id"], d.nodeDomain, nodeCategory,
$(svg).data("alignmentId"), d["nodeType"], d["isUri"], d3.event);
}
});
node.insert("path")
.attr("d", function(d) {
if (d.nodeType == "ColumnNode" || d.nodeType == "Unassigned" || d.nodeType == "FakeRoot" || d.nodeType == "DataPropertyOfColumnHolder") {
return "M0 0Z";
} else {
var w = d.width / 2;
return "M" + (w - 12) + " -2 L" + (w - 2) + " -2 L" + (w - 7) + " 3 Z";
}
})
.attr("y", function(d) {
if (d.nodeType == "ColumnNode" || d.nodeType == "Unassigned" || d.nodeType == "FakeRoot" || d.nodeType == "DataPropertyOfColumnHolder") {
return -2;
} else {
return -10;
}
}).attr("x", function(d) {
if (d.nodeType == "ColumnNode" || d.nodeType == "Unassigned" || d.nodeType == "FakeRoot" || d.nodeType == "DataPropertyOfColumnHolder") {
return 0;
} else {
return d["width"] - 5;
}
})
.on("click", function(d) {
if (d["nodeType"] == "InternalNode" || d["nodeType"] == "LiteralNode") {
var nodeCategory = "";
if (d.isForcedByUser)
nodeCategory = "forcedAdded";
ClassDropdownMenu.getInstance().show(worksheetId, d.id, d.label, d["id"], d.nodeDomain,
nodeCategory,
$(svg).data("alignmentId"), d["nodeType"], d["isUri"], d3.event);
}
});
/*** Check for collisions between labels and rectangles ***/
d3.selectAll("text.LinkLabel." + worksheetId)
.sort(comparator)
.each(function(d1, i1) {
// console.log("^^^^^^^^^^^^^^^^^^^^^^^" + d1.label)
var x1 = this.getBBox().x;
var y1 = this.getBBox().y;
var width1 = this.getBBox().width;
var height1 = this.getBBox().height;
var cur1 = $(this);
d3.selectAll("rect." + worksheetId).each(function(d2, i2) {
var x2 = d2.px + this.getBBox().x;
var y2 = d2.py + this.getBBox().y;
var width2 = this.getBBox().width;
var height2 = this.getBBox().height;
// console.log("D2 width: " + d2["width"]);
// Check if they overlap on y axis
if ((y2 < y1 && y1 < y2 + height2) || (y1 < y2 && y2 < y1 + height1 && y1 + height1 < y2 + height2)) {
// console.log("Collision detected on Y axis");
// console.log("Rect- X2: " + x2 + " Y2: " + y2 + " width: " + width2 + " height " + height2);
// console.log("Text- X1: " + x1 + " Y1: " + y1 + " width " + width1 + " height " + height1);
// Check overlap on X axis
if (x1 > x2 && x2 + width2 > x1) {
// console.log("Rect- X2: " + x2 + " Y2: " + y2 + " width: " + width2 + " height " + height2);
// console.log("Text- X1: " + x1 + " Y1: " + y1 + " width " + width1 + " height " + height1);
// console.log("Collision detected!")
// console.log(d1);
// console.log(d2);
// console.log("Number to add: " + (y2-y1-16));
$(cur1).attr("y", Number($(cur1).attr("y")) + (y2 - y1 - 16));
}
}
});
});
/*** Check for collisions between labels ***/
var flag = 0;
d3.selectAll("text.LinkLabel." + worksheetId)
.sort(comparator)
.each(function(d1, i1) {
var x1 = this.getBBox().x;
var y1 = this.getBBox().y;
var width1 = this.getBBox().width;
var height1 = this.getBBox().height;
var cur1 = $(this);
// console.log("^^^^^^^^^^^^");
d3.selectAll("text.LinkLabel." + worksheetId)
.sort(comparator)
.each(function(d2, i2) {
var x2 = this.getBBox().x;
var y2 = this.getBBox().y;
var width2 = this.getBBox().width;
var height2 = this.getBBox().height;
if (d1.id != d2.id) {
if (y1 == y2) {
if (((x1 + width1) > x2) && (x2 + width2 > x1 + width1)) {
//console.log("Collision detected!");
// console.log(d1);
// console.log(d2);
// console.log("Existing: " + $(cur1).attr("y"));
// console.log("Flag: " + flag);
if (flag % 2 == 0)
$(cur1).attr("y", Number($(cur1).attr("y")) - 12);
else
$(cur1).attr("y", Number($(cur1).attr("y")) + 5);
flag++;
}
} else if (y2 >= y1 && y2 <= y1 + height1) {
//console.log("Collision2 detected!");
if (flag % 2 == 0)
$(cur1).attr("y", Number($(cur1).attr("y")) - 6);
else
$(cur1).attr("y", Number($(cur1).attr("y")) + 3);
flag++;
}
if (x1 + width1 < x2)
return false;
}
});
});
node.attr("transform", function(d) {
return "translate(" + d.x + "," + d.y + ")";
});
$(window).resize(function() {
waitForFinalEvent(function() {
displayAlignmentTree_ForceKarmaLayout(json);
}, 500, worksheetId);
>>>>>>> |
<<<<<<<
var LITERAL_TYPE_ARRAY = [
"xsd:string","xsd:boolean","xsd:decimal","xsd:integer","xsd:double","xsd:float","xsd:time",
"xsd:dateTime","xsd:dateTimeStamp","xsd:gYear","xsd:gMonth","xsd:gDa","xsd:gYearMonth",
"xsd:gMonthDay","xsd:duration","xsd:yearMonthDuration","xsd:dayTimeDuration","xsd:",
"xsd:shor","xsd:int","xsd:long","xsd:unsignedByte","xsd:unsignedShort","xsd:unsignedInt",
"xsd:unsignedLong","xsd:positiveInteger","xsd:nonNegativeInteger","xsd:negativeInteger",
"xsd:nonPositiveInteger","xsd:hexBinary","xsd:base64Binar","xsd:anyURI",
"xsd:language","xsd:normalizedString","xsd:token","xsd:NMTOKEN","xsd:Namexsd:NCName"
];
=======
var MAX_NUM_SEMTYPE_SEARCH = 10;
>>>>>>>
var LITERAL_TYPE_ARRAY = [
"xsd:string","xsd:boolean","xsd:decimal","xsd:integer","xsd:double","xsd:float","xsd:time",
"xsd:dateTime","xsd:dateTimeStamp","xsd:gYear","xsd:gMonth","xsd:gDa","xsd:gYearMonth",
"xsd:gMonthDay","xsd:duration","xsd:yearMonthDuration","xsd:dayTimeDuration","xsd:",
"xsd:shor","xsd:int","xsd:long","xsd:unsignedByte","xsd:unsignedShort","xsd:unsignedInt",
"xsd:unsignedLong","xsd:positiveInteger","xsd:nonNegativeInteger","xsd:negativeInteger",
"xsd:nonPositiveInteger","xsd:hexBinary","xsd:base64Binar","xsd:anyURI",
"xsd:language","xsd:normalizedString","xsd:token","xsd:NMTOKEN","xsd:Namexsd:NCName"
];
var MAX_NUM_SEMTYPE_SEARCH = 10;
<<<<<<<
$("#literalTypeSelect").typeahead(
{source:LITERAL_TYPE_ARRAY, minLength:0, items:"all"});
}
=======
$("#literalTypeSelect").typeahead({
source: [
"xsd:string", "xsd:boolean", "xsd:decimal", "xsd:integer", "xsd:double", "xsd:float", "xsd:time",
"xsd:dateTime", "xsd:dateTimeStamp", "xsd:gYear", "xsd:gMonth", "xsd:gDa", "xsd:gYearMonth",
"xsd:gMonthDay", "xsd:duration", "xsd:yearMonthDuration", "xsd:dayTimeDuration", "xsd:",
"xsd:shor", "xsd:int", "xsd:long", "xsd:unsignedByte", "xsd:unsignedShort", "xsd:unsignedInt",
"xsd:unsignedLong", "xsd:positiveInteger", "xsd:nonNegativeInteger", "xsd:negativeInteger",
"xsd:nonPositiveInteger", "xsd:hexBinary", "xsd:base64Binar", "xsd:anyURI",
"xsd:language", "xsd:normalizedString", "xsd:token", "xsd:NMTOKEN", "xsd:Namexsd:NCName"
],
minLength: 0,
items: "all"
});
}
>>>>>>>
$("#literalTypeSelect").typeahead(
{source:LITERAL_TYPE_ARRAY, minLength:0, items:"all"});
}
<<<<<<<
})();
/**
* ==================================================================================================================
*
* Diloag to add a New Literal Node
*
* ==================================================================================================================
*/
var AddLiteralNodeDialog = (function() {
var instance = null;
function PrivateConstructor() {
var dialog = $("#addLiteralNodeDialog");
var worksheetId;
function init() {
//Initialize what happens when we show the dialog
dialog.on('show.bs.modal', function (e) {
hideError();
$("#literal", dialog).val("");
$("#literalType", dialog).val("");
$("input#isUri", dialog).attr("checked", false);
$("#literalType").typeahead(
{source:LITERAL_TYPE_ARRAY, minLength:0, items:"all"});
});
$('#btnSave', dialog).on('click', function (e) {
e.preventDefault();
saveDialog(e);
});
}
function validateClassInputValue(classData) {
selectedClass = classData;
}
function hideError() {
$("div.error", dialog).hide();
}
function showError(err) {
if(err) {
$("div.error", dialog).text(err);
}
$("div.error", dialog).show();
}
function saveDialog(e) {
var info = new Object();
info["workspaceId"] = $.workspaceGlobalInformation.id;
var newInfo = [];
var literal = $("#literal", dialog).val();
var literalType = $("#literalType", dialog).val();
var isUri = $("input#isUri").is(":checked");
newInfo.push(getParamObject("literalValue", literal, "other"));
newInfo.push(getParamObject("literalType", literalType, "other"));
newInfo.push(getParamObject("isUri", isUri, "other"));
newInfo.push(getParamObject("worksheetId", worksheetId, "worksheetId"));
info["newInfo"] = JSON.stringify(newInfo);
info["command"] = "AddLiteralNodeCommand";
showLoading(worksheetId);
var returned = $.ajax({
url: "RequestController",
type: "POST",
data : info,
dataType : "json",
complete :
function (xhr, textStatus) {
var json = $.parseJSON(xhr.responseText);
parse(json);
hideLoading(worksheetId);
hide();
},
error :
function (xhr, textStatus) {
alert("Error occured while adding the node!");
hideLoading(worksheetId);
hide();
}
});
};
function hide() {
dialog.modal('hide');
}
function show(wsId) {
worksheetId = wsId;
dialog.modal({keyboard:true, show:true, backdrop:'static'});
};
return { //Return back the public methods
show : show,
init : init
};
};
function getInstance() {
if( ! instance ) {
instance = new PrivateConstructor();
instance.init();
}
return instance;
}
return {
getInstance : getInstance
};
})();
=======
return { //Return back the public methods
show: show,
init: init
};
};
function getInstance() {
if (!instance) {
instance = new PrivateConstructor();
instance.init();
}
return instance;
}
return {
getInstance: getInstance
};
})();
>>>>>>>
return { //Return back the public methods
show: show,
init: init
};
};
function getInstance() {
if (!instance) {
instance = new PrivateConstructor();
instance.init();
}
return instance;
}
return {
getInstance: getInstance
};
})();
/**
* ==================================================================================================================
*
* Diloag to add a New Literal Node
*
* ==================================================================================================================
*/
var AddLiteralNodeDialog = (function() {
var instance = null;
function PrivateConstructor() {
var dialog = $("#addLiteralNodeDialog");
var worksheetId;
function init() {
//Initialize what happens when we show the dialog
dialog.on('show.bs.modal', function (e) {
hideError();
$("#literal", dialog).val("");
$("#literalType", dialog).val("");
$("input#isUri", dialog).attr("checked", false);
$("#literalType").typeahead(
{source:LITERAL_TYPE_ARRAY, minLength:0, items:"all"});
});
$('#btnSave', dialog).on('click', function (e) {
e.preventDefault();
saveDialog(e);
});
}
function validateClassInputValue(classData) {
selectedClass = classData;
}
function hideError() {
$("div.error", dialog).hide();
}
function showError(err) {
if(err) {
$("div.error", dialog).text(err);
}
$("div.error", dialog).show();
}
function saveDialog(e) {
var info = new Object();
info["workspaceId"] = $.workspaceGlobalInformation.id;
var newInfo = [];
var literal = $("#literal", dialog).val();
var literalType = $("#literalType", dialog).val();
var isUri = $("input#isUri").is(":checked");
newInfo.push(getParamObject("literalValue", literal, "other"));
newInfo.push(getParamObject("literalType", literalType, "other"));
newInfo.push(getParamObject("isUri", isUri, "other"));
newInfo.push(getParamObject("worksheetId", worksheetId, "worksheetId"));
info["newInfo"] = JSON.stringify(newInfo);
info["command"] = "AddLiteralNodeCommand";
showLoading(worksheetId);
var returned = $.ajax({
url: "RequestController",
type: "POST",
data : info,
dataType : "json",
complete :
function (xhr, textStatus) {
var json = $.parseJSON(xhr.responseText);
parse(json);
hideLoading(worksheetId);
hide();
},
error :
function (xhr, textStatus) {
alert("Error occured while adding the node!");
hideLoading(worksheetId);
hide();
}
});
};
function hide() {
dialog.modal('hide');
}
function show(wsId) {
worksheetId = wsId;
dialog.modal({keyboard:true, show:true, backdrop:'static'});
};
return { //Return back the public methods
show : show,
init : init
};
};
function getInstance() {
if( ! instance ) {
instance = new PrivateConstructor();
instance.init();
}
return instance;
}
return {
getInstance : getInstance
};
})(); |
<<<<<<<
$http({
method: 'POST',
url: '/tatami/authentication',
transformRequest: function (obj) {
var str = [];
for (var p in obj)
str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
return str.join("&");
},
data: {
j_username: $scope.user.email,
j_password: $scope.user.password,
_spring_security_remember_me: $scope.user.remember
},
headers: {'Content-Type': 'application/x-www-form-urlencoded'}
}).success(function(success) {
$state.go('tab.dash');
}).error(function(err) {
=======
ProfileService.get(function(success) {
$scope.shown = true;
console.log(success);
$state.go('tab.timeline');
}, function(error) {
>>>>>>>
$http({
method: 'POST',
url: '/tatami/authentication',
transformRequest: function (obj) {
var str = [];
for (var p in obj)
str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
return str.join("&");
},
data: {
j_username: $scope.user.email,
j_password: $scope.user.password,
_spring_security_remember_me: $scope.user.remember
},
headers: {'Content-Type': 'application/x-www-form-urlencoded'}
}).success(function(success) {
$state.go('tab.timeline');
}).error(function(err) { |
<<<<<<<
import sandboxStory from './Sandbox.story';
=======
import civicSandboxDashboardStory from './CivicSandboxDashboard.story';
import stackedAreaChart from './StackedAreaChart.story';
>>>>>>>
import sandboxStory from './Sandbox.story';
import civicSandboxDashboardStory from './CivicSandboxDashboard.story';
import stackedAreaChart from './StackedAreaChart.story';
<<<<<<<
civicSandboxMapStory();
sandboxStory();
=======
civicSandboxMapStory();
civicSandboxDashboardStory();
>>>>>>>
civicSandboxMapStory();
sandboxStory();
civicSandboxDashboardStory(); |
<<<<<<<
}],
context: ['statuses', 'StatusService', '$q', function(statuses, StatusService, $q) {
var temp = [];
for(var i = 0; i < statuses.length; ++i) {
if(statuses[i].replyTo) {
temp.push(
StatusService.get({ statusId: statuses[i].replyTo })
.$promise.then(
function(response) {
if(response === null) {
return $q.resolve(null);
}
return response;
}).$promise);
}
else {
temp.push(null);
}
}
return $q.all(temp);
}],
statusesWithContext: ['statuses', 'context', function(statuses, context) {
for(var i = 0; i < statuses.length; ++i) {
statuses[i]['context'] = context[i];
}
return statuses;
=======
}],
showModal: ['statuses', function(statuses) {
return statuses.length === 0;
>>>>>>>
}],
context: ['statuses', 'StatusService', '$q', function(statuses, StatusService, $q) {
var temp = [];
for(var i = 0; i < statuses.length; ++i) {
if(statuses[i].replyTo) {
temp.push(
StatusService.get({ statusId: statuses[i].replyTo })
.$promise.then(
function(response) {
if(response === null) {
return $q.resolve(null);
}
return response;
}).$promise);
}
else {
temp.push(null);
}
}
return $q.all(temp);
}],
statusesWithContext: ['statuses', 'context', function(statuses, context) {
for(var i = 0; i < statuses.length; ++i) {
statuses[i]['context'] = context[i];
}
return statuses;
}],
showModal: ['statuses', function(statuses) {
return statuses.length === 0; |
<<<<<<<
xtab.setActiveById = function(tabId) {
var index;
index = xtab.getTabIndex(tabId);
if (index >= 0) {
xtab.setActive(index);
}
};
xtab.getActiveTab = function() {
if (activeTab >= 0) {
return tabs[activeTab];
}
return null;
};
=======
xtab.setTabNode = function(tabId, nodes) {
var index;
index = xtab.getTabIndex(tabId);
if (index >= 0) {
tabs[index].nodes = nodes;
}
};
>>>>>>>
xtab.setTabNode = function(tabId, nodes) {
var index;
index = xtab.getTabIndex(tabId);
if (index >= 0) {
tabs[index].nodes = nodes;
}
};
xtab.setActiveById = function(tabId) {
var index;
index = xtab.getTabIndex(tabId);
if (index >= 0) {
xtab.setActive(index);
}
};
xtab.getActiveTab = function() {
if (activeTab >= 0) {
return tabs[activeTab];
}
return null;
}; |
<<<<<<<
var ts = require('typescript');
=======
var tss = require('typescript-simple');
var esprima = require('esprima');
var espree = require('espree');
var jshint = require('jshint');
>>>>>>>
var ts = require('typescript');
var esprima = require('esprima');
var espree = require('espree');
var jshint = require('jshint'); |
<<<<<<<
typescript: typescript.fallthrough,
chrome44: { val: flag, note_id: 'strict-required' },
=======
typescript: temp.typescriptFallthrough,
chrome43: strict,
>>>>>>>
typescript: typescript.fallthrough,
chrome43: strict,
<<<<<<<
iojs: { val: flag, note_id: 'strict-required' },
chrome44: { val: flag, note_id: 'strict-required' },
typescript: typescript.fallthrough,
=======
iojs: strict,
chrome43: strict,
typescript: temp.typescriptFallthrough,
>>>>>>>
iojs: strict,
chrome43: strict,
typescript: typescript.fallthrough,
<<<<<<<
typescript: typescript.fallthrough,
chrome44: { val: flag, note_id: 'strict-required' },
=======
typescript: temp.typescriptFallthrough,
chrome43: strict,
>>>>>>>
typescript: typescript.fallthrough,
chrome43: strict,
<<<<<<<
typescript: typescript.fallthrough,
chrome44: { val: flag, note_id: 'strict-required' },
=======
typescript: temp.typescriptFallthrough,
chrome43: strict,
>>>>>>>
typescript: typescript.fallthrough,
chrome43: strict,
<<<<<<<
typescript: typescript.fallthrough,
chrome44: { val: flag, note_id: 'strict-required' },
=======
typescript: temp.typescriptFallthrough,
chrome43: strict,
>>>>>>>
typescript: typescript.fallthrough,
chrome43: strict,
<<<<<<<
typescript: typescript.fallthrough,
chrome44: { val: flag, note_id: 'strict-required' },
=======
typescript: temp.typescriptFallthrough,
chrome43: strict,
>>>>>>>
typescript: typescript.fallthrough,
chrome43: strict,
<<<<<<<
typescript: typescript.fallthrough,
chrome44: { val: flag, note_id: 'strict-required' },
=======
typescript: temp.typescriptFallthrough,
chrome43: strict,
>>>>>>>
typescript: typescript.fallthrough,
chrome43: strict,
<<<<<<<
typescript: typescript.fallthrough,
chrome44: { val: flag, note_id: 'strict-required' },
=======
typescript: temp.typescriptFallthrough,
chrome43: strict,
>>>>>>>
typescript: typescript.fallthrough,
chrome43: strict,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
chrome43: strict,
>>>>>>>
typescript: typescript.fallthrough,
chrome43: strict,
<<<<<<<
typescript: typescript.fallthrough
=======
typescript: temp.typescriptFallthrough,
chrome43: strict,
>>>>>>>
typescript: typescript.fallthrough,
chrome43: strict,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
chrome43: strict,
>>>>>>>
typescript: typescript.fallthrough,
chrome43: strict,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
chrome43: strict,
>>>>>>>
typescript: typescript.fallthrough,
chrome43: strict, |
<<<<<<<
chrome50: true,
=======
chrome51: true,
webkit: true,
>>>>>>>
chrome50: true,
webkit: true,
<<<<<<<
chrome50: true,
=======
chrome51: true,
webkit: true,
>>>>>>>
chrome50: true,
webkit: true, |
<<<<<<<
typescript: typescript.fallthrough,
},
=======
typescript: temp.typescriptFallthrough,
}),
>>>>>>>
typescript: typescript.fallthrough,
}),
<<<<<<<
typescript: typescript.corejs,
=======
webkit: true,
>>>>>>>
typescript: typescript.corejs,
webkit: true,
<<<<<<<
typescript: typescript.corejs,
=======
webkit: true,
>>>>>>>
typescript: typescript.corejs,
webkit: true,
<<<<<<<
babel: true,
typescript: typescript.corejs,
=======
chrome43: true,
webkit: true,
iojs: true,
>>>>>>>
babel: true,
typescript: typescript.corejs,
chrome43: true,
webkit: true,
iojs: true,
<<<<<<<
babel: true,
typescript: typescript.corejs,
=======
chrome43: true,
webkit: true,
iojs: true,
>>>>>>>
typescript: typescript.corejs,
chrome43: true,
webkit: true,
iojs: true,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
webkit: true,
>>>>>>>
typescript: typescript.fallthrough,
webkit: true,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
webkit: true,
>>>>>>>
typescript: true,
webkit: true,
<<<<<<<
typescript: typescript.corejs,
=======
webkit: true,
>>>>>>>
typescript: typescript.corejs,
webkit: true,
<<<<<<<
typescript: typescript.corejs,
=======
webkit: true,
>>>>>>>
typescript: typescript.corejs,
webkit: true, |
<<<<<<<
'frozen objects as keys': {
exec: function () {/*
var f = Object.freeze({});
var m = new WeakMap;
m.set(f, 42);
return m.get(f) === 42;
*/},
res: {
babel: true,
ejs: true,
typescript: typescript.corejs,
edge: true,
firefox11: true,
chrome21dev: flag,
chrome36: true,
safari71_8: true,
webkit: true,
node: true,
iojs: true,
},
},
=======
'frozen objects as keys': {
exec: function () {/*
var f = Object.freeze({});
var m = new WeakMap;
m.set(f, 42);
return m.get(f) === 42;
*/},
res: {
babel: true,
ejs: true,
typescript: temp.typescriptFallthrough,
edge: true,
firefox11: true,
chrome21dev: flag,
chrome36: true,
safari71_8: true,
webkit: true,
node: true,
iojs: true,
},
},
>>>>>>>
'frozen objects as keys': {
exec: function () {/*
var f = Object.freeze({});
var m = new WeakMap;
m.set(f, 42);
return m.get(f) === 42;
*/},
res: {
babel: true,
ejs: true,
typescript: typescript.corejs,
edge: true,
firefox11: true,
chrome21dev: flag,
chrome36: true,
safari71_8: true,
webkit: true,
node: true,
iojs: true,
},
},
<<<<<<<
typescript: typescript.corejs,
=======
>>>>>>>
typescript: typescript.corejs,
<<<<<<<
typescript: typescript.corejs,
webkit: true,
=======
typescript: temp.typescriptFallthrough,
webkit: true,
>>>>>>>
typescript: typescript.corejs,
webkit: true,
<<<<<<<
babel: true,
typescript: typescript.corejs,
=======
babel: true,
typescript: temp.typescriptFallthrough,
>>>>>>>
babel: true,
typescript: typescript.corejs,
<<<<<<<
babel: true,
typescript: typescript.corejs,
tr: true,
edge: true,
firefox36: true,
webkit: true,
=======
babel: true,
tr: true,
edge: true,
firefox36: true,
webkit: true,
>>>>>>>
babel: true,
typescript: typescript.corejs,
tr: true,
edge: true,
firefox36: true,
webkit: true,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
>>>>>>>
typescript: typescript.fallthrough,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
>>>>>>>
typescript: typescript.fallthrough,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
>>>>>>>
typescript: typescript.fallthrough,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
>>>>>>>
typescript: typescript.fallthrough,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
>>>>>>>
typescript: typescript.fallthrough,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
>>>>>>>
typescript: typescript.fallthrough,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
>>>>>>>
typescript: typescript.fallthrough,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
>>>>>>>
typescript: typescript.fallthrough,
<<<<<<<
typescript: typescript.fallthrough
=======
typescript: temp.typescriptFallthrough
>>>>>>>
typescript: typescript.fallthrough
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
>>>>>>>
typescript: typescript.fallthrough,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
>>>>>>>
typescript: typescript.fallthrough,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
>>>>>>>
typescript: typescript.fallthrough,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
>>>>>>>
typescript: typescript.fallthrough,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
>>>>>>>
typescript: typescript.fallthrough,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
>>>>>>>
typescript: typescript.fallthrough,
<<<<<<<
typescript: typescript.fallthrough,
=======
typescript: temp.typescriptFallthrough,
>>>>>>>
typescript: typescript.fallthrough, |
<<<<<<<
export {default as Rate} from './rate';
export {default as SearchBar} from './search-bar';
=======
export {default as Rate} from './rate';
export {default as DatePicker} from './date-picker';
export {default as PickerView} from './picker-view';
export {default as InfiniteLoader} from './infinite-loader';
>>>>>>>
export {default as Rate} from './rate';
export {default as DatePicker} from './date-picker';
export {default as PickerView} from './picker-view';
export {default as InfiniteLoader} from './infinite-loader';
export {default as SearchBar} from './search-bar'; |
<<<<<<<
=======
// non-modifying HTML parsing rules for cheerio
var CHEERIO_OPTIONS = {
normalizeWhitespace: false,
xmlMode: false,
decodeEntities: false
};
var cheerioRenderOptions = cheerio.prototype.options;
cheerioRenderOptions.decodeEntities = false;
>>>>>>>
<<<<<<<
var styleEl = whacko('<style>' + content + '</style>');
=======
var styleDoc = cheerio.load('<style>' + content + '</style>', CHEERIO_OPTIONS);
>>>>>>>
var styleEl = whacko('<style>' + content + '</style>');
<<<<<<<
=======
function readDocument(filename) {
return cheerio.load(readFile(filename), CHEERIO_OPTIONS);
}
>>>>>>>
<<<<<<<
return $;
=======
// NOTE: work-around dom-serializer
// return $.html();
return render($._root.children, cheerioRenderOptions);
>>>>>>>
return $;
<<<<<<<
// remove import link
var $$ = concat(path.resolve(options.outputDir, href));
if (!$$) {
el.remove();
return;
=======
var rel = href;
var inputPath = path.dirname(options.input);
if (constants.ABS_URL.test(rel)) {
var abs = path.resolve(inputPath, path.join(options.abspath, rel));
rel = path.relative(options.outputDir, abs);
}
var importContent = concat(path.resolve(options.outputDir, rel));
// hide import content in the main document
if (mainDoc) {
importContent = '<div hidden>' + importContent + '</div>';
>>>>>>>
var rel = href;
var inputPath = path.dirname(options.input);
if (constants.ABS_URL.test(rel)) {
var abs = path.resolve(inputPath, path.join(options.abspath, rel));
rel = path.relative(options.outputDir, abs);
}
var $$ = concat(path.resolve(options.outputDir, rel));
if (!$$) {
// remove import link
el.remove();
return;
<<<<<<<
writeFileSync(options.output, $.html(), true);
=======
var outhtml = render($._root.children, CHEERIO_OPTIONS);
fs.writeFileSync(options.output, outhtml, 'utf8');
>>>>>>>
writeFileSync(options.output, $.html(), true); |
<<<<<<<
util_js.loadStyle(mochaPrefix + 'mocha.css');
=======
util.loadStyle(mochaPrefix + 'mocha.css', callback);
>>>>>>>
util_js.loadStyle(mochaPrefix + 'mocha.css', callback); |
<<<<<<<
const itemView = $$(function itemView() {
=======
const border = color ? `border-left: 4px inset ${color}` : 'border-left: 4px inset transparent';
return $$(function itemView() {
>>>>>>>
const border = color ? `border-left: 4px inset ${color}` : 'border-left: 4px inset transparent';
const itemView = $$(function itemView() { |
<<<<<<<
import Layout from "../layout/layout"
=======
import Layout from "../components/layout"
import HeaderBody from "../components/headerBody"
>>>>>>>
import Layout from "../layout/layout"
import HeaderBody from "../components/headerBody" |
<<<<<<<
import Layout from "../layout/layout"
=======
import Layout from "../components/layout"
import HeaderBody from "../components/headerBody"
>>>>>>>
import Layout from "../layout/layout"
import HeaderBody from "../components/headerBody" |
<<<<<<<
// Define the callback
var callback = function(){
// Emit events by default
self.emitAfter("complete logout success auth.logout auth", true);
};
// Does this endpoint
var logout = self.service[p.name]['logout'];
if( logout ){
// Convert logout to string
if(typeof(logout) === 'function' && (logout = logout(callback)) ){
return self;
}
// If logout is a string then assume URL and open in iframe.
if(logout){
utils.iframe( logout );
}
}
callback();
=======
// Emit events by default
self.emitAfter("complete logout success auth.logout auth", {network:p.name});
>>>>>>>
// Define the callback
var callback = function(){
// Emit events by default
self.emitAfter("complete logout success auth.logout auth", {network:p.name});
};
// Does this endpoint
var logout = self.service[p.name]['logout'];
if( logout ){
// Convert logout to string
if(typeof(logout) === 'function' && (logout = logout(callback)) ){
return self;
}
// If logout is a string then assume URL and open in iframe.
if(logout){
utils.iframe( logout );
}
}
callback(); |
<<<<<<<
assert.equal(0, Buffer('hello').slice(0, 0).length);
// test hex toString
console.log('Create hex string from buffer');
var hexb = new Buffer(256);
for (var i = 0; i < 256; i ++) {
hexb[i] = i;
}
var hexStr = hexb.toString('hex');
assert.equal(hexStr,
'000102030405060708090a0b0c0d0e0f'+
'101112131415161718191a1b1c1d1e1f'+
'202122232425262728292a2b2c2d2e2f'+
'303132333435363738393a3b3c3d3e3f'+
'404142434445464748494a4b4c4d4e4f'+
'505152535455565758595a5b5c5d5e5f'+
'606162636465666768696a6b6c6d6e6f'+
'707172737475767778797a7b7c7d7e7f'+
'808182838485868788898a8b8c8d8e8f'+
'909192939495969798999a9b9c9d9e9f'+
'a0a1a2a3a4a5a6a7a8a9aaabacadaeaf'+
'b0b1b2b3b4b5b6b7b8b9babbbcbdbebf'+
'c0c1c2c3c4c5c6c7c8c9cacbcccdcecf'+
'd0d1d2d3d4d5d6d7d8d9dadbdcdddedf'+
'e0e1e2e3e4e5e6e7e8e9eaebecedeeef'+
'f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff');
console.log('Create buffer from hex string');
var hexb2 = new Buffer(hexStr, 'hex');
for (var i = 0; i < 256; i ++) {
assert.equal(hexb2[i], hexb[i]);
}
// test an invalid slice end.
console.log('Try to slice off the end of the buffer');
var b = new Buffer([1,2,3,4,5]);
var b2 = b.toString('hex', 1, 10000);
var b3 = b.toString('hex', 1, 5);
var b4 = b.toString('hex', 1);
assert.equal(b2, b3);
assert.equal(b2, b4);
=======
assert.equal(0, Buffer('hello').slice(0, 0).length);
// Test slice on SlowBuffer GH-843
var SlowBuffer = process.binding('buffer').SlowBuffer;
function buildSlowBuffer (data) {
if (Array.isArray(data)) {
var buffer = new SlowBuffer(data.length);
data.forEach(function(v,k) {
buffer[k] = v;
});
return buffer;
};
return null;
}
var x = buildSlowBuffer([0x81,0xa3,0x66,0x6f,0x6f,0xa3,0x62,0x61,0x72]);
console.log(x.inspect())
assert.equal('<SlowBuffer 81 a3 66 6f 6f a3 62 61 72>', x.inspect());
var z = x.slice(4);
console.log(z.inspect())
console.log(z.length)
assert.equal(5, z.length);
assert.equal(0x6f, z[0]);
assert.equal(0xa3, z[1]);
assert.equal(0x62, z[2]);
assert.equal(0x61, z[3]);
assert.equal(0x72, z[4]);
var z = x.slice(0);
console.log(z.inspect())
console.log(z.length)
assert.equal(z.length, x.length);
var z = x.slice(0, 4);
console.log(z.inspect())
console.log(z.length)
assert.equal(4, z.length);
assert.equal(0x81, z[0]);
assert.equal(0xa3, z[1]);
var z = x.slice(0, 9);
console.log(z.inspect())
console.log(z.length)
assert.equal(9, z.length);
var z = x.slice(1, 4);
console.log(z.inspect())
console.log(z.length)
assert.equal(3, z.length);
assert.equal(0xa3, z[0]);
var z = x.slice(2, 4);
console.log(z.inspect())
console.log(z.length)
assert.equal(2, z.length);
assert.equal(0x66, z[0]);
assert.equal(0x6f, z[1]);
>>>>>>>
assert.equal(0, Buffer('hello').slice(0, 0).length);
// test hex toString
console.log('Create hex string from buffer');
var hexb = new Buffer(256);
for (var i = 0; i < 256; i ++) {
hexb[i] = i;
}
var hexStr = hexb.toString('hex');
assert.equal(hexStr,
'000102030405060708090a0b0c0d0e0f'+
'101112131415161718191a1b1c1d1e1f'+
'202122232425262728292a2b2c2d2e2f'+
'303132333435363738393a3b3c3d3e3f'+
'404142434445464748494a4b4c4d4e4f'+
'505152535455565758595a5b5c5d5e5f'+
'606162636465666768696a6b6c6d6e6f'+
'707172737475767778797a7b7c7d7e7f'+
'808182838485868788898a8b8c8d8e8f'+
'909192939495969798999a9b9c9d9e9f'+
'a0a1a2a3a4a5a6a7a8a9aaabacadaeaf'+
'b0b1b2b3b4b5b6b7b8b9babbbcbdbebf'+
'c0c1c2c3c4c5c6c7c8c9cacbcccdcecf'+
'd0d1d2d3d4d5d6d7d8d9dadbdcdddedf'+
'e0e1e2e3e4e5e6e7e8e9eaebecedeeef'+
'f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff');
console.log('Create buffer from hex string');
var hexb2 = new Buffer(hexStr, 'hex');
for (var i = 0; i < 256; i ++) {
assert.equal(hexb2[i], hexb[i]);
}
// test an invalid slice end.
console.log('Try to slice off the end of the buffer');
var b = new Buffer([1,2,3,4,5]);
var b2 = b.toString('hex', 1, 10000);
var b3 = b.toString('hex', 1, 5);
var b4 = b.toString('hex', 1);
assert.equal(b2, b3);
assert.equal(b2, b4);
// Test slice on SlowBuffer GH-843
var SlowBuffer = process.binding('buffer').SlowBuffer;
function buildSlowBuffer (data) {
if (Array.isArray(data)) {
var buffer = new SlowBuffer(data.length);
data.forEach(function(v,k) {
buffer[k] = v;
});
return buffer;
};
return null;
}
var x = buildSlowBuffer([0x81,0xa3,0x66,0x6f,0x6f,0xa3,0x62,0x61,0x72]);
console.log(x.inspect())
assert.equal('<SlowBuffer 81 a3 66 6f 6f a3 62 61 72>', x.inspect());
var z = x.slice(4);
console.log(z.inspect())
console.log(z.length)
assert.equal(5, z.length);
assert.equal(0x6f, z[0]);
assert.equal(0xa3, z[1]);
assert.equal(0x62, z[2]);
assert.equal(0x61, z[3]);
assert.equal(0x72, z[4]);
var z = x.slice(0);
console.log(z.inspect())
console.log(z.length)
assert.equal(z.length, x.length);
var z = x.slice(0, 4);
console.log(z.inspect())
console.log(z.length)
assert.equal(4, z.length);
assert.equal(0x81, z[0]);
assert.equal(0xa3, z[1]);
var z = x.slice(0, 9);
console.log(z.inspect())
console.log(z.length)
assert.equal(9, z.length);
var z = x.slice(1, 4);
console.log(z.inspect())
console.log(z.length)
assert.equal(3, z.length);
assert.equal(0xa3, z[0]);
var z = x.slice(2, 4);
console.log(z.inspect())
console.log(z.length)
assert.equal(2, z.length);
assert.equal(0x66, z[0]);
assert.equal(0x6f, z[1]); |
<<<<<<<
assert.ok(util.inspect(x).indexOf('inspect') != -1);
// util.inspect.styles and util.inspect.colors
function test_color_style(style, input, implicit) {
var color_name = util.inspect.styles[style];
var color = ['', ''];
if(util.inspect.colors[color_name])
color = util.inspect.colors[color_name];
var without_color = util.inspect(input, false, 0, false);
var with_color = util.inspect(input, false, 0, true);
var expect = '\u001b[' + color[0] + 'm' + without_color +
'\u001b[' + color[1] + 'm';
assert.equal(with_color, expect, 'util.inspect color for style '+style);
}
test_color_style('special', function(){});
test_color_style('number', 123.456);
test_color_style('boolean', true);
test_color_style('undefined', undefined);
test_color_style('null', null);
test_color_style('string', 'test string');
test_color_style('date', new Date);
test_color_style('regexp', /regexp/);
=======
assert.ok(util.inspect(x).indexOf('inspect') != -1);
// an object with "hasOwnProperty" overwritten should not throw
assert.doesNotThrow(function() {
util.inspect({
hasOwnProperty: null
});
});
>>>>>>>
assert.ok(util.inspect(x).indexOf('inspect') != -1);
// util.inspect.styles and util.inspect.colors
function test_color_style(style, input, implicit) {
var color_name = util.inspect.styles[style];
var color = ['', ''];
if(util.inspect.colors[color_name])
color = util.inspect.colors[color_name];
var without_color = util.inspect(input, false, 0, false);
var with_color = util.inspect(input, false, 0, true);
var expect = '\u001b[' + color[0] + 'm' + without_color +
'\u001b[' + color[1] + 'm';
assert.equal(with_color, expect, 'util.inspect color for style '+style);
}
test_color_style('special', function(){});
test_color_style('number', 123.456);
test_color_style('boolean', true);
test_color_style('undefined', undefined);
test_color_style('null', null);
test_color_style('string', 'test string');
test_color_style('date', new Date);
test_color_style('regexp', /regexp/);
// an object with "hasOwnProperty" overwritten should not throw
assert.doesNotThrow(function() {
util.inspect({
hasOwnProperty: null
});
}); |
<<<<<<<
'http://x:1/\' <>"`/{}|\\^~`/': {
protocol: 'http:',
slashes: true,
host: 'x:1',
port: '1',
hostname: 'x',
pathname: '/%27%20%3C%3E%22%60/%7B%7D%7C%5C%5E~%60/',
path: '/%27%20%3C%3E%22%60/%7B%7D%7C%5C%5E~%60/',
href: 'http://x:1/%27%20%3C%3E%22%60/%7B%7D%7C%5C%5E~%60/'
},
=======
'http://a@b@c/': {
protocol: 'http:',
slashes: true,
auth: 'a@b',
host: 'c',
hostname: 'c',
href: 'http://a%40b@c/',
path: '/',
pathname: '/'
},
'http://a@b?@c': {
protocol: 'http:',
slashes: true,
auth: 'a',
host: 'b',
hostname: 'b',
href: 'http://a@b/?@c',
path: '/?@c',
pathname: '/',
search: '?@c',
query: '@c'
},
'http://a\r" \t\n<\'b:b@c\r\nd/e?f':{
protocol: 'http:',
slashes: true,
auth: 'a\r" \t\n<\'b:b',
host: 'c',
port: null,
hostname: 'c',
hash: null,
search: '?f',
query: 'f',
pathname: '%0D%0Ad/e',
path: '%0D%0Ad/e?f',
href: 'http://a%0D%22%20%09%0A%3C\'b:b@c/%0D%0Ad/e?f'
}
>>>>>>>
'http://x:1/\' <>"`/{}|\\^~`/': {
protocol: 'http:',
slashes: true,
host: 'x:1',
port: '1',
hostname: 'x',
pathname: '/%27%20%3C%3E%22%60/%7B%7D%7C%5C%5E~%60/',
path: '/%27%20%3C%3E%22%60/%7B%7D%7C%5C%5E~%60/',
href: 'http://x:1/%27%20%3C%3E%22%60/%7B%7D%7C%5C%5E~%60/'
},
'http://a@b@c/': {
protocol: 'http:',
slashes: true,
auth: 'a@b',
host: 'c',
hostname: 'c',
href: 'http://a%40b@c/',
path: '/',
pathname: '/'
},
'http://a@b?@c': {
protocol: 'http:',
slashes: true,
auth: 'a',
host: 'b',
hostname: 'b',
href: 'http://a@b/?@c',
path: '/?@c',
pathname: '/',
search: '?@c',
query: '@c'
},
'http://a\r" \t\n<\'b:b@c\r\nd/e?f':{
protocol: 'http:',
slashes: true,
auth: 'a\r" \t\n<\'b:b',
host: 'c',
port: null,
hostname: 'c',
hash: null,
search: '?f',
query: 'f',
pathname: '%0D%0Ad/e',
path: '%0D%0Ad/e?f',
href: 'http://a%0D%22%20%09%0A%3C\'b:b@c/%0D%0Ad/e?f'
} |
<<<<<<<
query: opts.query,
sign: self.sign,
=======
sign: opts.sign || self.sign,
>>>>>>>
query: opts.query,
sign: opts.sign || self.sign, |
<<<<<<<
// Set transport name
this.name = 'syslog';
=======
>>>>>>>
// Set transport name
this.name = 'syslog';
<<<<<<<
message: meta ? JSON.stringify(data) : msg
=======
message: JSON.stringify(data)
>>>>>>>
message: meta ? JSON.stringify(data) : msg
<<<<<<<
return (!this.socket.readyState) || (this.socket.readyState === 'open')
=======
return callback(null);// Only writing on the socket...
return this.socket.readyState === 'open'
>>>>>>>
return (!this.socket.readyState) || (this.socket.readyState === 'open')
<<<<<<<
//
// Listen to the appropriate events on the socket that
// was just created.
//
this.socket.on(readyEvent, function () {
//
// When the socket is ready, write the current queue
// to it.
//
self.socket.write(self.queue.join(''), 'utf8', onError);
self.emit('logged');
self.queue = [];
self.retries = 0;
self.connected = true;
}).on('error', function (ex) {
//
// TODO: Pass this error back up
//
}).on('end', function (ex) {
//
// Nothing needs to be done here.
//
}).on('close', function (ex) {
//
// Attempt to reconnect on lost connection(s), progressively
// increasing the amount of time between each try.
//
var interval = Math.pow(2, self.retries);
self.connected = false;
setTimeout(function () {
self.retries++;
self.socket.connect(self.port, self.host);
}, interval * 1000);
}).on('timeout', function () {
if (self.socket.readyState !== 'open') {
self.socket.destroy();
}
});
this.socket.connect(this.port, this.host);
=======
>>>>>>>
//
// Listen to the appropriate events on the socket that
// was just created.
//
this.socket.on(readyEvent, function () {
//
// When the socket is ready, write the current queue
// to it.
//
self.socket.write(self.queue.join(''), 'utf8', onError);
self.emit('logged');
self.queue = [];
self.retries = 0;
self.connected = true;
}).on('error', function (ex) {
//
// TODO: Pass this error back up
//
}).on('end', function (ex) {
//
// Nothing needs to be done here.
//
}).on('close', function (ex) {
//
// Attempt to reconnect on lost connection(s), progressively
// increasing the amount of time between each try.
//
var interval = Math.pow(2, self.retries);
self.connected = false;
setTimeout(function () {
self.retries++;
self.socket.connect(self.port, self.host);
}, interval * 1000);
}).on('timeout', function () {
if (self.socket.readyState !== 'open') {
self.socket.destroy();
}
});
this.socket.connect(this.port, this.host); |
<<<<<<<
if(isFinite(Molpy.Boosts['Castles'].bought)) {
Molpy.totalCastlesDown += Molpy.castles;
Molpy.Boosts['Castles'].bought -= Molpy.castles;
=======
if(isFinite(Molpy.castlesBuilt)) {
Molpy.totalCastlesDown += Molpy.Boosts['Castles'].power;
Molpy.castlesBuilt -= Molpy.Boosts['Castles'].power;
>>>>>>>
if(isFinite(Molpy.Boosts['Castles'].bought)) {
Molpy.totalCastlesDown += Molpy.Boosts['Castles'].power;
Molpy.Boosts['Castles'].bought -= Molpy.Boosts['Castles'].power; |
<<<<<<<
<a href="javascript:;" title="Add or remove user from subreddit ban, contributor, and moderator lists." class="user-role active">Role</a>\
<a href="javascript:;" title="Edit user flair" class="edit-user-flair">User Flair</a>\
=======
<a href="javascript:;" title="Edit user flair" class="edit-user-flair">User Flair</a>\
<!--a href="javascript:;" title="Nuke chain" class="nuke-comment-chain">Nuke Chain</a-->\
>>>>>>>
<a href="javascript:;" title="Add or remove user from subreddit ban, contributor, and moderator lists." class="user-role active">Role</a>\
<a href="javascript:;" title="Edit user flair" class="edit-user-flair">User Flair</a>\
<!--a href="javascript:;" title="Nuke chain" class="nuke-comment-chain">Nuke Chain</a-->\
<<<<<<<
//
// Refresh the main tab saved subs list (with checkboxes)
//
// move this code in from the two other places it was
var $table = $(this).parents('.mod-popup').find('tbody'),
currentsub = $('#subreddit').text();
$table.html(''); //clear all the current subs.
=======
$('.the-nuclear-option').prop('checked', (JSON.parse(localStorage["Toolbox.ModButton.globalbutton"] || "false")));
$('.save').hide();
$('.mod-action').hide();
$('.subs-body').hide();
$('.ban-note').hide();
$('.global-button').hide();
$('.edit-user-flair').hide();
$('.nuke-comment-chain').hide();
$('.edit-dropdown').hide();
$('.settingSave').show();
$('.edit-subreddits').show();
});
function updateSavedSubs(){
savedSubs = TBUtils.saneSort(savedSubs);
savedSub = TBUtils.setting('ModButton', 'sublist', null, savedSubs);
$('.remove-dropdown').find('option').remove();
>>>>>>>
//
// Refresh the main tab saved subs list (with checkboxes)
//
// move this code in from the two other places it was
var $table = $(this).parents('.mod-popup').find('tbody'),
currentsub = $('#subreddit').text();
$table.html(''); //clear all the current subs.
<<<<<<<
// TODO: replace this with a real tab view controller so we don't have to duplicate these lines all the time
$(this).parents('.mod-popup').find('.edit-user-flair').removeClass('active');
$(this).parents('.mod-popup').find('.user-role').addClass('active');
$(this).parents('.mod-popup').find('.edit-modbutton-settings').removeClass('active');
$(this).parents('.mod-popup').find('.mod-popup-tab-settings').hide();
$(this).parents('.mod-popup').find('.mod-popup-tab-flair').hide();
$(this).parents('.mod-popup').find('.mod-popup-tab-role').show();
=======
$('.save').show();
$('.mod-action').show();
$('.subs-body').show();
$('.ban-note').show();
$('.global-button').show();
$('.edit-user-flair').show();
$('.nuke-comment-chain').show();
$('.edit-dropdown').show();
$('.settingSave').hide();
$('.edit-subreddits').hide();
>>>>>>>
// TODO: replace this with a real tab view controller so we don't have to duplicate these lines all the time
$(this).parents('.mod-popup').find('.edit-user-flair').removeClass('active');
$(this).parents('.mod-popup').find('.user-role').addClass('active');
$(this).parents('.mod-popup').find('.edit-modbutton-settings').removeClass('active');
$(this).parents('.mod-popup').find('.mod-popup-tab-settings').hide();
$(this).parents('.mod-popup').find('.mod-popup-tab-flair').hide();
$(this).parents('.mod-popup').find('.mod-popup-tab-role').show(); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.