conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
LANGUAGE_ja: 'Japonés',
LANGUAGE_it: 'Italiano',
=======
LANGUAGE_da: 'Danés',
>>>>>>>
LANGUAGE_ja: 'Japonés',
LANGUAGE_it: 'Italiano',
LANGUAGE_da: 'Danés', |
<<<<<<<
{sort: 'title', label: 'SORT_OPTIONS.AZ'},
{sort: '-title', label: 'SORT_OPTIONS.ZA'},
{sort: '-release_date', label: 'SORT_OPTIONS.NEWEST_RELEASED'},
{sort: 'release_date', label: 'SORT_OPTIONS.OLDEST_RELEASED'},
{sort: '-dateCreated', label: 'SORT_OPTIONS.NEWEST_ADDED'},
{sort: 'dateCreated', label: 'SORT_OPTIONS.OLDEST_ADDED'}
=======
{sort: 'title', order: 'ASC', label: 'SORT_OPTIONS.AZ'},
{sort: 'title', order: 'DESC', label: 'SORT_OPTIONS.ZA'},
{sort: 'release_date', order: 'DESC', label: 'SORT_OPTIONS.NEWEST_RELEASED'},
{sort: 'release_date', order: 'ASC', label: 'SORT_OPTIONS.OLDEST_RELEASED'}
>>>>>>>
{sort: 'title', order: 'ASC', label: 'SORT_OPTIONS.AZ'},
{sort: 'title', order: 'DESC', label: 'SORT_OPTIONS.ZA'},
{sort: 'release_date', order: 'DESC', label: 'SORT_OPTIONS.NEWEST_RELEASED'},
{sort: 'release_date', order: 'ASC', label: 'SORT_OPTIONS.OLDEST_RELEASED'},
{sort: 'dateCreated', order: 'DESC', label: 'SORT_OPTIONS.NEWEST_ADDED'},
{sort: 'dateCreated', order: 'ASC', label: 'SORT_OPTIONS.OLDEST_ADDED'} |
<<<<<<<
LANGUAGE_ja: 'Japonais',
LANGUAGE_it: 'Italien',
=======
LANGUAGE_da: 'Danois',
>>>>>>>
LANGUAGE_ja: 'Japonais',
LANGUAGE_it: 'Italien',
LANGUAGE_da: 'Danois', |
<<<<<<<
=======
//= require spring-websocket
//= require jquery/dist/jquery.min.js
//= require angular/angular.min.js
//= require angular-ui-router/release/angular-ui-router.min.js
//= require angular-sanitize/angular-sanitize.min.js
//= require bootstrap/dist/js/bootstrap.min.js
//= require angular-bootstrap/ui-bootstrap.min.js
//= require angular-bootstrap/ui-bootstrap-tpls.min.js
//= require alertify/alertify.min.js
//= require lodash/dist/lodash.min.js
//= require ng-file-upload/ng-file-upload.min.js
//= require jquery-ui-1.11.4.custom/jquery-ui.min.js
//= require angular-ui-slider/src/slider.js
//= require mousetrap/mousetrap.min.js
//= require Autolinker.js/dist/Autolinker.js
//= require angular-local-storage/dist/angular-local-storage.min.js
//= require angular-ui-select/dist/select.min.js
//= require jquery-mousewheel/jquery.mousewheel.min.js
//= require lodash-mixins.js
>>>>>>>
//= require lodash-mixins.js |
<<<<<<<
//= require riddle
=======
//= require vim
//= require emacs
//= require_tree .
>>>>>>>
//= require vim
//= require emacs
//= require riddle |
<<<<<<<
originalX = window.scrollX,
originalY = window.scrollY,
=======
originalOverflowStyle = document.documentElement.style.overflow,
>>>>>>>
originalX = window.scrollX,
originalY = window.scrollY,
originalOverflowStyle = document.documentElement.style.overflow,
<<<<<<<
numArrangements;
=======
numArrangements,
canvas = document.createElement('canvas'),
ctx;
canvas.width = fullWidth;
canvas.height = fullHeight;
ctx = canvas.getContext('2d');
// Disable all scrollbars. We'll restore the scrollbar state when we're done
// taking the screenshots.
document.documentElement.style.overflow = 'hidden';
>>>>>>>
numArrangements;
// Disable all scrollbars. We'll restore the scrollbar state when we're done
// taking the screenshots.
document.documentElement.style.overflow = 'hidden';
<<<<<<<
window.scrollTo(originalX, originalY);
=======
document.documentElement.style.overflow = originalOverflowStyle;
window.scrollTo(0, 0);
>>>>>>>
document.documentElement.style.overflow = originalOverflowStyle;
window.scrollTo(originalX, originalY);
<<<<<<<
// need to wait for scrollbar to disappear
window.setTimeout(function() {
chrome.extension.sendRequest(data, function(captured) {
if (captured) {
// Move on to capture next arrangement.
processArrangements();
} else {
// If there's an error in popup.js, the response value is undefined.
// This happens if the user clicks the page to close the popup. Return
// the window to its original scroll position.
window.scrollTo(originalX, originalY);
=======
// wait for the page to settle after scrolling before asking the
// background page to take a snapshot.
window.setTimeout(function() {
chrome.extension.sendRequest(data, function(response) {
// when there's an error in popup.js, the
// response is `undefined`. this can happen
// if you click the page to close the popup
if (typeof(response) != 'undefined') {
scrollTo();
>>>>>>>
// need to wait for scrollbar to disappear
window.setTimeout(function() {
chrome.extension.sendRequest(data, function(captured) {
if (captured) {
// Move on to capture next arrangement.
processArrangements();
} else {
// If there's an error in popup.js, the response value is undefined.
// This happens if the user clicks the page to close the popup. Return
// the window to its original scroll position.
window.scrollTo(originalX, originalY); |
<<<<<<<
this.firstz = Infinity;
=======
this.job = options.job || false;
this.retry = options.retry || 0;
>>>>>>>
this.job = options.job || false;
this.retry = options.retry || 0;
this.firstz = Infinity; |
<<<<<<<
}
function getTileRetry(source, z, x, y, tries, callback) {
tries = typeof tries === 'number' ? { max:tries, num:0 } : tries;
source.getTile(z, x, y, function(err, tile, headers) {
if (err && tries.num++ < tries.max) {
setTimeout(function() {
getTileRetry(source, z, x, y, tries, callback);
}, Math.pow(2, tries.num) * module.exports.retryBackoff);
} else {
callback.apply(this, arguments);
}
});
}
function putTileRetry(source, z, x, y, data, tries, callback) {
tries = typeof tries === 'number' ? { max:tries, num:0 } : tries;
source.putTile(z, x, y, data, function(err) {
if (err && tries.num++ < tries.max) {
setTimeout(function() {
putTileRetry(source, z, x, y, data, tries, callback);
}, Math.pow(2, tries.num) * module.exports.retryBackoff);
} else {
callback.apply(this, arguments);
}
});
}
=======
}
/**
* Limit a bounding box to the [-180, -90, 180, 90] limits
* of WGS84. We permit greater bounds for input data, since sometimes
* GeoJSON and unusual shapefiles feature them, but we can't tile
* beyond these bounds in XYZ, so we limit them.
*
* This method does not mutate its input, and it strongly expects
* that its input is a valid type.
*
* @param {Array<Number>} bounds
* @returns {Array<Number} bounds
*/
function limitBounds(bounds) {
// acceptable ranges for each number in a bounding box
var lon = [-180, 180], lat = [-90, 90], limits = [lon, lat, lon, lat];
return bounds.map(function(_, i) {
return Math.max(limits[i][0], Math.min(limits[i][1], _));
});
}
>>>>>>>
}
/**
* Limit a bounding box to the [-180, -90, 180, 90] limits
* of WGS84. We permit greater bounds for input data, since sometimes
* GeoJSON and unusual shapefiles feature them, but we can't tile
* beyond these bounds in XYZ, so we limit them.
*
* This method does not mutate its input, and it strongly expects
* that its input is a valid type.
*
* @param {Array<Number>} bounds
* @returns {Array<Number} bounds
*/
function limitBounds(bounds) {
// acceptable ranges for each number in a bounding box
var lon = [-180, 180], lat = [-90, 90], limits = [lon, lat, lon, lat];
return bounds.map(function(_, i) {
return Math.max(limits[i][0], Math.min(limits[i][1], _));
});
}
function getTileRetry(source, z, x, y, tries, callback) {
tries = typeof tries === 'number' ? { max:tries, num:0 } : tries;
source.getTile(z, x, y, function(err, tile, headers) {
if (err && tries.num++ < tries.max) {
setTimeout(function() {
getTileRetry(source, z, x, y, tries, callback);
}, Math.pow(2, tries.num) * module.exports.retryBackoff);
} else {
callback.apply(this, arguments);
}
});
}
function putTileRetry(source, z, x, y, data, tries, callback) {
tries = typeof tries === 'number' ? { max:tries, num:0 } : tries;
source.putTile(z, x, y, data, function(err) {
if (err && tries.num++ < tries.max) {
setTimeout(function() {
putTileRetry(source, z, x, y, data, tries, callback);
}, Math.pow(2, tries.num) * module.exports.retryBackoff);
} else {
callback.apply(this, arguments);
}
});
} |
<<<<<<<
import {load} from '../actions/infoActions';
import {requireServerCss} from '../util';
const styles = __CLIENT__ ? require('./InfoBar.scss') : requireServerCss(require.resolve('./InfoBar.scss'));
=======
import * as infoActions from '../actions/infoActions';
>>>>>>>
import {load} from '../actions/infoActions';
<<<<<<<
const {info, load} = this.props; // eslint-disable-line no-shadow
=======
const {info, load} = this.props;
const styles = require('./InfoBar.scss');
>>>>>>>
const {info, load} = this.props; // eslint-disable-line no-shadow
const styles = require('./InfoBar.scss'); |
<<<<<<<
import { Navbar, NavBrand, Nav, NavItem, CollapsibleNav } from 'react-bootstrap';
import Helmet from 'react-helmet';
=======
import { Navbar, Nav, NavItem } from 'react-bootstrap';
import DocumentMeta from 'react-document-meta';
>>>>>>>
import { Navbar, Nav, NavItem } from 'react-bootstrap';
import Helmet from 'react-helmet';
<<<<<<<
<Helmet {...config.app.head}/>
<Navbar fixedTop toggleNavKey={0}>
<NavBrand>
<IndexLink to="/" activeStyle={{color: '#33e0ff'}}>
<div className={styles.brand}/>
<span>{config.app.title}</span>
</IndexLink>
</NavBrand>
=======
<DocumentMeta {...config.app}/>
<Navbar fixedTop>
<Navbar.Header>
<Navbar.Brand>
<IndexLink to="/" activeStyle={{color: '#33e0ff'}}>
<div className={styles.brand}/>
<span>{config.app.title}</span>
</IndexLink>
</Navbar.Brand>
<Navbar.Toggle/>
</Navbar.Header>
>>>>>>>
<Helmet {...config.app.head}/>
<Navbar fixedTop>
<Navbar.Header>
<Navbar.Brand>
<IndexLink to="/" activeStyle={{color: '#33e0ff'}}>
<div className={styles.brand}/>
<span>{config.app.title}</span>
</IndexLink>
</Navbar.Brand>
<Navbar.Toggle/>
</Navbar.Header> |
<<<<<<<
return returnVal;
};
=======
return null;
};
fb.simplelogin.SessionStore_.prototype.clear = function() {
if (!hasLocalStorage) {
return;
}
localStorage.removeItem(sessionPersistentStorageKey);
goog.net.cookies.remove(encryptionStorageKey, cookieStoragePath, null);
};
fb.simplelogin.SessionStore = new fb.simplelogin.SessionStore_;
>>>>>>>
return null;
};
fb.simplelogin.SessionStore_.prototype.clear = function() {
if (!hasLocalStorage) {
return;
}
localStorage.removeItem(sessionPersistentStorageKey);
goog.net.cookies.remove(encryptionStorageKey, cookieStoragePath, null);
};
fb.simplelogin.SessionStore = new fb.simplelogin.SessionStore_;
<<<<<<<
=======
fb.simplelogin.client.prototype.loginWithPersona = function(options) {
fb.simplelogin.util.misc.warn("Persona authentication in Firebase Simple Login has been deprecated. Persona will be removed as an authentication provider at the end of May, 2014 with version 2.0.0.");
var self = this;
if (!navigator["id"]) {
throw new Error("FirebaseSimpleLogin.login(persona): Unable to find Persona include.js");
}
var promise = new fb.simplelogin.util.RSVP.Promise(function(resolve, reject) {
fb.simplelogin.providers.Persona.login(options, function(assertion) {
if (assertion === null) {
callback(fb.simplelogin.Errors.get("UNKNOWN_ERROR"));
} else {
fb.simplelogin.transports.JSONP.open(fb.simplelogin.Vars.getApiHost() + "/auth/persona/token", {"firebase":self.mNamespace, "assertion":assertion, "v":CLIENT_VERSION}, function(err, res) {
if (err || (!res["token"] || !res["user"])) {
var errorObj = fb.simplelogin.Errors.format(err);
self.mLoginStateChange(errorObj, null);
reject(errorObj);
} else {
var token = res["token"];
var user = res["user"];
self.attemptAuth(token, user, true, resolve, reject);
}
});
}
});
});
return promise;
};
>>>>>>> |
<<<<<<<
var keyMap = {
'tmp/linksf.js': 'linksf_js',
'tmp/linksf.css': 'linksf_css',
'tmp/linksf_admin.js': 'linksf_admin_js',
'tmp/linksf_admin.css': 'linksf_admin_css'
},
context = {},
Handlebars = require('handlebars'),
template,
output;
=======
var key_map = {
'js/static/output.js': 'output_js',
'js/static/admin.js': 'admin_js',
'css/static/user.css': 'user_css',
'css/static/admin.css': 'admin_css'
};
var context = {};
context.parseAppKey = process.env.PARSE_APP_KEY || 'Y213cb9EqDqUka0d56iQ1ZEyCeqsi4TMIh5zGTtY';
context.parseJSKey = process.env.PARSE_JS_KEY || 'CJrY4twgkR8KluQEtgMrbtciyk9rIFkILLxCRZGq';
var Handlebars = require('handlebars');
>>>>>>>
var keyMap = {
'tmp/linksf.js': 'linksf_js',
'tmp/linksf.css': 'linksf_css',
'tmp/linksf_admin.js': 'linksf_admin_js',
'tmp/linksf_admin.css': 'linksf_admin_css'
},
context = {},
context.parseAppKey = process.env.PARSE_APP_KEY || 'Y213cb9EqDqUka0d56iQ1ZEyCeqsi4TMIh5zGTtY';
context.parseJSKey = process.env.PARSE_JS_KEY || 'CJrY4twgkR8KluQEtgMrbtciyk9rIFkILLxCRZGq';
Handlebars = require('handlebars'),
template,
output; |
<<<<<<<
var facility = JSON.parse('{"address":"225 30th Street","description":"Women thing","gender":"F","name":"30TH STREET SENIOR CENTER","notes":"This is a facility for seniors that provides access to technology","phone":"(415) 550-2210","age":["S"],"hours":{"Sun": "11-12"},"location":{"__type":"GeoPoint","latitude":37.7421083,"longitude":-122.4251428},"services":["technology"],"objectId":"20ivH0qnQE","createdAt":"2013-04-09T07:01:45.280Z","updatedAt":"2013-04-09T14:55:19.177Z"}');
=======
// var facility = JSON.parse('{"address":"225 30th Street","description":"Women thing","gender":"F","name":"30TH STREET SENIOR CENTER","notes":"foobar","phone":"(415) 550-2210","age":["S"],"hours":{"Sun": "11-12"},"location":{"__type":"GeoPoint","latitude":37.7421083,"longitude":-122.4251428},"services":["technology"],"objectId":"20ivH0qnQE","createdAt":"2013-04-09T07:01:45.280Z","updatedAt":"2013-04-09T14:55:19.177Z"}');
>>>>>>>
// var facility = JSON.parse('{"address":"225 30th Street","description":"Women thing","gender":"F","name":"30TH STREET SENIOR CENTER","notes":"This is a facility for seniors that provides access to technology","phone":"(415) 550-2210","age":["S"],"hours":{"Sun": "11-12"},"location":{"__type":"GeoPoint","latitude":37.7421083,"longitude":-122.4251428},"services":["technology"],"objectId":"20ivH0qnQE","createdAt":"2013-04-09T07:01:45.280Z","updatedAt":"2013-04-09T14:55:19.177Z"}'); |
<<<<<<<
options: {loadPath: '.', bundleExec: true},
app: {src: 'app/css/app.scss', dest: 'tmp/linksf.css'},
admin: {src: 'admin/css/admin.scss', dest: 'tmp/linksf_admin.css'}
=======
options: {
includePaths: ['.']
},
app: {
src: 'app/css/app.scss',
dest: 'tmp/linksf.css'
},
admin: {
src: 'admin/css/admin.scss',
dest: 'tmp/linksf_admin.css'
}
>>>>>>>
options: {includePaths: ['.']},
app: {src: 'app/css/app.scss', dest: 'tmp/linksf.css'},
admin: {src: 'admin/css/admin.scss', dest: 'tmp/linksf_admin.css'}
<<<<<<<
qunit: {all: ['test/acceptance/**/*.html']},
env: {
dev: {src: '.env.dev'},
prod: {src: '.env.prod'}
=======
qunit: {
all: ['test/acceptance/**/*.html']
},
autoprefixer: {
options: {
browsers: [
'android >= 2.3',
'last 3 versions'
]
},
default: {
src: 'tmp/*.css'
}
>>>>>>>
qunit: {all: ['test/acceptance/**/*.html']},
env: {
dev: {src: '.env.dev'},
prod: {src: '.env.prod'}
},
autoprefixer: {
options: {
browsers: [
'android >= 2.3',
'last 3 versions'
]
},
default: {
src: 'tmp/*.css'
}
<<<<<<<
grunt.loadNpmTasks('grunt-env');
=======
grunt.loadNpmTasks('grunt-autoprefixer');
>>>>>>>
grunt.loadNpmTasks('grunt-env');
grunt.loadNpmTasks('grunt-autoprefixer');
<<<<<<<
=======
'configure:development:app',
'autoprefixer',
'cachebuster:app',
'qunit'
]);
grunt.registerTask('build:development:admin', [
'sass:admin',
'browserify:admin',
>>>>>>>
<<<<<<<
'cachebuster',
'qunit'
=======
'configure:development:admin',
'autoprefixer',
'cachebuster:admin'
>>>>>>>
'autoprefixer',
'cachebuster',
'qunit'
<<<<<<<
=======
'configure:production',
'autoprefixer',
>>>>>>>
'autoprefixer', |
<<<<<<<
Handlebars.registerPartial("facilityStatus", require('templates/facility_status'));
=======
function validCategory(category) {
return category && (/[a-z]+/).test(category.toString());
}
>>>>>>>
Handlebars.registerPartial("facilityStatus", require('templates/facility_status'));
function validCategory(category) {
return category && (/[a-z]+/).test(category.toString());
} |
<<<<<<<
Object.defineProperty(exports, "__esModule", { value: true });
=======
const schemas_1 = require("@broid/schemas");
const utils_1 = require("@broid/utils");
>>>>>>>
Object.defineProperty(exports, "__esModule", { value: true });
const schemas_1 = require("@broid/schemas");
const utils_1 = require("@broid/utils");
<<<<<<<
const schemas_1 = require("@broid/schemas");
const utils_1 = require("@broid/utils");
=======
>>>>>>>
<<<<<<<
this.generatorName = "messenger";
this.logger = new utils_1.Logger("parser", logLevel);
=======
this.generatorName = serviceName;
this.logger = new utils_1.Logger("parser", logLevel);
>>>>>>>
this.generatorName = serviceName;
this.logger = new utils_1.Logger("parser", logLevel); |
<<<<<<<
this.generatorName = serviceName;
this.logger = new broid_utils_1.Logger("parser", logLevel);
=======
this.generatorName = "ms-teams";
this.logger = new utils_1.Logger("parser", logLevel);
>>>>>>>
this.generatorName = serviceName;
this.logger = new utils_1.Logger("parser", logLevel); |
<<<<<<<
const broid_schemas_1 = require("broid-schemas");
const broid_utils_1 = require("broid-utils");
const express_1 = require("express");
=======
const schemas_1 = require("@broid/schemas");
const utils_1 = require("@broid/utils");
>>>>>>>
const schemas_1 = require("@broid/schemas");
const utils_1 = require("@broid/utils");
const express_1 = require("express");
<<<<<<<
this.parser = new parser_1.default(this.serviceName(), this.serviceID, this.logLevel);
this.logger = new broid_utils_1.Logger("adapter", this.logLevel);
if (obj.http) {
this.webhookServer = new webHookServer_1.default(obj.http, this.router, this.logLevel);
}
=======
const HTTPOptions = {
host: "127.0.0.1",
port: 8080,
};
this.HTTPOptions = obj && obj.http || HTTPOptions;
this.HTTPOptions.host = this.HTTPOptions.host || HTTPOptions.host;
this.HTTPOptions.port = this.HTTPOptions.port || HTTPOptions.port;
this.parser = new parser_1.default(this.serviceID, this.logLevel);
this.logger = new utils_1.Logger("adapter", this.logLevel);
>>>>>>>
this.parser = new parser_1.default(this.serviceName(), this.serviceID, this.logLevel);
this.logger = new utils_1.Logger("adapter", this.logLevel);
if (obj.http) {
this.webhookServer = new webHookServer_1.default(obj.http, this.router, this.logLevel);
} |
<<<<<<<
=======
exports.playground = function (req, res) {
res.render('playground', {version: joola.VERSION, GA_UA: process.env.GA_UA, GA_SITE: process.env.GA_SITE, playground: true});
};
>>>>>>>
exports.playground = function (req, res) {
res.render('playground', {version: joola.VERSION, GA_UA: process.env.GA_UA, GA_SITE: process.env.GA_SITE, playground: true});
};
<<<<<<<
app.get('/', function (req, res) {
res.render('index', {version: joola.VERSION, index: true});
});
app.get('/benchmark', function (req, res) {
res.render('benchmark', {version: joola.VERSION, benchmark: true});
});
=======
app.get('/', this.index);
app.get('/playground', this.playground);
>>>>>>>
app.get('/', this.index);
app.get('/playground', this.playground);
app.get('/benchmark', function (req, res) {
res.render('benchmark', {version: joola.VERSION, benchmark: true});
}); |
<<<<<<<
};
exports.setup = function (app) {
app.get('/', this.index);
=======
};
exports.datasources = function (req, res) {
var name = req.params.name;
res.render('datasources/' + name);
};
exports.partials = function (req, res) {
var name = req.params.name;
res.render('partials/' + name);
>>>>>>>
};
exports.datasources = function (req, res) {
var name = req.params.name;
res.render('datasources/' + name);
};
exports.partials = function (req, res) {
var name = req.params.name;
res.render('partials/' + name);
};
exports.setup = function (app) {
app.get('/', this.index); |
<<<<<<<
objects.datasources = require('./datasources');
objects.users = require('./users');
objects.logger= require('./logger');
=======
objects.datasources = require('./datasources');
objects.datatables = require('./datatables');
>>>>>>>
objects.datasources = require('./datasources');
objects.users = require('./users');
objects.logger= require('./logger');
objects.datatables = require('./datatables'); |
<<<<<<<
return alpha.technical.macd(`msft`, `daily`, `close`).then(data => {
expect(data['Meta Data']).toBeDefined();
expect(data['Meta Data']['1: Symbol']).toEqual('msft');
expect(data['Meta Data']['2: Indicator']).toEqual('Moving Average Convergence/Divergence (MACD)');
expect(data['Meta Data']['3: Last Refreshed']).toBeDefined();
expect(data['Meta Data']['4: Interval']).toEqual('daily');
expect(data['Meta Data']['5.1: Fast Period']).toEqual(12);
expect(data['Meta Data']['5.2: Slow Period']).toEqual(26);
expect(data['Meta Data']['5.3: Signal Period']).toEqual(9);
expect(data['Meta Data']['6: Series Type']).toEqual('close');
expect(data['Meta Data']['7: Time Zone']).toBeDefined();
expect(data['Technical Analysis: MACD']).toBeDefined();
});
=======
return delay(TIME)
.then(() => alpha.technical.macd(`msft`, `daily`, `close`))
.then(data => {
expect(data['Meta Data']).toBeDefined();
expect(data['Meta Data']['1: Symbol']).toEqual('msft');
expect(data['Meta Data']['2: Indicator']).toEqual('Moving Average Convergence/Divergence (MACD)');
expect(data['Meta Data']['3: Last Refreshed']).toBeDefined();
expect(data['Meta Data']['4: Interval']).toEqual('daily');
expect(data['Meta Data']['5.1: Fast Period']).toEqual(12);
expect(data['Meta Data']['5.2: Slow Period']).toEqual(26);
expect(data['Meta Data']['5.3: Signal Period']).toEqual(9);
expect(data['Meta Data']['6: Series Type']).toBeDefined();
expect(data['Meta Data']['7: Time Zone']).toBeDefined();
expect(data['Technical Analysis: MACD']).toBeDefined();
});
>>>>>>>
return delay(TIME)
.then(() => alpha.technical.macd(`msft`, `daily`, `close`))
.then(data => {
expect(data['Meta Data']).toBeDefined();
expect(data['Meta Data']['1: Symbol']).toEqual('msft');
expect(data['Meta Data']['2: Indicator']).toEqual('Moving Average Convergence/Divergence (MACD)');
expect(data['Meta Data']['3: Last Refreshed']).toBeDefined();
expect(data['Meta Data']['4: Interval']).toEqual('daily');
expect(data['Meta Data']['5.1: Fast Period']).toEqual(12);
expect(data['Meta Data']['5.2: Slow Period']).toEqual(26);
expect(data['Meta Data']['5.3: Signal Period']).toEqual(9);
expect(data['Meta Data']['6: Series Type']).toEqual('close');
expect(data['Meta Data']['7: Time Zone']).toBeDefined();
expect(data['Technical Analysis: MACD']).toBeDefined();
});
<<<<<<<
return alpha.technical.macdext(`msft`, `daily`, `close`).then(data => {
expect(data['Meta Data']).toBeDefined();
expect(data['Meta Data']['1: Symbol']).toEqual('msft');
expect(data['Meta Data']['2: Indicator']).toEqual('MACD with Controllable MA Type (MACDEXT)');
expect(data['Meta Data']['3: Last Refreshed']).toBeDefined();
expect(data['Meta Data']['4: Interval']).toEqual('daily');
expect(data['Meta Data']['5.1: Fast Period']).toEqual(12);
expect(data['Meta Data']['5.2: Slow Period']).toEqual(26);
expect(data['Meta Data']['5.3: Signal Period']).toEqual(9);
expect(data['Meta Data']['5.4: Fast MA Type']).toEqual(0);
expect(data['Meta Data']['5.5: Slow MA Type']).toEqual(0);
expect(data['Meta Data']['5.6: Signal MA Type']).toEqual(0);
expect(data['Meta Data']['6: Series Type']).toEqual('close');
expect(data['Meta Data']['7: Time Zone']).toBeDefined();
expect(data['Technical Analysis: MACDEXT']).toBeDefined();
});
=======
return delay(TIME)
.then(() => alpha.technical.macdext(`msft`, `daily`, `close`))
.then(data => {
expect(data['Meta Data']).toBeDefined();
expect(data['Meta Data']['1: Symbol']).toEqual('msft');
expect(data['Meta Data']['2: Indicator']).toEqual('MACD with Controllable MA Type (MACDEXT)');
expect(data['Meta Data']['3: Last Refreshed']).toBeDefined();
expect(data['Meta Data']['4: Interval']).toEqual('daily');
expect(data['Meta Data']['5.1: Fast Period']).toEqual(12);
expect(data['Meta Data']['5.2: Slow Period']).toEqual(26);
expect(data['Meta Data']['5.3: Signal Period']).toEqual(9);
expect(data['Meta Data']['5.4: Fast MA Type']).toEqual(0);
expect(data['Meta Data']['5.5: Slow MA Type']).toEqual(0);
expect(data['Meta Data']['5.6: Signal MA Type']).toEqual(0);
expect(data['Meta Data']['6: Series Type']).toBeDefined();
expect(data['Meta Data']['7: Time Zone']).toBeDefined();
expect(data['Technical Analysis: MACDEXT']).toBeDefined();
});
>>>>>>>
return delay(TIME)
.then(() => alpha.technical.macdext(`msft`, `daily`, `close`))
.then(data => {
expect(data['Meta Data']).toBeDefined();
expect(data['Meta Data']['1: Symbol']).toEqual('msft');
expect(data['Meta Data']['2: Indicator']).toEqual('MACD with Controllable MA Type (MACDEXT)');
expect(data['Meta Data']['3: Last Refreshed']).toBeDefined();
expect(data['Meta Data']['4: Interval']).toEqual('daily');
expect(data['Meta Data']['5.1: Fast Period']).toEqual(12);
expect(data['Meta Data']['5.2: Slow Period']).toEqual(26);
expect(data['Meta Data']['5.3: Signal Period']).toEqual(9);
expect(data['Meta Data']['5.4: Fast MA Type']).toEqual(0);
expect(data['Meta Data']['5.5: Slow MA Type']).toEqual(0);
expect(data['Meta Data']['5.6: Signal MA Type']).toEqual(0);
expect(data['Meta Data']['6: Series Type']).toEqual('close');
expect(data['Meta Data']['7: Time Zone']).toBeDefined();
expect(data['Technical Analysis: MACDEXT']).toBeDefined();
}); |
<<<<<<<
var compile = nunjucks;
if( loaders || env ){
compile = new nunjucks.Environment( loaders, env );
}
=======
/*
* file = file
* cb = callback function
*/
>>>>>>>
var compile = nunjucks;
if( loaders || env ){
compile = new nunjucks.Environment( loaders, env );
}
/*
* file = file
* cb = callback function
*/ |
<<<<<<<
// it("call getBranches using web.invoke", function (done) {
// this.timeout(tools.TIMEOUT);
// var augur = tools.setup(require("../../src"), process.argv.slice(2));
// augur.web.login(name, password, function (user) {
// if (user.error) {
// augur.web.logout();
// return done(new Error(tools.pp(user)));
// }
// assert.strictEqual(
// user.address,
// augur.web.account.address
// );
// // sync
// var branches = augur.web.invoke(augur.tx.Branches.getBranches);
// assert.isAbove(branches.length, 0);
// assert.isArray(branches);
// assert.strictEqual(
// augur.rpc.applyReturns(
// augur.tx.Branches.getBranches.returns,
// branches[0]
// ),
// augur.constants.DEFAULT_BRANCH_ID
// );
// // async
// augur.web.invoke(augur.tx.Branches.getBranches, function (branches) {
// assert.isAbove(branches.length, 0);
// assert.isArray(branches);
// assert.strictEqual(
// augur.rpc.applyReturns(
// augur.tx.Branches.getBranches.returns,
// branches[0]
// ),
// augur.constants.DEFAULT_BRANCH_ID
// );
// augur.web.logout();
// done();
// });
// });
// });
=======
it("call getBranches using web.invoke", function (done) {
this.timeout(tools.TIMEOUT);
var augur = tools.setup(require("../../src"), process.argv.slice(2));
augur.web.login(handle, password, function (user) {
if (user.error) {
augur.web.logout();
return done(new Error(tools.pp(user)));
}
assert.strictEqual(
user.address,
augur.web.account.address
);
// sync
var branches = augur.web.invoke(augur.tx.Branches.getBranches);
assert.isAbove(branches.length, 0);
assert.isArray(branches);
assert.strictEqual(
augur.rpc.applyReturns(
augur.tx.Branches.getBranches.returns,
branches[0]
),
augur.constants.DEFAULT_BRANCH_ID
);
// async
augur.web.invoke(augur.tx.Branches.getBranches, function (branches) {
assert.isAbove(branches.length, 0);
assert.isArray(branches);
assert.strictEqual(
augur.rpc.applyReturns(
augur.tx.Branches.getBranches.returns,
branches[0]
),
augur.constants.DEFAULT_BRANCH_ID
);
augur.web.logout();
done();
});
});
});
>>>>>>>
it("call getBranches using web.invoke", function (done) {
this.timeout(tools.TIMEOUT);
var augur = tools.setup(require("../../src"), process.argv.slice(2));
augur.web.login(name, password, function (user) {
if (user.error) {
augur.web.logout();
return done(new Error(tools.pp(user)));
}
assert.strictEqual(
user.address,
augur.web.account.address
);
// sync
var branches = augur.web.invoke(augur.tx.Branches.getBranches);
assert.isAbove(branches.length, 0);
assert.isArray(branches);
assert.strictEqual(
augur.rpc.applyReturns(
augur.tx.Branches.getBranches.returns,
branches[0]
),
augur.constants.DEFAULT_BRANCH_ID
);
// async
augur.web.invoke(augur.tx.Branches.getBranches, function (branches) {
assert.isAbove(branches.length, 0);
assert.isArray(branches);
assert.strictEqual(
augur.rpc.applyReturns(
augur.tx.Branches.getBranches.returns,
branches[0]
),
augur.constants.DEFAULT_BRANCH_ID
);
augur.web.logout();
done();
});
});
}); |
<<<<<<<
sha3: ethrpc.sha3,
});
=======
};
>>>>>>>
sha3: ethrpc.sha3,
}; |
<<<<<<<
oauthUrl: config.get('oauth_url'),
// req.locale is set by abide in a previous middleware.
language: req.locale
=======
// req.lang is set by abide in a previous middleware.
language: req.lang
>>>>>>>
oauthUrl: config.get('oauth_url'),
// req.lang is set by abide in a previous middleware.
language: req.lang |
<<<<<<<
cancel_at_period_end: false,
ended_at: null,
plan_name: 'Example',
=======
end_at: null,
plan_name: 'Example',
>>>>>>>
cancel_at_period_end: false,
end_at: null,
plan_name: 'Example', |
<<<<<<<
confirmTotpCode,
=======
closeCurrentWindow,
>>>>>>>
closeCurrentWindow,
confirmTotpCode, |
<<<<<<<
// determines if the scrolling is responding with negative values
isRtlScrollingInverted: dummyContainerOffset.left !== dummyContainerChildOffset.left && dummyContainerChildOffset.left - dummyContainerScrollOffsetAfterScroll.left !== 0,
// determines if the origin scrollbar position is inverted or not (positioned on left or right)
isRtlScrollbarInverted: dummyContainerOffset.left !== dummyContainerChildOffset.left
=======
autoHide: true,
forceVisible: false,
classNames: {
content: 'simplebar-content',
scrollContent: 'simplebar-scroll-content',
scrollbar: 'simplebar-scrollbar',
track: 'simplebar-track',
visible: 'visible',
horizontal: 'horizontal',
vertical: 'vertical'
},
scrollbarMinSize: 25,
scrollbarMaxSize: 0,
direction: 'ltr',
timeout: 1000
>>>>>>>
// determines if the scrolling is responding with negative values
isRtlScrollingInverted: dummyContainerOffset.left !== dummyContainerChildOffset.left && dummyContainerChildOffset.left - dummyContainerScrollOffsetAfterScroll.left !== 0,
// determines if the origin scrollbar position is inverted or not (positioned on left or right)
isRtlScrollbarInverted: dummyContainerOffset.left !== dummyContainerChildOffset.left
<<<<<<<
this.contentEl = this.el.querySelector(`.${this.classNames.content}`);
this.offsetEl = this.el.querySelector(`.${this.classNames.offset}`);
this.maskEl = this.el.querySelector(`.${this.classNames.mask}`);
this.placeholderEl = this.el.querySelector(`.${this.classNames.placeholder}`);
this.heightAutoObserverWrapperEl = this.el.querySelector(`.${this.classNames.heightAutoObserverWrapperEl}`);
this.heightAutoObserverEl = this.el.querySelector(`.${this.classNames.heightAutoObserverEl}`);
this.axis.x.track.el = this.el.querySelector(
`.${this.classNames.track}.horizontal`
=======
this.trackX = this.el.querySelector(
`.${this.classNames.track}.${this.classNames.horizontal}`
>>>>>>>
this.contentEl = this.el.querySelector(`.${this.classNames.content}`);
this.offsetEl = this.el.querySelector(`.${this.classNames.offset}`);
this.maskEl = this.el.querySelector(`.${this.classNames.mask}`);
this.placeholderEl = this.el.querySelector(`.${this.classNames.placeholder}`);
this.heightAutoObserverWrapperEl = this.el.querySelector(`.${this.classNames.heightAutoObserverWrapperEl}`);
this.heightAutoObserverEl = this.el.querySelector(`.${this.classNames.heightAutoObserverEl}`);
this.axis.x.track.el = this.el.querySelector(`.${this.classNames.track}.${this.classNames.horizontal}`);
this.axis.y.track.el = this.el.querySelector(`.${this.classNames.track}.${this.classNames.vertical}`);
} else {
// Prepare DOM
this.wrapperEl = document.createElement('div');
this.contentEl = document.createElement('div');
this.offsetEl = document.createElement('div');
this.maskEl = document.createElement('div');
this.placeholderEl = document.createElement('div');
this.heightAutoObserverWrapperEl = document.createElement('div');
this.heightAutoObserverEl = document.createElement('div');
this.wrapperEl.classList.add(this.classNames.wrapper);
this.contentEl.classList.add(this.classNames.content);
this.offsetEl.classList.add(this.classNames.offset);
this.maskEl.classList.add(this.classNames.mask);
this.placeholderEl.classList.add(this.classNames.placeholder);
this.heightAutoObserverWrapperEl.classList.add(this.classNames.heightAutoObserverWrapperEl);
this.heightAutoObserverEl.classList.add(this.classNames.heightAutoObserverEl);
while (this.el.firstChild) this.contentEl.appendChild(this.el.firstChild);
this.offsetEl.appendChild(this.contentEl);
this.maskEl.appendChild(this.offsetEl);
this.heightAutoObserverWrapperEl.appendChild(this.heightAutoObserverEl);
this.wrapperEl.appendChild(this.heightAutoObserverWrapperEl);
this.wrapperEl.appendChild(this.maskEl);
this.wrapperEl.appendChild(this.placeholderEl);
this.el.appendChild(this.wrapperEl);
}
if (!this.axis.x.track.el || !this.axis.y.track.el) {
const track = document.createElement('div');
const scrollbar = document.createElement('div');
track.classList.add(this.classNames.track);
scrollbar.classList.add(this.classNames.scrollbar);
if (!this.options.autoHide) {
scrollbar.classList.add(this.classNames.visible);
}
track.appendChild(scrollbar);
this.axis.x.track.el = track.cloneNode(true);
this.axis.x.track.el.classList.add(this.classNames.horizontal);
this.axis.y.track.el = track.cloneNode(true);
this.axis.y.track.el.classList.add(this.classNames.vertical);
this.el.appendChild(this.axis.x.track.el);
this.el.appendChild(this.axis.y.track.el);
}
this.axis.x.scrollbar.el = this.axis.x.track.el.querySelector(
`.${this.classNames.scrollbar}`
);
this.axis.y.scrollbar.el = this.axis.y.track.el.querySelector(
`.${this.classNames.scrollbar}`
);
this.el.setAttribute('data-simplebar', 'init');
}
initListeners() {
// Event listeners
if (this.options.autoHide) {
this.el.addEventListener('mouseenter', this.onMouseEnter);
}
['mousedown', 'click', 'dblclick', 'touchstart', 'touchend', 'touchmove'].forEach((e) => {
this.el.addEventListener(e, this.onPointerEvent);
});
this.el.addEventListener('mousemove', this.onMouseMove);
this.el.addEventListener('mouseleave', this.onMouseLeave);
this.contentEl.addEventListener('scroll', this.onScroll);
// Browser zoom triggers a window resize
window.addEventListener('resize', this.onWindowResize);
// MutationObserver is IE11+
if (typeof MutationObserver !== 'undefined') {
// create an observer instance
this.mutationObserver = new MutationObserver(mutations => {
mutations.forEach(mutation => {
if (mutation.target === this.el || !this.isChildNode(mutation.target) || mutation.addedNodes.length) {
this.recalculate();
}
});
});
// pass in the target node, as well as the observer options
this.mutationObserver.observe(this.el, {
attributes: true,
childList: true,
characterData: true,
subtree: true
});
}
this.resizeObserver = new ResizeObserver(this.recalculate);
this.resizeObserver.observe(this.el);
}
recalculate() {
const isHeightAuto = this.heightAutoObserverEl.offsetHeight <= 1;
this.elStyles = window.getComputedStyle(this.el);
this.isRtl = this.elStyles.direction === 'rtl';
this.contentEl.style.padding = `${this.elStyles.paddingTop} ${this.elStyles.paddingRight} ${this.elStyles.paddingBottom} ${this.elStyles.paddingLeft}`;
this.contentEl.style.height = isHeightAuto ? 'auto' : '100%';
this.placeholderEl.style.width = `${this.contentEl.scrollWidth}px`;
this.placeholderEl.style.height = `${this.contentEl.scrollHeight}px`;
this.placeholderEl.style.margin = `-${this.elStyles.paddingTop} -${this.elStyles.paddingRight} -${this.elStyles.paddingBottom} -${this.elStyles.paddingLeft}`;
this.axis.x.track.rect = this.axis.x.track.el.getBoundingClientRect();
this.axis.y.track.rect = this.axis.y.track.el.getBoundingClientRect();
// Set isEnabled to false if scrollbar is not necessary (content is shorter than offset)
this.axis.x.isEnabled = (this.scrollbarWidth ? this.contentEl.scrollWidth : this.contentEl.scrollWidth - this.minScrollbarWidth) > Math.ceil(this.axis.x.track.rect.width);
this.axis.y.isEnabled = (this.scrollbarWidth ? this.contentEl.scrollHeight : this.contentEl.scrollHeight - this.minScrollbarWidth) > Math.ceil(this.axis.y.track.rect.height);
// TODO this requires host to set overflow explicitely cause [data-simplebar] applies overflow: hidden...
// Set isEnabled to false if user explicitely set hidden overflow
this.axis.x.isEnabled = this.elStyles.overflowX === 'hidden' ? false : this.axis.x.isEnabled;
this.axis.y.isEnabled = this.elStyles.overflowY === 'hidden' ? false : this.axis.y.isEnabled;
this.axis.x.scrollbar.size = this.getScrollbarSize('x');
this.axis.y.scrollbar.size = this.getScrollbarSize('y');
this.axis.x.scrollbar.el.style.width = `${this.axis.x.scrollbar.size}px`;
this.axis.y.scrollbar.el.style.height = `${this.axis.y.scrollbar.size}px`;
this.positionScrollbar('x');
this.positionScrollbar('y');
this.toggleTrackVisibility('x');
this.toggleTrackVisibility('y');
this.hideNativeScrollbar();
}
/**
* Calculate scrollbar size
*/
getScrollbarSize(axis = 'y') {
const contentSize = this.scrollbarWidth ? this.contentEl[this.axis[axis].scrollSizeAttr] : this.contentEl[this.axis[axis].scrollSizeAttr] - this.minScrollbarWidth;
const trackSize = this.axis[axis].track.rect[this.axis[axis].sizeAttr];
let scrollbarSize;
if (!this.axis[axis].isEnabled && !this.options.forceVisible) {
return;
}
let scrollbarRatio = trackSize / contentSize;
// Calculate new height/position of drag handle.
scrollbarSize = Math.max(
~~(scrollbarRatio * trackSize),
this.options.scrollbarMinSize
);
if (this.options.scrollbarMaxSize) {
scrollbarSize = Math.min(
scrollbarSize,
this.options.scrollbarMaxSize
<<<<<<<
if (this.axis[axis].isEnabled) {
scrollbar.classList.add('visible');
this.axis[axis].isVisible = true;
=======
if (axis === 'x') {
scrollbar = this.scrollbarX;
} else {
// 'y'
scrollbar = this.scrollbarY;
}
if (this.isEnabled[axis]) {
scrollbar.classList.add(this.classNames.visible);
this.isVisible[axis] = true;
>>>>>>>
if (this.axis[axis].isEnabled) {
scrollbar.classList.add(this.classNames.visible);
this.axis[axis].isVisible = true; |
<<<<<<<
.then(function (accountData) {
return self.onSignUpSuccess(accountData);
=======
.then(function () {
self.navigate('confirm');
>>>>>>>
.then(function (accountData) {
return self.onSignUpSuccess(accountData);
<<<<<<<
},
onSignUpSuccess: function(accountData) {
if (accountData.verified) {
this.navigate('settings');
} else {
this.navigate('confirm');
}
}
=======
},
_suggestSignIn: function () {
var msg = t('Account already exists. <a href="/signin">Sign in</a>');
return this.displayErrorUnsafe(msg);
},
>>>>>>>
},
onSignUpSuccess: function(accountData) {
if (accountData.verified) {
this.navigate('settings');
} else {
this.navigate('confirm');
}
},
_suggestSignIn: function () {
var msg = t('Account already exists. <a href="/signin">Sign in</a>');
return this.displayErrorUnsafe(msg);
}, |
<<<<<<<
events: {
// validateAndSubmit is used to prevent multiple concurrent submissions.
'click #redirectTo': BaseView.preventDefaultThen('submit')
},
=======
_showSignUpMarketing: function () {
if (! this.is('sign_up')) {
return false;
}
// For UA information, see
// https://developer.mozilla.org/docs/Gecko_user_agent_string_reference
var ua = this.window.navigator.userAgent;
// covers both B2G and Firefox for Android
var isMobileFirefox = ua.indexOf('Mobile') > -1 && ua.indexOf('Firefox') > -1;
var isTabletFirefox = ua.indexOf('Tablet') > -1 && ua.indexOf('Firefox') > -1;
return ! (isMobileFirefox || isTabletFirefox);
},
>>>>>>>
events: {
// validateAndSubmit is used to prevent multiple concurrent submissions.
'click #redirectTo': BaseView.preventDefaultThen('submit')
},
_showSignUpMarketing: function () {
if (! this.is('sign_up')) {
return false;
}
// For UA information, see
// https://developer.mozilla.org/docs/Gecko_user_agent_string_reference
var ua = this.window.navigator.userAgent;
// covers both B2G and Firefox for Android
var isMobileFirefox = ua.indexOf('Mobile') > -1 && ua.indexOf('Firefox') > -1;
var isTabletFirefox = ua.indexOf('Tablet') > -1 && ua.indexOf('Firefox') > -1;
return ! (isMobileFirefox || isTabletFirefox);
}, |
<<<<<<<
closeCurrentWindow,
=======
confirmTotpCode,
>>>>>>>
closeCurrentWindow,
confirmTotpCode, |
<<<<<<<
;(function (factory) {
'use strict'
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:
define(['load-image'], factory)
} else if (typeof module === 'object' && module.exports) {
factory(require('./load-image'))
} else {
// Browser globals:
factory(window.loadImage)
}
=======
(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:
define(['./load-image'], factory);
} else if (typeof module === 'object' && module.exports) {
factory(require('./load-image'));
} else {
// Browser globals:
factory(window.loadImage);
}
>>>>>>>
;(function (factory) {
'use strict'
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:
define(['./load-image'], factory)
} else if (typeof module === 'object' && module.exports) {
factory(require('./load-image'))
} else {
// Browser globals:
factory(window.loadImage)
} |
<<<<<<<
'deckApp.pipelines.stage.enableAsg',
'deckApp.pipelines.stage.modifyScalingProcess',
=======
'deckApp.pipelines.stage.disableAsg',
>>>>>>>
'deckApp.pipelines.stage.enableAsg',
'deckApp.pipelines.stage.modifyScalingProcess',
'deckApp.pipelines.stage.disableAsg', |
<<<<<<<
var infrastructureCaches, deckCacheFactory, authenticationService, settings;
beforeEach(
window.module(
require('./infrastructureCaches.js')
)
);
beforeEach(window.inject(function(_infrastructureCaches_, _deckCacheFactory_, _authenticationService_, _settings_) {
=======
let infrastructureCaches, deckCacheFactory;
let cacheFactory;
let cacheInstantiations;
let removalCalls;
beforeEach(
window.module(
require('./infrastructureCaches.js')
)
);
beforeEach(window.inject(function(_infrastructureCaches_, _deckCacheFactory_) {
>>>>>>>
var infrastructureCaches, deckCacheFactory, authenticationService, settings;
beforeEach(
window.module(
require('./infrastructureCaches.js')
)
);
beforeEach(window.inject(function(_infrastructureCaches_, _deckCacheFactory_, _authenticationService_, _settings_) {
<<<<<<<
it('should remove all keys when clearCache called', function() {
infrastructureCaches.createCache('someBadCache', {
cacheFactory: this.cacheFactory,
version: 0,
});
var removalCallsAfterInitialization = this.removalCalls.length;
infrastructureCaches.clearCache('someBadCache');
expect(this.removalCalls.length).toBe(removalCallsAfterInitialization + 1);
});
it('should set disabled flag and register event when authEnabled', function () {
var originalAuthEnabled = settings.authEnabled;
settings.authEnabled = true;
spyOn(authenticationService, 'getAuthenticatedUser').and.returnValue({authenticated: false});
spyOn(authenticationService, 'onAuthentication');
infrastructureCaches.createCache('authCache', {
cacheFactory: this.cacheFactory,
authEnabled: true,
});
expect(this.cacheInstantiations[3].config.disabled).toBe(true);
expect(authenticationService.onAuthentication.calls.count()).toBe(1);
settings.authEnabled = originalAuthEnabled;
});
it('should ignore authEnabled flag when settings disable auth', function () {
var originalAuthEnabled = settings.authEnabled;
settings.authEnabled = false;
spyOn(authenticationService, 'getAuthenticatedUser').and.returnValue({authenticated: false});
spyOn(authenticationService, 'onAuthentication');
infrastructureCaches.createCache('authCache', {
cacheFactory: this.cacheFactory,
authEnabled: true,
});
expect(this.cacheInstantiations[3].config.disabled).toBe(false);
expect(authenticationService.onAuthentication.calls.count()).toBe(0);
settings.authEnabled = originalAuthEnabled;
});
=======
it('should remove all keys when clearCache called', function() {
infrastructureCaches.createCache('someBadCache', {
cacheFactory: this.cacheFactory,
version: 0,
});
var removalCallsAfterInitialization = this.removalCalls.length;
infrastructureCaches.clearCache('someBadCache');
expect(this.removalCalls.length).toBe(removalCallsAfterInitialization + 1);
});
>>>>>>>
it('should remove all keys when clearCache called', function() {
infrastructureCaches.createCache('someBadCache', {
cacheFactory: this.cacheFactory,
version: 0,
});
var removalCallsAfterInitialization = this.removalCalls.length;
infrastructureCaches.clearCache('someBadCache');
expect(this.removalCalls.length).toBe(removalCallsAfterInitialization + 1);
});
it('should remove all keys when clearCache called', function() {
infrastructureCaches.createCache('someBadCache', {
cacheFactory: this.cacheFactory,
version: 0,
});
var removalCallsAfterInitialization = this.removalCalls.length;
infrastructureCaches.clearCache('someBadCache');
expect(this.removalCalls.length).toBe(removalCallsAfterInitialization + 1);
});
it('should set disabled flag and register event when authEnabled', function () {
var originalAuthEnabled = settings.authEnabled;
settings.authEnabled = true;
spyOn(authenticationService, 'getAuthenticatedUser').and.returnValue({authenticated: false});
spyOn(authenticationService, 'onAuthentication');
infrastructureCaches.createCache('authCache', {
cacheFactory: this.cacheFactory,
authEnabled: true,
});
expect(this.cacheInstantiations[3].config.disabled).toBe(true);
expect(authenticationService.onAuthentication.calls.count()).toBe(1);
settings.authEnabled = originalAuthEnabled;
});
it('should ignore authEnabled flag when settings disable auth', function () {
var originalAuthEnabled = settings.authEnabled;
settings.authEnabled = false;
spyOn(authenticationService, 'getAuthenticatedUser').and.returnValue({authenticated: false});
spyOn(authenticationService, 'onAuthentication');
infrastructureCaches.createCache('authCache', {
cacheFactory: this.cacheFactory,
authEnabled: true,
});
expect(this.cacheInstantiations[3].config.disabled).toBe(false);
expect(authenticationService.onAuthentication.calls.count()).toBe(0);
settings.authEnabled = originalAuthEnabled;
}); |
<<<<<<<
more: 'More',
playbackRate: 'Playback rate',
rewind10: 'Rewind 10 seconds'
=======
continueWithVideo: 'Continue with video',
more: 'More'
>>>>>>>
more: 'More'
continueWithVideo: 'Continue with video',
more: 'More',
playbackRate: 'Playback rate',
rewind10: 'Rewind 10 seconds' |
<<<<<<<
},
messages: function (size, selected) {
var modalInstance = $modal.open({
templateUrl: 'views/messageModal.html',
controller: 'MessageCtrl as messageCtrl',
size: size,
resolve: {
auth: ['$q', '$location', 'AuthService',
function ($q, $location, AuthService) {
return AuthService.session().then(
function (success) {
},
function (err) {
$location.path('/login');
$location.replace();
return $q.reject(err);
});
}],
selected: function () {
return selected;
}
}
});
return modalInstance.result;
=======
},
attachTemplate: function (size, file, templateId) {
var modalInstance = $modal.open({
templateUrl: 'views/metadata/attachTemplateDialog.html',
controller: 'AttachTemplateCtrl as attachTemplateCtrl',
size: size,
backdrop: 'static',
resolve: {
auth: ['$q', '$location', 'AuthService',
function ($q, $location, AuthService) {
return AuthService.session().then(
function (success) {
},
function (err) {
$location.path('/login');
$location.replace();
return $q.reject(err);
});
}],
templateId: function () {
return templateId;
},
file: function () {
return file;
}
}
});
return modalInstance.result;
},
detachTemplate: function (size, file, templateId) {
var modalInstance = $modal.open({
templateUrl: 'views/metadata/detachTemplateDialog.html',
controller: 'DetachTemplateCtrl as detachTemplateCtrl',
size: size,
backdrop: 'static',
resolve: {
auth: ['$q', '$location', 'AuthService',
function ($q, $location, AuthService) {
return AuthService.session().then(
function (success) {
},
function (err) {
$location.path('/login');
$location.replace();
return $q.reject(err);
});
}],
templateId: function () {
return templateId;
},
file: function () {
return file;
}
}
});
return modalInstance.result;
>>>>>>>
},
attachTemplate: function (size, file, templateId) {
var modalInstance = $modal.open({
templateUrl: 'views/metadata/attachTemplateDialog.html',
controller: 'AttachTemplateCtrl as attachTemplateCtrl',
size: size,
backdrop: 'static',
resolve: {
auth: ['$q', '$location', 'AuthService',
function ($q, $location, AuthService) {
return AuthService.session().then(
function (success) {
},
function (err) {
$location.path('/login');
$location.replace();
return $q.reject(err);
});
}],
templateId: function () {
return templateId;
},
file: function () {
return file;
}
}
});
return modalInstance.result;
},
detachTemplate: function (size, file, templateId) {
var modalInstance = $modal.open({
templateUrl: 'views/metadata/detachTemplateDialog.html',
controller: 'DetachTemplateCtrl as detachTemplateCtrl',
size: size,
backdrop: 'static',
resolve: {
auth: ['$q', '$location', 'AuthService',
function ($q, $location, AuthService) {
return AuthService.session().then(
function (success) {
},
function (err) {
$location.path('/login');
$location.replace();
return $q.reject(err);
});
}],
templateId: function () {
return templateId;
},
file: function () {
return file;
}
}
});
return modalInstance.result;
},
messages: function (size, selected) {
var modalInstance = $modal.open({
templateUrl: 'views/messageModal.html',
controller: 'MessageCtrl as messageCtrl',
size: size,
resolve: {
auth: ['$q', '$location', 'AuthService',
function ($q, $location, AuthService) {
return AuthService.session().then(
function (success) {
},
function (err) {
$location.path('/login');
$location.replace();
return $q.reject(err);
});
}],
selected: function () {
return selected;
}
}
});
return modalInstance.result; |
<<<<<<<
* Opens a modal dialog to make dataset editable
* @returns {undefined}
*/
self.makeEditable = function (name) {
ModalService.makeEditable('md', name).then(
function (success) {
growl.success(success.data.successMessage, {title: 'Success', ttl: 5000});
}, function (error) {
});
};
/**
=======
* Opens a modal dialog for unsharing.
* @returns {undefined}
*/
self.unshare = function (name) {
ModalService.unshareDataset('md', name).then(
function (success) {
growl.success(success.data.successMessage, {title: 'Success', ttl: 5000});
}, function (error) {
});
};
/**
>>>>>>>
* Opens a modal dialog to make dataset editable
* @returns {undefined}
*/
self.makeEditable = function (name) {
ModalService.makeEditable('md', name).then(
function (success) {
growl.success(success.data.successMessage, {title: 'Success', ttl: 5000});
}, function (error) {
});
};
/**
* Opens a modal dialog for unsharing.
* @returns {undefined}
*/
self.unshare = function (name) {
ModalService.unshareDataset('md', name).then(
function (success) {
growl.success(success.data.successMessage, {title: 'Success', ttl: 5000});
}, function (error) {
});
};
/** |
<<<<<<<
path: function () {
return path;
}
}
});
return modalInstance.result;
},
selectFile: function (size) {
var modalInstance = $modal.open({
templateUrl: 'views/selectFile.html',
controller: 'SelectFileCtrl as selectFileCtrl',
size: size,
resolve: {
auth: ['$q', '$location', 'AuthService',
function ($q, $location, AuthService) {
return AuthService.session().then(
function (success) {
},
function (err) {
$location.path('/login');
$location.replace();
return $q.reject(err);
});
}]
}
});
return modalInstance.result;
},
=======
path: function () {
return path;
}
}
});
return modalInstance.result;
}
>>>>>>>
path: function () {
return path;
}
}
});
return modalInstance.result;
},
selectFile: function (size) {
var modalInstance = $modal.open({
templateUrl: 'views/selectFile.html',
controller: 'SelectFileCtrl as selectFileCtrl',
size: size,
resolve: {
auth: ['$q', '$location', 'AuthService',
function ($q, $location, AuthService) {
return AuthService.session().then(
function (success) {
},
function (err) {
$location.path('/login');
$location.replace();
return $q.reject(err);
});
}]
}
});
return modalInstance.result;
} |
<<<<<<<
self.init();
self.showTopic = function(){
=======
self.init();
self.showTopic = function(){
>>>>>>>
self.init();
self.init();
self.showTopic = function(){ |
<<<<<<<
return RequestCore.new().then(function(result){
requestCoreContract = result;
console.log("requestCore: "+requestCoreContract.address);
RequestEthereum.new(requestCoreContract.address).then(function(result){
requestEthereum=result;
console.log("requestEthereum: "+result.address);
RequestBurnManagerSimple.new(addressContractBurner).then(function(result){
requestBurnManagerSimple=result;
console.log("requestBurnManagerSimple: "+result.address);
requestBurnManagerSimple.setFeesPerTenThousand(feesPerTenThousand).then(function(result){
requestCoreContract.setBurnManager(requestBurnManagerSimple.address).then(function(result){
requestCoreContract.adminAddTrustedCurrencyContract(requestEthereum.address).then(function(r) {
requestCoreContract.getStatusContract(requestEthereum.address).then(function(d) {
console.log("getStatusContract: " + requestEthereum.address + " => " + d)
})
requestBurnManagerSimple.feesPer10000().then(function(d) {
console.log("trustedNewBurnManager %% => " + d);
})
requestCoreContract.trustedNewBurnManager().then(function(d) {
console.log("trustedNewBurnManager manager => " + d);
})
});
});
});
});
});
});
};
=======
deployer.deploy(RequestCore).then(function() {
return deployer.deploy(RequestEthereum, RequestCore.address).then(function() {
return deployer.deploy(RequestBurnManagerSimple, addressContractBurner).then(function() {
return deployer.deploy(RequestSynchroneExtensionEscrow, RequestCore.address).then(function() {
createInstances().then(function() {
setupContracts().then(function() {
checks()
});
});
});
});
});
});
};
var createInstances = function() {
return RequestCore.deployed().then(function(instance) {
requestCore = instance;
return RequestEthereum.deployed().then(function(instance) {
requestEthereum = instance;
return RequestBurnManagerSimple.deployed().then(function(instance) {
requestBurnManagerSimple = instance;
return RequestSynchroneExtensionEscrow.deployed().then(function(instance) {
requestEscrow = instance;
console.log("Instances set.")
});
});
});
});
}
var setupContracts = function() {
return requestBurnManagerSimple.setFeesPerTenThousand(feesPerTenThousand).then(function() {
return requestCore.setBurnManager(requestBurnManagerSimple.address).then(function() {
return requestCore.adminAddTrustedCurrencyContract(requestEthereum.address).then(function() {
return requestCore.adminAddTrustedExtension(requestEscrow.address).then(function() {
console.log("Contracts set up.")
});
});
});
});
}
var checks = function() {
requestCore.getStatusContract(requestEthereum.address).then(function(d) {
console.log("getStatusContract: " + requestEthereum.address + " => " + d)
});
requestCore.getStatusExtension(requestEscrow.address).then(function(d) {
console.log("getStatusExtension: " + requestEscrow.address + " => " + d)
});
requestBurnManagerSimple.feesPer10000().then(function(d) {
console.log("trustedNewBurnManager %% => " + d);
});
requestCore.trustedNewBurnManager().then(function(d) {
console.log("trustedNewBurnManager manager => " + d);
console.log("Checks complete")
});
}
>>>>>>>
deployer.deploy(RequestCore).then(function() {
return deployer.deploy(RequestEthereum, RequestCore.address).then(function() {
return deployer.deploy(RequestBurnManagerSimple, addressContractBurner).then(function() {
createInstances().then(function() {
setupContracts().then(function() {
checks()
});
});
});
});
});
};
var createInstances = function() {
return RequestCore.deployed().then(function(instance) {
requestCore = instance;
return RequestEthereum.deployed().then(function(instance) {
requestEthereum = instance;
return RequestBurnManagerSimple.deployed().then(function(instance) {
requestBurnManagerSimple = instance;
console.log("Instances set.")
});
});
});
}
var setupContracts = function() {
return requestBurnManagerSimple.setFeesPerTenThousand(feesPerTenThousand).then(function() {
return requestCore.setBurnManager(requestBurnManagerSimple.address).then(function() {
return requestCore.adminAddTrustedCurrencyContract(requestEthereum.address).then(function() {
console.log("Contracts set up.")
});
});
});
}
var checks = function() {
requestCore.getStatusContract(requestEthereum.address).then(function(d) {
console.log("getStatusContract: " + requestEthereum.address + " => " + d)
});
requestBurnManagerSimple.feesPer10000().then(function(d) {
console.log("trustedNewBurnManager %% => " + d);
});
requestCore.trustedNewBurnManager().then(function(d) {
console.log("trustedNewBurnManager manager => " + d);
console.log("Checks complete")
});
} |
<<<<<<<
this.resize(false);
=======
this.resizeEvent = function() {
that.$.trigger('resize');
};
$(window.top).resize(this.resizeEvent);
that.$.trigger('resize');
>>>>>>>
that.$.trigger('resize'); |
<<<<<<<
import Chip from '../components/essence-chip/src/chip.jsx';
=======
import List from '../components/essence-list/src/list.jsx';
import ListItem from '../components/essence-list/src/item.jsx';
import Image from '../components/essence-image/src/image.jsx';
>>>>>>>
import Chip from '../components/essence-chip/src/chip.jsx';
import List from '../components/essence-list/src/list.jsx';
import ListItem from '../components/essence-list/src/item.jsx';
import Image from '../components/essence-image/src/image.jsx';
<<<<<<<
var redbullChip = {
name: 'redbullChip',
text: [<strong>Redbull</strong>, <span> (interest)</span>],
icon: 'R',
deletable: true,
onClose: ( function () { console.log('redbullChip chip'); } )
}
var goproChip = {
name: 'goproChip',
text: [<strong>GoPRO</strong>, <span> (interest)</span>],
icon: 'G',
deletable: true,
onClose: ( function () { console.log('goproChip chip'); } )
}
class ChipTest extends React.Component {
constructor(props) {
super(props);
this.state = {
classes: ClassNames(
this.props.classes,
this.props.className
)
};
}
render() {
return(
<Chip {...this.props} />
);
}
};
=======
class ListTest extends React.Component {
constructor(props) {
super(props);
this.state = {
classes: ClassNames(
this.props.classes,
this.props.className
)
};
}
render() {
return(
<Block classes={'e-row'}>
<Block classes={'brick brick-4'}>
<Text type={'h2'} classes={'e-text-center'}>One line List</Text>
<List type={'navigation'} classes={"e-background-grey-300"}>
<ListItem>
<Text type={'a'} href={'#johnny'}>
<Switch type='checkbox' classes = 'e-left' name='radioButton'/>
<Block classes={'content e-left'}>
List Controls
</Block>
<Switch type='checkbox' classes = {'e-right'} name='radioButton'/>
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#bear'}>
<Switch type='switches' classes = 'e-left' name='switch'/>
<Block classes={'content e-left'}>
List Controls
</Block>
<Switch type='switches' classes = 'e-right' name='switch'/>
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#ninja'}>
<Icon name={'action-stars'} classes={'e-left'} />
<Block classes={'content e-left'}>
Mutant Ninja
</Block>
<Image src='http://i.imgur.com/a7okZb.jpg' alt={'Star Wars'} classes={'e-avatar e-right'}/>
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#pokemon'}>
<Icon name={'action-stars'} classes={'e-left'} />
<Block classes={'content e-left'}>
Pokemon
</Block>
<Image src='http://i.imgur.com/l0NKIJl.jpg' alt={'Star Wars'} classes={'e-avatar e-right'}/>
</Text>
</ListItem>
</List>
</Block>
<Block classes={'brick brick-4'}>
<Text type={'h2'} classes={'e-text-center'}>Two line List</Text>
<List type={'navigation'} classes={"e-background-grey-300 e-twolinelist"}>
<ListItem>
<Text type={'a'} href={'#johnny'}>
<Image src='http://i.imgur.com/Ix585.jpg' alt={'Star Wars'} classes={'e-avatar e-left'}/>
<Block classes={'content e-left'}>
<Text classes={'primary'}>Johnny Bravo</Text>
<Text classes={'secondary'}>Jan 9, 2016</Text>
</Block>
<Icon name={'action-info'} classes={'e-right e-text-grey-500'} />
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#bear'}>
<Image src='http://i.imgur.com/xrDnt12.png' alt={'Star Wars'} classes={'e-avatar e-left'}/>
<Block classes={'content e-left'}>
<Text classes={'primary'}>Uncle Bear</Text>
<Text classes={'secondary'}>Jan 10, 2016</Text>
</Block>
<Icon name={'action-info'} classes={'e-right e-text-grey-500'} />
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#ninja'}>
<Image src='http://i.imgur.com/a7okZb.jpg' alt={'Star Wars'} classes={'e-avatar e-left'}/>
<Block classes={'content e-left'}>
<Text classes={'primary'}>Mutant Ninja</Text>
<Text classes={'secondary'}>Jan 11, 2016</Text>
</Block>
<Icon name={'action-info'} classes={'e-right e-text-grey-500'} />
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#pokemon'}>
<Image src='http://i.imgur.com/l0NKIJl.jpg' alt={'Star Wars'} classes={'e-avatar e-left'}/>
<Block classes={'content e-left'}>
<Text classes={'primary'}>Pokemon</Text>
<Text classes={'secondary'}>Jan 11, 2016</Text>
</Block>
<Icon name={'action-info'} classes={'e-right e-text-grey-500'} />
</Text>
</ListItem>
</List>
</Block>
<Block classes={'brick brick-4'}>
<Text type={'h2'} classes={'e-text-center'}>Three line List</Text>
<List type={'navigation'} classes={"e-background-grey-300 e-threelinelist"}>
<ListItem>
<Text type={'a'} href={'#johnny'}>
<Image src='http://i.imgur.com/Ix585.jpg' alt={'Star Wars'} classes={'e-avatar e-left'}/>
<Block classes={'content e-left'}>
<Text classes={'primary'}>Johnny Bravo</Text>
<Text classes={'secondary'}>Jan 9, 2016</Text>
<Text classes={'tertiary'}>21:44</Text>
</Block>
<Icon name={'action-info'} classes={'e-right e-text-grey-500'} />
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#bear'}>
<Image src='http://i.imgur.com/xrDnt12.png' alt={'Star Wars'} classes={'e-avatar e-left'}/>
<Block classes={'content e-left'}>
<Text classes={'primary'}>Uncle Bear</Text>
<Text classes={'secondary'}>Jan 10, 2016</Text>
<Text classes={'tertiary'}>08:21</Text>
</Block>
<Icon name={'action-info'} classes={'e-right e-text-grey-500'} />
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#ninja'}>
<Image src='http://i.imgur.com/a7okZb.jpg' alt={'Star Wars'} classes={'e-avatar e-left'}/>
<Block classes={'content e-left'}>
<Text classes={'primary'}>Mutant Ninja</Text>
<Text classes={'secondary'}>Jan 11, 2016</Text>
<Text classes={'tertiary'}>20:14</Text>
</Block>
<Icon name={'action-info'} classes={'e-right e-text-grey-500'} />
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#pokemon'}>
<Image src='http://i.imgur.com/l0NKIJl.jpg' alt={'Star Wars'} classes={'e-avatar e-left'}/>
<Block classes={'content e-left'}>
<Text classes={'primary'}>Pokemon</Text>
<Text classes={'secondary'}>Jan 11, 2016</Text>
<Text classes={'tertiary'}>22:58</Text>
</Block>
<Icon name={'action-info'} classes={'e-right e-text-grey-500'} />
</Text>
</ListItem>
</List>
</Block>
</Block>
);
}
};
>>>>>>>
var redbullChip = {
name: 'redbullChip',
text: [<strong>Redbull</strong>, <span> (interest)</span>],
icon: 'R',
deletable: true,
onClose: ( function () { console.log('redbullChip chip'); } )
}
var goproChip = {
name: 'goproChip',
text: [<strong>GoPRO</strong>, <span> (interest)</span>],
icon: 'G',
deletable: true,
onClose: ( function () { console.log('goproChip chip'); } )
}
class ChipTest extends React.Component {
constructor(props) {
super(props);
this.state = {
classes: ClassNames(
this.props.classes,
this.props.className
)
};
}
render() {
return(
<Chip {...this.props} />
);
}
};
class ListTest extends React.Component {
constructor(props) {
super(props);
this.state = {
classes: ClassNames(
this.props.classes,
this.props.className
)
};
}
render() {
return(
<Block classes={'e-row'}>
<Block classes={'brick brick-4'}>
<Text type={'h2'} classes={'e-text-center'}>One line List</Text>
<List type={'navigation'} classes={"e-background-grey-300"}>
<ListItem>
<Text type={'a'} href={'#johnny'}>
<Switch type='checkbox' classes = 'e-left' name='radioButton'/>
<Block classes={'content e-left'}>
List Controls
</Block>
<Switch type='checkbox' classes = {'e-right'} name='radioButton'/>
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#bear'}>
<Switch type='switches' classes = 'e-left' name='switch'/>
<Block classes={'content e-left'}>
List Controls
</Block>
<Switch type='switches' classes = 'e-right' name='switch'/>
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#ninja'}>
<Icon name={'action-stars'} classes={'e-left'} />
<Block classes={'content e-left'}>
Mutant Ninja
</Block>
<Image src='http://i.imgur.com/a7okZb.jpg' alt={'Star Wars'} classes={'e-avatar e-right'}/>
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#pokemon'}>
<Icon name={'action-stars'} classes={'e-left'} />
<Block classes={'content e-left'}>
Pokemon
</Block>
<Image src='http://i.imgur.com/l0NKIJl.jpg' alt={'Star Wars'} classes={'e-avatar e-right'}/>
</Text>
</ListItem>
</List>
</Block>
<Block classes={'brick brick-4'}>
<Text type={'h2'} classes={'e-text-center'}>Two line List</Text>
<List type={'navigation'} classes={"e-background-grey-300 e-twolinelist"}>
<ListItem>
<Text type={'a'} href={'#johnny'}>
<Image src='http://i.imgur.com/Ix585.jpg' alt={'Star Wars'} classes={'e-avatar e-left'}/>
<Block classes={'content e-left'}>
<Text classes={'primary'}>Johnny Bravo</Text>
<Text classes={'secondary'}>Jan 9, 2016</Text>
</Block>
<Icon name={'action-info'} classes={'e-right e-text-grey-500'} />
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#bear'}>
<Image src='http://i.imgur.com/xrDnt12.png' alt={'Star Wars'} classes={'e-avatar e-left'}/>
<Block classes={'content e-left'}>
<Text classes={'primary'}>Uncle Bear</Text>
<Text classes={'secondary'}>Jan 10, 2016</Text>
</Block>
<Icon name={'action-info'} classes={'e-right e-text-grey-500'} />
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#ninja'}>
<Image src='http://i.imgur.com/a7okZb.jpg' alt={'Star Wars'} classes={'e-avatar e-left'}/>
<Block classes={'content e-left'}>
<Text classes={'primary'}>Mutant Ninja</Text>
<Text classes={'secondary'}>Jan 11, 2016</Text>
</Block>
<Icon name={'action-info'} classes={'e-right e-text-grey-500'} />
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#pokemon'}>
<Image src='http://i.imgur.com/l0NKIJl.jpg' alt={'Star Wars'} classes={'e-avatar e-left'}/>
<Block classes={'content e-left'}>
<Text classes={'primary'}>Pokemon</Text>
<Text classes={'secondary'}>Jan 11, 2016</Text>
</Block>
<Icon name={'action-info'} classes={'e-right e-text-grey-500'} />
</Text>
</ListItem>
</List>
</Block>
<Block classes={'brick brick-4'}>
<Text type={'h2'} classes={'e-text-center'}>Three line List</Text>
<List type={'navigation'} classes={"e-background-grey-300 e-threelinelist"}>
<ListItem>
<Text type={'a'} href={'#johnny'}>
<Image src='http://i.imgur.com/Ix585.jpg' alt={'Star Wars'} classes={'e-avatar e-left'}/>
<Block classes={'content e-left'}>
<Text classes={'primary'}>Johnny Bravo</Text>
<Text classes={'secondary'}>Jan 9, 2016</Text>
<Text classes={'tertiary'}>21:44</Text>
</Block>
<Icon name={'action-info'} classes={'e-right e-text-grey-500'} />
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#bear'}>
<Image src='http://i.imgur.com/xrDnt12.png' alt={'Star Wars'} classes={'e-avatar e-left'}/>
<Block classes={'content e-left'}>
<Text classes={'primary'}>Uncle Bear</Text>
<Text classes={'secondary'}>Jan 10, 2016</Text>
<Text classes={'tertiary'}>08:21</Text>
</Block>
<Icon name={'action-info'} classes={'e-right e-text-grey-500'} />
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#ninja'}>
<Image src='http://i.imgur.com/a7okZb.jpg' alt={'Star Wars'} classes={'e-avatar e-left'}/>
<Block classes={'content e-left'}>
<Text classes={'primary'}>Mutant Ninja</Text>
<Text classes={'secondary'}>Jan 11, 2016</Text>
<Text classes={'tertiary'}>20:14</Text>
</Block>
<Icon name={'action-info'} classes={'e-right e-text-grey-500'} />
</Text>
</ListItem>
<ListItem>
<Text type={'a'} href={'#pokemon'}>
<Image src='http://i.imgur.com/l0NKIJl.jpg' alt={'Star Wars'} classes={'e-avatar e-left'}/>
<Block classes={'content e-left'}>
<Text classes={'primary'}>Pokemon</Text>
<Text classes={'secondary'}>Jan 11, 2016</Text>
<Text classes={'tertiary'}>22:58</Text>
</Block>
<Icon name={'action-info'} classes={'e-right e-text-grey-500'} />
</Text>
</ListItem>
</List>
</Block>
</Block>
);
}
};
<<<<<<<
<Block>
<ChipTest data={redbullChip} className={'e-left'} />
<ChipTest data={goproChip} className={'e-left'} />
</Block>
<DataTableTest />
=======
<DataTableTest />
>>>>>>>
<Block>
<ChipTest data={redbullChip}/>
<ChipTest data={goproChip} />
</Block>
<ListTest />
<DataTableTest /> |
<<<<<<<
// clear the redo history
window.app.redos = [];
// record the paint stroke into the newest array
window.app.undos[window.app.undos.length - 1].push({
brush: window.app.activeBrush,
size: window.app.brushSize.val,
x: x,
y: y
});
this.updateUndoRedoButtonState();
};
=======
// record the paint stroke into the newest array
window.app.undos[window.app.undos.length - 1].push({
brush: window.app.activeBrush,
size: window.app.brushSize.val,
x: x,
y: y
});
this.updateUndoRedoButtonState();
};
>>>>>>>
// record the paint stroke into the newest array
window.app.undos[window.app.undos.length - 1].push({
brush: window.app.activeBrush,
size: window.app.brushSize.val,
x: x,
y: y
});
// clear the redo history
window.app.redos = [];
this.updateUndoRedoButtonState();
}; |
<<<<<<<
this.$ = $(this);
=======
this.$ = $(this);
>>>>>>>
this.$ = $(this);
<<<<<<<
summary: 'Summary',
copyright: 'View copyright information',
contentType: 'Content type',
title: 'Title',
author: 'Author',
source: 'Source',
license: 'License',
time: 'Time',
interactionsCopyright: 'Copyright information regarding interactions used in this interactive video',
bookmarks: 'Bookmarks',
"U": "Undisclosed",
"CC BY": "Attribution",
"CC BY-SA": "Attribution-ShareAlike",
"CC BY-ND": "Attribution-NoDerivs",
"CC BY-NC": "Attribution-NonCommercial",
"CC BY-NC-SA": "Attribution-NonCommercial-ShareAlike",
"CC BY-NC-ND": "Attribution-NonCommercial-NoDerivs",
"PD": "Public Domain",
"ODC PDDL": "Public Domain Dedication and Licence",
"CC PDM": "Public Domain Mark",
"C": "Copyright"
=======
summary: 'Summary'
>>>>>>>
summary: 'Summary'
<<<<<<<
this.oneSecondInPercentage = (100 / this.video.getDuration());
this.addSliderInteractions();
this.addBookmarks();
=======
this.drawSliderInteractions();
this.$.trigger('resize');
>>>>>>>
this.oneSecondInPercentage = (100 / this.video.getDuration());
this.addSliderInteractions();
this.addBookmarks();
this.$.trigger('resize');
<<<<<<<
$wrapper.html('<div class="h5p-controls-left"><a href="#" class="h5p-control h5p-play h5p-pause" title="' + that.l10n.play + '"></a><a href="#" class="h5p-control h5p-bookmarks" title="' + that.l10n.bookmarks + '"></a><div class="h5p-chooser h5p-bookmarks"><h3>' + that.l10n.bookmarks + '</h3></div></div><div class="h5p-controls-right"><a href="#" class="h5p-control h5p-fullscreen" title="' + that.l10n.fullscreen + '"></a><a href="#" class="h5p-control h5p-quality" title="' + that.l10n.quality + '"></a><div class="h5p-chooser h5p-quality"><h3>' + that.l10n.quality + '</h3></div><a href="#" class="h5p-control h5p-copyright" title="' + that.l10n.copyright + '"></a><a href="#" class="h5p-control h5p-volume" title="' + that.l10n.mute + '"></a><div class="h5p-control h5p-time"><span class="h5p-current">0:00</span> / <span class="h5p-total">0:00</span></div></div><div class="h5p-control h5p-slider"><div class="h5p-interactions-container"></div><div class="h5p-bookmarks-container"></div><div></div></div>');
=======
$wrapper.html('<div class="h5p-controls-left"><a href="#" class="h5p-control h5p-play h5p-pause" title="' + that.l10n.play + '"></a></div><div class="h5p-controls-right"><a href="#" class="h5p-control h5p-fullscreen" title="' + that.l10n.fullscreen + '"></a><a href="#" class="h5p-control h5p-quality" title="' + that.l10n.quality + '"></a><div class="h5p-quality-chooser h5p-hidden"><h3>' + that.l10n.quality + '</h3></div><a href="#" class="h5p-control h5p-volume" title="' + that.l10n.mute + '"></a><div class="h5p-control h5p-time"><span class="h5p-current">0:00</span> / <span class="h5p-total">0:00</span></div></div><div class="h5p-control h5p-slider"><div></div></div>');
>>>>>>>
$wrapper.html('<div class="h5p-controls-left"><a href="#" class="h5p-control h5p-play h5p-pause" title="' + that.l10n.play + '"></a><a href="#" class="h5p-control h5p-bookmarks" title="' + that.l10n.bookmarks + '"></a><div class="h5p-chooser h5p-bookmarks"><h3>' + that.l10n.bookmarks + '</h3></div></div><div class="h5p-controls-right"><a href="#" class="h5p-control h5p-fullscreen" title="' + that.l10n.fullscreen + '"></a><a href="#" class="h5p-control h5p-quality" title="' + that.l10n.quality + '"></a><div class="h5p-chooser h5p-quality"><h3>' + that.l10n.quality + '</h3></div><a href="#" class="h5p-control h5p-volume" title="' + that.l10n.mute + '"></a><div class="h5p-control h5p-time"><span class="h5p-current">0:00</span> / <span class="h5p-total">0:00</span></div></div><div class="h5p-control h5p-slider"><div class="h5p-interactions-container"></div><div class="h5p-bookmarks-container"></div><div></div></div>');
<<<<<<<
// Copyright button
$wrapper.find('.h5p-copyright').click(function () {
// Display dialog
that.showCopyrightInfo();
return false;
});
=======
>>>>>>>
<<<<<<<
* Displays a dialog with copyright information.
*
* @returns {undefined}
*/
C.prototype.showCopyrightInfo = function () {
var info = '';
for (var i = 0; i < this.params.assets.interactions.length; i++) {
var interaction = this.params.assets.interactions[i];
var params = interaction.action.params;
if (params.copyright === undefined) {
continue;
}
info += '<dl class="h5p-copyinfo"><dt>' + this.l10n.contentType + '</dt><dd>' + params.contentName + '</dd>';
if (params.copyright.title !== undefined) {
info += '<dt>' + this.l10n.title + '</dt><dd>' + params.copyright.title + '</dd>';
}
if (params.copyright.author !== undefined) {
info += '<dt>' + this.l10n.author + '</dt><dd>' + params.copyright.author + '</dd>';
}
if (params.copyright.license !== undefined) {
info += '<dt>' + this.l10n.license + '</dt><dd>' + this.l10n[params.copyright.license] + ' (' + params.copyright.license + ')</dd>';
}
if (params.copyright.source !== undefined) {
info += '<dt>' + this.l10n.source + '</dt><dd><a target="_blank" href="' + params.copyright.source + '">' + params.copyright.source + '</a></dd>';
}
info += '<dt>' + this.l10n.time + '</dt><dd>' + C.humanizeTime(interaction.duration.from) + ' - ' + C.humanizeTime(interaction.duration.to) + '</dd></dl>';
}
if (info) {
info = '<h2 class="h5p-interactions-copyright">' + this.l10n.interactionsCopyright + '</h2>' + info;
}
this.$dialog.children('.h5p-dialog-inner').html('<div class="h5p-dialog-interaction">' + this.params.video.copyright + info + '</div>');
this.showDialog();
};
/**
=======
>>>>>>> |
<<<<<<<
var verb = event.getVerb();
if (verb === 'interacted') {
const pos = self.interactions.sort((a, b) => a.getDuration().from - b.getDuration().from).indexOf(interaction);
self.interactionsState[pos] = 'interacted';
=======
if (event.getVerb() === 'interacted') {
const pos = self.interactions.sort((a, b) => a.getDuration().from - b.getDuration().from).indexOf(interaction);
self.interactionsProgress[pos] = Interaction.PROGRESS_INTERACTED;
this.setProgress(Interaction.PROGRESS_INTERACTED);
>>>>>>>
var verb = event.getVerb();
if (verb === 'interacted') {
const pos = self.interactions.sort((a, b) => a.getDuration().from - b.getDuration().from).indexOf(interaction);
self.interactionsProgress[pos] = Interaction.PROGRESS_INTERACTED;
this.setProgress(Interaction.PROGRESS_INTERACTED); |
<<<<<<<
return connectDropTarget(
<div>
<ColumnWrapper>
<TypeHeader>
<LabelHeading>{title.toUpperCase()}</LabelHeading>
<TypeDescription>{question}</TypeDescription>
</TypeHeader>
<ReflectionsArea>
<ReflectionsList canDrop={canDrop}>
{columnReflectionGroups.map((group) => {
if (phaseType === REFLECT) {
return group.reflections.map((reflection) => {
return (
<ColumnChild key={reflection.id}>
{reflection.isViewerCreator ?
<ReflectionCard meeting={meeting} reflection={reflection} /> :
<AnonymousReflectionCard meeting={meeting} reflection={reflection} />
}
</ColumnChild>
);
});
} else if (phaseType === GROUP) {
=======
return (
<ColumnWrapper>
{phaseType !== VOTE &&
<TypeHeader>
<LabelHeading>{title.toUpperCase()}</LabelHeading>
<TypeDescription>{question}</TypeDescription>
</TypeHeader>
}
<ReflectionsArea>
{phaseType === REFLECT && !isComplete &&
<ColumnChild>
<ButtonBlock>
<AddReflectionButton columnReflectionGroups={columnReflectionGroups} meeting={meeting} retroPhaseItem={retroPhaseItem} />
</ButtonBlock>
</ColumnChild>
}
<ReflectionsList>
{columnReflectionGroups.map((group) => {
if (phaseType === REFLECT) {
return group.reflections.map((reflection) => {
>>>>>>>
return connectDropTarget(
<div>
<ColumnWrapper>
{phaseType !== VOTE &&
<TypeHeader>
<LabelHeading>{title.toUpperCase()}</LabelHeading>
<TypeDescription>{question}</TypeDescription>
</TypeHeader>
}
<ReflectionsArea>
{phaseType === REFLECT && !isComplete &&
<ColumnChild>
<ButtonBlock>
<AddReflectionButton columnReflectionGroups={columnReflectionGroups} meeting={meeting} retroPhaseItem={retroPhaseItem} />
</ButtonBlock>
</ColumnChild>
}
<ReflectionsList canDrop={canDrop}>
{columnReflectionGroups.map((group) => {
if (phaseType === REFLECT) {
return group.reflections.map((reflection) => {
return (
<ColumnChild key={reflection.id}>
{reflection.isViewerCreator ?
<ReflectionCard meeting={meeting} reflection={reflection} /> :
<AnonymousReflectionCard meeting={meeting} reflection={reflection} />
}
</ColumnChild>
);
});
} else if (phaseType === GROUP) {
<<<<<<<
} else if (phaseType === VOTE) {
return (
<ColumnChild key={group.id}>
<ReflectionGroup
reflectionGroup={group}
retroPhaseItemId={retroPhaseItemId}
meeting={meeting}
/>
</ColumnChild>
);
}
return null;
})}
</ReflectionsList>
{phaseType === REFLECT && !isComplete &&
<ColumnChild>
<ButtonBlock>
<AddReflectionButton columnReflectionGroups={columnReflectionGroups} meeting={meeting} retroPhaseItem={retroPhaseItem} />
</ButtonBlock>
</ColumnChild>
}
</ReflectionsArea>
</ColumnWrapper>
</div>
=======
});
} else if (phaseType === GROUP) {
return (
<Droppable
key={group.id}
droppableId={group.id}
type={REFLECTION_CARD}
>
{(dropProvided: DroppableProvided, dropSnapshot: DroppableStateSnapshot) => (
<ColumnChild
innerRef={dropProvided.innerRef}
isDraggingOver={dropSnapshot.isDraggingOver}
{...dropProvided.droppableProps}
>
<ReflectionGroup
reflectionGroup={group}
retroPhaseItemId={retroPhaseItemId}
meeting={meeting}
isDraggingOver={dropSnapshot.isDraggingOver}
/>
{dropProvided.placeholder}
</ColumnChild>
)}
</Droppable>
);
} else if (phaseType === VOTE) {
return (
<ColumnChild key={group.id}>
<ReflectionGroup
reflectionGroup={group}
retroPhaseItemId={retroPhaseItemId}
meeting={meeting}
/>
</ColumnChild>
);
}
return null;
})}
</ReflectionsList>
{phaseType === GROUP && !isComplete &&
<EntireDropZone>
<ReflectionDropZone retroPhaseItem={retroPhaseItem} />
</EntireDropZone>
}
</ReflectionsArea>
</ColumnWrapper>
>>>>>>>
} else if (phaseType === VOTE) {
return (
<ColumnChild key={group.id}>
<ReflectionGroup
reflectionGroup={group}
retroPhaseItemId={retroPhaseItemId}
meeting={meeting}
/>
</ColumnChild>
);
}
return null;
})}
</ReflectionsList>
</ReflectionsArea>
</ColumnWrapper>
</div> |
<<<<<<<
healingRainLocation: HealingRainLocation,
=======
deathRecapTracker: DeathRecapTracker,
>>>>>>>
healingRainLocation: HealingRainLocation,
deathRecapTracker: DeathRecapTracker, |
<<<<<<<
makeEditingStatus.cache = active ? <span>editing<Ellipsis/></span> : fromNowString(updatedAt);
=======
makeEditingStatus.cache = active ? <span>editing {endStr}<Ellipsis/></span> :
fromNow(updatedAt);
>>>>>>>
makeEditingStatus.cache = active ? <span>editing {endStr}<Ellipsis/></span> :
fromNowString(updatedAt); |
<<<<<<<
facilitatorPhase,
facilitatorPhaseItem,
gotoItem,
localPhase,
localPhaseItem,
=======
gotoAgendaItem,
>>>>>>>
facilitatorPhase,
facilitatorPhaseItem,
gotoAgendaItem,
localPhase,
localPhaseItem,
<<<<<<<
facilitatorPhase={facilitatorPhase}
facilitatorPhaseItem={facilitatorPhaseItem}
gotoItem={gotoItem}
localPhase={localPhase}
localPhaseItem={localPhaseItem}
=======
gotoAgendaItem={gotoAgendaItem}
>>>>>>>
facilitatorPhase={facilitatorPhase}
facilitatorPhaseItem={facilitatorPhaseItem}
gotoAgendaItem={gotoAgendaItem}
localPhase={localPhase}
localPhaseItem={localPhaseItem}
<<<<<<<
facilitatorPhase: PropTypes.oneOf(phaseArray),
facilitatorPhaseItem: PropTypes.number,
gotoItem: PropTypes.func.isRequired,
localPhase: PropTypes.oneOf(phaseArray),
localPhaseItem: PropTypes.number,
=======
gotoAgendaItem: PropTypes.func.isRequired,
>>>>>>>
facilitatorPhase: PropTypes.oneOf(phaseArray),
facilitatorPhaseItem: PropTypes.number,
gotoAgendaItem: PropTypes.func.isRequired,
localPhase: PropTypes.oneOf(phaseArray),
localPhaseItem: PropTypes.number, |
<<<<<<<
import withStyles from 'universal/styles/withStyles';
import {css} from 'aphrodite';
import FontAwesome from 'react-fontawesome';
import CopyToClipboard from 'react-copy-to-clipboard';
import appTheme from 'universal/styles/theme/appTheme';
=======
import look, {StyleSheet} from 'react-look';
import theme from 'universal/styles/theme';
>>>>>>>
import withStyles from 'universal/styles/withStyles';
import {css} from 'aphrodite';
import appTheme from 'universal/styles/theme/appTheme';
<<<<<<<
const faStyle = {lineHeight: 'inherit'};
=======
let s = {};
>>>>>>>
//
<<<<<<<
<p className={css(styles.label)}>{'Copy & share this meeting:'}</p>
{/* */}
{/* TODO: prevent navigation and show a “Copied!” message inline or toast */}
{/* */}
<CopyToClipboard text={shortUrl}>
<a
className={css(styles.link)}
href={shortUrl}
onClick={voidClick}
title={`Copy link to meeting: ${shortUrl}`}
>
<span className={css(styles.linkText)}>{shortUrl}</span>
<span className={css(styles.icon)}>
<FontAwesome name="copy" style={faStyle}/>
</span>
</a>
</CopyToClipboard>
<h2 className={css(styles.prompt)}>Team Facilitator: begin the Check-In round!</h2>
=======
<p className={s.label}>Share this meeting:</p>
<div className={s.urlBlock}>
<CopyShortLink url={shortUrl} />
</div>
<h2 className={s.prompt}>Team Facilitator: begin the Check-In round!</h2>
>>>>>>>
<p className={css(styles.label)}>Share this meeting:</p>
<div className={css(styles.urlBlock)}>
<CopyShortLink url={shortUrl} />
</div>
<h2 className={css(styles.prompt)}>Team Facilitator: begin the Check-In round!</h2>
<<<<<<<
link: {
borderRadius: '.25rem',
display: 'block',
fontSize: faFontSize,
margin: '.5rem 0 4rem',
padding: '.75rem 1.5rem',
textDecoration: 'none !important',
':hover': {
backgroundColor: appTheme.palette.cool10l
},
':focus': {
backgroundColor: appTheme.palette.cool10l
}
},
linkText: {
display: 'inline-block',
verticalAlign: 'middle'
},
icon: {
display: 'inline-block',
fontSize: faFontSize,
marginLeft: '.5rem',
verticalAlign: 'middle'
},
=======
>>>>>>>
prompt: {
color: theme.palette.dark,
margin: '0 0 2rem'
padding: '.75rem 1.5rem',
textDecoration: 'none !important',
':hover': {
backgroundColor: appTheme.palette.cool10l
},
':focus': {
backgroundColor: appTheme.palette.cool10l
}
},
urlBlock: {
margin: '.5rem 0 4rem',
verticalAlign: 'middle'
}, |
<<<<<<<
import UpdateProjectPayload from 'server/graphql/types/UpdateProjectPayload';
import {fromGlobalId} from 'graphql-relay';
=======
import publishChangeNotifications from 'server/graphql/mutations/helpers/publishChangeNotifications';
import AreaEnum from 'server/graphql/types/AreaEnum';
>>>>>>>
import UpdateProjectPayload from 'server/graphql/types/UpdateProjectPayload';
import {fromGlobalId} from 'graphql-relay';
import publishChangeNotifications from 'server/graphql/mutations/helpers/publishChangeNotifications';
import AreaEnum from 'server/graphql/types/AreaEnum';
<<<<<<<
async resolve(source, {updatedProject}, {authToken, getDataLoader, socketId}) {
=======
async resolve(source, {area, updatedProject}, {authToken}) {
>>>>>>>
async resolve(source, {area, updatedProject}, {authToken, getDataLoader, socketId}) { |
<<<<<<<
import {AGENDA_ITEM, AGENDA_ITEMS, phaseArray} from 'universal/utils/constants';
=======
import {AGENDA_ITEM} from 'universal/utils/constants';
>>>>>>>
import {AGENDA_ITEM, phaseArray} from 'universal/utils/constants';
<<<<<<<
facilitatorPhase,
facilitatorPhaseItem,
gotoItem,
localPhase,
localPhaseItem,
=======
gotoAgendaItem,
>>>>>>>
facilitatorPhase,
facilitatorPhaseItem,
gotoAgendaItem,
localPhase,
localPhaseItem,
<<<<<<<
facilitatorPhase={facilitatorPhase}
facilitatorPhaseItem={facilitatorPhaseItem}
gotoAgendaItem={() => gotoItem(idx + 1, AGENDA_ITEMS)}
=======
gotoAgendaItem={gotoAgendaItem(idx)}
>>>>>>>
facilitatorPhase={facilitatorPhase}
facilitatorPhaseItem={facilitatorPhaseItem}
gotoAgendaItem={gotoAgendaItem(idx)}
<<<<<<<
facilitatorPhase: PropTypes.oneOf(phaseArray),
facilitatorPhaseItem: PropTypes.number,
gotoItem: PropTypes.func.isRequired,
localPhase: PropTypes.oneOf(phaseArray),
localPhaseItem: PropTypes.number,
=======
gotoAgendaItem: PropTypes.func.isRequired,
>>>>>>>
facilitatorPhase: PropTypes.oneOf(phaseArray),
facilitatorPhaseItem: PropTypes.number,
gotoAgendaItem: PropTypes.func.isRequired,
localPhase: PropTypes.oneOf(phaseArray),
localPhaseItem: PropTypes.number, |
<<<<<<<
=======
const normalizedProjectId = `Task::${projectId}`;
const editingMe = editing[normalizedProjectId] || [];
>>>>>>>
const normalizedProjectId = `Task::${projectId}`;
const editingMe = editing[normalizedProjectId] || []; |
<<<<<<<
=======
import {cashay} from 'cashay';
import getAuthedUser from 'universal/redux/getAuthedUser';
>>>>>>>
<<<<<<<
invitees: selector(state, 'invitees'),
inviteesRaw: selector(state, 'inviteesRaw'),
preferredName: selector(state, 'preferredName'),
teamName: selector(state, 'teamName'),
=======
authToken: state.authToken,
>>>>>>>
invitees: selector(state, 'invitees'),
inviteesRaw: selector(state, 'inviteesRaw'),
preferredName: selector(state, 'preferredName'),
teamName: selector(state, 'teamName'),
authToken: state.authToken,
<<<<<<<
=======
onPreferredNameSubmit = data => {
const {dispatch} = this.props;
const {preferredName} = data;
const user = getAuthedUser();
const options = {
variables: {
updatedProfile: {
id: user.id,
preferredName
}
}
};
dispatch(setWelcomeName(preferredName));
cashay.mutate('updateUserProfile', options);
};
onTeamNameSubmit = data => {
const {dispatch} = this.props;
const {teamName} = data;
const teamId = shortid.generate();
const teamMemberId = shortid.generate();
const user = getAuthedUser();
dispatch(setWelcomeTeam({teamName, teamId, teamMemberId}));
const createTeamOptions = {
variables: {
newTeam: {
id: teamId,
name: teamName,
leader: {
id: teamMemberId,
teamId,
cachedUserId: user.id,
isActive: true,
isLead: true,
isFacilitator: true
}
}
}
};
cashay.mutate('createTeam', createTeamOptions);
};
onInviteTeamSubmit = data => {
const {dispatch, welcome: {teamId}} = this.props;
const {invitees} = data;
const options = {
variables: {
teamId,
invitees
}
};
cashay.mutate('inviteTeam', options)
.then(res => {
// TODO make sure this resolves after the route changes
console.log('inviteTeamRes', res);
if (res.error) {
const {failedEmails} = JSON.parse(res.error);
if (Array.isArray(failedEmails)) {
const emailsNotDelivered = failedEmails.map(invitee => invitee.email).join(', ');
dispatch(show(emailInviteFail(emailsNotDelivered)));
}
} else if (res.data) {
dispatch(show(emailInviteSuccess));
}
});
// TODO dispatch email success notification
dispatch(push(`/team/${teamId}`));
};
>>>>>>> |
<<<<<<<
=======
const hasOpenStatusMenu = openMenu === OPEN_STATUS_MENU;
const hasOpenAssignMenu = openMenu === OPEN_ASSIGN_MENU;
>>>>>>>
const hasOpenStatusMenu = openMenu === OPEN_STATUS_MENU;
const hasOpenAssignMenu = openMenu === OPEN_ASSIGN_MENU; |
<<<<<<<
import {showSuccess} from 'universal/modules/toast/ducks/toastDuck';
=======
import {showSuccess} from 'universal/modules/notifications/ducks/notifications';
import {
APP_UPGRADE_PENDING_KEY,
APP_UPGRADE_PENDING_RELOAD
} from 'universal/utils/constants';
>>>>>>>
import {showSuccess} from 'universal/modules/toast/ducks/toastDuck';
import {
APP_UPGRADE_PENDING_KEY,
APP_UPGRADE_PENDING_RELOAD
} from 'universal/utils/constants'; |
<<<<<<<
import UpdateDragLocationPayload from 'server/graphql/types/UpdateDragLocationPayload'
=======
import DragDiscussionTopicPayload from 'server/graphql/types/DragDiscussionTopicPayload'
>>>>>>>
import UpdateDragLocationPayload from 'server/graphql/types/UpdateDragLocationPayload'
import DragDiscussionTopicPayload from 'server/graphql/types/DragDiscussionTopicPayload' |
<<<<<<<
import {PROJECT_CREATED} from 'universal/utils/constants';
import getPubSub from 'server/utils/getPubSub';
=======
import getPubSub from 'server/utils/getPubSub';
import AreaEnum from 'server/graphql/types/AreaEnum';
>>>>>>>
import {PROJECT_CREATED} from 'universal/utils/constants';
import getPubSub from 'server/utils/getPubSub';
import getPubSub from 'server/utils/getPubSub';
import AreaEnum from 'server/graphql/types/AreaEnum';
<<<<<<<
async resolve(source, {newProject}, {authToken, socket, getDataLoader}) {
=======
async resolve(source, {newProject, area}, {authToken, socket}) {
>>>>>>>
async resolve(source, {newProject, area}, {authToken, socket, getDataLoader}) {
<<<<<<<
const dataLoader = getDataLoader();
const operationId = dataLoader.share();
=======
const now = new Date();
>>>>>>>
const dataLoader = getDataLoader();
const operationId = dataLoader.share();
const now = new Date();
<<<<<<<
const projectCreated = {project};
getPubSub().publish(`${PROJECT_CREATED}.${teamId}`, {projectCreated, operationId});
getPubSub().publish(`${PROJECT_CREATED}.${userId}`, {projectCreated, operationId});
return projectCreated;
=======
// Almost always you start out with a blank card assigned to you (except for filtered team dash)
const changeAuthorId = `${myUserId}::${teamId}`;
const notificationsToAdd = [];
if (changeAuthorId !== project.teamMemberId && !usersToIgnore.includes(project.userId)) {
notificationsToAdd.push({
id: shortid.generate(),
startAt: now,
type: PROJECT_INVOLVES,
userIds: [userId],
involvement: ASSIGNEE,
projectId: project.id,
changeAuthorId,
teamId
});
}
getTypeFromEntityMap('MENTION', entityMap)
.filter((mention) => mention !== myUserId && mention !== project.userId && !usersToIgnore.includes(mention))
.forEach((mentioneeUserId) => {
notificationsToAdd.push({
id: shortid.generate(),
startAt: now,
type: PROJECT_INVOLVES,
userIds: [mentioneeUserId],
involvement: MENTIONEE,
projectId: project.id,
changeAuthorId,
teamId
});
});
if (notificationsToAdd.length) {
await r.table('Notification').insert(notificationsToAdd);
notificationsToAdd.forEach((notification) => {
const notificationsAdded = {notifications: [notification]};
const notificationUserId = notification.userIds[0];
getPubSub().publish(`${NOTIFICATIONS_ADDED}.${notificationUserId}`, {notificationsAdded});
});
}
return {project};
>>>>>>>
const projectCreated = {project};
getPubSub().publish(`${PROJECT_CREATED}.${teamId}`, {projectCreated, operationId});
getPubSub().publish(`${PROJECT_CREATED}.${userId}`, {projectCreated, operationId});
return projectCreated;
// Almost always you start out with a blank card assigned to you (except for filtered team dash)
const changeAuthorId = `${myUserId}::${teamId}`;
const notificationsToAdd = [];
if (changeAuthorId !== project.teamMemberId && !usersToIgnore.includes(project.userId)) {
notificationsToAdd.push({
id: shortid.generate(),
startAt: now,
type: PROJECT_INVOLVES,
userIds: [userId],
involvement: ASSIGNEE,
projectId: project.id,
changeAuthorId,
teamId
});
}
getTypeFromEntityMap('MENTION', entityMap)
.filter((mention) => mention !== myUserId && mention !== project.userId && !usersToIgnore.includes(mention))
.forEach((mentioneeUserId) => {
notificationsToAdd.push({
id: shortid.generate(),
startAt: now,
type: PROJECT_INVOLVES,
userIds: [mentioneeUserId],
involvement: MENTIONEE,
projectId: project.id,
changeAuthorId,
teamId
});
});
if (notificationsToAdd.length) {
await r.table('Notification').insert(notificationsToAdd);
notificationsToAdd.forEach((notification) => {
const notificationsAdded = {notifications: [notification]};
const notificationUserId = notification.userIds[0];
getPubSub().publish(`${NOTIFICATIONS_ADDED}.${notificationUserId}`, {notificationsAdded});
});
}
return {project}; |
<<<<<<<
import {css} from 'aphrodite-local-styles/no-important';
import PropTypes from 'prop-types';
=======
>>>>>>>
import {css} from 'aphrodite-local-styles/no-important';
import PropTypes from 'prop-types';
<<<<<<<
=======
import PropTypes from 'prop-types';
import ProviderRow from 'universal/modules/teamDashboard/components/ProviderRow/ProviderRow';
>>>>>>>
<<<<<<<
import providerAddedSubscription from 'universal/subscriptions/providerAddedSubscription';
import {GITHUB, SLACK} from 'universal/utils/constants';
=======
import ui from 'universal/styles/ui';
import {SLACK, GITHUB} from 'universal/utils/constants';
import Panel from 'universal/components/Panel/Panel';
const providerRow = {
github: {
accessToken: 'foo',
userCount: 2,
integrationCount: 3,
providerUserName: 'ackernaut'
}
};
>>>>>>>
import providerAddedSubscription from 'universal/subscriptions/providerAddedSubscription';
import {GITHUB, SLACK} from 'universal/utils/constants';
import ui from 'universal/styles/ui';
import Panel from 'universal/components/Panel/Panel';
<<<<<<<
<div className={css(styles.list)}>
<ProviderRow name={GITHUB} providerDetails={github} teamMemberId={teamMemberId}/>
<ProviderRow name={SLACK} providerDetails={slack} jwt={jwt} teamMemberId={teamMemberId}/>
=======
<div className={css(styles.providerList)}>
<Panel hasHeader={false}>
<ProviderRow name={GITHUB} providerDetails={providerMap.github} teamMemberId={teamMemberId} />
<ProviderRow name={SLACK} providerDetails={providerMap.slack} jwt={jwt} teamMemberId={teamMemberId} />
</Panel>
>>>>>>>
<div className={css(styles.providerList)}>
<Panel hasHeader={false}>
<ProviderRow name={GITHUB} providerDetails={github} teamMemberId={teamMemberId} />
<ProviderRow name={SLACK} providerDetails={slack} jwt={jwt} teamMemberId={teamMemberId} />
</Panel> |
<<<<<<<
import LoadingView from 'universal/components/LoadingView/LoadingView'
import EditableTeamName from 'universal/modules/teamDashboard/components/EditTeamName/EditableTeamName'
=======
import EditTeamName from 'universal/modules/teamDashboard/components/EditTeamName/EditTeamName'
>>>>>>>
import EditableTeamName from 'universal/modules/teamDashboard/components/EditTeamName/EditableTeamName' |
<<<<<<<
const r = require('../database/rethinkDriver');
module.exports = (param) => {
if (param === '?stopRethink') {
r.getPoolMaster().drain();
}
return transformSchema(rootSchema, graphql);
};
=======
const r = require('../database/rethinkDriver');
module.exports = params => {
if (params === '?exitRethink') {
// optional pool draining if your schema starts a DB connection pool
r.getPoolMaster().drain();
}
return transformSchema(rootSchema, graphql);
}
>>>>>>>
const r = require('../database/rethinkDriver');
module.exports = params => {
if (params === '?exitRethink') {
// optional pool draining if your schema starts a DB connection pool
r.getPoolMaster().drain();
}
return transformSchema(rootSchema, graphql);
}; |
<<<<<<<
player.dnb.dialog.open($dialogContent);
player.dnb.dialog.addLibraryClass(library);
=======
// Open dialog
player.dialog.open($dialogContent, title);
player.dialog.addLibraryClass(library);
>>>>>>>
// Open dialog
player.dnb.dialog.open($dialogContent);
player.dnb.dialog.addLibraryClass(library);
<<<<<<<
var max = player.dnb.dialog.getMaxSize($interaction);
=======
var max = player.dialog.getMaxSize($interaction, player.isMobileView);
>>>>>>>
var max = player.dnb.dialog.getMaxSize($interaction);
<<<<<<<
// Set dialog size and position
player.dnb.dialog.position($interaction, size);
=======
if (positionDialog) {
// Set dialog size and position
player.dialog.position($interaction, size);
}
>>>>>>>
if (positionDialog) {
// Set dialog size and position
player.dnb.dialog.position($interaction, size);
}
<<<<<<<
player.dnb.dialog.close();
}
else {
=======
player.dialog.close();
} else {
if (player.isMobileView) {
player.dialog.close();
}
>>>>>>>
player.dnb.dialog.close();
}
else {
if (player.isMobileView) {
player.dnb.dialog.close();
}
<<<<<<<
// Add continue button
addButton($adap, (adaptivity.seekLabel ? adaptivity.seekLabel : player.l10n.defaultAdaptivitySeekLabel), function () {
if (self.isButton()) {
player.dnb.dialog.close();
}
if (!adaptivity.allowOptOut) {
if (!self.isButton()) {
player.dnb.dialog.closeOverlay();
$interaction.css('zIndex', '');
=======
// Reset interaction
instance.hideButton('iv-adaptivity-' + adaptivityId);
if (!fullScore && instance.resetTask) {
instance.resetTask();
>>>>>>>
// Reset interaction
instance.hideButton('iv-adaptivity-' + adaptivityId);
if (!fullScore && instance.resetTask) {
instance.resetTask();
<<<<<<<
if (updateSize && library === 'H5P.DragQuestion') {
// Update size
var size = action.params.question.settings.size;
var fontSize = Number($interaction.css('fontSize').replace('px', ''));
if (self.isButton()) {
// Update element size with drag question parameters
parameters.width = size.width / fontSize;
parameters.height = size.height / fontSize;
}
else {
// Update drag question parameters with size set on element
size.width = Math.round(parameters.width * fontSize);
size.height = Math.round(parameters.height * fontSize);
}
}
if (player.editor !== undefined) {
player.editor.dnb.removeElement(action.subContentId);
}
$interaction.remove();
=======
$interaction.detach();
>>>>>>>
if (player.editor !== undefined) {
player.editor.dnb.removeElement(action.subContentId);
}
$interaction.detach(); |
<<<<<<<
isFacilitating={isFacilitating}
=======
localPhaseItem={localPhaseItem}
>>>>>>>
isFacilitating={isFacilitating}
localPhaseItem={localPhaseItem} |
<<<<<<<
<div className={css(styles.formBlock)}>
{isNewOrg ?
<div>
<Field
colorPalette="gray"
component={InputField}
label="Organization Name (required)"
name="orgName"
placeholder={randomPlaceholderTheme.orgName}
/>
<Field
component="input"
type="hidden"
name="stripeToken"
/>
<FieldBlock>
<div className={css(styles.addBillingBlock)}>
<div className={css(styles.addBillingBody)}>
<h3>Billing information (required)</h3>
<span>
=======
{isNewOrg ?
<div className={css(styles.formBlock)}>
<Field
autoFocus
colorPalette="gray"
component={InputField}
label="Organization Name (required)"
name="orgName"
placeholder={randomPlaceholderTheme.orgName}
/>
<Field
component="input"
type="hidden"
name="stripeToken"
/>
<FieldBlock>
<div className={css(styles.billingBlock)}>
<h3 className={css(styles.billingHeading)}>Billing information (required)</h3>
<p className={css(styles.billingCopy)}>
>>>>>>>
<div className={css(styles.formBlock)}>
{isNewOrg ?
<div className={css(styles.formBlock)}>
<Field
autoFocus
colorPalette="gray"
component={InputField}
label="Organization Name (required)"
name="orgName"
placeholder={randomPlaceholderTheme.orgName}
/>
<Field
component="input"
type="hidden"
name="stripeToken"
/>
<FieldBlock>
<div className={css(styles.billingBlock)}>
<h3 className={css(styles.billingHeading)}>Billing information (required)</h3>
<p className={css(styles.billingCopy)}> |
<<<<<<<
right: '2rem',
zIndex: ui.ziRejoinFacilitatorButton,
':hover': {
opacity: '.65'
}
=======
right: '2rem'
>>>>>>>
right: '2rem'
zIndex: ui.ziRejoinFacilitatorButton,
':hover': {
opacity: '.65'
} |
<<<<<<<
if (possiblyUpdatedResult.changes.length) {
if (possiblyUpdatedResult.changes.length > 1) {
console.warn('updatedOrOriginal() detects more than 1 change, returning 1st.');
}
return possiblyUpdatedResult.changes[0].new_val;
}
return original;
}
export function makeEnumValues(constArr) {
return constArr.reduce((values, constant) => {
values[constant] = {value: constant};
return values;
}, {})
=======
return firstChange(possiblyUpdatedResult).new_val || original;
}
export function previousValue(possiblyUpdatedResult) {
return firstChange(possiblyUpdatedResult).old_val;
>>>>>>>
return firstChange(possiblyUpdatedResult).new_val || original;
}
export function previousValue(possiblyUpdatedResult) {
return firstChange(possiblyUpdatedResult).old_val;
}
export function makeEnumValues(constArr) {
return constArr.reduce((values, constant) => {
values[constant] = {value: constant};
return values;
}, {}) |
<<<<<<<
block.html = edit(block.html)
.replace('comment', /<!--[\s\S]*?-->/)
.replace('closed', /<(tag)[\s\S]+?<\/\1>/)
.replace('closing', /<tag(?:"[^"]*"|'[^']*'|[^'">])*?>/)
.replace(/tag/g, block._tag)
.getRegex();
block.paragraph = edit(block.paragraph)
.replace('hr', block.hr)
.replace('heading', block.heading)
.replace('lheading', block.lheading)
.replace('blockquote', block.blockquote)
.replace('tag', '<' + block._tag)
.replace('def', block.def)
.getRegex();
=======
block.html = replace(block.html)
('comment', /<!--[\s\S]*?-->/)
('closed', /<(tag)[\s\S]+?<\/\1>/)
('closing', /<tag(?:"[^"]*"|'[^']*'|\s[^'"\/>]*)*?\/?>/)
(/tag/g, block._tag)
();
block.paragraph = replace(block.paragraph)
('hr', block.hr)
('heading', block.heading)
('lheading', block.lheading)
('tag', '<' + block._tag)
();
block.blockquote = replace(block.blockquote)
('paragraph', block.paragraph)
();
>>>>>>>
block.html = edit(block.html)
.replace('comment', /<!--[\s\S]*?-->/)
.replace('closed', /<(tag)[\s\S]+?<\/\1>/)
.replace('closing', /<tag(?:"[^"]*"|'[^']*'|\s[^'"\/>]*)*?\/?>/)
.replace(/tag/g, block._tag)
.getRegex();
block.paragraph = edit(block.paragraph)
.replace('hr', block.hr)
.replace('heading', block.heading)
.replace('lheading', block.lheading)
.replace('tag', '<' + block._tag)
.getRegex();
block.blockquote = edit(block.blockquote)
.replace('paragraph', block.paragraph)
.getRegex();
<<<<<<<
Lexer.prototype.token = function(src, top, bq) {
src = src.replace(/^ +$/gm, '');
var next,
loose,
cap,
bull,
b,
item,
space,
i,
l;
=======
Lexer.prototype.token = function(src, top) {
var src = src.replace(/^ +$/gm, '')
, next
, loose
, cap
, bull
, b
, item
, space
, i
, tag
, l;
>>>>>>>
Lexer.prototype.token = function(src, top) {
src = src.replace(/^ +$/gm, '');
var next,
loose,
cap,
bull,
b,
item,
space,
i,
tag,
l;
<<<<<<<
escape: edit(inline.escape).replace('])', '~|])').getRegex(),
url: /^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/,
=======
escape: replace(inline.escape)('])', '~|])')(),
url: replace(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/)
('email', inline._email)
(),
_backpedal: /(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,
>>>>>>>
escape: edit(inline.escape).replace('])', '~|])').getRegex(),
url: edit(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/)
.replace('email', inline._email)
.getRegex(),
_backpedal: /(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,
<<<<<<<
text: edit(inline.text)
.replace(']|', '~]|')
.replace('|', '|https?://|')
.getRegex()
=======
text: replace(inline.text)
(']|', '~]|')
('|', '|https?://|ftp://|www\\.|[a-zA-Z0-9.!#$%&\'*+/=?^_`{\\|}~-]+@|')
()
>>>>>>>
text: edit(inline.text)
.replace(']|', '~]|')
.replace('|', '|https?://|ftp://|www\\.|[a-zA-Z0-9.!#$%&\'*+/=?^_`{\\|}~-]+@|')
.getRegex()
<<<<<<<
text = escape(
cap[1].charAt(6) === ':'
? this.mangle(cap[1].substring(7))
: this.mangle(cap[1])
);
href = this.mangle('mailto:') + text;
=======
text = escape(this.mangle(cap[1]));
href = 'mailto:' + text;
>>>>>>>
text = escape(this.mangle(cap[1]));
href = 'mailto:' + text;
<<<<<<<
var header = '',
body = '',
i,
row,
cell,
j;
=======
var header = ''
, body = ''
, i
, row
, cell
, j;
>>>>>>>
var header = '',
body = '',
i,
row,
cell,
j; |
<<<<<<<
import {cardShadow} from 'universal/styles/elevation'
=======
import {findDOMNode} from 'react-dom'
>>>>>>>
import {cardShadow} from 'universal/styles/elevation'
import {findDOMNode} from 'react-dom' |
<<<<<<<
import {DashPanelHeading} from 'universal/components/Dashboard';
import FontAwesome from 'react-fontawesome';
import {Link} from 'react-router';
=======
import theme from 'universal/styles/theme';
import ib from 'universal/styles/helpers/ib';
import {
DashSectionControl,
DashSectionControls,
DashSectionHeader,
DashSectionHeading
} from 'universal/components/Dashboard';
import FontAwesome from 'react-fontawesome';
>>>>>>>
import theme from 'universal/styles/theme';
import ib from 'universal/styles/helpers/ib';
import {
DashSectionControl,
DashSectionControls,
DashSectionHeader,
DashSectionHeading
} from 'universal/components/Dashboard';
import FontAwesome from 'react-fontawesome';
<<<<<<<
<div className={styles.root}>
<div className={styles.heading}>
<DashPanelHeading icon="check" label="Team Projects" />
</div>
<div className={styles.controls}>
<Link to={`/team/${teamId}/archive`}>
See Archived Items
<FontAwesome name="archive" />
</Link>
<span>Show by team member: ALL TEAM MEMBERS</span>
</div>
</div>
=======
<DashSectionHeader>
<DashSectionHeading icon="calendar" label="Team Projects" />
<DashSectionControls>
{/* TODO: needs link to archive */}
<DashSectionControl>
<FontAwesome name="archive" style={ib} />
{' '}
<a className={styles.link} href="#" title="See Archived Projects">
See Archived Projects
</a>
</DashSectionControl>
{/* TODO: needs minimal, inline dropdown */}
<DashSectionControl>
<b style={ib}>Show by Team Member</b>:
{' '}
<a className={styles.link} href="#" title="Filter by All Team Members">
All Team Members
</a>
{' '}
<FontAwesome name="chevron-circle-down" style={ib} />
</DashSectionControl>
</DashSectionControls>
</DashSectionHeader>
>>>>>>>
<DashSectionHeader>
<DashSectionHeading icon="calendar" label="Team Projects" />
<DashSectionControls>
{/* TODO: needs link to archive */}
<DashSectionControl>
<FontAwesome name="archive" style={ib} />
{' '}
<Link to={`/team/${teamId}/archive`}>
See Archived Projects
<FontAwesome name="archive" />
</Link>
</DashSectionControl>
{/* TODO: needs minimal, inline dropdown */}
<DashSectionControl>
<b style={ib}>Show by Team Member</b>:
{' '}
<a className={styles.link} href="#" title="Filter by All Team Members">
All Team Members
</a>
{' '}
<FontAwesome name="chevron-circle-down" style={ib} />
</DashSectionControl>
</DashSectionControls>
</DashSectionHeader> |
<<<<<<<
const self = members.find((m) => m.isSelf);
const currentTeamMember = members[localPhaseItem - 1] || {};
const myTeamMemberId = self && self.id;
const isMyMeetingSection = myTeamMemberId === currentTeamMember.id;
=======
const {teamMembers} = team;
>>>>>>>
const self = members.find((m) => m.isSelf);
const currentTeamMember = members[localPhaseItem - 1] || {};
const myTeamMemberId = self && self.id;
const isMyMeetingSection = myTeamMemberId === currentTeamMember.id;
const {teamMembers} = team;
<<<<<<<
avatar={currentAvatar}
checkInQuestion={checkInQuestion}
canEdit={tierSupportsUpdateCheckInQuestion(tier)}
currentName={currentName}
greeting={checkInGreeting}
isFacilitating={isFacilitating}
teamId={teamId}
=======
localPhaseItem={localPhaseItem}
team={team}
>>>>>>>
avatar={currentAvatar}
checkInQuestion={checkInQuestion}
canEdit={tierSupportsUpdateCheckInQuestion(tier)}
currentName={currentName}
greeting={checkInGreeting}
isFacilitating={isFacilitating}
teamId={teamId}
localPhaseItem={localPhaseItem}
team={team}
<<<<<<<
<MeetingFacilitationHint showEllipsis={!nextMember || !isMyMeetingSection}>
{nextMember ?
<span>
{isMyMeetingSection ?
<span>{'Share with your teammates!'}</span> :
<span>{'Waiting for'} <b>{currentMember.preferredName}</b> {'to share with the team'}</span>
}
</span> :
<span>{'Waiting for'} <b>{getFacilitatorName(team, members)}</b> {`to advance to ${actionMeeting.updates.name}`}</span>
=======
<MeetingFacilitationHint>
{nextMemberName ?
<span>{'Waiting for'} <b>{currentMember.preferredName}</b> {'to share with the team'}</span> :
<span>{'Waiting for'}
<b>{facilitatorName}</b> {`to advance to ${actionMeeting.updates.name}`}</span>
>>>>>>>
<MeetingFacilitationHint showEllipsis={!nextMember || !isMyMeetingSection}>
{nextMemberName ?
<span>
{isMyMeetingSection ?
<span>{'Share with your teammates!'}</span> :
<span>{'Waiting for'} <b>{currentMember.preferredName}</b> {'to share with the team'}</span>
}
</span> :
<span>{'Waiting for'} <b>{facilitatorName}</b> {`to advance to ${actionMeeting.updates.name}`}</span> |
<<<<<<<
const {agendaItemCount, actionCount, gotoNext, hideMoveMeetingControls, members, projectCount, team} = props;
const facilitator = members.find(member => member.id === team.activeFacilitator);
=======
const {agendaItemCount, actionCount, gotoNext, isFacilitating, members, projectCount, team} = props;
const facilitator = members.find((member) => member.id === team.activeFacilitator);
>>>>>>>
const {agendaItemCount, actionCount, gotoNext, hideMoveMeetingControls, members, projectCount, team} = props;
const facilitator = members.find((member) => member.id === team.activeFacilitator); |
<<<<<<<
const {editorState, setEditorState, trackEditingClient, editorRef} = this.props;
=======
const {editorState, setEditorState, editorRef} = this.props;
const coords = getDraftCoords(editorRef);
// in this case, coords can be good, then bad as soon as the changer takes focus
// so, the container must handle bad then good as well as good then bad
if (!coords) {
setTimeout(() => {
this.forceUpdate();
});
}
// keys are very important because all modals feed into the same renderModal, which could replace 1 with the other
>>>>>>>
const {editorState, setEditorState, trackEditingClient, editorRef} = this.props;
const coords = getDraftCoords(editorRef);
// in this case, coords can be good, then bad as soon as the changer takes focus
// so, the container must handle bad then good as well as good then bad
if (!coords) {
setTimeout(() => {
this.forceUpdate();
});
}
// keys are very important because all modals feed into the same renderModal, which could replace 1 with the other
<<<<<<<
top={this.top}
left={this.left}
height={this.height}
editorState={editorState}
selectionState={selectionState}
setEditorState={setEditorState}
trackEditingClient={trackEditingClient}
removeModal={this.removeModal}
text={text}
initialValues={{text, link}}
editorRef={editorRef}
=======
>>>>>>>
top={this.top}
left={this.left}
height={this.height}
editorState={editorState}
selectionState={selectionState}
setEditorState={setEditorState}
trackEditingClient={trackEditingClient}
removeModal={this.removeModal}
text={text}
initialValues={{text, link}}
editorRef={editorRef} |
<<<<<<<
onClick={() => handleRemoveItem(item.id)}
teamMember={teamMembers.find(m => m.id === item.teamMemberId)}
=======
onClick={() => handleItemClick(idx)}
teamMember={item.teamMember}
>>>>>>>
onClick={() => handleRemoveItem(item.id)}
teamMember={item.teamMember} |
<<<<<<<
import withStyles from 'universal/styles/withStyles';
import {css} from 'aphrodite';
import Ellipsis from '../Ellipsis/Ellipsis';
import Type from '../Type/Type';
=======
import look, {StyleSheet} from 'react-look';
import theme from 'universal/styles/theme';
import {Ellipsis, Type} from 'universal/components';
>>>>>>>
import withStyles from 'universal/styles/withStyles';
import {css} from 'aphrodite';
import appTheme from 'universal/styles/theme/appTheme';
import {Ellipsis, Type} from 'universal/components';
<<<<<<<
=======
import {cardBorderTop} from 'universal/styles/helpers';
>>>>>>>
import {cardBorderTop} from 'universal/styles/helpers';
<<<<<<<
const {styles, username} = props;
=======
const {styles} = NullCard;
const {username} = props;
>>>>>>>
const {styles} = NullCard;
const {styles, username} = props;
<<<<<<<
<div className={css(styles.root)}>
<Type align="center" bold scale="s3" colorPalette="mid">
=======
<div className={styles.root}>
<Type align="center" bold scale="s3" theme="mid">
>>>>>>>
<div className={css(styles.root)}>
<Type align="center" bold scale="s3" colorPalette="mid">
<<<<<<<
const styleThunk = () => ({
=======
NullCard.defaultProps = {
username: 'TayaMueller',
};
NullCard.styles = StyleSheet.create({
>>>>>>>
const styleThunk = () => ({ |
<<<<<<<
import updateCheckInQuestion from 'server/graphql/mutations/updateTeamCheckInQuestion';
=======
import updateProject from 'server/graphql/mutations/updateProject';
>>>>>>>
import updateCheckInQuestion from 'server/graphql/mutations/updateTeamCheckInQuestion';
import updateProject from 'server/graphql/mutations/updateProject';
<<<<<<<
updateCheckInQuestion,
=======
updateProject,
>>>>>>>
updateCheckInQuestion,
updateProject, |
<<<<<<<
sendSegmentEvent('Retro Meeting Completed', nonFacilitators, traits)
=======
sendSegmentIdentify(presentMemberUserIds)
>>>>>>>
sendSegmentEvent('Retro Meeting Completed', nonFacilitators, traits)
sendSegmentIdentify(presentMemberUserIds) |
<<<<<<<
minWidth,
=======
onClose,
onOpen,
>>>>>>>
minWidth,
onClose,
onOpen, |
<<<<<<<
import {updateDragLocationTeamUpdater} from 'universal/mutations/UpdateDragLocationMutation'
import {dragReflectionTeamUpdater} from 'universal/mutations/DragReflectionMutation'
=======
import {dragDiscussionTopicTeamUpdater} from 'universal/mutations/DragDiscussionTopicMutation'
>>>>>>>
import {updateDragLocationTeamUpdater} from 'universal/mutations/UpdateDragLocationMutation'
import {dragReflectionTeamUpdater} from 'universal/mutations/DragReflectionMutation'
import {dragDiscussionTopicTeamUpdater} from 'universal/mutations/DragDiscussionTopicMutation' |
<<<<<<<
<ProviderList viewer={viewer} jwt={jwt} teamMemberId={teamMemberId}/>
<div>
Notifications
</div>
=======
<ProviderList providerMap={providerMap} jwt={jwt} teamMemberId={teamMemberId}/>
>>>>>>>
<ProviderList viewer={viewer} jwt={jwt} teamMemberId={teamMemberId}/> |
<<<<<<<
=======
const gotoNextItem = () => {
const updatedAgendaItem = {
id: agendaItem.id,
isComplete: true
};
cashay.mutate('updateAgendaItem', {variables: {updatedAgendaItem}});
phaseItemFactory(localPhaseItem + 1)();
};
const gotoPrevItem = phaseItemFactory(localPhaseItem - 1);
bindHotkey(['enter', 'right'], gotoNextItem);
bindHotkey('left', gotoPrevItem);
const hasFirstSpacer = true;
>>>>>>>
const hasFirstSpacer = true;
<<<<<<<
<div className={css(styles.linkSpacer)}>
<IconLink
colorPalette="cool"
icon="arrow-circle-right"
iconPlacement="right"
label="Next Agenda Item"
onClick={gotoNext}
scale="small"
/>
</div>
=======
<MeetingAgendaCardsContainer
agendaId={agendaItem.id}
myTeamMemberId={self && self.id}
/>
>>>>>>>
<MeetingAgendaCardsContainer
agendaId={agendaItem.id}
myTeamMemberId={self && self.id}
/> |
<<<<<<<
import NotifyFacilitatorDisconnected from 'server/graphql/types/NotifyFacilitatorDisconnected';
=======
import NotifyProjectInvolves from 'server/graphql/types/NotifyProjectInvolves';
>>>>>>>
import NotifyProjectInvolves from 'server/graphql/types/NotifyProjectInvolves';
import NotifyFacilitatorDisconnected from 'server/graphql/types/NotifyFacilitatorDisconnected'; |
<<<<<<<
const CreateProjectMutation = (environment, newProject, onError, onCompleted) => {
const {viewerId} = environment;
=======
const CreateProjectMutation = (environment, newProject, area, onError, onCompleted) => {
// const {viewerId} = environment;
>>>>>>>
const CreateProjectMutation = (environment, newProject, area, onError, onCompleted) => {
const {viewerId} = environment;
<<<<<<<
variables: {newProject},
updater: (store) => {
const project = store.getRootField('createProject').getLinkedRecord('project');
handleProjectConnections(store, viewerId, project);
},
optimisticUpdater: (store) => {
const now = new Date().toJSON();
const [userId, teamId] = newProject.teamMemberId.split('::');
const globalTeamMemberId = toGlobalId('TeamMember', newProject.teamMemberId);
// const globalTeamId = toGlobalId('Team', teamId);
const teamMember = store.get(globalTeamMemberId);
const team = store.get(teamId);
// TODO remove this when we move Teams to relay
if (!team) {
throw new Error('team not found', teamId);
}
const optimisticProject = {
...newProject,
teamId,
userId,
createdAt: now,
createdBy: userId,
updatedAt: now,
tags: [],
content: newProject.content || makeEmptyStr()
};
const project = createProxyRecord(store, 'Project', optimisticProject);
project
.setLinkedRecord(teamMember, 'teamMember')
.setLinkedRecord(team, 'team');
handleProjectConnections(store, viewerId, project);
},
=======
variables: {area, newProject},
// updater: (store) => {
// },
// optimisticUpdater: (store) => {
// TODO add the team to the sidebar when we move teams to relay
// },
>>>>>>>
variables: {area, newProject},
updater: (store) => {
const project = store.getRootField('createProject').getLinkedRecord('project');
handleProjectConnections(store, viewerId, project);
},
optimisticUpdater: (store) => {
const now = new Date().toJSON();
const [userId, teamId] = newProject.teamMemberId.split('::');
const globalTeamMemberId = toGlobalId('TeamMember', newProject.teamMemberId);
// const globalTeamId = toGlobalId('Team', teamId);
const teamMember = store.get(globalTeamMemberId);
const team = store.get(teamId);
// TODO remove this when we move Teams to relay
if (!team) {
throw new Error('team not found', teamId);
}
const optimisticProject = {
...newProject,
teamId,
userId,
createdAt: now,
createdBy: userId,
updatedAt: now,
tags: [],
content: newProject.content || makeEmptyStr()
};
const project = createProxyRecord(store, 'Project', optimisticProject);
project
.setLinkedRecord(teamMember, 'teamMember')
.setLinkedRecord(team, 'team');
handleProjectConnections(store, viewerId, project);
}, |
<<<<<<<
=======
var options
, defaults;
function setOptions(opt) {
if (!opt) opt = defaults;
if (options === opt) return;
options = opt;
if (options.gfm) {
block.fences = block.gfm.fences;
block.paragraph = block.gfm.paragraph;
block.table = block.gfm.table;
block.nptable = block.gfm.nptable;
inline.text = inline.gfm.text;
inline.url = inline.gfm.url;
} else {
block.fences = block.normal.fences;
block.paragraph = block.normal.paragraph;
block.table = block.normal.table;
block.nptable = block.normal.nptable;
inline.text = inline.normal.text;
inline.url = inline.normal.url;
}
if (options.pedantic) {
inline.em = inline.pedantic.em;
inline.strong = inline.pedantic.strong;
} else {
inline.em = inline.normal.em;
inline.strong = inline.normal.strong;
}
}
>>>>>>> |
<<<<<<<
=======
onClick={openUrl(PRICING_LINK)}
size="smallest"
>>>>>>>
onClick={openUrl(PRICING_LINK)} |
<<<<<<<
=======
atmosphere,
connectDropTarget,
dragState,
>>>>>>>
atmosphere,
<<<<<<<
styles,
userId,
queryKey
=======
styles
>>>>>>>
styles
<<<<<<<
<ScrollZone className={css(styles.columnInner)}>
{projects.map((project) => (
<ProjectCardContainer
=======
<div className={css(styles.columnInner)}>
{projects.map((project) =>
(<DraggableProject
>>>>>>>
<ScrollZone className={css(styles.columnInner)}>
{projects.map((project) => (
<DraggableProject
<<<<<<<
myUserId={userId}
insert={(draggedProject, before) => this.insertProject(draggedProject, project, before)}
/>
))}
<ProjectColumnTrailingSpace
area={area}
lastProject={projects[projects.length - 1]}
status={status}
queryKey={queryKey}
/>
</ScrollZone>
=======
dragState={dragState}
myUserId={atmosphere.userId}
ref={(c) => {
if (c) {
dragState.components.push(c);
}
}}
/>))
}
</div>
>>>>>>>
myUserId={atmosphere.userId}
insert={(draggedProject, before) => this.insertProject(draggedProject, project, before)}
/>
))}
<ProjectColumnTrailingSpace
area={area}
lastProject={projects[projects.length - 1]}
status={status}
/>
</ScrollZone>
<<<<<<<
=======
ProjectColumn.propTypes = {
area: PropTypes.string,
atmosphere: PropTypes.object.isRequired,
connectDropTarget: PropTypes.func,
dispatch: PropTypes.func.isRequired,
dragState: PropTypes.object,
firstColumn: PropTypes.bool,
history: PropTypes.object.isRequired,
isMyMeetingSection: PropTypes.bool,
lastColumn: PropTypes.bool,
myTeamMemberId: PropTypes.string,
projects: PropTypes.array.isRequired,
status: PropTypes.string,
styles: PropTypes.object,
teamMemberFilterId: PropTypes.string,
teams: PropTypes.array
};
>>>>>>> |
<<<<<<<
app.get('/email', emailSSR);
// stripe webhooks
app.post(`/stripe`, stripeWebhookHandler);
app.post('/stripe/live', (req, res) => {
});
=======
if (!PROD) {
app.get('/email', emailSSR);
}
>>>>>>>
if (!PROD) {
app.get('/email', emailSSR);
}
// stripe webhooks
app.post(`/stripe`, stripeWebhookHandler); |
<<<<<<<
=======
import checkInCardBaseStyles from '../CheckInCard/checkInCardBaseStyles';
import {CHECKIN} from 'universal/utils/constants';
import makePushURL from 'universal/modules/meeting/helpers/makePushURL';
>>>>>>>
import checkInCardBaseStyles from '../CheckInCard/checkInCardBaseStyles'; |
<<<<<<<
import React, {Component, PropTypes} from 'react';
import UserSettingsWrapper from 'universal/modules/userDashboard/components/UserSettingsWrapper/UserSettingsWrapper';
import {NOTIFICATIONS} from 'universal/modules/../utils/constants';
import withStyles from 'universal/styles/withStyles';
=======
import React, {PropTypes} from 'react';
import UserSettingsWrapper from '../../../userDashboard/components/UserSettingsWrapper/UserSettingsWrapper';
import {NOTIFICATIONS} from '../../../../utils/constants';
import withStyles from '../../../../styles/withStyles';
>>>>>>>
import React, {Component, PropTypes} from 'react';
import UserSettingsWrapper from 'universal/modules/userDashboard/components/UserSettingsWrapper/UserSettingsWrapper';
import {NOTIFICATIONS} from 'universal/modules/../utils/constants';
import withStyles from 'universal/styles/withStyles';
<<<<<<<
import ui from 'universal/styles/ui';
import appTheme from 'universal/modules/../styles/theme/appTheme';
import FontAwesome from 'react-fontawesome';
import OrganizationRow from 'universal/modules/userDashboard/components/OrganizationRow/OrganizationRow';
=======
>>>>>>>
<<<<<<<
import cardSection from 'universal/modules/../styles/helpers/cardSection';
import NotificationRow from 'universal/modules/userDashboard/components/NotificationRow/NotificationRow';
=======
import Panel from 'universal/components/Panel/Panel';
import NotificationRow from '../../../userDashboard/components/NotificationRow/NotificationRow';
>>>>>>>
import NotificationRow from 'universal/modules/userDashboard/components/NotificationRow/NotificationRow';
import Panel from 'universal/components/Panel/Panel'; |
<<<<<<<
if (ttl !== undefined && ttl <= MAX_TIMEOUT) {
=======
environment.querySubscriptions.forEach((querySub) => {
if (querySub.queryKey === this._queryKey) {
querySub.handleKickout = this.unsubscribe;
}
});
// if the client is unlikely to return after X, the subscription has a TTL of X
// when that time has be reached, then we unsub
if (ttl !== undefined && ttl <= MAX_INT) {
>>>>>>>
if (ttl !== undefined && ttl <= MAX_INT) { |
<<<<<<<
import HorizontalLinearStepper from '../LoremMaterial/Stepper.jsx';
=======
import MaterialContactList from '../LoremMaterial/MaterialContactList.jsx';
>>>>>>>
import HorizontalLinearStepper from '../LoremMaterial/Stepper.jsx';
import MaterialContactList from '../LoremMaterial/MaterialContactList.jsx';
<<<<<<<
))
.add('Airline booking', () => (
<MaterialAirlineBooking />
))
.add('Stepper', () => (
<HorizontalLinearStepper />
=======
>>>>>>>
))
.add('Airline booking', () => (
<MaterialAirlineBooking />
))
.add('Stepper', () => (
<HorizontalLinearStepper /> |
<<<<<<<
before(() => {
ajvs = [new Ajv(), new Ajv({allErrors: true}), new Ajv({inlineRefs: false})]
=======
before(function () {
ajvs = [
new Ajv(),
new Ajv({allErrors: true}),
new Ajv({inlineRefs: false}),
new Ajv({strictKeywords: true}),
]
>>>>>>>
before(() => {
ajvs = [
new Ajv(),
new Ajv({allErrors: true}),
new Ajv({inlineRefs: false}),
new Ajv({strictKeywords: true}),
] |
<<<<<<<
out += ' if (! ' + ('rootRefVal[0]') + '(' + ($data) + ', (dataPath || \'\') + ' + (it.errorPath) + ') ) { if (vErrors === null) vErrors = ' + ('rootRefVal[0]') + '.errors; else vErrors = vErrors.concat(' + ('rootRefVal[0]') + '.errors); errors = vErrors.length; } ';
=======
out += ' if (! ' + ('root.refVal[0]') + '(' + ($data) + ', (dataPath || \'\') + ' + (it.errorPath) + ') ) { if (validate.errors === null) validate.errors = ' + ('root.refVal[0]') + '.errors; else validate.errors = validate.errors.concat(' + ('root.refVal[0]') + '.errors); errors = validate.errors.length; } ';
>>>>>>>
out += ' if (! ' + ('root.refVal[0]') + '(' + ($data) + ', (dataPath || \'\') + ' + (it.errorPath) + ') ) { if (vErrors === null) vErrors = ' + ('root.refVal[0]') + '.errors; else vErrors = vErrors.concat(' + ('root.refVal[0]') + '.errors); errors = vErrors.length; } '; |
<<<<<<<
it("should coerce scalar values", () => {
testRules(coercionRules, (
test,
schema,
canCoerce /*, toType, fromType*/
) => {
instances.forEach((_ajv) => {
=======
it("should coerce scalar values", function () {
testRules(coercionRules, function (test, schema, canCoerce /*, toType, fromType*/) {
instances.forEach(function (_ajv) {
>>>>>>>
it("should coerce scalar values", () => {
testRules(coercionRules, (test, schema, canCoerce /*, toType, fromType*/) => {
instances.forEach((_ajv) => { |
<<<<<<<
import Dashboard from '../dashboard';
import LoadProject from '../loadProject';
=======
import * as embedUtils from '../../utils/embed';
>>>>>>>
import Dashboard from '../dashboard';
import LoadProject from '../loadProject';
import * as embedUtils from '../../utils/embed'; |
<<<<<<<
IconFork,
IconShare
=======
IconFork,
IconAlphabetA
>>>>>>>
IconFork,
IconShare,
IconAlphabetA
<<<<<<<
const { showUploadDialog, showUploadButton, showForkButton, showShareButton } = this.state.ipfsActions;
=======
const { showUploadDialog, showUploadButton, showForkButton } = this.state.ipfsActions;
const { showSelectedProjectName, showOpenInLab } = this.props.view;
>>>>>>>
const { showUploadDialog, showUploadButton, showForkButton, showShareButton } = this.state.ipfsActions;
const { showSelectedProjectName, showOpenInLab } = this.props.view;
<<<<<<<
<OnlyIf test={showShareButton}>
<DropdownContainer
className={style.actionShare}
dropdownContent={<ShareDialog />}
enableClickInside={true}
>
<ShareDropdownAction />
</DropdownContainer>
</OnlyIf>
<DropdownContainer
className={style.projectButton}
dropdownContent={
<ProjectDialog
functions={this.props.functions}
router={this.props.router}
onProjectSelected={this.props.onProjectSelected}
/>
}
>
<ProjectSelector title={selectedProjectName} />
</DropdownContainer>
=======
<OnlyIf test={showSelectedProjectName}>
<DropdownContainer
className={classNames([style.projectButton, !selectedProjectName ? style.projectButtonCenter : null])}
dropdownContent={
<ProjectDialog
functions={this.props.functions}
router={this.props.router}
onProjectSelected={this.props.onProjectSelected}
/>
}
>
<ProjectSelector title={selectedProjectName} />
</DropdownContainer>
</OnlyIf>
>>>>>>>
<OnlyIf test={showShareButton}>
<DropdownContainer
className={style.actionShare}
dropdownContent={<ShareDialog />}
enableClickInside={true}
>
<ShareDropdownAction />
</DropdownContainer>
</OnlyIf>
<OnlyIf test={showSelectedProjectName}>
<DropdownContainer
className={classNames([style.projectButton, !selectedProjectName ? style.projectButtonCenter : null])}
dropdownContent={
<ProjectDialog
functions={this.props.functions}
router={this.props.router}
onProjectSelected={this.props.onProjectSelected}
/>
}
>
<ProjectSelector title={selectedProjectName} />
</DropdownContainer>
</OnlyIf> |
<<<<<<<
let changed = false;
if (isFunction(this.schema.set)) {
this.schema.set(this.model, newValue);
changed = true;
} else if (this.schema.model) {
this.setModelValueByPath(this.schema.model, newValue);
changed = true;
}
if (changed) {
this.$emit("model-updated", newValue, this.schema.model);
if (isFunction(this.schema.onChanged)) {
this.schema.onChanged.call(this, this.model, newValue, oldValue, this.schema);
}
if (this.$parent.options && this.$parent.options.validateAfterChanged === true) {
if (this.$parent.options.validateDebounceTime > 0) {
this.debouncedValidate();
} else {
this.validate();
}
}
=======
if(isFunction(newValue)) {
newValue(newValue, oldValue);
} else {
this.updateModelValue(newValue, oldValue);
>>>>>>>
if (isFunction(newValue)) {
newValue(newValue, oldValue);
} else {
this.updateModelValue(newValue, oldValue);
<<<<<<<
if (this.schema.validator && this.schema.readonly !== true && this.disabled !== true) {
=======
let results = [];
if (this.schema.validator && this.schema.readonly !== true && this.disabled !== true) {
>>>>>>>
let results = [];
if (this.schema.validator && this.schema.readonly !== true && this.disabled !== true) {
<<<<<<<
each(this.schema.validator, validator => {
=======
forEach(this.schema.validator, (validator) => {
>>>>>>>
forEach(this.schema.validator, validator => {
<<<<<<<
each(validators, validator => {
let addErrors = err => {
if (isArray(err)) Array.prototype.push.apply(this.errors, err);
else if (isString(err)) this.errors.push(err);
};
let res = validator(this.value, this.schema, this.model);
if (res && isFunction(res.then)) {
// It is a Promise, async validator
res.then(err => {
if (err) {
addErrors(err);
let isValid = this.errors.length === 0;
=======
forEach(validators, (validator) => {
if(validateAsync) {
results.push(validator(this.value, this.schema, this.model));
} else {
let result = validator(this.value, this.schema, this.model);
if(result && isFunction(result.then)) {
result.then((err) => {
if(err) {
this.errors = this.errors.concat(err);
}
let isValid = this.errors.length == 0;
>>>>>>>
forEach(validators, validator => {
if (validateAsync) {
results.push(validator(this.value, this.schema, this.model));
} else {
let result = validator(this.value, this.schema, this.model);
if (result && isFunction(result.then)) {
result.then(err => {
if (err) {
this.errors = this.errors.concat(err);
}
let isValid = this.errors.length === 0;
<<<<<<<
}
});
} else {
if (res) addErrors(res);
=======
});
} else if(result) {
results = results.concat(result);
}
>>>>>>>
});
} else if (result) {
results = results.concat(result);
}
<<<<<<<
let isValid = this.errors.length === 0;
if (!calledParent) this.$emit("validated", isValid, this.errors, this);
=======
let isValid = fieldErrors.length == 0;
if (!calledParent) {
this.$emit("validated", isValid, fieldErrors, this);
}
this.errors = fieldErrors;
return fieldErrors;
};
if(!validateAsync) {
return handleErrors(results);
}
>>>>>>>
let isValid = fieldErrors.length === 0;
if (!calledParent) {
this.$emit("validated", isValid, fieldErrors, this);
}
this.errors = fieldErrors;
return fieldErrors;
};
if (!validateAsync) {
return handleErrors(results);
} |
<<<<<<<
},
getFieldClasses() {
return this.schema.fieldClasses || [];
}
=======
},
>>>>>>>
},
getFieldClasses() {
return this.schema.fieldClasses || [];
}, |
<<<<<<<
//= require projects.js.coffee
=======
//= require estimates.js.coffee
>>>>>>>
//= require projects.js.coffee
//= require estimates.js.coffee
<<<<<<<
if (document.location.pathname.search(/\/invoices\//) != -1 || document.location.pathname.search(/\/recurring_profiles\//) != -1 || document.location.pathname.search(/\/projects\//) != -1) {
=======
if (document.location.pathname.search(/\/invoices\//) != -1 || document.location.pathname.search(/\/recurring_profiles\//) != -1 || document.location.pathname.search(/\/estimates\//) != -1) {
>>>>>>>
if (document.location.pathname.search(/\/invoices\//) != -1 || document.location.pathname.search(/\/recurring_profiles\//) != -1 || document.location.pathname.search(/\/projects\//) != -1 || document.location.pathname.search(/\/estimates\//) != -1) { |
<<<<<<<
//= require tasks.js.coffee
=======
//= require staffs.js.coffee
>>>>>>>
//= require tasks.js.coffee
//= require staffs.js.coffee |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.