conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
pref("extensions.firetray.mail_accounts", '{ "serverTypes": {"pop3":{"order":1,"excluded":false}, "imap":{"order":1,"excluded":false}, "movemail":{"order":2,"excluded":true}, "none":{"order":3,"excluded":false}, "rss":{"order":4,"excluded":true}, "nntp":{"order":5,"excluded":true}}, "excludedAccounts": [] }'); // JSON
pref("extensions.firetray.only_favorite_folders", false);
=======
pref("extensions.firetray.mail_accounts", '{ "serverTypes": {"pop3":{"order":1,"excluded":false}, "imap":{"order":1,"excluded":false}, "movemail":{"order":2,"excluded":true}, "none":{"order":3,"excluded":false}, "rss":{"order":4,"excluded":true}, "nntp":{"order":5,"excluded":true}, "exquilla":{"order":6,"excluded":true}}, "excludedAccounts": [] }'); // JSON
>>>>>>>
pref("extensions.firetray.mail_accounts", '{ "serverTypes": {"pop3":{"order":1,"excluded":false}, "imap":{"order":1,"excluded":false}, "movemail":{"order":2,"excluded":true}, "none":{"order":3,"excluded":false}, "rss":{"order":4,"excluded":true}, "nntp":{"order":5,"excluded":true}, "exquilla":{"order":6,"excluded":true}}, "excludedAccounts": [] }'); // JSON
pref("extensions.firetray.only_favorite_folders", false); |
<<<<<<<
if (isNewModel && !setUpdatedAt || this.hasChanged() && !setUpdatedAt) {
=======
if (options && options.date) deprecate('options.date', 'the model\'s timestamp attributes to set these values')
if (updatedAtKey && (isNewModel && !setUpdatedAt || this.hasChanged() && !setUpdatedAt)) {
>>>>>>>
if (updatedAtKey && (isNewModel && !setUpdatedAt || this.hasChanged() && !setUpdatedAt)) { |
<<<<<<<
this.emit('readyForVideoStart');
this.machine.once('timeEstimate', function(timeEstimate) {
this.emit('timeEstimate', timeEstimate);
}.bind(this));
=======
//this.emit('readyForVideoStart');
//this.machine.once('timeEstimate',function(timeEstimate){this.emit('timeEstimate',timeEstimate);}.bind(this));
console.log("++ starting machine from dmcl ++");
>>>>>>>
this.emit('readyForVideoStart');
this.machine.once('timeEstimate', function(timeEstimate) {
this.emit('timeEstimate', timeEstimate);
}.bind(this));
<<<<<<<
//this.machine.removeAllListeners(); //avoid multiple event listeners
this.machine.once('drawingComplete', function(movement) {
=======
this.machine.removeAllListeners(); //avoid multiple event listeners
this.machine.once('drawingComplete', function(movement){
>>>>>>>
this.machine.removeAllListeners(); //avoid multiple event listeners
this.machine.once('drawingComplete', function(movement) { |
<<<<<<<
mobservable.batch(function() {
=======
mobservable.onceReady(function() {
//this is called async, and only after everything has finished, so d should be 54
test.deepEqual(54, d()); // only one new value for d
test.equal(mobservable.stackDepth(), 0);
test.done();
});
var x = mobservable.batch(function() {
>>>>>>>
var x = mobservable.batch(function() { |
<<<<<<<
export default function(breakpoints, { literal, overlap } = {}) {
const mq = literal ? breakpoints : [''].concat(breakpoints)
=======
export default function(breakpoints, { overlap } = {}) {
const mq = ['&'].concat(breakpoints)
>>>>>>>
export default function(breakpoints, { literal, overlap } = {}) {
const mq = literal ? breakpoints : ['&'].concat(breakpoints)
<<<<<<<
if (index === 0 && !literal) {
slots[key] = v
} else if (!slots[mq[index]]) {
=======
if (slots[mq[index]] === undefined) {
>>>>>>>
if (index === 0 && !literal) {
slots[key] = v
} else if (slots[mq[index]] === undefined) { |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
// P4 ISSUE: DETAILED BEHAVIOR OF HOOKS
//
// As implemented here, hooks are just ordinary properties of the
// Loader object. Default implementations are just ordinary methods
// of the Loader class. Loader subclasses can add methods with the
// appropriate names, and use `super()` to invoke the base-class
// behavior, and stuff will "just work".
//
// It's not clear that's the right design. What's specified in the
// document right now is different: hooks are stored in internal
// properties, and the loader exposes getters for each hook. Firing
// a hook takes it from the internal property. In no circumstance
// does `super` work.
//
var self = this;
function takeHook(name) {
=======
/*
P4 ISSUE: DETAILED BEHAVIOR OF HOOKS
As implemented here, hooks are just ordinary properties of the
Loader object. Default implementations are just ordinary methods
of the Loader class. Loader subclasses can add methods with the
appropriate names, and use super() to invoke the base-class
behavior, and stuff will "just work".
It's not clear that's the right design. What's specified in the
document right now is different: hooks are stored in internal
properties, and the loader exposes getters for each hook. Firing
a hook takes it from the internal property. In no circumstance
does super work.
*/
let takeHook = name => {
>>>>>>>
// P4 ISSUE: DETAILED BEHAVIOR OF HOOKS
//
// As implemented here, hooks are just ordinary properties of the
// Loader object. Default implementations are just ordinary methods
// of the Loader class. Loader subclasses can add methods with the
// appropriate names, and use `super()` to invoke the base-class
// behavior, and stuff will "just work".
//
// It's not clear that's the right design. What's specified in the
// document right now is different: hooks are stored in internal
// properties, and the loader exposes getters for each hook. Firing
// a hook takes it from the internal property. In no circumstance
// does `super` work.
//
let takeHook = name => { |
<<<<<<<
=======
import path from 'path'
import fs from 'fs'
import { components } from 'mjml-core'
>>>>>>>
import path from 'path'
import fs from 'fs'
<<<<<<<
const CDATASections = _.chain({
...components,
})
.filter(component => component.prototype.endingTag)
.map(component => component.tagName)
.value()
=======
const cwd = filePath ? path.dirname(filePath) : process.cwd()
>>>>>>>
const CDATASections = _.chain({
...components,
})
.filter(component => component.prototype.endingTag)
.map(component => component.tagName)
.value()
const cwd = filePath ? path.dirname(filePath) : process.cwd() |
<<<<<<<
import shorthandParser, { borderParser } from './helpers/shorthandParser'
=======
import shorthandParser from './helpers/shorthandParser'
import formatAttributes from './helpers/formatAttributes'
>>>>>>>
import shorthandParser, { borderParser } from './helpers/shorthandParser'
import formatAttributes from './helpers/formatAttributes' |
<<<<<<<
export default class extends BodyComponent {
static tagName = 'mj-column'
// static allowedAttributes: {
// 'background-color': 'color',
// border: 'unit(px)',
// 'border-bottom': 'unit(px)',
// 'border-left': 'unit(px)',
// 'border-radius': 'unit(px)',
// 'border-right': 'unit(px)',
// 'border-top': 'unit(px)',
// direction: 'enum(ltr,rtl)',
// 'padding-bottom': 'unit(px,%)',
// 'padding-left': 'unit(px,%)',
// 'padding-right': 'unit(px,%)',
// 'padding-top': 'unit(px,%)',
// padding: 'unit(px,%){1,4}',
// 'vertical-align': 'string',
// width: 'unit(px,%)',
// }
static defaultAttributes = {
direction: 'ltr',
}
=======
export default createBodyComponent('mj-column', {
allowedAttributes: {
'background-color': 'color',
'border': 'unit(px)',
'border-bottom': 'unit(px)',
'border-left': 'unit(px)',
'border-radius': 'unit(px)',
'border-right': 'unit(px)',
'border-top': 'unit(px)',
'direction': 'enum(ltr,rtl)',
'padding-bottom': 'unit(px,%)',
'padding-left': 'unit(px,%)',
'padding-right': 'unit(px,%)',
'padding-top': 'unit(px,%)',
'padding': 'unit(px,%){1,4}',
'vertical-align': 'string',
'width': 'unit(px,%)',
},
defaultAttributes: {
'direction': 'ltr',
},
>>>>>>>
export default class extends BodyComponent {
static tagName = 'mj-column'
// static allowedAttributes: {
// 'background-color': 'color',
// border: 'unit(px)',
// 'border-bottom': 'unit(px)',
// 'border-left': 'unit(px)',
// 'border-radius': 'unit(px)',
// 'border-right': 'unit(px)',
// 'border-top': 'unit(px)',
// direction: 'enum(ltr,rtl)',
// 'padding-bottom': 'unit(px,%)',
// 'padding-left': 'unit(px,%)',
// 'padding-right': 'unit(px,%)',
// 'padding-top': 'unit(px,%)',
// padding: 'unit(px,%){1,4}',
// 'vertical-align': 'string',
// width: 'unit(px,%)',
// }
static defaultAttributes = {
direction: 'ltr',
}
<<<<<<<
'background-color': this.getAttribute('background-color'),
border: this.getAttribute('border'),
'border-bottom': this.getAttribute('border-bottom'),
'border-left': this.getAttribute('border-left'),
'border-radius': this.getAttribute('border-radius'),
'border-right': this.getAttribute('border-right'),
'border-top': this.getAttribute('border-top'),
'vertical-align': this.getAttribute('vertical-align'),
=======
'background-color': this.getMjAttribute('background-color'),
'border': this.getMjAttribute('border'),
'border-bottom': this.getMjAttribute('border-bottom'),
'border-left': this.getMjAttribute('border-left'),
'border-radius': this.getMjAttribute('border-radius'),
'border-right': this.getMjAttribute('border-right'),
'border-top': this.getMjAttribute('border-top'),
'vertical-align': this.getMjAttribute('vertical-align'),
>>>>>>>
'background-color': this.getAttribute('background-color'),
border: this.getAttribute('border'),
'border-bottom': this.getAttribute('border-bottom'),
'border-left': this.getAttribute('border-left'),
'border-radius': this.getAttribute('border-radius'),
'border-right': this.getAttribute('border-right'),
'border-top': this.getAttribute('border-top'),
'vertical-align': this.getAttribute('vertical-align'),
<<<<<<<
'vertical-align': this.getAttribute('vertical-align'),
width: '100%',
=======
'vertical-align': this.getMjAttribute('vertical-align'),
'width': this.getMobileWidth(),
>>>>>>>
'vertical-align': this.getAttribute('vertical-align'),
'width': this.getMobileWidth(),
<<<<<<<
'td-outlook': {
'vertical-align': this.getAttribute('vertical-align'),
width: this.getParsedWidth(true), // should be in PX for outlook
=======
'td-outlook' : {
'vertical-align': this.getMjAttribute('vertical-align'),
'width': this.getParsedWidth(true), // should be in PX for outlook
>>>>>>>
'td-outlook': {
'vertical-align': this.getAttribute('vertical-align'),
'width': this.getParsedWidth(true), // should be in PX for outlook
<<<<<<<
background: component.getAttribute('container-background-color'),
'font-size': 0,
padding: component.getAttribute('padding'),
'padding-top': component.getAttribute('padding-top'),
'padding-right': component.getAttribute('padding-right'),
'padding-bottom': component.getAttribute('padding-bottom'),
'padding-left': component.getAttribute('padding-left'),
=======
'background': component.getMjAttribute('container-background-color'),
'font-size': '0px',
'padding': component.getMjAttribute('padding'),
'padding-top': component.getMjAttribute('padding-top'),
'padding-right': component.getMjAttribute('padding-right'),
'padding-bottom': component.getMjAttribute('padding-bottom'),
'padding-left': component.getMjAttribute('padding-left'),
>>>>>>>
'background': component.getAttribute('container-background-color'),
'font-size': '0px',
'padding': component.getAttribute('padding'),
'padding-top': component.getAttribute('padding-top'),
'padding-right': component.getAttribute('padding-right'),
'padding-bottom': component.getAttribute('padding-bottom'),
'padding-left': component.getAttribute('padding-left'), |
<<<<<<<
!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.Formatic=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
module.exports = require('./lib/formatic');
},{"./lib/formatic":42}],2:[function(require,module,exports){
=======
!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.formatic=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
>>>>>>>
!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.Formatic=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
<<<<<<<
},{}],34:[function(require,module,exports){
(function (global){
=======
},{}],33:[function(require,module,exports){
>>>>>>>
},{}],33:[function(require,module,exports){
(function (global){
<<<<<<<
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
},{}],35:[function(require,module,exports){
=======
},{}],34:[function(require,module,exports){
>>>>>>>
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
},{}],34:[function(require,module,exports){ |
<<<<<<<
if (field.key) {
var onChange = function () {
throw new Error('No onChange hook defined.');
};
if (formatic.hasMethod('onChangeComponent')) {
onChange = formatic.onChangeComponent.bind(null, this.onChange.bind(this, field));
}
props.onChange = onChange;
}
var createAction = function () {
throw new Error('No onAction hook defined');
};
if (formatic.hasMethod('onActionOfComponent')) {
createAction = function (name) {
return formatic.onActionOfComponent.bind(null, self.onAction.bind(self, name, field));
};
}
props.action = createAction;
if (formatic.hasMethod('format_' + field.type)) {
field.value = formatic['format_' + field.type](field.value);
}
=======
>>>>>>>
if (formatic.hasMethod('format_' + field.type)) {
field.value = formatic['format_' + field.type](field.value);
} |
<<<<<<<
await matchingEngine.setFeeAccountedPerReserveType(true, true, true, false, true, true, {from: admin});
=======
await matchingEngine.setKyberStorage(networkStorage.address, {from: admin});
await matchingEngine.setFeePayingPerReserveType(true, true, true, false, true, true, {from: admin});
>>>>>>>
await matchingEngine.setKyberStorage(networkStorage.address, {from: admin});
await matchingEngine.setFeeAccountedPerReserveType(true, true, true, false, true, true, {from: admin}); |
<<<<<<<
let tradeLogic;
=======
let hintParser;
>>>>>>>
let tradeLogic;
<<<<<<<
=======
hintParser = accounts[6];
//DAO related init.
expiryBlockNumber = new BN(await web3.eth.getBlockNumber() + 150);
DAO = await MockDao.new(rewardInBPS, rebateInBPS, epoch, expiryBlockNumber);
await DAO.setTakerFeeBps(takerFeesBps);
//init network
network = await KyberNetwork.new(admin);
// set proxy same as network
proxyForFeeHandler = network;
>>>>>>>
hintParser = accounts[6];
//DAO related init.
expiryBlockNumber = new BN(await web3.eth.getBlockNumber() + 150);
DAO = await MockDao.new(rewardInBPS, rebateInBPS, epoch, expiryBlockNumber);
await DAO.setTakerFeeBps(takerFeesBps);
//init network
network = await KyberNetwork.new(admin);
// set proxy same as network
proxyForFeeHandler = network;
<<<<<<<
=======
//setup network
await network.addOperator(operator, {from: admin});
await network.addKyberProxy(networkProxy, {from: admin});
await network.setContracts(feeHandler.address, DAO.address, hintParser, {from: admin});
for (let i = 0; i < numReserves; i++) {
reserve = reserves[i];
network.addReserve(reserve.address, new BN(i+1), isFeePaying[i], reserve.address, {from: operator});
for (let j = 0; j < numTokens; j++) {
network.listPairForReserve(reserve.address, tokens[j].address, true, true, true, {from: operator});
}
}
await network.setParams(gasPrice, negligibleRateDiffBps, {from: admin});
await network.setEnable(true, {from: admin});
>>>>>>>
<<<<<<<
//TODO: implement logic for other reserves
for (i=0; i < numReserves; i++) {
isFeePaying[i] = (i >= (numReserves / 2));
}
}
=======
it("test encode decode taker fee data with mock setter getter", async() => {
let tempNetwork = await MockNetwork.new(admin);
await tempNetwork.setContracts(feeHandler.address, DAO.address, hintParser, {from: admin});
>>>>>>>
//TODO: implement logic for other reserves
for (i=0; i < numReserves; i++) {
isFeePaying[i] = (i >= (numReserves / 2));
}
} |
<<<<<<<
const oneEth = new BN(10).pow(ethDecimals);
=======
const defaultNetworkFeeBps = new BN(25);
>>>>>>>
const oneEth = new BN(10).pow(ethDecimals);
const defaultNetworkFeeBps = new BN(25); |
<<<<<<<
'with non-array parameter. Ignoring requirement.');
*/
=======
'with unrecognized parameter. Ignoring requirement.');
>>>>>>>
'with unrecognized parameter. Ignoring requirement.');
*/ |
<<<<<<<
Svelte: !setToSelected,
}
=======
};
>>>>>>>
Svelte: !setToSelected,
};
<<<<<<<
Svelte: !setToSelected,
}
}
} else if (affectedFeature === 'Svelte') {
if (setToSelected) {
return {
...allFeatureStates,
Vue: !setToSelected,
React: !setToSelected,
}
=======
};
>>>>>>>
Svelte: !setToSelected,
};
}
} else if (affectedFeature === 'Svelte') {
if (setToSelected) {
return {
...allFeatureStates,
Vue: !setToSelected,
React: !setToSelected,
}; |
<<<<<<<
const isTypescript = _.includes(configItems, 'Typescript')
const isHotReact = _.includes(configItems, 'React hot loader')
const extraImports = getStyleImports(configItems)
=======
const isTypescript = _.includes(configItems, 'Typescript');
const isHotReact = _.includes(configItems, 'React hot loader'); // Bug fix: Should check on configItems
const extraImports = getStyleImports(configItems);
>>>>>>>
const isTypescript = _.includes(configItems, 'Typescript');
const isHotReact = _.includes(configItems, 'React hot loader');
const extraImports = getStyleImports(configItems);
<<<<<<<
const isTypescript = _.includes(configItems, 'Typescript')
const indexFilename = isTypescript ? 'src/index.ts' : 'src/index.js'
const styling = getStyleTags(configItems)
=======
const isTypescript = _.includes(configItems, 'Typescript');
const indexFilename = isTypescript ? 'src/index.ts' : 'src/index.js';
const isCss = _.includes(configItems, 'CSS');
const isLess = _.includes(configItems, 'Less');
const isSass = _.includes(configItems, 'Sass');
const isStylus = _.includes(configItems, 'stylus');
const cssStyle = `<style>
${css}
</style>`;
const lessStyle = `<style lang="less">
${less}
</style>`;
const sassStyle = `<style lang="scss">
${scss}
</style>`;
const stylusStyle = `<style lang="styl">
${stylus}
</style>`;
const styling = _.concat(
[],
isCss ? cssStyle : [],
isSass ? sassStyle : [],
isLess ? lessStyle : [],
isStylus ? stylusStyle : []
);
>>>>>>>
const isTypescript = _.includes(configItems, 'Typescript');
const indexFilename = isTypescript ? 'src/index.ts' : 'src/index.js';
const styling = getStyleTags(configItems);
<<<<<<<
const isTypescript = _.includes(configItems, 'Typescript')
const extraImports = getStyleImports(configItems)
if (!isTypescript) {
=======
const isReact = _.includes(configItems, 'React');
const isVue = _.includes(configItems, 'Vue');
const isTypescript = _.includes(configItems, 'Typescript');
const extraImports = getStyleImports(configItems);
if (!isTypescript && !isReact && !isVue) {
>>>>>>>
const isTypescript = _.includes(configItems, 'Typescript');
const extraImports = getStyleImports(configItems);
if (!isTypescript) { |
<<<<<<<
render_tags: function(template, context) {
var pop_first = function(lines) {
var lines_array = lines.split("\n");
lines_array.shift();
return lines_array.join("\n");
};
var new_regex = function() {
=======
render_tags: function(template) {
var lines = template.split("\n");
new_regex = function() {
>>>>>>>
render_tags: function(template, context) {
var lines = template.split("\n");
var new_regex = function() {
<<<<<<<
regex = new_regex();
var lines = template;
// for each {{(!<{)?foo}} tag, do...
while(regex.test(lines)) {
template = template.replace(regex, function (match, operator, name) {
switch(operator) {
case "!": // ignore comments
return match;
case "=": // set new delimiters
that.set_delimiters(name);
return "";
case "<": // render partial
return that.render_partial(name, context);
case "{": // the triple mustache is unescaped
return that.find(name, context);
default: // escape the value
return that.escape(that.find(name, context));
}
}, this);
regex = new_regex();
lines = pop_first(lines);
}
return template;
=======
var regex = new_regex();
for (var i=0; i < lines.length; i++) {
lines[i] = lines[i].replace(regex,
function (match,operator,name) {
switch(operator) {
case "!": // ignore comments
return match;
case "=": // set new delimiters, rebuild the replace regexp
that.set_delimiters(name);
regex = new_regex();
return "";
case "<": // render partial
return that.render_partial(name);
case "{": // the triple mustache is unescaped
return that.find(name);
default: // escape the value
return that.escape(that.find(name));
}},
this);
};
return lines.join("\n");
>>>>>>>
var regex = new_regex();
for (var i=0; i < lines.length; i++) {
lines[i] = lines[i].replace(regex,
function (match,operator,name) {
switch(operator) {
case "!": // ignore comments
return match;
case "=": // set new delimiters, rebuild the replace regexp
that.set_delimiters(name);
regex = new_regex();
return "";
case "<": // render partial
return that.render_partial(name, context);
case "{": // the triple mustache is unescaped
return that.find(name, context);
default: // escape the value
return that.escape(that.find(name, context));
}},
this);
};
return lines.join("\n"); |
<<<<<<<
let hints = null
let selected = null
let isShown = false
=======
let hints = null
let selected = null
let length = 0
let isShown = false
>>>>>>>
let hints = null
let isShown = false
<<<<<<<
isShown = true
=======
select(0)
isShown = true
>>>>>>>
isShown = true
<<<<<<<
render: render,
=======
render: render,
select: select,
>>>>>>>
render: render, |
<<<<<<<
root: settings.root,
hardware: settings.root + '/hardware',
avrbase: settings.root + '/hardware/tools/avr/bin'
=======
name: 'Blink',
>>>>>>>
root: settings.root,
hardware: settings.root + '/hardware',
avrbase: settings.root + '/hardware/tools/avr/bin'
<<<<<<<
OPTIONS.name = sketch;
compile.compile(sketchpath,outpath,OPTIONS, publishEvent, path.join(settings.usersketches, sketch));
=======
OPTIONS.platform = platform.getDefaultPlatform();
compile.compile(sketchpath,outpath,OPTIONS, publishEvent,settings.usersketches+'/'+sketch);
>>>>>>>
OPTIONS.platform = platform.getDefaultPlatform();
OPTIONS.name = sketch;
compile.compile(sketchpath,outpath,OPTIONS, publishEvent, path.join(settings.usersketches, sketch));
<<<<<<<
console.log('port = ',req.body.port);
console.log('OPTIONS = ',OPTIONS);
uploader.upload(path.join('build', 'out', req.body.sketch+'.hex'),req.body.port,OPTIONS);
=======
uploader.upload('build/out/Blink.hex',req.body.port,OPTIONS);
>>>>>>>
uploader.upload(path.join('build', 'out', req.body.sketch+'.hex'),req.body.port,OPTIONS); |
<<<<<<<
NavigationHeaderTitle,
NavigationState,
Platform,
=======
>>>>>>>
NavigationHeaderTitle,
NavigationState,
Platform,
<<<<<<<
initialState={new NavigationState([ 'First Route' ], 0)}
renderNavigator={(navState, onNavigation) => (
<NavigationAnimatedView
navigationState={navState}
style={styles.animatedView}
renderOverlay={(props) => (
<NavigationHeader
{...props}
renderLeftComponent={(route, index) => {
if (index === 0) {
return null;
}
return <NavigationExampleBackButton onNavigation={onNavigation} />;
}}
renderTitleComponent={route => <NavigationHeaderTitle>{route}</NavigationHeaderTitle>}
/>
)}
renderScene={(props) => (
<NavigationCard
{...props}>
<ScrollView style={styles.scrollView}>
<NavigationExampleRow
text={props.sceneRecord.get('route')}
/>
<NavigationExampleRow
text="Push!"
onPress={() => {
onNavigation(new NavigationActions.Push('Another Route'));
}}
/>
<NavigationExampleRow
text="Exit Animated Nav Example"
onPress={this.props.onExampleExit}
/>
</ScrollView>
</NavigationCard>
)}
=======
initialState={{routes: [ 'First Route' ], index: 0}}
persistenceKey="NAV_EXAMPLE_STATE_ANIMATED"
renderNavigator={(navState, onNavigation) => {
if (!navState) {
return null;
}
return this._renderNavigated.call(this, navState, onNavigation);
}}
/>
);
}
_renderNavigated(navState, onNavigation) {
return (
<NavigationAnimatedView
navigationState={navState}
style={styles.animatedView}
renderOverlay={(navState, position, layout) => (
<NavigationHeader
navState={navState}
position={position}
layout={layout}
getTitle={route => route}
>>>>>>>
initialState={{routes: [ 'First Route' ], index: 0}}
persistenceKey="NAV_EXAMPLE_STATE_ANIMATED"
renderNavigator={(navState, onNavigation) => {
if (!navState) {
return null;
}
return this._renderNavigated.call(this, navState, onNavigation);
}}
/>
);
}
_renderNavigated(navState, onNavigation) {
return (
<NavigationAnimatedView
navigationState={navState}
style={styles.animatedView}
renderOverlay={(navState, position, layout) => (
<NavigationHeader
position={position}
layout={layout}
renderLeftComponent={(route, index) => {
if (index === 0) {
return null;
}
return <NavigationExampleBackButton onNavigation={onNavigation} />;
}}
renderTitleComponent={route => <NavigationHeaderTitle>{route}</NavigationHeaderTitle>} |
<<<<<<<
const { getClaimList, resolveUri } = require('../helpers/lbryApi.js');
const { createPublishParams, validateApiPublishRequest, validatePublishSubmission, cleanseChannelName, cleanseUserName, checkClaimNameAvailability, checkChannelAvailability } = require('../helpers/publishHelpers.js');
=======
const { getClaimList, resolveUri, getClaim } = require('../helpers/lbryApi.js');
const { createPublishParams, validateApiPublishRequest, validatePublishSubmission, cleanseChannelName, checkClaimNameAvailability, checkChannelAvailability } = require('../helpers/publishHelpers.js');
>>>>>>>
const { getClaimList, resolveUri, getClaim } = require('../helpers/lbryApi.js');
const { createPublishParams, validateApiPublishRequest, validatePublishSubmission, cleanseChannelName, cleanseUserName, checkClaimNameAvailability, checkChannelAvailability } = require('../helpers/publishHelpers.js'); |
<<<<<<<
logger.info('getting LBC balance from lbrynet...');
return getWalletBalance();
})
.then(balance => {
logger.info('starting LBC balance:', balance);
=======
>>>>>>> |
<<<<<<<
const { addGetResultsToFileData, createFileData, createPublishParams, createThumbnailPublishParams, parsePublishApiRequestBody, parsePublishApiRequestFiles, parsePublishApiChannel } = require('../helpers/publishHelpers.js');
=======
const { createBasicPublishParams, parsePublishApiRequestBody, parsePublishApiRequestFiles, addGetResultsToFileData, createFileData } = require('../helpers/publishHelpers.js');
>>>>>>>
const { addGetResultsToFileData, createBasicPublishParams, createThumbnailPublishParams, parsePublishApiRequestBody, parsePublishApiRequestFiles, createFileData } = require('../helpers/publishHelpers.js');
<<<<<<<
let name, fileName, filePath, fileType, thumbnailFileName, thumbnailFilePath, thumbnailFileType, nsfw, license, title, description, thumbnail, channelName, channelPassword;
=======
let name, fileName, filePath, fileType, nsfw, license, title, description, thumbnail, channelName, channelId, channelPassword;
>>>>>>>
let name, fileName, filePath, fileType, thumbnailFileName, thumbnailFilePath, thumbnailFileType, nsfw, license, title, description, thumbnail, channelName, channelId, channelPassword;
<<<<<<<
({fileName, filePath, fileType, thumbnailFileName, thumbnailFilePath, thumbnailFileType} = parsePublishApiRequestFiles(files));
({channelName, channelPassword} = parsePublishApiChannel(body, user));
=======
({fileName, filePath, fileType} = parsePublishApiRequestFiles(files));
({channelName, channelId, channelPassword} = body);
>>>>>>>
({fileName, filePath, fileType, thumbnailFileName, thumbnailFilePath, thumbnailFileType} = parsePublishApiRequestFiles(files));
({channelName, channelId, channelPassword} = body);
<<<<<<<
// make sure the claim name is available
return checkClaimNameAvailability(name);
})
.then(result => {
if (!result) {
throw new Error('That name is already claimed by another user.');
}
// create publish parameters object
return Promise.all([
createPublishParams(filePath, name, title, description, license, nsfw, thumbnail, channelName),
createThumbnailPublishParams(thumbnailFilePath, name, license, nsfw),
]);
})
.then(([publishParams, thumbnailPublishParams]) => {
// publish the thumbnail
if (thumbnailPublishParams) {
publish(thumbnailPublishParams, thumbnailFileName, thumbnailFileType);
}
=======
>>>>>>>
// publish the thumbnail
if (thumbnailPublishParams) {
publish(thumbnailPublishParams, thumbnailFileName, thumbnailFileType);
} |
<<<<<<<
const importTxt = (e) => {
localStorage.getItem("data");
=======
const downloadPdf = imgDataUri => {
const doc = new jsPDF("p", "pt", "a4");
const width = doc.internal.pageSize.width;
const height = doc.internal.pageSize.height;
doc.text(10, 20, "");
doc.addImage(imgDataUri, "PNG", 0, 0, width, height);
doc.save();
};
const importTxt = e => {
>>>>>>>
const downloadPdf = imgDataUri => {
const doc = new jsPDF("p", "pt", "a4");
const width = doc.internal.pageSize.width;
const height = doc.internal.pageSize.height;
doc.text(10, 20, "");
doc.addImage(imgDataUri, "PNG", 0, 0, width, height);
doc.save();
};
const importTxt = e => {
<<<<<<<
let textarea = document.querySelector('#show-text')
var file = document.querySelector('input[type=file]').files[0];
var reader = new FileReader()
var textFile = /text.*/;
if (file.type.match(textFile)) {
reader.onload = function (event) {
let rtf = convertToPlain(event.target.result);
textarea.value += rtf;
}
} else {
textarea.value += "<span class='error'>It doesn't seem to be a text file!</span>";
}
reader.readAsText(file);
} else {
=======
let textarea = document.querySelector("#show-text");
var file = document.querySelector("input[type=file]").files[0];
var reader = new FileReader();
var textFile = /text.*/;
if (file.type.match(textFile)) {
reader.onload = function (event) {
let rtf = convertToPlain(event.target.result);
textarea.value += rtf;
};
} else {
textarea.value += "<span class='error'>It doesn't seem to be a text file!</span>";
}
reader.readAsText(file);
} else {
>>>>>>>
let textarea = document.querySelector("#show-text");
var file = document.querySelector("input[type=file]").files[0];
var reader = new FileReader();
var textFile = /text.*/;
if (file.type.match(textFile)) {
reader.onload = function (event) {
let rtf = convertToPlain(event.target.result);
textarea.value += rtf;
}
} else {
textarea.value += "<span class='error'>It doesn't seem to be a text file!</span>";
}
reader.readAsText(file);
} else {
<<<<<<<
}
}
=======
}
};
>>>>>>>
}
}
<<<<<<<
rtf = rtf.replace(/\\par[d]?/g, "");
rtf = rtf.replace(/\{\*?\\[^{}]+}|[{}]|\\\n?[A-Za-z]+\n?(?:-?\d+)?[ ]?/g, "");
// rtf = rtf.replace(/\n/ig, " ");
rtf = rtf.replace(/\\/ig, "");
rtf = rtf.replace(/\*/ig, "");
rtf = rtf.replace(/decimal.|tightenfactor0|eftab720|HYPERLINK|irnatural/ig, "");
rtf = rtf.replace(/irnaturaltightenfactor0|000000/ig, "");
rtf = rtf.replace(/�|ࡱ|p#|#|,|%|@|\$|~/ig, "");
return rtf.replace(/\\'[0-9a-zA-Z]{2}/g, "").trim();
}
=======
rtf = rtf.replace(/\\par[d]?/g, "");
rtf = rtf.replace(/\{\*?\\[^{}]+}|[{}]|\\\n?[A-Za-z]+\n?(?:-?\d+)?[ ]?/g, "");
// rtf = rtf.replace(/\n/ig, " ");
rtf = rtf.replace(/\\/gi, "");
rtf = rtf.replace(/\*/gi, "");
rtf = rtf.replace(/decimal.|tightenfactor0|eftab720|HYPERLINK|irnatural/gi, "");
rtf = rtf.replace(/irnaturaltightenfactor0|000000/gi, "");
rtf = rtf.replace(/�|ࡱ|p#|#|,|%|@|\$|~/gi, "");
return rtf.replace(/\\'[0-9a-zA-Z]{2}/g, "").trim();
}
>>>>>>>
rtf = rtf.replace(/\\par[d]?/g, "");
rtf = rtf.replace(/\{\*?\\[^{}]+}|[{}]|\\\n?[A-Za-z]+\n?(?:-?\d+)?[ ]?/g, "");
// rtf = rtf.replace(/\n/ig, " ");
rtf = rtf.replace(/\\/gi, "");
rtf = rtf.replace(/\*/gi, "");
rtf = rtf.replace(/decimal.|tightenfactor0|eftab720|HYPERLINK|irnatural/gi, "");
rtf = rtf.replace(/irnaturaltightenfactor0|000000/gi, "");
rtf = rtf.replace(/�|ࡱ|p#|#|,|%|@|\$|~/gi, "");
return rtf.replace(/\\'[0-9a-zA-Z]{2}/g, "").trim();
} |
<<<<<<<
const testOptions = { classNames: 'some crazy string with classes' };
=======
assert.ok(parse('No emoji present') === 'No emoji present',
'return the same string if no emoji is present'
);
>>>>>>>
const testOptions = { classNames: 'some crazy string with classes' };
assert.ok(parse('No emoji present') === 'No emoji present',
'return the same string if no emoji is present'
); |
<<<<<<<
/**
* Return array with matched emojis in text.
*
* @example
* import {load as loadEmojis, find as findEmojis} from 'gh-emoji';
*
* const text = 'Do you believe in :alien:...? :scream:';
*
* loadEmojis().then((emojis) => {
* console.log(findEmojis(text)); // [':alien:', ':scream:']
* });
*
* @param {String} text Text to search for emojis.
*
* @returns {Array<String>} Array with matched emojis.
*/
export function find(text) {
=======
export function find(text: string): Array<string> {
>>>>>>>
type ParseOptions = {
classNames?: string,
};
/**
* Return array with matched emojis in text.
*
* @example
* import {load as loadEmojis, find as findEmojis} from 'gh-emoji';
*
* const text = 'Do you believe in :alien:...? :scream:';
*
* loadEmojis().then((emojis) => {
* console.log(findEmojis(text)); // [':alien:', ':scream:']
* });
*
* @param {String} text Text to search for emojis.
*
* @returns {Array<String>} Array with matched emojis.
*/
export function find(text: string): Array<string> {
<<<<<<<
/**
* Fetch the emoji data from Github's api.
*
* @example
* import {load as loadEmojis} from 'gh-emoji';
*
* loadEmojis().then((emojis) => {
* console.log(emojis['+1']); // 👍
* });
*
* @returns {Promise<Object>} Promise which passes Object with emoji names
* as keys and generated image tags as values to callback.
*/
export function load() {
=======
export function load(): Promise<EmojiMap> {
>>>>>>>
/**
* Fetch the emoji data from Github's api.
*
* @example
* import {load as loadEmojis} from 'gh-emoji';
*
* loadEmojis().then((emojis) => {
* console.log(emojis['+1']); // 👍
* });
*
* @returns {Promise<Object>} Promise which passes Object with emoji names
* as keys and generated image tags as values to callback.
*/
export function load(): Promise<EmojiMap> {
<<<<<<<
/**
* Return all fetched emojis.
*
* @example
* import {load as loadEmojis, all as allEmojis} from 'gh-emoji';
*
* loadEmojis().then(() => {
* console.log(allEmojis()); // {emojiName: emojiImageTag}
* });
*
* @returns {Object} Object with emoji names as keys and generated image tags
* as values.
*/
export function all() {
=======
export function all(): ?EmojiMap {
>>>>>>>
/**
* Return all fetched emojis.
*
* @example
* import {load as loadEmojis, all as allEmojis} from 'gh-emoji';
*
* loadEmojis().then(() => {
* console.log(allEmojis()); // {emojiName: emojiImageTag}
* });
*
* @returns {Object} Object with emoji names as keys and generated image tags
* as values.
*/
export function all(): ?EmojiMap { |
<<<<<<<
=======
})
const volumeListProps = {
dataSource: data,
loading,
showAttachHost(record) {
dispatch({
type: 'volume/showAttachHostModal',
payload: {
selected: record,
},
})
},
showBackups(record) {
dispatch(routerRedux.push({
pathname: '/backup',
query: {
field: 'volumeName',
keyword: record.name,
},
}))
},
showSnapshots() {
dispatch({
type: 'volume/showSnapshotsModal',
})
},
showRecurring(record) {
dispatch({
type: 'volume/showRecurringModal',
payload: {
selected: record,
},
})
},
deleteVolume(record) {
dispatch({
type: 'volume/delete',
payload: record,
})
},
detach(url) {
dispatch({
type: 'volume/detach',
payload: {
url,
},
})
},
>>>>>>>
<<<<<<<
data.forEach(vol => {
const found = hosts.find(h => vol.controller && h.id === vol.controller.hostId)
if (found) {
vol.host = found.name
}
})
const volumeListProps = {
dataSource: data,
loading,
showAttachHost(record) {
dispatch({
type: 'volume/showAttachHostModal',
payload: {
selected: record,
},
})
},
showSnapshots: (record) => {
history.push(`/volume/${record.name}/snapshot`)
},
showRecurring() {
dispatch({
type: 'volume/showRecurringModal',
})
},
deleteVolume(record) {
dispatch({
type: 'volume/delete',
payload: record,
})
},
detach(url) {
dispatch({
type: 'volume/detach',
payload: {
url,
},
})
},
}
=======
const volumeFilterProps = {
hosts,
field,
location,
keyword,
onSearch(fieldsValue) {
fieldsValue.keyword.length ? dispatch(routerRedux.push({
pathname: '/volume',
query: {
...location.query,
field: fieldsValue.field,
keyword: fieldsValue.keyword,
},
})) : dispatch(routerRedux.push({
pathname: '/volume',
query: {
host: location.query.host,
},
}))
},
onSelect(selectedHost) {
selectedHost ? dispatch(routerRedux.push({
pathname: '/volume',
query: {
...location.query,
host: selectedHost,
},
})) : dispatch(routerRedux.push({
pathname: '/volume',
query: {
field: location.query.field,
keyword: location.query.keyword,
},
}))
},
onAdd() {
dispatch({
type: 'volume/showCreateVolumeModal',
})
},
}
const attachHostModalProps = {
item: selected,
visible: attachHostModalVisible,
hosts,
onOk(selectedHost, url) {
dispatch({
type: 'volume/attach',
payload: {
host: selectedHost,
url,
},
})
},
onCancel() {
dispatch({
type: 'volume/hideAttachHostModal',
})
},
}
const createVolumeModalProps = {
item: {
numberOfReplicas: 2,
size: 20,
iops: 1000,
frontend: 'iscsi',
},
hosts,
visible: createVolumeModalVisible,
onOk(newVolume) {
dispatch({
type: 'volume/create',
payload: newVolume,
})
},
onCancel() {
dispatch({
type: 'volume/hideCreateVolumeModal',
})
},
}
const recurringModalProps = {
item: selected,
visible: recurringModalVisible,
onOk(recurring) {
dispatch({
type: 'volume/recurring',
payload: recurring,
})
},
onCancel() {
dispatch({
type: 'volume/hideRecurringModal',
})
},
}
const snapshotsModalProps = {
item: {
},
visible: snapshotsModalVisible,
onCancel() {
dispatch({
type: 'volume/hideSnapshotsModal',
})
},
}
>>>>>>>
data.forEach(vol => {
const found = hosts.find(h => vol.controller && h.id === vol.controller.hostId)
if (found) {
vol.host = found.name
}
})
const volumeListProps = {
dataSource: data,
loading,
showAttachHost(record) {
dispatch({
type: 'volume/showAttachHostModal',
payload: {
selected: record,
},
})
},
showSnapshots: (record) => {
history.push(`/volume/${record.name}/snapshot`)
},
showRecurring() {
dispatch({
type: 'volume/showRecurringModal',
})
},
deleteVolume(record) {
dispatch({
type: 'volume/delete',
payload: record,
})
},
detach(url) {
dispatch({
type: 'volume/detach',
payload: {
url,
},
})
},
} |
<<<<<<<
import { Form, Input, Modal, InputNumber } from 'antd'
=======
import { Form, Input, InputNumber, Radio, Select } from 'antd'
import { ModalBlur } from '../../components'
>>>>>>>
import { Form, Input, InputNumber } from 'antd'
import { ModalBlur } from '../../components' |
<<<<<<<
}
export function hzToOctaves(freq, A440) {
return Math.log2(16 * freq / A440);
}
export function normalizeByColumn (a) {
var emptyRow = a[0].map(() => 0);
var colDenominators = a.reduce((acc, row) => {
row.forEach((cell, j) => {
acc[j] += Math.pow(cell, 2);
});
return acc;
}, emptyRow).map(Math.sqrt);
return a.map((row, i) => row.map((v, j) => v / (colDenominators[j] || 1) ));
};
export function createChromaFilterBank(numFilters, sampleRate, bufferSize, centerOctave=5, octaveWidth=2, baseC=true, A440=440) {
var numOutputBins = Math.floor(bufferSize / 2) + 1;
var frequencyBins = new Array(bufferSize).fill(0)
.map((_, i) => numFilters * hzToOctaves(sampleRate * i / bufferSize, A440));
// Set a value for the 0 Hz bin that is 1.5 octaves below bin 1
// (so chroma is 50% rotated from bin 1, and bin width is broad)
frequencyBins[0] = frequencyBins[1] - 1.5 * numFilters;
var binWidthBins = frequencyBins
.slice(1)
.map((v, i) => Math.max(v - frequencyBins[i]), 1)
.concat([1]);
var halfNumFilters = Math.round(numFilters / 2);
var filterPeaks = new Array(numFilters).fill(0)
.map((_, i) => frequencyBins.map(frq =>
((10 * numFilters + halfNumFilters + frq - i) % numFilters) - halfNumFilters
));
var weights = filterPeaks.map((row, i) => row.map((_, j) => (
Math.exp(-0.5 * Math.pow(2 * filterPeaks[i][j] / binWidthBins[j], 2))
)));
weights = normalizeByColumn(weights);
if (octaveWidth) {
var octaveWeights = frequencyBins.map(v =>
Math.exp(-0.5 * Math.pow((v / numFilters - centerOctave) / octaveWidth, 2))
);
weights = weights.map(row => row.map((cell, j) => cell * octaveWeights[j]));
}
if (baseC) {
weights = [...weights.slice(3), ...weights.slice(0, 3)];
}
return weights.map(row => row.slice(0, numOutputBins));
=======
}
export function frame(buffer, frameLength, hopLength) {
if (buffer.length < frameLength) {
throw new Error('Buffer is too short for frame length');
}
if (hopLength < 1) {
throw new Error('Hop length cannot be less that 1');
}
if (frameLength < 1) {
throw new Error('Frame length cannot be less that 1');
}
const numFrames = 1 + Math.floor((buffer.length - frameLength) / hopLength);
return new Array(numFrames).fill(0).map((_, i) =>
buffer.slice(i * hopLength, (i * hopLength) + frameLength));
>>>>>>>
}
export function hzToOctaves(freq, A440) {
return Math.log2(16 * freq / A440);
}
export function normalizeByColumn (a) {
var emptyRow = a[0].map(() => 0);
var colDenominators = a.reduce((acc, row) => {
row.forEach((cell, j) => {
acc[j] += Math.pow(cell, 2);
});
return acc;
}, emptyRow).map(Math.sqrt);
return a.map((row, i) => row.map((v, j) => v / (colDenominators[j] || 1) ));
};
export function createChromaFilterBank(numFilters, sampleRate, bufferSize, centerOctave=5, octaveWidth=2, baseC=true, A440=440) {
var numOutputBins = Math.floor(bufferSize / 2) + 1;
var frequencyBins = new Array(bufferSize).fill(0)
.map((_, i) => numFilters * hzToOctaves(sampleRate * i / bufferSize, A440));
// Set a value for the 0 Hz bin that is 1.5 octaves below bin 1
// (so chroma is 50% rotated from bin 1, and bin width is broad)
frequencyBins[0] = frequencyBins[1] - 1.5 * numFilters;
var binWidthBins = frequencyBins
.slice(1)
.map((v, i) => Math.max(v - frequencyBins[i]), 1)
.concat([1]);
var halfNumFilters = Math.round(numFilters / 2);
var filterPeaks = new Array(numFilters).fill(0)
.map((_, i) => frequencyBins.map(frq =>
((10 * numFilters + halfNumFilters + frq - i) % numFilters) - halfNumFilters
));
var weights = filterPeaks.map((row, i) => row.map((_, j) => (
Math.exp(-0.5 * Math.pow(2 * filterPeaks[i][j] / binWidthBins[j], 2))
)));
weights = normalizeByColumn(weights);
if (octaveWidth) {
var octaveWeights = frequencyBins.map(v =>
Math.exp(-0.5 * Math.pow((v / numFilters - centerOctave) / octaveWidth, 2))
);
weights = weights.map(row => row.map((cell, j) => cell * octaveWeights[j]));
}
if (baseC) {
weights = [...weights.slice(3), ...weights.slice(0, 3)];
}
return weights.map(row => row.slice(0, numOutputBins));
}
export function frame(buffer, frameLength, hopLength) {
if (buffer.length < frameLength) {
throw new Error('Buffer is too short for frame length');
}
if (hopLength < 1) {
throw new Error('Hop length cannot be less that 1');
}
if (frameLength < 1) {
throw new Error('Frame length cannot be less that 1');
}
const numFrames = 1 + Math.floor((buffer.length - frameLength) / hopLength);
return new Array(numFrames).fill(0).map((_, i) =>
buffer.slice(i * hopLength, (i * hopLength) + frameLength)); |
<<<<<<<
'ProcessIn and processOut': function (test) {
test.ok(typeof model.__verymeta.data.birthday === 'string');
test.ok(model.__verymeta.data.birthday === '1965-12-02T00:00:00.000Z');
test.ok(typeof model.toObject().birthday === 'object');
test.ok(model.toObject().birthday.getUTCMonth() === 11); // months are 0 indexed
test.ok(model.toObject().birthday.getUTCDate() === 2);
test.ok(model.toObject().birthday.getUTCFullYear() === 1965);
test.done();
},
=======
'Derived fields are populated': function (test) {
test.ok(model.toObject().name.full == 'Major-General Stanley');
test.done();
},
>>>>>>>
'ProcessIn and processOut': function (test) {
test.ok(typeof model.__verymeta.data.birthday === 'string');
test.ok(model.__verymeta.data.birthday === '1965-12-02T00:00:00.000Z');
test.ok(typeof model.toObject().birthday === 'object');
test.ok(model.toObject().birthday.getUTCMonth() === 11); // months are 0 indexed
test.ok(model.toObject().birthday.getUTCDate() === 2);
test.ok(model.toObject().birthday.getUTCFullYear() === 1965);
test.done();
},
'Derived fields are populated': function (test) {
test.ok(model.toObject().name.full == 'Major-General Stanley');
test.done();
}, |
<<<<<<<
=======
LineLinter = (function() {
>>>>>>>
LineLinter = (function() { |
<<<<<<<
html = '', badge = result.badge;
html += '<a href="../' + result.path + '">' + hlt(result.title);
=======
html = '',
badge = result.badge;
html += '<h1>' + hlt(result.title);
>>>>>>>
html = '',
badge = result.badge;
html += '<a href="../' + result.path + '">' + hlt(result.title);
<<<<<<<
a.href = '../' + item[1];
=======
>>>>>>>
a.href = '../' + item[1];
<<<<<<<
if (!item[1]) li.className = 'empty ';
cnt.appendChild(a);
=======
if (!item[1]) li.className = 'empty ';
cnt.appendChild(h1);
>>>>>>>
if (!item[1]) li.className = 'empty ';
cnt.appendChild(a); |
<<<<<<<
=======
console.log("photoCache");
console.log(photoCache);
>>>>>>>
console.log("photoCache");
console.log(photoCache); |
<<<<<<<
beddit: {
color: "rgb(255,100,0)",
facets: {
sleep: {
list: true,
photos: false,
map: true,
gps: false,
clock: ClockConfig.BODY_CATEGORY
}
}
},
=======
sleep_as_android: {
color: "rgb(0,128,0)",
facets: {
sleep: {
list: true,
photos: false,
map: true,
gps: false,
clock: ClockConfig.BODY_CATEGORY
}
}
},
>>>>>>>
beddit: {
color: "rgb(255,100,0)",
facets: {
sleep: {
list: true,
photos: false,
map: true,
gps: false,
clock: ClockConfig.BODY_CATEGORY
}
}
},
sleep_as_android: {
color: "rgb(0,128,0)",
facets: {
sleep: {
list: true,
photos: false,
map: true,
gps: false,
clock: ClockConfig.BODY_CATEGORY
}
}
}, |
<<<<<<<
console.log("createPhotoDialog is called: " + compoundPhotoId + ", " + timestamp + ", " + completionCallback);
=======
grapher.setTimeCursorPosition(timestamp);
>>>>>>>
grapher.setTimeCursorPosition(timestamp);
console.log("createPhotoDialog is called: " + compoundPhotoId + ", " + timestamp + ", " + completionCallback); |
<<<<<<<
var addressToUse = {latitude:0,longitude:0};
if (digest.addresses.ADDRESS_HOME != null && digest.addresses.ADDRESS_HOME.length != 0)
addressToUse = digest.addresses.ADDRESS_HOME[0];
var maxTimeBounds = {min:tbounds.start / 1000, max:tbounds.end / 1000};
=======
>>>>>>>
var maxTimeBounds = {min:tbounds.start / 1000, max:tbounds.end / 1000};
<<<<<<<
map = MapUtils.newMap(new google.maps.LatLng(addressToUse.latitude,addressToUse.longitude),16,"the_map",false,maxTimeBounds);
=======
map = MapUtils.newMap(new google.maps.LatLng(digest.metadata.mainCity.latitude,digest.metadata.mainCity.longitude),14,"the_map",false);
>>>>>>>
map = MapUtils.newMap(new google.maps.LatLng(digest.metadata.mainCity.latitude,digest.metadata.mainCity.longitude),14,"the_map",false,maxTimeBounds); |
<<<<<<<
it('should evaluate `and` truth table as <p>and: true</p> (conditionals/andTruthTable.html)', function(done) {
assert.equalIgnoreSpaces(teddy.render('conditionals/andTruthTable.html', model), ' <p>and: true true</p>');
done();
});
it('should evaluate <if something or notDefined> as true (conditionals/or.html)', function(done) {
assert.equalIgnoreSpaces(teddy.render('conditionals/or.html', model), ' <p>or: true</p>');
=======
it('should evaluate `or` truth table as <p>or: true true</p> <p>or: true false</p> <p>or: false true</p> <p>or: fasle false</p> (conditionals/orTruthTable.html)', function(done) {
assert.equalIgnoreSpaces(teddy.render('conditionals/orTruthTable.html', model), ' <p>or: true true</p> <p>or: true false</p> <p>or: false true</p> <p>or: false false</p>');
>>>>>>>
it('should evaluate `and` truth table as <p>and: true</p> (conditionals/andTruthTable.html)', function(done) {
assert.equalIgnoreSpaces(teddy.render('conditionals/andTruthTable.html', model), ' <p>and: true true</p>');
done();
});
it('should evaluate `or` truth table as <p>or: true true</p> <p>or: true false</p> <p>or: false true</p> <p>or: fasle false</p> (conditionals/orTruthTable.html)', function(done) {
assert.equalIgnoreSpaces(teddy.render('conditionals/orTruthTable.html', model), ' <p>or: true true</p> <p>or: true false</p> <p>or: false true</p> <p>or: false false</p>'); |
<<<<<<<
process.send({type: 'publish', data: {channel: channelId, event: event, data: data}});
=======
if (!channels[channelId]) {
return;
}
process.send({type: 'up-publish', data: {channel: channelId, event: event, data: data}});
>>>>>>>
process.send({type: 'up-publish', data: {channel: channelId, event: event, data: data}}); |
<<<<<<<
showSambaExports: function() {
this.renderSidebar('storage', 'samba');
this.cleanup();
this.currentLayout = new SambaView();
$('#maincontent').empty();
$('#maincontent').append(this.currentLayout.render().el);
},
addSambaExport: function() {
this.renderSidebar('storage', 'samba');
this.cleanup();
this.currentLayout = new AddSambaExportView();
$('#maincontent').empty();
$('#maincontent').append(this.currentLayout.render().el);
},
=======
showSFTP: function() {
this.renderSidebar('storage', 'sftp');
this.cleanup();
this.currentLayout = new SFTPView();
$('#maincontent').empty();
$('#maincontent').append(this.currentLayout.render().el);
},
addSFTPShare: function() {
this.renderSidebar('storage', 'sftp');
this.cleanup();
this.currentLayout = new AddSFTPShareView();
$('#maincontent').empty();
$('#maincontent').append(this.currentLayout.render().el);
},
>>>>>>>
showSambaExports: function() {
this.renderSidebar('storage', 'samba');
this.cleanup();
this.currentLayout = new SambaView();
$('#maincontent').empty();
$('#maincontent').append(this.currentLayout.render().el);
},
addSambaExport: function() {
this.renderSidebar('storage', 'samba');
this.cleanup();
this.currentLayout = new AddSambaExportView();
$('#maincontent').empty();
$('#maincontent').append(this.currentLayout.render().el);
},
showSFTP: function() {
this.renderSidebar('storage', 'sftp');
this.cleanup();
this.currentLayout = new SFTPView();
$('#maincontent').empty();
$('#maincontent').append(this.currentLayout.render().el);
},
addSFTPShare: function() {
this.renderSidebar('storage', 'sftp');
this.cleanup();
this.currentLayout = new AddSFTPShareView();
$('#maincontent').empty();
$('#maincontent').append(this.currentLayout.render().el);
}, |
<<<<<<<
measure: function(){
var path = this.getPath();
if (!path) return null;
return path.measure();
},
=======
>>>>>>>
measure: function(){
var path = this.getPath();
if (!path) return null;
return path.measure();
},
<<<<<<<
var fill = this._createGradient('gradientradial', stops);
if (focusX == null) focusX = this.left + this.width * 0.5;
if (focusY == null) focusY = this.top + this.height * 0.5;
if (radiusY == null) radiusY = radiusX || (this.height * 0.5);
if (radiusX == null) radiusX = this.width * 0.5;
=======
this.parent.apply(this, arguments);
if (focusX == null) focusX = (this.left || 0) + (this.width || 0) * 0.5;
if (focusY == null) focusY = (this.top || 0) + (this.height || 0) * 0.5;
if (radiusY == null) radiusY = radiusX || (this.height * 0.5) || 0;
if (radiusX == null) radiusX = (this.width || 0) * 0.5;
>>>>>>>
var fill = this._createGradient('gradientradial', stops);
if (focusX == null) focusX = (this.left || 0) + (this.width || 0) * 0.5;
if (focusY == null) focusY = (this.top || 0) + (this.height || 0) * 0.5;
if (radiusY == null) radiusY = radiusX || (this.height * 0.5) || 0;
if (radiusX == null) radiusX = (this.width || 0) * 0.5;
<<<<<<<
return this;
},
measure: function(){
return { left: this.left, top: this.top, width: this.width, height: this.height, right: this.right, bottom: this.bottom };
=======
>>>>>>>
return this;
},
measure: function(){
return { left: this.left, top: this.top, width: this.width, height: this.height, right: this.right, bottom: this.bottom }; |
<<<<<<<
requires: [Core/Class, Color/Color]
provides: [ART, ART.Element, ART.Container]
=======
requires: [Core/Class, Color/Color, Table/Table]
provides: [ART, ART.Element, ART.Container, ART.Transform]
>>>>>>>
requires: [Core/Class, Color/Color]
provides: [ART, ART.Element, ART.Container, ART.Transform]
<<<<<<<
=======
var transformTo = function(xx, yx, xy, yy, tx, ty){
if (xx && typeof xx == 'object'){
yx = xx.yx; yy = xx.yy; ty = xx.ty;
xy = xx.xy; tx = xx.tx; xx = xx.xx;
}
this.xx = xx == null ? 1 : xx;
this.yx = yx || 0;
this.xy = xy || 0;
this.yy = yy == null ? 1 : yy;
this.tx = (tx == null ? this.tx : tx) || 0;
this.ty = (ty == null ? this.ty : ty) || 0;
this._transform();
return this;
};
var translate = function(x, y){
this.tx += x || 0;
this.ty += y || 0;
this._transform();
return this;
};
ART.Transform = new Class({
initialize: transformTo,
_transform: function(){},
xx: 1, yx: 0, tx: 0,
xy: 0, yy: 1, ty: 0,
transform: function(xx, yx, xy, yy, tx, ty){
var m = this;
if (xx && typeof xx == 'object'){
yx = xx.yx; yy = xx.yy; ty = xx.ty;
xy = xx.xy; tx = xx.tx; xx = xx.xx;
}
if (!tx) tx = 0;
if (!ty) ty = 0;
return this.transformTo(
m.xx * xx + m.xy * yx,
m.yx * xx + m.yy * yx,
m.xx * xy + m.xy * yy,
m.yx * xy + m.yy * yy,
m.xx * tx + m.xy * ty + m.tx,
m.yx * tx + m.yy * ty + m.ty
);
},
transformTo: transformTo,
translate: translate,
move: translate,
scale: function(x, y){
if (y == null) y = x;
return this.transform(x, 0, 0, y, 0, 0);
},
rotate: function(deg, x, y){
var rad = deg * Math.PI / 180, sin = Math.sin(rad), cos = Math.cos(rad);
this.transform(1, 0, 0, 1, x, y);
var m = this;
return this.transformTo(
cos * m.xx - sin * m.yx,
sin * m.xx + cos * m.yx,
cos * m.xy - sin * m.yy,
sin * m.xy + cos * m.yy,
m.tx,
m.ty
).transform(1, 0, 0, 1, -x, -y);
},
moveTo: function(x, y){
var m = this;
return this.transformTo(m.xx, m.yx, m.xy, m.yy, x, y);
},
rotateTo: function(deg, x, y){
var m = this;
var flip = m.yx / m.xx > m.yy / m.xy ? -1 : 1;
if (m.xx < 0 ? m.xy >= 0 : m.xy < 0) flip = -flip;
return this.rotate(deg - Math.atan2(flip * m.yx, flip * m.xx) * 180 / Math.PI, x, y);
},
scaleTo: function(x, y){
// Normalize
var m = this;
var h = Math.sqrt(m.xx * m.xx + m.yx * m.yx);
m.xx /= h; m.yx /= h;
h = Math.sqrt(m.yy * m.yy + m.xy * m.xy);
m.yy /= h; m.xy /= h;
return this.scale(x, y);
},
point: function(x, y){
var m = this;
return {
x: m.xx * x + m.xy * y + m.tx,
y: m.yx * x + m.yy * y + m.ty
};
}
});
var UID = 0;
ART.uniqueID = function(){
return (new Date().getTime() + (UID++)).toString(36);
};
>>>>>>>
var transformTo = function(xx, yx, xy, yy, tx, ty){
if (xx && typeof xx == 'object'){
yx = xx.yx; yy = xx.yy; ty = xx.ty;
xy = xx.xy; tx = xx.tx; xx = xx.xx;
}
this.xx = xx == null ? 1 : xx;
this.yx = yx || 0;
this.xy = xy || 0;
this.yy = yy == null ? 1 : yy;
this.tx = (tx == null ? this.tx : tx) || 0;
this.ty = (ty == null ? this.ty : ty) || 0;
this._transform();
return this;
};
var translate = function(x, y){
this.tx += x || 0;
this.ty += y || 0;
this._transform();
return this;
};
ART.Transform = new Class({
initialize: transformTo,
_transform: function(){},
xx: 1, yx: 0, tx: 0,
xy: 0, yy: 1, ty: 0,
transform: function(xx, yx, xy, yy, tx, ty){
var m = this;
if (xx && typeof xx == 'object'){
yx = xx.yx; yy = xx.yy; ty = xx.ty;
xy = xx.xy; tx = xx.tx; xx = xx.xx;
}
if (!tx) tx = 0;
if (!ty) ty = 0;
return this.transformTo(
m.xx * xx + m.xy * yx,
m.yx * xx + m.yy * yx,
m.xx * xy + m.xy * yy,
m.yx * xy + m.yy * yy,
m.xx * tx + m.xy * ty + m.tx,
m.yx * tx + m.yy * ty + m.ty
);
},
transformTo: transformTo,
translate: translate,
move: translate,
scale: function(x, y){
if (y == null) y = x;
return this.transform(x, 0, 0, y, 0, 0);
},
rotate: function(deg, x, y){
var rad = deg * Math.PI / 180, sin = Math.sin(rad), cos = Math.cos(rad);
this.transform(1, 0, 0, 1, x, y);
var m = this;
return this.transformTo(
cos * m.xx - sin * m.yx,
sin * m.xx + cos * m.yx,
cos * m.xy - sin * m.yy,
sin * m.xy + cos * m.yy,
m.tx,
m.ty
).transform(1, 0, 0, 1, -x, -y);
},
moveTo: function(x, y){
var m = this;
return this.transformTo(m.xx, m.yx, m.xy, m.yy, x, y);
},
rotateTo: function(deg, x, y){
var m = this;
var flip = m.yx / m.xx > m.yy / m.xy ? -1 : 1;
if (m.xx < 0 ? m.xy >= 0 : m.xy < 0) flip = -flip;
return this.rotate(deg - Math.atan2(flip * m.yx, flip * m.xx) * 180 / Math.PI, x, y);
},
scaleTo: function(x, y){
// Normalize
var m = this;
var h = Math.sqrt(m.xx * m.xx + m.yx * m.yx);
m.xx /= h; m.yx /= h;
h = Math.sqrt(m.yy * m.yy + m.xy * m.xy);
m.yy /= h; m.xy /= h;
return this.scale(x, y);
},
point: function(x, y){
var m = this;
return {
x: m.xx * x + m.xy * y + m.tx,
y: m.yx * x + m.yy * y + m.ty
};
}
}); |
<<<<<<<
//renderTarget = new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, renderTargetParameters );
effectSave = new THREE.SavePass( new THREE.WebGLRenderTarget( 800, 600, renderTargetParameters ) );
effectBlend = new THREE.ShaderPass( THREE.BlendShader, "tDiffuse1" );
effectBlend.uniforms[ 'tDiffuse2' ].value = effectSave.renderTarget;
effectBlend.uniforms[ 'mixRatio' ].value = 0.77;
=======
>>>>>>>
//renderTarget = new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, renderTargetParameters );
effectSave = new THREE.SavePass( new THREE.WebGLRenderTarget( 800, 600, renderTargetParameters ) );
effectBlend = new THREE.ShaderPass( THREE.BlendShader, "tDiffuse1" );
effectBlend.uniforms[ 'tDiffuse2' ].value = effectSave.renderTarget;
effectBlend.uniforms[ 'mixRatio' ].value = 0.77;
<<<<<<<
//this is the display window resolution
=======
switch (resolution) {
case 'dk1':
W = _W*0.5, H = _H*0.5;
Z = 1/0.5;
break;
case 'fhd':
W = _W*0.67, H = _H*0.67;
Z = 1/0.67;
break;
case 'cv1':
W = _W*0.9, H = _H*0.9;
Z = 1/0.9;
break;
case 'cv2':
W = _W*1.35, H = _H*1.35;
Z = 1/1.35;
break;
}
>>>>>>>
//this is the display window resolution
switch (resolution) {
case 'dk1':
W = _W*0.5, H = _H*0.5;
Z = 1/0.5;
break;
case 'fhd':
W = _W*0.67, H = _H*0.67;
Z = 1/0.67;
break;
case 'cv1':
W = _W*0.9, H = _H*0.9;
Z = 1/0.9;
break;
case 'cv2':
W = _W*1.35, H = _H*1.35;
Z = 1/1.35;
break;
}
<<<<<<<
//changing resolution here changes the output resolution, which is upscaled to the resolution above
renderTarget =
new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, renderTargetParameters );
var new_rtt_params = {
minFilter: THREE.NearestFilter,
magFilter: THREE.NearestFilter,
format: THREE.RGBFormat,
stencilBuffer: false };
//changing resolution here changes the FIR motion blur resolution only.
effectSave = new THREE.SavePass(
new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, new_rtt_params ) );
=======
renderTarget = new THREE.WebGLRenderTarget( W, H, renderTargetParameters );
effectSave = new THREE.SavePass(new THREE.WebGLRenderTarget( W, H, renderTargetParameters ) );
>>>>>>>
//changing resolution here changes the output resolution, which is upscaled to the resolution above
renderTarget =
new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, renderTargetParameters );
var new_rtt_params = {
minFilter: THREE.NearestFilter,
magFilter: THREE.NearestFilter,
format: THREE.RGBFormat,
stencilBuffer: false };
//changing resolution here changes the FIR motion blur resolution only.
new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, renderTargetParameters ) );
new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, new_rtt_params ) );
<<<<<<<
composer.addPass(scalerPass);
composer.addPass( vignettePass );
=======
//composer.addPass( vignettePass );
>>>>>>>
composer.addPass(scalerPass);
//composer.addPass( vignettePass );
<<<<<<<
if (persistence == 'high') {
composer.addPass( effectBlend );
composer.addPass( effectSave );
//composer.addPass( hblurPass );
//composer.addPass( vblurPass );
}
composer.addPass( screenPass );
//composer.addPass( filmPass );
=======
//composer.addPass( screenPass );
composer.addPass( filmPass );
>>>>>>>
if (persistence == 'high') {
composer.addPass( effectBlend );
composer.addPass( effectSave );
//composer.addPass( hblurPass );
//composer.addPass( vblurPass );
}
composer.addPass( screenPass );
//composer.addPass( filmPass );
//composer.addPass( screenPass );
composer.addPass( filmPass ); |
<<<<<<<
provides: [ART.SVG, ART.SVG.Group, ART.SVG.Shape, ART.SVG.Image, ART.SVG.Text]
requires: [ART, ART.Element, ART.Container, ART.Path]
=======
provides: [ART.SVG, ART.SVG.Group, ART.SVG.Shape, ART.SVG.Image]
requires: [ART, ART.Element, ART.Container, ART.Transform, ART.Path]
>>>>>>>
provides: [ART.SVG, ART.SVG.Group, ART.SVG.Shape, ART.SVG.Image, ART.SVG.Text]
requires: [ART, ART.Element, ART.Container, ART.Transform, ART.Path]
<<<<<<<
var id = 'g' + String.uniqueID();
gradient.setAttribute('id', id);
this._injectGradient(type);
=======
gradient.setAttribute('spreadMethod', 'reflect'); // Closer to the VML gradient
>>>>>>>
gradient.setAttribute('spreadMethod', 'reflect'); // Closer to the VML gradient |
<<<<<<<
import { routerReducer } from 'react-router-redux';
=======
import { connectRouter } from 'connected-react-router';
import { reducer as modal } from 'redux-modal';
>>>>>>>
import { connectRouter } from 'connected-react-router';
import { reducer as modal } from 'redux-modal';
<<<<<<<
const rootReducer = combineReducers({
user,
spinner,
router: routerReducer,
});
=======
export default function createRootReducer(history) {
const rootReducer = combineReducers({
user,
spinner,
modal,
router: connectRouter(history),
});
>>>>>>>
export default function createRootReducer(history) {
const rootReducer = combineReducers({
user,
spinner,
router: connectRouter(history),
}); |
<<<<<<<
// #### Generate coverage report
// See the `grunt test-coverage` task in the section on [Testing](#testing) for more information.
coverage: {
command: 'node ' + mochaPath + ' --timeout 15000 --reporter html-cov > coverage.html ' +
path.resolve(cwd + '/core/test/blanket_coverage.js')
},
'sqlite-bindings': {
command: [
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=x64 --target_platform=linux --target=0.10.38',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=ia32 --target_platform=linux --target=0.10.38',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=x64 --target_platform=win32 --target=0.10.38',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=ia32 --target_platform=win32 --target=0.10.38',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=x64 --target_platform=darwin --target=0.10.38',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=x64 --target_platform=linux',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=ia32 --target_platform=linux',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=x64 --target_platform=win32',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=ia32 --target_platform=win32',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=x64 --target_platform=darwin'
].join('&&').replace(/\//g, '\\'),
options: {
stdout: true,
stdin: false,
stderr: true,
execOptions: {
cwd: 'node_modules/sqlite3/'
}
}
},
=======
>>>>>>>
'sqlite-bindings': {
command: [
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=x64 --target_platform=linux --target=0.10.38',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=ia32 --target_platform=linux --target=0.10.38',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=x64 --target_platform=win32 --target=0.10.38',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=ia32 --target_platform=win32 --target=0.10.38',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=x64 --target_platform=darwin --target=0.10.38',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=x64 --target_platform=linux',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=ia32 --target_platform=linux',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=x64 --target_platform=win32',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=ia32 --target_platform=win32',
'node_modules/.bin/node-pre-gyp.cmd install --runtime=node --target_arch=x64 --target_platform=darwin'
].join('&&').replace(/\//g, '\\'),
options: {
stdout: true,
stdin: false,
stderr: true,
execOptions: {
cwd: 'node_modules/sqlite3/'
}
}
},
<<<<<<<
['init', 'shell:ember:prod', 'uglify:release', 'clean:release', 'copy:release', 'shell:shrinkwrap', 'compress:release']);
grunt.registerTask('release-full', 'Create zip package with all needed node modules.',
['clean:all', 'init', 'shell:ember:prod', 'uglify:release', 'clean:release', 'copy:release', 'shell:shrinkwrap', 'compress:release', 'shell:sqlite-bindings', 'copy:full', 'compress:release-full']);
=======
['init', 'shell:ember:prod', 'uglify:release', 'clean:release', 'shell:shrinkwrap', 'copy:release', 'compress:release']);
>>>>>>>
['init', 'shell:ember:prod', 'uglify:release', 'clean:release', 'shell:shrinkwrap', 'copy:release', 'compress:release']);
grunt.registerTask('release-full', 'Create zip package with all needed node modules.',
['clean:all', 'init', 'shell:ember:prod', 'uglify:release', 'clean:release', 'copy:release', 'shell:shrinkwrap', 'compress:release', 'shell:sqlite-bindings', 'copy:full', 'compress:release-full']); |
<<<<<<<
'intern/node_modules/dojo/has!host-browser?./legacy/DstoreAdapter-Memory',
=======
'intern/node_modules/dojo/has!host-browser?./charting/StoreSeries',
>>>>>>>
'intern/node_modules/dojo/has!host-browser?./legacy/DstoreAdapter-Memory',
'intern/node_modules/dojo/has!host-browser?./charting/StoreSeries', |
<<<<<<<
myBool: ['boolean', true, false],
good: {
type: 'string',
validator: function (newVal) {
if (newVal !== 'good') {
return "Value not good";
}
}
}
=======
myBool: ['boolean', true, false],
someNumber: {type: 'number', allowNull: true}
>>>>>>>
someNumber: {type: 'number', allowNull: true},
good: {
type: 'string',
validator: function (newVal) {
if (newVal !== 'good') {
return "Value not good";
}
}
}
<<<<<<<
test('Attribute validation works', 2, function () {
var foo = new Foo({good: 'good'});
equal(foo.good, 'good');
throws(function () {
foo.good = 'bad';
}, TypeError, 'Throws exception on invalid attribute value');
});
=======
test('Should only allow nulls where specified', 2, function () {
var foo = new Foo({
firstName: 'bob',
lastName: 'vila',
someNumber: null
});
equal(foo.someNumber, null);
throws(function () {
foo.firstName = null;
}, TypeError, 'Throws exception when setting unallowed null');
});
>>>>>>>
test('Attribute validation works', 2, function () {
var foo = new Foo({good: 'good'});
equal(foo.good, 'good');
throws(function () {
foo.good = 'bad';
}, TypeError, 'Throws exception on invalid attribute value');
});
test('Should only allow nulls where specified', 2, function () {
var foo = new Foo({
firstName: 'bob',
lastName: 'vila',
someNumber: null
});
equal(foo.someNumber, null);
throws(function () {
foo.firstName = null;
}, TypeError, 'Throws exception when setting unallowed null');
}); |
<<<<<<<
const { decToBytes, addrToBytes } = require('./utils')
const e18 = 1000000000000000000 // 1e18
=======
const e18 = new BN("1000000000000000000") // 1e18
>>>>>>>
const { decToBytes, addrToBytes } = require('./utils')
const e18 = new BN("1000000000000000000") // 1e18
<<<<<<<
=======
it('1. minting during period 0', async () => {
await spankbank.mintBooty().should.be.rejectedWith('current period is zero')
})
>>>>>>> |
<<<<<<<
this.status = 200;
yield next;
=======
this.status = status || 200;
>>>>>>>
this.status = status || 200;
yield next; |
<<<<<<<
updateMousePosition (x, y) {
this.mouse.x = (((x - this.boundingRect.left) / this.renderer.domElement.clientWidth) * 2) - 1;
this.mouse.y = -(((y - this.boundingRect.top) / this.renderer.domElement.clientHeight) * 2) + 1;
}
=======
>>>>>>> |
<<<<<<<
[313, 42],
=======
[317, 42],
>>>>>>>
[319, 42],
<<<<<<<
[319, 111, 119, 115],
=======
8,
>>>>>>>
8,
<<<<<<<
[320, 112, 114, 118, 115],
=======
[323, 112, 120, 116],
>>>>>>>
[325, 112, 120, 116],
<<<<<<<
[321, 113],
=======
[324, 113, 115, 119, 116],
>>>>>>>
[326, 113, 115, 119, 116],
<<<<<<<
[322, 115, 116, 117],
=======
25,
>>>>>>>
25,
<<<<<<<
[323, 116],
=======
[326, 116, 117, 118],
>>>>>>>
[328, 116, 117, 118],
<<<<<<<
[324, 113, 108],
=======
28,
>>>>>>>
28,
<<<<<<<
[325, 113],
=======
[328, 114, 109],
>>>>>>>
[330, 114, 109],
<<<<<<<
[318, 124],
=======
48,
>>>>>>>
48,
<<<<<<<
/* 126 */
[315, 127],
=======
>>>>>>>
<<<<<<<
[314, 129],
=======
42,
>>>>>>>
42,
<<<<<<<
[316, 131],
=======
15,
>>>>>>>
15,
<<<<<<<
/* 134 */
[313, 127],
=======
>>>>>>>
<<<<<<<
[326, 136, 122, 108],
=======
[317, 128],
>>>>>>>
[319, 128],
<<<<<<<
[317, 108],
=======
[330, 137, 123, 109],
>>>>>>>
[332, 137, 123, 109],
<<<<<<<
/* 311 */,
/* 312 */,
/* 313 */
=======
/* 311 */,
/* 312 */,
/* 313 */,
/* 314 */,
/* 315 */,
/* 316 */,
/* 317 */
>>>>>>>
/* 311 */,
/* 312 */,
/* 313 */,
/* 314 */,
/* 315 */,
/* 316 */,
/* 317 */,
/* 318 */,
/* 319 */ |
<<<<<<<
ElLoading,
ElForm,
ElFormItem,
ElRadio,
ElRadioButton,
ElRadioGroup,
ElCheckbox,
ElCheckboxButton,
ElCheckboxGroup,
ElInput,
ElInputNumber,
ElSelect,
ElCascader,
ElCascaderPanel,
ElSlider,
ElTimePicker,
ElTimeSelect,
ElDatePicker,
ElUpload,
ElRate,
ElColorPicker,
ElTransfer,
ElOption,
ElOptionGroup
=======
ElLoading,
ElDialog,
ElTooltip,
ElPopover,
ElPopconfirm,
ElCard,
ElCarousel,
ElCollapse,
ElCollapseItem,
ElTimeline,
ElTimelineItem,
ElDivider,
ElCalendar,
ElImage,
ElInfiniteScroll,
ElDrawer
>>>>>>>
ElLoading,
ElForm,
ElFormItem,
ElRadio,
ElRadioButton,
ElRadioGroup,
ElCheckbox,
ElCheckboxButton,
ElCheckboxGroup,
ElInput,
ElInputNumber,
ElSelect,
ElCascader,
ElCascaderPanel,
ElSlider,
ElTimePicker,
ElTimeSelect,
ElDatePicker,
ElUpload,
ElRate,
ElColorPicker,
ElTransfer,
ElOption,
ElOptionGroup,
ElDialog,
ElTooltip,
ElPopover,
ElPopconfirm,
ElCard,
ElCarousel,
ElCollapse,
ElCollapseItem,
ElTimeline,
ElTimelineItem,
ElDivider,
ElCalendar,
ElImage,
ElInfiniteScroll,
ElDrawer
<<<<<<<
ElForm,
ElFormItem,
ElRadio,
ElRadioButton,
ElRadioGroup,
ElCheckbox,
ElCheckboxButton,
ElCheckboxGroup,
ElInput,
ElInputNumber,
ElSelect,
ElCascader,
ElCascaderPanel,
ElSlider,
ElTimePicker,
ElTimeSelect,
ElDatePicker,
ElUpload,
ElRate,
ElColorPicker,
ElTransfer,
ElOption,
ElOptionGroup,
=======
ElDialog,
ElTooltip,
ElPopover,
ElPopconfirm,
ElCard,
ElCarousel,
ElCollapse,
ElCollapseItem,
ElTimeline,
ElTimelineItem,
ElDivider,
ElCalendar,
ElImage,
ElInfiniteScroll,
ElDrawer,
>>>>>>>
ElForm,
ElFormItem,
ElRadio,
ElRadioButton,
ElRadioGroup,
ElCheckbox,
ElCheckboxButton,
ElCheckboxGroup,
ElInput,
ElInputNumber,
ElSelect,
ElCascader,
ElCascaderPanel,
ElSlider,
ElTimePicker,
ElTimeSelect,
ElDatePicker,
ElUpload,
ElRate,
ElColorPicker,
ElTransfer,
ElOption,
ElOptionGroup,
ElDialog,
ElTooltip,
ElPopover,
ElPopconfirm,
ElCard,
ElCarousel,
ElCollapse,
ElCollapseItem,
ElTimeline,
ElTimelineItem,
ElDivider,
ElCalendar,
ElImage,
ElInfiniteScroll,
ElDrawer, |
<<<<<<<
'image',
=======
'card',
>>>>>>>
'image',
'card', |
<<<<<<<
import Card from '../packages/card/index.js';
import Rate from '../packages/rate/index.js';
=======
import Badge from '../packages/badge/index.js';
import Card from '../packages/card/index.js';
>>>>>>>
import Card from '../packages/card/index.js';
import Rate from '../packages/rate/index.js';
import Badge from '../packages/badge/index.js';
<<<<<<<
Vue.component(Card.name, Card);
Vue.component(Rate.name, Rate);
=======
Vue.component(Badge.name, Badge);
Vue.component(Card.name, Card);
>>>>>>>
Vue.component(Card.name, Card);
Vue.component(Rate.name, Rate);
Vue.component(Badge.name, Badge);
<<<<<<<
Message,
Card,
Rate
=======
Message,
Badge,
Card
>>>>>>>
Card,
Rate,
Message,
Badge |
<<<<<<<
import ElCarousel from '../packages/carousel'
import ElCarouselItem from '../packages/carousel-item'
import ElInfiniteScroll from '../packages/infinite-scroll'
import ElDrawer from '../packages/drawer'
=======
import ElTabs from '../packages/tabs'
import ElTabPane from '../packages/tab-pane'
import ElPageHeader from '../packages/page-header'
import ElDropdown from '../packages/dropdown'
import ElDropdownItem from '../packages/dropdown-item'
import ElDropdownMenu from '../packages/dropdown-menu'
import ElSteps from '../packages/steps'
import ElStep from '../packages/step'
import ElForm from '../packages/form'
import ElFormItem from '../packages/form-item'
import ElRadio from '../packages/radio'
import ElRadioButton from '../packages/radio-button'
import ElRadioGroup from '../packages/radio-group'
import ElCheckbox from '../packages/checkbox'
import ElCheckboxButton from '../packages/checkbox-button'
import ElCheckboxGroup from '../packages/checkbox-group'
import ElInput from '../packages/input'
import ElInputNumber from '../packages/input-number'
import ElSelect from '../packages/select'
import ElCascader from '../packages/calendar'
import ElCascaderPanel from '../packages/cascader-panel'
import ElSlider from '../packages/slider'
import ElTimePicker from '../packages/time-picker'
import ElTimeSelect from '../packages/time-select'
import ElDatePicker from '../packages/date-picker'
import ElUpload from '../packages/upload'
import ElRate from '../packages/rate'
import ElColorPicker from '../packages/color-picker'
import ElTransfer from '../packages/transfer'
import ElOption from '../packages/option'
import ElOptionGroup from '../packages/option-group'
import ElLoading, { useLoading } from '../packages/loading'
import { useMessage } from '../packages/message'
import {
useMsgbox,
useAlert,
usePrompt,
useConfirm
} from '../packages/message-box'
import { useNotify } from '../packages/notification'
import ElDialog from '../packages/dialog'
import ElTooltip from '../packages/tooltip'
import ElPopover from '../packages/popover'
import ElPopconfirm from '../packages/popconfirm'
import ElCard from '../packages/card'
import ElCarousel from '../packages/carousel'
import ElCollapse from '../packages/collapse'
import ElCollapseItem from '../packages/collapse-item'
import ElTimeline from '../packages/timeline'
import ElTimelineItem from '../packages/timeline-item'
import ElDivider from '../packages/divider'
import ElCalendar from '../packages/calendar'
import ElImage from '../packages/image'
import ElInfiniteScroll from '../packages/infinite-scroll'
import ElDrawer from '../packages/drawer'
>>>>>>>
import ElCarousel from '../packages/carousel'
import ElCarouselItem from '../packages/carousel-item'
import ElTabs from '../packages/tabs'
import ElTabPane from '../packages/tab-pane'
import ElPageHeader from '../packages/page-header'
import ElDropdown from '../packages/dropdown'
import ElDropdownItem from '../packages/dropdown-item'
import ElDropdownMenu from '../packages/dropdown-menu'
import ElSteps from '../packages/steps'
import ElStep from '../packages/step'
import ElForm from '../packages/form'
import ElFormItem from '../packages/form-item'
import ElRadio from '../packages/radio'
import ElRadioButton from '../packages/radio-button'
import ElRadioGroup from '../packages/radio-group'
import ElCheckbox from '../packages/checkbox'
import ElCheckboxButton from '../packages/checkbox-button'
import ElCheckboxGroup from '../packages/checkbox-group'
import ElInput from '../packages/input'
import ElInputNumber from '../packages/input-number'
import ElSelect from '../packages/select'
import ElCascader from '../packages/calendar'
import ElCascaderPanel from '../packages/cascader-panel'
import ElSlider from '../packages/slider'
import ElTimePicker from '../packages/time-picker'
import ElTimeSelect from '../packages/time-select'
import ElDatePicker from '../packages/date-picker'
import ElUpload from '../packages/upload'
import ElRate from '../packages/rate'
import ElColorPicker from '../packages/color-picker'
import ElTransfer from '../packages/transfer'
import ElOption from '../packages/option'
import ElOptionGroup from '../packages/option-group'
import ElLoading, { useLoading } from '../packages/loading'
import { useMessage } from '../packages/message'
import {
useMsgbox,
useAlert,
usePrompt,
useConfirm
} from '../packages/message-box'
import { useNotify } from '../packages/notification'
import ElDialog from '../packages/dialog'
import ElTooltip from '../packages/tooltip'
import ElPopover from '../packages/popover'
import ElPopconfirm from '../packages/popconfirm'
import ElCard from '../packages/card'
import ElCollapse from '../packages/collapse'
import ElCollapseItem from '../packages/collapse-item'
import ElTimeline from '../packages/timeline'
import ElTimelineItem from '../packages/timeline-item'
import ElDivider from '../packages/divider'
import ElCalendar from '../packages/calendar'
import ElImage from '../packages/image'
import ElInfiniteScroll from '../packages/infinite-scroll'
import ElDrawer from '../packages/drawer'
<<<<<<<
ElAvatar,
ElCarousel,
ElCarouselItem,
ElInfiniteScroll,
ElDrawer
=======
ElAvatar,
ElTabs,
ElTabPane,
ElPageHeader,
ElDropdown,
ElDropdownItem,
ElDropdownMenu,
ElSteps,
ElStep,
ElLoading,
ElForm,
ElFormItem,
ElRadio,
ElRadioButton,
ElRadioGroup,
ElCheckbox,
ElCheckboxButton,
ElCheckboxGroup,
ElInput,
ElInputNumber,
ElSelect,
ElCascader,
ElCascaderPanel,
ElSlider,
ElTimePicker,
ElTimeSelect,
ElDatePicker,
ElUpload,
ElRate,
ElColorPicker,
ElTransfer,
ElOption,
ElOptionGroup,
ElDialog,
ElTooltip,
ElPopover,
ElPopconfirm,
ElCard,
ElCarousel,
ElCollapse,
ElCollapseItem,
ElTimeline,
ElTimelineItem,
ElDivider,
ElCalendar,
ElImage,
ElInfiniteScroll,
ElDrawer
>>>>>>>
ElAvatar,
ElCarousel,
ElCarouselItem,
ElTabs,
ElTabPane,
ElPageHeader,
ElDropdown,
ElDropdownItem,
ElDropdownMenu,
ElSteps,
ElStep,
ElLoading,
ElForm,
ElFormItem,
ElRadio,
ElRadioButton,
ElRadioGroup,
ElCheckbox,
ElCheckboxButton,
ElCheckboxGroup,
ElInput,
ElInputNumber,
ElSelect,
ElCascader,
ElCascaderPanel,
ElSlider,
ElTimePicker,
ElTimeSelect,
ElDatePicker,
ElUpload,
ElRate,
ElColorPicker,
ElTransfer,
ElOption,
ElOptionGroup,
ElDialog,
ElTooltip,
ElPopover,
ElPopconfirm,
ElCard,
ElCarousel,
ElCollapse,
ElCollapseItem,
ElTimeline,
ElTimelineItem,
ElDivider,
ElCalendar,
ElImage,
ElInfiniteScroll,
ElDrawer
<<<<<<<
ElAvatar,
ElCarousel,
ElCarouselItem,
ElInfiniteScroll,
ElDrawer
=======
ElAvatar,
ElTabs,
ElTabPane,
ElPageHeader,
ElDropdown,
ElDropdownItem,
ElDropdownMenu,
ElSteps,
ElStep,
ElLoading,
ElForm,
ElFormItem,
ElRadio,
ElRadioButton,
ElRadioGroup,
ElCheckbox,
ElCheckboxButton,
ElCheckboxGroup,
ElInput,
ElInputNumber,
ElSelect,
ElCascader,
ElCascaderPanel,
ElSlider,
ElTimePicker,
ElTimeSelect,
ElDatePicker,
ElUpload,
ElRate,
ElColorPicker,
ElTransfer,
ElOption,
ElOptionGroup,
ElDialog,
ElTooltip,
ElPopover,
ElPopconfirm,
ElCard,
ElCarousel,
ElCollapse,
ElCollapseItem,
ElTimeline,
ElTimelineItem,
ElDivider,
ElCalendar,
ElImage,
ElInfiniteScroll,
ElDrawer,
useMessage,
useLoading,
useMsgbox,
useAlert,
usePrompt,
useConfirm,
useNotify
>>>>>>>
ElAvatar,
ElCarousel,
ElCarouselItem,
ElInfiniteScroll,
ElDrawer,
ElTabs,
ElTabPane,
ElPageHeader,
ElDropdown,
ElDropdownItem,
ElDropdownMenu,
ElSteps,
ElStep,
ElLoading,
ElForm,
ElFormItem,
ElRadio,
ElRadioButton,
ElRadioGroup,
ElCheckbox,
ElCheckboxButton,
ElCheckboxGroup,
ElInput,
ElInputNumber,
ElSelect,
ElCascader,
ElCascaderPanel,
ElSlider,
ElTimePicker,
ElTimeSelect,
ElDatePicker,
ElUpload,
ElRate,
ElColorPicker,
ElTransfer,
ElOption,
ElOptionGroup,
ElDialog,
ElTooltip,
ElPopover,
ElPopconfirm,
ElCard,
ElCollapse,
ElCollapseItem,
ElTimeline,
ElTimelineItem,
ElDivider,
ElCalendar,
ElImage,
useMessage,
useLoading,
useMsgbox,
useAlert,
usePrompt,
useConfirm,
useNotify |
<<<<<<<
'timeline',
'timeline-item',
=======
'input-number',
>>>>>>>
'timeline',
'timeline-item',
'input-number', |
<<<<<<<
this.moveNodeInteraction = new MoveNodeInteraction(this);
=======
this.layouts = {
ltrTree: LTRTreeLayout,
dns: DNSLayout,
ringCenter: RingCenterLayout
};
>>>>>>>
this.moveNodeInteraction = new MoveNodeInteraction(this);
this.layouts = {
ltrTree: LTRTreeLayout,
dns: DNSLayout,
ringCenter: RingCenterLayout
}; |
<<<<<<<
SUB_RECEIVE_USER_SUBSCRIPTIONS: null,
=======
USER_RECEIVE: null,
>>>>>>>
SUB_RECEIVE_USER_SUBSCRIPTIONS: null,
USER_RECEIVE: null, |
<<<<<<<
COIN_OWNERSHIP: {
ACTIONS: {
ADD_USER: 'addUser',
REMOVE_USER: 'removeUser',
UPDATE_USER: 'updateUser'
},
EVENTS: {
USER_ADDED: 'coinOwnership:userAdded',
USER_REMOVED: 'coinOwnership:userRevmoed',
USER_UPDATED: 'coinOwnership:userUpdated'
}
},
PERSON_PICKER: {
ACTIONS: {
ADD_USER: 'addUser',
REMOVE_USER: 'removeUser',
UPDATE_USER: 'updateUser'
},
EVENTS: {
USER_ADDED: 'personPicker:userAdded',
USER_REMOVED: 'personPicker:userRemoved',
USER_UPDATED: 'personPicker:userUpdated'
}
},
TEXT_COMPLETE: {
=======
TAG_LIST: {
>>>>>>>
COIN_OWNERSHIP: {
ACTIONS: {
ADD_USER: 'addUser',
REMOVE_USER: 'removeUser',
UPDATE_USER: 'updateUser'
},
EVENTS: {
USER_ADDED: 'coinOwnership:userAdded',
USER_REMOVED: 'coinOwnership:userRevmoed',
USER_UPDATED: 'coinOwnership:userUpdated'
}
},
PERSON_PICKER: {
ACTIONS: {
ADD_USER: 'addUser',
REMOVE_USER: 'removeUser',
UPDATE_USER: 'updateUser'
},
EVENTS: {
USER_ADDED: 'personPicker:userAdded',
USER_REMOVED: 'personPicker:userRemoved',
USER_UPDATED: 'personPicker:userUpdated'
}
},
TAG_LIST: { |
<<<<<<<
})([Element.prototype, CharacterData.prototype, DocumentType.prototype]);
// Custom Events
// IE Polyfills: https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/CustomEvent#Polyfill
(function () {
if ( typeof window.CustomEvent === "function" ) return false;
function CustomEvent ( event, params ) {
params = params || { bubbles: false, cancelable: false, detail: null };
var evt = document.createEvent( 'CustomEvent' );
evt.initCustomEvent( event, params.bubbles, params.cancelable, params.detail );
return evt;
}
CustomEvent.prototype = window.Event.prototype;
window.CustomEvent = CustomEvent;
})();
=======
});
})([Element.prototype, CharacterData.prototype, DocumentType.prototype]);
>>>>>>>
});
})([Element.prototype, CharacterData.prototype, DocumentType.prototype]);
// Custom Events
// IE Polyfills: https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/CustomEvent#Polyfill
(function () {
if ( typeof window.CustomEvent === "function" ) return false;
function CustomEvent ( event, params ) {
params = params || { bubbles: false, cancelable: false, detail: null };
var evt = document.createEvent( 'CustomEvent' );
evt.initCustomEvent( event, params.bubbles, params.cancelable, params.detail );
return evt;
}
CustomEvent.prototype = window.Event.prototype;
window.CustomEvent = CustomEvent;
})(); |
<<<<<<<
self.uploadSdButton = undefined;
self.addFolderDialog = undefined;
self.addFolderName = ko.observable(undefined);
self.enableAddFolder = ko.computed(function() {
return self.loginState.isUser() && self.addFolderName() && self.addFolderName().trim() != "";
});
self.allItems = ko.observable(undefined);
self.listStyle = ko.observable("folders_files");
self.currentPath = ko.observable("");
=======
self.sdUploadButton = undefined;
self.uploadProgressBar = undefined;
self.localTarget = undefined;
self.sdTarget = undefined;
>>>>>>>
self.uploadSdButton = undefined;
self.uploadProgressBar = undefined;
self.localTarget = undefined;
self.sdTarget = undefined;
self.addFolderDialog = undefined;
self.addFolderName = ko.observable(undefined);
self.enableAddFolder = ko.computed(function() {
return self.loginState.isUser() && self.addFolderName() && self.addFolderName().trim() != "";
});
self.allItems = ko.observable(undefined);
self.listStyle = ko.observable("folders_files");
self.currentPath = ko.observable("");
<<<<<<<
self.onDataUpdaterReconnect = function() {
self.requestData(undefined, undefined, self.currentPath());
};
=======
>>>>>>>
<<<<<<<
$(document).bind("dragover", function (e) {
var dropOverlay = $("#drop_overlay");
var dropZone = $("#drop");
var dropZoneLocal = $("#drop_locally");
var dropZoneSd = $("#drop_sd");
var dropZoneBackground = $("#drop_background");
var dropZoneLocalBackground = $("#drop_locally_background");
var dropZoneSdBackground = $("#drop_sd_background");
var timeout = window.dropZoneTimeout;
if (!timeout) {
dropOverlay.addClass("in");
} else {
clearTimeout(timeout);
}
var foundLocal = false;
var foundSd = false;
var found = false;
var node = e.target;
do {
if (dropZoneLocal && node === dropZoneLocal[0]) {
foundLocal = true;
break;
} else if (dropZoneSd && node === dropZoneSd[0]) {
foundSd = true;
break;
} else if (dropZone && node === dropZone[0]) {
found = true;
break;
}
node = node.parentNode;
} while (node != null);
if (foundLocal) {
dropZoneLocalBackground.addClass("hover");
dropZoneSdBackground.removeClass("hover");
} else if (foundSd && self.printerState.isSdReady()) {
dropZoneSdBackground.addClass("hover");
dropZoneLocalBackground.removeClass("hover");
} else if (found) {
dropZoneBackground.addClass("hover");
} else {
if (dropZoneLocalBackground) dropZoneLocalBackground.removeClass("hover");
if (dropZoneSdBackground) dropZoneSdBackground.removeClass("hover");
if (dropZoneBackground) dropZoneBackground.removeClass("hover");
}
window.dropZoneTimeout = setTimeout(function () {
window.dropZoneTimeout = null;
dropOverlay.removeClass("in");
if (dropZoneLocal) dropZoneLocalBackground.removeClass("hover");
if (dropZoneSd) dropZoneSdBackground.removeClass("hover");
if (dropZone) dropZoneBackground.removeClass("hover");
}, 100);
});
=======
>>>>>>> |
<<<<<<<
OCTOPRINT_VIEWMODELS.push([
NavigationViewModel,
["loginStateViewModel", "appearanceViewModel", "settingsViewModel", "userSettingsViewModel", "systemViewModel", "accessViewModel"],
"#navbar"
]);
=======
OCTOPRINT_VIEWMODELS.push({
construct: NavigationViewModel,
dependencies: ["loginStateViewModel", "appearanceViewModel", "settingsViewModel", "userSettingsViewModel", "systemViewModel"],
elements: ["#navbar"]
});
>>>>>>>
OCTOPRINT_VIEWMODELS.push({
construct: NavigationViewModel,
dependencies: ["loginStateViewModel", "appearanceViewModel", "settingsViewModel", "userSettingsViewModel", "systemViewModel", "accessViewModel"],
elements: ["#navbar"]
}); |
<<<<<<<
// view model class, parameters for constructor, container to bind to
ADDITIONAL_VIEWMODELS.push([
PluginManagerViewModel,
["loginStateViewModel", "settingsViewModel", "printerStateViewModel", "systemViewModel", "accessViewModel"],
"#settings_plugin_pluginmanager"
]);
=======
OCTOPRINT_VIEWMODELS.push({
construct: PluginManagerViewModel,
dependencies: ["loginStateViewModel", "settingsViewModel", "printerStateViewModel", "systemViewModel"],
elements: ["#settings_plugin_pluginmanager"]
});
>>>>>>>
OCTOPRINT_VIEWMODELS.push({
construct: PluginManagerViewModel,
dependencies: ["loginStateViewModel", "settingsViewModel", "printerStateViewModel", "systemViewModel", "accessViewModel"],
elements: ["#settings_plugin_pluginmanager"]
}); |
<<<<<<<
return self.isOperational() &&
self.isReady() &&
!self.isPrinting() &&
self.loginState.hasPermission(self.access.permissions.PRINT) &&
self.filename() !== undefined;
=======
return self.isOperational() && self.isReady() && !self.isPrinting() && !self.isCancelling() && !self.isPausing() && self.loginState.isUser() && self.filename() != undefined;
>>>>>>>
return self.isOperational() &&
self.isReady() &&
!self.isPrinting() &&
!self.isCancelling() &&
!self.isPausing() &&
self.loginState.hasPermission(self.access.permissions.PRINT) &&
self.filename() !== undefined;
<<<<<<<
return self.isOperational() &&
(self.isPrinting() || self.isPaused()) &&
self.loginState.hasPermission(self.access.permissions.PRINT);
=======
return self.isOperational() && (self.isPrinting() || self.isPaused()) && !self.isCancelling() && !self.isPausing() && self.loginState.isUser();
>>>>>>>
return self.isOperational() &&
(self.isPrinting() || self.isPaused()) &&
!self.isCancelling() &&
!self.isPausing() &&
self.loginState.hasPermission(self.access.permissions.PRINT);
<<<<<<<
return self.isOperational() && (self.isPrinting() || self.isPaused()) && self.loginState.loggedIn();
=======
return self.isOperational() && (self.isPrinting() || self.isPaused()) && !self.isCancelling() && !self.isPausing() && self.loginState.isUser();
>>>>>>>
return self.isOperational() &&
(self.isPrinting() || self.isPaused()) &&
!self.isCancelling() &&
!self.isPausing() &&
self.loginState.loggedIn(); |
<<<<<<<
OCTOPRINT_VIEWMODELS.push([
SettingsViewModel,
["loginStateViewModel", "accessViewModel", "printerProfilesViewModel", "aboutViewModel", "usersViewModel"],
["#settings_dialog", "#navbar_settings"]
]);
=======
OCTOPRINT_VIEWMODELS.push({
construct: SettingsViewModel,
dependencies: ["loginStateViewModel", "usersViewModel", "printerProfilesViewModel", "aboutViewModel"],
elements: ["#settings_dialog", "#navbar_settings"]
});
>>>>>>>
OCTOPRINT_VIEWMODELS.push({
construct: SettingsViewModel,
dependencies: ["loginStateViewModel", "accessViewModel", "printerProfilesViewModel", "aboutViewModel", "usersViewModel"],
elements: ["#settings_dialog", "#navbar_settings"]
}); |
<<<<<<<
=======
self.editorPassword(undefined);
self.editorRepeatedPassword(undefined);
});
self.editorPasswordMismatch = ko.pureComputed(function() {
return self.editorPassword() !== self.editorRepeatedPassword();
});
self.requestData = function() {
if (!CONFIG_ACCESS_CONTROL) return;
>>>>>>>
<<<<<<<
self.deprecatedUsersVariable("emptyUser");
=======
if (user.name === self.loginState.username()) {
// we do not allow to delete ourselves
new PNotify({
title: gettext("Not possible"),
text: gettext("You may not delete your own account."),
type: "error"
});
return $.Deferred().reject("You may not delete your own account").promise();
}
return OctoPrint.users.delete(user.name)
.done(self.fromResponse);
};
>>>>>>>
self.deprecatedUsersVariable("emptyUser");
<<<<<<<
OCTOPRINT_VIEWMODELS.push([
UsersViewModel,
["accessViewModel"],
[]
]);
=======
OCTOPRINT_VIEWMODELS.push({
construct: UsersViewModel,
dependencies: ["loginStateViewModel"]
});
>>>>>>>
OCTOPRINT_VIEWMODELS.push({
construct: UsersViewModel,
dependencies: ["accessViewModel"]
}); |
<<<<<<<
self.foldersOnlyList = ko.dependentObservable(function() {
var filter = function(data) { return data["type"] && data["type"] == "folder"; };
return _.filter(self.listHelper.paginatedItems(), filter);
});
self.filesOnlyList = ko.dependentObservable(function() {
var filter = function(data) { return data["type"] && data["type"] != "folder"; };
return _.filter(self.listHelper.paginatedItems(), filter);
});
self.filesAndFolders = ko.dependentObservable(function() {
var style = self.listStyle();
if (style == "folders_files" || style == "files_folders") {
var files = self.filesOnlyList();
var folders = self.foldersOnlyList();
if (style == "folders_files") {
return folders.concat(files);
} else {
return files.concat(folders);
}
} else {
return self.listHelper.paginatedItems();
}
});
self.isLoadActionPossible = ko.computed(function() {
=======
self.isLoadActionPossible = ko.pureComputed(function() {
>>>>>>>
self.foldersOnlyList = ko.dependentObservable(function() {
var filter = function(data) { return data["type"] && data["type"] == "folder"; };
return _.filter(self.listHelper.paginatedItems(), filter);
});
self.filesOnlyList = ko.dependentObservable(function() {
var filter = function(data) { return data["type"] && data["type"] != "folder"; };
return _.filter(self.listHelper.paginatedItems(), filter);
});
self.filesAndFolders = ko.dependentObservable(function() {
var style = self.listStyle();
if (style == "folders_files" || style == "files_folders") {
var files = self.filesOnlyList();
var folders = self.foldersOnlyList();
if (style == "folders_files") {
return folders.concat(files);
} else {
return files.concat(folders);
}
} else {
return self.listHelper.paginatedItems();
}
});
self.isLoadActionPossible = ko.pureComputed(function() { |
<<<<<<<
return self.isOperational() &&
self.isReady() &&
!self.isPrinting() &&
self.loginState.hasPermission(self.access.permissions.PRINT) &&
self.filename() != undefined;
=======
return self.isOperational() && self.isReady() && !self.isPrinting() && self.loginState.isUser() && self.filename() !== undefined;
>>>>>>>
return self.isOperational() &&
self.isReady() &&
!self.isPrinting() &&
self.loginState.hasPermission(self.access.permissions.PRINT) &&
self.filename() !== undefined;
<<<<<<<
OCTOPRINT_VIEWMODELS.push([
PrinterStateViewModel,
["loginStateViewModel", "settingsViewModel", "accessViewModel"],
["#state_wrapper", "#drop_overlay"]
]);
=======
OCTOPRINT_VIEWMODELS.push({
construct: PrinterStateViewModel,
dependencies: ["loginStateViewModel", "settingsViewModel"],
elements: ["#state_wrapper", "#drop_overlay"]
});
>>>>>>>
OCTOPRINT_VIEWMODELS.push({
construct: PrinterStateViewModel,
dependencies: ["loginStateViewModel", "settingsViewModel", "accessViewModel"],
elements: ["#state_wrapper", "#drop_overlay"]
}); |
<<<<<<<
OCTOPRINT_VIEWMODELS.push([
TimelapseViewModel,
["loginStateViewModel", "accessViewModel"],
["#timelapse", "#timelapse_link"]
]);
=======
OCTOPRINT_VIEWMODELS.push({
construct: TimelapseViewModel,
dependencies: ["loginStateViewModel"],
elements: ["#timelapse"]
});
>>>>>>>
OCTOPRINT_VIEWMODELS.push({
construct: TimelapseViewModel,
dependencies: ["loginStateViewModel", "accessViewModel"],
elements: ["#timelapse", "#timelapse_link"]
}); |
<<<<<<<
self.access = parameters[1];
=======
self.settings = parameters[1];
>>>>>>>
self.access = parameters[1];
self.settings = parameters[1];
<<<<<<<
dependencies: ["loginStateViewModel", "accessViewModel"],
elements: ["#timelapse", "#timelapse_link"]
=======
dependencies: ["loginStateViewModel", "settingsViewModel"],
elements: ["#timelapse"]
>>>>>>>
dependencies: ["loginStateViewModel", "accessViewModel", "settingsViewModel"],
elements: ["#timelapse", "#timelapse_link"] |
<<<<<<<
OctoPrint.access.users.get(self.currentUser().name)
=======
return OctoPrint.users.get(self.currentUser().name)
>>>>>>>
return OctoPrint.access.users.get(self.currentUser().name) |
<<<<<<<
if (notifications) {
new PNotify({
title: gettext("Login successful"),
text: _.sprintf(gettext('You are now logged in as "%(username)s"'), {username: response.name}),
type: "success"
});
}
=======
new PNotify({title: gettext("Login successful"), text: _.sprintf(gettext('You are now logged in as "%(username)s"'), {username: _.escape(response.name)}), type: "success"});
>>>>>>>
if (notifications) {
new PNotify({
title: gettext("Login successful"),
text: _.sprintf(gettext('You are now logged in as "%(username)s"'), {username: _.escape(response.name)}),
type: "success"
});
} |
<<<<<<<
OctoPrint.plugins.softwareupdate.updateAll(force)
.done(function(data) {
self.currentlyBeingUpdated = data.checks;
self._markWorking(gettext("Updating..."), gettext("Updating, please wait."));
})
.fail(function() {
=======
var postData = {
force: (force == true)
};
if (items != undefined) {
postData.check = items;
}
$.ajax({
url: PLUGIN_BASEURL + "softwareupdate/update",
type: "POST",
dataType: "json",
contentType: "application/json; charset=UTF-8",
data: JSON.stringify(postData),
error: function() {
>>>>>>>
OctoPrint.plugins.softwareupdate.updateAll(force, items)
.done(function(data) {
self.currentlyBeingUpdated = data.checks;
self._markWorking(gettext("Updating..."), gettext("Updating, please wait."));
})
.fail(function() {
<<<<<<<
showConfirmationDialog({
message: gettext("This will update your OctoPrint installation and restart the server."),
onproceed: function(e) {
self.performUpdate(force);
}
});
=======
self.forceUpdate = (force == true);
self.confirmationDialog.modal("show");
>>>>>>>
self.forceUpdate = (force == true);
self.confirmationDialog.modal("show");
<<<<<<<
self._showWorkingDialog = function(title) {
if (!self.loginState.isAdmin()) {
return;
}
self.working(true);
self.workingTitle(title);
self.workingDialog.modal("show");
};
self._markWorking = function(title, line, stream) {
if (stream === undefined) {
stream = "message";
}
self.loglines.removeAll();
self.loglines.push({line: line, stream: stream});
self._showWorkingDialog(title);
};
self._markDone = function(line, stream) {
if (stream === undefined) {
stream = "message";
}
self.working(false);
self.loglines.push({line: "", stream: stream});
self.loglines.push({line: line, stream: stream});
self._scrollWorkingOutputToEnd();
};
self._scrollWorkingOutputToEnd = function() {
self.workingOutput.scrollTop(self.workingOutput[0].scrollHeight - self.workingOutput.height());
};
self.onStartup = function() {
self.workingDialog = $("#settings_plugin_softwareupdate_workingdialog");
self.workingOutput = $("#settings_plugin_softwareupdate_workingdialog_output");
};
=======
self.confirmUpdate = function() {
self.confirmationDialog.hide();
self.performUpdate(self.forceUpdate,
_.map(self.availableAndPossible(), function(info) { return info.key }));
};
>>>>>>>
self.confirmUpdate = function() {
self.confirmationDialog.hide();
self.performUpdate(self.forceUpdate,
_.map(self.availableAndPossible(), function(info) { return info.key }));
};
self._showWorkingDialog = function(title) {
if (!self.loginState.isAdmin()) {
return;
}
self.working(true);
self.workingTitle(title);
self.workingDialog.modal("show");
};
self._markWorking = function(title, line, stream) {
if (stream === undefined) {
stream = "message";
}
self.loglines.removeAll();
self.loglines.push({line: line, stream: stream});
self._showWorkingDialog(title);
};
self._markDone = function(line, stream) {
if (stream === undefined) {
stream = "message";
}
self.working(false);
self.loglines.push({line: "", stream: stream});
self.loglines.push({line: line, stream: stream});
self._scrollWorkingOutputToEnd();
};
self._scrollWorkingOutputToEnd = function() {
self.workingOutput.scrollTop(self.workingOutput[0].scrollHeight - self.workingOutput.height());
};
self.onStartup = function() {
self.workingDialog = $("#settings_plugin_softwareupdate_workingdialog");
self.workingOutput = $("#settings_plugin_softwareupdate_workingdialog_output");
}; |
<<<<<<<
if (!self.loginState.hasPermission(self.access.permissions.PLUGIN_SOFTWAREUPDATE_UPDATE)) return;
=======
if (!self.loginState.isAdmin()) return;
if (self.printerState.isPrinting()) return;
>>>>>>>
if (!self.loginState.hasPermission(self.access.permissions.PLUGIN_SOFTWAREUPDATE_UPDATE)) return;
if (self.printerState.isPrinting()) return;
<<<<<<<
self.update = function(force) {
if (self.updateInProgress || !self.loginState.hasPermission(self.access.permissions.PLUGIN_SOFTWAREUPDATE_UPDATE)) {
=======
self.update = function(force, items) {
if (self.updateInProgress) {
self._updateClicked = false;
return;
}
if (!self.loginState.isAdmin()) {
>>>>>>>
self.update = function(force, items) {
if (self.updateInProgress || !self.loginState.hasPermission(self.access.permissions.PLUGIN_SOFTWAREUPDATE_UPDATE)) { |
<<<<<<<
self.access = parameters[3];
=======
// optional
self.piSupport = parameters[3]; // might be null!
>>>>>>>
self.access = parameters[3];
// optional
self.piSupport = parameters[3]; // might be null!
<<<<<<<
self.onUserPermissionsChanged = self.onUserLoggedIn = self.onUserLoggedOut = function() {
if (self.loginState.hasPermission(self.access.permissions.PLUGIN_SOFTWAREUPDATE_CHECK)) {
self.performCheck();
} else {
self._closePopup();
}
=======
self.throttled = ko.pureComputed(function() {
return self.piSupport && self.piSupport.currentIssue();
});
self.onUserLoggedIn = function() {
self.performCheck();
};
self.onUserLoggedOut = function() {
self._closePopup();
>>>>>>>
self.throttled = ko.pureComputed(function() {
return self.piSupport && self.piSupport.currentIssue();
});
self.onUserPermissionsChanged = self.onUserLoggedIn = self.onUserLoggedOut = function() {
if (self.loginState.hasPermission(self.access.permissions.PLUGIN_SOFTWAREUPDATE_CHECK)) {
self.performCheck();
} else {
self._closePopup();
}
<<<<<<<
dependencies: ["loginStateViewModel", "printerStateViewModel", "settingsViewModel", "accessViewModel"],
=======
dependencies: ["loginStateViewModel", "printerStateViewModel", "settingsViewModel", "piSupportViewModel"],
optional: ["piSupportViewModel"],
>>>>>>>
dependencies: ["loginStateViewModel", "printerStateViewModel", "settingsViewModel", "accessViewModel", "piSupportViewModel"],
optional: ["piSupportViewModel"], |
<<<<<<<
import Messages from 'ember-model-validator/messages';
import PostalCodesRegex from 'ember-model-validator/postal-codes-regex';
=======
import Messages from 'ember-model-validator/messages/en';
>>>>>>>
import Messages from 'ember-model-validator/messages/en';
import PostalCodesRegex from 'ember-model-validator/postal-codes-regex'; |
<<<<<<<
function write(filename, contents){
fs.writeFileSync(filename, contents, 'utf-8');
}
=======
function prettyPrint(grammar) {
return grammar.rules.map(g => g.toString())
}
>>>>>>>
function write(filename, contents){
fs.writeFileSync(filename, contents, 'utf-8');
}
function prettyPrint(grammar) {
return grammar.rules.map(g => g.toString())
} |
<<<<<<<
var gi = require("./google_image_plugin");
var google_image_plugin = new gi();
try {
=======
>>>>>>>
try {
<<<<<<<
"announce": {
usage: "<message>",
description: "bot says message with text to speech",
process: function(bot,msg,suffix){ bot.sendMessage(msg.channel,suffix,true);}
},
"image": {
usage: "<image tags>",
description: "gets image matching tags from google",
process: function(bot,msg,suffix){ google_image_plugin.respond(suffix,msg.channel,bot);}
},
=======
>>>>>>>
"announce": {
usage: "<message>",
description: "bot says message with text to speech",
process: function(bot,msg,suffix){ bot.sendMessage(msg.channel,suffix,true);}
},
"image": {
usage: "<image tags>",
description: "gets image matching tags from google",
process: function(bot,msg,suffix){ google_image_plugin.respond(suffix,msg.channel,bot);}
},
<<<<<<<
function rssfeed(bot,msg,url,count,full){
var FeedParser = require('feedparser');
var feedparser = new FeedParser();
var request = require('request');
request(url).pipe(feedparser);
feedparser.on('error', function(error){
bot.sendMessage(msg.channel,"failed reading feed: " + error);
});
var shown = 0;
feedparser.on('readable',function() {
=======
var fs = require('fs'),
path = require('path');
function getDirectories(srcpath) {
return fs.readdirSync(srcpath).filter(function(file) {
return fs.statSync(path.join(srcpath, file)).isDirectory();
});
}
function load_plugins(){
var plugin_folders = getDirectories("./plugins");
for (var i = 0; i < plugin_folders.length; i++) {
var plugin;
try{
var plugin = require("./plugins/" + plugin_folders[i])
} catch (err){
console.log("Improper setup of the '" + plugin_folders[i] +"' plugin. : " + err);
}
if (plugin){
if("commands" in plugin){
for (var j = 0; j < plugin.commands.length; j++) {
if (plugin.commands[j] in plugin){
commands[plugin.commands[j]] = plugin[plugin.commands[j]];
}
}
}
}
}
console.log("Loaded " + Object.keys(commands).length + " chat commands type !help in Discord for a commands list.")
}
function rssfeed(host,path,bot,msg,suffix){
var http = require('http');
http.get({
host:host,
path:path
}, function(response) {
>>>>>>>
var fs = require('fs'),
path = require('path');
function getDirectories(srcpath) {
return fs.readdirSync(srcpath).filter(function(file) {
return fs.statSync(path.join(srcpath, file)).isDirectory();
});
}
function load_plugins(){
var plugin_folders = getDirectories("./plugins");
for (var i = 0; i < plugin_folders.length; i++) {
var plugin;
try{
var plugin = require("./plugins/" + plugin_folders[i])
} catch (err){
console.log("Improper setup of the '" + plugin_folders[i] +"' plugin. : " + err);
}
if (plugin){
if("commands" in plugin){
for (var j = 0; j < plugin.commands.length; j++) {
if (plugin.commands[j] in plugin){
commands[plugin.commands[j]] = plugin[plugin.commands[j]];
}
}
}
}
}
console.log("Loaded " + Object.keys(commands).length + " chat commands type !help in Discord for a commands list.")
}
function rssfeed(bot,msg,url,count,full){
var FeedParser = require('feedparser');
var feedparser = new FeedParser();
var request = require('request');
request(url).pipe(feedparser);
feedparser.on('error', function(error){
bot.sendMessage(msg.channel,"failed reading feed: " + error);
});
var shown = 0;
feedparser.on('readable',function() {
<<<<<<<
try{
cmd.process(bot,msg,suffix);
} catch(e){
bot.sendMessage(msg.channel, "command " + cmdTxt + " failed :(\n" + e.stack);
}
=======
if ("process" in cmd ){
cmd.process(bot,msg,suffix);
}
>>>>>>>
try{
cmd.process(bot,msg,suffix);
} catch(e){
bot.sendMessage(msg.channel, "command " + cmdTxt + " failed :(\n" + e.stack);
}
//if ("process" in cmd ){
// cmd.process(bot,msg,suffix);
//} |
<<<<<<<
},
"wolfram": {
usage: "<search terms>",
description: "gives results from wolframalpha using search terms",
process: function(bot,msg,suffix){
if(!suffix){
bot.sendMessage(msg.channel,"Usage: !wolfram <search terms> (Ex. !wolfram integrate 4x)");
}
wolfram_plugin.respond(suffix,msg.channel,bot);
}
}
=======
},
"hotspatch": {
description: "gets the latest patch notes for Heroes of the Storm from blizzpro",
process: function(bot,msg,suffix) {
//http://heroesofthestorm.blizzpro.com/tag/patch-notes/feed/
rssfeed("heroesofthestorm.blizzpro.com","/tag/patch-notes/feed/",bot,msg,suffix);
}
},
"reddit": {
usage: "[subreddit]",
description: "Returns the top post on reddit. Can optionally pass a subreddit to get the top psot there instead",
process: function(bot,msg,suffix) {
var path = "/.rss"
if(suffix){
path = "/r/"+suffix+path;
}
rssfeed("www.reddit.com",path,bot,msg,"");
}
}
>>>>>>>
},
"wolfram": {
usage: "<search terms>",
description: "gives results from wolframalpha using search terms",
process: function(bot,msg,suffix){
if(!suffix){
bot.sendMessage(msg.channel,"Usage: !wolfram <search terms> (Ex. !wolfram integrate 4x)");
}
wolfram_plugin.respond(suffix,msg.channel,bot);
}
},
"hotspatch": {
description: "gets the latest patch notes for Heroes of the Storm from blizzpro",
process: function(bot,msg,suffix) {
//http://heroesofthestorm.blizzpro.com/tag/patch-notes/feed/
rssfeed("heroesofthestorm.blizzpro.com","/tag/patch-notes/feed/",bot,msg,suffix);
}
},
"reddit": {
usage: "[subreddit]",
description: "Returns the top post on reddit. Can optionally pass a subreddit to get the top psot there instead",
process: function(bot,msg,suffix) {
var path = "/.rss"
if(suffix){
path = "/r/"+suffix+path;
}
rssfeed("www.reddit.com",path,bot,msg,"");
}
} |
<<<<<<<
var result = key
, structure = data;
for (var paths = key.split('.'), i = 0, length = paths.length; i < length && structure; i++) {
result = structure[+paths[i] || paths[i]];
structure = result;
}
return result || data[key];
}
=======
//
// compileMappings
//
// sort the mappings so that mappings for the same attribute and value go consecutive
// and inside those, those that change attributes appear first.
//
function compileMappings(oldMappings) {
var mappings = oldMappings.slice(0);
mappings.sort(function(map1, map2) {
if (map1.attribute !== map2.attribute) {
return map1.attribute < map2.attribute ? -1 : 1;
}
if (map1.value !== map2.value) {
return map1.value < map2.value ? -1 : 1;
}
if (! ('replace' in map1) && ! ('replace' in map2)) {
throw new Error('Conflicting mappings for attribute ' + map1.attribute + ' and value ' + map1.value);
}
if (map1.replace) {
return 1;
}
return -1;
});
return mappings;
}
Merge.prototype = {
>>>>>>>
var result = key
, structure = data;
for (var paths = key.split('.'), i = 0, length = paths.length; i < length && structure; i++) {
result = structure[+paths[i] || paths[i]];
structure = result;
}
return result || data[key];
}
//
// compileMappings
//
// sort the mappings so that mappings for the same attribute and value go consecutive
// and inside those, those that change attributes appear first.
//
function compileMappings(oldMappings) {
var mappings = oldMappings.slice(0);
mappings.sort(function(map1, map2) {
if (map1.attribute !== map2.attribute) {
return map1.attribute < map2.attribute ? -1 : 1;
}
if (map1.value !== map2.value) {
return map1.value < map2.value ? -1 : 1;
}
if (! ('replace' in map1) && ! ('replace' in map2)) {
throw new Error('Conflicting mappings for attribute ' + map1.attribute + ' and value ' + map1.value);
}
if (map1.replace) {
return 1;
}
return -1;
});
return mappings;
}
<<<<<<<
//
// ### function iterate(html, value, components, tagname, key)
// #### @html {String} peice of HTML
// #### @value {Mixed} iterateable object with data
// #### @components {Array} result of the this.tag regexp execution
// #### @tagname {String} the name of the tag that we iterate on
// #### @key {String} the key of the data that we need to extract from the value
//
// Iterate over over the supplied HTML.
//
iterate: function iterate(html, value, components, tagname, key) {
=======
iterate: function(html, value, components, tagname, key, map) {
>>>>>>>
//
// ### function iterate(html, value, components, tagname, key)
// #### @html {String} peice of HTML
// #### @value {Mixed} iterateable object with data
// #### @components {Array} result of the this.tag regexp execution
// #### @tagname {String} the name of the tag that we iterate on
// #### @key {String} the key of the data that we need to extract from the value
//
// Iterate over over the supplied HTML.
//
iterate: function iterate(html, value, components, tagname, key, map) {
<<<<<<<
return output += this.bind(segment, value);
=======
return output += this.bind(segment, value, map);
>>>>>>>
return output += this.bind(segment, value, map);
<<<<<<<
(_toString.call(mapping.value) === '[object RegExp]' &&
mapping.value.exec(value) !== null)
) {
if (mapping.remove) {
//
// only increase the remove counter if it's not a self
// closing element. As matchmode is suffectient to
// remove tose
//
if (!isSelfClosing) remove++;
matchmode = true;
} else if (mapping.plates) {
var partial = that.bind(
mapping.plates
, typeof mapping.data === 'string' ? data[mapping.data] : mapping.data || data
, mapping.mapper
);
buffer += tagbody + that.iterate(html, partial, components, tagname);
matchmode = true;
} else {
var v = newdata = fetch(data, mapping, value, tagbody, key);
newdata = tagbody + newdata;
if (Array.isArray(v)) {
newdata = that.iterate(html, v, components, tagname, value);
// If the item is an array, then we need to tell
// Plates that we're dealing with nests
that.nest.push(tagname);
} else if (typeof v === 'object') {
newdata = tagbody + that.iterate(html, v, components, tagname, value);
}
buffer += newdata || '';
matchmode = true;
=======
( ({}).toString.call(mappings[ii].value) === '[object RegExp]' &&
mappings[ii].value.exec(value) !== null) ) {
var v = data[mappings[ii].dataKey];
newdata = tagbody + newdata;
if (isArray(v)) {
newdata = that.iterate(html, v, components, tagname, value, map);
// If the item is an array, then we need to tell
// Plates that we're dealing with nests
that.nest.push(tagname);
}
else if (typeof v === 'object') {
newdata = tagbody + that.iterate(html, v, components, tagname, value, map);
>>>>>>>
(_toString.call(mapping.value) === '[object RegExp]' &&
mapping.value.exec(value) !== null)
) {
if (mapping.remove) {
//
// only increase the remove counter if it's not a self
// closing element. As matchmode is suffectient to
// remove tose
//
if (!isSelfClosing) remove++;
matchmode = true;
} else if (mapping.plates) {
var partial = that.bind(
mapping.plates
, typeof mapping.data === 'string' ? data[mapping.data] : mapping.data || data
, mapping.mapper
);
buffer += tagbody + that.iterate(html, partial, components, tagname, undefined, map);
matchmode = true;
} else {
var v = newdata = fetch(data, mapping, value, tagbody, key);
newdata = tagbody + newdata;
if (Array.isArray(v)) {
newdata = that.iterate(html, v, components, tagname, value, map);
// If the item is an array, then we need to tell
// Plates that we're dealing with nests
that.nest.push(tagname);
} else if (typeof v === 'object') {
newdata = tagbody + that.iterate(html, v, components, tagname, value, map);
}
buffer += newdata || '';
matchmode = true;
<<<<<<<
var v = data[value],
nest = Array.isArray(v),
output = (nest || typeof v === 'object') ? that.iterate(html, v, components, tagname, value) : v;
=======
var v = data[value],
nest = isArray(v),
output = (nest || typeof v === 'object') ? that.iterate(html, v, components, tagname, value, map) : v;
>>>>>>>
var v = data[value],
nest = Array.isArray(v),
output = (nest || typeof v === 'object') ? that.iterate(html, v, components, tagname, value, map) : v; |
<<<<<<<
module.exports = function lostCenterDecl(css, settings) {
=======
var lgLogic = require('./_lg-logic');
/**
* lost-center: Horizontally center a container element and apply padding
* to it.
*
* @param {length} [max-width|fraction] - Either a max-width to assign (can be
* any unit). Or, a simple fraction of the containing element's width.
*
* @param {length} [padding] - Padding on the left and right of the element.
* Can be any unit.
*
* @param {string} [flex|no-flex] - Determines whether this element should
* use Flexbox or not.
*
* @example
* section {
* lost-center: 980px;
* }
*
* @example
* section {
* lost-center: 3/12;
* }
*
* @example
* section {
* lost-center: 1140px 30px flex;
* }
*
* @example
* section {
* lost-center: 2/6 30px flex;
* }
*/
module.exports = function lostCenterDecl(css, settings, result) {
>>>>>>>
var lgLogic = require('./_lg-logic');
module.exports = function lostCenterDecl(css, settings) { |
<<<<<<<
var warningIcon = null;
if (this.showErrors()) {
warningIcon = (
<Icon symbol="remove" className="form-control-feedback" />
);
}
=======
>>>>>>>
<<<<<<<
var className = 'form-control'
if (this.showErrors()) {
className = 'form-control-danger form-control'
}
=======
var className = 'form-control'
if (this.showErrors()) {
className = 'form-control-danger form-control'
}
>>>>>>>
var className = 'form-control'
if (this.showErrors()) {
className = 'form-control-danger form-control'
} |
<<<<<<<
var warningIcon = null;
if (this.showErrors()) {
warningIcon = React.createElement(Icon, { symbol: 'remove', className: 'form-control-feedback' });
}
=======
>>>>>>> |
<<<<<<<
},
getAddresses: async (_, { name, keys }) => {
const ens = getENS()
const addresses = keys.map(key =>
ens.getAddr(name, key).then(addr => ({ key, value: addr }))
)
return Promise.all(addresses)
},
getTextRecords: async (_, { name, keys }) => {
const ens = getENS()
const textRecords = keys.map(key =>
ens.getText(name, key).then(addr => ({ key, value: addr }))
)
return Promise.all(textRecords)
=======
},
waitBlockTimestamp: async (_, { waitUntil }) => {
if (waitUntil) {
let block = await getBlock()
let timestamp = block.timestamp * 1000
while (timestamp < waitUntil) {
block = await getBlock()
timestamp = block.timestamp * 1000
await delay(1000)
}
return true
} else {
return false
}
>>>>>>>
},
getAddresses: async (_, { name, keys }) => {
const ens = getENS()
const addresses = keys.map(key =>
ens.getAddr(name, key).then(addr => ({ key, value: addr }))
)
return Promise.all(addresses)
},
getTextRecords: async (_, { name, keys }) => {
const ens = getENS()
const textRecords = keys.map(key =>
ens.getText(name, key).then(addr => ({ key, value: addr }))
)
return Promise.all(textRecords)
},
waitBlockTimestamp: async (_, { waitUntil }) => {
if (waitUntil) {
let block = await getBlock()
let timestamp = block.timestamp * 1000
while (timestamp < waitUntil) {
block = await getBlock()
timestamp = block.timestamp * 1000
await delay(1000)
}
return true
} else {
return false
} |
<<<<<<<
{this.state.columns.map(col => (
<VirtualizedList
ref={ref => (this._listRefs[col.index] = ref)}
key={`$col_${col.index}`}
data={col.data}
getItemCount={this._getItemCount}
getItem={this._getItem}
getItemLayout={(data, index) =>
this._getItemLayout(col.index, index)}
renderItem={({ item, index }) =>
renderItem({ item, index, column: col.index })}
renderScrollComponent={this._renderScrollComponent}
keyExtractor={keyExtractor}
onEndReached={onEndReached}
onEndReachedThreshold={this.props.onEndReachedThreshold}
removeClippedSubviews={false}
/>
))}
=======
{(!headerElement || this.state.headerHeight !== null) &&
this.state.columns.map(col => (
<VirtualizedList
{...props}
ref={ref => (this._listRefs[col.index] = ref)}
key={`$col_${col.index}`}
data={col.data}
getItemCount={this._getItemCount}
getItem={this._getItem}
getItemLayout={(data, index) =>
this._getItemLayout(col.index, index)}
renderItem={({ item, index }) =>
renderItem({ item, index, column: col.index })}
renderScrollComponent={this._renderScrollComponent}
keyExtractor={keyExtractor}
ListHeaderComponent={
headerElement && this._renderPlaceholderHeader
}
onEndReached={onEndReached}
onEndReachedThreshold={this.props.onEndReachedThreshold}
removeClippedSubviews={false}
/>
))}
>>>>>>>
{this.state.columns.map(col => (
<VirtualizedList
{...props}
ref={ref => (this._listRefs[col.index] = ref)}
key={`$col_${col.index}`}
data={col.data}
getItemCount={this._getItemCount}
getItem={this._getItem}
getItemLayout={(data, index) =>
this._getItemLayout(col.index, index)}
renderItem={({ item, index }) =>
renderItem({ item, index, column: col.index })}
renderScrollComponent={this._renderScrollComponent}
keyExtractor={keyExtractor}
onEndReached={onEndReached}
onEndReachedThreshold={this.props.onEndReachedThreshold}
removeClippedSubviews={false}
/>
))} |
<<<<<<<
fullGlob = (function () {
var packagejson = JSON.parse(fs.readFileSync('package.json', {encoding: 'utf8'}));
var pkgs = _.keys(packagejson.dependencies);
pkgs = pkgs.concat(_.keys(packagejson.optionalDependencies));
return pkgs.map(function (package) {
return 'node_modules/' + package + '/**';
}).concat(['!node_modules/aliyun-sdk/tools/**', '!node_modules/**/test/**']); //remove unsued files
}()),
// ## List of files we want to lint through jshint and jscs to make sure
// they conform to our desired code styles.
lintFiles = {
// Linting files for server side or shared javascript code.
server: {
files: {
src: [
'*.js',
'!config*.js', // note: i added this, do we want this linted?
'core/*.js',
'core/server/**/*.js',
'core/shared/**/*.js',
'!core/shared/vendor/**/*.js'
]
}
},
// Linting files for client side javascript code.
client: {
files: {
src: [
'core/client/**/*.js',
'!core/client/docs/js/*.js',
'!core/client/assets/vendor/**/*.js',
'!core/client/tpl/**/*.js'
]
}
},
clientTests: {
files: {
src: [
'core/test/client/**/*.js'
]
}
},
// Linting files for test code.
test: {
files: {
src: [
'core/test/**/*.js',
'!core/test/client/**/*.js'
]
}
}
},
=======
>>>>>>>
fullGlob = (function () {
var packagejson = JSON.parse(fs.readFileSync('package.json', {encoding: 'utf8'}));
var pkgs = _.keys(packagejson.dependencies);
pkgs = pkgs.concat(_.keys(packagejson.optionalDependencies));
return pkgs.map(function (package) {
return 'node_modules/' + package + '/**';
}).concat(['!node_modules/aliyun-sdk/tools/**', '!node_modules/**/test/**']); //remove unsued files
}()),
<<<<<<<
// ### grunt-contrib-concat
// concatenate multiple JS files into a single file ready for use
concat: {
dev: {
nonull: true,
dest: 'core/built/scripts/vendor-dev.js',
src: [
'bower_components/loader.js/loader.js',
'bower_components/jquery/dist/jquery.js',
'bower_components/ember/ember.debug.js',
'bower_components/ember-data/ember-data.js',
'bower_components/ember-resolver/dist/ember-resolver.js',
'bower_components/ic-ajax/dist/globals/main.js',
'bower_components/ember-load-initializers/ember-load-initializers.js',
'bower_components/validator-js/validator.js',
'bower_components/codemirror/lib/codemirror.js',
'bower_components/codemirror/addon/mode/overlay.js',
'bower_components/codemirror/mode/markdown/markdown.js',
'bower_components/codemirror/mode/gfm/gfm.js',
'bower_components/showdown-ghost/src/showdown.js',
'bower_components/moment/min/moment-with-locales.js',
'bower_components/keymaster/keymaster.js',
'bower_components/device/lib/device.js',
'bower_components/jquery-ui/ui/jquery-ui.js',
'bower_components/jquery-file-upload/js/jquery.fileupload.js',
'bower_components/fastclick/lib/fastclick.js',
'bower_components/nprogress/nprogress.js',
'bower_components/ember-simple-auth/simple-auth.js',
'bower_components/ember-simple-auth/simple-auth-oauth2.js',
'bower_components/google-caja/html-css-sanitizer-bundle.js',
'bower_components/nanoscroller/bin/javascripts/jquery.nanoscroller.js',
'bower_components/jqueryui-touch-punch/jquery.ui.touch-punch.js',
'core/shared/lib/showdown/extensions/ghostimagepreview.js',
'core/shared/lib/showdown/extensions/ghostgfm.js',
'core/shared/lib/showdown/extensions/ghostfootnotes.js',
'core/shared/lib/showdown/extensions/ghosthighlight.js'
]
},
prod: {
nonull: true,
dest: 'core/built/scripts/vendor.js',
src: [
'bower_components/loader.js/loader.js',
'bower_components/jquery/dist/jquery.js',
'bower_components/ember/ember.prod.js',
'bower_components/ember-data/ember-data.prod.js',
'bower_components/ember-resolver/dist/ember-resolver.js',
'bower_components/ic-ajax/dist/globals/main.js',
'bower_components/ember-load-initializers/ember-load-initializers.js',
'bower_components/validator-js/validator.js',
'bower_components/codemirror/lib/codemirror.js',
'bower_components/codemirror/addon/mode/overlay.js',
'bower_components/codemirror/mode/markdown/markdown.js',
'bower_components/codemirror/mode/gfm/gfm.js',
'bower_components/showdown-ghost/src/showdown.js',
'bower_components/moment/min/moment-with-locales.js',
'bower_components/keymaster/keymaster.js',
'bower_components/device/lib/device.js',
'bower_components/jquery-ui/ui/jquery-ui.js',
'bower_components/jquery-file-upload/js/jquery.fileupload.js',
'bower_components/fastclick/lib/fastclick.js',
'bower_components/nprogress/nprogress.js',
'bower_components/ember-simple-auth/simple-auth.js',
'bower_components/ember-simple-auth/simple-auth-oauth2.js',
'bower_components/google-caja/html-css-sanitizer-bundle.js',
'bower_components/nanoscroller/bin/javascripts/jquery.nanoscroller.js',
'bower_components/jqueryui-touch-punch/jquery.ui.touch-punch.js',
'core/shared/lib/showdown/extensions/ghostimagepreview.js',
'core/shared/lib/showdown/extensions/ghostgfm.js',
'core/shared/lib/showdown/extensions/ghostfootnotes.js',
'core/shared/lib/showdown/extensions/ghosthighlight.js'
]
}
},
=======
>>>>>>>
<<<<<<<
['init', 'concat:prod', 'copy:prod', 'emberBuildProd', 'uglify:release', 'clean:release',
'shell:shrinkwrap', 'copy:release', 'compress:release']);
grunt.registerTask('release-full', 'Create zip package with all needed node modules.',
['clean:all', 'init', 'concat:prod', 'copy:prod', 'emberBuildProd', 'uglify:release', 'clean:release',
'shell:shrinkwrap', 'copy:release', 'compress:release', 'shell:sqlite-bindings', 'copy:full', 'compress:release-full']);
=======
['init', 'shell:ember:prod', 'uglify:release', 'clean:release', 'copy:release', 'shell:shrinkwrap', 'compress:release']);
>>>>>>>
['init', 'shell:ember:prod', 'uglify:release', 'clean:release', 'copy:release', 'shell:shrinkwrap', 'compress:release']);
grunt.registerTask('release-full', 'Create zip package with all needed node modules.',
['clean:all', 'init', 'shell:ember:prod', 'uglify:release', 'clean:release', 'copy:release', 'shell:shrinkwrap', 'compress:release', 'shell:sqlite-bindings', 'copy:full', 'compress:release-full']); |
<<<<<<<
res = undo(state.history, action.steps);
debug('after undo', res);
debugEnd();
=======
res = undo(state.history);
debug('history (undo):', historyToString(state.history), '->', historyToString(res));
>>>>>>>
res = undo(state.history);
debug('after undo', res);
debugEnd();
<<<<<<<
res = redo(state.history, action.steps);
debug('after redo', res);
debugEnd();
=======
res = redo(state.history);
debug('history (redo):', historyToString(state.history), '->', historyToString(res));
>>>>>>>
res = redo(state.history);
debug('after redo', res);
debugEnd(); |
<<<<<<<
// import pickingMaterial from '../core/engine/picking/pickingMaterial';
=======
>>>>>>> |
<<<<<<<
import './packages/component/src/css/l7.css';
import './site/css/demo.css'
=======
require('./packages/component/src/css/l7.css');
>>>>>>>
import './packages/component/src/css/l7.css';
import './site/css/demo.css'
require('./packages/component/src/css/l7.css');
<<<<<<<
window.scene = require('@l7/scene');
window.layers= require('@l7/layers');
window.component= require('@l7/component');
window.G2PO = require('@antv/g2plot');
=======
window.scene = require('./packages/scene/src');
window.layers= require('./packages/layers/src');
window.component= require('./packages/component/src');
window.g2plot = require('@antv/g2plot');
>>>>>>>
window.scene = require('./packages/scene/src');
window.layers= require('./packages/layers/src');
window.component= require('./packages/component/src');
window.g2plot = require('@antv/g2plot'); |
<<<<<<<
export function Line(path, props, positionsIndex) {
// 区分path是面还是线
if (Array.isArray(path[0][0])) {
path = path[0]; // 面坐标转线坐标
}
=======
export function Line(path, props, positionsIndex, lengthPerDashSegment = 200) {
if (path.length === 1) path = path[0];// 面坐标转线坐标
>>>>>>>
export function Line(path, props, positionsIndex, lengthPerDashSegment = 200) {
if (Array.isArray(path[0][0])) {
path = path[0]; // 面坐标转线坐标
}
<<<<<<<
let c = 0;
let index = positionsIndex;
let { size, color, id } = props;
!Array.isArray(size) && (size = [ size ]);
path.forEach((point, pointIndex, list) => {
const i = index;
colors.push(...color);
=======
const { size, color, id } = props;
attrPos.forEach((point, pointIndex) => {
>>>>>>>
let { size, color, id } = props;
!Array.isArray(size) && (size = [ size ]);
attrPos.forEach((point, pointIndex) => { |
<<<<<<<
if (data && data.error && data.error.message) {
return <NetworkError message={data.error.message} />
} else {
return (
<>
<Router>
<Switch>
<Route
exact
path="/"
component={Home}
layout={HomePageLayout}
/>
<Route path="/test-registrar" component={TestRegistrar} />
<Route path="/favourites" component={Favourites} />
<Route path="/my-bids" component={SearchResults} />
<Route path="/how-it-works" component={SearchResults} />
<Route
path="/search/:searchTerm"
component={SearchResults}
/>
<Route path="/name/:name" component={SingleName} />
<Route
path="/address/:address/:domainType"
component={Address}
/>
<Route path="/address/:address" component={Address} />
<Route path="/renew" component={Renew} />
<Route path="*" component={Error404} />
</Switch>
</Router>
<Modal name={CONFIRM} component={Confirm} />
<ExpiryNotificationModal />
</>
)
}
}}
</Query>
</ApolloProvider>
)
}
=======
if (data.error && data.error.message) {
return <NetworkError message={data.error.message} />
} else {
return (
<>
<Router>
<Switch>
<Route
exact
path="/"
component={Home}
layout={HomePageLayout}
/>
<Route path="/test-registrar" component={TestRegistrar} />
<Route path="/favourites" component={Favourites} />
<Route path="/faq" component={Faq} />
<Route path="/my-bids" component={SearchResults} />
<Route path="/how-it-works" component={SearchResults} />
<Route path="/search/:searchTerm" component={SearchResults} />
<Route path="/name/:name" component={SingleName} />
<Route
path="/address/:address/:domainType"
component={Address}
/>
<Route path="/address/:address" component={Address} />
<Route path="/renew" component={Renew} />
<Route path="*" component={Error404} />
</Switch>
</Router>
<Modal name={CONFIRM} component={Confirm} />
<ExpiryNotificationModal />
</>
)
}
}}
</Query>
</>
)
>>>>>>>
if (data && data.error && data.error.message) {
return <NetworkError message={data.error.message} />
} else {
return (
<>
<Router>
<Switch>
<Route
exact
path="/"
component={Home}
layout={HomePageLayout}
/>
<Route path="/test-registrar" component={TestRegistrar} />
<Route path="/favourites" component={Favourites} />
<Route path="/faq" component={Faq} />
<Route path="/my-bids" component={SearchResults} />
<Route path="/how-it-works" component={SearchResults} />
<Route
path="/search/:searchTerm"
component={SearchResults}
/>
<Route path="/name/:name" component={SingleName} />
<Route
path="/address/:address/:domainType"
component={Address}
/>
<Route path="/address/:address" component={Address} />
<Route path="/renew" component={Renew} />
<Route path="*" component={Error404} />
</Switch>
</Router>
<Modal name={CONFIRM} component={Confirm} />
<ExpiryNotificationModal />
</>
)
}
}}
</Query>
</ApolloProvider>
)
} |
<<<<<<<
export function Line(path, props, positionsIndex) {
// 区分path是面还是线
if (Array.isArray(path[0][0])) {
path = path[0]; // 面坐标转线坐标
}
=======
export function Line(path, props, positionsIndex, lengthPerDashSegment = 200) {
if (path.length === 1) path = path[0];// 面坐标转线坐标
>>>>>>>
export function Line(path, props, positionsIndex, lengthPerDashSegment = 200) {
if (Array.isArray(path[0][0])) {
path = path[0]; // 面坐标转线坐标
}
<<<<<<<
let c = 0;
let index = positionsIndex;
let { size, color, id } = props;
!Array.isArray(size) && (size = [ size ]);
path.forEach((point, pointIndex, list) => {
const i = index;
colors.push(...color);
=======
const { size, color, id } = props;
attrPos.forEach((point, pointIndex) => {
>>>>>>>
let { size, color, id } = props;
!Array.isArray(size) && (size = [ size ]);
attrPos.forEach((point, pointIndex) => { |
<<<<<<<
import lighting from './shaderChunks/lighting.glsl';
=======
import sdf_2d from './shaderChunks/sdf_2d.glsl';
>>>>>>>
import lighting from './shaderChunks/lighting.glsl';
import sdf_2d from './shaderChunks/sdf_2d.glsl';
<<<<<<<
registerModule('lighting', { vs: lighting, fs: '' });
=======
registerModule('sdf_2d', { vs: '', fs: sdf_2d });
>>>>>>>
registerModule('lighting', { vs: lighting, fs: '' });
registerModule('sdf_2d', { vs: '', fs: sdf_2d }); |
<<<<<<<
// import WorkerPool from './worker';
=======
import FontAtlasManager from '../geom/buffer/point/text/font-manager';
// import WorkerPool from './worker';
>>>>>>>
import FontAtlasManager from '../geom/buffer/point/text/font-manager';
import WorkerPool from '../worker/worker_pool';
<<<<<<<
this._engine.run();
// this.workerPool = new WorkerPool();
=======
this.registerMapEvent();
// this._engine.run();
// this.workerPool = new WorkerPool();
>>>>>>>
this.registerMapEvent();
// this._engine.run();
this.workerPool = new WorkerPool(); |
<<<<<<<
import lighting from './shaderChunks/lighting.glsl';
=======
import sdf_2d from './shaderChunks/sdf_2d.glsl';
>>>>>>>
import lighting from './shaderChunks/lighting.glsl';
import sdf_2d from './shaderChunks/sdf_2d.glsl';
<<<<<<<
registerModule('lighting', { vs: lighting, fs: '' });
=======
registerModule('sdf_2d', { vs: '', fs: sdf_2d });
>>>>>>>
registerModule('lighting', { vs: lighting, fs: '' });
registerModule('sdf_2d', { vs: '', fs: sdf_2d }); |
<<<<<<<
/*
* @Author: ThinkGIS
* @Date: 2018-06-08 11:19:06
* @Last Modified by: mikey.zhaopeng
* @Last Modified time: 2019-02-25 20:58:08
*/
=======
>>>>>>>
<<<<<<<
import { aProjectFlat } from '../geo/project';
import { getTransform, getParser } from '../source';
=======
import { getMap } from '../map/index';
>>>>>>>
import { getTransform, getParser } from '../source';
import { getMap } from '../map/index'; |
<<<<<<<
// import pickingMaterial from '../core/engine/picking/pickingMaterial';
=======
>>>>>>> |
<<<<<<<
export function Line(path, props, positionsIndex) {
// 区分path是面还是线
if (Array.isArray(path[0][0])) {
path = path[0]; // 面坐标转线坐标
}
=======
export function Line(path, props, positionsIndex, lengthPerDashSegment = 200) {
if (path.length === 1) path = path[0];// 面坐标转线坐标
>>>>>>>
export function Line(path, props, positionsIndex, lengthPerDashSegment = 200) {
if (Array.isArray(path[0][0])) {
path = path[0]; // 面坐标转线坐标
}
<<<<<<<
let c = 0;
let index = positionsIndex;
let { size, color, id } = props;
!Array.isArray(size) && (size = [ size ]);
path.forEach((point, pointIndex, list) => {
const i = index;
colors.push(...color);
=======
const { size, color, id } = props;
attrPos.forEach((point, pointIndex) => {
>>>>>>>
let { size, color, id } = props;
!Array.isArray(size) && (size = [ size ]);
attrPos.forEach((point, pointIndex) => { |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.