conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
id: 'search-list'
});
=======
id: 'movie-list'
});
>>>>>>>
id: 'movie-list'
});
<<<<<<<
movieCollection.fetch();
// Create movie list
var movieList = new App.View.MovieList({
model: movieCollection
});
=======
>>>>>>>
movieCollection.fetch();
// Create movie list
var movieList = new App.View.MovieList({
model: movieCollection
}); |
<<<<<<<
=======
_createPlugin: function _createPlugin(component, isPlugin) {
if (window.jQuery) {
// this fn called via forIn, so isPlugin might be the field name,
// only explicit 'true' is treated as a plugin.
isPlugin = isPlugin === true;
var target, source;
if (isPlugin) {
target = component.global ? jQuery : (component.dom ? jQuery.fn : null);
source = Sys.plugins;
}
else {
target = component._isBehavior ? jQuery.fn : jQuery,
source = Sys.components;
}
if (target) {
var name = component.name,
fnName = name;
if (isPlugin) {
fnName = component.functionName || name;
}
// Use the already created _jqQueue or _jqQueueDom if it is set -- this is the case when the plugin/component
// was registered 'for real' before jquery was loaded, in which case the function is already the
// real deal. _jqQueue and _jqQueueDom may both be set in the case a plugin registered as both global
// and dom.
// OR Use _getCreate to create a temporary placeholder function that contains doc comments for intellisense
// purposes in debug mode. This will eventually be replaced by the real function when it is registered.
var existing = target[fnName];
// don't overwrite an existing plugin, unless it is a mock created by start.js
if (!existing || existing._slmock) {
target[fnName] = ((!isPlugin || component.global) ? source[name]._jqQueue : source[name]._jqQueueDom) ||
Sys._getCreate(component, isPlugin, true);
}
}
}
},
>>>>>>> |
<<<<<<<
* File: jquery.flexisel.js
* Version: 1.0.1
* Description: Responsive carousel jQuery plugin
* Author: 9bit Studios
* Copyright 2012, 9bit Studios
* http://www.9bitstudios.com
* Free to use and abuse under the MIT license.
* http://www.opensource.org/licenses/mit-license.php
*/
=======
* File: jquery.flexisel.js
* Version: 1.0.0
* Description: Responsive carousel jQuery plugin
* Author: 9bit Studios
* Copyright 2012, 9bit Studios
* http://www.9bitstudios.com
* Free to use and abuse under the MIT license.
* http://www.opensource.org/licenses/mit-license.php
*/
>>>>>>>
* File: jquery.flexisel.js
* Version: 1.0.2
* Description: Responsive carousel jQuery plugin
* Author: 9bit Studios
* Copyright 2012, 9bit Studios
* http://www.9bitstudios.com
* Free to use and abuse under the MIT license.
* http://www.opensource.org/licenses/mit-license.php
*/
<<<<<<<
$.fn.flexisel = function (options) {
var defaults = $.extend({
visibleItems: 4,
animationSpeed: 200,
autoPlay: false,
autoPlaySpeed: 3000,
pauseOnHover: true,
setMaxWidthAndHeight: false,
enableResponsiveBreakpoints: false,
responsiveBreakpoints: {
portrait: {
=======
$.fn.flexisel = function(options) {
var defaults = $.extend({
visibleItems : 4,
animationSpeed : 200,
autoPlay : false,
autoPlaySpeed : 3000,
pauseOnHover : true,
setMaxWidthAndHeight : false,
enableResponsiveBreakpoints : true,
clone : true,
responsiveBreakpoints : {
portrait: {
>>>>>>>
$.fn.flexisel = function(options) {
var defaults = $.extend({
visibleItems : 4,
animationSpeed : 200,
autoPlay : false,
autoPlaySpeed : 3000,
pauseOnHover : true,
setMaxWidthAndHeight : false,
enableResponsiveBreakpoints : true,
clone : true,
responsiveBreakpoints : {
portrait: {
<<<<<<<
var canNavigate = true;
var itemsVisible = settings.visibleItems;
var responsivePoints = [];
=======
var canNavigate = true;
var itemsVisible = settings.visibleItems; // Get visible items
var totalItems = object.children().length; // Get number of elements
>>>>>>>
var canNavigate = true;
var itemsVisible = settings.visibleItems; // Get visible items
var totalItems = object.children().length; // Get number of elements
var responsivePoints = [];
<<<<<<<
*******************************/
var methods = {
init: function() {
return this.each(function () {
methods.appendHTML();
methods.setEventHandlers();
methods.initializeItems();
=======
*******************************/
var methods = {
init : function() {
return this.each(function() {
methods.appendHTML();
methods.setEventHandlers();
methods.initializeItems();
>>>>>>>
*******************************/
var methods = {
init : function() {
return this.each(function() {
methods.appendHTML();
methods.setEventHandlers();
methods.initializeItems();
<<<<<<<
Set up carousel
*******************************/
initializeItems: function() {
=======
*******************************/
initializeItems : function() {
>>>>>>>
*******************************/
initializeItems : function() {
<<<<<<<
methods.sortResponsiveObject(settings.responsiveBreakpoints);
var innerWidth = listParent.width(); // Set widths
itemsWidth = (innerWidth)/itemsVisible;
childSet.width(itemsWidth);
childSet.last().insertBefore(childSet.first());
childSet.last().insertBefore(childSet.first());
object.css({'left' : -itemsWidth});
=======
>>>>>>>
methods.sortResponsiveObject(settings.responsiveBreakpoints);
<<<<<<<
Wrap list in markup with classes needed for carousel to function
*******************************/
appendHTML: function() {
object.addClass("nbs-flexisel-ul");
object.wrap("<div class='nbs-flexisel-container'><div class='nbs-flexisel-inner'></div></div>");
object.find("li").addClass("nbs-flexisel-item");
if(settings.setMaxWidthAndHeight) {
var baseWidth = $(".nbs-flexisel-item img").width();
var baseHeight = $(".nbs-flexisel-item img").height();
$(".nbs-flexisel-item img").css("max-width", baseWidth);
$(".nbs-flexisel-item img").css("max-height", baseHeight);
}
$("<div class='nbs-flexisel-nav-left'></div><div class='nbs-flexisel-nav-right'></div>").insertAfter(object);
var cloneContent = object.children().clone();
object.append(cloneContent);
=======
*******************************/
appendHTML : function() {
object.addClass("nbs-flexisel-ul");
object.wrap("<div class='nbs-flexisel-container'><div class='nbs-flexisel-inner'></div></div>");
object.find("li").addClass("nbs-flexisel-item");
if (settings.setMaxWidthAndHeight) {
var baseWidth = $(".nbs-flexisel-item img").width();
var baseHeight = $(".nbs-flexisel-item img").height();
$(".nbs-flexisel-item img").css("max-width", baseWidth);
$(".nbs-flexisel-item img").css("max-height", baseHeight);
}
$("<div class='nbs-flexisel-nav-left'></div><div class='nbs-flexisel-nav-right'></div>").insertAfter(object);
if (settings.clone) {
var cloneContent = object.children().clone();
object.append(cloneContent);
}
>>>>>>>
*******************************/
appendHTML : function() {
object.addClass("nbs-flexisel-ul");
object.wrap("<div class='nbs-flexisel-container'><div class='nbs-flexisel-inner'></div></div>");
object.find("li").addClass("nbs-flexisel-item");
if (settings.setMaxWidthAndHeight) {
var baseWidth = $(".nbs-flexisel-item img").width();
var baseHeight = $(".nbs-flexisel-item img").height();
$(".nbs-flexisel-item img").css("max-width", baseWidth);
$(".nbs-flexisel-item img").css("max-height", baseHeight);
}
$("<div class='nbs-flexisel-nav-left'></div><div class='nbs-flexisel-nav-right'></div>").insertAfter(object);
if (settings.clone) {
var cloneContent = object.children().clone();
object.append(cloneContent);
}
<<<<<<<
if(settings.pauseOnHover) {
=======
if (settings.pauseOnHover == true) {
>>>>>>>
if (settings.pauseOnHover == true) {
<<<<<<<
if(settings.autoPlay) {
setInterval(function () {
if(canNavigate)
=======
setInterval(function() {
if (canNavigate == true)
>>>>>>>
setInterval(function() {
if (canNavigate == true)
<<<<<<<
Set breakpoints depending on responsiveBreakpoints
*******************************/
setResponsiveEvents: function() {
=======
*******************************/
setResponsiveEvents : function() {
>>>>>>>
Set breakpoints depending on responsiveBreakpoints
*******************************/
setResponsiveEvents: function() {
<<<<<<<
Needed to position arrows correctly on init and resize
*******************************/
adjustScroll: function() {
=======
*******************************/
adjustScroll : function() {
>>>>>>>
*******************************/
adjustScroll : function() { |
<<<<<<<
import '../styles/main.scss';
import '../../node_modules/normalize.css/normalize.css';
import '../../node_modules/please-wait/build/please-wait.css';
import '../../node_modules/react-select/dist/react-select.css';
import '../../node_modules/react-joyride/lib/react-joyride-compiled.css';
import '../../node_modules/draft-js/dist/Draft.css';
import '../styles/components/edit-param-group.scss';
import '../styles/components/input-group.scss';
import '../styles/components/fonts-collection.scss';
import '../styles/components/warning-message.scss';
import '../styles/components/replay-playlist.scss';
import '../styles/components/create-param-group.scss';
import '../styles/components/export-as.scss';
import '../styles/components/nps-message.scss';
import '../styles/components/top-bar-menu.scss';
import '../styles/components/side-tabs.scss';
import '../styles/components/search-glyph-list.scss';
import '../styles/components/account.scss';
import '../styles/components/checkbox-with-img.scss';
import '../styles/components/forgotten-password.scss';
import '../styles/components/prototypo-canvas.scss';
import '../styles/components/glyph-list.scss';
import '../styles/components/cards-widget.scss';
import '../styles/components/prototypo-text.scss';
import '../styles/components/sliders.scss';
import '../styles/components/variant.scss';
import '../styles/components/alternate-menu.scss';
import '../styles/components/hover-view-menu.scss';
import '../styles/components/not-a-browser.scss';
import '../styles/components/onboarding.scss';
import '../styles/components/action-bar.scss';
import '../styles/components/glyph-btn.scss';
import '../styles/components/delete-param-group.scss';
import '../styles/components/prototypo-word.scss';
import '../styles/components/individualize-button.scss';
import '../styles/components/canvas-glyph-input.scss';
import '../styles/components/news-feed.scss';
import '../styles/components/close-button.scss';
import '../styles/components/progress-bar.scss';
import '../styles/components/contextual-menu.scss';
import '../styles/components/wait-for-load.scss';
import '../styles/components/zoom-buttons.scss';
import '../styles/components/controls-tabs.scss';
import '../styles/components/tutorials.scss';
import '../styles/components/go-pro-modal.scss';
import '../styles/components/shared/pricing.scss';
import '../styles/components/handlegrip-text.scss';
import '../styles/components/start.scss';
import '../styles/components/account/account-app.scss';
import '../styles/components/account/account-profile.scss';
import '../styles/components/account/account-change-password.scss';
import '../styles/components/account/account-billing-address.scss';
import '../styles/components/account/account-add-card.scss';
import '../styles/components/account/account-subscription.scss';
import '../styles/components/account/account-change-plan.scss';
import '../styles/components/account/account-invoice-list.scss';
import '../styles/components/account/credits-export.scss';
import '../styles/components/subscription/subscription.scss';
import '../styles/components/subscription/subscription-confirmation.scss';
import '../styles/components/subscription/subscription-sidebar.scss';
import '../styles/components/subscription/subscription-choose-plan.scss';
import '../styles/components/shared/input-with-label.scss';
import '../styles/components/shared/display-with-label.scss';
import '../styles/components/shared/columns.scss';
import '../styles/components/shared/billing-address.scss';
import '../styles/components/shared/account-validation-button.scss';
import '../styles/components/shared/form-error.scss';
import '../styles/components/shared/form-success.scss';
import '../styles/components/shared/select-override.scss';
import '../styles/components/shared/invoice.scss';
import '../styles/components/shared/loading-overlay.scss';
import '../styles/components/shared/button.scss';
import '../styles/components/shared/modal.scss';
import '../styles/components/shared/action-form-buttons.scss';
import '../styles/components/toolbar/toolbar.scss';
import '../styles/components/toolbar/arianne-thread.scss';
import '../styles/components/toolbar/view-buttons.scss';
import '../styles/components/topbar/allowed-top-bar-with-payment.scss';
import '../styles/components/collection/collection.scss';
import '../styles/components/collection/family.scss';
import '../styles/components/viewPanels/view-panels-menu.scss';
import '../styles/components/views/prototypo-word-input.scss';
import '../styles/components/indivMode/indiv-group-list.scss';
import '../styles/components/indivMode/indiv-sidebar.scss';
import '../styles/components/canvasTools/canvas-bar.scss';
import '../styles/lib/spinners/3-wave.scss';
import '../styles/lib/spinkit.scss';
import '../styles/lib/_variables.scss';
import '../styles/layout.scss';
import '../styles/userAdmin.scss';
import '../styles/tracking.scss';
import '../styles/layout/topbar.scss';
import '../styles/layout/dashboard.scss';
import '../styles/layout/signin.scss';
import '../styles/layout/glyph-panel.scss';
import '../styles/layout/replay.scss';
import '../styles/layout/prototypopanel.scss';
import '../styles/layout/workboard.scss';
import '../styles/layout/sidebar.scss';
import '../styles/main.scss';
import '../styles/_variables.scss';
=======
import './styles';
>>>>>>>
import './styles';
<<<<<<<
<Route path="start" component={StartApp} onEnter={redirectToLogin}/>
</Route>
</Router>
=======
</Router>
</ApolloProvider>
>>>>>>>
<Route path="start" component={StartApp} onEnter={redirectToLogin}/>
</Router>
</ApolloProvider> |
<<<<<<<
<ApolloProvider client={apolloClient}>
<Router history={hashHistory} onUpdate={trackUrl}>
<Route component={App} name="app" path="/">
<Route path="dashboard" component={Dashboard} onEnter={redirectToLogin}/>
/* #if debug */
<Route path="replay" path="replay/:replayId" component={ReplayViewer}/>
<Route path="debug" component={ReplayViewer}/>
/* #endif */
<Route path="signin" component={AccountApp} onEnter={redirectToDashboard}>
<Route path="forgotten" component={ForgottenPassword}/>
<IndexRoute component={Signin}/>
=======
<Router history={hashHistory} onUpdate={trackUrl}>
<Route component={App} name="app" path="/">
<Route path="dashboard" component={Dashboard} onEnter={redirectToLogin}/>
/* #if debug */
<Route path="replay" path="replay/:replayId" component={ReplayViewer}/>
<Route path="debug" component={ReplayViewer}/>
/* #endif */
<Route path="signin" component={AccountApp} onEnter={redirectToDashboard}>
<Route path="reset" component={ResetPassword}/>
<Route path="forgotten" component={ForgottenPassword}/>
<IndexRoute component={Signin}/>
</Route>
<Route path="signup" component={AccountApp} onEnter={redirectToDashboard}>
<IndexRoute component={Register}/>
</Route>
<Route component={AccountApp} path="account">
<IndexRedirect to="home" />
<Route path="billing" component={AccountDashboard} name="billing" onEnter={redirectToLogin}>
<IndexRoute component={AccountInvoiceList}/>
</Route>
<Route component={AccountDashboard} path="home" name="home" onEnter={redirectToLogin}>
<IndexRoute component={AccountHome}/>
</Route>
<Route component={AccountDashboard} path="success" name="success" onEnter={redirectToLogin}>
<IndexRoute component={AccountSuccess}/>
>>>>>>>
<ApolloProvider client={apolloClient}>
<Router history={hashHistory} onUpdate={trackUrl}>
<Route component={App} name="app" path="/">
<Route path="dashboard" component={Dashboard} onEnter={redirectToLogin}/>
/* #if debug */
<Route path="replay" path="replay/:replayId" component={ReplayViewer}/>
<Route path="debug" component={ReplayViewer}/>
/* #endif */
<Route path="signin" component={AccountApp} onEnter={redirectToDashboard}>
<Route path="reset" component={ResetPassword}/>
<Route path="forgotten" component={ForgottenPassword}/>
<IndexRoute component={Signin}/>
</Route> |
<<<<<<<
/**
* Set coordinates by either user coordinates or screen coordinates and recalculate the other one.
* @param {Number} coord_type The type of coordinates used here. Possible values are <b>COORDS_BY_USER</b> and <b>COORDS_BY_SCREEN</b>.
* @param {Array} coordinates An array of affine coordinates the Coords object is set to.
* @param {Boolean} [doRound=true] flag If true or null round the coordinates in usr2screen. This is used in smooth curve plotting.
* The IE needs rounded coordinates. Id doRound==false we have to round in updatePathString.
* @returns {JXG.Coords} Reference to the coords object.
*/
setCoordinates: function (coord_type, coordinates, doRound) {
var uc = this.usrCoords,
sc = this.scrCoords,
ou = [uc[0], uc[1], uc[2]],
os = [sc[0], sc[1], sc[2]];
if (coord_type === JXG.COORDS_BY_USER) {
if (coordinates.length === 2) { // Euclidean coordinates
uc[0] = 1.0;
uc[1] = coordinates[0];
uc[2] = coordinates[1];
} else { // Homogeneous coordinates (normalized)
uc[0] = coordinates[0];
uc[1] = coordinates[1];
uc[2] = coordinates[2];
this.normalizeUsrCoords();
=======
return Math.sqrt(sum);
},
/**
* Set coordinates by either user coordinates or screen coordinates and recalculate the other one.
* @param {Number} coord_type The type of coordinates used here. Possible values are <b>COORDS_BY_USER</b> and <b>COORDS_BY_SCREEN</b>.
* @param {Array} coordinates An array of affine coordinates the Coords object is set to.
* @param {Boolean} [doRound=true] flag If true or null round the coordinates in usr2screen. This is used in smooth curve plotting.
* The IE needs rounded coordinates. Id doRound==false we have to round in updatePathString.
* @returns {JXG.Coords} Reference to the coords object.
*/
setCoordinates: function (coord_type, coordinates, doRound) {
var uc = this.usrCoords,
sc = this.scrCoords,
ou = this.usrCoords.slice(0),
os = this.scrCoords.slice(0);
if (coord_type === JXG.COORDS_BY_USER) {
if (coordinates.length === 2) { // Euclidean coordinates
uc[0] = 1.0;
uc[1] = coordinates[0];
uc[2] = coordinates[1];
} else { // Homogeneous coordinates (normalized)
uc[0] = coordinates[0];
uc[1] = coordinates[1];
uc[2] = coordinates[2];
this.normalizeUsrCoords();
}
this.usr2screen(doRound);
} else {
sc[1] = coordinates[0];
sc[2] = coordinates[1];
this.screen2usr();
>>>>>>>
return Math.sqrt(sum);
},
/**
* Set coordinates by either user coordinates or screen coordinates and recalculate the other one.
* @param {Number} coord_type The type of coordinates used here. Possible values are <b>COORDS_BY_USER</b> and <b>COORDS_BY_SCREEN</b>.
* @param {Array} coordinates An array of affine coordinates the Coords object is set to.
* @param {Boolean} [doRound=true] flag If true or null round the coordinates in usr2screen. This is used in smooth curve plotting.
* The IE needs rounded coordinates. Id doRound==false we have to round in updatePathString.
* @returns {JXG.Coords} Reference to the coords object.
*/
setCoordinates: function (coord_type, coordinates, doRound) {
var uc = this.usrCoords,
sc = this.scrCoords,
ou = [uc[0], uc[1], uc[2]],
os = [sc[0], sc[1], sc[2]];
if (coord_type === JXG.COORDS_BY_USER) {
if (coordinates.length === 2) { // Euclidean coordinates
uc[0] = 1.0;
uc[1] = coordinates[0];
uc[2] = coordinates[1];
} else { // Homogeneous coordinates (normalized)
uc[0] = coordinates[0];
uc[1] = coordinates[1];
uc[2] = coordinates[2];
this.normalizeUsrCoords();
}
this.usr2screen(doRound);
} else {
sc[1] = coordinates[0];
sc[2] = coordinates[1];
this.screen2usr(); |
<<<<<<<
function testOptionClick(option, cb) {
=======
function testMoreBangs() {
var bangs_link = wd.findElement(By.css('.link.bang a'));
testNewTabUrl(bangs_link, "More Bangs link opens bangs page", /duckduckgo\.com\/bang/);
}
function testMoreOptions() {
var options_link = wd.findElement(By.css('.link.more a'));
var opts_url = new RegExp(MORE_OPTIONS_URL);
testNewTabUrl(options_link, "More Options link opens options.html", opts_url);
}
function testOptionClick(option) {
>>>>>>>
function testMoreBangs() {
var bangs_link = wd.findElement(By.css('.link.bang a'));
testNewTabUrl(bangs_link, "More Bangs link opens bangs page", /duckduckgo\.com\/bang/);
}
function testMoreOptions() {
var options_link = wd.findElement(By.css('.link.more a'));
var opts_url = new RegExp(MORE_OPTIONS_URL);
testNewTabUrl(options_link, "More Options link opens options.html", opts_url);
}
function testOptionClick(option, cb) { |
<<<<<<<
else if(cmpr==7) UTIF.decode._decodeNewJPEG(img, data, off, len, tgt, toff);
else if(cmpr==8) { var src = new Uint8Array(data.buffer,off,len); var bin = pako["inflate"](src); console.log(bin.length); for(var i=0; i<bin.length; i++) tgt[toff+i]=bin[i]; }
else if(cmpr==32773) UTIF.decode._decodePackBits(data, off, len, tgt, toff);
=======
else if(cmpr==8) { var src = new Uint8Array(data.buffer,off,len); var bin = pako["inflate"](src); log(bin.length); for(var i=0; i<bin.length; i++) tgt[toff+i]=bin[i]; }
else if(cmpr==32773) UTIF.decode._decodePackBits(data, off, len, tgt, toff);
>>>>>>>
else if(cmpr==7) UTIF.decode._decodeNewJPEG(img, data, off, len, tgt, toff);
else if(cmpr==8) { var src = new Uint8Array(data.buffer,off,len); var bin = pako["inflate"](src); log(bin.length); for(var i=0; i<bin.length; i++) tgt[toff+i]=bin[i]; }
else if(cmpr==32773) UTIF.decode._decodePackBits(data, off, len, tgt, toff); |
<<<<<<<
import {
CapabilitiesBasedSearchApi,
SearchApi,
WorkerSearchApi
} from './SearchApi'
=======
import { SearchApi, WorkerSearchApi } from './SearchApi'
import { Search } from './lib'
>>>>>>>
import {
CapabilitiesBasedSearchApi,
SearchApi,
WorkerSearchApi
} from './SearchApi'
import { Search } from './lib' |
<<<<<<<
this.startColor = this.endColor = this.customEase = this._completeCallback = null;
=======
this.startColor = this.startScale = this.startAlpha = this.startSpeed =
this.customEase = null;
>>>>>>>
this.startColor = this.startScale = this.startAlpha = this.startSpeed =
this.customEase = this._completeCallback = null; |
<<<<<<<
@connect(
state => ({
isReady: state.conversation.conversationId,
}),
{
setCredentials,
setFirstMessage,
createConversation,
},
)
=======
@connect(null, {
setCredentials,
createConversation,
removeAllMessages,
})
>>>>>>>
@connect(
state => ({
isReady: state.conversation.conversationId,
}),
{
setCredentials,
setFirstMessage,
createConversation,
removeAllMessages,
},
)
<<<<<<<
componentWillReceiveProps(nextProps) {
const { isReady, preferences } = nextProps
if (isReady !== this.props.isReady) {
let expanded = null
switch (preferences.openingType) {
case 'always':
expanded = true
break
case 'never':
expanded = false
break
case 'memory':
expanded = localStorage.getItem('isChatOpen') === 'true'
break
default:
break
}
this.setState({ expanded })
}
}
componentDidUpdate(prevState) {
if (this.state.expanded !== prevState.expanded) {
localStorage.setItem('isChatOpen', this.state.expanded)
}
}
=======
componentWillReceiveProps(nextProps) {
const { expanded } = nextProps
if (expanded !== undefined && expanded !== this.state.expanded) {
this.setState({ expanded })
}
}
componentDidUpdate(prevState) {
const { onToggle } = this.props
if (prevState.expanded !== this.state.expanded) {
if (onToggle) {
onToggle(this.state.expanded)
}
}
}
>>>>>>>
componentWillReceiveProps(nextProps) {
const { isReady, preferences, expanded } = nextProps
if (isReady !== this.props.isReady) {
let expanded = null
switch (preferences.openingType) {
case 'always':
expanded = true
break
case 'never':
expanded = false
break
case 'memory':
expanded = localStorage.getItem('isChatOpen') === 'true'
break
default:
break
}
this.setState({ expanded })
}
if (expanded !== undefined && expanded !== this.state.expanded) {
this.setState({ expanded })
}
}
componentDidUpdate(prevState) {
const { onToggle } = this.props
if (prevState.expanded !== this.state.expanded) {
localStorage.setItem('isChatOpen', this.state.expanded)
if (onToggle) {
onToggle(this.state.expanded)
}
}
} |
<<<<<<<
const credentials = getCredentialsFromCookie(channelId)
=======
const credentials = getCredentialsFromLocalStorage()
>>>>>>>
const credentials = getCredentialsFromLocalStorage(channelId)
<<<<<<<
storeCredentialsInCookie(chatId, id, preferences.conversationTimeToLive, channelId)
=======
storeCredentialsToLocalStorage(chatId, id, preferences.conversationTimeToLive)
>>>>>>>
storeCredentialsToLocalStorage(chatId, id, preferences.conversationTimeToLive, channelId) |
<<<<<<<
if (aboveVisible) addToScrollPos(cm, null, widget.height);
=======
if (aboveVisible) addToScrollPos(cm, 0, widget.height);
cm.curOp.forceUpdate = true;
>>>>>>>
if (aboveVisible) addToScrollPos(cm, null, widget.height);
cm.curOp.forceUpdate = true;
<<<<<<<
var nonASCIISingleCaseWordChar = /[\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
var isWordChar = CodeMirror.isWordChar = function(ch) {
=======
var nonASCIISingleCaseWordChar = /[\u00df\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
function isWordChar(ch) {
>>>>>>>
var nonASCIISingleCaseWordChar = /[\u00df\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
var isWordChar = CodeMirror.isWordChar = function(ch) {
<<<<<<<
CodeMirror.version = "4.0.0";
=======
CodeMirror.version = "3.22.1";
>>>>>>>
CodeMirror.version = "4.0.0"; |
<<<<<<<
if (insert == null && mode.lineComment) {
var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);
if (found > -1) {
insert = line.slice(0, found);
if (/\S/.test(insert)) insert = null;
else insert += mode.lineComment + line.slice(found + mode.lineComment.length).match(/^\s*/)[0];
}
=======
if (insert != null) insert += mode.blockCommentContinue;
}
if (insert == null && mode.lineComment && continueLineCommentEnabled(cm)) {
var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);
if (found > -1) {
insert = line.slice(0, found);
if (/\S/.test(insert)) insert = null;
else insert += mode.lineComment + line.slice(found + mode.lineComment.length).match(/^\s*/)[0];
>>>>>>>
if (insert == null && mode.lineComment && continueLineCommentEnabled(cm)) {
var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);
if (found > -1) {
insert = line.slice(0, found);
if (/\S/.test(insert)) insert = null;
else insert += mode.lineComment + line.slice(found + mode.lineComment.length).match(/^\s*/)[0];
} |
<<<<<<<
// ie_uptoN means Internet Explorer version N or lower
var ie_upto10 = /MSIE \d/.test(navigator.userAgent);
var ie_upto7 = ie_upto10 && (document.documentMode == null || document.documentMode < 8);
var ie_upto8 = ie_upto10 && (document.documentMode == null || document.documentMode < 9);
var ie_11up = /Trident\/([7-9]|\d{2,})\./.test(navigator.userAgent);
var ie = ie_upto10 || ie_11up;
=======
// IE11 currently doesn't count as 'ie', since it has almost none of
// the same bugs as earlier versions. Use ie_gt10 to handle
// incompatibilities in that version.
var old_ie = /MSIE \d/.test(navigator.userAgent);
var ie_lt8 = old_ie && (document.documentMode == null || document.documentMode < 8);
var ie_lt9 = old_ie && (document.documentMode == null || document.documentMode < 9);
var ie_lt10 = old_ie && (document.documentMode == null || document.documentMode < 10);
var ie_gt10 = /Trident\/([7-9]|\d{2,})\./.test(navigator.userAgent);
var ie = old_ie || ie_gt10;
>>>>>>>
// ie_uptoN means Internet Explorer version N or lower
var ie_upto10 = /MSIE \d/.test(navigator.userAgent);
var ie_upto7 = ie_upto10 && (document.documentMode == null || document.documentMode < 8);
var ie_upto8 = ie_upto10 && (document.documentMode == null || document.documentMode < 9);
var ie_upto9 = ie_upto10 && (document.documentMode == null || document.documentMode < 10);
var ie_11up = /Trident\/([7-9]|\d{2,})\./.test(navigator.userAgent);
var ie = ie_upto10 || ie_11up;
<<<<<<<
d.cachedCharWidth = d.cachedTextHeight = null;
=======
d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
d.measureLineCache = [];
d.measureLineCachePos = 0;
>>>>>>>
d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
<<<<<<<
clearLineMeasurementCache(cm);
cm.display.cachedCharWidth = cm.display.cachedTextHeight = null;
=======
cm.display.measureLineCache.length = cm.display.measureLineCachePos = 0;
cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null;
>>>>>>>
clearLineMeasurementCache(cm);
cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null;
<<<<<<<
var width = measureChar(cm, display.maxLine, display.maxLine.text.length).left;
=======
var width = measureLineWidth(cm, display.maxLine);
display.sizer.style.minWidth = Math.max(0, width + 3) + "px";
>>>>>>>
var width = measureChar(cm, display.maxLine, display.maxLine.text.length).left;
<<<<<<<
d.cachedCharWidth = d.cachedTextHeight = knownScrollbarWidth = null;
cm.setSize();
=======
d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = knownScrollbarWidth = null;
clearCaches(cm);
runInOp(cm, bind(regChange, cm));
>>>>>>>
d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = knownScrollbarWidth = null;
cm.setSize();
<<<<<<<
var lastClick, lastDoubleClick;
function leftButtonDown(cm, e, start) {
if (!cm.state.focused) onFocus(cm);
=======
setTimeout(bind(ensureFocus, cm), 0);
>>>>>>>
var lastClick, lastDoubleClick;
function leftButtonDown(cm, e, start) {
setTimeout(bind(ensureFocus, cm), 0);
<<<<<<<
if (cmp(cur, lastPos) != 0) {
if (!cm.state.focused) onFocus(cm);
extendTo(cur);
=======
if (!posEq(cur, last)) {
ensureFocus(cm);
last = cur;
doSelect(cur);
>>>>>>>
if (cmp(cur, lastPos) != 0) {
ensureFocus(cm);
extendTo(cur);
<<<<<<<
if (!ie_upto8 && (ie ? !e.buttons : !e_button(e))) done(e);
=======
if ((ie && !ie_lt10) ? !e.buttons : !e_button(e)) done(e);
>>>>>>>
if ((ie && !ie_upto9) ? !e.buttons : !e_button(e)) done(e);
<<<<<<<
if (!cm.state.focused) onFocus(cm);
if (signalDOMEvent(cm, e)) return;
=======
ensureFocus(cm);
if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
if (old_ie && e.keyCode == 27) e.returnValue = false;
var code = e.keyCode;
>>>>>>>
ensureFocus(cm);
if (signalDOMEvent(cm, e)) return;
<<<<<<<
deleteNearSelection(cm, function(range) {
return {from: Pos(range.from().line, 0),
to: clipPos(cm.doc, Pos(range.to().line + 1, 0))};
});
=======
var l = cm.getCursor().line;
cm.replaceRange("", Pos(l, 0), Pos(l + 1, 0), "+delete");
>>>>>>>
deleteNearSelection(cm, function(range) {
return {from: Pos(range.from().line, 0),
to: clipPos(cm.doc, Pos(range.to().line + 1, 0))};
}); |
<<<<<<<
INDISCRIMINATE_CONSUMPTION: { //Idol of Indiscriminate Consumption
id: 295962, // NOT CONFIRMED, NO EXAMPLE LOG FOUND
name: "Indiscriminate Consumption",
icon: "ability_druid_primaltenacity",
},
INSIDIOUS_GIFT: { //Lurker's Insidious Gift Mastery Buff
id: 295408,
name: "Insidious Gift",
icon: "inv_darkmoon_eye",
},
OBLIVION_SPEAR_DAMAGE: { //Harbinger's Inscrutable Will Damage
id: 295393,
name: "Oblivion Spear",
icon: "spell_fire_twilightpyroblast",
},
OBLIVION_SPEAR_SILENCE: { //Harbinger's Inscrutable Will Silence
id: 295395,
name: "Oblivion Spear",
icon: "spell_fire_twilightpyroblast",
},
SPITEFUL_BINDING: { //Grips of Forsaken Insanity
id: 295178,
name: "Spiteful Binding",
icon: "ability_creature_disease_05",
},
SUFFERING_DAMAGE: { //Lurker's Insidious Gift Damage
id: 295410,
name: "Suffering",
icon: "spell_shadow_painandsuffering",
},
SUFFERING_DEBUFF: { //Lurker's Insidious Gift Debuff
id: 295413,
name: "Suffering",
icon: "spell_shadow_painandsuffering",
},
UMBRAL_SHELL: { //Void Stone
id: 295271,
name: "Umbral Shell",
icon: "spell_warlock_demonsoul",
},
UNBOUND_ANGUISH_DAMAGE: { //Legplates of Unbound Anguish additional Damage Done
id: 295428,
name: "Unbound Anguish",
icon: "ability_warlock_soulswap",
},
UNBOUND_ANGUISH_SACRIFICE: { //Legplates of Unbound Anguish HP sacrificed
id: 295866,
name: "Unbound Anguish",
icon: "ability_warlock_soulswap",
},
VOID_EMBRACE: { //Malformed Herald's Legwraps Haste Buff
id: 295174,
name: "Void Embrace",
icon: "ability_priest_voidentropy",
},
VOID_BACKLASH: { //Malformed Herald's Legwraps Damage Taken
id: 295176,
name: "Void Backlash",
icon: "spell_priest_voidtendrils",
},
=======
UNTOUCHABLE: { //Stormglide Steps Crit Buff
id: 295278,
name: "Untouchable",
icon: "ability_monk_ridethewind",
},
>>>>>>>
INDISCRIMINATE_CONSUMPTION: { //Idol of Indiscriminate Consumption
id: 295962, // NOT CONFIRMED, NO EXAMPLE LOG FOUND
name: "Indiscriminate Consumption",
icon: "ability_druid_primaltenacity",
},
INSIDIOUS_GIFT: { //Lurker's Insidious Gift Mastery Buff
id: 295408,
name: "Insidious Gift",
icon: "inv_darkmoon_eye",
},
OBLIVION_SPEAR_DAMAGE: { //Harbinger's Inscrutable Will Damage
id: 295393,
name: "Oblivion Spear",
icon: "spell_fire_twilightpyroblast",
},
OBLIVION_SPEAR_SILENCE: { //Harbinger's Inscrutable Will Silence
id: 295395,
name: "Oblivion Spear",
icon: "spell_fire_twilightpyroblast",
},
SPITEFUL_BINDING: { //Grips of Forsaken Insanity
id: 295178,
name: "Spiteful Binding",
icon: "ability_creature_disease_05",
},
SUFFERING_DAMAGE: { //Lurker's Insidious Gift Damage
id: 295410,
name: "Suffering",
icon: "spell_shadow_painandsuffering",
},
SUFFERING_DEBUFF: { //Lurker's Insidious Gift Debuff
id: 295413,
name: "Suffering",
icon: "spell_shadow_painandsuffering",
},
UMBRAL_SHELL: { //Void Stone
id: 295271,
name: "Umbral Shell",
icon: "spell_warlock_demonsoul",
},
UNBOUND_ANGUISH_DAMAGE: { //Legplates of Unbound Anguish additional Damage Done
id: 295428,
name: "Unbound Anguish",
icon: "ability_warlock_soulswap",
},
UNBOUND_ANGUISH_SACRIFICE: { //Legplates of Unbound Anguish HP sacrificed
id: 295866,
name: "Unbound Anguish",
icon: "ability_warlock_soulswap",
},
UNTOUCHABLE: { //Stormglide Steps Crit Buff
id: 295278,
name: "Untouchable",
icon: "ability_monk_ridethewind",
},
VOID_EMBRACE: { //Malformed Herald's Legwraps Haste Buff
id: 295174,
name: "Void Embrace",
icon: "ability_priest_voidentropy",
},
VOID_BACKLASH: { //Malformed Herald's Legwraps Damage Taken
id: 295176,
name: "Void Backlash",
icon: "spell_priest_voidtendrils",
}, |
<<<<<<<
return false;
=======
>>>>>>>
return false; |
<<<<<<<
DependencyObject.Instance._SetValueWithErrorImpl = function (propd, value, error) {
=======
DependencyObject.Instance._SetValueImpl = function (propd, value, error) {
var propPrecEnum = _PropertyPrecedence;
>>>>>>>
DependencyObject.Instance._SetValueWithErrorImpl = function (propd, value, error) {
<<<<<<<
if (newValue !== undefined) {
this._Providers[_PropertyPrecedence.LocalValue].SetValue(propd, newValue);
=======
if (newValue != null) {
this._Providers[propPrecEnum.LocalValue].SetValue(propd, newValue);
>>>>>>>
if (newValue !== undefined) {
this._Providers[propPrecEnum.LocalValue].SetValue(propd, newValue);
<<<<<<<
DependencyObject.Instance._IsValueValid = function (propd, coerced, error) {
//TODO: Handle type problems
return true;
};
//#endregion
//#region Get Value
DependencyObject.Instance.$GetValue = function (propd) {
if (!propd)
throw new ArgumentException("Null dependency property.");
var error = new BError();
var value = this._GetValueWithError(propd, error);
if (error.IsErrored())
throw error.CreateException();
return value;
};
DependencyObject.Instance._GetValueWithError = function (propd, error) {
if (!this._HasProperty(propd)) {
error.SetErrored(BError.Exception, "Cannot get the DependencyProperty " + propd.Name + " on an object of type " + propd.OwnerType._TypeName);
return undefined;
}
return this._GetValue(propd);
};
DependencyObject.Instance._GetValue = function (propd, startingPrecedence, endingPrecedence) {
=======
DependencyObject.Instance.$GetValue = function (propd, startingPrecedence, endingPrecedence) {
var propPrecEnum = _PropertyPrecedence;
>>>>>>>
DependencyObject.Instance._IsValueValid = function (propd, coerced, error) {
//TODO: Handle type problems
return true;
};
//#endregion
//#region Get Value
DependencyObject.Instance.$GetValue = function (propd) {
if (!propd)
throw new ArgumentException("Null dependency property.");
var error = new BError();
var value = this._GetValueWithError(propd, error);
if (error.IsErrored())
throw error.CreateException();
return value;
};
DependencyObject.Instance._GetValueWithError = function (propd, error) {
if (!this._HasProperty(propd)) {
error.SetErrored(BError.Exception, "Cannot get the DependencyProperty " + propd.Name + " on an object of type " + propd.OwnerType._TypeName);
return undefined;
}
return this._GetValue(propd);
};
DependencyObject.Instance._GetValue = function (propd, startingPrecedence, endingPrecedence) {
var propPrecEnum = _PropertyPrecedence;
<<<<<<<
DependencyObject.Instance._ReadLocalValue = function (propd) {
return this._Providers[_PropertyPrecedence.LocalValue].GetPropertyValue(propd);
};
//#endregion
//#region Clear Value
DependencyObject.Instance.$ClearValue = function (propd) {
if (!propd)
throw new ArgumentException("Null dependency property.");
if (propd.IsReadOnly && !propd._IsCustom)
throw new ArgumentException("This property is readonly.");
this.$ClearValueInternal(propd);
};
DependencyObject.Instance.$ClearValueInternal = function (propd) {
this.$RemoveExpression(propd);
this._ClearValue(propd, true);
};
DependencyObject.Instance._ClearValue = function (propd, notifyListeners) {
var error = new BError();
this._ClearValueWithError(propd, true, error);
if (error.IsErrored())
throw error.CreateException();
};
DependencyObject.Instance._ClearValueWithError = function (propd, notifyListeners, error) {
if (notifyListeners === undefined)
=======
DependencyObject.Instance.ClearValue = function (propd, notifyListeners, error) {
var propPrecEnum = _PropertyPrecedence;
if (notifyListeners == undefined)
>>>>>>>
DependencyObject.Instance._ReadLocalValue = function (propd) {
return this._Providers[_PropertyPrecedence.LocalValue].GetPropertyValue(propd);
};
//#endregion
//#region Clear Value
DependencyObject.Instance.$ClearValue = function (propd) {
if (!propd)
throw new ArgumentException("Null dependency property.");
if (propd.IsReadOnly && !propd._IsCustom)
throw new ArgumentException("This property is readonly.");
this.$ClearValueInternal(propd);
};
DependencyObject.Instance.$ClearValueInternal = function (propd) {
this.$RemoveExpression(propd);
this._ClearValue(propd, true);
};
DependencyObject.Instance._ClearValue = function (propd, notifyListeners) {
var error = new BError();
this._ClearValueWithError(propd, true, error);
if (error.IsErrored())
throw error.CreateException();
};
DependencyObject.Instance._ClearValueWithError = function (propd, notifyListeners, error) {
if (notifyListeners === undefined)
<<<<<<<
var inheritedProvider = this._Providers[_PropertyPrecedence.Inherited];
if (inheritedProvider) {
if (providerPrecedence === _PropertyPrecedence.Inherited) {
=======
var inheritedProvider = this._Providers[propPrecEnum.Inherited];
if (inheritedProvider != null) {
if (providerPrecedence === propPrecEnum.Inherited) {
>>>>>>>
var propPrecInherited = _PropertyPrecedence.Inherited;
var inheritedProvider = this._Providers[propPrecInherited];
if (inheritedProvider) {
if (providerPrecedence === propPrecInherited) {
<<<<<<<
if (_InheritedPropertyValueProvider.IsInherited(this, propd)
&& this._GetPropertyValueProvider(propd) < _PropertyPrecedence.Inherited) {
=======
if (_InheritedPropertyValueProvider.GetInheritable(this, propd) > 0
&& this._GetPropertyValueProvider(propd) < propPrecEnum.Inherited) {
>>>>>>>
if (_InheritedPropertyValueProvider.GetInheritable(this, propd) > 0
&& this._GetPropertyValueProvider(propd) < propPrecInherited) {
<<<<<<<
var inheritedProvider = this._Providers[_PropertyPrecedence.Inherited];
if (!inheritedProvider)
=======
var propPrecEnumInherited = _PropertyPrecedence.Inherited;
var inheritedProvider = this._Providers[propPrecEnumInherited];
if (inheritedProvider == null)
>>>>>>>
var propPrecInherited = _PropertyPrecedence.Inherited;
var inheritedProvider = this._Providers[propPrecInherited];
if (!inheritedProvider)
<<<<<<<
this._ProviderValueChanged(_PropertyPrecedence.Inherited, propd, undefined, newValue, true, false, false, error);
return this._GetPropertyValueProvider(propd) === _PropertyPrecedence.Inherited;
=======
this._ProviderValueChanged(propPrecEnumInherited, propd, null, newValue, true, false, false, error);
return this._GetPropertyValueProvider(propd) === propPrecEnumInherited;
>>>>>>>
this._ProviderValueChanged(propPrecInherited, propd, undefined, newValue, true, false, false, error);
return this._GetPropertyValueProvider(propd) === propPrecInherited;
<<<<<<<
var inheritedProvider = this._Providers[_PropertyPrecedence.Inherited];
if (!inheritedProvider)
=======
var propPrecEnumInherited = _PropertyPrecedence.Inherited;
var inheritedProvider = this._Providers[propPrecEnumInherited];
if (inheritedProvider == null)
>>>>>>>
var propPrecInherited = _PropertyPrecedence.Inherited;
var inheritedProvider = this._Providers[propPrecInherited];
if (!inheritedProvider) |
<<<<<<<
var static_dir = 'static/';
var templates_dir = 'templates/';
var js_dir = 'js/';
var css_dir = 'css/';
var build_tasks = [
'handlebars:compile',
'concat:js',
'sass',
'execute:preProcessLists'
];
var js_file = js_dir + 'popup.js';
var sass_file = css_dir + 'popup.scss';
=======
>>>>>>>
var static_dir = 'static/';
var templates_dir = 'templates/';
var js_dir = 'js/';
var css_dir = 'css/';
var build_tasks = [
'handlebars:compile',
'concat:js',
'sass',
'execute:preProcessLists'
];
var js_file = js_dir + 'popup.js';
var sass_file = css_dir + 'popup.scss';
<<<<<<<
},
execute: {
preProcessLists: {
src: ['scripts/buildLists.js']
}
=======
},
watch: {
css: {
files: ['<%= dirs.src.css %>/**/*.scss'],
tasks: ['sass']
},
javascript: {
files: ['<%= dirs.src.js %>/**/*.js'],
tasks: ['concat:js']
},
templates: {
files: ['<%= dirs.src.templates %>/**/*.handlebars'],
tasks: ['handlebars:compile', 'concat:js']
}
>>>>>>>
},
execute: {
preProcessLists: {
src: ['scripts/buildLists.js']
}
},
watch: {
css: {
files: ['<%= dirs.src.css %>/**/*.scss'],
tasks: ['sass']
},
javascript: {
files: ['<%= dirs.src.js %>/**/*.js'],
tasks: ['concat:js']
},
templates: {
files: ['<%= dirs.src.templates %>/**/*.handlebars'],
tasks: ['handlebars:compile', 'concat:js']
} |
<<<<<<<
'measure': 'Messung',
'measureDistancesAndAreas': 'Messung von Abständen und Flächen',
'createNewMeasurement': 'Eine neue Messung durchführen',
'startCreating': 'Führen Sie die Messung durch, indem Sie der Karte Punkte hinzufügen.',
'finishMeasurement': 'Messung beenden',
'lastPoint': 'Letzter Punkt',
'area': 'Fläche',
'perimeter': 'Rand',
'pointLocation': 'Lage des Punkts',
'areaMeasurement': 'Gemessene Fläche',
'linearMeasurement': 'Gemessener Abstand',
'pathDistance': 'Abstand entlang des Pfads',
'centerOnArea': 'Auf diese Fläche zentrieren',
'centerOnLine': 'Auf diesen Linienzug zentrieren',
'centerOnLocation': 'Auf diesen Ort zentrieren',
'cancel': 'Abbrechen',
'delete': 'Löchen',
'acres': 'Morgen',
'feet': 'Fuß',
'kilometers': 'Kilometer',
'hectares': 'Hektar',
'meters': 'Meter',
'miles': 'Meilen',
'sqfeet': 'Quadratfuß',
'sqmeters': 'Quadratmeter',
'sqmiles': 'Quadratmeilen',
'decPoint': ',',
'thousandsSep': '.'
=======
'measure': 'Messung',
'measureDistancesAndAreas': 'Messung von Abständen und Flächen',
'createNewMeasurement': 'Eine neue Messung durchführen',
'startCreating': 'Führen Sie die Messung durch, indem Sie der Karte Punkte hinzufügen.',
'finishMeasurement': 'Messung beenden',
'lastPoint': 'Letzter Punkt',
'area': 'Fläche',
'perimeter': 'Rand',
'pointLocation': 'Lage des Punkts',
'areaMeasurement': 'Gemessene Fläche',
'linearMeasurement': 'Gemessener Abstand',
'pathDistance': 'Abstand entlang des Pfads',
'centerOnArea': 'Auf diese Fläche zentrieren',
'centerOnLine': 'Auf diesen Linienzug zentrieren',
'centerOnLocation': 'Auf diesen Ort zentrieren',
'cancel': 'Abbrechen',
'delete': 'Löschen',
'acres': 'Morgen',
'feet': 'Fuß',
'kilometers': 'Kilometer',
'hectares': 'Hektar',
'meters': 'Meter',
'miles': 'Meilen',
'sqfeet': 'Quadratfuß',
'sqmeters': 'Quadratmeter',
'sqmiles': 'Quadratmeilen',
'decPoint': '.',
'thousandsSep': ','
>>>>>>>
'measure': 'Messung',
'measureDistancesAndAreas': 'Messung von Abständen und Flächen',
'createNewMeasurement': 'Eine neue Messung durchführen',
'startCreating': 'Führen Sie die Messung durch, indem Sie der Karte Punkte hinzufügen.',
'finishMeasurement': 'Messung beenden',
'lastPoint': 'Letzter Punkt',
'area': 'Fläche',
'perimeter': 'Rand',
'pointLocation': 'Lage des Punkts',
'areaMeasurement': 'Gemessene Fläche',
'linearMeasurement': 'Gemessener Abstand',
'pathDistance': 'Abstand entlang des Pfads',
'centerOnArea': 'Auf diese Fläche zentrieren',
'centerOnLine': 'Auf diesen Linienzug zentrieren',
'centerOnLocation': 'Auf diesen Ort zentrieren',
'cancel': 'Abbrechen',
'delete': 'Löschen',
'acres': 'Morgen',
'feet': 'Fuß',
'kilometers': 'Kilometer',
'hectares': 'Hektar',
'meters': 'Meter',
'miles': 'Meilen',
'sqfeet': 'Quadratfuß',
'sqmeters': 'Quadratmeter',
'sqmiles': 'Quadratmeilen',
'decPoint': ',',
'thousandsSep': '.' |
<<<<<<<
SEQ test.seq1 test.seq2
=======
SEQ test.seq1 test.seq2
>>>>>>>
SEQ test.seq1 test.seq2
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>> |
<<<<<<<
"httpsUpgradeList": "https://duckduckgo.com/contentblocking.js?l=https",
"surrogateList": "https://duckduckgo.com/contentblocking.js?l=surrogates",
=======
"httpsUpgradeList": "https://duckduckgo.com/contentblocking.js?l=https2",
>>>>>>>
"surrogateList": "https://duckduckgo.com/contentblocking.js?l=surrogates",
"httpsUpgradeList": "https://duckduckgo.com/contentblocking.js?l=https2", |
<<<<<<<
},
{
name: "KievII",
website: "http://kievII.net/",
description: "Web audio application / DSP library, with HTML5 frontend.",
useIf: [
"You want to build an audio Web application with an HTML5 GUI, automations and MozAudio / Web API support."
],
size: "modular: 30Kb to start, max about 200Kb"
=======
},
{
name: "ArtJs",
website: "http://artjs.org",
description: "ArtJs is JavaScript framework of general purpose. It allows you to select or manipulate DOM elements, perform AJAX requests, provides load of helper methods for String, Date and other native classes, etc.",
tags: ["dom"],
size: 70
>>>>>>>
},
{
name: "KievII",
website: "http://kievII.net/",
description: "Web audio application / DSP library, with HTML5 frontend.",
useIf: [
"You want to build an audio Web application with an HTML5 GUI, automations and MozAudio / Web API support."
],
size: "modular: 30Kb to start, max about 200Kb"
},
{
name: "ArtJs",
website: "http://artjs.org",
description: "ArtJs is JavaScript framework of general purpose. It allows you to select or manipulate DOM elements, perform AJAX requests, provides load of helper methods for String, Date and other native classes, etc.",
tags: ["dom"],
size: 70 |
<<<<<<<
src.push("attribute vec4 flags2;");
=======
if (clipping) {
src.push("attribute vec4 flags2;");
}
src.push("attribute vec3 offset;");
>>>>>>>
src.push("attribute vec4 flags2;");
src.push("attribute vec3 offset;"); |
<<<<<<<
scope[ast.name.name] = {
type: "COMPONENT",
sizes: sizes,
cIdx: Array.isArray(cIdx) ? cIdx[0] : cIdx
};
=======
scope[ast.name.name] = {
type: "COMPONENT",
value: iterateSelectors(ctx, sizes, baseName, function(fullName) {
ctx.components[fullName] = "UNINSTANTIATED";
return {
type: "COMPONENT",
fullName: fullName
};
})
};
>>>>>>>
scope[ast.name.name] = {
type: "COMPONENT",
value: {
type: "COMPONENT",
sizes: sizes,
cIdx: Array.isArray(cIdx) ? cIdx[0] : cIdx
}
};
<<<<<<<
scope[template.params[i]] = paramValues[i];
ctx.components[cIdx].params[template.params[i]] = extractValue(paramValues[i]);
=======
scope[template.params[i]] = {
type: "VARIABLE",
value: paramValues[i]
};
ctx.components[ctx.currentComponent].params[template.params[i]] = extractValue(paramValues[i]);
>>>>>>>
scope[template.params[i]] = {
type: "VARIABLE",
value: paramValues[i]
};
ctx.components[cIdx].params[template.params[i]] = extractValue(paramValues[i]);
<<<<<<<
let sIdx = ctx.addSignal(ast.name.name, sizes);
if (!Array.isArray(sIdx)) sIdx = [sIdx, sIdx+1];
for (let i=sIdx[0]; i<sIdx[1]; i++) {
ctx.signals[i] = {
o: 0,
e: -1
};
if (ast.declareType == "SIGNALIN") {
ctx.signals[i].o |= ctx.IN;
ctx.components[ctx.currentComponent].nInSignals+=1;
}
if (ast.declareType == "SIGNALOUT") {
ctx.signals[i].o |= ctx.OUT;
}
if (ast.private ) {
ctx.signals[i].o |= ctx.PRV;
}
if (ctx.main) {
ctx.signals[i].o |= ctx.MAIN;
}
// ctx.components[ctx.currentComponent].signals.push(i);
}
scope[ast.name.name] = {
type: "SIGNAL",
sizes: sizes,
sIdx: sIdx[0]
};
=======
scope[ast.name.name] = {
type: "SIGNAL",
value: iterateSelectors(ctx, sizes, baseName, function(fullName) {
ctx.signals[fullName] = {
fullName: fullName,
direction: ast.declareType == "SIGNALIN" ? "IN" : (ast.declareType == "SIGNALOUT" ? "OUT" : ""),
private: ast.private,
component: ctx.currentComponent,
equivalence: "",
alias: [fullName]
};
ctx.components[ctx.currentComponent].signals.push(fullName);
return {
type: "SIGNAL",
fullName: fullName,
};
})
};
>>>>>>>
let sIdx = ctx.addSignal(ast.name.name, sizes);
if (!Array.isArray(sIdx)) sIdx = [sIdx, sIdx+1];
for (let i=sIdx[0]; i<sIdx[1]; i++) {
ctx.signals[i] = {
o: 0,
e: -1
};
if (ast.declareType == "SIGNALIN") {
ctx.signals[i].o |= ctx.IN;
ctx.components[ctx.currentComponent].nInSignals+=1;
}
if (ast.declareType == "SIGNALOUT") {
ctx.signals[i].o |= ctx.OUT;
}
if (ast.private ) {
ctx.signals[i].o |= ctx.PRV;
}
if (ctx.main) {
ctx.signals[i].o |= ctx.MAIN;
}
// ctx.components[ctx.currentComponent].signals.push(i);
}
scope[ast.name.name] = {
type: "SIGNAL",
value: {
type: "SIGNAL",
sizes: sizes,
sIdx: sIdx[0]
}
};
<<<<<<<
if ((num.type == "SIGNAL")&&(ast.op == "=")) return error(ctx, ast, "Cannot assign to a signal with `=` use <-- or <== ops");
if ((["NUMBER", "COMPONENT"].indexOf(num.type) >= 0 )&&(ast.op != "=")) return error(ctx, ast, `Cannot assign to a var with ${ast.op}. use = op`);
=======
if ((typ == "SIGNAL")&&(ast.op == "=")) return error(ctx, ast, "Cannot assign to a signal with `=` use <-- or <== ops");
if ((["NUMBER", "COMPONENT"].indexOf(typ) >= 0 )&&(ast.op != "=")) return error(ctx, ast, `Cannot assign to a var with ${ast.op}. use = op`);
>>>>>>>
if ((typ == "SIGNAL")&&(ast.op == "=")) return error(ctx, ast, "Cannot assign to a signal with `=` use <-- or <== ops");
if ((["NUMBER", "COMPONENT"].indexOf(typ) >= 0 )&&(ast.op != "=")) return error(ctx, ast, `Cannot assign to a var with ${ast.op}. use = op`);
<<<<<<<
Object.assign(num, res);
// setScope(ctx, v.name, v.selectors, res);
=======
setScopeRef(ctx, v.name, sels, res);
>>>>>>>
setScopeRef(ctx, v.name, sels, res); |
<<<<<<<
expect(dayPicker.props.weekdayComponent).to.be.a('Function');
=======
expect(dayPicker.props.navbarComponent).to.be.a('Function');
>>>>>>>
expect(dayPicker.props.weekdayComponent).to.be.a('Function');
expect(dayPicker.props.navbarComponent).to.be.a('Function'); |
<<<<<<<
function getStateFromProps(props) {
let month;
if (props.value) {
const day = props.parse(props.value);
if (day) {
month = day;
}
} else {
month =
props.dayPickerProps.initialMonth ||
props.dayPickerProps.month ||
new Date();
}
return {
value: props.value,
month,
};
}
=======
>>>>>>>
<<<<<<<
format: d => String(d),
parse: d => {
const day = new Date(d);
return isNaN(day.getTime()) ? null : day;
},
=======
format: 'L',
showOverlay: false,
>>>>>>>
format: d => String(d),
parse: d => {
const day = new Date(d);
return isNaN(day.getTime()) ? null : day;
},
showOverlay: false,
<<<<<<<
};
handleChange = e => {
const { value } = e.target;
const { parse, dayPickerProps, onDayChange, onChange } = this.props;
const day = parse(value);
=======
}
>>>>>>>
}
<<<<<<<
if (!day) {
=======
if (!m.isValid()) {
>>>>>>>
const day = parse(value);
if (!day) {
<<<<<<<
this.setState({ month: day, value }, () => {
if (!onDayChange) {
return;
}
const modifiersObj = {
disabled: dayPickerProps.disabledDays,
selected: dayPickerProps.selectedDays,
...dayPickerProps.modifiers,
};
const modifiers = getModifiersForDay(
day,
modifiersObj
).reduce((obj, modifier) => {
const newObj = { ...obj };
newObj[modifier] = true;
return newObj;
}, {});
this.props.onDayChange(day, modifiers);
});
};
=======
const day = m.toDate();
this.updateState(day, value);
}
>>>>>>>
this.updateState(day, value);
}
<<<<<<<
const { format } = this.props;
this.setState(
{
value: format(day),
month: day,
},
() => {
if (this.props.onDayChange) {
this.props.onDayChange(day, modifiers);
}
this.hideAfterDayClick();
=======
const m = moment(day).locale(dayPickerProps.locale || 'en');
const value = m.format(typeof format === 'string' ? format : format[0]);
this.setState({ value, month: day }, () => {
if (onDayChange) {
onDayChange(m, modifiers);
>>>>>>>
const value = format(day, dayPickerProps.locale);
this.setState({ value, month: day }, () => {
if (onDayChange) {
onDayChange(m, modifiers);
<<<<<<<
if (this.state.value) {
const day = this.props.parse(this.state.value);
if (day) {
selectedDay = day;
=======
if (!selectedDays && value) {
const m = moment(value, format, true);
if (m.isValid()) {
selectedDay = m.toDate();
>>>>>>>
if (!selectedDays && value) {
const day = parse(value);
if (day) {
selectedDay = day;
<<<<<<<
const inputProps = { ...this.props };
delete inputProps.component;
delete inputProps.dayPickerProps;
delete inputProps.format;
delete inputProps.parse;
delete inputProps.clickUnselectsDay;
delete inputProps.hideOnDayClick;
delete inputProps.onDayChange;
delete inputProps.classNames;
=======
const Input = this.props.component;
>>>>>>>
const Input = this.props.component; |
<<<<<<<
default:
if (onKeyDown) {
onKeyDown(e);
}
=======
case keys.UP:
this.showPreviousYear(callback);
break;
case keys.DOWN:
this.showNextYear(callback);
break;
>>>>>>>
case keys.UP:
this.showPreviousYear(onKeyDown);
break;
case keys.DOWN:
this.showNextYear(onKeyDown);
break;
default:
if (onKeyDown) {
onKeyDown(e);
}
<<<<<<<
<div
{...attributes}
className={ className }
=======
<div className={ className }
ref="dayPicker"
>>>>>>>
<div
{...attributes}
className={ className }
ref="dayPicker" |
<<<<<<<
<div className={ classNames.month } role="grid">
{React.cloneElement(captionElement, captionProps)}
=======
<div className={ classNames.month }>
{caption}
>>>>>>>
<div className={ classNames.month } role="grid">
{caption} |
<<<<<<<
addCategory: function(rawName, enable=false, shareToken = null) {
var name = rawName.replace(' ', '-');
=======
addCategory: function(rawName, enable=false) {
var name = rawName.replace(/\s+/g, '-');
>>>>>>>
addCategory: function(rawName, enable=false, shareToken = null) {
var name = rawName.replace(/\s+/g, '-'); |
<<<<<<<
this.addRouter('osrmCar', 'By car (OSRM)', optionsValues.osrmCarURL, null);
nbRoutersAdded++;
=======
this.addRouter('osrmCar', '🚗 ' + t('maps', 'By car (OSRM)'), optionsValues.osrmCarURL, null);
>>>>>>>
this.addRouter('osrmCar', '🚗 ' + t('maps', 'By car (OSRM)'), optionsValues.osrmCarURL, null);
nbRoutersAdded++;
<<<<<<<
this.addRouter('osrmBike', 'By bike (OSRM)', optionsValues.osrmBikeURL, null);
nbRoutersAdded++;
=======
this.addRouter('osrmBike', '🚲 ' + t('maps', 'By bike (OSRM)'), optionsValues.osrmBikeURL, null);
>>>>>>>
this.addRouter('osrmBike', '🚲 ' + t('maps', 'By bike (OSRM)'), optionsValues.osrmBikeURL, null);
nbRoutersAdded++;
<<<<<<<
this.addRouter('osrmFoot', 'By foot (OSRM)', optionsValues.osrmFootURL, null);
nbRoutersAdded++;
=======
this.addRouter('osrmFoot', '🚶 ' + t('maps', 'By foot (OSRM)'), optionsValues.osrmFootURL, null);
nbRouters++;
}
if (optionsValues.hasOwnProperty('osrmDEMO') && optionsValues.osrmDEMO === '1') {
this.addRouter('osrmDEMO', '🚗 ' + t('maps', 'By car (OSRM demo)'), null, null);
}
else {
delete this.routers.osrmDEMO;
>>>>>>>
this.addRouter('osrmFoot', '🚶 ' + t('maps', 'By foot (OSRM)'), optionsValues.osrmFootURL, null);
nbRoutersAdded++;
<<<<<<<
this.addRouter('mapbox/cycling', 'Mapbox by bike', null, optionsValues.mapboxAPIKEY);
this.addRouter('mapbox/walking', 'Mapbox by foot', null, optionsValues.mapboxAPIKEY);
this.addRouter('mapbox/driving-traffic', 'Mapbox by car with traffic', null, optionsValues.mapboxAPIKEY);
this.addRouter('mapbox/driving', 'Mapbox by car without traffic', null, optionsValues.mapboxAPIKEY);
nbRoutersAdded++;
=======
this.addRouter('mapbox/cycling', '🚲 ' + t('maps', 'By bike (Mapbox)'), null, optionsValues.mapboxAPIKEY);
this.addRouter('mapbox/walking', '🚶 ' + t('maps', 'By foot (Mapbox)'), null, optionsValues.mapboxAPIKEY);
this.addRouter('mapbox/driving-traffic', '🚗 ' + t('maps', 'By car with traffic (Mapbox)'), null, optionsValues.mapboxAPIKEY);
this.addRouter('mapbox/driving', t('maps', '🚗 ' +'By car without traffic (Mapbox)'), null, optionsValues.mapboxAPIKEY);
>>>>>>>
this.addRouter('mapbox/cycling', '🚲 ' + t('maps', 'By bike (Mapbox)'), null, optionsValues.mapboxAPIKEY);
this.addRouter('mapbox/walking', '🚶 ' + t('maps', 'By foot (Mapbox)'), null, optionsValues.mapboxAPIKEY);
this.addRouter('mapbox/driving-traffic', '🚗 ' + t('maps', 'By car with traffic (Mapbox)'), null, optionsValues.mapboxAPIKEY);
this.addRouter('mapbox/driving', '🚗 ' + t('maps', 'By car without traffic (Mapbox)'), null, optionsValues.mapboxAPIKEY);
nbRoutersAdded++;
<<<<<<<
this.addRouter('graphhopperCar', 'By car (GrahHopper)', optionsValues.graphhopperURL, apikey);
this.addRouter('graphhopperBike', 'By bike (GrahHopper)', optionsValues.graphhopperURL, apikey);
this.addRouter('graphhopperFoot', 'By Foot (GrahHopper)', optionsValues.graphhopperURL, apikey);
nbRoutersAdded++;
}
if (nbRoutersAdded === 0 && optionsValues.hasOwnProperty('osrmDEMO') && optionsValues.osrmDEMO === '1') {
this.addRouter('osrmDEMO', 'By car (OSRM demo)', null, null);
}
else {
delete this.routers.osrmDEMO;
=======
this.addRouter('graphhopperCar', '🚗 ' + t('maps', 'By car (GrahHopper)'), optionsValues.graphhopperURL, apikey);
this.addRouter('graphhopperBike', '🚲 ' + t('maps', 'By bike (GrahHopper)'), optionsValues.graphhopperURL, apikey);
this.addRouter('graphhopperFoot', '🚶 ' + t('maps', 'By Foot (GrahHopper)'), optionsValues.graphhopperURL, apikey);
>>>>>>>
this.addRouter('graphhopperCar', '🚗 ' + t('maps', 'By car (GrahHopper)'), optionsValues.graphhopperURL, apikey);
this.addRouter('graphhopperBike', '🚲 ' + t('maps', 'By bike (GrahHopper)'), optionsValues.graphhopperURL, apikey);
this.addRouter('graphhopperFoot', '🚶 ' + t('maps', 'By Foot (GrahHopper)'), optionsValues.graphhopperURL, apikey);
nbRoutersAdded++;
}
if (nbRoutersAdded === 0 && optionsValues.hasOwnProperty('osrmDEMO') && optionsValues.osrmDEMO === '1') {
this.addRouter('osrmDEMO', '🚗 ' + 'By car (OSRM demo)', null, null);
}
else {
delete this.routers.osrmDEMO; |
<<<<<<<
tracksController.initController(mapController.map);
tracksController.getTracks();
=======
mapController.map.contactsController = contactsController;
>>>>>>>
mapController.map.contactsController = contactsController;
tracksController.initController(mapController.map);
tracksController.getTracks(); |
<<<<<<<
const browserWrapper = require('./$BROWSER-wrapper.es6')
=======
const load = require('./load.es6')
const settings = require('./settings.es6')
const entityMap = require('../../data/tracker_lists/entityMap')
>>>>>>>
const browserWrapper = require('./$BROWSER-wrapper.es6')
const load = require('./load.es6')
const settings = require('./settings.es6')
const entityMap = require('../../data/tracker_lists/entityMap')
<<<<<<<
getBrowserName: getBrowserName,
=======
getBrowserName: getBrowserName,
findParent: findParent
>>>>>>>
getBrowserName: getBrowserName,
findParent: findParent |
<<<<<<<
notion.save_image = storage.secret.notion.save_image;
=======
notion.schema = storage.secret.notion.schema;
notion.type = storage.secret.notion.type;
>>>>>>>
notion.save_image = storage.secret.notion.save_image;
notion.schema = storage.secret.notion.schema;
notion.type = storage.secret.notion.type; |
<<<<<<<
browser.runtime.onMessage.addListener( async function ( request, sender, sendResponse ) {
if ( request.type == msg.MESSAGE_ACTION.NOTION_DL_IMG ) {
try {
const option = request.value,
{ url } = option,
dlRes = await axios({ method: 'get', url, responseType: 'blob', });
let blob = dlRes.data;
=======
browser.runtime.onMessage.addListener(async function (
request,
sender,
sendResponse
) {
if (request.type == msg.MESSAGE_ACTION.NOTION_DL_IMG) {
try {
const option = request.value
const { url, protocol } = option
const dlRes = await axios({
method: 'get',
url: url.replace(/https?:/, protocol),
responseType: 'blob',
})
>>>>>>>
browser.runtime.onMessage.addListener( async function ( request, sender, sendResponse ) {
if ( request.type == msg.MESSAGE_ACTION.NOTION_DL_IMG ) {
try {
const option = request.value,
{ url, protocol } = option,
dlRes = await axios({ method: 'get', url, responseType: 'blob', });
let blob = dlRes.data; |
<<<<<<<
=======
asyncTest("@loader is current loader with steal syntax", function(){
makeIframe("current-loader/dev-steal.html");
});
asyncTest("@steal is the current steal", function(){
makeIframe("current-steal/dev.html");
});
asyncTest("less loads in the right spot", function(){
makeIframe("less-imports/dev.html");
});
asyncTest("set options to less plugin", function(){
makeIframe("less_options/site.html");
});
>>>>>>>
asyncTest("@loader is current loader with steal syntax", function(){
makeIframe("current-loader/dev-steal.html");
});
asyncTest("@steal is the current steal", function(){
makeIframe("current-steal/dev.html");
}); |
<<<<<<<
isBrowserWithWindow = !isNode && typeof window !== "undefined",
isNW = isNode && (function(){
try {
return require("nw.gui") !== "undefined";
} catch(e) {
return false;
}
})();
isNode = isNode && !isNW;
=======
isBrowserWithWindow = !isNode && typeof window !== "undefined",
warn = typeof console === "object" ?
fBind.call(console.warn, console) : function(){};
>>>>>>>
isBrowserWithWindow = !isNode && typeof window !== "undefined",
isNW = isNode && (function(){
try {
return require("nw.gui") !== "undefined";
} catch(e) {
return false;
}
})();
isNode = isNode && !isNW,
warn = typeof console === "object" ?
fBind.call(console.warn, console) : function(){};
<<<<<<<
if ( last(parts) === cfg.bowerPath || last(parts) === "bower_components" ) {
=======
var isFromPackage = false;
if ( last(parts) === "bower_components" ) {
>>>>>>>
var isFromPackage = false;
if ( last(parts) === cfg.bowerPath || last(parts) === "bower_components" ) {
<<<<<<<
// Get options from the script tag
if (isWebWorker) {
var urlOptions = {
stealURL: location.href
};
} else if(isBrowserWithWindow || isNW) {
var urlOptions = getScriptOptions();
} else {
// or the only option is where steal is.
var urlOptions = {
stealPath: __dirname
};
}
// first set the config that is set with a steal object
if(config){
System.config(config);
}
// B: DO THINGS WITH OPTIONS
// CALCULATE CURRENT LOCATION OF THINGS ...
System.config(urlOptions);
=======
appPromise = getUrlOptions().then(function(urlOptions) {
>>>>>>>
appPromise = getUrlOptions().then(function(urlOptions) {
<<<<<<<
if(System.mainSource) {
appDeferred = appDeferred.then(function(){
return System.module(System.mainSource);
});
}
return appDeferred;
=======
return appPromise;
>>>>>>>
return appPromise; |
<<<<<<<
module("Tilde extension");
asyncTest("Basics work", function(){
makeIframe("tilde/site.html");
});
=======
asyncTest("Loads config automatically", function(){
makeIframe("bower/default-config.html");
});
asyncTest("with npm", function(){
makeIframe("bower/npm/index.html");
});
module("Web Workers");
if(window.Worker) {
asyncTest("basics works", function(){
makeIframe("webworkers/dev.html");
});
asyncTest("env is properly set", function(){
makeIframe("envs/worker/dev.html");
});
}
>>>>>>>
asyncTest("Loads config automatically", function(){
makeIframe("bower/default-config.html");
});
asyncTest("with npm", function(){
makeIframe("bower/npm/index.html");
});
module("Web Workers");
if(window.Worker) {
asyncTest("basics works", function(){
makeIframe("webworkers/dev.html");
});
asyncTest("env is properly set", function(){
makeIframe("envs/worker/dev.html");
});
}
module("Tilde extension");
asyncTest("Basics work", function(){
makeIframe("tilde/site.html");
}); |
<<<<<<<
// TODO create a proxy in nginx and webpack-dev-server
var couchDbServer = 'http://127.0.0.1:5984';
=======
>>>>>>> |
<<<<<<<
"httpsUpgradeList": "https://duckduckgo.com/contentblocking.js?l=https",
=======
"tosdrMessages" : {
"A": "Good",
"B": "Mixed",
"C": "Bad",
"D": "Bad",
"E": "Bad",
"good": "Good",
"bad": "Bad",
"unknown": "Unknown",
"mixed": "Mixed"
},
>>>>>>>
"httpsUpgradeList": "https://duckduckgo.com/contentblocking.js?l=https",
"tosdrMessages" : {
"A": "Good",
"B": "Mixed",
"C": "Bad",
"D": "Bad",
"E": "Bad",
"good": "Good",
"bad": "Bad",
"unknown": "Unknown",
"mixed": "Mixed"
}, |
<<<<<<<
"characters/ninja.svg": "Ninja",
=======
"characters/Mr zero.svg":"Mr. Zero",
"characters/Mrs zero.svg": "Mrs. Zero",
"characters/stickman.svg": "Stickman",
"characters/cpt_america.svg": "Captain America",
"characters/daredevil.svg": "DancinDaredevil",
"characters/MonsterJuice.svg": "Monster Juice",
"characters/pixie.svg": "Forest Spirit",
"characters/AngryBot.svg": "Angry Bot",
"characters/deathnote.svg": "Death Note",
>>>>>>>
"characters/ninja.svg": "Ninja",
"characters/Mr zero.svg":"Mr. Zero",
"characters/Mrs zero.svg": "Mrs. Zero",
"characters/stickman.svg": "Stickman",
"characters/cpt_america.svg": "Captain America",
"characters/daredevil.svg": "DancinDaredevil",
"characters/MonsterJuice.svg": "Monster Juice",
"characters/pixie.svg": "Forest Spirit",
"characters/AngryBot.svg": "Angry Bot",
"characters/deathnote.svg": "Death Note", |
<<<<<<<
var inputOptionsPromise = new Promise(function (resolve) {
// input your character here in the form, "src_url": "character_name",
=======
var inputOptionsPromise = new Promise(function(resolve) {
// input your character here in the form, "src_url": "character_name",
>>>>>>>
var inputOptionsPromise = new Promise(function(resolve) {
// input your character here in the form, "src_url": "character_name",
<<<<<<<
=======
"characters/golem.svg": "Golem",
>>>>>>>
"characters/golem.svg": "Golem",
<<<<<<<
//added Character from RuKoBe
"characters/OwnChar.png": "OwnChar"
=======
"characters/ninja.svg": "Ninja",
"characters/Mr zero.svg":"Mr. Zero",
"characters/Mrs zero.svg": "Mrs. Zero",
"characters/stickman.svg": "Stickman",
"characters/cpt_america.svg": "Captain America",
"characters/daredevil.svg": "DancinDaredevil",
"characters/MonsterJuice.svg": "Monster Juice",
"characters/pixie.svg": "Forest Spirit",
"characters/AngryBot.svg": "Angry Bot",
"characters/deathnote.svg": "Death Note",
>>>>>>>
//added Character from RuKoBe
"characters/OwnChar.png": "OwnChar"
"characters/ninja.svg": "Ninja",
"characters/Mr zero.svg":"Mr. Zero",
"characters/Mrs zero.svg": "Mrs. Zero",
"characters/stickman.svg": "Stickman",
"characters/cpt_america.svg": "Captain America",
"characters/daredevil.svg": "DancinDaredevil",
"characters/MonsterJuice.svg": "Monster Juice",
"characters/pixie.svg": "Forest Spirit",
"characters/AngryBot.svg": "Angry Bot",
"characters/deathnote.svg": "Death Note", |
<<<<<<<
"characters/shadowman.svg": "Shadowman",
=======
"characters/santa.svg": "Santa Clause",
>>>>>>>
"characters/shadowman.svg": "Shadowman",
"characters/santa.svg": "Santa Clause", |
<<<<<<<
outdoor: Object.assign({}, OpenDoors, {
canEnterFromTheRight() { return false; },
canLeaveToTheRight() { return false; },
createImages: function () {
this.wallRight = this.createImage("tiles/rooms/wall/outwall.svg");
this.ground = this.createImage("tiles/rooms/floor/out.svg");
this.wallTop = this.createImage("tiles/rooms/door/out.svg");
},
visit: function() {
swal({
type: 'question',
title: "Do you like to go to outdoor?"
});
this.wallRight.show();
this.wallTop.show();
this.ground.show();
}
}),
=======
new: Object.assign({}, OpenDoors, {
createImages: function() {
this.wallTop = this.createImage("tiles/rooms/door/top.svg");
this.wallRight = this.createImage("tiles/rooms/door/right.svg");
this.ground = this.createImage("tiles/rooms/floor/new.svg");
},
}),
plain: Object.assign({}, OpenDoors, {
createImages: function() {
this.wallTop = this.createImage("tiles/rooms/door/top.svg");
this.wallRight = this.createImage("tiles/rooms/door/right.svg");
this.ground = this.createImage("tiles/rooms/floor/plain.svg");
},
}),
sofa: Object.assign({}, OpenDoors, {
canEnterFromTheRight() {return false;},
canLeaveToTheRight() {return false;},
createImages: function() {
this.wallTop = this.createImage("tiles/rooms/door/topSofa.svg");
this.wallRight = this.createImage("tiles/rooms/wall/rightSofa.svg");
this.ground = this.createImage("tiles/rooms/floor/sofa.svg");
},
visit: function() {
swal({
type: 'info',
title: 'Get out!',
text: "Yeah, I know no one's here, but basically you shouldn't invade someone else's living room."
});
this.wallTop.show();
this.wallRight.show();
this.ground.show();
}
}),
>>>>>>>
outdoor: Object.assign({}, OpenDoors, {
canEnterFromTheRight() { return false; },
canLeaveToTheRight() { return false; },
createImages: function () {
this.wallRight = this.createImage("tiles/rooms/wall/outwall.svg");
this.ground = this.createImage("tiles/rooms/floor/out.svg");
this.wallTop = this.createImage("tiles/rooms/door/out.svg");
},
visit: function() {
swal({
type: 'question',
title: "Do you like to go to outdoor?"
});
this.wallRight.show();
this.wallTop.show();
this.ground.show();
}
}),
new: Object.assign({}, OpenDoors, {
createImages: function() {
this.wallTop = this.createImage("tiles/rooms/door/top.svg");
this.wallRight = this.createImage("tiles/rooms/door/right.svg");
this.ground = this.createImage("tiles/rooms/floor/new.svg");
},
}),
plain: Object.assign({}, OpenDoors, {
createImages: function() {
this.wallTop = this.createImage("tiles/rooms/door/top.svg");
this.wallRight = this.createImage("tiles/rooms/door/right.svg");
this.ground = this.createImage("tiles/rooms/floor/plain.svg");
},
}),
sofa: Object.assign({}, OpenDoors, {
canEnterFromTheRight() {return false;},
canLeaveToTheRight() {return false;},
createImages: function() {
this.wallTop = this.createImage("tiles/rooms/door/topSofa.svg");
this.wallRight = this.createImage("tiles/rooms/wall/rightSofa.svg");
this.ground = this.createImage("tiles/rooms/floor/sofa.svg");
},
visit: function() {
swal({
type: 'info',
title: 'Get out!',
text: "Yeah, I know no one's here, but basically you shouldn't invade someone else's living room."
});
this.wallTop.show();
this.wallRight.show();
this.ground.show();
}
}), |
<<<<<<<
"characters/ant.svg": "The AntMan",
=======
"characters/fireman.svg": "Fire Man",
>>>>>>>
"characters/ant.svg": "The AntMan",
"characters/fireman.svg": "Fire Man", |
<<<<<<<
function createTestLevel(level) {
if(level == 2) {
/* 2nd level */
return new Level([
[door.none, door.right, door.minecraft, door.none, door.goal, door.none],
[door.none, door.right, door.Forbidden, door.none, door.none, door.none],
[door.none, door.sofa, door.outdoor, door.chessMate, door.both, door.chessStale],
[door.none, door.yellowBoxes, PlayerStartsAt(door.black), door.green, door.banner, door.top],
[door.none, door.highLow, door.new, door.wheel, door.plain, door.top],
[door.none, door.top, door.cricketGround, door.treasure, door.yellow, door.top],
[door.none, door.top, door.marina, door.treasureKey, door.drawn, door.top],
[NullTile, door.none, door.none, door.none, door.none, door.newYear],
]);
} else if (level == 3){
return new Level([
[desert.none, desert.right, desert.right, desert.right, desert.right, desert.none],
[desert.none, desert.top, desert.both, desert.both, desert.both, desert.both],
[desert.none, desert.top, PlayerStartsAt(desert.start), desert.both, desert.both, desert.top],
[desert.none, desert.top, desert.both, desert.both, desert.both, desert.top],
[desert.none, desert.top, desert.top, desert.both, desert.top, desert.top],
[desert.none, desert.top, desert.both, desert.both, desert.both, desert.top],
[NullTile, desert.none, desert.none, desert.none, desert.none, desert.none],
]);
} else {
/* Default level */
return new Level([
[door.none, door.right, door.minecraft, door.none, door.goal, door.none],
[door.none, door.sofa, door.outdoor, door.chessMate, door.both, door.chessStale],
[door.none, door.yellowBoxes, PlayerStartsAt(door.black), door.green, door.banner, door.top],
[door.none, door.highLow, door.new, door.wheel, door.plain, door.top],
[door.none, door.top, door.cricketGround, door.treasure, door.top, door.top],
[door.none, door.top, door.both, door.treasureKey, door.drawn, door.top],
[NullTile, door.none, door.none, door.none, door.none, door.newYear],
]);
}
=======
function createTestLevel()
{
return new Level([
[door.none, door.right, door.minecraft, door.none, door.goal, door.none],
[door.none, door.right, door.Forbidden, door.none, door.none, door.none],
[door.none, door.sofa, door.outdoor, door.chessMate, door.both, door.chessStale],
[door.none, door.yellowBoxes, PlayerStartsAt(door.black), door.green, door.banner, door.threeHeads],
[door.none, door.highLow, door.new, door.wheel, door.plain, door.top],
[door.none, door.top, door.cricketGround, door.treasure, door.yellow, door.red],
[door.none, door.top, door.marina, door.treasureKey, door.drawn, door.top],
[NullTile, door.none, door.river, door.none, door.none, door.newYear],
]);
return new Level([
[NullTile, door.none, door.left, door.right, door.none, door.right, door.none, door.none, door.right, door.top],
[door.none, door.right, door.right, door.right, door.goal, door.none, door.top, door.left, door.right,],
[door.none, door.top, door.both, door.both, door.wheel, door.top, NullTile, door.right, door.top, door.left],
[door.none, door.top, PlayerStartsAt(door.black), door.both, door.both, door.top]
[door.none, door.top, door.both, door.both, door.both, door.top, door.top, door.left, door.right],
[door.none, door.top, door.wheel, door.both, door.both, door.wheel, door.right, door.top, door.top],
[door.none, door.top, door.both, door.wheel, door.both, door.top, door.none, door.right, door.top, door.both],
[door.none, door.none, door.none, door.none, door.none, door.none, door.both, door.right, door.top, door.none],
[door.left, door.top, door.none, door.right, door.none, door.wheel, door.none, door.none, door.none],
[NullTile, door.none, door.none, door.none, door.none, door.none, door.left, door.top, door.right, door.top]
]);
/* I know this return doesnot work but leaving it here to be solved in #161 */
/* Forest specific levels */
return new Level([
[forest.none, forest.right, forest.right, forest.right, forest.right, forest.none],
[forest.none, forest.top, forest.both, forest.both, forest.both, forest.both],
[forest.none, forest.top, PlayerStartsAt(forest.start), forest.both, forest.both, forest.top],
[forest.none, forest.top, forest.both, forest.both, forest.both, forest.top],
[forest.none, forest.top, forest.top, forest.both, forest.top, forest.top],
[forest.none, forest.top, forest.both, forest.both, forest.both, forest.top],
[NullTile, forest.none, forest.none, forest.none, forest.none, forest.none],
]);
return new Level([
[desert.none, desert.right, desert.right, desert.right, desert.right, desert.none],
[desert.none, desert.top, desert.both, desert.both, desert.both, desert.both],
[desert.none, desert.top, PlayerStartsAt(desert.start), desert.both, desert.both, desert.top],
[desert.none, desert.top, desert.both, desert.both, desert.both, desert.top],
[desert.none, desert.top, desert.top, desert.both, desert.top, desert.top],
[desert.none, desert.top, desert.both, desert.both, desert.both, desert.top],
[NullTile, desert.none, desert.none, desert.none, desert.none, desert.none],
]);
>>>>>>>
function createTestLevel(level) {
if(level == 2) {
/* 2nd level */
return new Level([
[door.none, door.right, door.minecraft, door.none, door.goal, door.none],
[door.none, door.right, door.Forbidden, door.none, door.none, door.none],
[door.none, door.sofa, door.outdoor, door.chessMate, door.both, door.chessStale],
[door.none, door.yellowBoxes, PlayerStartsAt(door.black), door.green, door.banner, door.threeHeads],
[door.none, door.highLow, door.new, door.wheel, door.plain, door.top],
[door.none, door.top, door.cricketGround, door.treasure, door.yellow, door.red],
[door.none, door.top, door.marina, door.treasureKey, door.drawn, door.top],
[NullTile, door.none, door.river, door.none, door.none, door.newYear],
]);
} else if (level == 3){
return new Level([
[desert.none, desert.right, desert.right, desert.right, desert.right, desert.none],
[desert.none, desert.top, desert.both, desert.both, desert.both, desert.both],
[desert.none, desert.top, PlayerStartsAt(desert.start), desert.both, desert.both, desert.top],
[desert.none, desert.top, desert.both, desert.both, desert.both, desert.top],
[desert.none, desert.top, desert.top, desert.both, desert.top, desert.top],
[desert.none, desert.top, desert.both, desert.both, desert.both, desert.top],
[NullTile, desert.none, desert.none, desert.none, desert.none, desert.none],
]);
} else {
/* Default level */
return new Level([
[door.none, door.right, door.minecraft, door.none, door.goal, door.none],
[door.none, door.sofa, door.outdoor, door.chessMate, door.both, door.chessStale],
[door.none, door.yellowBoxes, PlayerStartsAt(door.black), door.green, door.banner, door.top],
[door.none, door.highLow, door.new, door.wheel, door.plain, door.top],
[door.none, door.top, door.cricketGround, door.treasure, door.top, door.top],
[door.none, door.top, door.both, door.treasureKey, door.drawn, door.top],
[NullTile, door.none, door.none, door.none, door.none, door.newYear],
]);
} |
<<<<<<<
var selectedSubtitleStream = subtitleStreams.filter(function (s) {
return s.Index == mediaSource.DefaultSubtitleStreamIndex;
})[0];
var baseParams = {
audioChannels: 2,
StartTimeTicks: startPosition,
AudioStreamIndex: mediaSource.DefaultAudioStreamIndex,
deviceId: ApiClient.deviceId(),
Static: false,
mediaSourceId: mediaSource.Id,
api_key: ApiClient.accessToken(),
StreamId: playbackInfo.StreamId
};
if (selectedSubtitleStream && (!self.supportsSubtitleStreamExternally(selectedSubtitleStream) || !self.supportsTextTracks())) {
baseParams.SubtitleStreamIndex = mediaSource.DefaultSubtitleStreamIndex;
}
var mp4Quality = getVideoQualityOptions(mediaStreams).filter(function (opt) {
return opt.selected;
})[0];
mp4Quality = $.extend(mp4Quality, self.getFinalVideoParams(mediaSource, mp4Quality.maxWidth, mp4Quality.bitrate, baseParams.AudioStreamIndex, baseParams.SubtitleStreamIndex, '.mp4'));
var webmQuality = getVideoQualityOptions(mediaStreams).filter(function (opt) {
return opt.selected;
})[0];
webmQuality = $.extend(webmQuality, self.getFinalVideoParams(mediaSource, webmQuality.maxWidth, webmQuality.bitrate, baseParams.AudioStreamIndex, baseParams.SubtitleStreamIndex, '.webm'));
var m3U8Quality = getVideoQualityOptions(mediaStreams).filter(function (opt) {
return opt.selected;
})[0];
m3U8Quality = $.extend(m3U8Quality, self.getFinalVideoParams(mediaSource, mp4Quality.maxWidth, mp4Quality.bitrate, baseParams.AudioStreamIndex, baseParams.SubtitleStreamIndex, '.mp4'));
var isStatic = mp4Quality.isStatic;
self.startTimeTicksOffset = isStatic ? 0 : startPosition || 0;
var startPositionInSeekParam = startPosition ? (startPosition / 10000000) : 0;
var seekParam = startPositionInSeekParam ? '#t=' + startPositionInSeekParam : '';
var mp4VideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.mp4', $.extend({}, baseParams, {
Static: isStatic,
maxWidth: mp4Quality.maxWidth,
videoBitrate: mp4Quality.videoBitrate,
audioBitrate: mp4Quality.audioBitrate,
VideoCodec: mp4Quality.videoCodec,
AudioCodec: mp4Quality.audioCodec,
profile: 'high',
//EnableAutoStreamCopy: false,
level: '41'
}));
if (isStatic && mediaSource.Protocol == 'Http' && !mediaSource.RequiredHttpHeaders.length) {
mp4VideoUrl = mediaSource.Path;
}
if (isStatic) {
mp4VideoUrl += seekParam;
} else {
mp4VideoUrl += "&StreamId=" + new Date().getTime();
}
var webmVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.webm', $.extend({}, baseParams, {
VideoCodec: 'vpx',
AudioCodec: 'Vorbis',
maxWidth: webmQuality.maxWidth,
videoBitrate: webmQuality.videoBitrate,
audioBitrate: webmQuality.audioBitrate,
EnableAutoStreamCopy: false,
StreamId: new Date().getTime()
}));
var hlsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/master.m3u8', $.extend({}, baseParams, {
maxWidth: m3U8Quality.maxWidth,
videoBitrate: m3U8Quality.videoBitrate,
audioBitrate: m3U8Quality.audioBitrate,
VideoCodec: m3U8Quality.videoCodec,
AudioCodec: m3U8Quality.audioCodec,
profile: 'high',
level: '41',
StartTimeTicks: 0,
StreamId: new Date().getTime()
})) + seekParam;
// Get Video Poster (Code from librarybrowser.js)
var screenWidth = Math.max(screen.height, screen.width),
posterCode = '';
if (item.BackdropImageTags && item.BackdropImageTags.length) {
posterCode = ' poster="' + ApiClient.getScaledImageUrl(item.Id, {
type: "Backdrop",
index: 0,
maxWidth: screenWidth,
tag: item.BackdropImageTags[0]
}) + '"';
}
else if (item.ParentBackdropItemId && item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) {
posterCode = ' poster="' + ApiClient.getScaledImageUrl(item.ParentBackdropItemId, {
type: 'Backdrop',
index: 0,
maxWidth: screenWidth,
tag: item.ParentBackdropImageTags[0]
}) + '"';
}
=======
>>>>>>>
// Get Video Poster (Code from librarybrowser.js)
var screenWidth = Math.max(screen.height, screen.width),
posterCode = '';
if (item.BackdropImageTags && item.BackdropImageTags.length) {
posterCode = ' poster="' + ApiClient.getScaledImageUrl(item.Id, {
type: "Backdrop",
index: 0,
maxWidth: screenWidth,
tag: item.BackdropImageTags[0]
}) + '"';
}
else if (item.ParentBackdropItemId && item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) {
posterCode = ' poster="' + ApiClient.getScaledImageUrl(item.ParentBackdropItemId, {
type: 'Backdrop',
index: 0,
maxWidth: screenWidth,
tag: item.ParentBackdropImageTags[0]
}) + '"';
}
<<<<<<<
html += '<video class="itemVideo" id="itemVideo" preload="none" autoplay="autoplay" controls="controls"' + posterCode + '>';
=======
html += '<video class="itemVideo" id="itemVideo" preload="none" autoplay="autoplay" crossorigin="anonymous" controls="controls">';
>>>>>>>
html += '<video class="itemVideo" id="itemVideo" preload="none" autoplay="autoplay" crossorigin="anonymous" controls="controls"' + posterCode + '>';
<<<<<<<
html += '<video class="itemVideo" id="itemVideo" preload="metadata" autoplay' + posterCode + '>';
}
if (!isStatic) {
// HLS must be at the top for safari
html += '<source type="application/x-mpegURL" src="' + hlsVideoUrl + '" />';
}
var mp4BeforeWebm = self.getVideoTranscodingExtension() != '.webm';
if (mp4BeforeWebm) {
html += '<source type="video/mp4" src="' + mp4VideoUrl + '" />';
}
// Have to put webm ahead of mp4 because it will play in fast forward in chrome
// And firefox doesn't like fragmented mp4
if (!isStatic) {
html += '<source type="video/webm" src="' + webmVideoUrl + '" />';
=======
html += '<video class="itemVideo" id="itemVideo" preload="metadata" crossorigin="anonymous" autoplay>';
>>>>>>>
html += '<video class="itemVideo" id="itemVideo" preload="metadata" crossorigin="anonymous" autoplay' + posterCode + '>'; |
<<<<<<<
var http = require('http');
var sys = require('util');
var fs = require('fs');
var config = require('./config').config;
var blacklist = [];
var iplist = [];
var hostfilters = {};
=======
var http = require('http'),
util = require('util');
fs = require('fs'),
config = require('./config').config,
blacklist = [],
iplist = [],
hostfilters = {};
>>>>>>>
var http = require('http'),
util = require('util');
fs = require('fs'),
config = require('./config').config,
blacklist = [],
iplist = [],
hostfilters = {};
<<<<<<<
security_log(request, response, msg);
=======
util.log(msg);
>>>>>>>
security_log(request, response, msg);
util.log(msg);
<<<<<<<
security_log(request, response, msg);
=======
util.log(msg);
>>>>>>>
security_log(request, response, msg);
util.log(msg);
<<<<<<<
sys.log(ip + ": " + request.method + " " + request.headers.host + "=>" + request.url);
=======
util.log(ip + ": " + request.method + " " + request.url);
>>>>>>>
util.log(ip + ": " + request.method + " " + request.headers.host + "=>" + request.url); |
<<<<<<<
import '../mathjax3/input/tex/extpfeil/ExtpfeilConfiguration.js';
=======
import '../mathjax3/input/tex/mhchem/MhchemConfiguration.js';
import '../mathjax3/input/tex/braket/BraketConfiguration.js';
import '../mathjax3/input/tex/physics/PhysicsConfiguration.js';
>>>>>>>
import '../mathjax3/input/tex/extpfeil/ExtpfeilConfiguration.js';
import '../mathjax3/input/tex/mhchem/MhchemConfiguration.js';
import '../mathjax3/input/tex/braket/BraketConfiguration.js';
import '../mathjax3/input/tex/physics/PhysicsConfiguration.js';
<<<<<<<
InputJax: new TeX({packages: ['base', 'ams', 'boldsymbol', 'newcommand', 'extpfeil']})
=======
InputJax: new TeX({packages: ['base', 'ams', 'boldsymbol', 'newcommand', 'mhchem', 'braket', 'physics']})
>>>>>>>
InputJax: new TeX({packages: ['base', 'ams', 'boldsymbol', 'newcommand', 'extpfeil', 'mhchem', 'braket', 'physics']}) |
<<<<<<<
import '../mathjax3/input/tex/extpfeil/ExtpfeilConfiguration.js';
=======
import '../mathjax3/input/tex/action/ActionConfiguration.js';
>>>>>>>
import '../mathjax3/input/tex/extpfeil/ExtpfeilConfiguration.js';
import '../mathjax3/input/tex/action/ActionConfiguration.js';
<<<<<<<
InputJax: new TeX({packages: ['base', 'ams', 'boldsymbol', 'newcommand', 'extpfeil', 'braket', 'physics']})
=======
InputJax: new TeX({packages: ['base', 'ams', 'boldsymbol', 'newcommand', 'braket', 'physics', 'action']})
>>>>>>>
InputJax: new TeX({packages: ['base', 'ams', 'boldsymbol', 'newcommand', 'extpfeil', 'braket', 'physics', 'action']}) |
<<<<<<<
import 'mathjax3/input/tex/mhchem/MhchemConfiguration.js';
=======
import 'mathjax3/input/tex/noerrors/NoErrorsConfiguration.js';
>>>>>>>
import 'mathjax3/input/tex/mhchem/MhchemConfiguration.js';
import 'mathjax3/input/tex/noerrors/NoErrorsConfiguration.js'; |
<<<<<<<
import '../mathjax3/input/tex/action/ActionConfiguration.js';
=======
import '../mathjax3/input/tex/braket/BraketConfiguration.js';
import '../mathjax3/input/tex/physics/PhysicsConfiguration.js';
>>>>>>>
import '../mathjax3/input/tex/action/ActionConfiguration.js';
import '../mathjax3/input/tex/braket/BraketConfiguration.js';
import '../mathjax3/input/tex/physics/PhysicsConfiguration.js';
<<<<<<<
InputJax: new TeX({packages: ['base', 'ams', 'boldsymbol', 'newcommand', 'action']})
=======
InputJax: new TeX({packages: ['base', 'ams', 'boldsymbol', 'newcommand', 'braket', 'physics']})
>>>>>>>
InputJax: new TeX({packages: ['base', 'ams', 'boldsymbol', 'newcommand', 'braket', 'physics', 'action']}) |
<<<<<<<
import React from 'react'
import PropTypes from 'prop-types'
import {Image, TouchableOpacity} from 'react-native'
import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource'
=======
import React from 'react';
import PropTypes from 'prop-types';
import { Image, ImageBackground, TouchableOpacity } from 'react-native';
import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
>>>>>>>
import React from 'react'
import PropTypes from 'prop-types'
import {Image, TouchableOpacity, ImageBackground} from 'react-native'
import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource'
<<<<<<<
constructor(props) {
super(props)
this.state = {
width : null,
height: null,
}
this.mounted = false
this.computeAndSetRatio = this.computeAndSetRatio.bind(this)
}
componentWillUnmount() {
this.mounted = false
}
componentDidMount() {
this.mounted = true
this._imageChanged(this.props)
}
_imageChanged(props) {
if (props.source.uri) {
Image.getSize(props.source.uri ? props.source.uri : props.source, (width, height) => this.computeAndSetRatio(width, height, props), console.log)
}
else {
const source = resolveAssetSource(props.source)
this.computeAndSetRatio(source.width, source.height, props)
}
}
componentWillReceiveProps(nextProps) {
this._imageChanged(nextProps)
}
computeAndSetRatio(width, height, props) {
const maxWidth = props.maxWidth ? props.maxWidth : Number.MAX_VALUE
const maxHeight = props.maxHeight ? props.maxHeight : Number.MAX_VALUE
let ratio = 1
if (props.width && props.height) {
ratio = Math.min(props.width / width, props.height / height)
}
else if (props.width) {
ratio = props.width / width
}
else if (props.height) {
ratio = props.height / height
}
// consider max width
if (width * ratio > maxWidth) {
ratio = (maxWidth * ratio) / (width * ratio)
}
// consider max height
if (height * ratio > maxHeight) {
ratio = (maxHeight * ratio) / (height * ratio)
}
if (this.mounted) {
this.setState({width: width * ratio, height: height * ratio})
}
}
render() {
if (this.props.onPress) {
return (
<TouchableOpacity onPress={this.props.onPress}>
<Image
{...this.props}
style={[
this.props.style,
{width: this.state.width, height: this.state.height}
]}
/>
</TouchableOpacity>
)
}
else {
return (
<Image
{...this.props}
style={[
this.props.style,
{width: this.state.width, height: this.state.height}
]}
/>
)
}
}
=======
constructor(props) {
super(props);
this.state = {
width: null,
height: null,
};
this.mounted = false;
this.computeAndSetRatio = this.computeAndSetRatio.bind(this);
}
componentWillUnmount() {
this.mounted = false;
}
componentDidMount() {
this.mounted = true;
if (this.props.source.uri) {
Image.getSize(this.props.source.uri ? this.props.source.uri : this.props.source, this.computeAndSetRatio, console.log);
}
else {
const source = resolveAssetSource(this.props.source);
this.computeAndSetRatio(source.width, source.height);
}
}
computeAndSetRatio(width, height) {
const maxWidth = this.props.maxWidth ? this.props.maxWidth : Number.MAX_VALUE;
const maxHeight = this.props.maxHeight ? this.props.maxHeight : Number.MAX_VALUE;
let ratio = 1;
if (this.props.width && this.props.height) {
ratio = Math.min(this.props.width / width, this.props.height / height);
}
else if (this.props.width) {
ratio = this.props.width / width;
}
else if (this.props.height) {
ratio = this.props.height / height;
}
// consider max width
if (width * ratio > maxWidth) {
ratio = (maxWidth * ratio) / (width * ratio);
}
// consider max height
if (height * ratio > maxHeight) {
ratio = (maxHeight * ratio) / (height * ratio);
}
if (this.mounted) {
this.setState({width: width * ratio, height: height * ratio});
}
}
render() {
let ImageComponent = Image
if (this.props.background) {
ImageComponent = ImageBackground
}
if (this.props.onPress) {
return (
<TouchableOpacity onPress={this.props.onPress}>
<ImageComponent
{ ...this.props }
style={[
this.props.style,
{width: this.state.width, height: this.state.height}
]}
/>
</TouchableOpacity>
)
} else {
return (
<ImageComponent
{ ...this.props }
style={[
this.props.style,
{width: this.state.width, height: this.state.height}
]}
/>
)
}
}
>>>>>>>
constructor(props) {
super(props)
this.state = {
width : null,
height: null,
}
this.mounted = false
this.computeAndSetRatio = this.computeAndSetRatio.bind(this)
}
componentWillUnmount() {
this.mounted = false
}
componentDidMount() {
this.mounted = true
this._imageChanged(this.props)
}
_imageChanged(props) {
if (props.source.uri) {
Image.getSize(props.source.uri ? props.source.uri : props.source, (width, height) => this.computeAndSetRatio(width, height, props), console.log)
}
else {
const source = resolveAssetSource(props.source)
this.computeAndSetRatio(source.width, source.height, props)
}
}
componentWillReceiveProps(nextProps) {
this._imageChanged(nextProps)
}
computeAndSetRatio(width, height, props) {
const maxWidth = props.maxWidth ? props.maxWidth : Number.MAX_VALUE
const maxHeight = props.maxHeight ? props.maxHeight : Number.MAX_VALUE
let ratio = 1
if (props.width && props.height) {
ratio = Math.min(props.width / width, props.height / height)
}
else if (props.width) {
ratio = props.width / width
}
else if (props.height) {
ratio = props.height / height
}
// consider max width
if (width * ratio > maxWidth) {
ratio = (maxWidth * ratio) / (width * ratio)
}
// consider max height
if (height * ratio > maxHeight) {
ratio = (maxHeight * ratio) / (height * ratio)
}
if (this.mounted) {
this.setState({width: width * ratio, height: height * ratio})
}
}
render() {
let ImageComponent = Image
if (this.props.background) {
ImageComponent = ImageBackground
}
if (this.props.onPress) {
return (
<TouchableOpacity onPress={this.props.onPress}>
<ImageComponent
{ ...this.props }
style={[
this.props.style,
{width: this.state.width, height: this.state.height}
]}
/>
</TouchableOpacity>
)
} else {
return (
<ImageComponent
{ ...this.props }
style={[
this.props.style,
{width: this.state.width, height: this.state.height}
]}
/>
)
}
}
<<<<<<<
width : PropTypes.number,
height : PropTypes.number,
maxWidth : PropTypes.number,
maxHeight: PropTypes.number,
onPress : PropTypes.func,
}
=======
width: PropTypes.number,
height: PropTypes.number,
maxWidth: PropTypes.number,
maxHeight: PropTypes.number,
onPress: PropTypes.func,
background: PropTypes.bool
};
>>>>>>>
width: PropTypes.number,
height: PropTypes.number,
maxWidth: PropTypes.number,
maxHeight: PropTypes.number,
onPress: PropTypes.func,
background: PropTypes.bool
}; |
<<<<<<<
state = {
title: '',
content: '',
tag: ''
};
=======
static displayName = "CreatePost"
static propTypes = {
createPost: PropTypes.func.isRequired,
toggleCreate: PropTypes.func.isRequired,
}
constructor(props) {
super(props)
this.state = {
title: "",
content: "",
tag: "",
}
}
>>>>>>>
state = {
title: '',
content: '',
tag: ''
}
static displayName = "CreatePost"
static propTypes = {
createPost: PropTypes.func.isRequired,
toggleCreate: PropTypes.func.isRequired,
} |
<<<<<<<
const contractAccount = process.env.REACT_APP_EOSIO_CONTRACT_ACCOUNT
this.eosio = new EOSIOClient(contractAccount, contractAccount)
=======
const contractAccount = process.env.REACT_APP_EOSIO_ACCOUNT
this.eosio = new EOSIOClient(contractAccount)
>>>>>>>
const contractAccount = process.env.REACT_APP_EOSIO_CONTRACT_ACCOUNT
this.eosio = new EOSIOClient(contractAccount) |
<<<<<<<
let mainChannel = null; // Main pc channel for the client as single pc is default.
=======
let quicTransportChannel;
>>>>>>>
let mainChannel = null; // Main pc channel for the client as single pc is default.
let quicTransportChannel;
<<<<<<<
const pcc = new ConferencePeerConnectionChannel(
config, signalingForChannel);
pcc.addEventListener('id', (messageEvent) => {
if (!channels.has(messageEvent.message)) {
channels.set(messageEvent.message, pcc);
} else {
Logger.warning('Channel already exists', messageEvent.message);
}
=======
return signalingForChannel;
}
// eslint-disable-next-line require-jsdoc
function createPeerConnectionChannel(transport) {
const signalingForChannel = createSignalingForChannel();
const channel =
new ConferencePeerConnectionChannel(config, signalingForChannel);
channel.addEventListener('id', (messageEvent) => {
channels.set(messageEvent.message, channel);
>>>>>>>
return signalingForChannel;
}
// eslint-disable-next-line require-jsdoc
function createPeerConnectionChannel(transport) {
const signalingForChannel = createSignalingForChannel();
const channel =
new ConferencePeerConnectionChannel(config, signalingForChannel);
channel.addEventListener('id', (messageEvent) => {
if (!channels.has(messageEvent.message)) {
channels.set(messageEvent.message, pcc);
} else {
Logger.warning('Channel already exists', messageEvent.message);
}
<<<<<<<
if (!mainChannel) {
mainChannel = createPeerConnectionChannel();
mainChannel.addEventListener('ended', () => {
mainChannel = null;
});
}
return mainChannel.publish(stream, options, videoCodecs);
=======
const channel = createPeerConnectionChannel();
return channel.publish(stream, options);
>>>>>>>
if (!mainChannel) {
mainChannel = createPeerConnectionChannel();
mainChannel.addEventListener('ended', () => {
mainChannel = null;
});
}
return mainChannel.publish(stream, options, videoCodecs);
<<<<<<<
if (!mainChannel) {
mainChannel = createPeerConnectionChannel();
mainChannel.addEventListener('ended', () => {
mainChannel = null;
});
}
return mainChannel.subscribe(stream, options);
=======
if (stream.source.data) {
if (stream.source.audio || stream.source.video) {
return Promise.reject(new TypeError(
'Invalid source info. A remote stream is either a data stream or ' +
'a media stream.'));
}
return quicTransportChannel.subscribe(stream);
// TODO
}
const channel = createPeerConnectionChannel(options.transport);
return channel.subscribe(stream, options);
>>>>>>>
if (stream.source.data) {
if (stream.source.audio || stream.source.video) {
return Promise.reject(new TypeError(
'Invalid source info. A remote stream is either a data stream or ' +
'a media stream.'));
}
return quicTransportChannel.subscribe(stream);
// TODO
}
if (!mainChannel) {
mainChannel = createPeerConnectionChannel();
mainChannel.addEventListener('ended', () => {
mainChannel = null;
});
}
return mainChannel.subscribe(stream, options); |
<<<<<<<
this._videoCodecs = undefined;
=======
this._options = null;
>>>>>>>
this._videoCodecs = undefined;
this._options = null;
<<<<<<<
async publish(stream, options, videoCodecs) {
if (this._ended) {
return Promise.reject('Connection closed');
}
=======
publish(stream, options) {
>>>>>>>
async publish(stream, options, videoCodecs) {
if (this._ended) {
return Promise.reject('Connection closed');
}
<<<<<<<
const transceiver = this._pc.addTransceiver(
stream.mediaStream.getAudioTracks()[0],
transceiverInit);
transceivers.push({
type: 'audio',
transceiver,
source: mediaOptions.audio.source,
option: {audio: options.audio},
});
if (Utils.isFirefox()) {
// Firefox does not support encodings setting in addTransceiver.
const parameters = transceiver.sender.getParameters();
parameters.encodings = transceiverInit.sendEncodings;
await transceiver.sender.setParameters(parameters);
=======
if (mediaOptions.video && stream.mediaStream.getVideoTracks().length >
0) {
const transceiverInit = {
direction: 'sendonly',
};
if (this._isRtpEncodingParameters(options.video)) {
transceiverInit.sendEncodings = options.video;
}
const transceiver = this._pc.addTransceiver(
stream.mediaStream.getVideoTracks()[0], transceiverInit);
if (Utils.isFirefox()) {
// Firefox does not support encodings setting in addTransceiver.
const parameters = transceiver.sender.getParameters();
parameters.encodings = transceiverInit.sendEncodings;
setPromise = setPromise.then(
() => transceiver.sender.setParameters(parameters));
}
>>>>>>>
const transceiver = this._pc.addTransceiver(
stream.mediaStream.getAudioTracks()[0],
transceiverInit);
transceivers.push({
type: 'audio',
transceiver,
source: mediaOptions.audio.source,
option: {audio: options.audio},
});
if (Utils.isFirefox()) {
// Firefox does not support encodings setting in addTransceiver.
const parameters = transceiver.sender.getParameters();
parameters.encodings = transceiverInit.sendEncodings;
await transceiver.sender.setParameters(parameters);
<<<<<<<
_setRtpReceiverOptions(sdp, options, mid) {
// Add legacy simulcast in SDP for safari.
if (this._isRtpEncodingParameters(options.video) && Utils.isSafari()) {
if (options.video.length > 1) {
sdp = SdpUtils.addLegacySimulcast(
sdp, 'video', options.video.length, mid);
}
}
// _videoCodecs is a workaround for setting video codecs. It will be moved to RTCRtpSendParameters.
if (this._isRtpEncodingParameters(options.video) && this._videoCodecs) {
sdp = SdpUtils.reorderCodecs(sdp, 'video', this._videoCodecs, mid);
return sdp;
}
=======
_setRtpReceiverOptions(sdp, options) {
>>>>>>>
_setRtpReceiverOptions(sdp, options, mid) {
// Add legacy simulcast in SDP for safari.
if (this._isRtpEncodingParameters(options.video) && Utils.isSafari()) {
if (options.video.length > 1) {
sdp = SdpUtils.addLegacySimulcast(
sdp, 'video', options.video.length, mid);
}
}
// _videoCodecs is a workaround for setting video codecs. It will be moved to RTCRtpSendParameters.
if (this._isRtpEncodingParameters(options.video) && this._videoCodecs) {
sdp = SdpUtils.reorderCodecs(sdp, 'video', this._videoCodecs, mid);
return sdp;
} |
<<<<<<<
player: req.params.player,
extra: await getExtra(),
=======
player: playerUsername,
>>>>>>>
player: playerUsername,
extra: await getExtra(),
<<<<<<<
player: req.params.player,
extra: await getExtra(),
=======
player: playerUsername,
>>>>>>>
player: playerUsername,
extra: await getExtra(),
<<<<<<<
player: req.params.player,
extra: await getExtra(),
=======
player: playerUsername,
>>>>>>>
player: playerUsername,
extra: await getExtra(),
<<<<<<<
player: req.params.player,
extra: await getExtra(),
=======
player: playerUsername,
>>>>>>>
player: playerUsername,
extra: await getExtra(),
<<<<<<<
player: req.params.player,
extra: await getExtra(),
=======
player: playerUsername,
>>>>>>>
player: playerUsername,
extra: await getExtra(),
<<<<<<<
player: req.params.player,
extra: await getExtra(),
=======
player: playerUsername,
>>>>>>>
player: playerUsername,
extra: await getExtra(),
<<<<<<<
player: req.params.player,
extra: await getExtra(),
=======
player: playerUsername,
>>>>>>>
player: playerUsername,
extra: await getExtra(),
<<<<<<<
const userProfile = profile.members[data.player.uuid];
=======
if(!profile){
res.render('index', {
error: 'User not found in selected profile. This is probably due to a declined co-op invite.',
player: playerUsername,
page: 'index'
});
return false;
}
let userProfile = profile.members[data.player.uuid];
>>>>>>>
if(!profile){
res.render('index', {
error: 'User not found in selected profile. This is probably due to a declined co-op invite.',
player: playerUsername,
extra: await getExtra(),
page: 'index'
});
return false;
}
let userProfile = profile.members[data.player.uuid];
<<<<<<<
player: req.params.player,
extra: await getExtra(),
=======
player: playerUsername,
>>>>>>>
player: playerUsername,
extra: await getExtra(), |
<<<<<<<
context_sendTreeToDevice: false,
context_groupTabs: true,
context_ungroupTabs: true,
=======
>>>>>>>
context_sendTreeToDevice: false,
<<<<<<<
context_topLevel_sendTreeToDevice: true,
context_topLevel_groupTabs: false,
context_topLevel_ungroupTabs: false,
=======
>>>>>>>
context_topLevel_sendTreeToDevice: true, |
<<<<<<<
<div class="privacy-practices site-info site-info--full-height card">
<div class="hero privacy-practices__overview border--bottom text--center
js-privacy-practices-overview">
${overview(domain, tosdr)}
=======
<div class="privacy-practices site-info card">
<div class="border--bottom text--center
js-privacy-practices-hero">
${hero({
id: 'privacy-practices',
status: tosdrStatus,
title: domain,
subtitle: `${tosdrMsg} Privacy Practices`
})}
>>>>>>>
<div class="privacy-practices site-info site-info--full-height card">
<div class="border--bottom text--center
js-privacy-practices-hero">
${hero({
id: 'privacy-practices',
status: tosdrStatus,
title: domain,
subtitle: `${tosdrMsg} Privacy Practices`
})} |
<<<<<<<
'sendTreeToDevice': {
title: browser.i18n.getMessage('context_sendTreeToDevice_label'),
titleMultiselected: browser.i18n.getMessage('context_sendTreeToDevice_label_multiselected')
},
'groupTabs': {
title: browser.i18n.getMessage('context_groupTabs_label'),
requireMultiselected: true
},
'ungroupTabs': {
title: browser.i18n.getMessage('context_ungroupTabs_label'),
requireGrouped: true
},
=======
>>>>>>>
'sendTreeToDevice': {
title: browser.i18n.getMessage('context_sendTreeToDevice_label'),
titleMultiselected: browser.i18n.getMessage('context_sendTreeToDevice_label_multiselected')
},
<<<<<<<
case 'sendTreeToDevice:all':
Commands.sendTabsToAllDevices(contextTabs, { recursively: true });
break;
case 'groupTabs':
if (contextTabs.length > 1)
TabsGroup.groupTabs(contextTabs, { broadcast: true });
break;
case 'ungroupTabs':
if (contextTabs.length > 1)
TabsGroup.ungroupTabs(contextTabs, { broadcast: true });
break;
=======
>>>>>>>
case 'sendTreeToDevice:all':
Commands.sendTabsToAllDevices(contextTabs, { recursively: true });
break; |
<<<<<<<
gStyleLoader = document.querySelector('#style-loader');
=======
}
async function init() {
log('initialize sidebar on load');
window.addEventListener('resize', onResize);
>>>>>>>
gStyleLoader = document.querySelector('#style-loader');
}
async function init() {
log('initialize sidebar on load');
window.addEventListener('resize', onResize); |
<<<<<<<
let canceled = false;
if (serializedTab && gLastMousedown) {
const results = await sendTSTAPIMessage(Object.assign({}, gLastMousedown.detail, {
=======
if (serializedTab && lastMousedown) {
sendTSTAPIMessage(Object.assign({}, lastMousedown.detail, {
>>>>>>>
let canceled = false;
if (serializedTab && lastMousedown) {
const results = await sendTSTAPIMessage(Object.assign({}, lastMousedown.detail, {
<<<<<<<
if (!canceled) {
const actionForNewTabCommand = gLastMousedown.detail.isAccelClick ?
configs.autoAttachOnNewTabButtonMiddleClick :
configs.autoAttachOnNewTabCommand;
if (isEventFiredOnNewTabButton(aEvent) &&
gLastMousedown.detail.button != 2) {
if (configs.logOnMouseEvent)
log('click on the new tab button');
handleNewTabAction(aEvent, {
action: actionForNewTabCommand
=======
var actionForNewTabCommand = lastMousedown.detail.isAccelClick ?
configs.autoAttachOnNewTabButtonMiddleClick :
configs.autoAttachOnNewTabCommand;
if (isEventFiredOnNewTabButton(aEvent) &&
lastMousedown.detail.button != 2) {
if (configs.logOnMouseEvent)
log('click on the new tab button');
handleNewTabAction(aEvent, {
action: actionForNewTabCommand
});
handled = true;
}
else if (tab/* && warnAboutClosingTabSubtreeOf(tab)*/ &&
lastMousedown.detail.isMiddleClick) { // Ctrl-click doesn't close tab on Firefox's tab bar!
if (configs.logOnMouseEvent)
log('middle click on a tab');
//log('middle-click to close');
confirmToCloseTabs(getCountOfClosingTabs(tab))
.then(aConfirmed => {
if (aConfirmed)
removeTabInternally(tab, { inRemote: true });
>>>>>>>
if (!canceled) {
const actionForNewTabCommand = lastMousedown.detail.isAccelClick ?
configs.autoAttachOnNewTabButtonMiddleClick :
configs.autoAttachOnNewTabCommand;
if (isEventFiredOnNewTabButton(aEvent) &&
lastMousedown.detail.button != 2) {
if (configs.logOnMouseEvent)
log('click on the new tab button');
handleNewTabAction(aEvent, {
action: actionForNewTabCommand |
<<<<<<<
import {
refreshContextMenuItems,
contextMenuClickListener,
} from './context-menu.js';
import { gMetricsData } from './metrics.js';
=======
import * as ContextMenu from './context-menu.js';
>>>>>>>
import * as ContextMenu from './context-menu.js';
import { gMetricsData } from './metrics.js';
<<<<<<<
window.refreshContextMenuItems = refreshContextMenuItems;
window.contextMenuClickListener = contextMenuClickListener;
window.gMetricsData = gMetricsData;
=======
window.ContextMenu = ContextMenu;
>>>>>>>
window.ContextMenu = ContextMenu;
window.gMetricsData = gMetricsData; |
<<<<<<<
// Shows a box (eg inbox or sent) immediately,
// even though the contents have not yet been decrypted
function showEncryptedBox(boxSummary, box) {
boxSummary.EmailHeaders.forEach(function(header){
header.HexMessageID = bin2hex(header.MessageID)
});
var data = {
token: sessionStorage["token"],
box: box,
emailAddress: boxSummary.EmailAddress,
pubHash: boxSummary.PublicHash,
offset: boxSummary.Offset,
limit: boxSummary.Limit,
total: boxSummary.Total,
page: Math.floor(boxSummary.Offset / boxSummary.Limit)+1,
totalPages: Math.ceil(boxSummary.Total / boxSummary.Limit),
emailHeaders: boxSummary.EmailHeaders,
};
var pages = [];
for (var i=0; i<data.totalPages; i++) {
pages.push({page:i+1})
};
data.pages = pages;
$("#wrapper").html(render("page-template", data));
bindSidebarEvents();
setSelectedTab($("#tab-"+box));
$("#"+box).html(render("box-template", data));
bindBoxEvents(box);
viewState.box = box;
}
// Asynchronously decrypts a box (eg inbox and sent). Uses Web Workers.
function startDecryptingBox(boxSummary, box) {
getContacts(function() {
boxSummary.EmailHeaders.forEach(decryptSubject);
=======
function decryptAndDisplayBox(boxSummary, box) {
box = box || "inbox";
sessionStorage["pubHash"] = boxSummary.PublicHash;
sessionStorage["emailAddress"] = boxSummary.EmailAddress;
console.log("Decrypting and displaying "+box);
getPrivateKey(function(privateKey) {
getContacts(function() {
decryptSubjects(boxSummary.EmailHeaders, privateKey);
var data = {
token: sessionStorage["token"],
box: box,
emailAddress: boxSummary.EmailAddress,
pubHash: boxSummary.PublicHash,
offset: boxSummary.Offset,
limit: boxSummary.Limit,
total: boxSummary.Total,
page: Math.floor(boxSummary.Offset / boxSummary.Limit)+1,
totalPages: Math.ceil(boxSummary.Total / boxSummary.Limit),
emailHeaders: boxSummary.EmailHeaders,
};
var pages = [];
for (var i=0; i<data.totalPages; i++) {
pages.push({page:i+1})
};
data.pages = pages;
$("#wrapper").html(render("page-template", data));
bindSidebarEvents();
setSelectedTab($(".js-tab-"+box));
$("#"+box).html(render("box-template", data));
bindBoxEvents(box);
viewState.box = box;
});
>>>>>>>
// Shows a box (eg inbox or sent) immediately,
// even though the contents have not yet been decrypted
function showEncryptedBox(boxSummary, box) {
boxSummary.EmailHeaders.forEach(function(header){
header.HexMessageID = bin2hex(header.MessageID)
});
var data = {
token: sessionStorage["token"],
box: box,
emailAddress: boxSummary.EmailAddress,
pubHash: boxSummary.PublicHash,
offset: boxSummary.Offset,
limit: boxSummary.Limit,
total: boxSummary.Total,
page: Math.floor(boxSummary.Offset / boxSummary.Limit)+1,
totalPages: Math.ceil(boxSummary.Total / boxSummary.Limit),
emailHeaders: boxSummary.EmailHeaders,
};
var pages = [];
for (var i=0; i<data.totalPages; i++) {
pages.push({page:i+1})
};
data.pages = pages;
$("#wrapper").html(render("page-template", data));
bindSidebarEvents();
setSelectedTab($(".js-tab-"+box));
$("#"+box).html(render("box-template", data));
bindBoxEvents(box);
viewState.box = box;
}
// Asynchronously decrypts a box (eg inbox and sent). Uses Web Workers.
function startDecryptingBox(boxSummary, box) {
getContacts(function() {
boxSummary.EmailHeaders.forEach(decryptSubject); |
<<<<<<<
if(getEvtX('clientX', ev)) {
var width = getEvtX('clientX', ev) - startLeft;
if (width > parentWidth - startPosLeft) width = parentWidth - startPosLeft;
if (width >= minWidth) {
self.val([self.range[0], self.range[0] + width / parentWidth], {dontApplyDelta: true});
} else if(width <= 10) {
$(document).trigger(opposite);
self.$el.find('.elessar-handle:first-child').trigger(subsequent);
}
=======
var width = getEvtX('clientX', ev) - startLeft;
if (width > parentWidth - startPosLeft) width = parentWidth - startPosLeft;
if (width >= minWidth) {
self.val([self.range[0], self.range[0] + width / parentWidth], {dontApplyDelta: true});
} else if(width <= 10) {
$(document).trigger(opposite + '.elessar');
self.$el.find('.elessar-handle:first-child').trigger(subsequent + '.elessar');
>>>>>>>
if(getEvtX('clientX', ev)) {
var width = getEvtX('clientX', ev) - startLeft;
if (width > parentWidth - startPosLeft) width = parentWidth - startPosLeft;
if (width >= minWidth) {
self.val([self.range[0], self.range[0] + width / parentWidth], {dontApplyDelta: true});
} else if(width <= 10) {
$(document).trigger(opposite + '.elessar');
self.$el.find('.elessar-handle:first-child').trigger(subsequent + '.elessar');
}
<<<<<<<
if(getEvtX('clientX', ev)) {
var left = getEvtX('clientX', ev) - parentOffset.left - mouseOffset;
var width = startPosLeft + startWidth - left;
if (left < 0) {
left = 0;
width = startPosLeft + startWidth;
}
if (width >= minWidth) {
self.val([left / parentWidth, self.range[1]], {dontApplyDelta: true});
} else if(width <= 10) {
$(document).trigger(opposite);
self.$el.find('.elessar-handle:last-child').trigger(subsequent);
}
=======
if (left < 0) {
left = 0;
width = startPosLeft + startWidth;
}
if (width >= minWidth) {
self.val([left / parentWidth, self.range[1]], {dontApplyDelta: true});
} else if(width <= 10) {
$(document).trigger(opposite + '.elessar');
self.$el.find('.elessar-handle:last-child').trigger(subsequent + '.elessar');
>>>>>>>
if(getEvtX('clientX', ev)) {
var left = getEvtX('clientX', ev) - parentOffset.left - mouseOffset;
var width = startPosLeft + startWidth - left;
if (left < 0) {
left = 0;
width = startPosLeft + startWidth;
}
if (width >= minWidth) {
self.val([left / parentWidth, self.range[1]], {dontApplyDelta: true});
} else if(width <= 10) {
$(document).trigger(opposite + '.elessar');
self.$el.find('.elessar-handle:last-child').trigger(subsequent + '.elessar');
} |
<<<<<<<
// Hoist @import
text = text.replace(/@import\s+(?:url\s*\(\s*['"]?|['"])[^"'\s]+(?:['"]?\s*\)|['"])\s*([\w\s\(\)\d\:,\-]*);/g, function(e) {
temp += e;
});
text = temp + text;
=======
// Hoist @import
text = text.replace(/@import\s+(?:url\s*\(\s*['"]?|['"])[^"'\s]+(?:['"]?\s*\)|['"])\s*([\w\s\(\)\d\:,\-]*);/g, function(e) {
temp += e; return '';
});
text = temp + text;
>>>>>>>
// Hoist @import
text = text.replace(/@import\s+(?:url\s*\(\s*['"]?|['"])[^"'\s]+(?:['"]?\s*\)|['"])\s*([\w\s\(\)\d\:,\-]*);/g, function(e) {
temp += e; return '';
});
text = temp + text;
<<<<<<<
var t, k;
if (!this || this.constructor != Passage) {
throw new ReferenceError("passage() incorrectly capitalised");
}
=======
var t;
if (!this || this.constructor != Passage) {
throw new ReferenceError("passage() must be in lowercase");
}
>>>>>>>
var t;
if (!this || this.constructor != Passage) {
throw new ReferenceError("passage() must be in lowercase");
}
if (!this || this.constructor != Passage) {
throw new ReferenceError("passage() incorrectly capitalised");
}
<<<<<<<
var softErrorMessage = " You may be able to continue playing, but parts of the story may not work properly.";
window.onerror = function (msg, a, b, c, error) {
var s = (error && (".\n\n" + error.stack + "\n\n")) || (" (" + msg + ").\n");
alert("Sorry to interrupt, but this story's code has got itself in a mess" + s + softErrorMessage.slice(1));
=======
var softErrorMessage = " You may be able to continue playing, but some parts may not work properly.";
window.onerror = function (msg, a, b, c, error) {
var s = (error && (".\n\n" + error.stack.replace(/\([^\)]+\)/g,'') + "\n\n")) || (" (" + msg + ").\n");
alert("Sorry to interrupt, but this " + ((tale && tale.identity && tale.identity()) || "page") + "'s code has got itself in a mess" + s + softErrorMessage.slice(1));
>>>>>>>
var softErrorMessage = " You may be able to continue playing, but some parts may not work properly.";
window.onerror = function (msg, a, b, c, error) {
var s = (error && (".\n\n" + error.stack.replace(/\([^\)]+\)/g,'') + "\n\n")) || (" (" + msg + ").\n");
alert("Sorry to interrupt, but this " + ((tale && tale.identity && tale.identity()) || "page") + "'s code has got itself in a mess" + s + softErrorMessage.slice(1)); |
<<<<<<<
return readFile(file, options, $refs)
.then(function (resolver) {
$ref.pathType = resolver.plugin.name;
file.data = resolver.result;
return parseFile(file, options, $refs);
})
.then(function (parser) {
$ref.value = parser.result;
return parser.result;
});
=======
const resolver = await readFile(file, options);
$ref.pathType = resolver.plugin.name;
file.data = resolver.result;
const parser = await parseFile(file, options);
$ref.value = parser.result;
return parser.result;
>>>>>>>
const resolver = await readFile(file, options, $refs);
$ref.pathType = resolver.plugin.name;
file.data = resolver.result;
const parser = await parseFile(file, options, $refs);
$ref.value = parser.result;
return parser.result;
<<<<<<<
function readFile (file, options, $refs) {
return new Promise(function (resolve, reject) {
=======
function readFile (file, options) {
return new Promise(((resolve, reject) => {
>>>>>>>
function readFile (file, options, $refs) {
return new Promise(((resolve, reject) => {
<<<<<<<
function parseFile (file, options, $refs) {
return new Promise(function (resolve, reject) {
=======
function parseFile (file, options) {
return new Promise(((resolve, reject) => {
>>>>>>>
function parseFile (file, options, $refs) {
return new Promise(((resolve, reject) => { |
<<<<<<<
<br><br>If you choose to show subreddit styles, you will see flair images and spoiler tags, but be warned: <em>you may see bright images, comment highlighting, etc.</em> If you do, please message the mods for that subreddit.",
advanced: true
},
=======
<br><br>If you choose to show subreddit styles, you will see flair images and spoiler tags, but be warned: <em>you may see bright images, comment highlighting, etc.</em> If you do, please message the mods for that subreddit."
},
disableAnimations: {
type: 'boolean',
value: false,
description: 'Discourage CSS3 animations. (This will apply to all of reddit, every subreddit, and RES functionality. However, subreddits might still some animations.)'
},
>>>>>>>
<br><br>If you choose to show subreddit styles, you will see flair images and spoiler tags, but be warned: <em>you may see bright images, comment highlighting, etc.</em> If you do, please message the mods for that subreddit.",
advanced: true
},
disableAnimations: {
type: 'boolean',
value: false,
description: 'Discourage CSS3 animations. (This will apply to all of reddit, every subreddit, and RES functionality. However, subreddits might still some animations.)'
}, |
<<<<<<<
require(['jquery-1.11.2.min', 'guiders', 'favico', 'snuownd', 'jquery.sortable-0.9.12', 'jquery.edgescroll-0.1', 'jquery.tokeninput', 'jquery-fieldselection.min'], function() {
RESUtils.init.complete();
=======
require(['jquery-1.11.3.min', 'guiders', 'favico', 'snuownd', 'jquery.sortable-0.9.12', 'jquery.edgescroll-0.1', 'jquery.tokeninput', 'jquery-fieldselection.min'], function() {
RESInit();
>>>>>>>
require(['jquery-1.11.3.min', 'guiders', 'favico', 'snuownd', 'jquery.sortable-0.9.12', 'jquery.edgescroll-0.1', 'jquery.tokeninput', 'jquery-fieldselection.min'], function() {
RESUtils.init.complete(); |
<<<<<<<
addModule('subRedditTagger', function(module, moduleID) {
module.moduleName = 'Subreddit Tagger';
module.category = [ 'Filters', 'Posts' ];
module.description = 'Adds tags to posts based on which subreddit they were posted to.';
module.options = {
=======
addModule('subRedditTagger', {
moduleID: 'subRedditTagger',
moduleName: 'Subreddit Tagger',
category: [ 'Subreddits' ],
options: {
>>>>>>>
addModule('subRedditTagger', function(module, moduleID) {
module.moduleName = 'Subreddit Tagger';
module.category = [ 'Subreddits' ];
module.description = 'Adds tags to posts based on which subreddit they were posted to.';
module.options = { |
<<<<<<<
RESUtils.htmlClasses = [];
RESUtils.documentClasses = {
concat: function(oldItems, newItems) {
var items = [].concat([].slice.call(newItems))
.map(function(item) {
return item.split(' ');
})
.reduce(function(prev, items) {
return prev.concat(items)
}, []);
return [].concat(oldItems, items);
},
add: function(items) {
this._add = this.concat(this._add, arguments);
this.apply();
},
remove: function(items) {
this._remove = this.concat(this._remove, arguments);
this.apply();
},
apply: function() { // TODO: maybe _.debounce(thisfunction, 1) for DOM repainting efficiency
var add = this._add || [];
var remove = this.remove || [];
DOMTokenList.prototype.add.apply(document.html.classList, add);
DOMTokenList.prototype.remove.apply(document.html.classList, remove);
if (document.body) { // else wait for RESinit to call this function again when body is ready
DOMTokenList.prototype.add.apply(document.body.classList, add);
DOMTokenList.prototype.remove.apply(document.body.classList, remove);
}
}
};
=======
RESUtils.addBodyClasses = (function() {
var classes = [];
return function add() {
classes = Array.prototype.slice.call(arguments).reduce(function(a, b) {
return a.concat(b);
}, classes);
if (classes.length) {
if (document.html) {
DOMTokenList.prototype.add.apply(document.html.classList, classes);
}
if (document.body) {
DOMTokenList.prototype.add.apply(document.body.classList, classes);
}
}
}
})();
RESUtils.addBodyClasses('res', 'res-v430');
>>>>>>>
(function() {
var classes = [];
RESUtils.addBodyClasses = function() {
classes = Array.prototype.slice.call(arguments).reduce(function(a, b) {
return a.concat(b);
}, classes);
if (classes.length) {
if (document.html) {
DOMTokenList.prototype.add.apply(document.html.classList, classes);
}
if (document.body) {
DOMTokenList.prototype.add.apply(document.body.classList, classes);
}
}
}
RESUtils.removeBodyClasses = function(classes) {
classes = Array.prototype.slice.call(arguments)
.reduce(function(a, b) {
return a.concat(b);
}, []);
if (classes.length) {
if (document.html) {
DOMTokenList.prototype.remove.apply(document.html.classList, classes);
}
if (document.body) {
DOMTokenList.prototype.remove.apply(document.body.classList, classes);
}
}
}
})();
RESUtils.addBodyClasses('res', 'res-v430');
<<<<<<<
RESUtils.options = {};
RESUtils.options.listTypes = {};
RESUtils.options.listTypes['subreddits'] = {
source: '/api/search_reddit_names.json?app=res',
hintText: 'type a subreddit name',
onResult: function(response) {
var names = response.names;
var results = [];
for (var i = 0, len = names.length; i < len; i++) {
results.push({
id: names[i],
name: names[i]
});
}
return results;
},
onCachedResult: function(response) {
var names = response.names;
var results = [];
for (var i = 0, len = names.length; i < len; i++) {
results.push({
id: names[i],
name: names[i]
});
}
return results;
},
sanitizeValues: function(values) {
var sanitized = [].concat(values)
.map(function (subreddit) {
return subreddit.split(/[\s,]/);
})
.reduce(function(collection, subreddits) {
return collection.concat(subreddits);
}, [])
.map(function(subreddit) {
return subreddit.replace(/^\/?r\//, '');
});
return sanitized;
}
};
(function() {
RESUtils.options.table = {};
RESUtils.options.table.getMatchingValue = function (moduleID, optionKey, valueIdentifiers) {
var option = modules[moduleID].options[optionKey];
var values = option.value;
var matchingValue;
if (!(option.type === 'table' && values && values.length)) return;
for (var vi = 0, vlength = values.length; vi < vlength; vi++) {
var value = values[vi];
var match = false;
for (var fi = 0, flength = option.fields.length; fi < flength; fi++) {
var field = option.fields[fi];
var fieldValue = value[fi];
var matchValue = RESUtils.firstValid(valueIdentifiers[fi], valueIdentifiers[field.name]);
if (matchValue === void 0) {
continue;
} else if (matchValue === fieldValue) {
match = true;
continue;
} else {
match = false;
break;
}
}
if (match) {
matchingValue = value;
break;
}
}
return matchingValue;
};
RESUtils.options.table.addValue = function (moduleID, optionKey, value) {
var option = modules[moduleID].options[optionKey];
if (option.type !== 'table') {
console.error('Tried to save table value to non-table option: modules[\'' + moduleID + '\'].options.' + optionKey);
return;
}
if (!option.value) {
option.value = [];
}
var values = option.value;
var optionValue = [];
for (var i = 0, length = option.fields.length; i < length; i++) {
var field = option.fields[i];
var fieldValue = RESUtils.firstValid(value[i], value[field.name], field.value);
optionValue.push(fieldValue);
}
values.push(optionValue);
RESUtils.setOption(moduleID, optionKey, values);
return optionValue;
};
RESUtils.options.table.getMatchingValueOrAdd = function (moduleID, optionKey, valueIdentifier, hydrateValue) {
var matchingValue = RESUtils.options.table.getMatchingValue(moduleID, optionKey, valueIdentifier);
if (!matchingValue) {
var value = valueIdentifier;
if (hydrateValue) {
value = hydrateValue(valueIdentifier);
}
matchingValue = RESUtils.options.table.addValue(moduleID, optionKey, value);
}
return matchingValue;
};
RESUtils.options.table.mapValueToObject = function (moduleID, optionKey, value) {
var option = modules[moduleID].options[optionKey];
var object = {};
for (var i = 0, length = option.fields.length; i < length; i++) {
var field = option.fields[i];
object[field.name] = value[i];
}
return object;
};
})();
=======
>>>>>>> |
<<<<<<<
RESUtils.addCSS('#tagPageControls { display: inline-block; position: relative; top: 9px;}');
// some styles to override /r/dashboard stylesheet.
RESUtils.addCSS('#userTaggerContents, #newCommentsContents { margin-right: 305px; font-size: small; }');
RESUtils.addCSS('#userTaggerContents table, #newCommentsContents table { margin: 0; width: 100%; }');
RESUtils.addCSS('#userTaggerTable th, #newCommentsTable th, #userTaggerTable td, #newCommentsTable td { min-width: 0; padding: 5px 8px; border: 1px solid rgb(200,200,200); }');
RESUtils.addCSS('#newCommentsTable th, #userTaggerTable th, #newCommentsTable td { white-space: nowrap; }');
RESUtils.addCSS('#newCommentsTable td:first-child, #newCommentsTable th:first-child { width: auto; white-space: normal; }');
RESUtils.addCSS('#newCommentsTable .deleteIcon, #userTaggerTable .deleteIcon { color: rgba(0,0,0,0); }');
RESUtils.addCSS('#newCommentsTable tr:hover .deleteIcon, #userTaggerTable tr:hover .deleteIcon { color: #369; }');
=======
RESUtils.addCSS('#tagPageControls { display: inline-block; margin: 0 0 0 10px; }');
RESUtils.addCSS('.dashboardPane.md { max-width: none; font-size: x-small; }');
RESUtils.addCSS('.dashboardPane.md table { margin: 0; width: 100%; }');
RESUtils.addCSS('.dashboardPane.md th { font-weight: normal; }');
>>>>>>>
RESUtils.addCSS('#tagPageControls { display: inline-block; margin: 0 0 0 10px; }');
// some styles to override /r/dashboard stylesheet.
RESUtils.addCSS('#userTaggerContents, #newCommentsContents { margin-right: 305px; font-size: small; }');
RESUtils.addCSS('#userTaggerContents table, #newCommentsContents table { margin: 0; width: 100%; }');
RESUtils.addCSS('#userTaggerTable th, #newCommentsTable th, #userTaggerTable td, #newCommentsTable td { min-width: 0; padding: 5px 8px; border: 1px solid rgb(200,200,200); }');
RESUtils.addCSS('#newCommentsTable th, #userTaggerTable th, #newCommentsTable td { white-space: nowrap; }');
RESUtils.addCSS('#newCommentsTable td:first-child, #newCommentsTable th:first-child { width: auto; white-space: normal; }');
RESUtils.addCSS('#newCommentsTable .deleteIcon, #userTaggerTable .deleteIcon { color: rgba(0,0,0,0); }');
RESUtils.addCSS('#newCommentsTable tr:hover .deleteIcon, #userTaggerTable tr:hover .deleteIcon { color: #369; }'); |
<<<<<<<
description: 'The saved tab on pages with the multireddit side bar is now located in that collapsible bar. This will restore it to the header. If you have the \'Save Comments\' module enabled then you\'ll see both the links <em>and</em> comments tabs.'
},
doNoCtrlF: {
type: 'boolean',
value: false,
description: 'Modify reddit\'s comment/link buttons ("perma-link source save...") such that they don\'t show up in searches. Disabled by default due to a slight performance impact.'
=======
description: 'The saved tab is now located in the multireddit sidebar. This will restore a "saved" link to the header (next to the "hot", "new", etc. tabs).'
>>>>>>>
description: 'The saved tab is now located in the multireddit sidebar. This will restore a "saved" link to the header (next to the "hot", "new", etc. tabs).'
},
doNoCtrlF: {
type: 'boolean',
value: false,
description: 'Modify reddit\'s comment/link buttons ("perma-link source save...") such that they don\'t show up in searches. Disabled by default due to a slight performance impact.' |
<<<<<<<
RESUtils.allRegex = /^https?:\/\/(?:[-\w\.]+\.)?reddit\.com\//i;
RESUtils.commentsRegex = /^https?:\/\/(?:[-\w\.]+\.)?reddit\.com\/[-\w\.\/]*\/comments/i;
RESUtils.nosubCommentsRegex = /https?:\/\/(?:[-\w\.]+\.)?reddit\.com\/comments\/[-\w\.\/]*/i;
RESUtils.friendsCommentsRegex = /^https?:\/\/(?:[-\w\.]+\.)?reddit\.com\/r\/friends\/*comments/i;
RESUtils.inboxRegex = /^https?:\/\/(?:[-\w\.]+\.)?reddit\.com\/(?:r\/[-\w\.\/]+?\/)?message\//i;
RESUtils.profileRegex = /^https?:\/\/(?:[-\w\.]+\.)?reddit\.com\/user\/([-\w\.#=]*)\/?(?:comments)?\/?(?:\?(?:[a-z]+=[a-zA-Z0-9_%]*&?)*)?$/i;
RESUtils.submitRegex = /^https?:\/\/(?:[-\w\.]+\.)?reddit\.com\/(?:[-\w\.\/]*\/)?submit\/?(?:\?.*)?$/i;
RESUtils.prefsRegex = /^https?:\/\/(?:[-\w\.]+\.)?reddit\.com\/prefs/i;
RESUtils.wikiRegex = /^https?:\/\/(?:[-\w\.]+\.)?reddit\.com\/(?:r\/[-\w\.]+\/)?wiki/i;
RESUtils.styleSheetRegex = /^https?:\/\/(?:[-\w\.]+\.)?reddit\.com\/(?:r\/[-\w\.]+\/)?about\/stylesheet/i;
RESUtils.searchRegex = /^https?:\/\/(?:[-\w\.]+\.)?reddit\.com\/(?:[-\w\.\/]*\/)?search/i;
=======
RESUtils.userInfoCallbacks = {};
RESUtils.allRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\//i;
RESUtils.commentsRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/[\-\w\.\/]*\/comments/i;
RESUtils.nosubCommentsRegex = /https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/comments\/[\-\w\.\/]*/i;
RESUtils.friendsCommentsRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/r\/friends\/*comments/i;
RESUtils.inboxRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/(?:r\/[\-\w\.\/]+?\/)?message\//i;
RESUtils.profileRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/user\/([\-\w\.#=]*)\/?(?:comments)?\/?(?:\?(?:[a-z]+=[a-zA-Z0-9_%]*&?)*)?$/i;
RESUtils.submitRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/(?:[\-\w\.\/]*\/)?submit\/?(?:\?.*)?$/i;
RESUtils.prefsRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/prefs/i;
RESUtils.wikiRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/(?:r\/[\-\w\.]+\/)?wiki/i;
RESUtils.styleSheetRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/(?:r\/[\-\w\.]+\/)?about\/stylesheet/i;
RESUtils.searchRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/(?:[\-\w\.\/]*\/)?search/i;
>>>>>>>
RESUtils.allRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\//i;
RESUtils.commentsRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/[\-\w\.\/]*\/comments/i;
RESUtils.nosubCommentsRegex = /https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/comments\/[\-\w\.\/]*/i;
RESUtils.friendsCommentsRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/r\/friends\/*comments/i;
RESUtils.inboxRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/(?:r\/[\-\w\.\/]+?\/)?message\//i;
RESUtils.profileRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/user\/([\-\w\.#=]*)\/?(?:comments)?\/?(?:\?(?:[a-z]+=[a-zA-Z0-9_%]*&?)*)?$/i;
RESUtils.submitRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/(?:[\-\w\.\/]*\/)?submit\/?(?:\?.*)?$/i;
RESUtils.prefsRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/prefs/i;
RESUtils.wikiRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/(?:r\/[\-\w\.]+\/)?wiki/i;
RESUtils.styleSheetRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/(?:r\/[\-\w\.]+\/)?about\/stylesheet/i;
RESUtils.searchRegex = /^https?:\/\/(?:[\-\w\.]+\.)?reddit\.com\/(?:[\-\w\.\/]*\/)?search/i; |
<<<<<<<
'modules/hosts/github.js',
=======
'modules/hosts/pastebin.js',
>>>>>>>
'modules/hosts/pastebin.js',
'modules/hosts/github.js', |
<<<<<<<
type: 'text',
value: 'white',
description: 'Color for highlighted text.',
advanced: true
=======
type: 'color',
value: '#FFFFFF',
description: 'Color for highlighted text.'
>>>>>>>
type: 'color',
value: '#FFFFFF',
description: 'Color for highlighted text.'
advanced: true
<<<<<<<
values: [],
advanced: true
=======
values: []
},
generateHoverColors: {
type: 'button',
text: 'Generate',
callback: null,
description: 'Automatically generate hover color based on normal color.'
>>>>>>>
values: [],
advanced: true
},
generateHoverColors: {
type: 'button',
text: 'Generate',
callback: null,
description: 'Automatically generate hover color based on normal color.' |
<<<<<<<
options: {
searchSubredditByDefault: {
type: 'boolean',
value: true,
description: 'Search the current subreddit by default when using the search box, instead of all of reddit.'
},
userFilterBySubreddit: {
=======
options: {
addSearchOptions: {
>>>>>>>
options: {
searchSubredditByDefault: {
type: 'boolean',
value: true,
description: 'Search the current subreddit by default when using the search box, instead of all of reddit.'
},
addSearchOptions: {
<<<<<<<
if (this.options.searchSubredditByDefault.value) {
this.searchSubredditByDefault();
}
=======
if (this.options.addSearchOptions.value) {
var searchExpando;
if (searchExpando = document.getElementById('searchexpando')) {
var searchOptionsHtml = '<label>Sort:<select name="sort"><option value="relevance">relevance</option><option value="new">new</option><option value="hot">hot</option><option value="top">top</option><option value="comments">comments</option></select></label> <label>Time:<select name="t"><option value="all">all time</option><option value="hour">this hour</option><option value="day">today</option><option value="week">this week</option><option value="month">this month</option><option value="year">this year</option></select></label>';
if($(searchExpando).find('input[name=restrict_sr]').length) { // we don't want to add the new line if we are on the front page
searchOptionsHtml = '<br />' + searchOptionsHtml;
}
$(searchExpando).find('#moresearchinfo').before(searchOptionsHtml);
}
}
>>>>>>>
if (this.options.searchSubredditByDefault.value) {
this.searchSubredditByDefault();
if (this.options.addSearchOptions.value) {
var searchExpando;
if (searchExpando = document.getElementById('searchexpando')) {
var searchOptionsHtml = '<label>Sort:<select name="sort"><option value="relevance">relevance</option><option value="new">new</option><option value="hot">hot</option><option value="top">top</option><option value="comments">comments</option></select></label> <label>Time:<select name="t"><option value="all">all time</option><option value="hour">this hour</option><option value="day">today</option><option value="week">this week</option><option value="month">this month</option><option value="year">this year</option></select></label>';
if($(searchExpando).find('input[name=restrict_sr]').length) { // we don't want to add the new line if we are on the front page
searchOptionsHtml = '<br />' + searchOptionsHtml;
}
$(searchExpando).find('#moresearchinfo').before(searchOptionsHtml);
}
} |
<<<<<<<
var senders = ['/u/' + username],
sendFromCacheKey = 'RESUtils.sendFromCache.' + username;
// We moderate a subreddit
if (RESUtils.isModeratorAnywhere()) {
RESUtils.getCacheable({
key: sendFromCacheKey,
endpoint: 'subreddits/mine/moderator.json?limit=100&show=all',
handleData: function (response) {
return senders.concat(response.data.children.map(function (e) {
return e.data.url.slice(0, -1);
}));
},
callback: callback
=======
var sendFromCacheKey = 'RESUtils.sendFromCache.' + username,
cacheData = RESStorage.getItem(sendFromCacheKey) || '{}',
sendFromCache = safeJSON.parse(cacheData),
lastCheck = (sendFromCache !== null) ? parseInt(sendFromCache.lastCheck, 10) || 0 : 0,
now = Date.now();
var senders = ['/u/' + username];
// We moderate a subreddit and the cache is stale
if (RESUtils.isModeratorAnywhere() && ((now - lastCheck) > 300000 || lastCheck > now)) {
callback(senders); // return initial data early
BrowserStrategy.ajax({
method: 'GET',
url: location.protocol + '//' + location.hostname + '/subreddits/mine/moderator.json?app=res',
data: 'limit=100&show=all',
onload: function(response) {
var thisResponse;
try {
thisResponse = JSON.parse(response.responseText);
} catch (e) {
console.log('quickMessage: Error parsing response from reddit');
console.log(response.responseText);
return false;
}
sendFromCache.lastCheck = now;
thisResponse.data.children.forEach(function(elem) {
senders.push(elem.data.url.slice(0, -1));
});
sendFromCache.senders = senders;
RESStorage.setItem(sendFromCacheKey, JSON.stringify(sendFromCache));
callback(sendFromCache.senders);
}
>>>>>>>
var senders = ['/u/' + username],
sendFromCacheKey = 'RESUtils.sendFromCache.' + username;
// We moderate a subreddit
if (RESUtils.isModeratorAnywhere()) {
callback(senders); // return initial data early
RESUtils.getCacheable({
key: sendFromCacheKey,
endpoint: 'subreddits/mine/moderator.json?limit=100&show=all',
handleData: function (response) {
return senders.concat(response.data.children.map(function (e) {
return e.data.url.slice(0, -1);
}));
},
callback: callback |
<<<<<<<
self.data.url('modules/hosts/graphiq.js'),
=======
self.data.url('modules/hosts/spotify.js'),
>>>>>>>
self.data.url('modules/hosts/graphiq.js'),
self.data.url('modules/hosts/spotify.js'), |
<<<<<<<
selfTextMaxHeight: {
type: 'text',
value: '0',
description: 'Add a scroll bar to text expandos taller than [x] pixels (enter zero for unlimited).',
advanced: true
},
commentMaxHeight: {
type: 'text',
value: '0',
description: 'Add a scroll bar to comments taller than [x] pixels (enter zero for unlimited).',
advanced: true
},
autoMaxHeight: {
type: 'boolean',
value: false,
description: 'Increase the max height of a self-text expando or comment if an expando is taller than the current max height.\
This only takes effect if max height is specified (previous two options).',
advanced: true
},
=======
displayOriginalResolution: {
type: 'boolean',
value: false,
description: 'Display each image\'s original (unresized) resolution in a tooltip.'
},
>>>>>>>
displayOriginalResolution: {
type: 'boolean',
value: false,
description: 'Display each image\'s original (unresized) resolution in a tooltip.'
},
selfTextMaxHeight: {
type: 'text',
value: '0',
description: 'Add a scroll bar to text expandos taller than [x] pixels (enter zero for unlimited).',
advanced: true
},
commentMaxHeight: {
type: 'text',
value: '0',
description: 'Add a scroll bar to comments taller than [x] pixels (enter zero for unlimited).',
advanced: true
},
autoMaxHeight: {
type: 'boolean',
value: false,
description: 'Increase the max height of a self-text expando or comment if an expando is taller than the current max height.\
This only takes effect if max height is specified (previous two options).',
advanced: true
}, |
<<<<<<<
}
const bob = {
ethereumPrivateKey: '7e5374ec2ef0d91761a6e72fdf8f6ac665519bfdf6da0a2329cf0d804514b816',
encryptionPrivateKey: 'flN07C7w2Rdhpucv349qxmVRm/322gojKc8NgEUUuBY=',
encryptionPublicKey: 'C5YMNdqE4kLgxQhJO1MfuQcHP5hjVSXzamzd/TxlR0U=' }
const secretMessage = {data:'My name is Satoshi Buterin'};
const encryptedData = { version: 'x25519-xsalsa20-poly1305',
nonce: '1dvWO7uOnBnO7iNDJ9kO9pTasLuKNlej',
ephemPublicKey: 'FBH1/pAEHOOW14Lu3FWkgV3qOEcuL78Zy+qW1RwzMXQ=',
ciphertext: 'f8kBcl/NCyf3sybfbwAKk/np2Bzt9lRVkZejr6uh5FgnNlH/ic62DZzy' };
test("Getting bob's encryptionPublicKey", async t => {
t.plan(1);
const result = await sigUtil.getEncryptionPublicKey(bob.ethereumPrivateKey)
t.equal(result, bob.encryptionPublicKey);
});
//encryption test
test("Alice encrypts message with bob's encryptionPublicKey", async t => {
t.plan(4);
const result = await sigUtil.encrypt(
bob.encryptionPublicKey,
secretMessage,
'x25519-xsalsa20-poly1305'
);
console.log("RESULT", result)
t.ok(result.version);
t.ok(result.nonce);
t.ok(result.ephemPublicKey);
t.ok(result.ciphertext);
});
// decryption test
test("Bob decrypts message that Alice sent to him", t => {
t.plan(1);
const result = sigUtil.decrypt(encryptedData, bob.ethereumPrivateKey);
t.equal(result, secretMessage.data);
});
test('Decryption failed because version is wrong or missing', t =>{
t.plan(1)
const badVersionData = { version: 'x256k1-aes256cbc',
nonce: '1dvWO7uOnBnO7iNDJ9kO9pTasLuKNlej',
ephemPublicKey: 'FBH1/pAEHOOW14Lu3FWkgV3qOEcuL78Zy+qW1RwzMXQ=',
ciphertext: 'f8kBcl/NCyf3sybfbwAKk/np2Bzt9lRVkZejr6uh5FgnNlH/ic62DZzy' };
t.throws( function() { sigUtil.decrypt(badVersionData, bob.ethereumPrivateKey)}, 'Encryption type/version not supported.')
});
test('Decryption failed because nonce is wrong or missing', t => {
t.plan(1);
//encrypted data
const badNonceData = { version: 'x25519-xsalsa20-poly1305',
nonce: '',
ephemPublicKey: 'FBH1/pAEHOOW14Lu3FWkgV3qOEcuL78Zy+qW1RwzMXQ=',
ciphertext: 'f8kBcl/NCyf3sybfbwAKk/np2Bzt9lRVkZejr6uh5FgnNlH/ic62DZzy' };
t.throws(function() { sigUtil.decrypt(badNonceData, bob.ethereumPrivateKey)}, 'Decryption failed.')
});
test('Decryption failed because ephemPublicKey is wrong or missing', t => {
t.plan(1);
//encrypted data
const badEphemData = { version: 'x25519-xsalsa20-poly1305',
nonce: '1dvWO7uOnBnO7iNDJ9kO9pTasLuKNlej',
ephemPublicKey: 'FFFF/pAEHOOW14Lu3FWkgV3qOEcuL78Zy+qW1RwzMXQ=',
ciphertext: 'f8kBcl/NCyf3sybfbwAKk/np2Bzt9lRVkZejr6uh5FgnNlH/ic62DZzy' };
t.throws(function() { sigUtil.decrypt(badEphemData, bob.ethereumPrivateKey)}, 'Decryption failed.')
});
test('Decryption failed because cyphertext is wrong or missing', async t => {
t.plan(1);
//encrypted data
const badCypherData = { version: 'x25519-xsalsa20-poly1305',
nonce: '1dvWO7uOnBnO7iNDJ9kO9pTasLuKNlej',
ephemPublicKey: 'FBH1/pAEHOOW14Lu3FWkgV3qOEcuL78Zy+qW1RwzMXQ=',
ciphertext: 'ffffff/NCyf3sybfbwAKk/np2Bzt9lRVkZejr6uh5FgnNlH/ic62DZzy' };
t.throws(function() { sigUtil.decrypt(badEphemData, bob.ethereumPrivateKey)}, 'Decryption failed.')
});
test("Decryption fails because you are not the recipient", t => {
t.plan(1);
t.throws(function() { sigUtil.decrypt(encryptedData, alice.ethereumPrivateKey)}, 'Decryption failed.')
});
=======
}
test('signedTypeData', (t) => {
t.plan(8)
const utils = sigUtil.TypedDataUtils
const privateKey = ethUtil.sha3('cow')
const address = ethUtil.privateToAddress(privateKey)
const sig = sigUtil.signTypedData(privateKey, { data: typedData })
t.equal(utils.encodeType('Mail', typedData.types),
'Mail(Person from,Person to,string contents)Person(string name,address wallet)')
t.equal(ethUtil.bufferToHex(utils.hashType('Mail', typedData.types)),
'0xa0cedeb2dc280ba39b857546d74f5549c3a1d7bdc2dd96bf881f76108e23dac2')
t.equal(ethUtil.bufferToHex(utils.encodeData(typedData.primaryType, typedData.message, typedData.types)),
'0xa0cedeb2dc280ba39b857546d74f5549c3a1d7bdc2dd96bf881f76108e23dac2fc71e5fa27ff56c350aa531bc129ebdf613b772b6604664f5d8dbe21b85eb0c8cd54f074a4af31b4411ff6a60c9719dbd559c221c8ac3492d9d872b041d703d1b5aadf3154a261abdd9086fc627b61efca26ae5702701d05cd2305f7c52a2fc8')
t.equal(ethUtil.bufferToHex(utils.hashStruct(typedData.primaryType, typedData.message, typedData.types)),
'0xc52c0ee5d84264471806290a3f2c4cecfc5490626bf912d01f240d7a274b371e')
t.equal(ethUtil.bufferToHex(utils.hashStruct('EIP712Domain', typedData.domain, typedData.types)),
'0xf2cee375fa42b42143804025fc449deafd50cc031ca257e0b194a650a912090f')
t.equal(ethUtil.bufferToHex(utils.sign(typedData)),
'0xbe609aee343fb3c4b28e1df9e632fca64fcfaede20f02e86244efddf30957bd2')
t.equal(ethUtil.bufferToHex(address), '0xcd2a3d9f938e13cd947ec05abc7fe734df8dd826')
t.equal(sig, '0x4355c47d63924e8a72e509b65029052eb6c299d53a04e167c5775fd466751c9d07299936d304c153f6443dfa05f40ff007d72911b6f72307f996231605b915621c')
})
>>>>>>>
}
const bob = {
ethereumPrivateKey: '7e5374ec2ef0d91761a6e72fdf8f6ac665519bfdf6da0a2329cf0d804514b816',
encryptionPrivateKey: 'flN07C7w2Rdhpucv349qxmVRm/322gojKc8NgEUUuBY=',
encryptionPublicKey: 'C5YMNdqE4kLgxQhJO1MfuQcHP5hjVSXzamzd/TxlR0U=' }
const secretMessage = {data:'My name is Satoshi Buterin'};
const encryptedData = { version: 'x25519-xsalsa20-poly1305',
nonce: '1dvWO7uOnBnO7iNDJ9kO9pTasLuKNlej',
ephemPublicKey: 'FBH1/pAEHOOW14Lu3FWkgV3qOEcuL78Zy+qW1RwzMXQ=',
ciphertext: 'f8kBcl/NCyf3sybfbwAKk/np2Bzt9lRVkZejr6uh5FgnNlH/ic62DZzy' };
test("Getting bob's encryptionPublicKey", async t => {
t.plan(1);
const result = await sigUtil.getEncryptionPublicKey(bob.ethereumPrivateKey)
t.equal(result, bob.encryptionPublicKey);
});
//encryption test
test("Alice encrypts message with bob's encryptionPublicKey", async t => {
t.plan(4);
const result = await sigUtil.encrypt(
bob.encryptionPublicKey,
secretMessage,
'x25519-xsalsa20-poly1305'
);
console.log("RESULT", result)
t.ok(result.version);
t.ok(result.nonce);
t.ok(result.ephemPublicKey);
t.ok(result.ciphertext);
});
// decryption test
test("Bob decrypts message that Alice sent to him", t => {
t.plan(1);
const result = sigUtil.decrypt(encryptedData, bob.ethereumPrivateKey);
t.equal(result, secretMessage.data);
});
test('Decryption failed because version is wrong or missing', t =>{
t.plan(1)
const badVersionData = { version: 'x256k1-aes256cbc',
nonce: '1dvWO7uOnBnO7iNDJ9kO9pTasLuKNlej',
ephemPublicKey: 'FBH1/pAEHOOW14Lu3FWkgV3qOEcuL78Zy+qW1RwzMXQ=',
ciphertext: 'f8kBcl/NCyf3sybfbwAKk/np2Bzt9lRVkZejr6uh5FgnNlH/ic62DZzy' };
t.throws( function() { sigUtil.decrypt(badVersionData, bob.ethereumPrivateKey)}, 'Encryption type/version not supported.')
});
test('Decryption failed because nonce is wrong or missing', t => {
t.plan(1);
//encrypted data
const badNonceData = { version: 'x25519-xsalsa20-poly1305',
nonce: '',
ephemPublicKey: 'FBH1/pAEHOOW14Lu3FWkgV3qOEcuL78Zy+qW1RwzMXQ=',
ciphertext: 'f8kBcl/NCyf3sybfbwAKk/np2Bzt9lRVkZejr6uh5FgnNlH/ic62DZzy' };
t.throws(function() { sigUtil.decrypt(badNonceData, bob.ethereumPrivateKey)}, 'Decryption failed.')
});
test('Decryption failed because ephemPublicKey is wrong or missing', t => {
t.plan(1);
//encrypted data
const badEphemData = { version: 'x25519-xsalsa20-poly1305',
nonce: '1dvWO7uOnBnO7iNDJ9kO9pTasLuKNlej',
ephemPublicKey: 'FFFF/pAEHOOW14Lu3FWkgV3qOEcuL78Zy+qW1RwzMXQ=',
ciphertext: 'f8kBcl/NCyf3sybfbwAKk/np2Bzt9lRVkZejr6uh5FgnNlH/ic62DZzy' };
t.throws(function() { sigUtil.decrypt(badEphemData, bob.ethereumPrivateKey)}, 'Decryption failed.')
});
test('Decryption failed because cyphertext is wrong or missing', async t => {
t.plan(1);
//encrypted data
const badCypherData = { version: 'x25519-xsalsa20-poly1305',
nonce: '1dvWO7uOnBnO7iNDJ9kO9pTasLuKNlej',
ephemPublicKey: 'FBH1/pAEHOOW14Lu3FWkgV3qOEcuL78Zy+qW1RwzMXQ=',
ciphertext: 'ffffff/NCyf3sybfbwAKk/np2Bzt9lRVkZejr6uh5FgnNlH/ic62DZzy' };
t.throws(function() { sigUtil.decrypt(badEphemData, bob.ethereumPrivateKey)}, 'Decryption failed.')
});
test("Decryption fails because you are not the recipient", t => {
t.plan(1);
t.throws(function() { sigUtil.decrypt(encryptedData, alice.ethereumPrivateKey)}, 'Decryption failed.')
});
test('signedTypeData', (t) => {
t.plan(8)
const utils = sigUtil.TypedDataUtils
const privateKey = ethUtil.sha3('cow')
const address = ethUtil.privateToAddress(privateKey)
const sig = sigUtil.signTypedData(privateKey, { data: typedData })
t.equal(utils.encodeType('Mail', typedData.types),
'Mail(Person from,Person to,string contents)Person(string name,address wallet)')
t.equal(ethUtil.bufferToHex(utils.hashType('Mail', typedData.types)),
'0xa0cedeb2dc280ba39b857546d74f5549c3a1d7bdc2dd96bf881f76108e23dac2')
t.equal(ethUtil.bufferToHex(utils.encodeData(typedData.primaryType, typedData.message, typedData.types)),
'0xa0cedeb2dc280ba39b857546d74f5549c3a1d7bdc2dd96bf881f76108e23dac2fc71e5fa27ff56c350aa531bc129ebdf613b772b6604664f5d8dbe21b85eb0c8cd54f074a4af31b4411ff6a60c9719dbd559c221c8ac3492d9d872b041d703d1b5aadf3154a261abdd9086fc627b61efca26ae5702701d05cd2305f7c52a2fc8')
t.equal(ethUtil.bufferToHex(utils.hashStruct(typedData.primaryType, typedData.message, typedData.types)),
'0xc52c0ee5d84264471806290a3f2c4cecfc5490626bf912d01f240d7a274b371e')
t.equal(ethUtil.bufferToHex(utils.hashStruct('EIP712Domain', typedData.domain, typedData.types)),
'0xf2cee375fa42b42143804025fc449deafd50cc031ca257e0b194a650a912090f')
t.equal(ethUtil.bufferToHex(utils.sign(typedData)),
'0xbe609aee343fb3c4b28e1df9e632fca64fcfaede20f02e86244efddf30957bd2')
t.equal(ethUtil.bufferToHex(address), '0xcd2a3d9f938e13cd947ec05abc7fe734df8dd826')
t.equal(sig, '0x4355c47d63924e8a72e509b65029052eb6c299d53a04e167c5775fd466751c9d07299936d304c153f6443dfa05f40ff007d72911b6f72307f996231605b915621c')
}) |
<<<<<<<
const indentString = require('indent-string')
=======
const mkdirp = require('mkdirp')
// https://github.com/englercj/tsd-jsdoc/issues/64#issuecomment-462020832
>>>>>>>
const indentString = require('indent-string')
const mkdirp = require('mkdirp')
<<<<<<<
// Write out to types.d.ts file in /lib
fs.writeFileSync(OUTPUT_PATH, newContent)
=======
export = analytics;`
mkdirp(path.dirname(OUTPUT_PATH), function (err) {
if (err) console.error(err)
fs.writeFileSync(OUTPUT_PATH, newContent)
})
>>>>>>>
mkdirp(path.dirname(OUTPUT_PATH), function (err) {
if (err) console.error(err)
fs.writeFileSync(OUTPUT_PATH, newContent)
}) |
<<<<<<<
system = env.get('BADGES_SYSTEM'),
Client = require('badgekit-api-client');
=======
system = config.BADGES_SYSTEM,
Client = require('badgekit-api-client'),
jade = require('jade');
>>>>>>>
system = env.get('BADGES_SYSTEM'),
Client = require('badgekit-api-client'),
jade = require('jade'); |
<<<<<<<
// Remember: Backbone 0.9.2 stable version has a memory issue on remove()
this.discoverView.remove();
if (!this.$el.find(this.searchView).length) {
this.$el.append(this.searchView.el);
=======
this.discover.remove();
if (!this.$el.find(this.search).length) {
this.$el.append(this.search.el);
>>>>>>>
this.discoverView.remove();
if (!this.$el.find(this.searchView).length) {
this.$el.append(this.searchView.el); |
<<<<<<<
import Tombstone from './Modules/Talents/Tombstone';
import Voracious from './Modules/Talents/Voracious';
import RapidDecomposition from './Modules/Talents/RapidDecomposition';
=======
import WillOfTheNecropolis from './Modules/Talents/WillOfTheNecropolis';
>>>>>>>
import Tombstone from './Modules/Talents/Tombstone';
import Voracious from './Modules/Talents/Voracious';
import RapidDecomposition from './Modules/Talents/RapidDecomposition';
import WillOfTheNecropolis from './Modules/Talents/WillOfTheNecropolis';
<<<<<<<
tombstone: Tombstone,
voracious: Voracious,
rapidDecomposition: RapidDecomposition,
=======
willOfTheNecropolis: WillOfTheNecropolis,
>>>>>>>
tombstone: Tombstone,
voracious: Voracious,
rapidDecomposition: RapidDecomposition,
willOfTheNecropolis: WillOfTheNecropolis, |
<<<<<<<
<draggable v-show="suite.tasks.length > 0 || AppStatus.editMode" element="ul"
:options="{filter:'.no-draggable', group:'tasks'}"
class="collapsible no-margin"
data-collapsible="accordion"
v-model="suite.tasks"
:move="checkMove">
=======
<draggable v-else class="collapsible task-list" data-collapsible="accordion" element="ul" v-bind:options="draggableOptions" v-model="draggableTasks" @start="onDragStart" @end="onDragEnd">
>>>>>>>
<draggable v-else element="ul"
:options="{filter:'.no-draggable', group:'tasks'}"
class="collapsible no-margin task-list"
data-collapsible="accordion"
v-model="suite.tasks"
@start="onDragStart"
:move="checkMove">
<<<<<<<
<task-card v-bind:task="task" v-on:remove="removeTask(i)" v-on:edit="editTask(i, $event)" v-bind:event="event"></task-card>
=======
<task-card v-bind:task="task" v-on:remove="removeTask(i)" @edit="editTask(i, $event)" v-bind:event="event"></task-card>
>>>>>>>
<task-card v-bind:task="task" v-on:remove="removeTask(i)" @edit="editTask(i, $event)" v-bind:event="event"></task-card>
<<<<<<<
checkMove(evt) {
return AppStatus.editMode && !(evt.related.classList.contains('no-draggable') && evt.willInsertAfter);
=======
onDragStart(){
this.event.emit("collapseTask");
},
onDragEnd(ev) {
const tasks = this.suite.tasks;
const movedTask = tasks[ev.oldIndex];
tasks.splice(ev.oldIndex, 1);
tasks.splice(ev.newIndex, 0, movedTask);
tasks.forEach((task, index) => {
this.editTask(index, task);
});
>>>>>>>
checkMove(evt) {
return !(evt.related.classList.contains('no-draggable') && evt.willInsertAfter);
},
onDragStart(){
this.event.emit("collapseTask");
<<<<<<<
hideMessage() {
return this.suite.tasks.length === 0 && !AppStatus.editMode;
=======
emptySuite() {
return this.suite.tasks.length === 0 && !AppStatus.editMode;
},
draggableTasks() {
return this.suite.tasks;
>>>>>>>
emptySuite() {
return this.suite.tasks.length === 0 && !AppStatus.editMode; |
<<<<<<<
import Circle from './circle';
=======
import Shape from './shape';
>>>>>>>
import Circle from './circle';
import Shape from './shape';
<<<<<<<
function Shape(color, path) {
this.type = "Shape";
this.guid = guid();
this.properties = {};
this.properties[rtv.frame] = {c: color, path: path, v: false, w: 1, h: 1, r: 0};
this.selected_indices = [];
this.duplicate = function() {
if (this.selected_indices.length == 0) {
return;
}
let newc = new Shape(null, null);
newc.properties[rtv.frame] = copy(this.properties[rtv.frame]);
// select all indices for next one
for (let i = 0; i < newc.properties[rtv.frame].path.length; i++) {
newc.selected_indices.push(i);
}
this.selected_indices = [];
rtv.objs.push(newc);
}
this.hidden = function() {
if (!this.properties[rtv.frame]) {
return true;
}
return this.properties[rtv.frame].c[3] == 0;
}
this.copy_properties = function(f, n) {
this.properties[n] = copy(this.properties[f]);
}
this.hide = function() {
if (this.selected_indices.length != 0) {
if (this.properties[rtv.frame].c[3] == 1) {
this.properties[rtv.frame].c[3] = 0;
} else {
this.properties[rtv.frame].c[3] = 1;
}
this.selected_indices = [];
}
}
this.select = function() {
this.selected_indices = [];
for (let i = 0; i < this.properties[rtv.frame].path.length; i++) {
this.selected_indices.push(i);
}
}
this.is_selected = function() {
return this.selected_indices.length > 0;
}
this.set_color = function(rgba) {
if (this.selected_indices.length != 0) {
rgba[3] = this.properties[rtv.frame].c[3];
this.properties[rtv.frame].c = rgba;
}
}
this.clear_props = function(f) {
delete this.properties[f];
}
this.clear_all_props = function() {
if (this.selected_indices.length == 0) {
return;
}
for (var key in this.properties) {
if (key != rtv.frame) {
delete this.properties[key];
}
}
}
this.del_props_before = function() {
if (this.selected_indices.length == 0) {
return;
}
if (this.properties && this.properties[rtv.frame-1]) {
delete this.properties[rtv.frame-1];
}
}
this.add_point = function(p) {
let props = this.properties[rtv.frame];
let path = props.path;
path.push(p);
}
this.closest_point_idx = function() {
let props = this.properties[rtv.frame];
let path = props.path;
for (let i = 0; i < path.length; i++) {
let p = path[i];
if (distance(p, rtv.mouse.pos) < GRID_SIZE/8) {
return i;
}
}
return -1;
}
this.in_rect = function(x, y, x2, y2) {
// select individual points
let props = this.properties[rtv.frame];
if (this.hidden()) {
return;
}
let path = props.path;
this.selected_indices = [];
let found = false;
for (let i = 0; i < path.length; i++) {
let p = path[i];
if (p.x > x && p.x < x2 && p.y > y && p.y < y2) {
this.selected_indices.push(i);
found = true;
}
}
return found;
}
this.onkeydown = function(evt) {
let key = evt.key;
if (this.selected_indices.length != 0) {
this.properties[rtv.frame] = transform_props(key, this.properties[rtv.frame]);
}
return false;
}
this.mouse_down = function(evt) {
if (this.hidden()) {
return false;
}
// try to selected one
let idx = this.closest_point_idx();
if (idx != -1) {
this.selected_indices = [idx];
return true;
}
return false;
}
this.mouse_drag = function(evt) {
if (this.selected_indices.length > 0) {
let props = this.properties[rtv.frame];
let path = props.path;
if (rtv.tool == "select") {
// move all
let offset = {x: rtv.mouse.grid.x - rtv.mouse.gridLast.x,
y: rtv.mouse.grid.y - rtv.mouse.gridLast.y};
for (let i = 0; i < this.selected_indices.length; i++) {
let idx = this.selected_indices[i];
let p = path[idx];
path[idx] = {x: p.x + offset.x, y: p.y + offset.y};
}
}
}
}
this.mouse_up = function(evt) {
if (!rtv.keys.shift) {
this.selected_indices = [];
}
}
this.bezier = function(points, off, t) {
let x = points[0].x - off.x;
let y = points[0].y - off.y;
let c = 0;
let N = points.length;
for (let i = 0; i < N; i++) {
c = math.factorial(N) / (math.factorial(N-i) * math.factorial(i));
c *= math.pow(1-t, N-i) * math.pow(t, i);
x += c * (points[i].x - off.x);
y += c * (points[i].y - off.y);
}
return [x, y];
}
this.draw_path = function(props) {
let path = props.path;
let c = {x: 0, y: 0};
for (let i = 0; i < path.length; i++) {
c.x += path[i].x;
c.y += path[i].y;
}
c.x /= path.length;
c.y /= path.length;
rtv.ctx.translate(c.x, c.y);
rtv.ctx.rotate(props.r);
rtv.ctx.scale(props.w, props.h);
let idx = this.closest_point_idx();
let hidden = this.hidden();
for (let i = 0; i < path.length; i++) {
let p = path[i];
if (i == 0) {
rtv.ctx.moveTo(p.x - c.x, p.y - c.y);
} else {
rtv.ctx.lineTo(p.x - c.x, p.y - c.y);
}
// show selected indices
if (!rtv.presenting && !hidden && (this.selected_indices.indexOf(i) != -1 || i == idx)) {
rtv.ctx.strokeStyle = DARK;
rtv.ctx.strokeRect(p.x- c.x -GRID_SIZE/2, p.y - c.y - GRID_SIZE/2, GRID_SIZE, GRID_SIZE);
}
}
if (this.selected_indices.length > 0) {
// render side lengths while dragging
for (let i = 0; i < path.length - 1; i++) {
let p1 = path[i];
let p2 = path[i+1];
let b = between(p1, p2);
let d = distance(p1, p2) / GRID_SIZE;
d = Math.round(d * 10) / 10;
rtv.ctx.fillText(d, b.x - c.x, b.y - c.y);
}
}
if (this.properties[rtv.frame].v && path.length >= 2) {
// vector
let b = path[path.length-2];
let a = path[path.length-1];
let theta = Math.atan2(a.y - b.y, a.x - b.x);
rtv.ctx.moveTo(a.x - c.x, a.y - c.y);
rtv.ctx.lineTo(a.x - c.x + Math.cos(theta - Math.PI*3/4) * GRID_SIZE/2, a.y - c.y + Math.sin(theta - Math.PI*3/4) * GRID_SIZE/2);
rtv.ctx.moveTo(a.x - c.x, a.y - c.y);
rtv.ctx.lineTo(a.x - c.x + Math.cos(theta + Math.PI*3/4) * GRID_SIZE/2, a.y - c.y + Math.sin(theta + Math.PI*3/4) * GRID_SIZE/2);
}
}
this.generate_javascript = function() {
let cp = rtv.cam.properties[rtv.frame].p;
let props = this.properties[rtv.frame];
let path = props.path;
let c = {x: 0, y: 0};
for (let i = 0; i < path.length; i++) {
c.x += path[i].x;
c.y += path[i].y;
}
c.x /= path.length;
c.y /= path.length;
js = "";
js += "ctx.save();\n";
js += "ctx.globalAlpha = " + props.c[3] + ";\n";
js += "ctx.strokeStyle = \"" + rgbToHex(props.c) + "\";\n";
js += "ctx.translate(x + " + (c.x - cp.x) + ", y + " + (c.y - cp.y) + ");\n";
js += "ctx.rotate(" + props.r + ");\n";
js += "ctx.scale(" + props.w + ", " + props.h + ");\n";
js += "ctx.beginPath();\n";
for (let i = 0; i < path.length; i++) {
let p = path[i];
if (i == 0) {
js += "ctx.moveTo(" + (p.x - c.x) + ", " + (p.y - c.y) + ");\n";
} else {
js += "ctx.lineTo(" + (p.x - c.x) + ", " + (p.y - c.y) + ");\n";
}
}
js += "ctx.restore();\n";
js += "ctx.stroke();\n";
return js;
}
this.render = function(ctx) {
let a = this.properties[rtv.frame];
let b = this.properties[rtv.next_frame];
if (!a) {
return;
}
let props;
if (rtv.transition.transitioning) {
props = interpolate(a, b);
} else {
props = a;
}
ctx.save();
ctx.beginPath();
ctx.globalAlpha = props.c[3];
ctx.strokeStyle = rgbToHex(props.c);
this.draw_path(props);
ctx.stroke();
ctx.restore();
}
}
=======
function Circle(color, pos) {
this.type = "Circle";
this.guid = guid();
this.properties = {};
this.properties[rtv.frame] = {p: pos, c: color, fill:[0,0,0,0], a_s:0, a_e: Math.PI*2.0, w: 1, h: 1, r: 0};
this.selected = false;
this.select = function() {
this.selected = true;
}
this.is_selected = function() {
return this.selected;
}
this.hidden = function() {
if (!this.properties[rtv.frame]) {
return true;
}
return this.properties[rtv.frame].c[3] == 0;
}
this.copy_properties = function(f, n) {
this.properties[n] = copy(this.properties[f]);
}
this.duplicate = function() {
if (!this.selected) {
return;
}
let newc = new Circle(null, null);
newc.properties[rtv.frame] = copy(this.properties[rtv.frame]);
newc.selected = true;
this.selected = false;
rtv.objs.push(newc);
}
this.hide = function() {
if (this.selected) {
if (this.properties[rtv.frame].c[3] == 1) {
this.properties[rtv.frame].c[3] = 0;
} else {
this.properties[rtv.frame].c[3] = 1;
}
this.selected = false;
}
}
this.set_color = function(rgba) {
if (this.selected) {
rgba[3] = this.properties[rtv.frame].c[3];
this.properties[rtv.frame].c = rgba;
}
}
this.clear_props = function(f) {
delete this.properties[f];
}
this.clear_all_props = function() {
if (!this.selected) {
return;
}
for (var key in this.properties) {
if (key != rtv.frame) {
delete this.properties[key];
}
}
}
this.del_props_before = function() {
if (!this.selected) {
return;
}
if (this.properties && this.properties[rtv.frame-1]) {
delete this.properties[rtv.frame-1];
}
}
this.near_mouse = function () {
let props = this.properties[rtv.frame];
if (!props) {
return false;
}
return distance(props.p, rtv.mouse.pos) < GRID_SIZE/2
}
this.in_rect = function(x, y, x2, y2) {
if (this.hidden()) {
return false;
}
let props = this.properties[rtv.frame];
let p = props.p;
if (p.x > x && p.x < x2 && p.y > y && p.y < y2) {
this.selected = true;
return true;
}
return false;
}
this.onkeydown = function(evt) {
if (!this.selected) {
return false;
}
let key = evt.key;
if (rtv.keys.ctrl) {
let p = this.properties[rtv.frame];
let step = Math.PI/12;
if (key == "u") {
p.a_s += step;
} else if (key == "o") {
p.a_s -= step;
} else if (key == "j") {
p.a_e -= step;
} else if (key == "l") {
p.a_e += step;
}
} else {
this.properties[rtv.frame] = transform_props(key, this.properties[rtv.frame]);
}
return false;
}
this.mouse_down = function(evt) {
if (this.hidden()) {
return false;
}
// try to selected one
if (this.near_mouse()) {
this.selected = true;
return true;
}
return false;
}
this.mouse_drag = function(evt) {
if (this.selected && rtv.tool == "select") {
// move
let props = this.properties[rtv.frame];
let offset = {x: rtv.mouse.grid.x - rtv.mouse.gridLast.x,
y: rtv.mouse.grid.y - rtv.mouse.gridLast.y};
let p = props.p;
this.properties[rtv.frame].p = {x: p.x + offset.x, y: p.y + offset.y};
}
}
this.mouse_up = function(evt) {
if (!rtv.keys.shift) {
this.selected = false;
}
}
this.draw_ellipse = function(props, ctx) {
let p = props.p;
ctx.save();
ctx.translate(p.x, p.y);
ctx.rotate(props.r);
ctx.scale(props.w, props.h);
ctx.arc(0, 0, 20, props.a_s, props.a_e, false);
ctx.restore();
}
this.generate_javascript = function() {
let props = this.properties[rtv.frame];
let p = props.p;
let cp = rtv.cam.properties[rtv.frame].p;
let js = "";
js += "ctx.save();\n"
js += "ctx.beginPath();\n";
js += "ctx.translate(x + " + (p.x - cp.x) + ", y + " + (p.y - cp.y) + ");\n"
js += "ctx.rotate(" + props.r + ");\n"
js += "ctx.scale(" + props.w + ", " + props.h +");\n"
js += "ctx.arc(0, 0, 20, " + props.a_s + ", " + props.a_e + ", false);\n";
js += "ctx.globalAlpha = " + props.c[3] + ";\n";
js += "ctx.strokeStyle = \"" + rgbToHex(props.c) + "\";\n";
js += "ctx.restore();\n";
js += "ctx.stroke();\n";
return js;
}
this.render = function(ctx) {
let a = this.properties[rtv.frame];
let b = this.properties[rtv.next_frame];
if (!a) {
return;
}
let props;
if (rtv.transition.transitioning) {
props = interpolate(a, b);
} else {
props = a;
}
ctx.beginPath();
this.draw_ellipse(props, ctx);
ctx.save();
ctx.fillStyle = rgbToHex(props.fill);
ctx.globalAlpha = math.min(props.fill[3], props.c[3]);
ctx.fill();
ctx.globalAlpha = props.c[3];
ctx.strokeStyle = rgbToHex(props.c);
ctx.stroke();
ctx.restore();
if (!rtv.presenting && props.c[3] != 0 && (this.selected || this.near_mouse())) {
ctx.beginPath();
ctx.strokeStyle = DARK;
ctx.strokeRect(props.p.x - GRID_SIZE/4, props.p.y - GRID_SIZE/4, GRID_SIZE/2, GRID_SIZE/2);
ctx.stroke();
}
}
}
>>>>>>> |
<<<<<<<
var pageMetadata = pageMap[ pageMapKey ][ mode ];
if( ! pageMetadata ) return next( new Error( "Could not find pageKey " + pageMapKey + " in page key map." ) );
=======
var pageMetadata = pageMap[ pageMapKey ];//[ mode ];
>>>>>>>
var pageMetadata = pageMap[ pageMapKey ];//[ mode ];
if( ! pageMetadata ) return next( new Error( "Could not find pageKey " + pageMapKey + " in page key map." ) ); |
<<<<<<<
var c = options.getProviderOptions("twitter") || options.getProviderOptions("twitter.status");
var uri = url.parse("https://api.twitter.com/1.1/statuses/oembed.json");
uri.query = {
=======
var url = "https://api.twitter.com/1.1/statuses/oembed.json";
var qs = {
>>>>>>>
var c = options.getProviderOptions("twitter") || options.getProviderOptions("twitter.status");
var url = "https://api.twitter.com/1.1/statuses/oembed.json";
var qs = {
<<<<<<<
oembed["min-width"] = c["min-width"];
oembed["max-width"] = c["max-width"];
cb(null, {
title: oembed.title,
twitter_oembed: oembed
});
=======
cb(null, {
title: oembed.title,
twitter_oembed: oembed
>>>>>>>
oembed["min-width"] = c["min-width"];
oembed["max-width"] = c["max-width"];
cb(null, {
twitter_oembed: oembed |
<<<<<<<
var system = new System(this.world, attributes);
if (system.init) system.init(attributes);
=======
var system = new SystemClass(this.world, attributes);
if (system.init) system.init();
>>>>>>>
var system = new SystemClass(this.world, attributes);
if (system.init) system.init(attributes); |
<<<<<<<
});
test("passes attributes to system.init", t => {
var world = new World();
var mockAttributes = { test: 10 };
var initArg1;
class mockSystem {
init(attributes) {
initArg1 = attributes;
}
}
world.registerSystem(mockSystem, mockAttributes);
t.is(initArg1, mockAttributes);
=======
});
test("registerSystems with different systems matching names", t => {
let world = new World();
function importSystemA() {
class SystemWithCommonName extends System {}
return SystemWithCommonName;
}
function importSystemB() {
class SystemWithCommonName extends System {}
return SystemWithCommonName;
}
let SystemA = importSystemA();
let SystemB = importSystemB();
world.registerSystem(SystemA);
t.is(world.systemManager._systems.length, 1);
world.registerSystem(SystemB);
t.is(world.systemManager._systems.length, 2);
// Can't register twice the same system
world.registerSystem(SystemA);
t.is(world.systemManager._systems.length, 2);
>>>>>>>
});
test("passes attributes to system.init", t => {
var world = new World();
var mockAttributes = { test: 10 };
var initArg1;
class mockSystem {
init(attributes) {
initArg1 = attributes;
}
}
world.registerSystem(mockSystem, mockAttributes);
t.is(initArg1, mockAttributes);
});
test("registerSystems with different systems matching names", t => {
let world = new World();
function importSystemA() {
class SystemWithCommonName extends System {}
return SystemWithCommonName;
}
function importSystemB() {
class SystemWithCommonName extends System {}
return SystemWithCommonName;
}
let SystemA = importSystemA();
let SystemB = importSystemB();
world.registerSystem(SystemA);
t.is(world.systemManager._systems.length, 1);
world.registerSystem(SystemB);
t.is(world.systemManager._systems.length, 2);
// Can't register twice the same system
world.registerSystem(SystemA);
t.is(world.systemManager._systems.length, 2); |
<<<<<<<
, soundcloud: {
login: ''
, password: ''
}
=======
, mailchimp: {
login: ''
, password: ''
}
>>>>>>>
, soundcloud: {
login: ''
, password: ''
}
, mailchimp: {
login: ''
, password: ''
} |
<<<<<<<
var usersByGoogleHybridId = {};
=======
var usersByReadabilityId = {};
>>>>>>>
var usersByGoogleHybridId = {};
var usersByReadabilityId = {};
<<<<<<<
everyauth.googlehybrid
.myHostname('http://local.host:3000')
.consumerKey(conf.google.clientId)
.consumerSecret(conf.google.clientSecret)
.scope(['http://docs.google.com/feeds/','http://spreadsheets.google.com/feeds/'])
.findOrCreateUser( function(session, userAttributes) {
return usersByGoogleHybridId[userAttributes.claimedIdentifier] || (usersByGoogleHybridId[userAttributes.claimedIdentifier] = userAttributes);
})
.redirectPath('/')
=======
everyauth.readability
.myHostname('http://local.host:3000')
.consumerKey(conf.readability.consumerKey)
.consumerSecret(conf.readability.consumerSecret)
.findOrCreateUser( function (sess, accessToken, accessSecret, reader) {
return usersByReadabilityId[reader.id] || (usersByReadabilityId[reader.id] = reader);
})
.redirectPath('/');
>>>>>>>
everyauth.googlehybrid
.myHostname('http://local.host:3000')
.consumerKey(conf.google.clientId)
.consumerSecret(conf.google.clientSecret)
.scope(['http://docs.google.com/feeds/','http://spreadsheets.google.com/feeds/'])
.findOrCreateUser( function(session, userAttributes) {
return usersByGoogleHybridId[userAttributes.claimedIdentifier] || (usersByGoogleHybridId[userAttributes.claimedIdentifier] = userAttributes);
})
.redirectPath('/')
everyauth.readability
.myHostname('http://local.host:3000')
.consumerKey(conf.readability.consumerKey)
.consumerSecret(conf.readability.consumerSecret)
.findOrCreateUser( function (sess, accessToken, accessSecret, reader) {
return usersByReadabilityId[reader.id] || (usersByReadabilityId[reader.id] = reader);
})
.redirectPath('/'); |
<<<<<<<
var usersByVimeoId = {};
=======
var usersByJustintvId = {};
>>>>>>>
var usersByVimeoId = {};
var usersByJustintvId = {};
<<<<<<<
everyauth
.vimeo
.consumerKey(conf.vimeo.consumerKey)
.consumerSecret(conf.vimeo.consumerSecret)
.findOrCreateUser( function (sess, accessToken, accessSecret, vimeoUser) {
return usersByVimeoId[vimeoUser.id] ||
(usersByVimeoId[vimeoUser.id] = vimeoUser);
})
.redirectPath('/')
=======
everyauth.justintv
.consumerKey(conf.justintv.consumerKey)
.consumerSecret(conf.justintv.consumerSecret)
.findOrCreateUser( function (sess, accessToken, accessSecret, justintvUser) {
return usersByJustintvId[justintvUser.id] ||
(usersByJustintvId[justintvUser.id] = justintvUser);
})
.redirectPath('/')
>>>>>>>
everyauth.vimeo
.consumerKey(conf.vimeo.consumerKey)
.consumerSecret(conf.vimeo.consumerSecret)
.findOrCreateUser( function (sess, accessToken, accessSecret, vimeoUser) {
return usersByVimeoId[vimeoUser.id] ||
(usersByVimeoId[vimeoUser.id] = vimeoUser);
})
.redirectPath('/')
everyauth.justintv
.consumerKey(conf.justintv.consumerKey)
.consumerSecret(conf.justintv.consumerSecret)
.findOrCreateUser( function (sess, accessToken, accessSecret, justintvUser) {
return usersByJustintvId[justintvUser.id] ||
(usersByJustintvId[justintvUser.id] = justintvUser);
})
.redirectPath('/') |
<<<<<<<
import Nightstalker from './modules/talents/Nightstalker';
import Subterfuge from './modules/talents/Subterfuge';
import MasterAssassin from './modules/talents/MasterAssassin';
=======
import MasterPoisoner from './modules/talents/MasterPoisoner';
>>>>>>>
import MasterPoisoner from './modules/talents/MasterPoisoner';
import Nightstalker from './modules/talents/Nightstalker';
import Subterfuge from './modules/talents/Subterfuge';
import MasterAssassin from './modules/talents/MasterAssassin';
<<<<<<<
nightstalker: Nightstalker,
subterfuge: Subterfuge,
masterAssassin: MasterAssassin,
=======
masterPoisoner: MasterPoisoner,
>>>>>>>
masterPoisoner: MasterPoisoner,
nightstalker: Nightstalker,
subterfuge: Subterfuge,
masterAssassin: MasterAssassin, |
<<<<<<<
prevOutput.value = prevOutput.value.trim();
// Repush the previous output
output.push(prevOutput);
=======
// If the previous output is not just whitespace, trim it
if (prevOutput.value.match(/^\s*$/) === null) {
prevOutput.value = prevOutput.value.trimEnd();
// Repush the previous output
output.push(prevOutput);
}
>>>>>>>
prevOutput.value = prevOutput.value.trimEnd();
// Repush the previous output
output.push(prevOutput);
<<<<<<<
prevIntermediateOutput.value = prevIntermediateOutput.value.trim();
// Repush the previous intermediate output
intermediateOutput.push(prevIntermediateOutput);
=======
// If the previous output is not just whitespace, trim it
if (prevIntermediateOutput.value.match(/^\s*$/) === null) {
prevIntermediateOutput.value = prevIntermediateOutput.value.trimEnd();
// Repush the previous intermediate output
intermediateOutput.push(prevIntermediateOutput);
}
>>>>>>>
prevIntermediateOutput.value = prevIntermediateOutput.value.trimEnd();
// Repush the previous intermediate output
intermediateOutput.push(prevIntermediateOutput);
<<<<<<<
nextToken.value = nextToken.value.trim();
// Unshift the next token
tokens.unshift(nextToken);
=======
// If the next token is not just whitespace, trim it
if (nextToken.value.match(/^\s*$/) === null) {
nextToken.value = nextToken.value.trimStart();
// Unshift the next token
tokens.unshift(nextToken);
}
>>>>>>>
nextToken.value = nextToken.value.trimStart();
// Unshift the next token
tokens.unshift(nextToken); |
<<<<<<<
},
batch: function(items, params) {
var size = params.shift(),
fill = params.shift(),
result,
last,
missing;
if (!Twig.lib.is("Array", items)) {
throw new Twig.Error("batch filter expects items to be an array");
}
if (!Twig.lib.is("Number", size)) {
throw new Twig.Error("batch filter expects size to be a number");
}
size = Math.ceil(size);
result = Twig.lib.chunkArray(items, size);
if (fill && items.length % size != 0) {
last = result.pop();
missing = size - last.length;
while (missing--) {
last.push(fill);
}
result.push(last);
}
return result;
=======
},
round: function(value, params) {
params = params || [];
var precision = params.length > 0 ? params[0] : 0,
method = params.length > 1 ? params[1] : "common";
value = parseFloat(value);
if(precision && !Twig.lib.is("Number", precision)) {
throw new Twig.Error("round filter expects precision to be a number");
}
if (method === "common") {
return Twig.lib.round(value, precision);
}
if(!Twig.lib.is("Function", Math[method])) {
throw new Twig.Error("round filter expects method to be 'floor', 'ceil', or 'common'");
}
return Math[method](value * Math.pow(10, precision)) / Math.pow(10, precision);
>>>>>>>
},
batch: function(items, params) {
var size = params.shift(),
fill = params.shift(),
result,
last,
missing;
if (!Twig.lib.is("Array", items)) {
throw new Twig.Error("batch filter expects items to be an array");
}
if (!Twig.lib.is("Number", size)) {
throw new Twig.Error("batch filter expects size to be a number");
}
size = Math.ceil(size);
result = Twig.lib.chunkArray(items, size);
if (fill && items.length % size != 0) {
last = result.pop();
missing = size - last.length;
while (missing--) {
last.push(fill);
}
result.push(last);
}
return result;
},
round: function(value, params) {
params = params || [];
var precision = params.length > 0 ? params[0] : 0,
method = params.length > 1 ? params[1] : "common";
value = parseFloat(value);
if(precision && !Twig.lib.is("Number", precision)) {
throw new Twig.Error("round filter expects precision to be a number");
}
if (method === "common") {
return Twig.lib.round(value, precision);
}
if(!Twig.lib.is("Function", Math[method])) {
throw new Twig.Error("round filter expects method to be 'floor', 'ceil', or 'common'");
}
return Math[method](value * Math.pow(10, precision)) / Math.pow(10, precision); |
<<<<<<<
if (typeof console !== "undefined" &&
typeof console.log !== "undefined") {
Twig.log.error = function() {
console.log.apply(console, arguments);
=======
if (typeof console !== "undefined") {
if (typeof console.error !== "undefined") {
Twig.log.error = function() {
console.error.apply(console, arguments);
}
} else if (typeof console.log !== "undefined") {
Twig.log.error = function() {
console.log.apply(console, arguments);
}
>>>>>>>
if (typeof console !== "undefined") {
if (typeof console.error !== "undefined") {
Twig.log.error = function() {
console.error.apply(console, arguments);
}
} else if (typeof console.log !== "undefined") {
Twig.log.error = function() {
console.log.apply(console, arguments);
}
<<<<<<<
Twig.Template.prototype.importMacros = function(file) {
var url = parsePath(this, file);
// load remote template
var remoteTemplate = Twig.Templates.loadRemote(url, {
method: this.url?'ajax':'fs',
async: false,
id: url
});
return remoteTemplate;
};
=======
>>>>>>>
Twig.Template.prototype.importMacros = function(file) {
var url = parsePath(this, file);
// load remote template
var remoteTemplate = Twig.Templates.loadRemote(url, {
method: this.url?'ajax':'fs',
async: false,
id: url
});
return remoteTemplate;
};
<<<<<<<
* Generate the canonical version of a url based on the given base path and file path and in
* the previously registered namespaces.
*
* @param {string} template The Twig Template
* @param {string} file The file path, may be relative and may contain namespaces.
*
* @return {string} The canonical version of the path
*/
function parsePath(template, file) {
var namespaces = null;
if (typeof template === 'object' && typeof template.options === 'object') {
namespaces = template.options.namespaces;
}
if (typeof namespaces === 'object' && file.indexOf('::') > 0) {
for (var k in namespaces){
if (namespaces.hasOwnProperty(k)) {
file = file.replace(k + '::', namespaces[k]);
}
}
return file;
}
return relativePath(template, file);
}
/**
=======
* Create safe output
*
* @param {string} Content safe to output
*
* @return {String} Content wrapped into a String
*/
Twig.Markup = function(content) {
if (typeof content === 'string' && content.length > 0) {
content = new String(content);
content.twig_markup = true;
}
return content;
}
/**
>>>>>>>
* Create safe output
*
* @param {string} Content safe to output
*
* @return {String} Content wrapped into a String
*/
Twig.Markup = function(content) {
if (typeof content === 'string' && content.length > 0) {
content = new String(content);
content.twig_markup = true;
}
return content;
};
/**
* Generate the canonical version of a url based on the given base path and file path and in
* the previously registered namespaces.
*
* @param {string} template The Twig Template
* @param {string} file The file path, may be relative and may contain namespaces.
*
* @return {string} The canonical version of the path
*/
function parsePath(template, file) {
var namespaces = null;
if (typeof template === 'object' && typeof template.options === 'object') {
namespaces = template.options.namespaces;
}
if (typeof namespaces === 'object' && file.indexOf('::') > 0) {
for (var k in namespaces){
if (namespaces.hasOwnProperty(k)) {
file = file.replace(k + '::', namespaces[k]);
}
}
return file;
}
return relativePath(template, file);
}
/** |
<<<<<<<
<div className='home-wrapper' key={this.props.view}>
<Footer></Footer>
<div className='home-body'>
=======
<div className="home-wrapper" key={this.props.view}>
<div className="home-body">
>>>>>>>
<div className='home-wrapper' key={this.props.view}>
<Footer/>
<div className='home-body'>
<<<<<<<
=======
<Footer/>
>>>>>>> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.