conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
Router.go('post_page', {_id: comment.postId});
throwError("Your comment has been deleted.");
=======
Router.go("/posts/"+comment.postId);
flashMessage("Your comment has been deleted.", "success");
// Router.go("/comments/deleted");
>>>>>>>
Router.go('post_page', {_id: comment.postId});
flashMessage("Your comment has been deleted.", "success"); |
<<<<<<<
import { createTestClient } from 'apollo-server-testing';
=======
// import { createTestClient } from 'apollo-server-testing'
import { WebApp } from 'meteor/webapp';
import request from 'supertest';
>>>>>>>
import { createTestClient } from 'apollo-server-testing';
// import { createTestClient } from 'apollo-server-testing'
import { WebApp } from 'meteor/webapp';
import request from 'supertest'; |
<<<<<<<
showViewsNav: false,
=======
getTitle: function() {
return i18n.t("Search") + ' - ' + getSetting('title', "Telescope");
},
getDescription: function() {
return getSetting('description');
},
>>>>>>>
showViewsNav: false,
getTitle: function() {
return i18n.t("Search") + ' - ' + getSetting('title', "Telescope");
},
getDescription: function() {
return getSetting('description');
}, |
<<<<<<<
test('onClick prop should be called', () => {
const onClickMock = jest.fn();
const ButtonShallowInstance = shallow(<Button onClick={onClickMock} />);
ButtonShallowInstance.instance().clickHandler();
expect(onClickMock).toHaveBeenCalledTimes(1);
});
=======
test('should call ReactGA when in prod environment', () => {
/* eslint-disable no-console */
ReactGA.initialize('foo', { testMode: true });
process.env.NODE_ENV = 'production';
const ButtonShallowInstance = shallow(<Button>Testing</Button>);
ButtonShallowInstance.instance().clickHandler();
expect(ReactGA.testModeAPI.calls).toContainEqual([
'send',
{
eventAction: 'Button Selected',
eventCategory: 'Interactions',
hitType: 'event',
},
]);
});
>>>>>>>
test('onClick prop should be called', () => {
const onClickMock = jest.fn();
const ButtonShallowInstance = shallow(<Button onClick={onClickMock} />);
ButtonShallowInstance.instance().clickHandler();
expect(onClickMock).toHaveBeenCalledTimes(1);
});
test('should call ReactGA when in prod environment', () => {
/* eslint-disable no-console */
ReactGA.initialize('foo', { testMode: true });
process.env.NODE_ENV = 'production';
const ButtonShallowInstance = shallow(<Button>Testing</Button>);
ButtonShallowInstance.instance().clickHandler();
expect(ReactGA.testModeAPI.calls).toContainEqual([
'send',
{
eventAction: 'Button Selected',
eventCategory: 'Interactions',
hitType: 'event',
},
]);
}); |
<<<<<<<
// if the email is already in the Mailchimp list, no need to throw an error
if (error.code === 214) {
return {result: 'already-subscribed'};
=======
console.log(error)
let name, message;
if (error.code == 212) {
name = 'has_unsubscribed';
} else if (error.code == 214) {
name = 'already_subscribed';
} else {
name = 'subscription_failed';
message = error.message;
>>>>>>>
console.log(error)
let name, message;
if (error.code == 214) {
name = 'has_unsubscribed';
} else if (error.code == 214) {
name = 'already_subscribed';
} else {
name = 'subscription_failed';
message = error.message; |
<<<<<<<
AccountController = RouteController.extend({
=======
UserEditController = FastRender.RouteController.extend({
>>>>>>>
UserEditController = RouteController.extend({
<<<<<<<
return {
user : Meteor.user(),
invites: Invites.find({invitingUserId:Meteor.userId()})
};
},
fastRender: true
=======
var user = Meteor.users.findOne({slug: this.params.slug});
var data = {
user: user
}
if (user) {
data.invites = Invites.find({invitingUserId: user._id});
}
return data;
}
>>>>>>>
var user = Meteor.users.findOne({slug: this.params.slug});
var data = {
user: user
}
if (user) {
data.invites = Invites.find({invitingUserId: user._id});
}
return data;
},
fastRender: true |
<<<<<<<
=======
export type StaticStyles = {[key: string]: {}}
>>>>>>>
<<<<<<<
export type HOCProps<Theme, Props> = Props & {
theme?: Theme,
=======
export type HOCProps<Theme, Props> = Props & {|
theme: Theme,
>>>>>>>
export type HOCProps<Theme, Props> = Props & {
theme: Theme, |
<<<<<<<
export const primary = "#3ed6f0";
export const secondary = "#252e3e";
export const gray = "#e2e2e2";
export const white = "#f7f7f7";
=======
export const primary = "#249cbc";
export const primaryLight = "#4ac2e2";
export const primaryDark = "#007696";
export const secondary = "#d1665a";
export const secondaryLight = "#f78c80";
export const secondaryDark = "#ab4034";
export const mist = "#f0f2f2";
export const slate = "#47566b";
export const slateLight = "#6d7c91";
export const slateDark = "#213045";
export const gray = "#9baab5";
export const grayLight = "#d0d5da";
export const grayDark = "#75848f";
export const navy = "#252e3e";
export const primaryFontFamily = "\"PF Din Display\"";
export const secondaryFontFamily = "\"Noto Serif\"";
>>>>>>>
export const primary = "#3ed6f0";
export const secondary = "#252e3e";
export const gray = "#e2e2e2";
export const white = "#f7f7f7";
export const primaryFontFamily = "\"PF Din Display\"";
export const secondaryFontFamily = "\"Noto Serif\""; |
<<<<<<<
* Constructs an error with a pointer to an URL with more information.
* @param {String} id the error ID that maps to an ID on a web page.
* @param {String} message human readable error.
* @param {Error} [err] the original error, if there is one.
*
* @returns {Error}
*/
function makeError(id, msg, err) {
var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id);
if (err) {
e.originalError = err;
}
return e;
}
/**
=======
* Constructs an error with a pointer to an URL with more information.
* @param {String} id the error ID that maps to an ID on a web page.
* @param {String} message human readable error.
* @returns {Error}
*/
function makeError(id, msg) {
return new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id);
}
/**
>>>>>>>
* Constructs an error with a pointer to an URL with more information.
* @param {String} id the error ID that maps to an ID on a web page.
* @param {String} message human readable error.
* @param {Error} [err] the original error, if there is one.
*
* @returns {Error}
*/
function makeError(id, msg, err) {
var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id);
if (err) {
e.originalError = err;
}
return e;
}
/**
<<<<<<<
/**
* jQuery 1.4.3-1.5.x use a readyWait/ready() pairing to hold DOM
* ready callbacks, but jQuery 1.6 supports a holdReady() API instead.
* At some point remove the readyWait/ready() support and just stick
* with using holdReady.
*/
function jQueryHoldReady($, shouldHold) {
if ($.holdReady) {
$.holdReady(shouldHold);
} else if (shouldHold) {
$.readyWait += 1;
} else {
$.ready(true);
}
}
if (typeof define !== "undefined") {
//If a define is already in play via another AMD loader,
//do not overwrite.
return;
}
if (typeof requirejs !== "undefined") {
if (isFunction(requirejs)) {
//Do not overwrite and existing requirejs instance.
=======
/**
* jQuery 1.4.3-1.5.x use a readyWait/ready() pairing to hold DOM
* ready callbacks, but jQuery 1.6 supports a holdReady() API instead.
* At some point remove the readyWait/ready() support and just stick
* with using holdReady.
*/
function jQueryHoldReady($, shouldHold) {
if ($.holdReady) {
$.holdReady(shouldHold);
} else if (shouldHold) {
$.readyWait += 1;
} else {
$.ready(true);
}
}
//Check for an existing version of require. If so, then exit out. Only allow
//one version of require to be active in a page. However, allow for a require
//config object, just exit quickly if require is an actual function.
if (typeof require !== "undefined") {
if (isFunction(require)) {
>>>>>>>
/**
* jQuery 1.4.3-1.5.x use a readyWait/ready() pairing to hold DOM
* ready callbacks, but jQuery 1.6 supports a holdReady() API instead.
* At some point remove the readyWait/ready() support and just stick
* with using holdReady.
*/
function jQueryHoldReady($, shouldHold) {
if ($.holdReady) {
$.holdReady(shouldHold);
} else if (shouldHold) {
$.readyWait += 1;
} else {
$.ready(true);
}
}
if (typeof define !== "undefined") {
//If a define is already in play via another AMD loader,
//do not overwrite.
return;
}
if (typeof requirejs !== "undefined") {
if (isFunction(requirejs)) {
//Do not overwrite and existing requirejs instance.
<<<<<<<
//Normalize module name if have a base relative module name to work from.
moduleName = normalize(moduleName, relModuleMap && relModuleMap.fullName);
//If a colon is in the URL, it indicates a protocol is used and it is just
//an URL to a file, or if it starts with a slash or ends with .js, it is just a plain file.
//The slash is important for protocol-less URLs as well as full paths.
if (req.jsExtRegExp.test(moduleName)) {
//Just a plain path, not module name lookup, so just return it.
//Add extension if it is included. This is a bit wonky, only non-.js things pass
//an extension, this method probably needs to be reworked.
url = moduleName + (ext ? ext : "");
} else {
//A module that needs to be converted to a path.
paths = config.paths;
pkgs = config.pkgs;
syms = moduleName.split("/");
//For each module name segment, see if there is a path
//registered for it. Start with most specific name
//and work up from it.
for (i = syms.length; i > 0; i--) {
parentModule = syms.slice(0, i).join("/");
if (paths[parentModule]) {
syms.splice(0, i, paths[parentModule]);
break;
} else if ((pkg = pkgs[parentModule])) {
//If module name is just the package name, then looking
//for the main module.
if (moduleName === pkg.name) {
pkgPath = pkg.location + '/' + pkg.main;
} else {
pkgPath = pkg.location;
=======
//Normalize module name if have a base relative module name to work from.
moduleName = normalize(moduleName, relModuleMap && relModuleMap.fullName);
//If a colon is in the URL, it indicates a protocol is used and it is just
//an URL to a file, or if it starts with a slash or ends with .js, it is just a plain file.
//The slash is important for protocol-less URLs as well as full paths.
if (req.jsExtRegExp.test(moduleName)) {
//Just a plain path, not module name lookup, so just return it.
//Add extension if it is included. This is a bit wonky, only non-.js things pass
//an extension, this method probably needs to be reworked.
url = moduleName + (ext ? ext : "");
} else {
//A module that needs to be converted to a path.
paths = config.paths;
pkgs = config.pkgs;
syms = moduleName.split("/");
//For each module name segment, see if there is a path
//registered for it. Start with most specific name
//and work up from it.
for (i = syms.length; i > 0; i--) {
parentModule = syms.slice(0, i).join("/");
if (paths[parentModule]) {
syms.splice(0, i, paths[parentModule]);
break;
} else if ((pkg = pkgs[parentModule])) {
//If module name is just the package name, then looking
//for the main module.
if (moduleName === pkg.name) {
pkgPath = pkg.location + '/' + pkg.main;
} else {
pkgPath = pkg.location;
}
syms.splice(0, i, pkgPath);
break;
>>>>>>>
//Normalize module name if have a base relative module name to work from.
moduleName = normalize(moduleName, relModuleMap && relModuleMap.fullName);
//If a colon is in the URL, it indicates a protocol is used and it is just
//an URL to a file, or if it starts with a slash or ends with .js, it is just a plain file.
//The slash is important for protocol-less URLs as well as full paths.
if (req.jsExtRegExp.test(moduleName)) {
//Just a plain path, not module name lookup, so just return it.
//Add extension if it is included. This is a bit wonky, only non-.js things pass
//an extension, this method probably needs to be reworked.
url = moduleName + (ext ? ext : "");
} else {
//A module that needs to be converted to a path.
paths = config.paths;
pkgs = config.pkgs;
syms = moduleName.split("/");
//For each module name segment, see if there is a path
//registered for it. Start with most specific name
//and work up from it.
for (i = syms.length; i > 0; i--) {
parentModule = syms.slice(0, i).join("/");
if (paths[parentModule]) {
syms.splice(0, i, paths[parentModule]);
break;
} else if ((pkg = pkgs[parentModule])) {
//If module name is just the package name, then looking
//for the main module.
if (moduleName === pkg.name) {
pkgPath = pkg.location + '/' + pkg.main;
} else {
pkgPath = pkg.location;
<<<<<<<
//Join the path parts together, then figure out if baseUrl is needed.
url = syms.join("/") + (ext || ".js");
url = (url.charAt(0) === '/' || url.match(/^\w+:/) ? "" : config.baseUrl) + url;
}
=======
>>>>>>>
//Join the path parts together, then figure out if baseUrl is needed.
url = syms.join("/") + (ext || ".js");
url = (url.charAt(0) === '/' || url.match(/^\w+:/) ? "" : config.baseUrl) + url;
}
<<<<<<<
/**
* Support require.config() to make it easier to cooperate with other
* AMD loaders on globally agreed names.
*/
req.config = function (config) {
return req(config);
};
/**
* Export require as a global, but only if it does not already exist.
*/
if (typeof require === "undefined") {
require = req;
}
/**
* Global require.toUrl(), to match global require, mostly useful
* for debugging/work in the global space.
*/
req.toUrl = function (moduleNamePlusExt) {
return contexts[defContextName].toUrl(moduleNamePlusExt);
};
=======
/**
* Global require.toUrl(), to match global require, mostly useful
* for debugging/work in the global space.
*/
req.toUrl = function (moduleNamePlusExt) {
return contexts[defContextName].toUrl(moduleNamePlusExt);
};
>>>>>>>
/**
* Support require.config() to make it easier to cooperate with other
* AMD loaders on globally agreed names.
*/
req.config = function (config) {
return req(config);
};
/**
* Export require as a global, but only if it does not already exist.
*/
if (typeof require === "undefined") {
require = req;
}
/**
* Global require.toUrl(), to match global require, mostly useful
* for debugging/work in the global space.
*/
req.toUrl = function (moduleNamePlusExt) {
return contexts[defContextName].toUrl(moduleNamePlusExt);
};
<<<<<<<
var loaded = context.loaded;
=======
var contextName = context.contextName,
loaded = context.loaded;
>>>>>>>
var loaded = context.loaded;
<<<<<<<
context.scriptCount += 1;
req.attach(url, context, moduleName);
//If tracking a jQuery, then make sure its ready callbacks
//are put on hold to prevent its ready callbacks from
//triggering too soon.
if (context.jQuery && !context.jQueryIncremented) {
jQueryHoldReady(context.jQuery, true);
context.jQueryIncremented = true;
=======
context.scriptCount += 1;
req.attach(url, contextName, moduleName);
//If tracking a jQuery, then make sure its ready callbacks
//are put on hold to prevent its ready callbacks from
//triggering too soon.
if (context.jQuery && !context.jQueryIncremented) {
jQueryHoldReady(context.jQuery, true);
context.jQueryIncremented = true;
>>>>>>>
context.scriptCount += 1;
req.attach(url, context, moduleName);
//If tracking a jQuery, then make sure its ready callbacks
//are put on hold to prevent its ready callbacks from
//triggering too soon.
if (context.jQuery && !context.jQueryIncremented) {
jQueryHoldReady(context.jQuery, true);
context.jQueryIncremented = true;
<<<<<<<
if (node) {
if (!name) {
name = node.getAttribute("data-requiremodule");
}
context = contexts[node.getAttribute("data-requirecontext")];
=======
if (!node) {
return req.onError(makeError("interactive", "No matching script interactive for " + callback));
}
if (!name) {
name = node.getAttribute("data-requiremodule");
>>>>>>>
if (node) {
if (!name) {
name = node.getAttribute("data-requiremodule");
}
context = contexts[node.getAttribute("data-requirecontext")]; |
<<<<<<<
controllers.constant('internalPages', [
{ name: 'Chrome Apps', location: 'chrome://apps/' },
{ name: 'Extensions', location: 'chrome://extensions/' },
{ name: 'History', location: 'chrome://history/' },
{ name: 'Downloads', location: 'chrome://downloads/' },
{ name: 'Bookmarks', location: 'chrome://bookmarks/' },
{ name: 'Internals', location: 'chrome://net-internals/' },
{ name: 'Devices', location: 'chrome://devices/' },
{ name: 'Flags', location: 'chrome://flags/' },
{ name: 'Inspect', location: 'chrome://inspect/' },
{ name: 'Memory', location: 'chrome://memory-redirect/' },
{ name: 'Version', location: 'chrome://version/' },
{ name: 'Blank Page', location: 'about:blank' }
]);
=======
controllers.constant('internalPages', [
{name: 'Chrome Apps', location: 'chrome://apps/'},
{name: 'Extensions', location: 'chrome://extensions/'},
{name: 'History', location: 'chrome://history/'},
{name: 'Downloads', location: 'chrome://downloads/'},
{name: 'Bookmarks', location: 'chrome://bookmarks/'},
{name: 'Internals', location: 'chrome://net-internals/'},
{name: 'Devices', location: 'chrome://devices/'},
{name: 'Flags', location: 'chrome://flags/'},
{name: 'Inspect', location: 'chrome://inspect/'},
{name: 'Memory', location: 'chrome://memory-redirect/'},
{name: 'version', location: 'chrome://version/'}
]);
})(angular);
>>>>>>>
controllers.constant('internalPages', [
{ name: 'Chrome Apps', location: 'chrome://apps/' },
{ name: 'Extensions', location: 'chrome://extensions/' },
{ name: 'History', location: 'chrome://history/' },
{ name: 'Downloads', location: 'chrome://downloads/' },
{ name: 'Bookmarks', location: 'chrome://bookmarks/' },
{ name: 'Internals', location: 'chrome://net-internals/' },
{ name: 'Devices', location: 'chrome://devices/' },
{ name: 'Flags', location: 'chrome://flags/' },
{ name: 'Inspect', location: 'chrome://inspect/' },
{ name: 'Memory', location: 'chrome://memory-redirect/' },
{ name: 'Version', location: 'chrome://version/' },
{ name: 'Blank Page', location: 'about:blank' }
]);
})(angular); |
<<<<<<<
};
/* Converts implicit form control labeling to explicit by
* adding an unique id to form controls if they don't already
* have one and then setting the corresponding label element's
* for attribute to form control's id value. This explicit
* linkage is better supported by adaptive technologies.
* See SAK-18851.
*/
fixImplicitLabeling = function(){
var idCounter = 0;
$('label select,label input').each(function (idx, oInput) {
if (!oInput.id) {
idCounter++;
$(oInput).attr('id', 'a11yAutoGenInputId' + idCounter.toString());
}
if (!$(oInput).parents('label').eq(0).attr('for')) {
$(oInput).parents('label').eq(0).attr('for', $(oInput).attr('id'));
}
});
}
=======
};
toggle_visibility = function(id) {
var e = document.getElementById(id);
var elabel = document.getElementById('toggle' + id);
if(e.style.display == 'block')
{
e.style.display = 'none';
elabel.src='/library/image/sakai/expand.gif'
elabel.title='</f:verbatim><h:outputText value="#{msgs.hideshowdesc_toggle_show}"/><f:verbatim>'
resizeFrame('shrink');
}
else
{
e.style.display = 'block';
elabel.src='/library/image/sakai/collapse.gif'
elabel.title='</f:verbatim><h:outputText value="#{msgs.hideshowdesc_toggle_hide}"/><f:verbatim>'
resizeFrame();
}
};
showHideDivBlock = function(hideDivisionNo, context, key)
{
var tmpdiv = hideDivisionNo + "__hide_division_";
var tmpimg = hideDivisionNo + "__img_hide_division_";
var divisionNo = getTheElement(tmpdiv);
var imgNo = getTheElement(tmpimg);
if(divisionNo)
{
if(divisionNo.style.display =="block")
{
divisionNo.style.display="none";
if (imgNo)
{
imgNo.src = context + "/image/sakai/expand.gif";
}
}
else
{
divisionNo.style.display="block";
if(imgNo)
{
imgNo.src = context + "/image/sakai/collapse.gif";
}
}
resizeFrame('grow');
saveDivState(key, divisionNo.style.display);
}
};
saveDivState = function (key, displayState) {
var state = 0;
if (displayState == "block")
state = 1;
jQuery.ajax({
type: "POST",
url: "/direct/userPrefs/1234/saveDivState",
data: {
key: key,
state: state
}
});
};
getTheElement = function(thisid)
{
var thiselm = null;
if (document.getElementById)
{
thiselm = document.getElementById(thisid);
}
else if (document.all)
{
thiselm = document.all[thisid];
}
else if (document.layers)
{
thiselm = document.layers[thisid];
}
if(thiselm)
{
if(thiselm == null)
{
return;
}
else
{
return thiselm;
}
}
};
resizeFrame = function (updown) {
var frame = parent.document.getElementById( window.name );
if( frame ) {
if(updown=='shrink')
{
var clientH = document.body.clientHeight + 30;
}
else
{
var clientH = document.body.clientHeight + 30;
}
$( frame ).height( clientH );
} else {
throw( "resizeFrame did not get the frame (using name=" + window.name + ")" );
}
};
>>>>>>>
};
/* Converts implicit form control labeling to explicit by
* adding an unique id to form controls if they don't already
* have one and then setting the corresponding label element's
* for attribute to form control's id value. This explicit
* linkage is better supported by adaptive technologies.
* See SAK-18851.
*/
fixImplicitLabeling = function(){
var idCounter = 0;
$('label select,label input').each(function (idx, oInput) {
if (!oInput.id) {
idCounter++;
$(oInput).attr('id', 'a11yAutoGenInputId' + idCounter.toString());
}
if (!$(oInput).parents('label').eq(0).attr('for')) {
$(oInput).parents('label').eq(0).attr('for', $(oInput).attr('id'));
}
});
}
toggle_visibility = function(id) {
var e = document.getElementById(id);
var elabel = document.getElementById('toggle' + id);
if(e.style.display == 'block')
{
e.style.display = 'none';
elabel.src='/library/image/sakai/expand.gif'
elabel.title='</f:verbatim><h:outputText value="#{msgs.hideshowdesc_toggle_show}"/><f:verbatim>'
resizeFrame('shrink');
}
else
{
e.style.display = 'block';
elabel.src='/library/image/sakai/collapse.gif'
elabel.title='</f:verbatim><h:outputText value="#{msgs.hideshowdesc_toggle_hide}"/><f:verbatim>'
resizeFrame();
}
};
showHideDivBlock = function(hideDivisionNo, context, key)
{
var tmpdiv = hideDivisionNo + "__hide_division_";
var tmpimg = hideDivisionNo + "__img_hide_division_";
var divisionNo = getTheElement(tmpdiv);
var imgNo = getTheElement(tmpimg);
if(divisionNo)
{
if(divisionNo.style.display =="block")
{
divisionNo.style.display="none";
if (imgNo)
{
imgNo.src = context + "/image/sakai/expand.gif";
}
}
else
{
divisionNo.style.display="block";
if(imgNo)
{
imgNo.src = context + "/image/sakai/collapse.gif";
}
}
resizeFrame('grow');
saveDivState(key, divisionNo.style.display);
}
};
saveDivState = function (key, displayState) {
var state = 0;
if (displayState == "block")
state = 1;
jQuery.ajax({
type: "POST",
url: "/direct/userPrefs/1234/saveDivState",
data: {
key: key,
state: state
}
});
};
getTheElement = function(thisid)
{
var thiselm = null;
if (document.getElementById)
{
thiselm = document.getElementById(thisid);
}
else if (document.all)
{
thiselm = document.all[thisid];
}
else if (document.layers)
{
thiselm = document.layers[thisid];
}
if(thiselm)
{
if(thiselm == null)
{
return;
}
else
{
return thiselm;
}
}
};
resizeFrame = function (updown) {
var frame = parent.document.getElementById( window.name );
if( frame ) {
if(updown=='shrink')
{
var clientH = document.body.clientHeight + 30;
}
else
{
var clientH = document.body.clientHeight + 30;
}
$( frame ).height( clientH );
} else {
throw( "resizeFrame did not get the frame (using name=" + window.name + ")" );
}
}; |
<<<<<<<
if (compilation.__HAS_RUN_BSB__) return Promise.resolve()
compilation.__HAS_RUN_BSB__ = true
return new Promise((resolve, reject) => {
exec(bsb, { maxBuffer: Infinity, cwd: buildDir }, (err, stdout, stderr) => {
let output = `${stdout.toString()}\n${stderr.toString()}`
if (err) {
reject(output)
} else {
resolve(output)
}
=======
if (!compilation.bsbRunner) {
compilation.bsbRunner = new Promise((resolve, reject) => {
exec(
bsb,
{ maxBuffer: Infinity, cwd: buildDir },
(err, stdout, stderr) => {
if (err) {
reject(`${stdout.toString()}\n${stderr.toString()}`)
} else {
resolve()
}
}
)
>>>>>>>
if (!compilation.bsbRunner) {
compilation.bsbRunner = new Promise((resolve, reject) => {
exec(
bsb,
{ maxBuffer: Infinity, cwd: buildDir },
(err, stdout, stderr) => {
let output = `${stdout.toString()}\n${stderr.toString()}`
if (err) {
reject(output)
} else {
resolve(output)
}
}
) |
<<<<<<<
// - Simplest Possible Graph - no customisations
var temp_graph = new SimpleGraph("simplest_graph_holder", temp_labels, temp_data);
// - Temperature Graph - adds colour, fill, and a minimum value for the y axis
var temp_graph = new SimpleGraph("temp_graph_holder", temp_labels, temp_data,
{lineColor: "#f00", pointColor: "#f00", fillUnderLine: true, fillColor: "#f00", units: "ºC", minYAxisValue: 30});
// - Rain Graph - adds a caption to the y axis
var rain_graph = new SimpleGraph("rain_graph_holder", rain_labels, rain_data,
{lineColor: "#00f", pointColor: "#00f", units: "mm", leftGutter: 60, minYAxisValue: 10, yAxisCaption: "Max Rainfall"});
// - Combined Graph - plots two data sets with different scales on the one graph
var combined_graph = new SimpleGraph("combined_graph_holder", temp_labels, temp_data,
{lineColor: "#f00", pointColor: "#f00", leftGutter: 90, units: "ºC", minYAxisValue: 30, yAxisCaption: "Max Temp"});
combined_graph.plotAdditionalDataSet(rain_data, {yAxisCaption: "Max Rainfall", minYAxisValue: 10, penColor: "#00f"})
};
=======
// - Temperature Graph
var temp_graph = new SimpleGraph("temp_graph_holder", temp_labels, temp_data, "ºC",
{lineColor: "#f00", pointColor: "#f00", fillUnderLine: true, fillColor: "#f00"});
temp_graph.drawGrid(30);
temp_graph.plot();
// - Rain Graph
var rain_graph = new SimpleGraph("rain_graph_holder", rain_labels, rain_data, "mm",
{lineColor: "#00f", pointColor: "#00f", leftGutter: 60});
rain_graph.drawGrid(10);
rain_graph.addYAxisLabels(0, "Max Rainfall");
rain_graph.plot();
// - Combined Graph
var combined_graph = new SimpleGraph("combined_graph_holder", temp_labels, temp_data, "ºC",
{lineColor: "#f00", pointColor: "#f00", leftGutter: 90});
combined_graph.drawGrid(30);
combined_graph.addYAxisLabels(0, "Max Temp");
combined_graph.plot();
combined_graph.newDataSet(rain_labels, rain_data, 10);
combined_graph.settings.lineColor = "#00f";
combined_graph.settings.pointColor = "#00f";
combined_graph.addYAxisLabels(30, "Max Rainfall");
combined_graph.plot();
});
>>>>>>>
// - Simplest Possible Graph - no customisations
var temp_graph = new SimpleGraph("simplest_graph_holder", temp_labels, temp_data);
// - Temperature Graph - adds colour, fill, and a minimum value for the y axis
var temp_graph = new SimpleGraph("temp_graph_holder", temp_labels, temp_data,
{lineColor: "#f00", pointColor: "#f00", fillUnderLine: true, fillColor: "#f00", units: "ºC", minYAxisValue: 30});
// - Rain Graph - adds a caption to the y axis
var rain_graph = new SimpleGraph("rain_graph_holder", rain_labels, rain_data,
{lineColor: "#00f", pointColor: "#00f", units: "mm", leftGutter: 60, minYAxisValue: 10, yAxisCaption: "Max Rainfall"});
// - Combined Graph - plots two data sets with different scales on the one graph
var combined_graph = new SimpleGraph("combined_graph_holder", temp_labels, temp_data,
{lineColor: "#f00", pointColor: "#f00", leftGutter: 90, units: "ºC", minYAxisValue: 30, yAxisCaption: "Max Temp"});
combined_graph.plotAdditionalDataSet(rain_data, {yAxisCaption: "Max Rainfall", minYAxisValue: 10, penColor: "#00f"})
}); |
<<<<<<<
horizontalGesture: false,
reloadOnContextChange: false,
inertia: 1,
=======
lerp: 0.1,
>>>>>>>
horizontalGesture: false,
reloadOnContextChange: false,
lerp: 0.1,
<<<<<<<
touchMultiplier: 2,
tablet: {
smooth: false,
direction: 'vertical',
horizontalGesture: false,
breakpoint: 1024
},
smartphone: {
smooth: false,
direction: 'vertical',
horizontalGesture: false
}
=======
touchMultiplier: 2,
scrollFromAnywhere: false
>>>>>>>
touchMultiplier: 2,
tablet: {
smooth: false,
direction: 'vertical',
horizontalGesture: false,
breakpoint: 1024
},
smartphone: {
smooth: false,
direction: 'vertical',
horizontalGesture: false
}
<<<<<<<
window.scrollTo(0, 0); // Override default options with given ones
=======
>>>>>>>
<<<<<<<
var delta;
if (this.isMobile) {
delta = this[this.context].horizontalGesture ? e.deltaX : e.deltaY;
} else {
delta = this.horizontalGesture ? e.deltaX : e.deltaY;
}
this.instance.delta[this.directionAxis] -= delta;
if (this.instance.delta[this.directionAxis] < 0) this.instance.delta[this.directionAxis] = 0;
if (this.instance.delta[this.directionAxis] > this.instance.limit[this.directionAxis]) this.instance.delta[this.directionAxis] = this.instance.limit[this.directionAxis];
=======
this.instance.delta.y -= e.deltaY * this.multiplier;
if (this.instance.delta.y < 0) this.instance.delta.y = 0;
if (this.instance.delta.y > this.instance.limit) this.instance.delta.y = this.instance.limit;
>>>>>>>
var delta;
if (this.isMobile) {
delta = this[this.context].horizontalGesture ? e.deltaX : e.deltaY;
} else {
delta = this.horizontalGesture ? e.deltaX : e.deltaY;
}
this.instance.delta[this.directionAxis] -= delta * this.multiplier;
if (this.instance.delta[this.directionAxis] < 0) this.instance.delta[this.directionAxis] = 0;
if (this.instance.delta[this.directionAxis] > this.instance.limit[this.directionAxis]) this.instance.delta[this.directionAxis] = this.instance.limit[this.directionAxis];
<<<<<<<
this.instance.scroll[this.directionAxis] = lerp(this.instance.scroll[this.directionAxis], this.instance.delta[this.directionAxis], this.inertia * this.inertiaRatio);
=======
this.instance.scroll.y = lerp(this.instance.scroll.y, this.instance.delta.y, this.lerp);
>>>>>>>
this.instance.scroll[this.directionAxis] = lerp(this.instance.scroll[this.directionAxis], this.instance.delta[this.directionAxis], this.lerp);
<<<<<<<
if (this.instance.delta[this.directionAxis] != this.instance.scroll[this.directionAxis]) {
this.instance.speed = (this.instance.delta[this.directionAxis] - this.instance.scroll[this.directionAxis]) / (Date.now() - this.timestamp);
=======
if (this.instance.delta.y != this.instance.scroll.y) {
this.instance.speed = (this.instance.delta.y - this.instance.scroll.y) / Math.max(1, Date.now() - this.timestamp);
>>>>>>>
if (this.instance.delta[this.directionAxis] != this.instance.scroll[this.directionAxis]) {
this.instance.speed = (this.instance.delta[this.directionAxis] - this.instance.scroll[this.directionAxis]) / Math.max(1, Date.now() - this.timestamp);
<<<<<<<
document.body.append(this.scrollbar);
this.scrollbarHeight = this.scrollbar.getBoundingClientRect().height;
this.scrollbarWidth = this.scrollbar.getBoundingClientRect().width;
if (this.direction === 'horizontal') {
this.scrollbarThumb.style.width = "".concat(this.scrollbarWidth * this.scrollbarWidth / (this.instance.limit.x + this.scrollbarWidth), "px");
} else {
this.scrollbarThumb.style.height = "".concat(this.scrollbarHeight * this.scrollbarHeight / (this.instance.limit.y + this.scrollbarHeight), "px");
}
this.scrollBarLimit = {
x: this.scrollbarWidth - this.scrollbarThumb.getBoundingClientRect().width,
y: this.scrollbarHeight - this.scrollbarThumb.getBoundingClientRect().height
};
=======
document.body.append(this.scrollbar); // Scrollbar Events
>>>>>>>
document.body.append(this.scrollbar); // Scrollbar Events
<<<<<<<
var elDistance = {
x: el.getBoundingClientRect().left - left,
y: el.getBoundingClientRect().top - top
};
=======
var elTop = el.getBoundingClientRect().top;
var elDistance = elTop - top;
>>>>>>>
var elTop = el.getBoundingClientRect().top;
var elLeft = el.getBoundingClientRect().left;
var elDistance = {
x: elLeft - left,
y: elTop - top
};
<<<<<<<
left += window.innerWidth;
bottom = top + targetEl.offsetHeight - window.innerHeight - el.offsetHeight - elDistance[_this6.directionAxis];
right = left + targetEl.offsetWidth - window.innerWidth - el.offsetWidth - elDistance[_this6.directionAxis];
middle = {
x: (right - left) / 2 + left,
y: (bottom - top) / 2 + top
};
=======
bottom = elTop + targetEl.offsetHeight - el.offsetHeight - elDistance;
middle = (bottom - top) / 2 + top;
>>>>>>>
left += window.innerWidth;
bottom = elTop + targetEl.offsetHeight - el.offsetHeight - elDistance[_this6.directionAxis];
right = elLeft + targetEl.offsetWidth - el.offsetWidth - elDistance[_this6.directionAxis];
middle = {
x: (right - left) / 2 + left,
y: (bottom - top) / 2 + top
};
<<<<<<<
var scrollRight = this.instance.scroll.x + this.windowWidth;
=======
var setAllElements = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
>>>>>>>
var setAllElements = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
var scrollRight = this.instance.scroll.x + this.windowWidth; |
<<<<<<<
const distance = (Math.abs(this.instance.delta[this.directionAxis] - this.instance.scroll[this.directionAxis]));
if ((distance < 0.5 && this.instance.delta[this.directionAxis] != 0) || (distance < 0.5 && this.instance.delta[this.directionAxis] == 0)) {
=======
this.updateScroll();
const distance = (Math.abs(this.instance.delta.y - this.instance.scroll.y));
if (!this.animatingScroll && ((distance < 0.5 && this.instance.delta.y != 0) || (distance < 0.5 && this.instance.delta.y == 0))) {
>>>>>>>
this.updateScroll();
const distance = (Math.abs(this.instance.delta[this.directionAxis] - this.instance.scroll[this.directionAxis]));
if (!this.animatingScroll && ((distance < 0.5 && this.instance.delta[this.directionAxis] != 0) || (distance < 0.5 && this.instance.delta[this.directionAxis] == 0))) {
<<<<<<<
let delta
if(this.isMobile) {
delta = this[this.context].horizontalGesture ? e.deltaX : e.deltaY
} else {
delta = this.horizontalGesture ? e.deltaX : e.deltaY
}
this.instance.delta[this.directionAxis] -= delta;
if (this.instance.delta[this.directionAxis] < 0) this.instance.delta[this.directionAxis] = 0;
if (this.instance.delta[this.directionAxis] > this.instance.limit[this.directionAxis]) this.instance.delta[this.directionAxis] = this.instance.limit[this.directionAxis];
=======
this.instance.delta.y -= e.deltaY * this.multiplier;
if (this.instance.delta.y < 0) this.instance.delta.y = 0;
if (this.instance.delta.y > this.instance.limit) this.instance.delta.y = this.instance.limit;
>>>>>>>
let delta
if(this.isMobile) {
delta = this[this.context].horizontalGesture ? e.deltaX : e.deltaY
} else {
delta = this.horizontalGesture ? e.deltaX : e.deltaY
}
this.instance.delta[this.directionAxis] -= delta * this.multiplier;
if (this.instance.delta[this.directionAxis] < 0) this.instance.delta[this.directionAxis] = 0;
if (this.instance.delta[this.directionAxis] > this.instance.limit[this.directionAxis]) this.instance.delta[this.directionAxis] = this.instance.limit[this.directionAxis];
<<<<<<<
this.instance.scroll[this.directionAxis] = lerp(this.instance.scroll[this.directionAxis], this.instance.delta[this.directionAxis], this.inertia * this.inertiaRatio);
=======
this.instance.scroll.y = lerp(this.instance.scroll.y, this.instance.delta.y, this.lerp);
>>>>>>>
this.instance.scroll[this.directionAxis] = lerp(this.instance.scroll[this.directionAxis], this.instance.delta[this.directionAxis], this.lerp);
<<<<<<<
if (this.instance.delta[this.directionAxis] != this.instance.scroll[this.directionAxis]) {
this.instance.speed = (this.instance.delta[this.directionAxis] - this.instance.scroll[this.directionAxis]) / (Date.now() - this.timestamp);
=======
if (this.instance.delta.y != this.instance.scroll.y) {
this.instance.speed = (this.instance.delta.y - this.instance.scroll.y) / Math.max(1,(Date.now() - this.timestamp));
>>>>>>>
if (this.instance.delta[this.directionAxis] != this.instance.scroll[this.directionAxis]) {
this.instance.speed = (this.instance.delta[this.directionAxis] - this.instance.scroll[this.directionAxis]) / Math.max(1,(Date.now() - this.timestamp));
<<<<<<<
this.scrollbarHeight = this.scrollbar.getBoundingClientRect().height;
this.scrollbarWidth = this.scrollbar.getBoundingClientRect().width;
if(this.direction === 'horizontal') {
this.scrollbarThumb.style.width = `${(this.scrollbarWidth * this.scrollbarWidth) / (this.instance.limit.x + this.scrollbarWidth)}px`;
} else {
this.scrollbarThumb.style.height = `${(this.scrollbarHeight * this.scrollbarHeight) / (this.instance.limit.y + this.scrollbarHeight)}px`;
}
this.scrollBarLimit = {
x: this.scrollbarWidth - this.scrollbarThumb.getBoundingClientRect().width,
y: this.scrollbarHeight - this.scrollbarThumb.getBoundingClientRect().height
}
=======
// Scrollbar Events
>>>>>>>
// Scrollbar Events
<<<<<<<
const elDistance = {
x: el.getBoundingClientRect().left - left,
y: el.getBoundingClientRect().top - top
}
=======
const elTop = el.getBoundingClientRect().top;
const elDistance = elTop - top;
>>>>>>>
const elTop = el.getBoundingClientRect().top
const elLeft = el.getBoundingClientRect().left
const elDistance = {
x: elLeft - left,
y: elTop - top
}
<<<<<<<
left += window.innerWidth;
bottom = top + targetEl.offsetHeight - window.innerHeight - el.offsetHeight - elDistance[this.directionAxis];
right = left + targetEl.offsetWidth - window.innerWidth - el.offsetWidth - elDistance[this.directionAxis];
middle = {
x: ((right - left) / 2) + left,
y: ((bottom - top) / 2) + top
};
=======
bottom = elTop + targetEl.offsetHeight - el.offsetHeight - elDistance;
middle = ((bottom - top) / 2) + top;
>>>>>>>
left += window.innerWidth;
bottom = elTop + targetEl.offsetHeight - el.offsetHeight - elDistance[this.directionAxis];
right = elLeft + targetEl.offsetWidth - el.offsetWidth - elDistance[this.directionAxis];
middle = {
x: ((right - left) / 2) + left,
y: ((bottom - top) / 2) + top
};
<<<<<<<
transformElements(isForced) {
const scrollRight = this.instance.scroll.x + this.windowWidth;
=======
transformElements(isForced, setAllElements = false) {
>>>>>>>
transformElements(isForced, setAllElements = false) {
const scrollRight = this.instance.scroll.x + this.windowWidth;
<<<<<<<
// Actual scrollTo (the lerp will do the animation itself)
this.instance.delta[this.directionAxis] = Math.max(0,Math.min(offset, this.instance.limit[this.directionAxis])); // We limit the value to scroll boundaries (between 0 and instance limit)
this.inertiaRatio = Math.min(4000 / Math.abs(this.instance.delta[this.directionAxis] - this.instance.scroll[this.directionAxis]),0.8);
=======
// Actual scrollto
// ==========================================================================
// Setup
const scrollStart = parseFloat(this.instance.delta.y)
const scrollTarget = Math.max(0,Math.min(offset, this.instance.limit)) // Make sure our target is in the scroll boundaries
const scrollDiff = scrollTarget - scrollStart
const render = (p) => {
if(disableLerp)
this.setScroll(this.instance.delta.x, scrollStart + (scrollDiff * p))
else
this.instance.delta.y = scrollStart + (scrollDiff * p)
}
// Prepare the scroll
this.animatingScroll = true // This boolean allows to prevent `checkScroll()` from calling `stopScrolling` when the animation is slow (i.e. at the beginning of an EaseIn)
this.stopScrolling() // Stop any movement, allows to kill any other `scrollTo` still happening
this.startScrolling() // Restart the scroll
>>>>>>>
// Actual scrollto
// ==========================================================================
// Setup
const scrollStart = parseFloat(this.instance.delta[this.directionAxis])
const scrollTarget = Math.max(0,Math.min(offset, this.instance.limit[this.directionAxis])) // Make sure our target is in the scroll boundaries
const scrollDiff = scrollTarget - scrollStart
const render = (p) => {
if(disableLerp) {
if(this.direction === 'horizontal') {
this.setScroll(scrollStart + (scrollDiff * p), this.instance.delta.y)
} else {
this.setScroll(this.instance.delta.x, scrollStart + (scrollDiff * p))
}
}
else {
this.instance.delta[this.directionAxis] = scrollStart + (scrollDiff * p)
}
}
// Prepare the scroll
this.animatingScroll = true // This boolean allows to prevent `checkScroll()` from calling `stopScrolling` when the animation is slow (i.e. at the beginning of an EaseIn)
this.stopScrolling() // Stop any movement, allows to kill any other `scrollTo` still happening
this.startScrolling() // Restart the scroll |
<<<<<<<
horizontalGesture: false,
reloadOnContextChange: false,
inertia: 1,
=======
lerp: 0.1,
>>>>>>>
horizontalGesture: false,
reloadOnContextChange: false,
lerp: 0.1,
<<<<<<<
touchMultiplier: 2,
tablet: {
smooth: false,
direction: 'vertical',
horizontalGesture: false,
breakpoint: 1024
},
smartphone: {
smooth: false,
direction: 'vertical',
horizontalGesture: false
}
=======
touchMultiplier: 2,
scrollFromAnywhere: false
>>>>>>>
touchMultiplier: 2,
tablet: {
smooth: false,
direction: 'vertical',
horizontalGesture: false,
breakpoint: 1024
},
smartphone: {
smooth: false,
direction: 'vertical',
horizontalGesture: false
}
<<<<<<<
window.scrollTo(0, 0); // Override default options with given ones
=======
>>>>>>>
<<<<<<<
var delta;
if (this.isMobile) {
delta = this[this.context].horizontalGesture ? e.deltaX : e.deltaY;
} else {
delta = this.horizontalGesture ? e.deltaX : e.deltaY;
}
this.instance.delta[this.directionAxis] -= delta;
if (this.instance.delta[this.directionAxis] < 0) this.instance.delta[this.directionAxis] = 0;
if (this.instance.delta[this.directionAxis] > this.instance.limit[this.directionAxis]) this.instance.delta[this.directionAxis] = this.instance.limit[this.directionAxis];
=======
this.instance.delta.y -= e.deltaY * this.multiplier;
if (this.instance.delta.y < 0) this.instance.delta.y = 0;
if (this.instance.delta.y > this.instance.limit) this.instance.delta.y = this.instance.limit;
>>>>>>>
var delta;
if (this.isMobile) {
delta = this[this.context].horizontalGesture ? e.deltaX : e.deltaY;
} else {
delta = this.horizontalGesture ? e.deltaX : e.deltaY;
}
this.instance.delta[this.directionAxis] -= delta * this.multiplier;
if (this.instance.delta[this.directionAxis] < 0) this.instance.delta[this.directionAxis] = 0;
if (this.instance.delta[this.directionAxis] > this.instance.limit[this.directionAxis]) this.instance.delta[this.directionAxis] = this.instance.limit[this.directionAxis];
<<<<<<<
this.instance.scroll[this.directionAxis] = lerp(this.instance.scroll[this.directionAxis], this.instance.delta[this.directionAxis], this.inertia * this.inertiaRatio);
=======
this.instance.scroll.y = lerp(this.instance.scroll.y, this.instance.delta.y, this.lerp);
>>>>>>>
this.instance.scroll[this.directionAxis] = lerp(this.instance.scroll[this.directionAxis], this.instance.delta[this.directionAxis], this.lerp);
<<<<<<<
if (this.instance.delta[this.directionAxis] != this.instance.scroll[this.directionAxis]) {
this.instance.speed = (this.instance.delta[this.directionAxis] - this.instance.scroll[this.directionAxis]) / (Date.now() - this.timestamp);
=======
if (this.instance.delta.y != this.instance.scroll.y) {
this.instance.speed = (this.instance.delta.y - this.instance.scroll.y) / Math.max(1, Date.now() - this.timestamp);
>>>>>>>
if (this.instance.delta[this.directionAxis] != this.instance.scroll[this.directionAxis]) {
this.instance.speed = (this.instance.delta[this.directionAxis] - this.instance.scroll[this.directionAxis]) / Math.max(1, Date.now() - this.timestamp);
<<<<<<<
document.body.append(this.scrollbar);
this.scrollbarHeight = this.scrollbar.getBoundingClientRect().height;
this.scrollbarWidth = this.scrollbar.getBoundingClientRect().width;
if (this.direction === 'horizontal') {
this.scrollbarThumb.style.width = "".concat(this.scrollbarWidth * this.scrollbarWidth / (this.instance.limit.x + this.scrollbarWidth), "px");
} else {
this.scrollbarThumb.style.height = "".concat(this.scrollbarHeight * this.scrollbarHeight / (this.instance.limit.y + this.scrollbarHeight), "px");
}
this.scrollBarLimit = {
x: this.scrollbarWidth - this.scrollbarThumb.getBoundingClientRect().width,
y: this.scrollbarHeight - this.scrollbarThumb.getBoundingClientRect().height
};
=======
document.body.append(this.scrollbar); // Scrollbar Events
>>>>>>>
document.body.append(this.scrollbar); // Scrollbar Events
<<<<<<<
var elDistance = {
x: el.getBoundingClientRect().left - left,
y: el.getBoundingClientRect().top - top
};
=======
var elTop = el.getBoundingClientRect().top;
var elDistance = elTop - top;
>>>>>>>
var elTop = el.getBoundingClientRect().top;
var elLeft = el.getBoundingClientRect().left;
var elDistance = {
x: elLeft - left,
y: elTop - top
};
<<<<<<<
left += window.innerWidth;
bottom = top + targetEl.offsetHeight - window.innerHeight - el.offsetHeight - elDistance[_this6.directionAxis];
right = left + targetEl.offsetWidth - window.innerWidth - el.offsetWidth - elDistance[_this6.directionAxis];
middle = {
x: (right - left) / 2 + left,
y: (bottom - top) / 2 + top
};
=======
bottom = elTop + targetEl.offsetHeight - el.offsetHeight - elDistance;
middle = (bottom - top) / 2 + top;
>>>>>>>
left += window.innerWidth;
bottom = elTop + targetEl.offsetHeight - el.offsetHeight - elDistance[_this6.directionAxis];
right = elLeft + targetEl.offsetWidth - el.offsetWidth - elDistance[_this6.directionAxis];
middle = {
x: (right - left) / 2 + left,
y: (bottom - top) / 2 + top
};
<<<<<<<
var scrollRight = this.instance.scroll.x + this.windowWidth;
=======
var setAllElements = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
>>>>>>>
var setAllElements = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
var scrollRight = this.instance.scroll.x + this.windowWidth; |
<<<<<<<
const { computed, inject, RSVP } = Ember;
const twiddleAppName = 'demo-app';
=======
const { inject, RSVP } = Ember;
const twiddleAppName = 'app';
>>>>>>>
const { computed, inject, RSVP } = Ember;
const twiddleAppName = 'app'; |
<<<<<<<
/* global require, module */
var fs = require('fs');
=======
/* global require, module, process */
>>>>>>>
/* global require, module, process */
var fs = require('fs');
<<<<<<<
},
fileCreator: [{filename: '/lib/blueprints.js', content: mapContent}]
=======
},
sourcemaps: {
enabled: !isProductionLikeBuild,
},
minifyCSS: { enabled: isProductionLikeBuild },
minifyJS: { enabled: isProductionLikeBuild },
tests: process.env.EMBER_CLI_TEST_COMMAND || !isProductionLikeBuild,
hinting: process.env.EMBER_CLI_TEST_COMMAND || !isProductionLikeBuild,
vendorFiles: {
'ember.js': {
staging: 'bower_components/ember/ember.prod.js'
}
}
>>>>>>>
},
fileCreator: [{filename: '/lib/blueprints.js', content: mapContent}],
sourcemaps: {
enabled: !isProductionLikeBuild,
},
minifyCSS: { enabled: isProductionLikeBuild },
minifyJS: { enabled: isProductionLikeBuild },
tests: process.env.EMBER_CLI_TEST_COMMAND || !isProductionLikeBuild,
hinting: process.env.EMBER_CLI_TEST_COMMAND || !isProductionLikeBuild,
vendorFiles: {
'ember.js': {
staging: 'bower_components/ember/ember.prod.js'
}
} |
<<<<<<<
Mad.Player.fromFile(file, function (player) {
if(globalPlayer) globalPlayer.destroy();
globalPlayer = player;
if (player.id3) {
var id3 = player.id3.toHash();
var id3element = document.getElementById('ID3');
var id3string = "<div class='player'><div class='picture'>";
var pictures = id3['Attached picture'];
if (pictures) {
var mime = pictures[0].mime;
var enc = btoa(pictures[0].value);
id3string += "<img class='picture' src='data:" + mime + ';base64,' + enc + "' />";
}
id3string += "<a href='#' id='playpause' class='button play'></a>";
id3string += "<div class='timeline'><div id='progressbar'></div></div>";
id3string += "</div></div>";
id3string += "<div class='info'>";
id3string += "<h2>" + id3['Title/Songname/Content description'] + "</h2>";
id3string += "<h3>" + id3['Lead artist/Lead performer/Soloist/Performing group'] + "</h3>";
id3string += "<div class='meta'>";
id3string += "<p><strong>Album:</strong> " + id3['Album/Movie/Show title'] + "</p>";
id3string += "<p><strong>Track:</strong> " + id3['Track number/Position in set'] + "</p>";
id3string += "<p><strong>Year:</strong> " + id3['Year'] + "</p>";
id3string += "</div>";
id3string += "</div>";
id3element.innerHTML = id3string;
}
player.onProgress = onProgress;
document.getElementById('playpause').onclick = function () {
player.setPlaying(!player.playing);
return false;
};
player.onPlay = function() {
document.getElementById('playpause').className = 'button pause';
};
player.onPause = function() {
document.getElementById('playpause').className = 'button play';
};
player.createDevice();
=======
Mad.Player.fromFile(file, function(player) {
if (player.id3) {
var id3 = player.id3.toHash();
var id3element = document.getElementById('ID3');
var id3string = "<div class='player'><div class='picture'>";
var pictures = id3['Attached picture'];
if (pictures) {
var mime = pictures[0].mime;
var enc = btoa(pictures[0].value);
id3string += "<img class='picture' src='data:" + mime + ';base64,' + enc + "' />"; }
else {
id3string += "<img class='picture' src='../images/nopicture.png' />";
}
id3string += "<a href='#' class='button play'></a>";
id3string += "<div class='timeline'><div id='progressbar'></div></div>";
id3string += "</div></div>";
id3string += "<div class='info'>";
id3string += "<h2>" + id3['Title/Songname/Content description'] + "</h2>";
id3string += "<h3>" + id3['Lead artist/Lead performer/Soloist/Performing group'] + "</h3>";
id3string += "<div class='meta'>";
id3string += "<p><strong>Album:</strong> " + id3['Album/Movie/Show title'] + "</p>";
id3string += "<p><strong>Track:</strong> " + id3['Track number/Position in set'] + "</p>";
id3string += "<p><strong>Year:</strong> " + id3['Year'] + "</p>";
id3string += "</div>";
id3string += "</div>";
id3element.innerHTML = id3string;
}
player.onProgress = onProgress;
player.createDevice();
>>>>>>>
Mad.Player.fromFile(file, function (player) {
if(globalPlayer) globalPlayer.destroy();
globalPlayer = player;
if (player.id3) {
var id3 = player.id3.toHash();
var id3element = document.getElementById('ID3');
var id3string = "<div class='player'><div class='picture'>";
var pictures = id3['Attached picture'];
if (pictures) {
var mime = pictures[0].mime;
var enc = btoa(pictures[0].value);
id3string += "<img class='picture' src='data:" + mime + ';base64,' + enc + "' />";
} else {
id3string += "<img class='picture' src='../images/nopicture.png' />";
}
id3string += "<a href='#' id='playpause' class='button play'></a>";
id3string += "<div class='timeline'><div id='progressbar'></div></div>";
id3string += "</div></div>";
id3string += "<div class='info'>";
id3string += "<h2>" + id3['Title/Songname/Content description'] + "</h2>";
id3string += "<h3>" + id3['Lead artist/Lead performer/Soloist/Performing group'] + "</h3>";
id3string += "<div class='meta'>";
id3string += "<p><strong>Album:</strong> " + id3['Album/Movie/Show title'] + "</p>";
id3string += "<p><strong>Track:</strong> " + id3['Track number/Position in set'] + "</p>";
id3string += "<p><strong>Year:</strong> " + id3['Year'] + "</p>";
id3string += "</div>";
id3string += "</div>";
id3element.innerHTML = id3string;
}
player.onProgress = onProgress;
document.getElementById('playpause').onclick = function () {
player.setPlaying(!player.playing);
return false;
};
player.onPlay = function() {
document.getElementById('playpause').className = 'button pause';
};
player.onPause = function() {
document.getElementById('playpause').className = 'button play';
};
player.createDevice(); |
<<<<<<<
PATCH: 'pre2',
BRANCH: 'dev'
=======
PATCH: '',
BRANCH: ''
>>>>>>>
PATCH: '',
BRANCH: 'dev' |
<<<<<<<
try {
this.fetchWorker = new FetchWorker();
} catch (ex) {
console.log(ex);
}
setTimeout(function() {thisB.realInit2()}, 1);
=======
if (window.getComputedStyle(this.browserHolderHolder).display != 'none') {
setTimeout(function() {thisB.realInit2()}, 1);
} else {
var pollInterval = setInterval(function() {
if (window.getComputedStyle(thisB.browserHolderHolder).display != 'none') {
clearInterval(pollInterval);
thisB.realInit2();
}
}, 300);
}
>>>>>>>
try {
this.fetchWorker = new FetchWorker();
} catch (ex) {
console.log(ex);
}
if (window.getComputedStyle(this.browserHolderHolder).display != 'none') {
setTimeout(function() {thisB.realInit2()}, 1);
} else {
var pollInterval = setInterval(function() {
if (window.getComputedStyle(thisB.browserHolderHolder).display != 'none') {
clearInterval(pollInterval);
thisB.realInit2();
}
}, 300);
} |
<<<<<<<
var beforeProcess = Date.now();
=======
>>>>>>>
<<<<<<<
function doCrossDomainRequest(url, handler, credentials, timings) {
=======
function doCrossDomainRequest(url, handler, credentials, custAuth) {
>>>>>>>
function doCrossDomainRequest(url, handler, credentials, custAuth) {
<<<<<<<
if (req.status == 200 || req.status == 0) {
var reqFetched = Date.now();
var xml = req.responseXML;
var reqParsed = Date.now();
if (timings) {
dlog('fetch=' + (reqFetched-reqStart) + 'ms; parse=' + (reqParsed-reqFetched) + 'ms');
}
=======
if (req.status >= 200 || req.status == 0) {
>>>>>>>
if (req.status >= 200 || req.status == 0) {
<<<<<<<
return doCrossDomainRequest(url, handler, this.credentials, this.timings);
=======
var custAuth;
if (this.xUser) {
custAuth = 'Basic ' + btoa(this.xUser + ':' + this.xPass);
}
return doCrossDomainRequest(url, handler, this.credentials, custAuth);
>>>>>>>
var custAuth;
if (this.xUser) {
custAuth = 'Basic ' + btoa(this.xUser + ':' + this.xPass);
}
return doCrossDomainRequest(url, handler, this.credentials, custAuth); |
<<<<<<<
var AMINO_ACID_TRANSLATION = {
'TTT': 'F',
'TTC': 'F',
'TTA': 'L',
'TTG': 'L',
'CTT': 'L',
'CTC': 'L',
'CTA': 'L',
'CTG': 'L',
'ATT': 'I',
'ATC': 'I',
'ATA': 'I',
'ATG': 'M',
'GTT': 'V',
'GTC': 'V',
'GTA': 'V',
'GTG': 'V',
'TCT': 'S',
'TCC': 'S',
'TCA': 'S',
'TCG': 'S',
'CCT': 'P',
'CCC': 'P',
'CCA': 'P',
'CCG': 'P',
'ACT': 'T',
'ACC': 'T',
'ACA': 'T',
'ACG': 'T',
'GCT': 'A',
'GCC': 'A',
'GCA': 'A',
'GCG': 'A',
'TAT': 'Y',
'TAC': 'Y',
'TAA': '*', // stop
'TAG': '*', // stop
'CAT': 'H',
'CAC': 'H',
'CAA': 'Q',
'CAG': 'Q',
'AAT': 'N',
'AAC': 'N',
'AAA': 'K',
'AAG': 'K',
'GAT': 'D',
'GAC': 'D',
'GAA': 'E',
'GAG': 'E',
'TGT': 'C',
'TGC': 'C',
'TGA': '*', // stop
'TGG': 'W',
'CGT': 'R',
'CGC': 'R',
'CGA': 'R',
'CGG': 'R',
'AGT': 'S',
'AGC': 'S',
'AGA': 'R',
'AGG': 'R',
'GGT': 'G',
'GGC': 'G',
'GGA': 'G',
'GGG': 'G'
}
=======
function resolveUrlToPage(rel) {
return makeElement('a', null, {href: rel}).href;
}
>>>>>>>
var AMINO_ACID_TRANSLATION = {
'TTT': 'F',
'TTC': 'F',
'TTA': 'L',
'TTG': 'L',
'CTT': 'L',
'CTC': 'L',
'CTA': 'L',
'CTG': 'L',
'ATT': 'I',
'ATC': 'I',
'ATA': 'I',
'ATG': 'M',
'GTT': 'V',
'GTC': 'V',
'GTA': 'V',
'GTG': 'V',
'TCT': 'S',
'TCC': 'S',
'TCA': 'S',
'TCG': 'S',
'CCT': 'P',
'CCC': 'P',
'CCA': 'P',
'CCG': 'P',
'ACT': 'T',
'ACC': 'T',
'ACA': 'T',
'ACG': 'T',
'GCT': 'A',
'GCC': 'A',
'GCA': 'A',
'GCG': 'A',
'TAT': 'Y',
'TAC': 'Y',
'TAA': '*', // stop
'TAG': '*', // stop
'CAT': 'H',
'CAC': 'H',
'CAA': 'Q',
'CAG': 'Q',
'AAT': 'N',
'AAC': 'N',
'AAA': 'K',
'AAG': 'K',
'GAT': 'D',
'GAC': 'D',
'GAA': 'E',
'GAG': 'E',
'TGT': 'C',
'TGC': 'C',
'TGA': '*', // stop
'TGG': 'W',
'CGT': 'R',
'CGC': 'R',
'CGA': 'R',
'CGG': 'R',
'AGT': 'S',
'AGC': 'S',
'AGA': 'R',
'AGG': 'R',
'GGT': 'G',
'GGC': 'G',
'GGA': 'G',
'GGG': 'G'
}
function resolveUrlToPage(rel) {
return makeElement('a', null, {href: rel}).href;
} |
<<<<<<<
MICRO: 8,
PATCH: 'a',
BRANCH: 'dev'
};
=======
MICRO: 9,
PATCH: '',
BRANCH: ''
}
>>>>>>>
MICRO: 9,
PATCH: '',
BRANCH: 'dev'
}; |
<<<<<<<
Log.error(Utils.colors.error("File not found: "), configFileName);
return;
=======
console.error(Utils.colors.error("File not found: "), configFileName);
throw new Error("No config file present!");
>>>>>>>
Log.error(Utils.colors.error("File not found: "), configFileName);
throw new Error("No config file present!");
<<<<<<<
Log.log(Utils.colors.error(e));
return;
=======
console.log(Utils.colors.error(e));
throw new Error("No permission to access config file!");
>>>>>>>
Log.log(Utils.colors.error(e));
throw new Error("No permission to access config file!");
return;
<<<<<<<
Log.info(Utils.colors.info("Checking file... "), configFileName);
=======
// In case the there errors show messages and
// return
console.info(Utils.colors.info("Checking file... "), configFileName);
>>>>>>>
Log.info(Utils.colors.info("Checking file... "), configFileName); |
<<<<<<<
};
if (typeof module !== "undefined") {module.exports = translations;}
=======
"et" : "translations/et.json", // Estonian
};
>>>>>>>
"et" : "translations/et.json", // Estonian
};
if (typeof module !== "undefined") {module.exports = translations;} |
<<<<<<<
"is" : "translations/is.json", // Icelandic
=======
"ru" : "translations/ru.json", // Russian
"af" : "translations/af.json", // Afrikaans
"hu" : "translations/hu.json", // Hungarian
>>>>>>>
"ru" : "translations/ru.json", // Russian
"af" : "translations/af.json", // Afrikaans
"hu" : "translations/hu.json", // Hungarian
"is" : "translations/is.json", // Icelandic |
<<<<<<<
class: event.class,
firstYear: event.start.getFullYear()
=======
firstYear: event.start.getFullYear(),
location: location,
geo: geo,
description: description
>>>>>>>
class: event.class,
firstYear: event.start.getFullYear(),
location: location,
geo: geo,
description: description
<<<<<<<
fullDayEvent: fullDayEvent,
class: event.class
=======
fullDayEvent: fullDayEvent,
location: location,
geo: geo,
description: description
>>>>>>>
fullDayEvent: fullDayEvent,
class: event.class
location: location,
geo: geo,
description: description |
<<<<<<<
=======
export const getUsersByUsername = createSelector(
getUsers,
(users) => {
const usersByUsername = {};
for (const id in users) {
if (users.hasOwnProperty(id)) {
const user = users[id];
usersByUsername[user.username] = user;
}
}
return usersByUsername;
}
);
export function getAutocompleteUsersInChannel(state) {
return state.entities.users.autocompleteUsersInChannel;
}
>>>>>>>
export const getUsersByUsername = createSelector(
getUsers,
(users) => {
const usersByUsername = {};
for (const id in users) {
if (users.hasOwnProperty(id)) {
const user = users[id];
usersByUsername[user.username] = user;
}
}
return usersByUsername;
}
);
<<<<<<<
}
=======
}
export const getAutocompleteUsersInCurrentChannel = createSelector(
getCurrentChannelId,
getAutocompleteUsersInChannel,
(currentChannelId, autocompleteUsersInChannel) => {
return autocompleteUsersInChannel[currentChannelId] || {};
}
);
>>>>>>>
} |
<<<<<<<
import {General} from 'constants';
=======
import mimeDB from 'mime-db';
import {Constants} from 'constants';
>>>>>>>
import {General} from 'constants';
import mimeDB from 'mime-db'; |
<<<<<<<
import {ErrorTypes} from 'action_types';
=======
import serializeError from 'serialize-error';
import Client from 'client';
import {ErrorTypes} from 'constants';
>>>>>>>
import {ErrorTypes} from 'action_types';
import serializeError from 'serialize-error';
import Client from 'client'; |
<<<<<<<
const CLIENT_ID = '10525470235.apps.googleusercontent.com';
const CLIENT_SECRET = '4DERCyUerlYZDmc7qbneQlgf';
const SCOPES = 'https://www.googleapis.com/auth/drive.install ' +
'https://www.googleapis.com/auth/drive.file ' +
'https://www.googleapis.com/auth/drive.readonly.metadata';
window.googleAuth = null;
window.pendingAnalytics = [];
function initOauth2Object() {
window.googleAuth = new OAuth2('google', {
'client_id': CLIENT_ID,
'client_secret': CLIENT_SECRET,
'api_scope': SCOPES
});
}
=======
>>>>>>>
<<<<<<<
MessageHandling.prototype.checkDriveAuth = function(request, sendResponse) {
if (request && request.forceNew) {
window.googleAuth.clear();
window.googleAuth = null;
}
if (!window.googleAuth) {
initOauth2Object();
}
var at = window.googleAuth.getAccessToken();
if (at && window.googleAuth.isAccessTokenExpired()) {
at = null;
}
var data = null;
if (at) {
data = {
'access_token': at,
'expires_in': 3600
/*window.googleAuth.get('expiresIn') -
(~~((Date.now() - window.googleAuth.get('accessTokenDate')) / 1000))*/
};
}
sendResponse({
'payload': 'checkDriveAuth',
'response': data
});
};
MessageHandling.prototype.gdriveAuth = function(request, sendResponse) {
if (request && request.forceNew) {
window.googleAuth.clear();
window.googleAuth = null;
}
if (!window.googleAuth) {
initOauth2Object();
}
window.googleAuth.authorize(function() {
var at = window.googleAuth.getAccessToken();
if (at && window.googleAuth.isAccessTokenExpired()) {
at = null;
}
var data = null;
if (at) {
data = {
'access_token': at,
'expires_in': 3600
/*window.googleAuth.get('expiresIn') - (~~((Date.now() -
window.googleAuth.get('accessTokenDate')) / 1000))*/
};
}
sendResponse({
'payload': 'checkDriveAuth',
'response': data
});
});
};
MessageHandling.prototype.gdrive = function(request, sendResponse, sender) {
=======
MessageHandling.prototype.gdrive = function(request, sendResponse) {
>>>>>>>
MessageHandling.prototype.gdrive = function(request, sendResponse) { |
<<<<<<<
'*yarnpkg.com': 'usa',
'*cloudfront.net': 'usa',
=======
'assets.fastgit.org': 'usa',
>>>>>>>
'assets.fastgit.org': 'usa',
'*yarnpkg.com': 'usa',
'*cloudfront.net': 'usa', |
<<<<<<<
const path = require('path')
const filename = path.join(getDefaultConfigBasePath(), '/logs/gui.log')
=======
const level = process.env.NODE_ENV === 'development' ? 'debug' : 'info'
>>>>>>>
const level = process.env.NODE_ENV === 'development' ? 'debug' : 'info'
const path = require('path')
const filename = path.join(getDefaultConfigBasePath(), '/logs/gui.log')
<<<<<<<
appenders: { std: { type: 'stdout' }, file: { type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename } },
categories: { default: { appenders: ['file', 'std'], level: 'info' } }
=======
appenders: { std: { type: 'stdout' }, file: { type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename: getDefaultConfigBasePath() + '/logs/gui.log' } },
categories: { default: { appenders: ['file', 'std'], level: level } }
>>>>>>>
appenders: { std: { type: 'stdout' }, file: { type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename } },
categories: { default: { appenders: ['file', 'std'], level } } |
<<<<<<<
if (options.lockBody) {
lockBody(true);
}
},
_onEnd = function () {
targets = $([]);
$wrapper.remove().find('*').remove();
if (options.lockBody) {
lockBody(false);
=======
if (options.caption) {
$wrapper.append($captionObject);
>>>>>>>
if (options.caption) {
$wrapper.append($captionObject);
<<<<<<<
$wrapper.trigger('previous.ilb2');
=======
>>>>>>>
<<<<<<<
_loadImage('left');
=======
$wrapper.trigger("previous.ilb2");
_loadImage(-1);
>>>>>>>
$wrapper.trigger('previous.ilb2');
_loadImage(-1);
<<<<<<<
$wrapper.trigger('next.ilb2');
=======
>>>>>>>
<<<<<<<
_loadImage('right');
=======
$wrapper.trigger("next.ilb2");
_loadImage(+1);
>>>>>>>
$wrapper.trigger('next.ilb2');
_loadImage(+1);
<<<<<<<
$('#imagelightbox-loading').remove();
},
lockBody = function (toggle) {
if (toggle) {
$('body').css('overflow','hidden');
} else {
$('body').css('overflow','scroll');
}
=======
$('.imagelightbox-loading').remove();
>>>>>>>
$('.imagelightbox-loading').remove();
<<<<<<<
$wrapper.trigger('start.ilb2');
target = $target;
_loadImage();
=======
if (options.lockBody) {
$("body").addClass("imagelightbox-scroll-lock");
}
$wrapper.trigger("start.ilb2");
_loadImage(0);
>>>>>>>
if (options.lockBody) {
$('body').addClass('imagelightbox-scroll-lock');
}
$wrapper.trigger('start.ilb2');
_loadImage(0);
<<<<<<<
$wrapper.trigger('quit.ilb2');
=======
$wrapper.trigger("quit.ilb2");
if (options.lockBody) {
$("body").removeClass("imagelightbox-scroll-lock");
}
>>>>>>>
$wrapper.trigger('quit.ilb2');
if (options.lockBody) {
$('body').removeClass('imagelightbox-scroll-lock');
} |
<<<<<<<
targetSet = '',
targets = $([]),
target = $(),
targetIndex = 0, // Isn't it the same as currentIndex?
image = $(),
imageWidth = 0,
imageHeight = 0,
swipeDiff = 0,
inProgress = false,
currentIndex = 0,
=======
>>>>>>> |
<<<<<<<
options[prefix + 'transform'] = 'translateX(' + positionX + ')';
options[prefix + 'transition'] = prefix + 'transform ' + speed + 's ease-in';
=======
options[prefix + 'transform'] = 'translateX(' + positionX + ') translateY(-50%)';
options[prefix + 'transition'] = prefix + 'transform ' + speed + 's linear';
>>>>>>>
options[prefix + 'transform'] = 'translateX(' + positionX + ') translateY(-50%)';
options[prefix + 'transition'] = prefix + 'transform ' + speed + 's ease-in';
<<<<<<<
allowedTypes: 'png|jpg|jpeg|gif', // TODO make it work again
animationSpeed: 350,
=======
allowedTypes: 'png|jpg|jpeg|gif',
animationSpeed: 250,
>>>>>>>
allowedTypes: 'png|jpg|jpeg|gif',
animationSpeed: 350,
<<<<<<<
$wrapper.on("previous.ilb2 next.ilb2", function () {
$navItems.removeClass('active')
.eq(targets.index(target))
.addClass('active');
=======
$wrapper.on('previous.ilb2 next.ilb2', function () {
$navItems.removeClass('active').eq(targets.index(target)).addClass('active');
>>>>>>>
$wrapper.on('previous.ilb2 next.ilb2', function () {
$navItems.removeClass('active').eq(targets.index(target)).addClass('active');
<<<<<<<
image = $('<img id="' + options.id + '" />')
.attr('src', imgPath)
.on('load.ilb7', function () {
$wrapper.trigger("loaded.ilb2");
var params = {'opacity': 1};
image.appendTo($wrapper);
_setImage();
image.css('opacity', 0);
if (isCssTransitionSupport) {
cssTransitionTranslateX(image, (-1 * $windowWidth * direction / 3) + 'px', 0);
setTimeout(function () {
cssTransitionTranslateX(image, 0 + 'px', options.animationSpeed / 1000);
}, 50);
} else {
var imagePosLeft = parseInt(image.css('left'));
params.left = imagePosLeft + 'px';
image.css('left', imagePosLeft - 100 * direction + 'px');
}
=======
>>>>>>> |
<<<<<<<
if (Airbus_FMA.CurrentPlaneState.autoPilotThrottleActive && Airbus_FMA.CurrentPlaneState.thisFlightDirectorActive && (Airbus_FMA.CurrentPlaneState.highestThrottleDetent == ThrottleMode.FLEX_MCT)) {
=======
if (Airbus_FMA.CurrentPlaneState.autoPilotThrottleActive && (Airbus_FMA.CurrentPlaneState.highestThrottleDetent == ThrottleMode.FLEX_MCT)) {
>>>>>>>
if (Airbus_FMA.CurrentPlaneState.autoPilotThrottleActive && (Airbus_FMA.CurrentPlaneState.highestThrottleDetent == ThrottleMode.FLEX_MCT)) {
<<<<<<<
if (Airbus_FMA.CurrentPlaneState.autoPilotThrottleActive && Airbus_FMA.CurrentPlaneState.thisFlightDirectorActive &&
Airbus_FMA.CurrentPlaneState.highestThrottleDetent == ThrottleMode.AUTO && Airbus_FMA.CurrentPlaneState.anyAutoPilotsActive && !Column2.IsActive_VS() && (Column2.GetModeState_GS() != MODE_STATE.ENGAGED && Column2.GetModeState_GS() != MODE_STATE.CAPTURED) && !AltCaptured) {
=======
if (Airbus_FMA.CurrentPlaneState.autoPilotThrottleActive &&
Airbus_FMA.CurrentPlaneState.highestThrottleDetent == ThrottleMode.AUTO && Airbus_FMA.CurrentPlaneState.anyAutoPilotsActive) {
>>>>>>>
if (Airbus_FMA.CurrentPlaneState.autoPilotThrottleActive &&
Airbus_FMA.CurrentPlaneState.highestThrottleDetent == ThrottleMode.AUTO && Airbus_FMA.CurrentPlaneState.anyAutoPilotsActive) {
<<<<<<<
if (Airbus_FMA.CurrentPlaneState.anyAutoPilotsActive && Airbus_FMA.CurrentPlaneState.autoPilotAltitudeLockActive && Airbus_FMA.CurrentPlaneState.thisFlightDirectorActive) {
var diffAlt = Math.abs(Airbus_FMA.CurrentPlaneState.autoPilotAltitudeLockValue - Airbus_FMA.CurrentPlaneState.altitude);
=======
if (Airbus_FMA.CurrentPlaneState.anyAutoPilotsActive && Airbus_FMA.CurrentPlaneState.autoPilotAltitudeLockActive && Airbus_FMA.CurrentPlaneState.anyFlightDirectorsActive) {
const diffAlt = Math.abs(Airbus_FMA.CurrentPlaneState.autoPilotAltitudeLockValue - Airbus_FMA.CurrentPlaneState.altitude);
>>>>>>>
if (Airbus_FMA.CurrentPlaneState.anyAutoPilotsActive && Airbus_FMA.CurrentPlaneState.autoPilotAltitudeLockActive && Airbus_FMA.CurrentPlaneState.thisFlightDirectorActive) {
const diffAlt = Math.abs(Airbus_FMA.CurrentPlaneState.autoPilotAltitudeLockValue - Airbus_FMA.CurrentPlaneState.altitude);
<<<<<<<
if (Simplane.getAutoPilotAPPRHold() && Simplane.getAutoPilotGlideslopeHold() && Simplane.getAutoPilotApproachType() == 4 && Airbus_FMA.CurrentPlaneState.thisFlightDirectorActive) {
if (SimVar.GetSimVarValue("L:A32NX_OFF_GS", "bool") == 1 && Simplane.getAutoPilotAPPRActive()) {
=======
if (Simplane.getAutoPilotAPPRHold() && Simplane.getAutoPilotGlideslopeHold() && (!Simplane.getAutoPilotApproachLoaded() || Simplane.getAutoPilotApproachType() === 4) && Airbus_FMA.CurrentPlaneState.anyFlightDirectorsActive) {
if (SimVar.GetSimVarValue("L:A32NX_OFF_GS", "bool") === 1 && Simplane.getAutoPilotAPPRActive()) {
>>>>>>>
if (Simplane.getAutoPilotAPPRHold() && Simplane.getAutoPilotGlideslopeHold() && (!Simplane.getAutoPilotApproachLoaded() || Simplane.getAutoPilotApproachType() === 4) && Airbus_FMA.CurrentPlaneState.thisFlightDirectorActive) {
if (SimVar.GetSimVarValue("L:A32NX_OFF_GS", "bool") === 1 && Simplane.getAutoPilotAPPRActive()) { |
<<<<<<<
function patch ({user, namespace, name, body}) {
return Garden(user).namespaces(namespace).shoots(name).mergePatch({body})
=======
exports.patch = async function ({user, namespace, name, body}) {
return Garden(user).namespaces(namespace).shoots.mergePatch({name, body})
>>>>>>>
function patch ({user, namespace, name, body}) {
return Garden(user).namespaces(namespace).shoots.mergePatch({name, body}) |
<<<<<<<
this.A32NXCore = new A32NX_Core();
this.A32NXCore.init(this._lastTime);
=======
this.defaultInputErrorMessage = "NOT ALLOWED";
>>>>>>>
this.A32NXCore = new A32NX_Core();
this.A32NXCore.init(this._lastTime);
this.defaultInputErrorMessage = "NOT ALLOWED"; |
<<<<<<<
this.beforeTakeoffPhase = true; // MODIFIED
=======
this.externalPowerWhenApuMasterOnTimer = -1 // MODIFIED
this.doorPageActivated = false
this.selfTestDiv = this.querySelector("#SelfTestDiv");
this.selfTestTimer = -1;
this.selfTestTimerStarted = false;
>>>>>>>
this.beforeTakeoffPhase = true; // MODIFIED
this.externalPowerWhenApuMasterOnTimer = -1 // MODIFIED
this.doorPageActivated = false
this.selfTestDiv = this.querySelector("#SelfTestDiv");
this.selfTestTimer = -1;
this.selfTestTimerStarted = false;
<<<<<<<
// checks if the plane is on takeoff phase or else disables it.
var planeOnGround = SimVar.GetSimVarValue("SIM ON GROUND", "Bool"); // Temporary Sim Value
if(!planeOnGround && this.beforeTakeoffPhase) {
this.beforeTakeoffPhase = false;
}
=======
// modification ends here
>>>>>>>
// checks if the plane is on takeoff phase or else disables it.
var planeOnGround = SimVar.GetSimVarValue("SIM ON GROUND", "Bool"); // Temporary Sim Value
if(!planeOnGround && this.beforeTakeoffPhase) {
this.beforeTakeoffPhase = false;
}
// modification ends here |
<<<<<<<
let mcduStartPage = SimVar.GetSimVarValue("L:A320_NEO_CDU_START_PAGE", "number");
if (mcduStartPage < 1) {
if (mcduStartPage < 1) {
CDUIdentPage.ShowPage(this);
}
else if (mcduStartPage === 10) {
CDUDirectToPage.ShowPage(this);
}
else if (mcduStartPage === 20) {
CDUProgressPage.ShowPage(this);
}
else if (mcduStartPage === 30) {
CDUPerformancePage.ShowPage(this);
}
else if (mcduStartPage === 31) {
CDUPerformancePage.ShowTAKEOFFPage(this);
}
else if (mcduStartPage === 32) {
CDUPerformancePage.ShowCLBPage(this);
}
else if (mcduStartPage === 33) {
CDUPerformancePage.ShowCRZPage(this);
}
else if (mcduStartPage === 34) {
CDUPerformancePage.ShowDESPage(this);
}
else if (mcduStartPage === 35) {
CDUPerformancePage.ShowAPPRPage(this);
}
else if (mcduStartPage === 40) {
CDUInitPage.ShowPage1(this);
}
else if (mcduStartPage === 50) {
CDUDataIndexPage.ShowPage(this);
}
else if (mcduStartPage === 60) {
CDUFlightPlanPage.ShowPage(this);
}
else if (mcduStartPage === 70) {
CDUNavRadioPage.ShowPage(this);
}
else if (mcduStartPage === 80) {
CDUFuelPredPage.ShowPage(this);
}
;
}
this.electricity = this.querySelector("#Electricity")
=======
CDUIdentPage.ShowPage(this);
this.electricity = this.querySelector("#Electricity");
this.climbTransitionGroundAltitude = null;
>>>>>>>
let mcduStartPage = SimVar.GetSimVarValue("L:A320_NEO_CDU_START_PAGE", "number");
if (mcduStartPage < 1) {
if (mcduStartPage < 1) {
CDUIdentPage.ShowPage(this);
}
else if (mcduStartPage === 10) {
CDUDirectToPage.ShowPage(this);
}
else if (mcduStartPage === 20) {
CDUProgressPage.ShowPage(this);
}
else if (mcduStartPage === 30) {
CDUPerformancePage.ShowPage(this);
}
else if (mcduStartPage === 31) {
CDUPerformancePage.ShowTAKEOFFPage(this);
}
else if (mcduStartPage === 32) {
CDUPerformancePage.ShowCLBPage(this);
}
else if (mcduStartPage === 33) {
CDUPerformancePage.ShowCRZPage(this);
}
else if (mcduStartPage === 34) {
CDUPerformancePage.ShowDESPage(this);
}
else if (mcduStartPage === 35) {
CDUPerformancePage.ShowAPPRPage(this);
}
else if (mcduStartPage === 40) {
CDUInitPage.ShowPage1(this);
}
else if (mcduStartPage === 50) {
CDUDataIndexPage.ShowPage(this);
}
else if (mcduStartPage === 60) {
CDUFlightPlanPage.ShowPage(this);
}
else if (mcduStartPage === 70) {
CDUNavRadioPage.ShowPage(this);
}
else if (mcduStartPage === 80) {
CDUFuelPredPage.ShowPage(this);
}
;
}
this.electricity = this.querySelector("#Electricity")
this.climbTransitionGroundAltitude = null; |
<<<<<<<
setTemplate(template, large = false) {
=======
setTemplate(template) {
>>>>>>>
setTemplate(template, large = false) {
<<<<<<<
=======
getNavDataDateRange() {
return SimVar.GetGameVarValue("FLIGHT NAVDATA DATE RANGE", "string");
}
>>>>>>>
getNavDataDateRange() {
return SimVar.GetGameVarValue("FLIGHT NAVDATA DATE RANGE", "string");
} |
<<<<<<<
=======
const app = require('../../lib/app')
const common = require('../support/common')
>>>>>>>
const common = require('../support/common')
<<<<<<<
let app
before(function () {
app = global.createServer()
})
after(function () {
app.close()
})
=======
const sandbox = sinon.sandbox.create()
>>>>>>>
const sandbox = sinon.sandbox.create()
let app
before(function () {
app = global.createServer()
})
after(function () {
app.close()
}) |
<<<<<<<
this.handleRunningCadence_();
=======
this.handleRunningTemperature_();
>>>>>>>
this.handleRunningCadence_();
this.handleRunningTemperature_();
<<<<<<<
handleRunningCadence_: function() {
if (!this.userSettings_.activateRunningCadence) {
return;
}
if (_.isUndefined(window.pageView)) {
return;
}
// Avoid bike activity
if (window.pageView.activity().attributes.type != "Run") {
return;
}
if (!window.location.pathname.match(/^\/activities/)) {
return;
}
if (env.debugMode) console.log("Execute handleRunningCadence_()");
var runningCadenceModifier = new RunningCadenceModifier();
runningCadenceModifier.modify();
},
=======
handleRunningTemperature_: function() {
if (!this.userSettings_.activateRunningTemperature) {
return;
}
if (_.isUndefined(window.pageView)) {
return;
}
// Avoid bike activity
if (window.pageView.activity().attributes.type != "Run") {
return;
}
if (!window.location.pathname.match(/^\/activities/)) {
return;
}
if (env.debugMode) console.log("Execute handleRunningHeartRate_()");
var runningTemperatureModifier = new RunningTemperatureModifier();
runningTemperatureModifier.modify();
},
>>>>>>>
handleRunningCadence_: function() {
if (!this.userSettings_.activateRunningCadence) {
return;
}
if (_.isUndefined(window.pageView)) {
return;
}
// Avoid bike activity
if (window.pageView.activity().attributes.type != "Run") {
return;
}
if (!window.location.pathname.match(/^\/activities/)) {
return;
}
if (env.debugMode) console.log("Execute handleRunningCadence_()");
var runningCadenceModifier = new RunningCadenceModifier();
runningCadenceModifier.modify();
},
handleRunningTemperature_: function() {
if (!this.userSettings_.activateRunningTemperature) {
return;
}
if (_.isUndefined(window.pageView)) {
return;
}
// Avoid bike activity
if (window.pageView.activity().attributes.type != "Run") {
return;
}
if (!window.location.pathname.match(/^\/activities/)) {
return;
}
if (env.debugMode) console.log("Execute handleRunningHeartRate_()");
var runningTemperatureModifier = new RunningTemperatureModifier();
runningTemperatureModifier.modify();
}, |
<<<<<<<
optionEnableSub: 'reviveGoogleMapsLayerType'
}, {
optionKey: 'reviveGoogleMapsLayerType',
optionType: 'list',
optionLabels: ['All'],
optionList: [{
key: 'roadmap',
name: 'Roadmap'
}, {
key: 'satellite',
name: 'Satellite'
}, {
key: 'hybrid',
name: 'Satellite + Legends'
}, {
key: 'terrain',
name: 'Terrain'
}],
optionTitle: 'Default Google Maps layer type',
optionHtml: 'Do what title describes...',
=======
}, {
optionKey: 'displayActivityBestSplits',
optionType: 'checkbox',
optionTitle: 'Enable best splits into your cycling activities',
optionLabels: ['Cycling'],
optionHtml: 'This option allows to enable best splits into your cycling activities.',
>>>>>>>
optionEnableSub: 'reviveGoogleMapsLayerType'
}, {
optionKey: 'reviveGoogleMapsLayerType',
optionType: 'list',
optionLabels: ['All'],
optionList: [{
key: 'roadmap',
name: 'Roadmap'
}, {
key: 'satellite',
name: 'Satellite'
}, {
key: 'hybrid',
name: 'Satellite + Legends'
}, {
key: 'terrain',
name: 'Terrain'
}],
optionTitle: 'Default Google Maps layer type',
optionHtml: 'Do what title describes...',
}, {
optionKey: 'displayActivityBestSplits',
optionType: 'checkbox',
optionTitle: 'Enable best splits into your cycling activities',
optionLabels: ['Cycling'],
optionHtml: 'This option allows to enable best splits into your cycling activities.', |
<<<<<<<
const serviceAccountList = [
getServiceAccount('garden-foo', 'robot-foo'),
getServiceAccount('garden-bar', 'robot-bar')
]
const serviceAccountSecretList = [
getServiceAccountSecret('garden-foo', 'robot-foo'),
getServiceAccountSecret('garden-bar', 'robot-bar')
]
const gardenAdministrators = getAdministrators(['[email protected]'])
=======
const gardenAdministrators = ['[email protected]']
>>>>>>>
const serviceAccountList = [
getServiceAccount('garden-foo', 'robot-foo'),
getServiceAccount('garden-bar', 'robot-bar')
]
const serviceAccountSecretList = [
getServiceAccountSecret('garden-foo', 'robot-foo'),
getServiceAccountSecret('garden-bar', 'robot-bar')
]
const gardenAdministrators = ['[email protected]'] |
<<<<<<<
this.resource("submit-suggestion");
this.resource("faqs");
=======
//this.resource("submit-suggestion");
>>>>>>>
this.resource("faqs");
//this.resource("submit-suggestion"); |
<<<<<<<
export default Ember.Route.extend(ResetScrollMixin, {
=======
export default Ember.Route.extend({
meta: Ember.inject.service(),
>>>>>>>
export default Ember.Route.extend(ResetScrollMixin, {
meta: Ember.inject.service(), |
<<<<<<<
loadTemplate: function (filePath, options, callback) {
=======
getTemplate: function (filePath, options, callback) {
filePath = path.resolve(filePath);
>>>>>>>
loadTemplate: function (filePath, options, callback) {
filePath = path.resolve(filePath);
<<<<<<<
_loadDir: function (dirPath, options, callback) {
=======
_getDir: function (dirPath, options, callback) {
dirPath = path.resolve(dirPath);
>>>>>>>
_loadDir: function (dirPath, options, callback) {
dirPath = path.resolve(dirPath);
<<<<<<<
_loadFile: function (filePath, options, callback) {
=======
_getFile: function (filePath, options, callback) {
filePath = path.resolve(filePath);
>>>>>>>
_loadFile: function (filePath, options, callback) {
filePath = path.resolve(filePath); |
<<<<<<<
User.find({_id: { $in: m.topUsers }}, {_id: 1, banned: true, deactivated: true}).then(users => {
m.topUsers = users.filter(u => !u.banned && !u.deactivated).sort((a, b) => m.pixelCounts[b._id] - m.pixelCounts[a._id]).map(u => u.id);
m.isUpdating = false;
=======
User.find({_id: { $in: this.topUsers }}, {_id: 1, banned: true, deactivated: true}).then(users => {
this.topUsers = users.filter(u => !u.banned && !u.deactivated).sort((a, b) => this.pixelCounts[b._id] - this.pixelCounts[a._id]).map(u => u.id);
this.isUpdating = false;
this.lastUpdated = new Date();
>>>>>>>
User.find({_id: { $in: m.topUsers }}, {_id: 1, banned: true, deactivated: true}).then(users => {
m.topUsers = users.filter(u => !u.banned && !u.deactivated).sort((a, b) => m.pixelCounts[b._id] - m.pixelCounts[a._id]).map(u => u.id);
m.isUpdating = false;
this.lastUpdated = new Date(); |
<<<<<<<
// Don't allow Oauth logins from normal login area.
if(user.isOauth === true) return done(null, false, { error: { message: "Incorrect username or password provided.", code: "invalid_credentials" } });
=======
if (user.loginError()) return done(null, false, { error: user.loginError() });
>>>>>>>
// Don't allow Oauth logins from normal login area.
if(user.isOauth === true) return done(null, false, { error: { message: "Incorrect username or password provided.", code: "invalid_credentials" } });
if (user.loginError()) return done(null, false, { error: user.loginError() }); |
<<<<<<<
success : function( response ) {
=======
success : function(x) {
// This event is used to show an updated list of who will be notified of editorial comments and status updates.
$( '#ef-post_following_box' ).trigger( 'following_list_updated' );
>>>>>>>
success : function( response ) {
// This event is used to show an updated list of who will be notified of editorial comments and status updates.
$( '#ef-post_following_box' ).trigger( 'following_list_updated' ); |
<<<<<<<
var self = this;
// judge mousemove start or end
var isMoving = false;
var outer = self.outer;
=======
>>>>>>> |
<<<<<<<
if (Math.abs(offset[axis]) - Math.abs(offset[otherAxis]) > 10) {
evt.preventDefault();
=======
var res=this._moveHandler(evt);
if(!res&&Math.abs(offset[axis]) - Math.abs(offset[otherAxis]) > 10) {
>>>>>>>
var res=this._moveHandler(evt);
if(!res&&Math.abs(offset[axis]) - Math.abs(offset[otherAxis]) > 10) {
evt.preventDefault(); |
<<<<<<<
if (Math.abs(offset[axis]) - Math.abs(offset[otherAxis]) > 10) {
evt.preventDefault();
=======
var res = this._moveHandler(evt);
if (!res && Math.abs(offset[axis]) - Math.abs(offset[otherAxis]) > 10) {
>>>>>>>
var res = this._moveHandler(evt);
if (!res && Math.abs(offset[axis]) - Math.abs(offset[otherAxis]) > 10) {
evt.preventDefault(); |
<<<<<<<
=======
'use strict';
>>>>>>>
'use strict';
<<<<<<<
// loaded image
this.loadedImage = [];
// default type
=======
// default type
>>>>>>>
// loaded image
this.loadedImage = [];
// default type
<<<<<<<
// Callback function when your finger is moving
=======
this.isOverspread = opts.isOverspread || false;
// Callback function when your finger is moving
>>>>>>>
this.isOverspread = opts.isOverspread || false;
// Callback function when your finger is moving
<<<<<<<
// debug mode
this.log = opts.isDebug ? function(str) {console.log(str);} : function() {};
=======
// debug mode
this.log = opts.isDebug ? function (str) { console.log(str) } : function (){};
>>>>>>>
// debug mode
this.log = opts.isDebug ? function(str) {console.log(str);} : function() {};
<<<<<<<
// stop autoplay when window blur
=======
if (opts.animateType === 'tear' && this.isVertical) {
this.isOverspread = true;
}
// stop autoplay when window blur
>>>>>>>
if (opts.animateType === 'tear' && this.isVertical) {
this.isOverspread = true;
}
// stop autoplay when window blur
<<<<<<<
if (this.isVertical) {
offset = -offset;
}
=======
if (this.isVertical){
offset = -offset;
}
>>>>>>>
if (this.isVertical) {
offset = -offset;
}
<<<<<<<
dom.style.webkitTransformStyle = 'preserve-3d';
dom.style.webkitTransform = 'rotate' + rotateDirect + '(' + 90 * (offset / scale + i - 1) + 'deg) translateZ('
+ (0.888 * scale / 2) + 'px) scale(0.888)';
=======
dom.style.webkitTransformStyle = 'preserve-3d';
dom.style.webkitTransform = 'rotate' + rotateDirect + '(' + 90 * (offset / scale + i - 1) + 'deg) translateZ(' + (0.888 * scale / 2) + 'px) scale(0.888)';
>>>>>>>
dom.style.webkitTransformStyle = 'preserve-3d';
dom.style.webkitTransform = 'rotate' + rotateDirect + '(' + 90 * (offset / scale + i - 1) + 'deg) translateZ('
+ (0.888 * scale / 2) + 'px) scale(0.888)';
<<<<<<<
dom.style.webkitTransform = 'translateZ(' + (scale / 2) + 'px) rotate' + rotateDirect
+ '(' + 180 * (offset / scale + i - 1) + 'deg) scale(0.875)';
=======
dom.style.webkitTransform = 'translateZ(' + (scale / 2) + 'px) rotate' + rotateDirect + '(' + 180 * (offset/scale + i - 1) + 'deg) scale(0.875)';
>>>>>>>
dom.style.webkitTransform = 'translateZ(' + (scale / 2) + 'px) rotate' + rotateDirect
+ '(' + 180 * (offset / scale + i - 1) + 'deg) scale(0.875)';
<<<<<<<
this.wrap.style.webkitPerspective = scale * 4;
=======
>>>>>>>
<<<<<<<
dom.style.webkitTransform = 'scale(' + zoomScale + ', ' + zoomScale + ') translateZ(0) translate'
+ axis + '(' + ((1 + Math.abs(i - 1) * 0.2) * offset + scale * (i - 1)) + 'px)';
=======
dom.style.webkitTransform = 'scale(' + zoomScale + ', ' + zoomScale + ') translateZ(0) translate' + axis + '(' + ((1 + Math.abs(i - 1) * 0.2) * offset + scale * (i - 1)) + 'px)';
>>>>>>>
dom.style.webkitTransform = 'scale(' + zoomScale + ', ' + zoomScale + ') translateZ(0) translate'
+ axis + '(' + ((1 + Math.abs(i - 1) * 0.2) * offset + scale * (i - 1)) + 'px)';
<<<<<<<
if (this.type === 'pic') {
html = item.height / item.width > this.ratio
=======
if (this.type === 'pic' && !this.isOverspread) {
html = item.height / item.width > this.ratio
>>>>>>>
if (this.type === 'pic' && !this.isOverspread) {
html = item.height / item.width > this.ratio
<<<<<<<
}
else if (this.type === 'overspread') {
html = this.ratio < 1
? '<div style="height: 100%; width:100%; background:url('
+ item.content + ') center no-repeat; background-size:' + this.width + 'px auto;"></div>'
: '<div style="height: 100%; width:100%; background:url('
+ item.content + ') center no-repeat; background-size: auto ' + this.height + 'px;"></div>';
=======
}
else if (this.type === 'pic' && this.isOverspread) {
html = this.ratio < 1
? '<div style="height: 100%; width:100%; background:url(' + item.content + ') center no-repeat; background-size:' + this.width + 'px auto;"></div>'
: '<div style="height: 100%; width:100%; background:url(' + item.content + ') center no-repeat; background-size: auto ' + this.height + 'px;"></div>';
>>>>>>>
}
else if (this.type === 'pic' && this.isOverspread) {
html = this.ratio < 1
? '<div style="height: 100%; width:100%; background:url(' + item.content
+ ') center no-repeat; background-size:' + this.width + 'px auto;"></div>'
: '<div style="height: 100%; width:100%; background:url(' + item.content
+ ') center no-repeat; background-size: auto ' + this.height + 'px;"></div>';
<<<<<<<
this._preLoadImg(this.els);
// append ul to div#canvas
=======
// append ul to div#canvas
>>>>>>>
this._preLoadImg(this.els);
// append ul to div#canvas
<<<<<<<
// get image size when the image is ready
iSlider.prototype._getImgSize = function(img, index) {
var self = this;
if (this.data[index].width === undefined
|| this.data[index].height === undefined) {
img.onload = function() {
self.data[index].height = img.height;
self.data[index].width = img.width;
};
}
};
// start loading image
iSlider.prototype._startLoadingImg = function(index, direction) {
var dirIndex = (direction === 'right') ? 1 : 0;
this.loadedImage[dirIndex] = new Image();
this.loadedImage[dirIndex].src = this.data[index].content;
this._getImgSize(this.loadedImage[dirIndex], index);
};
// pre load image
iSlider.prototype._preLoadImg = function(els) {
var self = this;
var dataLen = this.data.length;
var elsLen = els.length;
var imgCompleteNum = 0;
var sliderIndex = [dataLen - 1, 0, 1];
var isImgComplete = setTimeout(function() {
for (var i = 0; i < elsLen; i++) {
if (els[i].children[0] && els[i].children[0].complete) {
self._getImgSize(els[i].children[0], sliderIndex[i]);
imgCompleteNum++;
}
}
if (imgCompleteNum >= 2) {
clearTimeout(isImgComplete);
self._startLoadingImg(2, 'right');
if (dataLen - 2 !== 3 && self.isLooping) {
self._startLoadingImg(dataLen - 2, 'left');
}
}
else {
self._preLoadImg(els);
}
}, 200);
};
// logical slider, control left or right
=======
// logical slider, control left or right
>>>>>>>
// get image size when the image is ready
iSlider.prototype._getImgSize = function(img, index) {
var self = this;
if (this.data[index].width === undefined
|| this.data[index].height === undefined) {
img.onload = function() {
self.data[index].height = img.height;
self.data[index].width = img.width;
};
}
};
// start loading image
iSlider.prototype._startLoadingImg = function(index, direction) {
var dirIndex = (direction === 'right') ? 1 : 0;
this.loadedImage[dirIndex] = new Image();
this.loadedImage[dirIndex].src = this.data[index].content;
this._getImgSize(this.loadedImage[dirIndex], index);
};
// pre load image
iSlider.prototype._preLoadImg = function(els) {
var self = this;
var dataLen = this.data.length;
var elsLen = els.length;
var imgCompleteNum = 0;
var sliderIndex = [dataLen - 1, 0, 1];
var isImgComplete = setTimeout(function() {
for (var i = 0; i < elsLen; i++) {
if (els[i].children[0] && els[i].children[0].complete) {
self._getImgSize(els[i].children[0], sliderIndex[i]);
imgCompleteNum++;
}
}
if (imgCompleteNum >= 2) {
clearTimeout(isImgComplete);
self._startLoadingImg(2, 'right');
if (dataLen - 2 !== 3 && self.isLooping) {
self._startLoadingImg(dataLen - 2, 'left');
}
}
else {
self._preLoadImg(els);
}
}, 200);
};
// logical slider, control left or right
<<<<<<<
this.sliderIndex = n > 0 ? 0 : data.length - 1;
}
else {
=======
this.sliderIndex = n > 0 ? 0 : data.length - 1;
}
else {
>>>>>>>
this.sliderIndex = n > 0 ? 0 : data.length - 1;
}
else {
<<<<<<<
// enable autoplay
iSlider.prototype.play = function() {
=======
// enable autoplay
iSlider.prototype.play = function () {
>>>>>>>
// enable autoplay
iSlider.prototype.play = function() {
<<<<<<<
// pause autoplay
iSlider.prototype.pause = function() {
=======
// pause autoplay
iSlider.prototype.pause = function () {
>>>>>>>
// pause autoplay
iSlider.prototype.pause = function() {
<<<<<<<
// plugin extend
iSlider.prototype.extend = function(plugin) {
var fn = iSlider.prototype;
=======
// plugin extend
iSlider.prototype.extend = function(plugin, main){
if (!main) {
var main = iSlider.prototype;
}
>>>>>>>
// plugin extend
iSlider.prototype.extend = function(plugin, main) {
if (!main) {
var main = iSlider.prototype;
}
<<<<<<<
Object.defineProperty(fn, property, Object.getOwnPropertyDescriptor(plugin, property));
=======
Object.defineProperty(main, property, Object.getOwnPropertyDescriptor(plugin, property));
>>>>>>>
Object.defineProperty(main, property, Object.getOwnPropertyDescriptor(plugin, property)); |
<<<<<<<
initOnStart({ turnID } = {}) {
this.turnID = turnID;
this.score = 0;
}
initOnRound({ tellerID = '', cards = [] } = {}) {
this.isTeller = this.socketID === tellerID;
this.cards = cards;
}
toggleReady(isReady) {
=======
initRound() {
this.submittedCard = null;
this.votedCard = null;
this.isTeller = false;
this.isReady = false;
}
setReady(isReady) {
>>>>>>>
initOnStart({ turnID } = {}) {
this.turnID = turnID;
this.score = 0;
}
initOnRound({ tellerID = '', cards = [] } = {}) {
this.submittedCard = null;
this.votedCard = null;
this.isReady = false;
this.isTeller = this.socketID === tellerID;
this.cards = cards;
}
setReady(isReady) { |
<<<<<<<
socket.on('update player', onUpdatePlayer);
=======
socket.on('ready player', onReadyPlayer);
>>>>>>>
socket.on('update player', onUpdatePlayer);
socket.on('ready player', onReadyPlayer); |
<<<<<<<
DUCK_THROTTLE: 100,
DUCK_SPEED: 1000,
=======
LIFT_CARD_UP: 4500,
LIFT_CARD_DELETE: 3500,
NONE_INTERVAL: 0,
WRAP_UP: {
TELLER_SELECT: 3500,
},
>>>>>>>
DUCK_THROTTLE: 100,
DUCK_SPEED: 1000,
LIFT_CARD_UP: 4500,
LIFT_CARD_DELETE: 3500,
NONE_INTERVAL: 0,
WRAP_UP: {
TELLER_SELECT: 3500,
}, |
<<<<<<<
const { NicknameInput } = renderWaitingRoom(roomID);
setupWaitingRoomSocket();
=======
const { NicknameInput, AllReadyText } = renderWaitingRoom(roomID);
// const { PlayerList } = renderLeftTab();
setupWaitingRoomSocket({ AllReadyText });
>>>>>>>
const { NicknameInput, AllReadyText } = renderWaitingRoom(roomID);
setupWaitingRoomSocket({ AllReadyText }); |
<<<<<<<
};
export const changeNickname = (NicknameInput) => {
const newNickname = NicknameInput.instance.value;
if (!newNickname || newNickname.length > 12) {
// 이전 닉네임으로 되돌아가는 기능 추가해야 함
return;
}
socket.emit('update player', { nickname: newNickname, color: '#578' });
=======
};
export const toggleReady = ({ target }) => {
const { isReady } = JSON.parse(target.dataset.data);
// const nextStatus = target.dataset.status === 'not ready';
const nextStatus = !isReady;
// target.dataset.status = nextStatus ? 'ready' : 'not ready';
target.dataset.data = JSON.stringify({ isReady: nextStatus });
target.classList.toggle('button-primary');
target.classList.toggle('button-primary-clicked');
socket.emit('ready player', { isReady: nextStatus });
>>>>>>>
};
export const changeNickname = (NicknameInput) => {
const newNickname = NicknameInput.instance.value;
if (!newNickname || newNickname.length > 12) {
// 이전 닉네임으로 되돌아가는 기능 추가해야 함
return;
}
socket.emit('update player', { nickname: newNickname, color: '#578' });
};
export const toggleReady = ({ target }) => {
const { isReady } = JSON.parse(target.dataset.data);
// const nextStatus = target.dataset.status === 'not ready';
const nextStatus = !isReady;
// target.dataset.status = nextStatus ? 'ready' : 'not ready';
target.dataset.data = JSON.stringify({ isReady: nextStatus });
target.classList.toggle('button-primary');
target.classList.toggle('button-primary-clicked');
socket.emit('ready player', { isReady: nextStatus }); |
<<<<<<<
/*Tests_SRS_NODE_COMMON_MQTT_BASE_16_009: [** If the message has properties, the property keys and values shall be uri-encoded, then serialized and appended at the end of the topic with the following convention: `<key>=<value>&<key2>=<value2>&<key3>=<value3>(...)`.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_038: [ If the outputEvent message has properties, the property keys and values shall be uri-encoded, then serialized and appended at the end of the topic with the following convention: `<key>=<value>&<key2>=<value2>&<key3>=<value3>(...)`. ]*/
it('correctly serializes properties on the topic', function(done) {
=======
[
/*Tests_SRS_NODE_COMMON_MQTT_BASE_16_011: [The `sendEvent` method shall serialize the `messageId` property of the message as a key-value pair on the topic with the key `$.mid`.]*/
{ propName: 'messageId', serializedAs: '%24.mid', fakeValue: 'fakeMessageId' },
/*Tests_SRS_NODE_COMMON_MQTT_BASE_16_012: [The `sendEvent` method shall serialize the `correlationId` property of the message as a key-value pair on the topic with the key `$.cid`.]*/
{ propName: 'correlationId', serializedAs: '%24.cid', fakeValue: 'fakeCorrelationId' },
/*Tests_SRS_NODE_COMMON_MQTT_BASE_16_013: [The `sendEvent` method shall serialize the `userId` property of the message as a key-value pair on the topic with the key `$.uid`.]*/
{ propName: 'userId', serializedAs: '%24.uid', fakeValue: 'fakeUserId' },
/*Tests_SRS_NODE_COMMON_MQTT_BASE_16_014: [The `sendEvent` method shall serialize the `to` property of the message as a key-value pair on the topic with the key `$.to`.]*/
{ propName: 'to', serializedAs: '%24.to', fakeValue: 'fakeTo' },
/*Tests_SRS_NODE_COMMON_MQTT_BASE_16_015: [The `sendEvent` method shall serialize the `expiryTimeUtc` property of the message as a key-value pair on the topic with the key `$.exp`.]*/
{ propName: 'expiryTimeUtc', serializedAs: '%24.exp', fakeValue: 'fakeDateString' },
{ propName: 'expiryTimeUtc', serializedAs: '%24.exp', fakeValue: new Date(1970, 1, 1), fakeSerializedValue: encodeURIComponent(new Date(1970, 1, 1).toISOString()) },
/*Tests_SRS_NODE_DEVICE_MQTT_16_083: [The `sendEvent` method shall serialize the `contentEncoding` property of the message as a key-value pair on the topic with the key `$.ce`.]*/
{ propName: 'contentEncoding', serializedAs: '%24.ce', fakeValue: 'utf-8' },
/*Tests_SRS_NODE_DEVICE_MQTT_16_084: [The `sendEvent` method shall serialize the `contentType` property of the message as a key-value pair on the topic with the key `$.ct`.]*/
{ propName: 'contentType', serializedAs: '%24.ct', fakeValue: 'application/json', fakeSerializedValue: encodeURIComponent('application/json') }
].forEach(function(testProperty) {
it('serializes Message.' + testProperty.propName + ' as ' + decodeURIComponent(testProperty.serializedAs) + ' on the topic', function(done) {
>>>>>>>
/*Tests_SRS_NODE_COMMON_MQTT_BASE_16_009: [** If the message has properties, the property keys and values shall be uri-encoded, then serialized and appended at the end of the topic with the following convention: `<key>=<value>&<key2>=<value2>&<key3>=<value3>(...)`.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_038: [ If the outputEvent message has properties, the property keys and values shall be uri-encoded, then serialized and appended at the end of the topic with the following convention: `<key>=<value>&<key2>=<value2>&<key3>=<value3>(...)`. ]*/
it('correctly serializes properties on the topic', function(done) {
<<<<<<<
topicName: 'devices/deviceId/messages/devicebound/#'
},
{
=======
topicName: 'devices/deviceId/messages/devicebound/#',
qos: 1
},
{
>>>>>>>
topicName: 'devices/deviceId/messages/devicebound/#',
qos: 1
},
{
<<<<<<<
topicName: '$iothub/methods/POST/#'
},
{
methodName: 'enableTwin',
topicName: '$iothub/twin/res/#'
},
{
methodName: 'enableInputMessages',
moduleId: 'moduleId',
topicName: 'devices/deviceId/modules/moduleId/inputs/#'
},
=======
topicName: '$iothub/methods/POST/#',
qos: 0
}
>>>>>>>
topicName: '$iothub/methods/POST/#',
qos: 0
},
{
methodName: 'enableInputMessages',
moduleId: 'moduleId',
topicName: 'devices/deviceId/modules/moduleId/inputs/#',
qos: 1
},
<<<<<<<
/*Tests_SRS_NODE_DEVICE_MQTT_16_057: [`enableTwin` shall connect the MQTT connection if it is disconnected.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_059: [ `enableInputMessages` shall connect the MQTT connection if it is disconnected. ]*/
=======
/*Tests_SRS_NODE_DEVICE_MQTT_16_057: [`enableTwinDesiredPropertiesUpdates` shall connect the MQTT connection if it is disconnected.]*/
>>>>>>>
/*Tests_SRS_NODE_DEVICE_MQTT_16_057: [`enableTwinDesiredPropertiesUpdates` shall connect the MQTT connection if it is disconnected.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_059: [ `enableInputMessages` shall connect the MQTT connection if it is disconnected. ]*/
<<<<<<<
/*Tests_SRS_NODE_DEVICE_MQTT_16_060: [`enableTwin` shall call its callback with no arguments when the `SUBACK` packet is received.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_062: [ `enableInputMessages` shall call its callback with no arguments when the `SUBACK` packet is received. ]*/
=======
>>>>>>>
/*Tests_SRS_NODE_DEVICE_MQTT_18_062: [ `enableInputMessages` shall call its callback with no arguments when the `SUBACK` packet is received. ]*/
<<<<<<<
/*Tests_SRS_NODE_DEVICE_MQTT_16_059: [`enableTwin` shall subscribe to the MQTT topics for twins.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_061: [ `enableInputMessages` shall subscribe to the MQTT topic for inputMessages. ]*/
assert.equal(fakeMqttBase.subscribe.firstCall.args[0], testConfig.topicName);
=======
assert.isTrue(fakeMqttBase.subscribe.calledWith(testConfig.topicName));
assert.strictEqual(fakeMqttBase.subscribe.firstCall.args[1].qos, testConfig.qos);
>>>>>>>
/*Tests_SRS_NODE_DEVICE_MQTT_18_061: [ `enableInputMessages` shall subscribe to the MQTT topic for inputMessages. ]*/
assert.equal(fakeMqttBase.subscribe.firstCall.args[0], testConfig.topicName);
assert.strictEqual(fakeMqttBase.subscribe.firstCall.args[1].qos, testConfig.qos);
<<<<<<<
/*Tests_SRS_NODE_DEVICE_MQTT_16_058: [`enableTwin` shall calls its callback with an `Error` object if it fails to connect.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_060: [ `enableInputMessages` shall calls its callback with an `Error` object if it fails to connect. ]*/
=======
/*Tests_SRS_NODE_DEVICE_MQTT_16_058: [`enableTwinDesiredPropertiesUpdates` shall calls its callback with an `Error` object if it fails to connect.]*/
>>>>>>>
/*Tests_SRS_NODE_DEVICE_MQTT_16_058: [`enableTwinDesiredPropertiesUpdates` shall calls its callback with an `Error` object if it fails to connect.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_060: [ `enableInputMessages` shall calls its callback with an `Error` object if it fails to connect. ]*/
<<<<<<<
/*Tests_SRS_NODE_DEVICE_MQTT_16_061: [`enableTwin` shall call its callback with an `Error` if subscribing to the topics fails.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_063: [ `enableInputMessages` shall call its callback with an `Error` if subscribing to the topic fails. ]*/
=======
/*Tests_SRS_NODE_DEVICE_MQTT_16_061: [`enableTwinDesiredPropertiesUpdates` shall call its callback with an `Error` if subscribing to the topics fails.]*/
>>>>>>>
/*Tests_SRS_NODE_DEVICE_MQTT_16_061: [`enableTwinDesiredPropertiesUpdates` shall call its callback with an `Error` if subscribing to the topics fails.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_063: [ `enableInputMessages` shall call its callback with an `Error` if subscribing to the topic fails. ]*/
<<<<<<<
{ enableFeatureMethod: 'enableTwin', disableFeatureMethod: 'disableTwin' },
{ enableFeatureMethod: 'enableInputMessages', disableFeatureMethod: 'disableInputMessages', moduleId: 'moduleId' }
=======
{ enableFeatureMethod: 'enableTwinDesiredPropertiesUpdates', disableFeatureMethod: 'disableTwinDesiredPropertiesUpdates' }
>>>>>>>
{ enableFeatureMethod: 'enableTwin', disableFeatureMethod: 'disableTwin' },
{ enableFeatureMethod: 'enableInputMessages', disableFeatureMethod: 'disableInputMessages', moduleId: 'moduleId' }
<<<<<<<
/*Tests_SRS_NODE_DEVICE_MQTT_16_062: [`disableTwin` shall call its callback immediately if the MQTT connection is already disconnected.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_064: [ `disableInputMessages` shall call its callback immediately if the MQTT connection is already disconnected. ]*/
=======
/*Tests_SRS_NODE_DEVICE_MQTT_16_062: [`disableTwinDesiredPropertiesUpdates` shall call its callback immediately if the MQTT connection is already disconnected.]*/
>>>>>>>
/*Tests_SRS_NODE_DEVICE_MQTT_16_062: [`disableTwinDesiredPropertiesUpdates` shall call its callback immediately if the MQTT connection is already disconnected.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_064: [ `disableInputMessages` shall call its callback immediately if the MQTT connection is already disconnected. ]*/
<<<<<<<
/*Tests_SRS_NODE_DEVICE_MQTT_16_065: [`disableTwin` shall call its callback with an `Error` if an error is received while unsubscribing.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_067: [ `disableInputMessages` shall call its callback with an `Error` if an error is received while unsubscribing. ]*/
=======
/*Tests_SRS_NODE_DEVICE_MQTT_16_065: [`disableTwinDesiredPropertiesUpdates` shall call its callback with an `Error` if an error is received while unsubscribing.]*/
>>>>>>>
/*Tests_SRS_NODE_DEVICE_MQTT_16_065: [`disableTwinDesiredPropertiesUpdates` shall call its callback with an `Error` if an error is received while unsubscribing.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_067: [ `disableInputMessages` shall call its callback with an `Error` if an error is received while unsubscribing. ]*/
<<<<<<<
/*Tests_SRS_NODE_DEVICE_MQTT_16_064: [`disableTwin` shall call its callback with no arguments when the `UNSUBACK` packet is received.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_066: [ `disableInputMessages` shall call its callback with no arguments when the `UNSUBACK` packet is received. ]*/
=======
/*Tests_SRS_NODE_DEVICE_MQTT_16_064: [`disableTwinDesiredPropertiesUpdates` shall call its callback with no arguments when the `UNSUBACK` packet is received.]*/
>>>>>>>
/*Tests_SRS_NODE_DEVICE_MQTT_16_064: [`disableTwinDesiredPropertiesUpdates` shall call its callback with no arguments when the `UNSUBACK` packet is received.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_066: [ `disableInputMessages` shall call its callback with no arguments when the `UNSUBACK` packet is received. ]*/
<<<<<<<
/*Tests_SRS_NODE_DEVICE_MQTT_16_063: [`disableTwin` shall unsubscribe from the topics for twin messages.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_065: [ `disableInputMessages` shall unsubscribe from the topic for inputMessages. ]*/
=======
/*Tests_SRS_NODE_DEVICE_MQTT_16_063: [`disableTwinDesiredPropertiesUpdates` shall unsubscribe from the topics for twin messages.]*/
>>>>>>>
/*Tests_SRS_NODE_DEVICE_MQTT_16_063: [`disableTwinDesiredPropertiesUpdates` shall unsubscribe from the topics for twin messages.]*/
/*Tests_SRS_NODE_DEVICE_MQTT_18_065: [ `disableInputMessages` shall unsubscribe from the topic for inputMessages. ]*/ |
<<<<<<<
import SPELLS_WARLOCK from './SPELLS_WARLOCK';
=======
import SPELLS_DEMON_HUNTER from './SPELLS_DEMON_HUNTER';
>>>>>>>
import SPELLS_WARLOCK from './SPELLS_WARLOCK';
import SPELLS_DEMON_HUNTER from './SPELLS_DEMON_HUNTER';
<<<<<<<
...SPELLS_WARLOCK,
=======
...SPELLS_DEMON_HUNTER,
>>>>>>>
...SPELLS_WARLOCK,
...SPELLS_DEMON_HUNTER, |
<<<<<<<
const getRoot = function() {
let root = document.getElementById('smarttoc_wrapper')
if (!root) {
root = document.body.appendChild(document.createElement('DIV'))
root.id = 'smarttoc_wrapper'
}
return root
}
export default function createTOC({ article, headings, userOffset = [0, 0] }) {
headings = addAnchors(headings)
=======
export default function createTOC({
article,
$headings: $headings_,
userOffset = [0, 0]
}) {
const $headings = $headings_.map(addAnchors)
>>>>>>>
const getRoot = function() {
let root = document.getElementById('smarttoc_wrapper')
if (!root) {
root = document.body.appendChild(document.createElement('DIV'))
root.id = 'smarttoc_wrapper'
}
return root
}
export default function createTOC({
article,
$headings: $headings_,
userOffset = [0, 0]
}) {
const $headings = $headings_.map(addAnchors)
<<<<<<<
m.mount(
getRoot(),
Container({
article,
scrollable,
headings,
theme,
$activeHeading,
$isShow,
$userOffset,
$relayout,
$scroll,
$topbarHeight,
onClickHeading
})
)
=======
const container = Container({
article,
scrollable,
$headings,
theme,
$activeHeading,
$isShow,
$userOffset,
$relayout,
$scroll,
$topbarHeight,
onClickHeading
})
mount(document.body, container)
>>>>>>>
m.mount(
getRoot(),
Container({
article,
scrollable,
$headings,
theme,
$activeHeading,
$isShow,
$userOffset,
$relayout,
$scroll,
$topbarHeight,
onClickHeading
})
) |
<<<<<<<
it('should detect interfaces added to types', () => {
const interface1 = new GraphQLInterfaceType({
name: 'Interface1',
fields: {
field1: { type: GraphQLString },
},
resolveType: () => null,
});
const oldType = new GraphQLObjectType({
name: 'Type1',
interfaces: [],
fields: {
field1: {
type: GraphQLString,
},
},
});
const newType = new GraphQLObjectType({
name: 'Type1',
interfaces: [
interface1
],
fields: {
field1: {
type: GraphQLString,
},
},
});
const oldSchema = new GraphQLSchema({
query: queryType,
types: [
oldType,
]
});
const newSchema = new GraphQLSchema({
query: queryType,
types: [
newType,
]
});
expect(
findInterfacesAddedToObjectTypes(oldSchema, newSchema)
).to.eql([
{
description: 'Interface1 added to interfaces implemented by Type1.',
type: DangerousChangeType.INTERFACE_ADDED_TO_OBJECT
}
]);
});
=======
it('should detect if a type was added to a union type', () => {
const type1 = new GraphQLObjectType({
name: 'Type1',
fields: {
field1: { type: GraphQLString },
}
});
// logially equivalent to type1; findTypesRemovedFromUnions should not
// treat this as different than type1
const type1a = new GraphQLObjectType({
name: 'Type1',
fields: {
field1: { type: GraphQLString },
}
});
const type2 = new GraphQLObjectType({
name: 'Type2',
fields: {
field1: { type: GraphQLString },
}
});
const oldUnionType = new GraphQLUnionType({
name: 'UnionType1',
types: [ type1 ],
resolveType: () => null,
});
const newUnionType = new GraphQLUnionType({
name: 'UnionType1',
types: [ type1a, type2 ],
resolveType: () => null,
});
const oldSchema = new GraphQLSchema({
query: queryType,
types: [
oldUnionType,
]
});
const newSchema = new GraphQLSchema({
query: queryType,
types: [
newUnionType,
]
});
expect(findTypesAddedToUnions(oldSchema, newSchema)).to.eql([
{
type: DangerousChangeType.TYPE_ADDED_TO_UNION,
description: 'Type2 was added to union type UnionType1.',
},
]);
});
>>>>>>>
it('should detect interfaces added to types', () => {
const interface1 = new GraphQLInterfaceType({
name: 'Interface1',
fields: {
field1: { type: GraphQLString },
},
resolveType: () => null,
});
const oldType = new GraphQLObjectType({
name: 'Type1',
interfaces: [],
fields: {
field1: {
type: GraphQLString,
},
},
});
const newType = new GraphQLObjectType({
name: 'Type1',
interfaces: [
interface1
],
fields: {
field1: {
type: GraphQLString,
},
},
});
const oldSchema = new GraphQLSchema({
query: queryType,
types: [
oldType,
]
});
const newSchema = new GraphQLSchema({
query: queryType,
types: [
newType,
]
});
expect(
findInterfacesAddedToObjectTypes(oldSchema, newSchema)
).to.eql([
{
description: 'Interface1 added to interfaces implemented by Type1.',
type: DangerousChangeType.INTERFACE_ADDED_TO_OBJECT
}
]);
});
it('should detect if a type was added to a union type', () => {
const type1 = new GraphQLObjectType({
name: 'Type1',
fields: {
field1: { type: GraphQLString },
}
});
// logially equivalent to type1; findTypesRemovedFromUnions should not
// treat this as different than type1
const type1a = new GraphQLObjectType({
name: 'Type1',
fields: {
field1: { type: GraphQLString },
}
});
const type2 = new GraphQLObjectType({
name: 'Type2',
fields: {
field1: { type: GraphQLString },
}
});
const oldUnionType = new GraphQLUnionType({
name: 'UnionType1',
types: [ type1 ],
resolveType: () => null,
});
const newUnionType = new GraphQLUnionType({
name: 'UnionType1',
types: [ type1a, type2 ],
resolveType: () => null,
});
const oldSchema = new GraphQLSchema({
query: queryType,
types: [
oldUnionType,
]
});
const newSchema = new GraphQLSchema({
query: queryType,
types: [
newUnionType,
]
});
expect(findTypesAddedToUnions(oldSchema, newSchema)).to.eql([
{
type: DangerousChangeType.TYPE_ADDED_TO_UNION,
description: 'Type2 was added to union type UnionType1.',
},
]);
});
<<<<<<<
},
{
description: 'Interface1 added to interfaces implemented ' +
'by TypeThatGainsInterface1.',
type: DangerousChangeType.INTERFACE_ADDED_TO_OBJECT
=======
},
{
type: DangerousChangeType.TYPE_ADDED_TO_UNION,
description: 'TypeInUnion2 was added to union type ' +
'UnionTypeThatGainsAType.',
>>>>>>>
},
{
description: 'Interface1 added to interfaces implemented ' +
'by TypeThatGainsInterface1.',
type: DangerousChangeType.INTERFACE_ADDED_TO_OBJECT
},
{
type: DangerousChangeType.TYPE_ADDED_TO_UNION,
description: 'TypeInUnion2 was added to union type ' +
'UnionTypeThatGainsAType.', |
<<<<<<<
'config',
'ngTagsInput'
=======
'angularSpinner',
'config'
>>>>>>>
'angularSpinner',
'config',
'ngTagsInput' |
<<<<<<<
schema: []
=======
docs: {
url: 'https://github.com/Gillespie59/eslint-plugin-angular/blob/master/docs/rules/definedundefined.md'
},
schema: [],
fixable: 'code'
>>>>>>>
docs: {
url: 'https://github.com/Gillespie59/eslint-plugin-angular/blob/master/docs/rules/definedundefined.md'
},
schema: [] |
<<<<<<<
/**
* All your services should have a name starting with the parameter you can define in your config object.
* The second parameter can be a Regexp wrapped in quotes.
* You can not prefix your services by "$" (reserved keyword for AngularJS services) ("service-name": [2, "ng"]) [Y125](https://github.com/johnpapa/angular-styleguide#style-y125)
*
* @ruleName service-name
* @config 2
*/
module.exports = function(context) {
'use strict';
=======
'use strict';
>>>>>>>
/**
* All your services should have a name starting with the parameter you can define in your config object.
* The second parameter can be a Regexp wrapped in quotes.
* You can not prefix your services by "$" (reserved keyword for AngularJS services) ("service-name": [2, "ng"]) [Y125](https://github.com/johnpapa/angular-styleguide#style-y125)
*
* @ruleName service-name
* @config 2
*/
'use strict'; |
<<<<<<<
/**
* You should use the angular.isFunction method instead of the default JavaScript implementation (typeof function(){} ==="[object Function]").
*
* @ruleName typecheck-function
* @config 2
*/
module.exports = function(context) {
'use strict';
=======
'use strict';
>>>>>>>
/**
* You should use the angular.isFunction method instead of the default JavaScript implementation (typeof function(){} ==="[object Function]").
*
* @ruleName typecheck-function
* @config 2
*/
'use strict'; |
<<<<<<<
/**
* You should use the angular.isString method instead of the default JavaScript implementation (typeof "" === "[object String]").
*
* @ruleName typecheck-string
* @config 2
*/
module.exports = function(context) {
'use strict';
=======
'use strict';
>>>>>>>
/**
* You should use the angular.isString method instead of the default JavaScript implementation (typeof "" === "[object String]").
*
* @ruleName typecheck-string
* @config 2
*/
'use strict'; |
<<<<<<<
/**
* All your directives should have a name starting with the parameter you can define in your config object.
* The second parameter can be a Regexp wrapped in quotes.
* You can not prefix your directives by "ng" (reserved keyword for AngularJS directives) ("directive-name": [2, "ng"]) [Y073](https://github.com/johnpapa/angular-styleguide#style-y073), [Y126](https://github.com/johnpapa/angular-styleguide#style-y126)
*
* @ruleName directive-name
* @config 0
*/
module.exports = function(context) {
'use strict';
=======
'use strict';
>>>>>>>
/**
* All your directives should have a name starting with the parameter you can define in your config object.
* The second parameter can be a Regexp wrapped in quotes.
* You can not prefix your directives by "ng" (reserved keyword for AngularJS directives) ("directive-name": [2, "ng"]) [Y073](https://github.com/johnpapa/angular-styleguide#style-y073), [Y126](https://github.com/johnpapa/angular-styleguide#style-y126)
*
* @ruleName directive-name
* @config 0
*/
'use strict'; |
<<<<<<<
/**
* You should prefer the factory() method instead of service() [Y040](https://github.com/johnpapa/angular-styleguide#style-y040)
*
* @ruleName no-service-method
* @config 2
*/
module.exports = function(context) {
'use strict';
=======
'use strict';
>>>>>>>
/**
* You should prefer the factory() method instead of service() [Y040](https://github.com/johnpapa/angular-styleguide#style-y040)
*
* @ruleName no-service-method
* @config 2
*/
'use strict'; |
<<<<<<<
/**
* All your DI should use the same syntax : the Array or function syntaxes ("di": [2, "function or array"])
*
* @ruleName di
* @config [2, 'function']
*/
module.exports = function(context) {
'use strict';
=======
'use strict';
>>>>>>>
/**
* All your DI should use the same syntax : the Array or function syntaxes ("di": [2, "function or array"])
*
* @ruleName di
* @config [2, 'function']
*/
'use strict'; |
<<<<<<<
/**
* If you have one empty controller, maybe you have linked it in your Router configuration or in one of your views.
* You can remove this declaration because this controller is useless
*
* @ruleName empty-controller
* @config 0
*/
module.exports = function(context) {
'use strict';
=======
'use strict';
>>>>>>>
/**
* If you have one empty controller, maybe you have linked it in your Router configuration or in one of your views.
* You can remove this declaration because this controller is useless
*
* @ruleName empty-controller
* @config 0
*/
'use strict'; |
<<<<<<<
/**
* You should use the angular.forEach method instead of the default JavaScript implementation [].forEach.
*
* @ruleName foreach
* @config 0
*/
module.exports = function(context) {
'use strict';
=======
'use strict';
>>>>>>>
/**
* You should use the angular.forEach method instead of the default JavaScript implementation [].forEach.
*
* @ruleName foreach
* @config 0
*/
'use strict'; |
<<<<<<<
rulesConfiguration.addRule('no-http-callback', 0);
=======
rulesConfiguration.addRule('no-inline-template', [0, {'allow-simple': true}]);
>>>>>>>
rulesConfiguration.addRule('no-http-callback', 0);
rulesConfiguration.addRule('no-inline-template', [0, {'allow-simple': true}]); |
<<<<<<<
router.get('/spa-config', controllers.socialProviders);
if (config.web.idSite.enabled) {
router.get(config.web.idSite.uri, controllers.idSiteVerify);
=======
if (web.idSite.enabled) {
router.get(web.idSite.uri, controllers.idSiteVerify);
>>>>>>>
router.get('/spa-config', controllers.socialProviders);
if (web.idSite.enabled) {
router.get(web.idSite.uri, controllers.idSiteVerify); |
<<<<<<<
router.get(web.forgotPassword.uri, controllers.forgotPassword);
router.post(web.forgotPassword.uri, controllers.forgotPassword);
=======
router.get(config.web.forgotPassword.uri, controllers.forgotPassword);
router.post(config.web.forgotPassword.uri, bodyParser.json({ limit: '200kb' }), controllers.forgotPassword);
>>>>>>>
router.get(web.forgotPassword.uri, controllers.forgotPassword);
router.post(web.forgotPassword.uri, bodyParser.json({ limit: '200kb' }), controllers.forgotPassword);
<<<<<<<
router.post(web.oauth2.uri, stormpathMiddleware, controllers.getToken);
=======
if (config.web.oauth2.enabled) {
router.post(config.web.oauth2.uri, stormpathMiddleware, controllers.getToken);
}
>>>>>>>
if (web.oauth2.enabled) {
router.post(web.oauth2.uri, stormpathMiddleware, controllers.getToken);
} |
<<<<<<<
app.on('stormpath.error', done);
app.on('stormpath.ready', done);
=======
app.on('stormpath.ready', function() {
helpers.destroyApplication(application, done);
});
>>>>>>>
app.on('stormpath.error', done);
app.on('stormpath.ready', function() {
helpers.destroyApplication(application, done);
});
<<<<<<<
app.on('stormpath.error', done);
app.on('stormpath.ready', done);
=======
app.on('stormpath.ready', function() {
helpers.destroyApplication(application, done);
});
>>>>>>>
app.on('stormpath.error', done);
app.on('stormpath.ready', function() {
helpers.destroyApplication(application, done);
}); |
<<<<<<<
var GCC = process.env['CC'] || 'gcc';
var LOG_LEVEL = process.env['Log_LEVEL'] || 'DEBUG';
=======
var GCC = process.env['CC'];
if (!GCC) {
if (SYSTEM === 'freebsd') {
GCC = 'gcc47';
} else {
GCC = 'gcc';
}
}
var BUILDDIR = process.env['BUILDDIR'];
if (BUILDDIR === undefined) {
BUILDDIR = 'build_'+SYSTEM;
}
>>>>>>>
var LOG_LEVEL = process.env['Log_LEVEL'] || 'DEBUG';
var GCC = process.env['CC'];
if (!GCC) {
if (SYSTEM === 'freebsd') {
GCC = 'gcc47';
} else {
GCC = 'gcc';
}
}
var BUILDDIR = process.env['BUILDDIR'];
if (BUILDDIR === undefined) {
BUILDDIR = 'build_'+SYSTEM;
}
<<<<<<<
=======
var logLevel = process.env['Log_LEVEL'] || 'DEBUG';
builder.config.cflags.push('-D','Log_'+logLevel);
var usePie = process.env['NO_PIE'] === undefined && SYSTEM !== 'freebsd';
if (usePie) {
builder.config.cflags.push('-fPIE');
}
>>>>>>>
<<<<<<<
if (process.env['NO_PIE'] === undefined && SYSTEM !== 'win32') {
builder.config.cflags.push('-fPIE');
builder.config.ldflags.push('-pie');
=======
if (usePie) {
builder.config.ldflags.push(
'-pie'
);
>>>>>>>
if (process.env['NO_PIE'] === undefined && SYSTEM !== 'freebsd' && SYSTEM !== 'win32') {
builder.config.cflags.push('-fPIE');
builder.config.ldflags.push('-pie'); |
<<<<<<<
import storeConfig from '@/../store/modules/WiFi/WiFi';
import { SET_AP_SPIN_SHOW, SET_AP_ITEMS, SET_STA_ITEMS, SET_SCAN_STATUS, SET_CHANNEL,
SET_STA_SPIN_SHOW, SET_AP_JAM_BY_INDEX, SET_STA_JAM_BY_INDEX } from '../../../store/mutation-types';
// eslint-disable-next-line import/no-webpack-loader-syntax
const actionInjector = require('!!vue-loader?inject!@/../store/modules/WiFi/actions');
=======
import storeConfig from '@/../store/modules/WiFi/WiFi';
// import { SET_SCAN_STATUS } from '../../../store/mutation-types';
>>>>>>>
import storeConfig from '@/../store/modules/WiFi/WiFi';
import { SET_AP_SPIN_SHOW, SET_AP_ITEMS, SET_STA_ITEMS, SET_SCAN_STATUS, SET_CHANNEL,
SET_STA_SPIN_SHOW, SET_AP_JAM_BY_INDEX, SET_STA_JAM_BY_INDEX } from '../../../store/mutation-types';
// eslint-disable-next-line import/no-webpack-loader-syntax
const actionInjector = require('!!vue-loader?inject!@/../store/modules/WiFi/actions');
<<<<<<<
// storeConfig.action = actions;
let newStoreConfig;
let actions;
let defaultAPList;
let defaultSTAList;
=======
// let myStoreConfig;
>>>>>>>
// storeConfig.action = actions;
let newStoreConfig;
let actions;
let defaultAPList;
let defaultSTAList;
<<<<<<<
defaultAPList = [{
Index: 0,
SSID: '360WIFI-XX',
BSSID: '11:22:33:44:55:66',
RSSI: '-80',
JAM: false,
},
{
Index: 1,
SSID: '360WIFI-X2',
BSSID: '11:22:33:44:55:66',
RSSI: '-94',
JAM: false,
},
{
Index: 2,
SSID: '360WIFI-X3',
BSSID: '11:22:33:44:55:66',
RSSI: '-81',
JAM: false,
}];
defaultSTAList = [{
Index: 0,
NAME: 'iPhone',
MAC: '11:22:33:44:55:66',
RSSI: '522',
JAM: false,
},
{
Index: 1,
NAME: 'Android',
MAC: '11:22:33:44:55:66',
RSSI: '94',
JAM: false,
},
{
Index: 2,
NAME: 'iPhone',
MAC: '11:22:33:44:55:66',
RSSI: '101',
JAM: false,
}];
actionInjector({
'@/../services/WiFi': {
getAPList: ({ commit }) => setTimeout(() => {
// mock apList
commit('setAPItems', defaultAPList);
commit(SET_AP_SPIN_SHOW, false);
}, 100),
getSTAList: ({ commit }) => setTimeout(() => {
// mock staList
commit('setAPItems', defaultSTAList);
commit(SET_AP_SPIN_SHOW, false);
}, 100),
setAPList({ commit }, apList) {
commit(SET_AP_ITEMS, apList);
},
setSTAList({ commit }, staList) {
commit(SET_STA_ITEMS, staList);
},
setScanStatus({ commit }, status) {
commit(SET_SCAN_STATUS, status);
},
setChannel({ commit }, channel) {
commit(SET_CHANNEL, channel);
},
setAPSpinShow({ commit }, status) {
commit(SET_AP_SPIN_SHOW, status);
},
setSTASpinShow({ commit }, status) {
commit(SET_STA_SPIN_SHOW, status);
},
changeSTAJAMByIndex({ commit }, index) {
commit(SET_STA_JAM_BY_INDEX, index);
},
changeAPJAMByIndex({ commit }, index) {
commit(SET_AP_JAM_BY_INDEX, index);
},
},
});
// newStoreConfig = { ...storeConfig, actions };
=======
// myStoreConfig = storeConfig.default;
>>>>>>>
defaultAPList = [{
Index: 0,
SSID: '360WIFI-XX',
BSSID: '11:22:33:44:55:66',
RSSI: '-80',
JAM: false,
},
{
Index: 1,
SSID: '360WIFI-X2',
BSSID: '11:22:33:44:55:66',
RSSI: '-94',
JAM: false,
},
{
Index: 2,
SSID: '360WIFI-X3',
BSSID: '11:22:33:44:55:66',
RSSI: '-81',
JAM: false,
}];
defaultSTAList = [{
Index: 0,
NAME: 'iPhone',
MAC: '11:22:33:44:55:66',
RSSI: '522',
JAM: false,
},
{
Index: 1,
NAME: 'Android',
MAC: '11:22:33:44:55:66',
RSSI: '94',
JAM: false,
},
{
Index: 2,
NAME: 'iPhone',
MAC: '11:22:33:44:55:66',
RSSI: '101',
JAM: false,
}];
actionInjector({
'@/../services/WiFi': {
getAPList: ({ commit }) => setTimeout(() => {
// mock apList
commit('setAPItems', defaultAPList);
commit(SET_AP_SPIN_SHOW, false);
}, 100),
getSTAList: ({ commit }) => setTimeout(() => {
// mock staList
commit('setAPItems', defaultSTAList);
commit(SET_AP_SPIN_SHOW, false);
}, 100),
setAPList({ commit }, apList) {
commit(SET_AP_ITEMS, apList);
},
setSTAList({ commit }, staList) {
commit(SET_STA_ITEMS, staList);
},
setScanStatus({ commit }, status) {
commit(SET_SCAN_STATUS, status);
},
setChannel({ commit }, channel) {
commit(SET_CHANNEL, channel);
},
setAPSpinShow({ commit }, status) {
commit(SET_AP_SPIN_SHOW, status);
},
setSTASpinShow({ commit }, status) {
commit(SET_STA_SPIN_SHOW, status);
},
changeSTAJAMByIndex({ commit }, index) {
commit(SET_STA_JAM_BY_INDEX, index);
},
changeAPJAMByIndex({ commit }, index) {
commit(SET_AP_JAM_BY_INDEX, index);
},
},
});
newStoreConfig = { ...storeConfig, actions }; |
<<<<<<<
} else if (typeof value !== 'number') {
var copy = {}; // apply child translation on a copy
=======
f.log(value);
} else if (valueType !== '[object Number]' && valueType !== '[object Function]' && valueType !== '[object RegExp]') {
var copy = (valueType === '[object Array]') ? [] : {}; // apply child translation on a copy
>>>>>>>
} else if (valueType !== '[object Number]' && valueType !== '[object Function]' && valueType !== '[object RegExp]') {
var copy = (valueType === '[object Array]') ? [] : {}; // apply child translation on a copy |
<<<<<<<
return (
<ComponentErrorBoundary
componentType={_dashprivate_layout.type}
componentId={_dashprivate_layout.props.id}
>
{this.getComponent(_dashprivate_layout, children, loadingState, setProps)}
</ComponentErrorBoundary>
);
=======
return this.getComponent(_dashprivate_layout, children, _dashprivate_loadingState, setProps);
>>>>>>>
return (
<ComponentErrorBoundary
componentType={_dashprivate_layout.type}
componentId={_dashprivate_layout.props.id}
>
{this.getComponent(_dashprivate_layout, children, loadingState, setProps)}
</ComponentErrorBoundary>
);
return this.getComponent(_dashprivate_layout, children, _dashprivate_loadingState, setProps);
<<<<<<<
export const AugmentedTreeContainer = connect(
mapStateToProps,
mapDispatchToProps,
mergeProps
)(TreeContainer);
=======
function getLoadingState(layout, requestQueue) {
const ids = isLoadingComponent(layout) ?
getNestedIds(layout) :
(layout && layout.props.id ?
[layout.props.id] :
[]);
let isLoading = false;
let loadingProp;
let loadingComponent;
if (requestQueue) {
forEach(r => {
const controllerId = isNil(r.controllerId) ? '' : r.controllerId;
if (r.status === 'loading' && any(id => contains(id, controllerId), ids)) {
isLoading = true;
[loadingComponent, loadingProp] = r.controllerId.split('.');
}
}, requestQueue);
}
// Set loading state
return {
is_loading: isLoading,
prop_name: loadingProp,
component_name: loadingComponent,
};
}
function getNestedIds(layout) {
const ids = [];
const queue = [layout];
while (queue.length) {
const elementLayout = queue.shift();
const props = elementLayout &&
elementLayout.props;
if (!props) {
continue;
}
const { children, id } = props;
if (id) {
ids.push(id);
}
if (children) {
const filteredChildren = filter(
child => !isSimpleComponent(child) && !isLoadingComponent(child),
Array.isArray(children) ? children : [children]
);
queue.push(...filteredChildren);
}
}
return ids;
}
function isLoadingComponent(layout) {
return Registry.resolve(layout.type, layout.namespace)._dashprivate_isLoadingComponent;
}
export const AugmentedTreeContainer = connect(mapStateToProps, mapDispatchToProps, mergeProps)(TreeContainer);
>>>>>>>
export const AugmentedTreeContainer = connect(
mapStateToProps,
mapDispatchToProps,
mergeProps
)(TreeContainer);
function getLoadingState(layout, requestQueue) {
const ids = isLoadingComponent(layout) ?
getNestedIds(layout) :
(layout && layout.props.id ?
[layout.props.id] :
[]);
let isLoading = false;
let loadingProp;
let loadingComponent;
if (requestQueue) {
forEach(r => {
const controllerId = isNil(r.controllerId) ? '' : r.controllerId;
if (r.status === 'loading' && any(id => contains(id, controllerId), ids)) {
isLoading = true;
[loadingComponent, loadingProp] = r.controllerId.split('.');
}
}, requestQueue);
}
// Set loading state
return {
is_loading: isLoading,
prop_name: loadingProp,
component_name: loadingComponent,
};
}
function getNestedIds(layout) {
const ids = [];
const queue = [layout];
while (queue.length) {
const elementLayout = queue.shift();
const props = elementLayout &&
elementLayout.props;
if (!props) {
continue;
}
const { children, id } = props;
if (id) {
ids.push(id);
}
if (children) {
const filteredChildren = filter(
child => !isSimpleComponent(child) && !isLoadingComponent(child),
Array.isArray(children) ? children : [children]
);
queue.push(...filteredChildren);
}
}
return ids;
}
function isLoadingComponent(layout) {
return Registry.resolve(layout.type, layout.namespace)._dashprivate_isLoadingComponent;
}
export const AugmentedTreeContainer = connect(mapStateToProps, mapDispatchToProps, mergeProps)(TreeContainer); |
<<<<<<<
promises.push(updateOutput(outputIdAndProp, getState, requestUid, dispatch));
=======
promises.push(updateOutput(outputComponentId, outputProp, getState, requestUid, dispatch, changedProps.map(function (prop) {
return id + '.' + prop;
})));
>>>>>>>
promises.push(updateOutput(outputIdAndProp, getState, requestUid, dispatch, changedProps.map(function (prop) {
return id + '.' + prop;
})));
<<<<<<<
function updateOutput(outputIdAndProp, getState, requestUid, dispatch) {
=======
function updateOutput(outputComponentId, outputProp, getState, requestUid, dispatch, changedPropIds) {
>>>>>>>
function updateOutput(outputIdAndProp, getState, requestUid, dispatch, changedPropIds) {
<<<<<<<
dependenciesRequest = _getState3.dependenciesRequest;
=======
paths = _getState3.paths,
dependenciesRequest = _getState3.dependenciesRequest,
hooks = _getState3.hooks;
>>>>>>>
dependenciesRequest = _getState3.dependenciesRequest,
hooks = _getState3.hooks;
<<<<<<<
output: outputIdAndProp
=======
output: { id: outputComponentId, property: outputProp },
changedPropIds: changedPropIds
>>>>>>>
output: outputIdAndProp,
changedPropIds: changedPropIds
<<<<<<<
=======
var inputsPropIds = inputs.map(function (p) {
return p.id + '.' + p.property;
});
payload.changedPropIds = changedPropIds.filter(function (p) {
return (0, _ramda.contains)(p, inputsPropIds);
});
>>>>>>>
var inputsPropIds = inputs.map(function (p) {
return p.id + '.' + p.property;
});
payload.changedPropIds = changedPropIds.filter(function (p) {
return (0, _ramda.contains)(p, inputsPropIds);
});
<<<<<<<
var multi = data.multi;
=======
// Fire custom request_post hook if any
if (hooks.request_post !== null) {
hooks.request_post(payload, data.response);
}
// and update the props of the component
var observerUpdatePayload = {
itempath: getState().paths[outputComponentId],
// new prop from the server
props: data.response.props,
source: 'response'
};
dispatch(updateProps(observerUpdatePayload));
>>>>>>>
var multi = data.multi;
<<<<<<<
var outputIds = [];
(0, _ramda.keys)(newProps).forEach(function (idAndProp) {
if (
// It's an output
InputGraph.dependenciesOf(idAndProp).length === 0 &&
/*
* And none of its inputs are generated in this
* request
*/
(0, _ramda.intersection)(InputGraph.dependantsOf(idAndProp), (0, _ramda.keys)(newProps)).length === 0) {
outputIds.push(idAndProp);
delete newProps[idAndProp];
}
});
// Dispatch updates to inputs
var reducedNodeIds = reduceInputIds((0, _ramda.keys)(newProps), InputGraph);
var depOrder = InputGraph.overallOrder();
var sortedNewProps = (0, _ramda.sort)(function (a, b) {
return depOrder.indexOf(a.input) - depOrder.indexOf(b.input);
}, reducedNodeIds);
sortedNewProps.forEach(function (inputOutput) {
var payload = newProps[inputOutput.input];
payload.excludedOutputs = inputOutput.excludedOutputs;
dispatch(notifyObservers(payload));
});
// Dispatch updates to lone outputs
outputIds.forEach(function (idAndProp) {
var requestUid = (0, _utils2.uid)();
dispatch(setRequestQueue((0, _ramda.append)({
// TODO - Are there any implications of doing this??
controllerId: null,
status: 'loading',
uid: requestUid,
requestTime: Date.now()
}, getState().requestQueue)));
updateOutput(idAndProp, getState, requestUid, dispatch);
});
}
=======
// Dispatch updates to lone outputs
outputIds.forEach(function (idAndProp) {
var requestUid = (0, _utils2.uid)();
dispatch(setRequestQueue((0, _ramda.append)({
// TODO - Are there any implications of doing this??
controllerId: null,
status: 'loading',
uid: requestUid,
requestTime: Date.now()
}, getState().requestQueue)));
updateOutput(idAndProp.split('.')[0], idAndProp.split('.')[1], getState, requestUid, dispatch, changedPropIds);
});
>>>>>>>
var outputIds = [];
(0, _ramda.keys)(newProps).forEach(function (idAndProp) {
if (
// It's an output
InputGraph.dependenciesOf(idAndProp).length === 0 &&
/*
* And none of its inputs are generated in this
* request
*/
(0, _ramda.intersection)(InputGraph.dependantsOf(idAndProp), (0, _ramda.keys)(newProps)).length === 0) {
outputIds.push(idAndProp);
delete newProps[idAndProp];
}
});
// Dispatch updates to inputs
var reducedNodeIds = reduceInputIds((0, _ramda.keys)(newProps), InputGraph);
var depOrder = InputGraph.overallOrder();
var sortedNewProps = (0, _ramda.sort)(function (a, b) {
return depOrder.indexOf(a.input) - depOrder.indexOf(b.input);
}, reducedNodeIds);
sortedNewProps.forEach(function (inputOutput) {
var payload = newProps[inputOutput.input];
payload.excludedOutputs = inputOutput.excludedOutputs;
dispatch(notifyObservers(payload));
});
// Dispatch updates to lone outputs
outputIds.forEach(function (idAndProp) {
var requestUid = (0, _utils2.uid)();
dispatch(setRequestQueue((0, _ramda.append)({
// TODO - Are there any implications of doing this??
controllerId: null,
status: 'loading',
uid: requestUid,
requestTime: Date.now()
}, getState().requestQueue)));
updateOutput(idAndProp, getState, requestUid, dispatch, changedPropIds);
});
} |
<<<<<<<
viewer.updated = true;
=======
BrainBrowser.events.triggerEvent("zoom", zoom);
>>>>>>>
BrainBrowser.events.triggerEvent("zoom", zoom);
viewer.updated = true; |
<<<<<<<
=======
let path = require('path')
var http = require('http')
>>>>>>>
let path = require('path')
var http = require('http')
<<<<<<<
let isCI = process.env.TRAVIS || process.env.CI
let timeout = isCI ? 10000 : 5000
=======
let timeout = process.env.TRAVIS ? 10000 : 5000
let url = `http://localhost:2000`
>>>>>>>
let isCI = process.env.TRAVIS || process.env.CI
let timeout = isCI ? 10000 : 5000
let url = 'http://localhost:2000'
<<<<<<<
console.log(out
.replace(/\n {2}/g, '\n ')
.replace(/\n$/, ''))
=======
if (!process.env.QUIET) {
console.log(out
.replace(/\n /g, '\n ')
.replace(/\n$/, ''))
}
>>>>>>>
if (!process.env.QUIET) {
console.log(out
.replace(/\n {2}/g, '\n ')
.replace(/\n$/, ''))
} |
<<<<<<<
=======
.option('--overwrite', 'overwrite the [target/--output-path] directory')
.option('-e, --environment <environment>', 'build environment [development]', 'development')
.option('--prod', 'alias for --environment=production')
.option('--dev', 'alias for --environment=development')
>>>>>>>
.option('-e, --environment <environment>', 'build environment [development]', 'development')
.option('--prod', 'alias for --environment=production')
.option('--dev', 'alias for --environment=development')
<<<<<<<
=======
.option('--overwrite', 'overwrite the [target/--output-path] directory')
.option('-e, --environment <environment>', 'build environment [development]', 'development')
.option('--prod', 'alias for --environment=production')
.option('--dev', 'alias for --environment=development')
>>>>>>>
.option('-e, --environment <environment>', 'build environment [development]', 'development')
.option('--prod', 'alias for --environment=production')
.option('--dev', 'alias for --environment=development')
<<<<<<<
function guardOutputDir(outputDir) {
=======
function buildBrocfileOptions(options) {
return {
env: options.environment,
};
}
function guardOutputDir(outputDir, overwrite) {
if (!fs.existsSync(outputDir)) {
return;
}
if (!overwrite) {
throw new CliError(
outputDir +
'/ already exists; we cannot build into an existing directory, ' +
'pass --overwrite to overwrite the output directory'
);
}
>>>>>>>
function buildBrocfileOptions(options) {
return {
env: options.environment,
};
}
function guardOutputDir(outputDir) { |
<<<<<<<
export function watch (...args) {
vm.$watch(...args)
}
// Proxy traps
const traps = {
get (target, key) {
return vm && vm.$data[key]
},
set (target, key, value) {
sendValue(key, value)
return setValue(key, value)
}
}
const SharedDataProxy = new Proxy({}, traps)
=======
const proxy = {}
Object.keys(internalSharedData).forEach(key => {
Object.defineProperty(proxy, key, {
configurable: false,
get: () => vm && vm.$data[key],
set: (value) => {
sendValue(key, value)
setValue(key, value)
}
})
})
>>>>>>>
export function watch (...args) {
vm.$watch(...args)
}
const proxy = {}
Object.keys(internalSharedData).forEach(key => {
Object.defineProperty(proxy, key, {
configurable: false,
get: () => vm && vm.$data[key],
set: (value) => {
sendValue(key, value)
setValue(key, value)
}
})
}) |
<<<<<<<
}
export function scrollIntoView (scrollParent, el) {
const top = el.offsetTop
const height = el.offsetHeight
scrollParent.scrollTop = top + (height - scrollParent.offsetHeight) / 2
=======
}
export function set (object, path, value, cb = null) {
const sections = path.split('.')
while (sections.length > 1) {
object = object[sections.shift()]
}
const field = sections[0]
if (cb) {
cb(object, field, value)
} else {
object[field] = value
}
>>>>>>>
}
export function set (object, path, value, cb = null) {
const sections = path.split('.')
while (sections.length > 1) {
object = object[sections.shift()]
}
const field = sections[0]
if (cb) {
cb(object, field, value)
} else {
object[field] = value
}
}
export function scrollIntoView (scrollParent, el) {
const top = el.offsetTop
const height = el.offsetHeight
scrollParent.scrollTop = top + (height - scrollParent.offsetHeight) / 2 |
<<<<<<<
assert.ok(afterMarkers[1].isEmpty, 'final afterMarker is empty');
=======
assert.ok(afterMarkers[1].empty(), 'final afterMarker is empty');
});
test('#clone a marker', (assert) => {
const marker = builder.createMarker('hi there!');
const cloned = marker.clone();
assert.equal(marker.builder, cloned.builder, 'builder is present');
assert.equal(marker.value, cloned.value, 'value is present');
assert.equal(marker.markups.length, cloned.markups.length, 'markup length is the same');
>>>>>>>
assert.ok(afterMarkers[1].isEmpty, 'final afterMarker is empty');
});
test('#clone a marker', (assert) => {
const marker = builder.createMarker('hi there!');
const cloned = marker.clone();
assert.equal(marker.builder, cloned.builder, 'builder is present');
assert.equal(marker.value, cloned.value, 'value is present');
assert.equal(marker.markups.length, cloned.markups.length, 'markup length is the same'); |
<<<<<<<
},
crop: function(test) {
test.expect(2);
createTest(test, "crop.png")(test.done);
=======
},
quality: function(test) {
test.expect(3);
async.series([
createTest(test, 'quality.jpg'),
function(callback) {
fs.stat('tmp/quality.jpg', function(err, stats) {
fs.stat('test/expected/quality.jpg', function(err, expected) {
var epsilon = 1024;
test.ok(expected.size - epsilon < stats.size && expected.size + epsilon > stats.size );
callback();
});
});
}
], test.done);
>>>>>>>
},
crop: function(test) {
test.expect(2);
createTest(test, "crop.png")(test.done);
},
quality: function(test) {
test.expect(3);
async.series([
createTest(test, 'quality.jpg'),
function(callback) {
fs.stat('tmp/quality.jpg', function(err, stats) {
fs.stat('test/expected/quality.jpg', function(err, expected) {
var epsilon = 1024;
test.ok(expected.size - epsilon < stats.size && expected.size + epsilon > stats.size );
callback();
});
});
}
], test.done); |
<<<<<<<
PricingClient = require('./PricingClient');
=======
MonitorClient = require('./MonitorClient'),
>>>>>>>
PricingClient = require('./PricingClient');
MonitorClient = require('./MonitorClient'),
<<<<<<<
initializer.PricingClient = PricingClient;
=======
initializer.MonitorClient = MonitorClient;
>>>>>>>
initializer.PricingClient = PricingClient;
initializer.MonitorClient = MonitorClient; |
<<<<<<<
module.exports.inject = function (windowInj, localStorageInj, documentInj, MathInj, conf) {
=======
var window, localStorage, angular, document;
module.exports.inject = function (windowInj, localStorageInj, conf, angularInj, documentInj) {
>>>>>>>
var window, localStorage, angular, document, Math;
module.exports.inject = function (windowInj, localStorageInj, documentInj, MathInj, angularInj, conf) {
<<<<<<<
Math = MathInj;
document = documentInj;
=======
angular = angularInj;
document = documentInj;
>>>>>>>
document = documentInj;
Math = MathInj;
angular = angularInj;
<<<<<<<
var AuthenticationContext = function(config) {
REQUEST_TYPE = {
=======
AuthenticationContext = function (config) {
this.REQUEST_TYPE = {
>>>>>>>
AuthenticationContext = function (config) {
this.REQUEST_TYPE = {
<<<<<<<
logStatus('Navigate url is empty');
}
};
AuthenticationContext.prototype.clearCache = function () {
this._saveItem(CONSTANTS.STORAGE.ACCESS_TOKEN_KEY, '');
this._saveItem(CONSTANTS.STORAGE.EXPIRATION_KEY, 0);
this._saveItem(CONSTANTS.STORAGE.FAILED_RENEW, '');
this._saveItem(CONSTANTS.STORAGE.SESSION_STATE, '');
this._saveItem(CONSTANTS.STORAGE.STATE_LOGIN, '');
this._saveItem(CONSTANTS.STORAGE.STATE_RENEW, '');
this._saveItem(CONSTANTS.STORAGE.STATE_RENEW_RESOURCE, '');
this._saveItem(CONSTANTS.STORAGE.STATE_IDTOKEN, '');
this._saveItem(CONSTANTS.STORAGE.START_PAGE, '');
this._saveItem(CONSTANTS.STORAGE.USERNAME, '');
this._saveItem(CONSTANTS.STORAGE.ERROR, '');
this._saveItem(CONSTANTS.STORAGE.ERROR_DESCRIPTION, '');
var keys = this._getItem(CONSTANTS.STORAGE.TOKEN_KEYS);
=======
this._logstatus('Navigate url is empty');
}
};
AuthenticationContext.prototype.clearCache = function () {
this._saveItem(this.CONSTANTS.STORAGE.ACCESS_TOKEN_KEY, '');
this._saveItem(this.CONSTANTS.STORAGE.EXPIRATION_KEY, 0);
this._saveItem(this.CONSTANTS.STORAGE.FAILED_RENEW, '');
this._saveItem(this.CONSTANTS.STORAGE.SESSION_STATE, '');
this._saveItem(this.CONSTANTS.STORAGE.STATE_LOGIN, '');
this._saveItem(this.CONSTANTS.STORAGE.STATE_RENEW, '');
this._saveItem(this.CONSTANTS.STORAGE.STATE_IDTOKEN, '');
this._saveItem(this.CONSTANTS.STORAGE.START_PAGE, '');
this._saveItem(this.CONSTANTS.STORAGE.USERNAME, '');
this._saveItem(this.CONSTANTS.STORAGE.ERROR, '');
this._saveItem(this.CONSTANTS.STORAGE.ERROR_DESCRIPTION, '');
var keys = this._getItem(this.CONSTANTS.STORAGE.TOKEN_KEYS);
>>>>>>>
this._logstatus('Navigate url is empty');
}
};
AuthenticationContext.prototype.clearCache = function () {
this._saveItem(this.CONSTANTS.STORAGE.ACCESS_TOKEN_KEY, '');
this._saveItem(this.CONSTANTS.STORAGE.EXPIRATION_KEY, 0);
this._saveItem(this.CONSTANTS.STORAGE.FAILED_RENEW, '');
this._saveItem(this.CONSTANTS.STORAGE.SESSION_STATE, '');
this._saveItem(this.CONSTANTS.STORAGE.STATE_LOGIN, '');
this._saveItem(this.CONSTANTS.STORAGE.STATE_RENEW, '');
this._saveItem(this.CONSTANTS.STORAGE.STATE_RENEW_RESOURCE, '');
this._saveItem(this.CONSTANTS.STORAGE.STATE_IDTOKEN, '');
this._saveItem(this.CONSTANTS.STORAGE.START_PAGE, '');
this._saveItem(this.CONSTANTS.STORAGE.USERNAME, '');
this._saveItem(this.CONSTANTS.STORAGE.ERROR, '');
this._saveItem(this.CONSTANTS.STORAGE.ERROR_DESCRIPTION, '');
var keys = this._getItem(this.CONSTANTS.STORAGE.TOKEN_KEYS);
<<<<<<<
var frameHandle = this._addAdalFrame('adalIdTokenFrame');
logStatus('Expected state: ' + expectedState + ' start for iframe');
=======
var frameHandle = this._addAdalFrame('adalIdTokenFrame');
this._logstatus('Expected state: ' + expectedState + ' start for iframe');
>>>>>>>
var frameHandle = this._addAdalFrame('adalIdTokenFrame');
this._logstatus('Expected state: ' + expectedState + ' start for iframe');
<<<<<<<
str.push('client_id=' + encodeURIComponent(obj['clientId']));
str.push('resource=' + encodeURIComponent(obj['resource']));
str.push('redirect_uri=' + encodeURIComponent(obj['redirect_uri']));
str.push('state=' + encodeURIComponent(obj['state']));
=======
str.push('&client_id=' + encodeURIComponent(obj.clientId));
str.push('&resource=' + encodeURIComponent(obj.resource));
str.push('&redirect_uri=' + encodeURIComponent(obj.redirectUri));
str.push('&state=' + encodeURIComponent(obj.state));
>>>>>>>
str.push('client_id=' + encodeURIComponent(obj.clientId));
str.push('resource=' + encodeURIComponent(obj.resource));
str.push('redirect_uri=' + encodeURIComponent(obj.redirectUri));
str.push('state=' + encodeURIComponent(obj.state));
<<<<<<<
str.push('slice=' + encodeURIComponent(obj['slice']));
=======
str.push('&slice=' + encodeURIComponent(obj.slice));
>>>>>>>
str.push('slice=' + encodeURIComponent(obj.slice)); |
<<<<<<<
import Progress from 'progress';
=======
import previewImage from 'preview-image';
>>>>>>>
import previewImage from 'preview-image';
import Progress from 'progress';
<<<<<<<
Progress,
=======
previewImage,
>>>>>>>
previewImage,
Progress, |
<<<<<<<
import classNames from 'classnames';
import { I18nReciever as Reciever } from 'i18n';
import { TimePicker as I18nDefault } from 'i18n/default';
=======
import isString from 'lodash/isString';
>>>>>>>
import isString from 'lodash/isString';
import { I18nReciever as Reciever } from 'i18n';
import { TimePicker as I18nDefault } from 'i18n/default';
<<<<<<<
<Reciever componentName="TimePicker" defaultI18n={I18nDefault}>
{i18n => (
<DatePicker
{...pickerProps}
openPanel={openPanel[0]}
placeholder={placeholder[0] || i18n.start}
max={value[1] || pickerProps.max}
defaultTime={defaultTime[0]}
value={value[0]}
onClick={val => onClick && onClick(val, START)}
onOpen={() => onOpen && onOpen(START)}
onClose={() => onClose && onClose(START)}
onChange={this.onChange(START)}
disabledDate={val => disabledDate(val, START)}
/>
)}
</Reciever>
<Reciever componentName="TimePicker" defaultI18n={I18nDefault}>
{i18n => <span className="picker-seperator">{i18n.to}</span>}
</Reciever>
<Reciever componentName="TimePicker" defaultI18n={I18nDefault}>
{i18n => (
<DatePicker
{...pickerProps}
openPanel={openPanel[1]}
placeholder={placeholder[1] || i18n.end}
min={value[0] || pickerProps.min}
defaultTime={defaultTime[1]}
value={value[1]}
onClick={val => onClick && onClick(val, END)}
onOpen={() => onOpen && onOpen(END)}
onClose={() => onClose && onClose(END)}
onChange={this.onChange(END)}
disabledDate={val => disabledDate(val, END)}
/>
)}
</Reciever>
=======
<DatePicker
{...pickerProps}
openPanel={openPanel[0]}
placeholder={placeholder[0]}
max={value[1] || pickerProps.max}
defaultTime={timeArr[0]}
value={value[0]}
onClick={val => onClick && onClick(val, START)}
onOpen={() => onOpen && onOpen(START)}
onClose={() => onClose && onClose(START)}
onChange={this.onChange(START)}
disabledDate={val => disabledDate(val, START)}
/>
<span className="picker-seperator">至</span>
<DatePicker
{...pickerProps}
openPanel={openPanel[1]}
placeholder={placeholder[1]}
min={value[0] || pickerProps.min}
defaultTime={timeArr[1]}
value={value[1]}
onClick={val => onClick && onClick(val, END)}
onOpen={() => onOpen && onOpen(END)}
onClose={() => onClose && onClose(END)}
onChange={this.onChange(END)}
disabledDate={val => disabledDate(val, END)}
/>
>>>>>>>
<Reciever componentName="TimePicker" defaultI18n={I18nDefault}>
{i18n => (
<DatePicker
{...pickerProps}
openPanel={openPanel[0]}
placeholder={placeholder[0] || i18n.start}
max={value[1] || pickerProps.max}
defaultTime={timeArr[0]}
value={value[0]}
onClick={val => onClick && onClick(val, START)}
onOpen={() => onOpen && onOpen(START)}
onClose={() => onClose && onClose(START)}
onChange={this.onChange(START)}
disabledDate={val => disabledDate(val, START)}
/>
)}
</Reciever>
<Reciever componentName="TimePicker" defaultI18n={I18nDefault}>
{i18n => <span className="picker-seperator">{i18n.to}</span>}
</Reciever>
<Reciever componentName="TimePicker" defaultI18n={I18nDefault}>
{i18n => (
<DatePicker
{...pickerProps}
openPanel={openPanel[1]}
placeholder={placeholder[1] || i18n.end}
min={value[0] || pickerProps.min}
defaultTime={timeArr[1]}
value={value[1]}
onClick={val => onClick && onClick(val, END)}
onOpen={() => onOpen && onOpen(END)}
onClose={() => onClose && onClose(END)}
onChange={this.onChange(END)}
disabledDate={val => disabledDate(val, END)}
/>
)}
</Reciever> |
<<<<<<<
<Reciever componentName="TimePicker" defaultI18n={I18nDefault}>
{i18n => (
<PanelFooter
buttonText={props.confirmText}
linkText={i18n.current.month}
linkCls="link--current"
onClickLink={() => this.onSelectMonth(CURRENT)}
onClickButton={this.onConfirm}
/>
)}
</Reciever>
=======
{props.isFooterVisble ? (
<PanelFooter
buttonText={props.confirmText}
linkText="当前月"
linkCls="link--current"
onClickLink={() => this.onSelectMonth(CURRENT)}
onClickButton={this.onConfirm}
/>
) : null}
>>>>>>>
{props.isFooterVisble ? (
<Reciever componentName="TimePicker" defaultI18n={I18nDefault}>
{i18n => (
<PanelFooter
buttonText={props.confirmText}
linkText={i18n.current.month}
linkCls="link--current"
onClickLink={() => this.onSelectMonth(CURRENT)}
onClickButton={this.onConfirm}
/>
)}
</Reciever>
) : null} |
<<<<<<<
whereDoesCharComeFrom([origin, characterIndex], function(steps){
=======
whereDoesCharComeFrom(origin, characterIndex, function(steps){
steps.forEach(registerOriginIdsForStep)
>>>>>>>
whereDoesCharComeFrom([origin, characterIndex], function(steps){
steps.forEach(registerOriginIdsForStep) |
<<<<<<<
GenericBuilder.prototype.prepEnv = function() {
=======
function hasCustomRules (projectRoot) {
return fs.existsSync(path.join(projectRoot, 'custom_rules.xml'));
}
GenericBuilder.prototype.prepEnv = function () {
>>>>>>>
GenericBuilder.prototype.prepEnv = function() {
<<<<<<<
return Object.keys(this.binDirs)
.reduce(function (result, builderName) {
console.log('builderName:'+ builderName);
=======
return Object.keys(this.binDirs).reduce(function (result, builderName) {
>>>>>>>
return Object.keys(this.binDirs) .reduce(function (result, builderName) {
console.log('builderName:'+ builderName);
<<<<<<<
=======
GenericBuilder.prototype.readProjectProperties = function () {
function findAllUniq (data, r) {
var s = {};
var m;
while ((m = r.exec(data))) {
s[m[1]] = 1;
}
return Object.keys(s);
}
var data = fs.readFileSync(path.join(this.root, 'project.properties'), 'utf8');
return {
libs: findAllUniq(data, /^\s*android\.library\.reference\.\d+=(.*)(?:\s|$)/mg),
gradleIncludes: findAllUniq(data, /^\s*cordova\.gradle\.include\.\d+=(.*)(?:\s|$)/mg),
systemLibs: findAllUniq(data, /^\s*cordova\.system\.library\.\d+=(.*)(?:\s|$)/mg)
};
};
GenericBuilder.prototype.extractRealProjectNameFromManifest = function () {
var manifestPath = path.join(this.root, 'AndroidManifest.xml');
var manifestData = fs.readFileSync(manifestPath, 'utf8');
var m = /<manifest[\s\S]*?package\s*=\s*"(.*?)"/i.exec(manifestData);
if (!m) {
throw new CordovaError('Could not find package name in ' + manifestPath);
}
var packageName = m[1];
var lastDotIndex = packageName.lastIndexOf('.');
return packageName.substring(lastDotIndex + 1);
};
>>>>>>> |
<<<<<<<
},
// This "custom" type is used to accept every layer that user want to define himself.
// We can wrap these custom layers like heatmap or yandex, but it means a lot of work/code to wrap the world,
// so we let user to define their own layer outside the directive,
// and pass it on "createLayer" result for next processes
custom: {
createLayer: function (params) {
if (params.layer instanceof L.Class) {
return angular.copy(params.layer);
}
else {
$log.error('[AngularJS - Leaflet] A custom layer must be a leaflet Class');
}
}
=======
},
cartodb: {
mustHaveUrl: true,
createLayer: function(params) {
return cartodb.createLayer(params.map, params.url);
}
>>>>>>>
},
// This "custom" type is used to accept every layer that user want to define himself.
// We can wrap these custom layers like heatmap or yandex, but it means a lot of work/code to wrap the world,
// so we let user to define their own layer outside the directive,
// and pass it on "createLayer" result for next processes
custom: {
createLayer: function (params) {
if (params.layer instanceof L.Class) {
return angular.copy(params.layer);
}
else {
$log.error('[AngularJS - Leaflet] A custom layer must be a leaflet Class');
}
},
cartodb: {
mustHaveUrl: true,
createLayer: function(params) {
return cartodb.createLayer(params.map, params.url);
} |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.