conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
data.state = context.store.getState();
=======
data.chunk = assets[route.chunk] && assets[route.chunk].js;
>>>>>>>
data.state = context.store.getState();
data.chunk = assets[route.chunk] && assets[route.chunk].js; |
<<<<<<<
import { ErrorPageWithoutStyle } from './pages/error/ErrorPage';
import errorPageStyle from './pages/error/ErrorPage.scss';
import passport from './core/passport';
=======
import { ErrorPageWithoutStyle } from './routes/error/ErrorPage';
import errorPageStyle from './routes/error/ErrorPage.css';
import createFetch from './createFetch';
import passport from './passport';
import router from './router';
>>>>>>>
import { ErrorPageWithoutStyle } from './pages/error/ErrorPage';
import errorPageStyle from './pages/error/ErrorPage.scss';
import createFetch from './createFetch';
import passport from './core/passport';
<<<<<<<
=======
import assets from './assets.json'; // eslint-disable-line import/no-unresolved
>>>>>>>
<<<<<<<
import { receiveLogin, receiveLogout } from './actions/user';
import { port, auth } from './config';
import assets from './assets.json'; // eslint-disable-line import/no-unresolved
import theme from './styles/theme.scss';
import cookie from 'react-cookie';
import { Provider } from 'react-redux';
=======
import config from './config';
>>>>>>>
import { receiveLogin, receiveLogout } from './actions/user';
import config from './config';
import assets from './assets.json'; // eslint-disable-line import/no-unresolved
import theme from './styles/theme.scss';
import cookie from 'react-cookie';
import { Provider } from 'react-redux';
<<<<<<<
const token = jwt.sign(user, auth.jwt.secret, { expiresIn });
res.cookie('id_token', token, { maxAge: 1000 * expiresIn, httpOnly: false });
res.json({ id_token: token });
} else {
res.status(401).json({message: 'To login use user/password'});
}
});
=======
const token = jwt.sign(req.user, config.auth.jwt.secret, { expiresIn });
res.cookie('id_token', token, { maxAge: 1000 * expiresIn, httpOnly: true });
res.redirect('/');
},
);
>>>>>>>
const token = jwt.sign(user, config.auth.jwt.secret, { expiresIn });
res.cookie('id_token', token, { maxAge: 1000 * expiresIn, httpOnly: false });
res.json({ id_token: token });
} else {
res.status(401).json({message: 'To login use user/password'});
}
});
<<<<<<<
try {
const store = configureStore({
user: req.user || null,
}, {
cookie: req.headers.cookie,
});
store.dispatch(setRuntimeVariable({
name: 'initialNow',
value: Date.now(),
}));
if (req.user && req.user.login) {
store.dispatch(receiveLogin({
id_token: req.cookies.id_token
}));
} else {
store.dispatch(receiveLogout());
}
const css = new Set();
const data = {
title: 'React Dashboard',
description: 'React Dashboard Starter project based on react-router 4, redux, graphql, bootstrap',
};
// Global (context) variables that can be easily accessed from any React component
// https://facebook.github.io/react/docs/context.html
const context = {
// Enables critical path CSS rendering
// https://github.com/kriasoft/isomorphic-style-loader
insertCss: (...styles) => {
// eslint-disable-next-line no-underscore-dangle
styles.forEach(style => css.add(style._getCss()));
},
// Initialize a new Redux store
// http://redux.js.org/docs/basics/UsageWithReact.html
store,
};
// eslint-disable-next-line no-underscore-dangle
css.add(theme._getCss());
data.scripts = [
assets.vendor.js,
assets.client.js,
];
data.state = context.store.getState();
const html = ReactDOM.renderToString(
<StaticRouter
location={req.url}
context={context}
>
<Provider store={store}>
<App store={store} />
</Provider>
</StaticRouter>,
);
data.styles = [
{ id: 'css', cssText: [...css].join('') },
];
data.children = html;
const markup = ReactDOM.renderToString(
<Html {...data} />,
);
res.status(200);
res.send(`<!doctype html>${markup}`);
} catch (err) {
next(err);
}
});
=======
try {
const css = new Set();
const fetch = createFetch({
baseUrl: config.api.serverUrl,
cookie: req.headers.cookie,
});
const initialState = {
user: req.user || null,
};
const store = configureStore(initialState, {
fetch,
// I should not use `history` on server.. but how I do redirection? follow universal-router
});
store.dispatch(setRuntimeVariable({
name: 'initialNow',
value: Date.now(),
}));
// Global (context) variables that can be easily accessed from any React component
// https://facebook.github.io/react/docs/context.html
const context = {
// Enables critical path CSS rendering
// https://github.com/kriasoft/isomorphic-style-loader
insertCss: (...styles) => {
// eslint-disable-next-line no-underscore-dangle
styles.forEach(style => css.add(style._getCss()));
},
fetch,
// You can access redux through react-redux connect
store,
storeSubscription: null,
};
const route = await router.resolve({
path: req.path,
query: req.query,
fetch,
store,
});
if (route.redirect) {
res.redirect(route.status || 302, route.redirect);
return;
}
const data = { ...route };
data.children = ReactDOM.renderToString(
<App context={context} store={store}>
{route.component}
</App>,
);
data.styles = [
{ id: 'css', cssText: [...css].join('') },
];
data.scripts = [
assets.vendor.js,
assets.client.js,
];
if (assets[route.chunk]) {
data.scripts.push(assets[route.chunk].js);
}
data.app = {
apiUrl: config.api.clientUrl,
state: context.store.getState(),
};
const html = ReactDOM.renderToStaticMarkup(<Html {...data} />);
res.status(route.status || 200);
res.send(`<!doctype html>${html}`);
} catch (err) {
next(err);
}
});
>>>>>>>
try {
const css = new Set();
const fetch = createFetch({
baseUrl: config.api.serverUrl,
cookie: req.headers.cookie,
});
const initialState = {
user: req.user || null,
};
const store = configureStore(initialState, {
fetch,
// I should not use `history` on server.. but how I do redirection? follow universal-router
});
if (req.user && req.user.login) {
store.dispatch(receiveLogin({
id_token: req.cookies.id_token
}));
} else {
store.dispatch(receiveLogout());
}
store.dispatch(setRuntimeVariable({
name: 'initialNow',
value: Date.now(),
}));
// Global (context) variables that can be easily accessed from any React component
// https://facebook.github.io/react/docs/context.html
const context = {
// Enables critical path CSS rendering
// https://github.com/kriasoft/isomorphic-style-loader
insertCss: (...styles) => {
// eslint-disable-next-line no-underscore-dangle
styles.forEach(style => css.add(style._getCss()));
},
fetch,
// You can access redux through react-redux connect
store,
storeSubscription: null,
};
// eslint-disable-next-line no-underscore-dangle
css.add(theme._getCss());
const data = {
title: 'React Dashboard',
description: 'React Dashboard Starter project based on react-router 4, redux, graphql, bootstrap',
};
data.styles = [
{ id: 'css', cssText: [...css].join('') },
];
data.scripts = [
assets.vendor.js,
assets.client.js,
];
data.app = {
apiUrl: config.api.clientUrl,
state: context.store.getState(),
};
const html = ReactDOM.renderToString(
<StaticRouter
location={req.url}
context={context}
>
<Provider store={store}>
<App store={store} />
</Provider>
</StaticRouter>,
);
data.styles = [
{ id: 'css', cssText: [...css].join('') },
];
data.children = html;
const markup = ReactDOM.renderToString(
<Html {...data} />,
);
res.status(200);
res.send(`<!doctype html>${markup}`);
} catch (err) {
next(err);
}
});
<<<<<<<
app.listen(port, () => {
console.info(`The server is running at http://localhost:${port}/`);
=======
app.listen(config.port, () => {
console.info(`The server is running at http://localhost:${config.port}/`);
>>>>>>>
app.listen(config.port, () => {
console.info(`The server is running at http://localhost:${config.port}/`); |
<<<<<<<
import { port, auth, analytics } from './config';
import configureStore from './store/configureStore';
import { setRuntimeVariable } from './actions/runtime';
=======
import { port, auth } from './config';
>>>>>>>
import configureStore from './store/configureStore';
import { setRuntimeVariable } from './actions/runtime';
import { port, auth } from './config';
<<<<<<<
if (process.env.NODE_ENV === 'production') {
data.trackingId = analytics.google.trackingId;
}
const store = configureStore({}, {
cookie: req.headers.cookie,
});
store.dispatch(setRuntimeVariable({
name: 'initialNow',
value: Date.now(),
}));
await match(routes, {
=======
await UniversalRouter.resolve(routes, {
>>>>>>>
const store = configureStore({}, {
cookie: req.headers.cookie,
});
store.dispatch(setRuntimeVariable({
name: 'initialNow',
value: Date.now(),
}));
await UniversalRouter.resolve(routes, {
<<<<<<<
store,
insertCss: styles => css.push(styles._getCss()), // eslint-disable-line no-underscore-dangle
=======
insertCss: (...styles) => {
styles.forEach(style => css.push(style._getCss())); // eslint-disable-line no-underscore-dangle, max-len
},
>>>>>>>
store,
insertCss: (...styles) => {
styles.forEach(style => css.push(style._getCss())); // eslint-disable-line no-underscore-dangle, max-len
},
<<<<<<<
data.state = JSON.stringify(store.getState());
data.body = ReactDOM.renderToString(component);
data.css = css.join('');
=======
data.children = ReactDOM.renderToString(component);
data.style = css.join('');
>>>>>>>
data.children = ReactDOM.renderToString(component);
data.style = css.join('');
data.state = store.getState(); |
<<<<<<<
const store = configureStore({}, {
cookie: req.headers.cookie,
});
store.dispatch(setRuntimeVariable({
name: 'initialNow',
value: Date.now(),
}));
await match(routes, {
=======
await UniversalRouter.resolve(routes, {
>>>>>>>
const store = configureStore({}, {
cookie: req.headers.cookie,
});
store.dispatch(setRuntimeVariable({
name: 'initialNow',
value: Date.now(),
}));
await UniversalRouter.resolve(routes, {
<<<<<<<
store,
insertCss: styles => css.push(styles._getCss()), // eslint-disable-line no-underscore-dangle
=======
insertCss: (...styles) => {
styles.forEach(style => css.push(style._getCss())); // eslint-disable-line no-underscore-dangle, max-len
},
>>>>>>>
insertCss: (...styles) => {
styles.forEach(style => css.push(style._getCss())); // eslint-disable-line no-underscore-dangle, max-len
}, |
<<<<<<<
}
/*
Open popup window
*/
function installHelpButtons() {
document.getElementById("btnAbout").onclick = openAbout;
document.getElementById("btnHelp").onclick = openHelp;
}
function openWindow(page) {
window.open('/help/' + lang_key + '/' + page + '.html',
'Help_<% SERVER_WINDOW_NAME %>',
'menubar=0,location=0,toolbar=0,personalbar=0,status=0,scrollbars=1,height=600,width=505'
);
return false;
}
function openAbout() { return openWindow("about"); }
function openHelp() {
var uri = window.location.pathname.replace(/\/?\d*\/?$/g, "");
if (uri.length == 0) { uri = "/workflow/profile/workspace"; }
return openWindow(uri);
=======
}
/*
* Handle multiple onload events
* By Marshall Roch, 2005-03-25
*
* To use, instead of writing "window.onload = someFunction" or
* "<body onload='someFunction'>", use "multiOnload.onload('someFunction')".
*/
var multiOnload = new Object();
multiOnload.onload = multiOnload_addOnload;
window.onload = multiOnload_onload;
function multiOnload_onload() {
if (multiOnload.events) {
for (var i=0; i < multiOnload.events.length; i++) {
eval(multiOnload.events[i] + "()");
}
}
}
function multiOnload_addOnload(eventFn) {
if(!this.events) { this.events = new Array(); }
this.events[this.events.length] = eventFn;
>>>>>>>
}
/*
Open popup window
*/
function installHelpButtons() {
document.getElementById("btnAbout").onclick = openAbout;
document.getElementById("btnHelp").onclick = openHelp;
}
function openWindow(page) {
window.open('/help/' + lang_key + '/' + page + '.html',
'Help_<% SERVER_WINDOW_NAME %>',
'menubar=0,location=0,toolbar=0,personalbar=0,status=0,scrollbars=1,height=600,width=505'
);
return false;
}
function openAbout() { return openWindow("about"); }
function openHelp() {
var uri = window.location.pathname.replace(/\/?\d*\/?$/g, "");
if (uri.length == 0) { uri = "/workflow/profile/workspace"; }
return openWindow(uri);
}
/*
* Handle multiple onload events
* By Marshall Roch, 2005-03-25
*
* To use, instead of writing "window.onload = someFunction" or
* "<body onload='someFunction'>", use "multiOnload.onload('someFunction')".
*/
var multiOnload = new Object();
multiOnload.onload = multiOnload_addOnload;
window.onload = multiOnload_onload;
function multiOnload_onload() {
if (multiOnload.events) {
for (var i=0; i < multiOnload.events.length; i++) {
eval(multiOnload.events[i] + "()");
}
}
}
function multiOnload_addOnload(eventFn) {
if(!this.events) { this.events = new Array(); }
this.events[this.events.length] = eventFn; |
<<<<<<<
var myObj= $(which);
if (myObj.value.length>maxLength) myObj.value=myObj.value.substring(0,maxLength);
$("textCountUp" + which).innerHTML = myObj.value.length;
$("textCountDown" + which).innerHTML = maxLength-myObj.value.length;
=======
var myObj= document.getElementById(which);
if (myObj.value.length > maxLength) myObj.value=myObj.value.substring(0,maxLength);
document.getElementById("textCountUp" + which).innerHTML = myObj.value.length;
document.getElementById("textCountDown" + which).innerHTML = maxLength-myObj.value.length;
>>>>>>>
var myObj= $(which);
if (myObj.value.length > maxLength) myObj.value=myObj.value.substring(0,maxLength);
$("textCountUp" + which).innerHTML = myObj.value.length;
$("textCountDown" + which).innerHTML = maxLength-myObj.value.length;
<<<<<<<
closeDialog($('finddialog'));
alert(replaced + (chunks.length - 1) + chunks.length > 2 ? occurrence : occurrences);
=======
closeDialog(document.getElementById('finddialog'));
alert((replaced) + (chunks.length - 1) + (chunks.length > 2 ? occurrences : occurrence));
>>>>>>>
closeDialog($('finddialog'));
alert((replaced) + (chunks.length - 1) + (chunks.length > 2 ? occurrences : occurrence)); |
<<<<<<<
t.ok(m.webrtcMinimumVersion, 'Minimum Browser version detected');
});
test('Browser supported by adapter.js', function (t) {
t.plan(1);
t.ok(m.webrtcDetectedVersion >= m.webrtcMinimumVersion, 'Browser version supported by adapter.js');
});
test('create RTCPeerConnection', function (t) {
t.plan(1);
t.ok(typeof(new m.RTCPeerConnection()) === 'object', 'RTCPeerConnection constructor');
=======
});
test('basic connection establishment', function(t) {
var pc1 = new m.RTCPeerConnection(null);
var pc2 = new m.RTCPeerConnection(null);
var ended = false;
pc1.createDataChannel('somechannel');
pc1.oniceconnectionstatechange = function() {
if (pc1.iceConnectionState === 'connected' ||
pc1.iceConnectionState === 'completed') {
t.pass('P2P connection established');
if (!ended) {
ended = true;
t.end();
}
}
};
var addCandidate = function(pc, event) {
if (event.candidate) {
var cand = new RTCIceCandidate(event.candidate);
pc.addIceCandidate(cand,
function() {
},
function(err) {
t.fail('addIceCandidate ' + err.toString());
}
);
}
};
pc1.onicecandidate = function(event) {
addCandidate(pc2, event);
};
pc2.onicecandidate = function(event) {
addCandidate(pc1, event);
};
pc1.createOffer(
function(offer) {
pc1.setLocalDescription(offer,
function() {
t.pass('pc1.setLocalDescription');
offer = new RTCSessionDescription(offer);
t.pass('created RTCSessionDescription from offer');
pc2.setRemoteDescription(offer,
function() {
t.pass('pc2.setRemoteDescription');
pc2.createAnswer(
function(answer) {
t.pass('pc2.createAnswer');
pc2.setLocalDescription(answer,
function() {
t.pass('pc2.setLocalDescription');
answer = new RTCSessionDescription(answer);
t.pass('created RTCSessionDescription from answer');
pc1.setRemoteDescription(answer,
function() {
t.pass('pc1.setRemoteDescription');
},
function(err) {
t.fail('pc1.setRemoteDescription ' + err.toString());
}
);
},
function(err) {
t.fail('pc2.setLocalDescription ' + err.toString());
}
);
},
function(err) {
t.fail('pc2.createAnswer ' + err.toString());
}
);
},
function(err) {
t.fail('pc2.setRemoteDescription ' + err.toString());
}
);
},
function(err) {
t.fail('pc1.setLocalDescription ' + err.toString());
}
);
},
function(err) {
t.fail('pc1 failed to create offer ' + err.toString());
}
);
>>>>>>>
t.ok(m.webrtcMinimumVersion, 'Minimum Browser version detected');
});
test('Browser supported by adapter.js', function (t) {
t.plan(1);
t.ok(m.webrtcDetectedVersion >= m.webrtcMinimumVersion, 'Browser version supported by adapter.js');
});
test('create RTCPeerConnection', function (t) {
t.plan(1);
t.ok(typeof(new m.RTCPeerConnection()) === 'object', 'RTCPeerConnection constructor');
});
test('basic connection establishment', function(t) {
var pc1 = new m.RTCPeerConnection(null);
var pc2 = new m.RTCPeerConnection(null);
var ended = false;
pc1.createDataChannel('somechannel');
pc1.oniceconnectionstatechange = function() {
if (pc1.iceConnectionState === 'connected' ||
pc1.iceConnectionState === 'completed') {
t.pass('P2P connection established');
if (!ended) {
ended = true;
t.end();
}
}
};
var addCandidate = function(pc, event) {
if (event.candidate) {
var cand = new RTCIceCandidate(event.candidate);
pc.addIceCandidate(cand,
function() {
},
function(err) {
t.fail('addIceCandidate ' + err.toString());
}
);
}
};
pc1.onicecandidate = function(event) {
addCandidate(pc2, event);
};
pc2.onicecandidate = function(event) {
addCandidate(pc1, event);
};
pc1.createOffer(
function(offer) {
pc1.setLocalDescription(offer,
function() {
t.pass('pc1.setLocalDescription');
offer = new RTCSessionDescription(offer);
t.pass('created RTCSessionDescription from offer');
pc2.setRemoteDescription(offer,
function() {
t.pass('pc2.setRemoteDescription');
pc2.createAnswer(
function(answer) {
t.pass('pc2.createAnswer');
pc2.setLocalDescription(answer,
function() {
t.pass('pc2.setLocalDescription');
answer = new RTCSessionDescription(answer);
t.pass('created RTCSessionDescription from answer');
pc1.setRemoteDescription(answer,
function() {
t.pass('pc1.setRemoteDescription');
},
function(err) {
t.fail('pc1.setRemoteDescription ' + err.toString());
}
);
},
function(err) {
t.fail('pc2.setLocalDescription ' + err.toString());
}
);
},
function(err) {
t.fail('pc2.createAnswer ' + err.toString());
}
);
},
function(err) {
t.fail('pc2.setRemoteDescription ' + err.toString());
}
);
},
function(err) {
t.fail('pc1.setLocalDescription ' + err.toString());
}
);
},
function(err) {
t.fail('pc1 failed to create offer ' + err.toString());
}
); |
<<<<<<<
var endTime = null;
var webSocket;
=======
var signalingReady = false;
var socket;
var started = false;
>>>>>>>
var webSocket;
<<<<<<<
=======
var prevStats;
var turnDone = false;
var xmlhttp;
>>>>>>>
var prevStats; |
<<<<<<<
this.collectStatsStartTime = Date.now();
call.gatherStats(call.pc1, this.analyzeStats_.bind(this), this.encoderSetupTime_.bind(this), 100);
setTimeoutWithProgressBar(function() {
=======
call.gatherStats(call.pc1, this.analyzeStats_.bind(this), 1000);
setTimeoutWithProgressBar(function() {
>>>>>>>
this.collectStatsStartTime = Date.now();
call.gatherStats(call.pc1, this.analyzeStats_.bind(this), 1000);
setTimeoutWithProgressBar(function() { |
<<<<<<<
=======
'samples/web/content/manual-test/**/*',
'samples/web/content/apprtc/js/compiled/*.js',
>>>>>>>
'samples/web/content/apprtc/js/compiled/*.js', |
<<<<<<<
if (isChromeApp()) {
document.cancelFullScreen = function() {
chrome.app.window.current().restore();
};
} else {
document.cancelFullScreen = document.webkitCancelFullScreen ||
document.mozCancelFullScreen || document.cancelFullScreen;
}
if (isChromeApp()) {
document.body.requestFullScreen = function() {
chrome.app.window.current().fullscreen();
};
} else {
document.body.requestFullScreen = document.body.webkitRequestFullScreen ||
document.body.mozRequestFullScreen || document.body.requestFullScreen;
}
document.onfullscreenchange = document.onwebkitfullscreenchange = document.onmozfullscreenchange;
=======
document.cancelFullScreen = document.webkitCancelFullScreen ||
document.mozCancelFullScreen || document.cancelFullScreen;
document.body.requestFullScreen = document.body.webkitRequestFullScreen ||
document.body.mozRequestFullScreen || document.body.requestFullScreen;
document.onfullscreenchange = document.onfullscreenchange ||
document.onwebkitfullscreenchange || document.onmozfullscreenchange;
>>>>>>>
if (isChromeApp()) {
document.cancelFullScreen = function() {
chrome.app.window.current().restore();
};
} else {
document.cancelFullScreen = document.webkitCancelFullScreen ||
document.mozCancelFullScreen || document.cancelFullScreen;
}
if (isChromeApp()) {
document.body.requestFullScreen = function() {
chrome.app.window.current().fullscreen();
};
} else {
document.body.requestFullScreen = document.body.webkitRequestFullScreen ||
document.body.mozRequestFullScreen || document.body.requestFullScreen;
}
document.onfullscreenchange = document.onfullscreenchange ||
document.onwebkitfullscreenchange || document.onmozfullscreenchange; |
<<<<<<<
/* globals addCodecParam, displayError, displayStatus,
gatheredIceCandidateTypes, hasTurnServer, iceCandidateType, localStream,
maybePreferAudioReceiveCodec, maybePreferAudioSendCodec,
=======
/* globals addCodecParam, channelReady:true, displayError, displayStatus,
gatheredIceCandidateTypes, goog, hasLocalStream, iceCandidateType,
localStream, maybePreferAudioReceiveCodec, maybePreferAudioSendCodec,
maybePreferVideoReceiveCodec, maybePreferVideoSendCodec,
>>>>>>>
/* globals addCodecParam, displayError, displayStatus,
gatheredIceCandidateTypes, hasTurnServer, iceCandidateType, localStream,
maybePreferAudioReceiveCodec, maybePreferAudioSendCodec,
maybePreferVideoReceiveCodec, maybePreferVideoSendCodec,
<<<<<<<
var message = {
type: 'candidate',
label: event.candidate.sdpMLineIndex,
id: event.candidate.sdpMid,
candidate: event.candidate.candidate
};
if (params.isInitiator) {
sendGAEMessage(message);
} else {
sendWSSMessage(message);
}
noteIceCandidate('Local', iceCandidateType(event.candidate.candidate));
=======
>>>>>>> |
<<<<<<<
//this._stackV = 0;
this._pushTime = 0;
this._popTime = 0;
=======
>>>>>>>
this._pushTime = 0;
this._popTime = 0; |
<<<<<<<
let renderelement = ReactDOM.findDOMNode(this);
let props = this.props;
let context = this._reactInternalInstance._context;
=======
var renderelement = this.props.canvas || ReactDOM.findDOMNode(this);
var props = this.props;
// var instance = this._reactInternalInstance._renderedComponent;
>>>>>>>
let renderelement = this.props.canvas || ReactDOM.findDOMNode(this);
let props = this.props;
let context = this._reactInternalInstance._context; |
<<<<<<<
handleInput: function() {\n\
=======
handleChange: React.autoBind(function() {\n\
>>>>>>>
handleChange: function() {\n\ |
<<<<<<<
* appchan x - Version 2.2.1 - 2013-07-29
=======
* 4chan X - Version 1.2.24 - 2013-07-31
>>>>>>>
* appchan x - Version 2.2.1 - 2013-07-31 |
<<<<<<<
var $, $$, DAY, Favicon, HOUR, MINUTE, Main, NAMESPACE, SECOND, Time, VERSION, anonymize, conf, config, d, engine, expandComment, expandThread, filter, flatten, g, getTitle, imgExpand, imgGif, imgHover, key, keybinds, log, nav, options, quoteBacklink, quoteDR, quoteInline, quoteOP, quotePreview, redirect, replyHiding, reportButton, revealSpoilers, sauce, strikethroughQuotes, threadHiding, threadStats, threading, titlePost, ui, unread, updater, val, watcher, _base;
var __slice = Array.prototype.slice;
=======
var $, $$, DAY, Favicon, HOUR, MINUTE, Main, NAMESPACE, Recaptcha, SECOND, Time, VERSION, anonymize, conf, config, cooldown, d, engine, expandComment, expandThread, filter, flatten, g, getTitle, imgExpand, imgGif, imgHover, key, keybinds, log, nav, options, qr, quoteBacklink, quoteDR, quoteInline, quoteOP, quotePreview, redirect, replyHiding, reportButton, revealSpoilers, sauce, strikethroughQuotes, threadHiding, threadStats, threading, titlePost, ui, unread, updater, val, watcher, _base,
__slice = Array.prototype.slice;
>>>>>>>
var $, $$, DAY, Favicon, HOUR, MINUTE, Main, NAMESPACE, SECOND, Time, VERSION, anonymize, conf, config, d, engine, expandComment, expandThread, filter, flatten, g, getTitle, imgExpand, imgGif, imgHover, key, keybinds, log, nav, options, quoteBacklink, quoteDR, quoteInline, quoteOP, quotePreview, redirect, replyHiding, reportButton, revealSpoilers, sauce, strikethroughQuotes, threadHiding, threadStats, threading, titlePost, ui, unread, updater, val, watcher, _base,
__slice = Array.prototype.slice; |
<<<<<<<
// @version 1.3.7
// @minGMVer 1.14
=======
// @version 1.3.10
// @minGMVer 1.13
>>>>>>>
// @version 1.3.10
// @minGMVer 1.14
<<<<<<<
* 4chan X - Version 1.3.7 - 2014-02-23
=======
* 4chan X - Version 1.3.10 - 2014-02-21
>>>>>>>
* 4chan X - Version 1.3.10 - 2014-02-23
<<<<<<<
var dialog, elm, event, i, items, key, name, node, nodes, save, value, _ref;
=======
var dialog, elm, event, flagSelector, i, items, key, name, node, nodes, save, value, _ref;
>>>>>>>
var dialog, elm, event, i, items, key, name, node, nodes, save, value, _ref;
<<<<<<<
}, {
name: "installgentoo.com",
boards: ["g", "t"],
files: ["g", "t"],
data: {
domain: "chan.installgentoo.com",
http: true,
software: "foolfuuka"
}
}, {
name: "Foolz Beta",
boards: ["a", "co", "gd", "jp", "m", "s4s", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"],
files: ["a", "gd", "jp", "m", "s4s", "tg", "u", "vg", "vp", "vr", "wsg"],
=======
}, {
name: "installgentoo.com",
boards: ["g", "t"],
files: ["g", "t"],
data: {
domain: "chan.installgentoo.com",
http: true,
software: "foolfuuka"
}
}, {
name: "Foolz Beta",
boards: ["a", "biz", "co", "d", "gd", "jp", "m", "mlp", "s4s", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"],
files: ["a", "biz", "d", "gd", "jp", "m", "s4s", "tg", "u", "vg", "vp", "vr", "wsg"],
>>>>>>>
}, {
name: "installgentoo.com",
boards: ["g", "t"],
files: ["g", "t"],
data: {
domain: "chan.installgentoo.com",
http: true,
software: "foolfuuka"
}
}, {
name: "Foolz Beta",
boards: ["a", "biz", "co", "d", "gd", "jp", "m", "mlp", "s4s", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"],
files: ["a", "biz", "d", "gd", "jp", "m", "s4s", "tg", "u", "vg", "vp", "vr", "wsg"], |
<<<<<<<
var err, nTimeout, notice, req, timeEl;
=======
var err, notice, req, timeEl, _ref;
>>>>>>>
var err, nTimeout, notice, req, timeEl, _ref;
<<<<<<<
}, {
name: "4plebs",
boards: ["hr", "pol", "s4s", "tg", "tv", "x"],
files: ["hr", "pol", "s4s", "tg", "tv", "x"],
=======
},
"4plebs": {
boards: ["hr", "o", "pol", "s4s", "tg", "tv", "x"],
files: ["hr", "o", "pol", "s4s", "tg", "tv", "x"],
>>>>>>>
}, {
name: "4plebs",
boards: ["hr", "o", "pol", "s4s", "tg", "tv", "x"],
files: ["hr", "o", "pol", "s4s", "tg", "tv", "x"], |
<<<<<<<
* appchan x - Version 2.9.7 - 2014-03-22
=======
* 4chan X - Version 1.4.1 - 2014-03-23
>>>>>>>
* appchan x - Version 2.9.7 - 2014-03-23
<<<<<<<
if (left < 0) {
x = -window.scrollX;
=======
if (!/(mailto:|.+:\/\/)/.test(text)) {
text = (/@/.test(text) ? 'mailto:' : 'http://') + text;
>>>>>>>
if (left < 0) {
x = -window.scrollX;
<<<<<<<
return $.get('AutoWatch', 0, function(_arg) {
var AutoWatch, thread;
AutoWatch = _arg.AutoWatch;
if (!(thread = g.BOARD.threads[AutoWatch])) {
=======
return Thread.callbacks.disconnect('Thread Updater');
},
node: function() {
ThreadUpdater.thread = this;
ThreadUpdater.root = this.OP.nodes.root.parentNode;
ThreadUpdater.lastPost = +this.posts.keys[this.posts.keys.length - 1];
ThreadUpdater.cb.interval.call($.el('input', {
value: Conf['Interval'],
name: 'Interval'
}));
$.on(window, 'online offline', ThreadUpdater.cb.online);
$.on(d, 'QRPostSuccessful', ThreadUpdater.cb.checkpost);
$.on(d, 'visibilitychange', ThreadUpdater.cb.visibility);
return ThreadUpdater.cb.online();
},
/*
http://freesound.org/people/pierrecartoons1979/sounds/90112/
cc-by-nc-3.0
*/
beep: 'data:audio/wav;base64,UklGRjQDAABXQVZFZm10IBAAAAABAAEAgD4AAIA+AAABAAgAc21wbDwAAABBAAADAAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkYXRhzAIAAGMms8em0tleMV4zIpLVo8nhfSlcPR102Ki+5JspVEkdVtKzs+K1NEhUIT7DwKrcy0g6WygsrM2k1NpiLl0zIY/WpMrjgCdbPhxw2Kq+5Z4qUkkdU9K1s+K5NkVTITzBwqnczko3WikrqM+l1NxlLF0zIIvXpsnjgydZPhxs2ay95aIrUEkdUdC3suK8N0NUIjq+xKrcz002WioppdGm091pK1w0IIjYp8jkhydXPxxq2K295aUrTkoeTs65suK+OUFUIzi7xqrb0VA0WSoootKm0t5tKlo1H4TYqMfkiydWQBxm16+85actTEseS8y7seHAPD9TIza5yKra01QyWSson9On0d5wKVk2H4DYqcfkjidUQB1j1rG75KsvSkseScu8seDCPz1TJDW2yara1FYxWSwnm9Sn0N9zKVg2H33ZqsXkkihSQR1g1bK65K0wSEsfR8i+seDEQTxUJTOzy6rY1VowWC0mmNWoz993KVc3H3rYq8TklSlRQh1d1LS647AyR0wgRMbAsN/GRDpTJTKwzKrX1l4vVy4lldWpzt97KVY4IXbUr8LZljVPRCxhw7W3z6ZISkw1VK+4sMWvXEhSPk6buay9sm5JVkZNiLWqtrJ+TldNTnquqbCwilZXU1BwpKirrpNgWFhTaZmnpquZbFlbVmWOpaOonHZcXlljhaGhpZ1+YWBdYn2cn6GdhmdhYGN3lp2enIttY2Jjco+bnJuOdGZlZXCImJqakHpoZ2Zug5WYmZJ/bGlobX6RlpeSg3BqaW16jZSVkoZ0bGtteImSk5KIeG5tbnaFkJKRinxxbm91gY2QkIt/c3BwdH6Kj4+LgnZxcXR8iI2OjIR5c3J0e4WLjYuFe3VzdHmCioyLhn52dHR5gIiKioeAeHV1eH+GiYqHgXp2dnh9hIiJh4J8eHd4fIKHiIeDfXl4eHyBhoeHhH96eHmA',
cb: {
online: function() {
if (ThreadUpdater.online = navigator.onLine) {
ThreadUpdater.outdateCount = 0;
ThreadUpdater.setInterval();
ThreadUpdater.set('status', null, null);
>>>>>>>
return $.get('AutoWatch', 0, function(_arg) {
var AutoWatch, thread;
AutoWatch = _arg.AutoWatch;
if (!(thread = g.BOARD.threads[AutoWatch])) { |
<<<<<<<
var $, $$, DAY, Favicon, HOUR, MINUTE, Main, NAMESPACE, Recaptcha, SECOND, Time, anonymize, conf, config, cooldown, d, expandComment, expandThread, firstRun, g, getTitle, imgExpand, imgGif, imgHover, imgPreloading, key, keybinds, log, nav, nodeInserted, options, pathname, qr, quoteBacklink, quoteInline, quoteOP, quotePreview, redirect, replyHiding, reportButton, revealSpoilers, sauce, temp, threadHiding, threadStats, threading, titlePost, ui, unread, updater, val, watcher;
=======
var $, $$, DAY, Favicon, HOUR, MINUTE, Main, NAMESPACE, QR, SECOND, Time, anonymize, conf, config, d, expandComment, expandThread, firstRun, g, getTitle, imgExpand, imgGif, imgHover, imgPreloading, key, keybinds, log, nav, nodeInserted, options, quoteBacklink, quoteInline, quoteOP, quotePreview, redirect, replyHiding, reportButton, revealSpoilers, sauce, threadHiding, threadStats, threading, titlePost, ui, unread, updater, val, watcher;
>>>>>>>
var $, $$, DAY, Favicon, HOUR, MINUTE, Main, NAMESPACE, QR, SECOND, Time, anonymize, conf, config, d, expandComment, expandThread, firstRun, g, getTitle, imgExpand, imgGif, imgHover, imgPreloading, key, keybinds, log, nav, nodeInserted, options, pathname, quoteBacklink, quoteInline, quoteOP, quotePreview, redirect, replyHiding, reportButton, revealSpoilers, sauce, temp, threadHiding, threadStats, threading, titlePost, ui, unread, updater, val, watcher;
<<<<<<<
var callback, canPost, cutoff, form, hiddenThreads, id, lastChecked, now, op, table, timestamp, tzOffset, _i, _j, _k, _l, _len, _len2, _len3, _len4, _ref, _ref2, _ref3, _ref4, _ref5;
=======
var callback, cutoff, hiddenThreads, id, lastChecked, now, op, pathname, table, temp, timestamp, tzOffset, _i, _j, _k, _l, _len, _len2, _len3, _len4, _ref, _ref2, _ref3, _ref4, _ref5;
$.unbind(window, 'load', Main.init);
pathname = location.pathname.substring(1).split('/');
g.BOARD = pathname[0], temp = pathname[1];
if (temp === 'res') {
g.REPLY = temp;
g.THREAD_ID = pathname[2];
} else {
g.PAGENUM = parseInt(temp) || 0;
}
>>>>>>>
var callback, cutoff, hiddenThreads, id, lastChecked, now, op, table, timestamp, tzOffset, _i, _j, _k, _l, _len, _len2, _len3, _len4, _ref, _ref2, _ref3, _ref4, _ref5; |
<<<<<<<
// @version 1.3.2
// @minGMVer 1.14
=======
// @version 1.3.7
// @minGMVer 1.13
>>>>>>>
// @version 1.3.7
// @minGMVer 1.14 |
<<<<<<<
* 4chan X - Version 1.2.19 - 2013-07-21
=======
* 4chan X - Version 1.2.24 - 2013-07-24
>>>>>>>
* 4chan X - Version 1.2.24 - 2013-07-24
<<<<<<<
var cb;
if (d.readyState !== 'loading') {
=======
var cb, _ref;
if ((_ref = d.readyState) === 'interactive' || _ref === 'complete') {
>>>>>>>
var cb;
if (d.readyState !== 'loading') {
<<<<<<<
=======
$.item = function(key, val) {
var item;
item = {};
item[key] = val;
return item;
};
>>>>>>>
<<<<<<<
var capcode, date, email, flag, info, name, post, subject, tripcode, uniqueID;
=======
var alt, anchor, capcode, date, email, file, fileInfo, flag, info, name, post, size, subject, thumb, tripcode, uniqueID, unit;
>>>>>>>
var capcode, date, email, flag, info, name, post, subject, tripcode, uniqueID;
<<<<<<<
var bq, i, node, nodes, text, _i, _len, _ref;
=======
var bq, data, i, node, nodes, text, _i, _len, _ref;
>>>>>>>
var bq, i, node, nodes, text, _i, _len, _ref;
<<<<<<<
var file, info, inline, inlined, key, nodes, post, root, val, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2, _ref3;
=======
var file, index, info, inline, inlined, key, nodes, post, root, val, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2, _ref3;
>>>>>>>
var file, info, inline, inlined, key, nodes, post, root, val, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2, _ref3;
<<<<<<<
return $.id('boardNavMobile') || d.readyState !== 'loading';
=======
var _ref;
return $.id('boardNavMobile') || ((_ref = d.readyState) === 'interactive' || _ref === 'complete');
>>>>>>>
return $.id('boardNavMobile') || d.readyState !== 'loading';
<<<<<<<
var boardID, path, postID, threadID, _ref;
=======
var boardID, path, postID, threadID;
>>>>>>>
var boardID, path, postID, threadID, _ref;
<<<<<<<
var post, _i, _len, _ref;
=======
var i, _i, _len, _ref;
>>>>>>>
var post, _i, _len, _ref;
<<<<<<<
var disabled, status, thread, value;
=======
var disabled, status, value;
>>>>>>>
var disabled, status, thread, value;
<<<<<<<
var caretPos, com, index, post, range, s, sel, text, thread, _ref;
=======
var OP, caretPos, com, index, post, range, s, sel, selectionRoot, text, thread, _ref;
>>>>>>>
var caretPos, com, index, post, range, s, sel, text, thread, _ref;
<<<<<<<
if (files instanceof Event) {
=======
if (this instanceof Element) {
>>>>>>>
if (files instanceof Event) {
<<<<<<<
this["delete"]();
=======
$.rm(this.nodes.el);
>>>>>>>
this["delete"]();
<<<<<<<
var name, _ref;
=======
var value, _ref;
>>>>>>>
var name, _ref;
<<<<<<<
=======
if (!window.URL) {
if (!fileURL) {
reader = new FileReader();
reader.onload = function(e) {
return _this.setThumbnail(e.target.result);
};
reader.readAsDataURL(this.file);
return;
}
} else {
fileURL = URL.createObjectURL(this.file);
}
>>>>>>>
<<<<<<<
=======
el = $('.drag', this.parentNode);
$.rmClass(el, 'drag');
>>>>>>>
<<<<<<<
$.get('captchas', [], function(_arg) {
var captchas;
captchas = _arg.captchas;
return _this.sync(captchas);
=======
$.get('captchas', [], function(_arg) {
var captchas;
captchas = _arg.captchas;
return _this.sync(captchas);
>>>>>>>
$.get('captchas', [], function(_arg) {
var captchas;
captchas = _arg.captchas;
return _this.sync(captchas);
<<<<<<<
=======
button = Menu.makeButton(this);
>>>>>>>
<<<<<<<
return function() {
=======
return function(post) {
var clone;
>>>>>>>
return function() {
<<<<<<<
return Menu.menu.toggle(e, this, Get.postFromNode(this));
=======
var post;
post = this.dataset.clone ? Get.postFromNode(this) : g.posts[this.dataset.postid];
return Menu.menu.toggle(e, this, post);
>>>>>>>
return Menu.menu.toggle(e, this, Get.postFromNode(this));
<<<<<<<
var checkPosition, hash, onload, post, posts, root;
=======
var checkPosition, hash, onload, post, posts, prevID, root;
>>>>>>>
var checkPosition, hash, onload, post, posts, root;
<<<<<<<
var archive, arr, boardID, data, id, name, type, _ref, _ref1, _ref2, _results;
=======
var archive, arr, boardID, data, id, name, type, _i, _len, _ref, _ref1, _ref2, _ref3;
>>>>>>>
var archive, arr, boardID, data, id, name, type, _ref, _ref1, _ref2, _results;
<<<<<<<
=======
Sauce = {
init: function() {
var err, link, links, _i, _len, _ref;
if (g.VIEW === 'catalog' || !Conf['Sauce']) {
return;
}
links = [];
_ref = Conf['sauces'].split('\n');
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
link = _ref[_i];
if (link[0] === '#') {
continue;
}
try {
links.push(this.createSauceLink(link.trim()));
} catch (_error) {
err = _error;
continue;
}
}
if (!links.length) {
return;
}
this.links = links;
this.link = $.el('a', {
target: '_blank'
});
return Post.prototype.callbacks.push({
name: 'Sauce',
cb: this.node
});
},
createSauceLink: function(link) {
var m, text;
link = link.replace(/%(T?URL|MD5|board)/ig, function(parameter) {
switch (parameter) {
case '%TURL':
return "' + encodeURIComponent(post.file.thumbURL) + '";
case '%URL':
return "' + encodeURIComponent(post.file.URL) + '";
case '%MD5':
return "' + encodeURIComponent(post.file.MD5) + '";
case '%board':
return "' + encodeURIComponent(post.board) + '";
default:
return parameter;
}
});
text = (m = link.match(/;text:(.+)$/)) ? m[1] : link.match(/(\w+)\.\w+\//)[1];
link = link.replace(/;text:.+$/, '');
return Function('post', 'a', "a.href = '" + link + "';\na.textContent = '" + text + "';\nreturn a;");
},
node: function() {
var link, nodes, _i, _len, _ref;
if (this.isClone || !this.file) {
return;
}
nodes = [];
_ref = Sauce.links;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
link = _ref[_i];
nodes.push($.tn('\u00A0'), link(this, Sauce.link.cloneNode(true)));
}
return $.add(this.file.info, nodes);
}
};
>>>>>>>
<<<<<<<
return d.head && $('link[rel="shortcut icon"]', d.head) || d.readyState !== 'loading';
=======
var _ref;
return d.head && $('link[rel="shortcut icon"]', d.head) || ((_ref = d.readyState) === 'interactive' || _ref === 'complete');
>>>>>>>
return d.head && $('link[rel="shortcut icon"]', d.head) || d.readyState !== 'loading';
<<<<<<<
var mainStyleSheet, setStyle, style, styleSheets, _ref;
=======
var mainStyleSheet, observer, setStyle, style, styleSheets, _ref;
>>>>>>>
var mainStyleSheet, setStyle, style, styleSheets, _ref;
<<<<<<<
var board, err, errors, href, passLink, postRoot, posts, styleSelector, thread, threadRoot, threads, _i, _j, _len, _len1, _ref, _ref1;
=======
var board, boardChild, err, errors, href, passLink, posts, styleSelector, thread, threadChild, threads, _i, _j, _len, _len1, _ref, _ref1;
>>>>>>>
var board, err, errors, href, passLink, postRoot, posts, styleSelector, thread, threadRoot, threads, _i, _j, _len, _len1, _ref, _ref1; |
<<<<<<<
var arr, back, checked, description, dialog, favicon, hiddenNum, hiddenThreads, indicator, indicators, input, key, li, obj, option, overlay, ta, time, ul, _i, _j, _k, _l, _len, _len2, _len3, _len4, _ref, _ref2, _ref3, _ref4, _ref5;
dialog = $.el('div', {
id: 'options',
className: 'reply dialog',
innerHTML: '<div id=optionsbar>\
=======
var arr, back, checked, description, dialog, favicon, hiddenNum, hiddenThreads, indicator, indicators, input, key, li, obj, overlay, ta, time, ul, _i, _j, _k, _len, _len2, _len3, _ref, _ref2, _ref3, _ref4;
dialog = ui.dialog('options', '', '\
<div id=optionsbar>\
>>>>>>>
var arr, back, checked, description, dialog, favicon, hiddenNum, hiddenThreads, indicator, indicators, input, key, li, obj, overlay, ta, time, ul, _i, _j, _k, _len, _len2, _len3, _ref, _ref2, _ref3, _ref4;
dialog = $.el('div', {
id: 'options',
className: 'reply dialog',
innerHTML: '<div id=optionsbar>\
<<<<<<<
onLoad: function() {
var callback, node, nodes, _i, _j, _len, _len2, _ref;
=======
ready: function() {
var callback, canPost, form, node, nodes, _i, _j, _len, _len2, _ref;
>>>>>>>
ready: function() {
var callback, node, nodes, _i, _j, _len, _len2, _ref;
<<<<<<<
if (conf['Reveal Spoilers'] && $('.postarea label')) revealSpoilers.init();
=======
if (conf['Quick Reply']) qr.init();
>>>>>>> |
<<<<<<<
for (let item of this._subscribedToData[key]) {
if (framework === 'vue' || item.component.hasOwnProperty('$vnode'))
=======
for (let i = 0; i < this._subscribedToData[key].length; i++) {
const item = this._subscribedToData[key][i];
if (item.component.hasOwnProperty('$vnode'))
>>>>>>>
for (let i = 0; i < this._subscribedToData[key].length; i++) {
const item = this._subscribedToData[key][i];
if (framework === 'vue' || item.component.hasOwnProperty('$vnode'))
<<<<<<<
} else {
// nothing yet, maybe a configurable callback
=======
>>>>>>>
} else {
// nothing yet, maybe a configurable callback |
<<<<<<<
g.seconds = g.sage ? 60 : 30;
qr.cooldownStart();
} else {
error = $.el('span', {
className: 'error',
textContent: data
});
$.append(dialog, error);
qr.autohide.unset();
=======
>>>>>>>
<<<<<<<
=======
}
},
refresh: function(dialog) {
var auto, f, submit, _ref;
$('textarea', dialog).value = '';
$('input[name=recaptcha_response_field]', dialog).value = '';
f = $('input[type=file]', dialog).parentNode;
f.innerHTML = f.innerHTML;
submit = $('input[type=submit]', qr);
submit.value = g.sage ? 60 : 30;
submit.disabled = true;
window.setTimeout(qr.cooldown, 1000);
auto = submit.previousSibling.lastChild;
if (auto.checked) {
return (_ref = $('input[title=autohide]:checked', qr)) != null ? _ref.click() : void 0;
>>>>>>>
<<<<<<<
threadHiding = {
init: function() {
var a, hiddenThreads, node, op, thread, _i, _len, _ref, _results;
node = $('form[name=delform] > *');
threadHiding.thread(node);
hiddenThreads = $.getValue("hiddenThread/" + g.BOARD + "/", {});
_ref = $$('div.thread');
_results = [];
=======
recaptchaListener = function(e) {
if (e.keyCode === 8 && this.value === '') {
return recaptchaReload();
}
};
recaptchaReload = function() {
return window.location = 'javascript:Recaptcha.reload()';
};
redirect = function() {
var url;
switch (g.BOARD) {
case 'a':
case 'g':
case 'lit':
case 'sci':
case 'tv':
url = "http://green-oval.net/cgi-board.pl/" + g.BOARD + "/thread/" + g.THREAD_ID;
break;
case 'jp':
case 'm':
case 'tg':
url = "http://archive.easymodo.net/cgi-board.pl/" + g.BOARD + "/thread/" + g.THREAD_ID;
break;
case '3':
case 'adv':
case 'an':
case 'c':
case 'ck':
case 'co':
case 'fa':
case 'fit':
case 'int':
case 'k':
case 'mu':
case 'n':
case 'o':
case 'p':
case 'po':
case 'soc':
case 'sp':
case 'toy':
case 'trv':
case 'v':
case 'vp':
case 'x':
url = "http://archive.no-ip.org/" + g.BOARD + "/thread/" + g.THREAD_ID;
break;
default:
url = "http://boards.4chan.org/" + g.BOARD;
}
return location.href = url;
};
replyNav = function() {
var direction, op;
if (g.REPLY) {
return window.location = this.textContent === '▲' ? '#navtop' : '#navbot';
} else {
direction = this.textContent === '▲' ? 'preceding' : 'following';
op = $.x("" + direction + "::span[starts-with(@id, 'nothread')][1]", this).id;
return window.location = "#" + op;
}
};
report = function() {
var input;
input = $.x('preceding-sibling::input[1]', this);
input.click();
$('input[value="Report"]').click();
return input.click();
};
scrollThread = function(count) {
var hash, idx, temp, thread, top, _ref;
_ref = getThread(), thread = _ref[0], idx = _ref[1];
top = thread.getBoundingClientRect().top;
if (idx === 0 && top > 1) {
idx = -1;
}
if (count < 0 && top < -1) {
count++;
}
temp = idx + count;
if (temp < 0) {
hash = '';
} else if (temp > 9) {
hash = 'p9';
} else {
hash = "p" + temp;
}
return location.hash = hash;
};
showReply = function() {
var div, id, table;
div = this.parentNode;
table = div.nextSibling;
$.show(table);
$.remove(div);
id = $('td.reply, td.replyhl', table).id;
$.slice(g.hiddenReplies, id);
return GM_setValue("hiddenReplies/" + g.BOARD + "/", JSON.stringify(g.hiddenReplies));
};
showThread = function() {
var div, id;
div = this.nextSibling;
$.show(div);
$.hide(this);
id = div.id;
$.slice(g.hiddenThreads, id);
return GM_setValue("hiddenThreads/" + g.BOARD + "/", JSON.stringify(g.hiddenThreads));
};
stopPropagation = function(e) {
return e.stopPropagation();
};
threadF = function(current) {
var a, div, hidden, id, _i, _len, _ref;
div = $.el('div', {
className: 'thread'
});
a = $.el('a', {
textContent: '[ - ]',
className: 'pointer'
});
$.bind(a, 'click', hideThread);
$.append(div, a);
$.before(current, div);
while (!current.clear) {
$.append(div, current);
current = div.nextSibling;
}
$.append(div, current);
current = div.nextSibling;
id = $('input[value="delete"]', div).name;
div.id = id;
_ref = g.hiddenThreads;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
hidden = _ref[_i];
if (id === hidden.id) {
hideThread(div);
}
}
current = current.nextSibling.nextSibling;
if (current.nodeName !== 'CENTER') {
return threadF(current);
}
};
request = function(url, callback) {
var r;
r = new XMLHttpRequest();
r.onload = callback;
r.open('get', url, true);
r.send();
return r;
};
updateCallback = function() {
var arr, body, count, id, input, l, replies, reply, root, s, table, timer, _i, _len, _ref;
count = $('#updater #count');
timer = $('#updater #timer');
if (this.status === 404) {
count.textContent = 404;
count.className = 'error';
timer.textContent = '';
clearInterval(g.interval);
_ref = $$('input[type=submit]');
>>>>>>>
threadHiding = {
init: function() {
var a, hiddenThreads, node, op, thread, _i, _len, _ref, _results;
node = $('form[name=delform] > *');
threadHiding.thread(node);
hiddenThreads = $.getValue("hiddenThread/" + g.BOARD + "/", {});
_ref = $$('div.thread');
_results = [];
<<<<<<<
/*
lastChecked = Number GM_getValue('lastChecked', '0')
now = Date.now()
DAY = 24 * 60 * 60
if lastChecked < now - 1*DAY
cutoff = now - 7*DAY
while g.hiddenThreads.length
if g.hiddenThreads[0].timestamp > cutoff
break
g.hiddenThreads.shift()
while g.hiddenReplies.length
if g.hiddenReplies[0].timestamp > cutoff
break
g.hiddenReplies.shift()
GM_setValue("hiddenThreads/#{g.BOARD}/", JSON.stringify(g.hiddenThreads))
GM_setValue("hiddenReplies/#{g.BOARD}/", JSON.stringify(g.hiddenReplies))
GM_setValue('lastChecked', now.toString())
*/
=======
lastChecked = Number(GM_getValue('lastChecked', '0'));
now = Date.now();
DAY = 1000 * 60 * 60 * 24;
if (lastChecked < now - 1 * DAY) {
cutoff = now - 7 * DAY;
while (g.hiddenThreads.length) {
if (g.hiddenThreads[0].timestamp > cutoff) {
break;
}
g.hiddenThreads.shift();
}
while (g.hiddenReplies.length) {
if (g.hiddenReplies[0].timestamp > cutoff) {
break;
}
g.hiddenReplies.shift();
}
GM_setValue("hiddenThreads/" + g.BOARD + "/", JSON.stringify(g.hiddenThreads));
GM_setValue("hiddenReplies/" + g.BOARD + "/", JSON.stringify(g.hiddenReplies));
GM_setValue('lastChecked', now.toString());
}
>>>>>>>
/*
lastChecked = Number GM_getValue('lastChecked', '0')
now = Date.now()
DAY = 1000 * 60 * 60 * 24
if lastChecked < now - 1*DAY
cutoff = now - 7*DAY
while g.hiddenThreads.length
if g.hiddenThreads[0].timestamp > cutoff
break
g.hiddenThreads.shift()
while g.hiddenReplies.length
if g.hiddenReplies[0].timestamp > cutoff
break
g.hiddenReplies.shift()
GM_setValue("hiddenThreads/#{g.BOARD}/", JSON.stringify(g.hiddenThreads))
GM_setValue("hiddenReplies/#{g.BOARD}/", JSON.stringify(g.hiddenReplies))
GM_setValue('lastChecked', now.toString())
*/ |
<<<<<<<
{
name: 'Kakediagram',
content: 'packages/ffe-chart-donut-react/USAGE.md',
components: 'packages/ffe-chart-donut-react/src/[A-Z]+([A-Za-z]).js'
},
{
name: 'Accordion',
components: 'packages/ffe-accordion-react/src/Accordion*.js',
}
=======
{
name: 'Kort',
components: 'packages/ffe-cards-react/src/[A-Z]+([A-Za-z]).js'
},
>>>>>>>
{
name: 'Kakediagram',
content: 'packages/ffe-chart-donut-react/USAGE.md',
components: 'packages/ffe-chart-donut-react/src/[A-Z]+([A-Za-z]).js'
},
{
name: 'Accordion',
components: 'packages/ffe-accordion-react/src/Accordion*.js',
},
{
name: 'Kort',
components: 'packages/ffe-cards-react/src/[A-Z]+([A-Za-z]).js'
}, |
<<<<<<<
* appchan x - Version 2.9.9 - 2014-03-27
=======
* 4chan X - Version 1.4.1 - 2014-04-02
>>>>>>>
* appchan x - Version 2.9.9 - 2014-04-02
<<<<<<<
},
notify: function(el) {
var notice, notif;
notice = new Notice('warning', el);
if (!(Header.areNotificationsEnabled && d.hidden)) {
return QR.notifications.push(notice);
} else {
notif = new Notification(el.textContent, {
body: el.textContent,
icon: Favicon.logo
});
notif.onclick = function() {
return window.focus();
};
notif.onclose = function() {
return notice.close();
};
return notif.onshow = function() {
return setTimeout(function() {
notif.onclose = null;
return notif.close();
}, 7 * $.SECOND);
};
}
},
notifications: [],
cleanNotifications: function() {
var notification, _i, _len, _ref;
_ref = QR.notifications;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
notification = _ref[_i];
notification.close();
=======
QR.persona.set(post);
_ref1 = h1.nextSibling.textContent.match(/thread:(\d+),no:(\d+)/), _ = _ref1[0], threadID = _ref1[1], postID = _ref1[2];
postID = +postID;
threadID = +threadID || postID;
isReply = threadID !== postID;
QR.db.set({
boardID: g.BOARD.ID,
threadID: threadID,
postID: postID,
val: true
});
ThreadUpdater.postID = postID;
$.event('QRPostSuccessful', {
board: g.BOARD,
threadID: threadID,
postID: postID
});
$.event('QRPostSuccessful_', {
threadID: threadID,
postID: postID
});
postsCount = QR.posts.length - 1;
QR.cooldown.auto = postsCount && isReply;
if (!(Conf['Persistent QR'] || QR.cooldown.auto)) {
QR.close();
} else {
post.rm();
}
QR.cooldown.set({
req: req,
post: post,
isReply: isReply,
threadID: threadID
});
URL = threadID === postID ? "/" + g.BOARD + "/res/" + threadID : g.VIEW === 'index' && !QR.cooldown.auto && Conf['Open Post in New Tab'] ? "/" + g.BOARD + "/res/" + threadID + "#p" + postID : void 0;
if (URL) {
if (Conf['Open Post in New Tab']) {
$.open(URL);
} else {
window.location = URL;
}
>>>>>>>
},
notify: function(el) {
var notice, notif;
notice = new Notice('warning', el);
if (!(Header.areNotificationsEnabled && d.hidden)) {
return QR.notifications.push(notice);
} else {
notif = new Notification(el.textContent, {
body: el.textContent,
icon: Favicon.logo
});
notif.onclick = function() {
return window.focus();
};
notif.onclose = function() {
return notice.close();
};
return notif.onshow = function() {
return setTimeout(function() {
notif.onclose = null;
return notif.close();
}, 7 * $.SECOND);
};
}
},
notifications: [],
cleanNotifications: function() {
var notification, _i, _len, _ref;
_ref = QR.notifications;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
notification = _ref[_i];
notification.close();
<<<<<<<
nodes.fileInput.max = $('input[name=MAX_FILE_SIZE]').value;
QR.spoiler = !!$('input[name=spoiler]');
if (QR.spoiler) {
$.addClass(QR.nodes.el, 'has-spoiler');
=======
},
keydown: function(e) {
if (e.keyCode === 8 && !this.nodes.input.value) {
this.reload();
>>>>>>>
nodes.fileInput.max = $('input[name=MAX_FILE_SIZE]').value;
QR.spoiler = !!$('input[name=spoiler]');
if (QR.spoiler) {
$.addClass(QR.nodes.el, 'has-spoiler');
<<<<<<<
$.on(thumb.parentNode, 'click', ImageExpand.cb.toggle);
if (this.isClone && $.hasClass(thumb, 'expanding')) {
ImageExpand.contract(this);
ImageExpand.expand(this);
return;
=======
thumb.removeAttribute('style');
return thumb.src = this.file.thumbURL;
}
};
Sauce = {
init: function() {
var err, link, links, _i, _len, _ref;
if (!Conf['Sauce']) {
return;
}
links = [];
_ref = Conf['sauces'].split('\n');
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
link = _ref[_i];
try {
if (link[0] !== '#') {
links.push(this.createSauceLink(link.trim()));
}
} catch (_error) {
err = _error;
}
}
if (!links.length) {
return;
}
this.links = links;
this.link = $.el('a', {
target: '_blank'
});
return Post.callbacks.push({
name: 'Sauce',
cb: this.node
});
},
createSauceLink: function(link) {
var m, text;
link = link.replace(/%(T?URL|MD5|board|name)/g, function(parameter) {
var type;
return ((type = {
'%TURL': 'post.file.thumbURL',
'%URL': 'post.file.URL',
'%MD5': 'post.file.MD5',
'%board': 'post.board',
'%name': 'post.file.name'
}[parameter]) ? "' + encodeURIComponent(" + type + ") + '" : parameter);
});
text = (m = link.match(/;text:(.+)$/)) ? m[1] : link.match(/(\w+)\.\w+\//)[1];
link = link.replace(/;text:.+$/, '');
return Function('post', 'a', "a.href = '" + link + "';\na.textContent = '" + text + "';\nreturn a;");
},
node: function() {
var link, nodes, _i, _len, _ref;
if (this.isClone || !this.file) {
return;
}
nodes = [];
_ref = Sauce.links;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
link = _ref[_i];
nodes.push($.tn('\u00A0'), link(this, Sauce.link.cloneNode(true)));
}
return $.add(this.file.text, nodes);
}
};
Linkify = {
init: function() {
if (!Conf['Linkify']) {
return;
}
if (Conf['Comment Expansion']) {
ExpandComment.callbacks.push(this.node);
}
if (Conf['Embedding'] || Conf['Link Title']) {
this.embedProcess = Function('link', "var data = this.services(link); if (data) { " + ((Conf['Embedding'] ? 'this.embed(data);\n' : '') + (Conf['Title Link'] ? 'this.title(data);' : '')) + " }");
}
return Post.callbacks.push({
name: 'Linkify',
cb: this.node
});
},
events: function(post) {
var el, i, items;
i = 0;
items = $$('.embedder', post.nodes.comment);
while (el = items[i++]) {
$.on(el, 'click', Linkify.cb.toggle);
if ($.hasClass(el, 'embedded')) {
Linkify.cb.toggle.call(el);
}
}
},
node: function() {
var data, end, endNode, i, index, length, link, links, node, result, saved, snapshot, space, test, word;
if (this.isClone) {
return (Conf['Embedding'] ? Linkify.events(this) : null);
}
if (!Linkify.regString.test(this.info.comment)) {
return;
}
test = /[^\s'"]+/g;
space = /[\s'"]/;
snapshot = $.X('.//br|.//text()', this.nodes.comment);
i = 0;
links = [];
while (node = snapshot.snapshotItem(i++)) {
data = node.data;
if (!data || node.parentElement.nodeName === "A") {
continue;
}
while (result = test.exec(data)) {
index = result.index;
endNode = node;
word = result[0];
if ((length = index + word.length) === data.length) {
test.lastIndex = 0;
while ((saved = snapshot.snapshotItem(i++))) {
if (saved.nodeName === 'BR') {
break;
}
endNode = saved;
data = saved.data;
word += data;
length = data.length;
if (end = space.exec(data)) {
test.lastIndex = length = end.index;
i--;
break;
}
}
}
if (Linkify.regString.exec(word)) {
links.push(Linkify.makeRange(node, endNode, index, length));
}
if (!(test.lastIndex && node === endNode)) {
break;
}
}
>>>>>>>
$.on(thumb.parentNode, 'click', ImageExpand.cb.toggle);
if (this.isClone && $.hasClass(thumb, 'expanding')) {
ImageExpand.contract(this);
ImageExpand.expand(this);
return;
<<<<<<<
cb: {
toggle: function(e) {
if (e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || e.button !== 0) {
return;
}
e.preventDefault();
return ImageExpand.toggle(Get.postFromNode(this));
},
toggleAll: function() {
var func;
$.event('CloseMenu');
if (ImageExpand.on = $.hasClass(ImageExpand.EAI, 'expand-all-shortcut')) {
ImageExpand.EAI.className = 'contract-all-shortcut a-icon';
ImageExpand.EAI.title = 'Contract All Images';
func = ImageExpand.expand;
} else {
ImageExpand.EAI.className = 'expand-all-shortcut a-icon';
ImageExpand.EAI.title = 'Expand All Images';
func = ImageExpand.contract;
}
return g.posts.forEach(function(post) {
var file, _i, _len, _ref;
_ref = [post].concat(post.clones);
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
post = _ref[_i];
file = post.file;
if (!(file && file.isImage && doc.contains(post.nodes.root))) {
return;
}
if (ImageExpand.on && (!Conf['Expand spoilers'] && file.isSpoiler || Conf['Expand from here'] && Header.getTopOf(file.thumb) < 0)) {
return;
}
$.queueTask(func, post);
}
});
},
setFitness: function() {
return (this.checked ? $.addClass : $.rmClass)(doc, this.name.toLowerCase().replace(/\s+/g, '-'));
}
},
toggle: function(post) {
var headRect, left, root, thumb, top, x, y, _ref;
thumb = post.file.thumb;
if (!(post.file.isExpanded || $.hasClass(thumb, 'expanding'))) {
ImageExpand.expand(post);
return;
=======
embedProcess: function() {},
regString: /((https?|mailto|git|magnet|ftp|irc):([a-z\d%\/])|[-a-z\d]+[.](aero|asia|biz|cat|com|coop|info|int|jobs|mobi|museum|name|net|org|post|pro|tel|travel|xxx|edu|gov|mil|[a-z]{2})([:\/]|(?!.))|[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}|[-\w\d.@]+@[a-z\d.-]+\.[a-z\d])/i,
makeRange: function(startNode, endNode, startOffset, endOffset) {
var range;
range = document.createRange();
range.setStart(startNode, startOffset);
range.setEnd(endNode, endOffset);
return range;
},
makeLink: function(range) {
var a, i, t, text;
text = range.toString();
i = 0;
while (/[(\[{<>]/.test(text.charAt(i))) {
i++;
>>>>>>>
cb: {
toggle: function(e) {
if (e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || e.button !== 0) {
return;
}
e.preventDefault();
return ImageExpand.toggle(Get.postFromNode(this));
},
toggleAll: function() {
var func;
$.event('CloseMenu');
if (ImageExpand.on = $.hasClass(ImageExpand.EAI, 'expand-all-shortcut')) {
ImageExpand.EAI.className = 'contract-all-shortcut a-icon';
ImageExpand.EAI.title = 'Contract All Images';
func = ImageExpand.expand;
} else {
ImageExpand.EAI.className = 'expand-all-shortcut a-icon';
ImageExpand.EAI.title = 'Expand All Images';
func = ImageExpand.contract;
}
return g.posts.forEach(function(post) {
var file, _i, _len, _ref;
_ref = [post].concat(post.clones);
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
post = _ref[_i];
file = post.file;
if (!(file && file.isImage && doc.contains(post.nodes.root))) {
return;
}
if (ImageExpand.on && (!Conf['Expand spoilers'] && file.isSpoiler || Conf['Expand from here'] && Header.getTopOf(file.thumb) < 0)) {
return;
}
$.queueTask(func, post);
}
});
},
setFitness: function() {
return (this.checked ? $.addClass : $.rmClass)(doc, this.name.toLowerCase().replace(/\s+/g, '-'));
}
},
toggle: function(post) {
var headRect, left, root, thumb, top, x, y, _ref;
thumb = post.file.thumb;
if (!(post.file.isExpanded || $.hasClass(thumb, 'expanding'))) {
ImageExpand.expand(post);
return; |
<<<<<<<
var $, $$, DAY, Favicon, HOUR, MINUTE, NAMESPACE, QR, SECOND, Time, anonymize, conf, config, d, expandComment, expandThread, firstRun, g, getTitle, imgExpand, imgGif, imgHover, imgPreloading, key, keybinds, log, main, nav, nodeInserted, options, quoteBacklink, quoteInline, quoteOP, quotePreview, redirect, replyHiding, reportButton, revealSpoilers, sauce, threadHiding, threadStats, threading, titlePost, ui, unread, updater, val, watcher;
=======
var $, $$, DAY, Favicon, HOUR, MINUTE, Main, NAMESPACE, Recaptcha, SECOND, Time, anonymize, conf, config, cooldown, d, expandComment, expandThread, firstRun, g, getTitle, imgExpand, imgGif, imgHover, imgPreloading, key, keybinds, log, nav, nodeInserted, options, qr, quoteBacklink, quoteInline, quoteOP, quotePreview, redirect, replyHiding, reportButton, revealSpoilers, sauce, threadHiding, threadStats, threading, titlePost, ui, unread, updater, val, watcher;
>>>>>>>
var $, $$, DAY, Favicon, HOUR, MINUTE, Main, NAMESPACE, QR, SECOND, Time, anonymize, conf, config, d, expandComment, expandThread, firstRun, g, getTitle, imgExpand, imgGif, imgHover, imgPreloading, key, keybinds, log, nav, nodeInserted, options, quoteBacklink, quoteInline, quoteOP, quotePreview, redirect, replyHiding, reportButton, revealSpoilers, sauce, threadHiding, threadStats, threading, titlePost, ui, unread, updater, val, watcher;
<<<<<<<
g.callbacks.push(function(root) {
var quote;
quote = $('a.quotejs + a', root);
return $.bind(quote, 'click', QR.quote);
});
$.add(d.body, $.el('iframe', {
name: 'iframe',
hidden: true
}));
$.bind(window, 'message', QR.receive);
$('#recaptcha_response_field').id = '';
holder = $('#recaptcha_challenge_field_holder');
$.bind(holder, 'DOMNodeInserted', QR.captchaNode);
QR.captchaNode({
target: holder.firstChild
});
QR.accept = $('.rules').textContent.match(/: (.+) /)[1].replace(/\w+/g, function(type) {
=======
_ref = $$('#com_submit');
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
submit = _ref[_i];
submit.value = cooldown.duration;
submit.disabled = true;
}
return setTimeout(cooldown.cb, 1000);
},
cb: function() {
var submit, submits, _i, _j, _len, _len2, _results;
submits = $$('#com_submit');
if (--cooldown.duration) {
setTimeout(cooldown.cb, 1000);
_results = [];
for (_i = 0, _len = submits.length; _i < _len; _i++) {
submit = submits[_i];
_results.push(submit.value = cooldown.duration);
}
return _results;
} else {
for (_j = 0, _len2 = submits.length; _j < _len2; _j++) {
submit = submits[_j];
submit.disabled = false;
submit.value = 'Submit';
}
return qr.autoPost();
}
}
};
qr = {
init: function() {
var iframe;
g.callbacks.push(qr.node);
$.bind($('#recaptcha_challenge_field_holder'), 'DOMNodeInserted', qr.captchaNode);
qr.captchaTime = Date.now();
qr.spoiler = $('.postarea label') ? '<label> [<input type=checkbox name=spoiler>Spoiler Image?]</label>' : '';
qr.acceptFiles = $('.rules').textContent.match(/: (.+) /)[1].replace(/\w+/g, function(type) {
>>>>>>>
g.callbacks.push(function(root) {
var quote;
quote = $('a.quotejs + a', root);
return $.bind(quote, 'click', QR.quote);
});
$.add(d.body, $.el('iframe', {
name: 'iframe',
hidden: true
}));
$.bind(window, 'message', QR.receive);
$('#recaptcha_response_field').id = '';
holder = $('#recaptcha_challenge_field_holder');
$.bind(holder, 'DOMNodeInserted', QR.captchaNode);
QR.captchaNode({
target: holder.firstChild
});
QR.accept = $('.rules').textContent.match(/: (.+) /)[1].replace(/\w+/g, function(type) {
<<<<<<<
cooldown: function() {
var b, cooldown, n, now;
if (!(g.REPLY && QR.qr)) {
=======
dialog: function(link) {
var THREAD_ID, c, email, html, m, name, pwd, submitDisabled, submitValue;
c = d.cookie;
name = (m = c.match(/4chan_name=([^;]+)/)) ? decodeURIComponent(m[1]) : '';
email = (m = c.match(/4chan_email=([^;]+)/)) ? decodeURIComponent(m[1]) : '';
pwd = (m = c.match(/4chan_pass=([^;]+)/)) ? decodeURIComponent(m[1]) : $('input[name=pwd]').value;
submitValue = $('#com_submit').value;
submitDisabled = $('#com_submit').disabled ? 'disabled' : '';
THREAD_ID = g.THREAD_ID || $.x('ancestor::div[@class="thread"]/div', link).id;
qr.challenge = $('#recaptcha_challenge_field').value;
html = " <a id=close title=close>X</a> <input type=checkbox id=autohide title=autohide> <div class=move> <input class=inputtext type=text name=name value='" + name + "' placeholder=Name form=qr_form> Quick Reply </div> <div class=autohide> <form name=post action=http://sys.4chan.org/" + g.BOARD + "/post method=POST enctype=multipart/form-data target=iframe id=qr_form> <input type=hidden name=resto value=" + THREAD_ID + "> <input type=hidden name=mode value=regist> <input type=hidden name=recaptcha_challenge_field id=recaptcha_challenge_field> <input type=hidden name=recaptcha_response_field id=recaptcha_response_field> <div><input class=inputtext type=text name=email value='" + email + "' placeholder=E-mail>" + qr.spoiler + "</div> <div><input class=inputtext type=text name=sub placeholder=Subject><input type=submit value=" + submitValue + " id=com_submit " + submitDisabled + "><label><input type=checkbox id=auto>auto</label></div> <div><textarea class=inputtext name=com placeholder=Comment></textarea></div> <div><img src=http://www.google.com/recaptcha/api/image?c=" + qr.challenge + "></div> <div><input class=inputtext type=text autocomplete=off placeholder=Verification id=dummy><span id=captchas>" + ($.get('captchas', []).length) + " captchas</span></div> <div><input type=file name=upfile accept='" + qr.acceptFiles + "'></div> </form> <div id=files></div> <div><input class=inputtext type=password name=pwd value='" + pwd + "' placeholder=Password form=qr_form maxlength=8><a id=attach>attach another file</a></div> </div> <a id=error class=error></a> ";
qr.el = ui.dialog('qr', 'top: 0; left: 0;', html);
$.bind($('input[name=name]', qr.el), 'mousedown', function(e) {
return e.stopPropagation();
});
$.bind($('input[name=upfile]', qr.el), 'change', qr.validateFileSize);
$.bind($('#close', qr.el), 'click', qr.close);
$.bind($('form', qr.el), 'submit', qr.submit);
$.bind($('#attach', qr.el), 'click', qr.attach);
$.bind($('img', qr.el), 'click', Recaptcha.reload);
$.bind($('#dummy', qr.el), 'keydown', Recaptcha.listener);
$.bind($('#dummy', qr.el), 'keydown', qr.captchaKeydown);
return $.add(d.body, qr.el);
},
message: function(e) {
var data, duration, fileCount;
$('iframe[name=iframe]').src = 'about:blank';
fileCount = $('#files', qr.el).childElementCount;
data = e.data;
if (data) {
data = JSON.parse(data);
$.extend($('#error', qr.el), data);
$('#recaptcha_response_field', qr.el).value = '';
$('#autohide', qr.el).checked = false;
if (data.textContent === 'You seem to have mistyped the verification.') {
setTimeout(qr.autoPost, 1000);
} else if (data.textContent === 'Error: Duplicate file entry detected.' && fileCount) {
$('textarea', qr.el).value += '\n' + data.textContent + ' ' + data.href;
qr.attachNext();
setTimeout(qr.autoPost, 1000);
}
>>>>>>>
cooldown: function() {
var b, cooldown, n, now;
if (!(g.REPLY && QR.qr)) {
<<<<<<<
var callback, cutoff, hiddenThreads, id, lastChecked, now, op, pathname, table, temp, timestamp, tzOffset, _i, _j, _k, _l, _len, _len2, _len3, _len4, _ref, _ref2, _ref3, _ref4, _ref5;
$.unbind(window, 'load', main.init);
=======
var callback, canPost, cutoff, form, hiddenThreads, id, lastChecked, now, op, pathname, table, temp, timestamp, tzOffset, _i, _j, _k, _l, _len, _len2, _len3, _len4, _ref, _ref2, _ref3, _ref4, _ref5;
$.unbind(window, 'load', Main.init);
>>>>>>>
var callback, cutoff, hiddenThreads, id, lastChecked, now, op, pathname, table, temp, timestamp, tzOffset, _i, _j, _k, _l, _len, _len2, _len3, _len4, _ref, _ref2, _ref3, _ref4, _ref5;
$.unbind(window, 'load', Main.init);
<<<<<<<
$.addStyle(main.css);
=======
$.addStyle(Main.css);
if ((form = $('form[name=post]')) && (canPost = !!$('#recaptcha_response_field'))) {
Recaptcha.init();
if (g.REPLY && conf['Auto Watch Reply'] && conf['Thread Watcher']) {
$.bind(form, 'submit', function() {
if ($('img.favicon').src === Favicon.empty) {
return watcher.watch(null, g.THREAD_ID);
}
});
}
}
>>>>>>>
$.addStyle(Main.css); |
<<<<<<<
'ffe-details-list',
=======
'ffe-decorators-react',
>>>>>>>
'ffe-decorators-react',
'ffe-details-list', |
<<<<<<<
'ffe-expandable-react',
=======
'ffe-decorators-react',
'ffe-details-list',
'ffe-dropdown-react',
>>>>>>>
'ffe-decorators-react',
'ffe-details-list',
'ffe-dropdown-react',
'ffe-expandable-react', |
<<<<<<<
'ffe-file-upload-react',
=======
'ffe-decorators-react',
'ffe-details-list',
'ffe-dropdown-react',
'ffe-expandable-react',
>>>>>>>
'ffe-decorators-react',
'ffe-details-list',
'ffe-dropdown-react',
'ffe-expandable-react',
'ffe-file-upload-react', |
<<<<<<<
* appchan x - Version 2.2.1 - 2013-07-31
=======
* 4chan X - Version 1.2.24 - 2013-08-01
>>>>>>>
* appchan x - Version 2.2.1 - 2013-08-01 |
<<<<<<<
var el, fileInfo, img, parentClass, post;
parentClass = node.parentNode.className;
=======
var el, img, post, rootClass;
rootClass = node.className;
>>>>>>>
var el, img, parentClass, post;
parentClass = node.parentNode.className; |
<<<<<<<
* appchan x - Version 2.4.1 - 2013-10-14
=======
* 4chan X - Version 1.2.41 - 2013-10-16
>>>>>>>
* appchan x - Version 2.4.1 - 2013-10-16 |
<<<<<<<
var thumb;
if (!(this.file && (this.file.isImage || this.file.isVideo))) {
=======
var clone, thumb, _ref, _ref1;
if (!(((_ref = this.file) != null ? _ref.isImage : void 0) || ((_ref1 = this.file) != null ? _ref1.isVideo : void 0))) {
>>>>>>>
var clone, thumb, _ref, _ref1;
if (!(((_ref = this.file) != null ? _ref.isImage : void 0) || ((_ref1 = this.file) != null ? _ref1.isVideo : void 0))) {
<<<<<<<
if (this.isClone) {
if (this.file.isImage && this.file.isExpanding) {
ImageExpand.contract(this);
ImageExpand.expand(this);
return;
}
if (this.file.isExpanded && this.file.isVideo) {
ImageExpand.setupVideoControls(this);
return;
}
}
if (ImageExpand.on && !this.isHidden && (Conf['Expand spoilers'] || !this.file.isSpoiler)) {
return ImageExpand.expand(this);
=======
if (this.isClone && $.hasClass(thumb, 'expanding')) {
ImageExpand.contract(this);
return ImageExpand.expand(this);
} else if (this.isClone && this.file.isExpanded && this.file.isVideo) {
clone = this;
ImageExpand.setupVideoControls(clone);
if (!clone.origin.file.fullImage.paused) {
return $.queueTask(function() {
return ImageExpand.startVideo(clone);
});
}
} else if (ImageExpand.on && !this.isHidden && (Conf['Expand spoilers'] || !this.file.isSpoiler) && (Conf['Expand videos'] || !this.file.isVideo)) {
return ImageExpand.expand(this, null, true);
>>>>>>>
if (this.isClone && $.hasClass(thumb, 'expanding')) {
ImageExpand.contract(this);
return ImageExpand.expand(this);
} else if (this.isClone && this.file.isExpanded && this.file.isVideo) {
clone = this;
ImageExpand.setupVideoControls(clone);
if (!clone.origin.file.fullImage.paused) {
return $.queueTask(function() {
return ImageExpand.startVideo(clone);
});
}
} else if (ImageExpand.on && !this.isHidden && (Conf['Expand spoilers'] || !this.file.isSpoiler) && (Conf['Expand videos'] || !this.file.isVideo)) {
return ImageExpand.expand(this, null, true);
<<<<<<<
completeExpand: function(post) {
var bottom, complete, thumb;
=======
completeExpand: function(post, disableAutoplay) {
var bottom, thumb;
>>>>>>>
completeExpand: function(post, disableAutoplay) {
var bottom, thumb;
<<<<<<<
complete();
=======
ImageExpand.completeExpand2(post, disableAutoplay);
>>>>>>>
ImageExpand.completeExpand2(post, disableAutoplay);
<<<<<<<
=======
completeExpand2: function(post, disableAutoplay) {
var thumb;
thumb = post.file.thumb;
$.addClass(post.nodes.root, 'expanded-image');
$.rmClass(post.file.thumb, 'expanding');
post.file.isExpanded = true;
if (post.file.isVideo) {
ImageExpand.setupVideoControls(post);
post.file.fullImage.muted = !Conf['Allow Sound'];
post.file.fullImage.controls = Conf['Show Controls'];
if (Conf['Autoplay'] && !disableAutoplay) {
return ImageExpand.startVideo(post);
}
}
},
>>>>>>>
completeExpand2: function(post, disableAutoplay) {
var thumb;
thumb = post.file.thumb;
$.addClass(post.nodes.root, 'expanded-image');
$.rmClass(post.file.thumb, 'expanding');
post.file.isExpanded = true;
if (post.file.isVideo) {
ImageExpand.setupVideoControls(post);
post.file.fullImage.muted = !Conf['Allow Sound'];
post.file.fullImage.controls = Conf['Show Controls'];
if (Conf['Autoplay'] && !disableAutoplay) {
return ImageExpand.startVideo(post);
}
}
}, |
<<<<<<<
rules: {
'type-empty': [2, 'never'],
'scope-enum': [
2,
'always',
[
'release',
'eslint-config-ffe',
'eslint-config-ffe-base',
'stylelint-config-ffe',
'ffe-accordion',
'ffe-accordion-react',
'ffe-buttons',
'ffe-buttons-react',
'ffe-cards',
'ffe-cards-react',
'ffe-chart-donut-react',
'ffe-core',
'ffe-core-react',
'ffe-form',
'ffe-icons',
'ffe-icons-react',
'ffe-searchable-dropdown-react',
],
],
},
=======
rules: {
'type-empty': [2, 'never'],
'scope-enum': [2, 'always', [
'release',
'eslint-config-ffe',
'eslint-config-ffe-base',
'stylelint-config-ffe',
'ffe-accordion',
'ffe-accordion-react',
'ffe-buttons',
'ffe-buttons-react',
'ffe-cards',
'ffe-cards-react',
'ffe-chart-donut-react',
'ffe-context-message',
'ffe-context-message-react',
'ffe-core',
'ffe-core-react',
'ffe-form',
'ffe-icons',
'ffe-icons-react'
]]
}
>>>>>>>
rules: {
'type-empty': [2, 'never'],
'scope-enum': [
2,
'always',
[
'release',
'eslint-config-ffe',
'eslint-config-ffe-base',
'stylelint-config-ffe',
'ffe-accordion',
'ffe-accordion-react',
'ffe-buttons',
'ffe-buttons-react',
'ffe-cards',
'ffe-cards-react',
'ffe-chart-donut-react',
'ffe-context-message',
'ffe-context-message-react',
'ffe-core',
'ffe-core-react',
'ffe-form',
'ffe-icons',
'ffe-icons-react',
'ffe-searchable-dropdown-react',
],
],
}, |
<<<<<<<
* 4chan X - Version 1.2.19 - 2013-07-21
=======
* 4chan X - Version 1.2.24 - 2013-07-24
>>>>>>>
* 4chan X - Version 1.2.24 - 2013-07-24
<<<<<<<
var cb;
if (d.readyState !== 'loading') {
=======
var cb, _ref;
if ((_ref = d.readyState) === 'interactive' || _ref === 'complete') {
>>>>>>>
var cb;
if (d.readyState !== 'loading') {
<<<<<<<
=======
$.item = function(key, val) {
var item;
item = {};
item[key] = val;
return item;
};
>>>>>>>
<<<<<<<
var capcode, date, email, flag, info, name, post, subject, tripcode, uniqueID;
=======
var alt, anchor, capcode, date, email, file, fileInfo, flag, info, name, post, size, subject, thumb, tripcode, uniqueID, unit;
>>>>>>>
var capcode, date, email, flag, info, name, post, subject, tripcode, uniqueID;
<<<<<<<
var bq, i, node, nodes, text, _i, _len, _ref;
=======
var bq, data, i, node, nodes, text, _i, _len, _ref;
>>>>>>>
var bq, i, node, nodes, text, _i, _len, _ref;
<<<<<<<
var file, info, inline, inlined, key, nodes, post, root, val, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2, _ref3;
=======
var file, index, info, inline, inlined, key, nodes, post, root, val, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2, _ref3;
>>>>>>>
var file, info, inline, inlined, key, nodes, post, root, val, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2, _ref3;
<<<<<<<
return $.id('boardNavMobile') || d.readyState !== 'loading';
=======
var _ref;
return $.id('boardNavMobile') || ((_ref = d.readyState) === 'interactive' || _ref === 'complete');
>>>>>>>
return $.id('boardNavMobile') || d.readyState !== 'loading';
<<<<<<<
var boardID, path, postID, threadID, _ref;
=======
var boardID, path, postID, threadID;
>>>>>>>
var boardID, path, postID, threadID, _ref;
<<<<<<<
var post, _i, _len, _ref;
=======
var i, _i, _len, _ref;
>>>>>>>
var post, _i, _len, _ref;
<<<<<<<
var disabled, status, thread, value;
=======
var disabled, status, value;
>>>>>>>
var disabled, status, thread, value;
<<<<<<<
var caretPos, com, index, post, range, s, sel, text, thread, _ref;
=======
var OP, caretPos, com, index, post, range, s, sel, selectionRoot, text, thread, _ref;
>>>>>>>
var caretPos, com, index, post, range, s, sel, text, thread, _ref;
<<<<<<<
if (files instanceof Event) {
=======
if (this instanceof Element) {
>>>>>>>
if (files instanceof Event) {
<<<<<<<
this["delete"]();
=======
$.rm(this.nodes.el);
>>>>>>>
this["delete"]();
<<<<<<<
var name, _ref;
=======
var value, _ref;
>>>>>>>
var name, _ref;
<<<<<<<
=======
if (!window.URL) {
if (!fileURL) {
reader = new FileReader();
reader.onload = function(e) {
return _this.setThumbnail(e.target.result);
};
reader.readAsDataURL(this.file);
return;
}
} else {
fileURL = URL.createObjectURL(this.file);
}
>>>>>>>
<<<<<<<
=======
el = $('.drag', this.parentNode);
$.rmClass(el, 'drag');
>>>>>>>
<<<<<<<
$.get('captchas', [], function(_arg) {
var captchas;
captchas = _arg.captchas;
return _this.sync(captchas);
=======
$.get('captchas', [], function(_arg) {
var captchas;
captchas = _arg.captchas;
return _this.sync(captchas);
>>>>>>>
$.get('captchas', [], function(_arg) {
var captchas;
captchas = _arg.captchas;
return _this.sync(captchas);
<<<<<<<
=======
button = Menu.makeButton(this);
>>>>>>>
<<<<<<<
return function() {
=======
return function(post) {
var clone;
>>>>>>>
return function() {
<<<<<<<
return Menu.menu.toggle(e, this, Get.postFromNode(this));
=======
var post;
post = this.dataset.clone ? Get.postFromNode(this) : g.posts[this.dataset.postid];
return Menu.menu.toggle(e, this, post);
>>>>>>>
return Menu.menu.toggle(e, this, Get.postFromNode(this));
<<<<<<<
var checkPosition, hash, onload, post, posts, root;
=======
var checkPosition, hash, onload, post, posts, prevID, root;
>>>>>>>
var checkPosition, hash, onload, post, posts, root;
<<<<<<<
var archive, arr, boardID, data, id, name, type, _ref, _ref1, _ref2, _results;
=======
var archive, arr, boardID, data, id, name, type, _i, _len, _ref, _ref1, _ref2, _ref3;
>>>>>>>
var archive, arr, boardID, data, id, name, type, _ref, _ref1, _ref2, _results;
<<<<<<<
=======
Sauce = {
init: function() {
var err, link, links, _i, _len, _ref;
if (g.VIEW === 'catalog' || !Conf['Sauce']) {
return;
}
links = [];
_ref = Conf['sauces'].split('\n');
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
link = _ref[_i];
if (link[0] === '#') {
continue;
}
try {
links.push(this.createSauceLink(link.trim()));
} catch (_error) {
err = _error;
continue;
}
}
if (!links.length) {
return;
}
this.links = links;
this.link = $.el('a', {
target: '_blank'
});
return Post.prototype.callbacks.push({
name: 'Sauce',
cb: this.node
});
},
createSauceLink: function(link) {
var m, text;
link = link.replace(/%(T?URL|MD5|board)/ig, function(parameter) {
switch (parameter) {
case '%TURL':
return "' + encodeURIComponent(post.file.thumbURL) + '";
case '%URL':
return "' + encodeURIComponent(post.file.URL) + '";
case '%MD5':
return "' + encodeURIComponent(post.file.MD5) + '";
case '%board':
return "' + encodeURIComponent(post.board) + '";
default:
return parameter;
}
});
text = (m = link.match(/;text:(.+)$/)) ? m[1] : link.match(/(\w+)\.\w+\//)[1];
link = link.replace(/;text:.+$/, '');
return Function('post', 'a', "a.href = '" + link + "';\na.textContent = '" + text + "';\nreturn a;");
},
node: function() {
var link, nodes, _i, _len, _ref;
if (this.isClone || !this.file) {
return;
}
nodes = [];
_ref = Sauce.links;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
link = _ref[_i];
nodes.push($.tn('\u00A0'), link(this, Sauce.link.cloneNode(true)));
}
return $.add(this.file.info, nodes);
}
};
>>>>>>>
<<<<<<<
return d.head && $('link[rel="shortcut icon"]', d.head) || d.readyState !== 'loading';
=======
var _ref;
return d.head && $('link[rel="shortcut icon"]', d.head) || ((_ref = d.readyState) === 'interactive' || _ref === 'complete');
>>>>>>>
return d.head && $('link[rel="shortcut icon"]', d.head) || d.readyState !== 'loading';
<<<<<<<
var mainStyleSheet, setStyle, style, styleSheets, _ref;
=======
var mainStyleSheet, observer, setStyle, style, styleSheets, _ref;
>>>>>>>
var mainStyleSheet, setStyle, style, styleSheets, _ref;
<<<<<<<
var board, err, errors, href, passLink, postRoot, posts, styleSelector, thread, threadRoot, threads, _i, _j, _len, _len1, _ref, _ref1;
=======
var board, boardChild, err, errors, href, passLink, posts, styleSelector, thread, threadChild, threads, _i, _j, _len, _len1, _ref, _ref1;
>>>>>>>
var board, err, errors, href, passLink, postRoot, posts, styleSelector, thread, threadRoot, threads, _i, _j, _len, _len1, _ref, _ref1; |
<<<<<<<
* appchan x - Version 2.9.8 - 2014-03-26
=======
* 4chan X - Version 1.4.1 - 2014-03-27
>>>>>>>
* appchan x - Version 2.9.8 - 2014-03-27
<<<<<<<
$.on(d, 'QRAddPreSubmitHook', function(_arg) {
var cb;
cb = _arg.detail;
return QR.preSubmitHooks.push(cb);
=======
$.sync('captchas', QR.captcha.sync);
QR.captcha.nodes.challenge = challenge;
new MutationObserver(QR.captcha.load.bind(QR.captcha)).observe(challenge, {
childList: true,
subtree: true,
attributes: true
>>>>>>>
$.on(d, 'QRAddPreSubmitHook', function(_arg) {
var cb;
cb = _arg.detail;
return QR.preSubmitHooks.push(cb);
<<<<<<<
=======
makeButton: (function() {
var a;
a = $.el('a', {
className: 'menu-button',
innerHTML: '<i class="fa fa-angle-down"></i>',
href: 'javascript:;'
});
return function() {
var button;
button = a.cloneNode(true);
$.on(button, 'click', Menu.toggle);
return button;
};
})(),
toggle: function(e) {
var fullID;
fullID = $.x('ancestor::*[@data-full-i-d][1]', this).dataset.fullID;
return Menu.menu.toggle(e, this, g.posts[fullID]);
}
};
>>>>>>>
<<<<<<<
close: function() {
Conf['editMode'] = false;
editMascot = {};
$.rm($.id('mascotConf'));
return Settings.open("Mascots");
},
importMascot: function() {
var file, reader;
file = this.files[0];
reader = new FileReader();
reader.onload = function(e) {
var err, mascots;
try {
mascots = JSON.parse(e.target.result);
} catch (_error) {
err = _error;
alert(err);
return;
=======
archives: [
{
name: "Foolz",
boards: ["a", "biz", "co", "diy", "gd", "jp", "m", "sci", "sp", "tg", "tv", "v", "vg", "vp", "vr", "wsg"],
files: ["a", "biz", "diy", "gd", "jp", "m", "sci", "tg", "vg", "vp", "vr", "wsg"],
data: {
domain: "archive.foolz.us",
http: false,
https: true,
software: "foolfuuka"
}
}, {
name: "NSFW Foolz",
boards: ["u"],
files: ["u"],
data: {
domain: "nsfw.foolz.us",
http: false,
https: true,
software: "foolfuuka"
}
}, {
name: "The Dark Cave",
boards: ["c", "int", "out", "po"],
files: ["c", "po"],
data: {
domain: "archive.thedarkcave.org",
http: true,
https: true,
software: "foolfuuka"
}
}, {
name: "4plebs",
boards: ["adv", "hr", "o", "pol", "s4s", "tg", "trv", "tv", "x"],
files: ["adv", "hr", "o", "pol", "s4s", "tg", "trv", "tv", "x"],
data: {
domain: "archive.4plebs.org",
http: true,
https: true,
software: "foolfuuka"
}
}, {
name: "4plebs Flash Archive",
boards: ["f"],
files: ["f"],
data: {
domain: "flash.4plebs.org",
http: true,
https: true,
software: "foolfuuka"
}
}, {
name: "Nyafuu",
boards: ["c", "e", "w", "wg"],
files: ["c", "e", "w", "wg"],
data: {
domain: "archive.nyafuu.org",
http: true,
https: true,
software: "foolfuuka"
}
}, {
name: "Love is Over",
boards: ["d", "i"],
files: ["d", "i"],
data: {
domain: "loveisover.me",
http: true,
https: true,
software: "foolfuuka"
}
}, {
name: "Rebecca Black Tech",
boards: ["cgl", "g", "mu", "w"],
files: ["cgl", "g", "mu", "w"],
data: {
domain: "archive.rebeccablacktech.com",
http: true,
https: true,
software: "fuuka"
>>>>>>>
close: function() {
Conf['editMode'] = false;
editMascot = {};
$.rm($.id('mascotConf'));
return Settings.open("Mascots");
},
importMascot: function() {
var file, reader;
file = this.files[0];
reader = new FileReader();
reader.onload = function(e) {
var err, mascots;
try {
mascots = JSON.parse(e.target.result);
} catch (_error) {
err = _error;
alert(err);
return; |
<<<<<<<
var thumb;
if (!(this.file && (this.file.isImage || this.file.isVideo))) {
=======
var clone, thumb, _ref, _ref1;
if (!(((_ref = this.file) != null ? _ref.isImage : void 0) || ((_ref1 = this.file) != null ? _ref1.isVideo : void 0))) {
>>>>>>>
var clone, thumb, _ref, _ref1;
if (!(((_ref = this.file) != null ? _ref.isImage : void 0) || ((_ref1 = this.file) != null ? _ref1.isVideo : void 0))) {
<<<<<<<
if (this.isClone) {
if (this.file.isImage && this.file.isExpanding) {
ImageExpand.contract(this);
ImageExpand.expand(this);
return;
}
if (this.file.isExpanded && this.file.isVideo) {
ImageExpand.setupVideoControls(this);
return;
}
}
if (ImageExpand.on && !this.isHidden && (Conf['Expand spoilers'] || !this.file.isSpoiler)) {
return ImageExpand.expand(this);
=======
if (this.isClone && $.hasClass(thumb, 'expanding')) {
ImageExpand.contract(this);
return ImageExpand.expand(this);
} else if (this.isClone && this.file.isExpanded && this.file.isVideo) {
clone = this;
ImageExpand.setupVideoControls(clone);
if (!clone.origin.file.fullImage.paused) {
return $.queueTask(function() {
return ImageExpand.startVideo(clone);
});
}
} else if (ImageExpand.on && !this.isHidden && (Conf['Expand spoilers'] || !this.file.isSpoiler) && (Conf['Expand videos'] || !this.file.isVideo)) {
return ImageExpand.expand(this, null, true);
>>>>>>>
if (this.isClone && $.hasClass(thumb, 'expanding')) {
ImageExpand.contract(this);
return ImageExpand.expand(this);
} else if (this.isClone && this.file.isExpanded && this.file.isVideo) {
clone = this;
ImageExpand.setupVideoControls(clone);
if (!clone.origin.file.fullImage.paused) {
return $.queueTask(function() {
return ImageExpand.startVideo(clone);
});
}
} else if (ImageExpand.on && !this.isHidden && (Conf['Expand spoilers'] || !this.file.isSpoiler) && (Conf['Expand videos'] || !this.file.isVideo)) {
return ImageExpand.expand(this, null, true);
<<<<<<<
completeExpand: function(post) {
var bottom, complete, thumb;
=======
completeExpand: function(post, disableAutoplay) {
var bottom, thumb;
>>>>>>>
completeExpand: function(post, disableAutoplay) {
var bottom, thumb;
<<<<<<<
complete();
=======
ImageExpand.completeExpand2(post, disableAutoplay);
>>>>>>>
ImageExpand.completeExpand2(post, disableAutoplay);
<<<<<<<
=======
completeExpand2: function(post, disableAutoplay) {
var thumb;
thumb = post.file.thumb;
$.addClass(post.nodes.root, 'expanded-image');
$.rmClass(post.file.thumb, 'expanding');
post.file.isExpanded = true;
if (post.file.isVideo) {
ImageExpand.setupVideoControls(post);
post.file.fullImage.muted = !Conf['Allow Sound'];
post.file.fullImage.controls = Conf['Show Controls'];
if (Conf['Autoplay'] && !disableAutoplay) {
return ImageExpand.startVideo(post);
}
}
},
>>>>>>>
completeExpand2: function(post, disableAutoplay) {
var thumb;
thumb = post.file.thumb;
$.addClass(post.nodes.root, 'expanded-image');
$.rmClass(post.file.thumb, 'expanding');
post.file.isExpanded = true;
if (post.file.isVideo) {
ImageExpand.setupVideoControls(post);
post.file.fullImage.muted = !Conf['Allow Sound'];
post.file.fullImage.controls = Conf['Show Controls'];
if (Conf['Autoplay'] && !disableAutoplay) {
return ImageExpand.startVideo(post);
}
}
}, |
<<<<<<<
* appchan x - Version 2.8.5 - 2014-01-17
=======
* 4chan X - Version 1.3.2 - 2014-01-17
>>>>>>>
* appchan x - Version 2.8.5 - 2014-01-17
<<<<<<<
var $, $$, Anonymize, ArchiveLink, AutoGIF, Banner, Board, Build, Callbacks, CatalogLinks, Clone, Color, Conf, Config, CustomCSS, DataBoard, DeleteLink, Dice, DownloadLink, Emoji, ExpandComment, ExpandThread, FappeTyme, Favicon, FileInfo, Filter, Fourchan, Gallery, Get, GlobalMessage, Header, IDColor, ImageExpand, ImageHover, ImageLoader, Index, InfiniScroll, JSColor, Keybinds, Linkify, Main, MascotTools, Mascots, Menu, Nav, Navigate, Notice, PSAHiding, Polyfill, Post, PostHiding, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, QuoteStrikeThrough, QuoteThreading, QuoteYou, Quotify, RandomAccessList, Recursive, Redirect, RelativeDates, RemoveSpoilers, Report, ReportLink, RevealSpoilers, Rice, Sauce, Settings, Style, ThemeTools, Themes, Thread, ThreadExcerpt, ThreadHiding, ThreadStats, ThreadUpdater, ThreadWatcher, Time, UI, Unread, c, d, doc, editMascot, editTheme, g, userNavigation,
=======
var $, $$, Anonymize, ArchiveLink, AutoGIF, Banner, Board, Build, Callbacks, CatalogLinks, Clone, Conf, Config, CustomCSS, DataBoard, DeleteLink, Dice, DownloadLink, Emoji, ExpandComment, ExpandThread, FappeTyme, Favicon, FileInfo, Filter, Fourchan, Gallery, Get, Header, IDColor, ImageExpand, ImageHover, ImageLoader, Index, InfiniScroll, Keybinds, Linkify, Main, Menu, Nav, Navigate, Notice, PSAHiding, Polyfill, Post, PostHiding, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, QuoteStrikeThrough, QuoteThreading, QuoteYou, Quotify, RandomAccessList, Recursive, Redirect, RelativeDates, RemoveSpoilers, Report, ReportLink, RevealSpoilers, Sauce, Settings, SimpleDict, Thread, ThreadExcerpt, ThreadHiding, ThreadStats, ThreadUpdater, ThreadWatcher, Time, UI, Unread, c, d, doc, g,
>>>>>>>
var $, $$, Anonymize, ArchiveLink, AutoGIF, Banner, Board, Build, Callbacks, CatalogLinks, Clone, Color, Conf, Config, CustomCSS, DataBoard, DeleteLink, Dice, DownloadLink, Emoji, ExpandComment, ExpandThread, FappeTyme, Favicon, FileInfo, Filter, Fourchan, Gallery, Get, GlobalMessage, Header, IDColor, ImageExpand, ImageHover, ImageLoader, Index, InfiniScroll, JSColor, Keybinds, Linkify, Main, MascotTools, Mascots, Menu, Nav, Navigate, Notice, PSAHiding, Polyfill, Post, PostHiding, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, QuoteStrikeThrough, QuoteThreading, QuoteYou, Quotify, RandomAccessList, Recursive, Redirect, RelativeDates, RemoveSpoilers, Report, ReportLink, RevealSpoilers, Rice, Sauce, Settings, SimpleDict, Style, ThemeTools, Themes, Thread, ThreadExcerpt, ThreadHiding, ThreadStats, ThreadUpdater, ThreadWatcher, Time, UI, Unread, c, d, doc, editMascot, editTheme, g, userNavigation,
<<<<<<<
VERSION: '2.8.5',
NAMESPACE: 'appchan_x.',
TYPE: 'sfw',
boards: {},
threads: {},
posts: {}
=======
VERSION: '1.3.2',
NAMESPACE: '4chan X.',
boards: {}
>>>>>>>
VERSION: '2.8.5',
NAMESPACE: 'appchan_x.',
boards: {}
<<<<<<<
=======
post.pasteText(file);
return;
}
if (isSingle) {
post = QR.selected;
} else if ((post = QR.posts[QR.posts.length - 1]).file) {
post = new QR.post();
}
return post.setFile(file);
},
openFileInput: function(e) {
var _ref;
e.stopPropagation();
if (e.shiftKey && e.type === 'click') {
return QR.selected.rmFile();
}
if (e.ctrlKey && e.type === 'click') {
$.addClass(QR.nodes.filename, 'edit');
QR.nodes.filename.focus();
return $.on(QR.nodes.filename, 'blur', function() {
return $.rmClass(QR.nodes.filename, 'edit');
});
}
if (e.target.nodeName === 'INPUT' || (e.keyCode && ((_ref = e.keyCode) !== 32 && _ref !== 13)) || e.ctrlKey) {
return;
}
e.preventDefault();
return QR.nodes.fileInput.click();
},
generatePostableThreadsList: function() {
var list, options, thread, val, _i, _len, _ref;
if (!QR.nodes) {
return;
}
list = QR.nodes.thread;
options = [list.firstChild];
_ref = g.BOARD.threads.keys;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
thread = _ref[_i];
options.push($.el('option', {
value: thread,
textContent: "Thread No." + thread
}));
}
val = list.value;
$.rmAll(list);
$.add(list, options);
list.value = val;
if (!list.value) {
return;
>>>>>>>
<<<<<<<
if (type === 'password') {
QR.persona.pwd = val;
=======
},
cb: {
toggle: function(e) {
if (e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || e.button !== 0) {
return;
}
e.preventDefault();
return ImageExpand.toggle(Get.postFromNode(this));
},
toggleAll: function() {
var func;
$.event('CloseMenu');
func = function(post) {
var file;
file = post.file;
if (!(file && file.isImage && doc.contains(post.nodes.root))) {
return;
}
if (ImageExpand.on && (!Conf['Expand spoilers'] && file.isSpoiler || Conf['Expand from here'] && Header.getTopOf(file.thumb) < 0)) {
return;
}
return $.queueTask(func, post);
};
if (ImageExpand.on = $.hasClass(ImageExpand.EAI, 'expand-all-shortcut')) {
ImageExpand.EAI.className = 'contract-all-shortcut fa fa-compress';
ImageExpand.EAI.title = 'Contract All Images';
func = ImageExpand.expand;
} else {
ImageExpand.EAI.className = 'expand-all-shortcut fa fa-expand';
ImageExpand.EAI.title = 'Expand All Images';
func = ImageExpand.contract;
}
return g.posts.forEach(function(post) {
var _i, _len, _ref;
func(post);
_ref = post.clones;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
post = _ref[_i];
func(post);
}
});
},
setFitness: function() {
return (this.checked ? $.addClass : $.rmClass)(doc, this.name.toLowerCase().replace(/\s+/g, '-'));
}
},
toggle: function(post) {
var headRect, left, root, thumb, top, x, y, _ref;
thumb = post.file.thumb;
if (!(post.file.isExpanded || $.hasClass(thumb, 'expanding'))) {
ImageExpand.expand(post);
>>>>>>>
if (type === 'password') {
QR.persona.pwd = val;
<<<<<<<
_ref = ['thread', 'name', 'email', 'sub', 'com', 'fileButton', 'filename', 'spoiler', 'flag'];
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
name = _ref[_i];
if (node = QR.nodes[name]) {
node.disabled = lock;
}
=======
if (this.file.isSpoiler) {
style = thumb.style;
style.maxHeight = style.maxWidth = this.isReply ? '125px' : '250px';
}
img = $.el('img');
if (Conf[string]) {
$.on(img, 'load', function() {
return thumb.src = URL;
});
}
return img.src = URL;
},
toggle: function() {
var enabled;
enabled = Conf['prefetch'] = this.checked;
if (enabled) {
ImageLoader.thread.posts.forEach(ImageLoader.node.call);
>>>>>>>
_ref = ['thread', 'name', 'email', 'sub', 'com', 'fileButton', 'filename', 'spoiler', 'flag'];
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
name = _ref[_i];
if (node = QR.nodes[name]) {
node.disabled = lock;
}
<<<<<<<
color: function(target) {
var HSV_RGB, RGB_HSV, THIS, abortBlur, blurTarget, blurValue, drawPicker, holdPad, holdSld, isPickerOwner, leavePad, leaveSld, leaveStyle, leaveValue, redrawPad, redrawSld, removePicker, setPad, setSld, styleElement, valueElement;
this.hsv = [0, 0, 1];
this.rgb = [1, 1, 1];
this.valueElement = this.styleElement = target;
abortBlur = holdPad = holdSld = false;
this.hidePicker = function() {
if (isPickerOwner()) {
return removePicker();
=======
addPosts: function(posts) {
var ID, post, _i, _len, _ref, _ref1;
for (_i = 0, _len = posts.length; _i < _len; _i++) {
post = posts[_i];
ID = post.ID;
if (ID <= Unread.lastReadPost || post.isHidden || QR.db.get({
boardID: post.board.ID,
threadID: post.thread.ID,
postID: ID
})) {
continue;
>>>>>>>
color: function(target) {
var HSV_RGB, RGB_HSV, THIS, abortBlur, blurTarget, blurValue, drawPicker, holdPad, holdSld, isPickerOwner, leavePad, leaveSld, leaveStyle, leaveValue, redrawPad, redrawSld, removePicker, setPad, setSld, styleElement, valueElement;
this.hsv = [0, 0, 1];
this.rgb = [1, 1, 1];
this.valueElement = this.styleElement = target;
abortBlur = holdPad = holdSld = false;
this.hidePicker = function() {
if (isPickerOwner()) {
return removePicker();
<<<<<<<
_ref = name && (ilen = imported.length) ? ["" + name + " successfully imported!", 'info'] : ilen ? ["" + ilen + " mascots successfully imported!", 'info'] : ["Failed to import any mascots. ;__;", 'info'], message = _ref[0], type = _ref[1];
$.set('userMascots', userMascots);
if (len !== Conf["Deleted Mascots"].length) {
$.set('Deleted Mascots', Conf['Deleted Mascots']);
=======
if ($.x('preceding-sibling::div[contains(@class,"replyContainer")]', post.data.nodes.root)) {
return $.before(post.data.nodes.root, Unread.hr);
>>>>>>>
_ref = name && (ilen = imported.length) ? ["" + name + " successfully imported!", 'info'] : ilen ? ["" + ilen + " mascots successfully imported!", 'info'] : ["Failed to import any mascots. ;__;", 'info'], message = _ref[0], type = _ref[1];
$.set('userMascots', userMascots);
if (len !== Conf["Deleted Mascots"].length) {
$.set('Deleted Mascots', Conf['Deleted Mascots']);
<<<<<<<
div = $.el("div", {
className: "themevar",
innerHTML: "<div class=optionname><b>" + item + "</b></div><div class=option><input name='" + item + "' placeholder='" + (item === "Background Image" ? "Shift+Click to upload image" : item) + "'>"
});
input = $('input', div);
input.value = editTheme[item];
switch (item) {
case "Background Image":
input.className = 'field';
fileInput = $.el('input', {
type: 'file',
accept: "image/*",
title: "BG Image",
hidden: "hidden"
});
$.on(input, 'click', function(evt) {
if (evt.shiftKey) {
return this.nextSibling.click();
}
});
$.on(fileInput, 'change', function(evt) {
return ThemeTools.uploadImage(evt, this);
});
$.after(input, fileInput);
break;
case "Background Attachment":
case "Background Position":
case "Background Repeat":
input.className = 'field';
break;
default:
input.className = "colorfield";
colorInput = $.el('input', {
className: 'color',
value: "#" + ((new Color(input.value)).hex())
});
JSColor.bind(colorInput);
$.after(input, colorInput);
=======
}, {
name: "Nyafuu",
boards: ["c", "e", "w", "wg"],
files: ["c", "e", "w", "wg"],
data: {
domain: "archive.nyafuu.org",
http: true,
https: true,
software: "foolfuuka"
>>>>>>>
div = $.el("div", {
className: "themevar",
innerHTML: "<div class=optionname><b>" + item + "</b></div><div class=option><input name='" + item + "' placeholder='" + (item === "Background Image" ? "Shift+Click to upload image" : item) + "'>"
});
input = $('input', div);
input.value = editTheme[item];
switch (item) {
case "Background Image":
input.className = 'field';
fileInput = $.el('input', {
type: 'file',
accept: "image/*",
title: "BG Image",
hidden: "hidden"
});
$.on(input, 'click', function(evt) {
if (evt.shiftKey) {
return this.nextSibling.click();
}
});
$.on(fileInput, 'change', function(evt) {
return ThemeTools.uploadImage(evt, this);
});
$.after(input, fileInput);
break;
case "Background Attachment":
case "Background Position":
case "Background Repeat":
input.className = 'field';
break;
default:
input.className = "colorfield";
colorInput = $.el('input', {
className: 'color',
value: "#" + ((new Color(input.value)).hex())
});
JSColor.bind(colorInput);
$.after(input, colorInput);
<<<<<<<
var board, sfw, theme;
=======
var aboard, board, err, _i, _len, _ref;
>>>>>>>
var aboard, board, err, _i, _len, _ref;
<<<<<<<
if (Favicon.SFW === (sfw = !!board.ws_board)) {
return;
}
g.TYPE = sfw ? 'sfw' : 'nsfw';
if (Conf["NSFW/SFW Mascots"]) {
Main.setMascotString();
MascotTools.toggle();
}
if (Conf["NSFW/SFW Themes"]) {
Main.setThemeString();
theme = Themes[Conf[g.THEMESTRING] || (sfw ? 'Yotsuba B' : 'Yotsuba')] || Themes[Conf[g.THEMESTRING] = sfw ? 'Yotsuba B' : 'Yotsuba'];
Style.setTheme(theme);
}
Favicon.SFW = sfw;
Favicon.el.href = "//s.4cdn.org/image/favicon" + (sfw ? '-ws' : '') + ".ico";
$.add(d.head, Favicon.el);
return Favicon.init();
=======
return Navigate.updateFavicon(!!board.ws_board);
>>>>>>>
return Navigate.updateFavicon(!!board.ws_board);
<<<<<<<
if (g.VIEW === 'thread' || !Conf['JSON Navigation']) {
=======
if (!(Conf['JSON Navigation'] && g.VIEW === 'index')) {
>>>>>>>
if (!(Conf['JSON Navigation'] && g.VIEW === 'index')) { |
<<<<<<<
partitions: [],
tenantTags: [],
=======
>>>>>>>
tenantTags: [],
<<<<<<<
partitions(state) {
return state.partitions
},
tenantTags(state) {
return state.tenantTags
},
=======
>>>>>>>
tenantTags(state) {
return state.tenantTags
},
<<<<<<<
async fetchPartitions({ commit }) {
let partitions = (await api.cluster.getPartitions()).data
commit('setPartitions', { partitions })
},
async fetchTenantTags({ commit }) {
let tenantTags = (await api.training.getTags()).data
commit('setTenantTags', tenantTags)
},
=======
>>>>>>>
async fetchTenantTags({ commit }) {
let tenantTags = (await api.training.getTags()).data
commit('setTenantTags', tenantTags)
},
<<<<<<<
setPartitions(state, { partitions }) {
state.partitions = partitions
},
setTenantTags(state, tenantTags) {
state.tenantTags = tenantTags
},
=======
>>>>>>>
setTenantTags(state, tenantTags) {
state.tenantTags = tenantTags
}, |
<<<<<<<
self.get('notifications').showAlert('博客所有权已成功移交给 ' + user.get('name'), {type: 'success', key: 'owner.transfer.success'});
}).catch(function (error) {
self.get('notifications').showAPIError(error, {key: 'owner.transfer'});
=======
this.get('notifications').showAlert(`Ownership successfully transferred to ${user.get('name')}`, {type: 'success', key: 'owner.transfer.success'});
}).catch((error) => {
this.get('notifications').showAPIError(error, {key: 'owner.transfer'});
>>>>>>>
this.get('notifications').showAlert(`博客所有权已成功移交给 ${user.get('name')}`, {type: 'success', key: 'owner.transfer.success'});
}).catch((error) => {
this.get('notifications').showAPIError(error, {key: 'owner.transfer'});
<<<<<<<
},
confirm: {
accept: {
text: '是的 - 我确定',
buttonClass: 'btn btn-red'
},
reject: {
text: '取消',
buttonClass: 'btn btn-default btn-minor'
}
=======
>>>>>>> |
<<<<<<<
{
name: 'Tabeller',
content: 'packages/ffe-tables-react/USAGE.md',
components: 'packages/ffe-tables-react/src/[A-Z]+([A-Za-z]).js',
},
=======
{
name: 'Skjema',
components: 'packages/ffe-form-react/src/[A-Z]+([A-Za-z]).js',
},
{
name: 'Checkbox',
components: 'packages/ffe-checkbox-react/src/[A-Z]+([A-Za-z]).js',
},
>>>>>>>
{
name: 'Tabeller',
content: 'packages/ffe-tables-react/USAGE.md',
components: 'packages/ffe-tables-react/src/[A-Z]+([A-Za-z]).js',
},
{
name: 'Skjema',
components: 'packages/ffe-form-react/src/[A-Z]+([A-Za-z]).js',
},
{
name: 'Checkbox',
components: 'packages/ffe-checkbox-react/src/[A-Z]+([A-Za-z]).js',
}, |
<<<<<<<
* @abstract
* @param {import("ol/style/Style.js").StyleLike} style The sketchStyle used for the drawing
* interaction.
* @param {VectorSource<import("ol/geom/Geometry.js").default>} source Vector source.
* @return {?import("ol/interaction/Draw.js").default|import("ngeo/interaction/DrawAzimut.js").default|import("ngeo/interaction/MobileDraw.js").default}
=======
* @param {import("ol/style/Style.js").StyleLike|undefined}
* style The sketchStyle used for the drawing interaction.
* @param {import("ol/source/Vector.js").default} source Vector source.
* @return {import("ol/interaction/Draw.js").default|import("ngeo/interaction/DrawAzimut.js").default|import("ngeo/interaction/MobileDraw.js").default}
>>>>>>>
* @param {import("ol/style/Style.js").StyleLike} style The sketchStyle used for the drawing
* interaction.
* @param {VectorSource<import("ol/geom/Geometry.js").default>} source Vector source.
* @return {?import("ol/interaction/Draw.js").default|import("ngeo/interaction/DrawAzimut.js").default|import("ngeo/interaction/MobileDraw.js").default} |
<<<<<<<
goog.require('ol.format.GeoJSON');
goog.require('ol.geom.MultiLineString');
goog.require('ol.geom.MultiPoint');
=======
>>>>>>>
goog.require('ol.format.GeoJSON'); |
<<<<<<<
=======
import Point from 'ol/geom/Point.js';
import LineString from 'ol/geom/LineString.js';
import LinearRing from 'ol/geom/LinearRing.js';
import Polygon from 'ol/geom/Polygon.js';
import MultiPoint from 'ol/geom/MultiPoint.js';
import MultiLineString from 'ol/geom/MultiLineString.js';
import MultiPolygon from 'ol/geom/MultiPolygon.js';
import GeometryCollection from 'ol/geom/GeometryCollection.js';
>>>>>>>
import Point from 'ol/geom/Point.js';
import LineString from 'ol/geom/LineString.js';
import LinearRing from 'ol/geom/LinearRing.js';
import Polygon from 'ol/geom/Polygon.js';
import MultiPoint from 'ol/geom/MultiPoint.js';
import MultiLineString from 'ol/geom/MultiLineString.js';
import MultiPolygon from 'ol/geom/MultiPolygon.js';
import GeometryCollection from 'ol/geom/GeometryCollection.js';
<<<<<<<
// @ts-ignore: not supported import
import {OL3Parser} from 'jsts/io';
/**
* @typedef {Object.<string, import("ol/style/Style.js").default|Array.<import("ol/style/Style.js").default>>} StylesObject
*/
/**
* @enum {string}
* @hidden
*/
const ObjecteditingState = {
INSERT: 'insert',
UPDATE: 'update'
};
=======
import OL3Parser from 'jsts/io/OL3Parser.js';
import 'jsts/monkey.js';
>>>>>>>
// @ts-ignore: not supported import
import {OL3Parser} from 'jsts/io';
import 'jsts/monkey.js';
/**
* @typedef {Object.<string, import("ol/style/Style.js").default|Array.<import("ol/style/Style.js").default>>} StylesObject
*/
/**
* @enum {string}
* @hidden
*/
const ObjecteditingState = {
INSERT: 'insert',
UPDATE: 'update'
};
<<<<<<<
this.jstsOL3Parser_ = new OL3Parser();
=======
this.jstsOL3Parser_ = new OL3Parser(undefined, {
geom: {
Point, LineString, LinearRing, Polygon, MultiPoint, MultiLineString, MultiPolygon, GeometryCollection
}
});
>>>>>>>
this.jstsOL3Parser_ = new OL3Parser(undefined, {
geom: {
Point, LineString, LinearRing, Polygon, MultiPoint, MultiLineString, MultiPolygon, GeometryCollection
}
});
<<<<<<<
if (geometry.getType() === 'MultiPolygon') {
=======
if (geometry instanceof MultiPolygon) {
>>>>>>>
if (geometry.getType() === 'MultiPolygon') { |
<<<<<<<
let coordProj = this.scope_['coordinatesProjections'];
=======
/**
* The maximum zoom we will zoom on result.
* @type {number}
* @export
*/
this.maxZoom = 16;
var coordProj = this.scope_['coordinatesProjections'];
>>>>>>>
/**
* The maximum zoom we will zoom on result.
* @type {number}
* @export
*/
this.maxZoom = 16;
let coordProj = this.scope_['coordinatesProjections'];
<<<<<<<
view.fit(fitArray, {size, maxZoom: 16});
=======
view.fit(fitArray, mapSize, /** @type {olx.view.FitOptions} */ ({
maxZoom: this.maxZoom}));
>>>>>>>
view.fit(fitArray, mapSize, /** @type {olx.view.FitOptions} */ ({
maxZoom: this.maxZoom})); |
<<<<<<<
const msg = this.gettextCatalog_.getString(
=======
var gettextCatalog = this.gettextCatalog_;
var msg = gettextCatalog.getString(
>>>>>>>
const gettextCatalog = this.gettextCatalog_;
const msg = gettextCatalog.getString(
<<<<<<<
const msg = this.gettextCatalog_.getString(
=======
var gettextCatalog = this.gettextCatalog_;
var msg = gettextCatalog.getString(
>>>>>>>
const gettextCatalog = this.gettextCatalog_;
const msg = gettextCatalog.getString(
<<<<<<<
const pixel = this.map.getEventPixel(evt);
const coordinate = this.map.getCoordinateFromPixel(pixel);
=======
var gettextCatalog = this.gettextCatalog_;
var pixel = this.map.getEventPixel(evt);
var coordinate = this.map.getCoordinateFromPixel(pixel);
>>>>>>>
const gettextCatalog = this.gettextCatalog_;
const pixel = this.map.getEventPixel(evt);
const coordinate = this.map.getCoordinateFromPixel(pixel); |
<<<<<<<
// Clear the capabilities if the roles changes
this.$scope_.$watch(() => this.gmfAuthenticationService_.getRolesIds().join(','), () => {
this.gmfPrintState_.state = PrintStateEnum.CAPABILITIES_NOT_LOADED;
=======
olEvents.listen(this.map.getView(), 'change:rotation', (event) => {
this.updateRotation_(Math.round(olMath.toDegrees(event.target.getRotation())));
});
// Clear the capabilities if the roleId changes
this.$scope_.$watch(() => this.gmfAuthenticationService_.getRoleId(), () => {
this.gmfPrintState_.state = exports.PrintStateEnum.CAPABILITIES_NOT_LOADED;
>>>>>>>
olEvents.listen(this.map.getView(), 'change:rotation', (event) => {
this.updateRotation_(Math.round(olMath.toDegrees(event.target.getRotation())));
});
// Clear the capabilities if the roles changes
this.$scope_.$watch(() => this.gmfAuthenticationService_.getRolesIds().join(','), () => {
this.gmfPrintState_.state = PrintStateEnum.CAPABILITIES_NOT_LOADED;
<<<<<<<
=======
const type = icons ? 'image' : source.serverType_;
>>>>>>>
<<<<<<<
'icons': [icon_dpi.url]
}, icon_dpi.dpi != 72 ? {
'dpi': icon_dpi.dpi,
=======
'icons': [icons]
}, type === 'qgis' ? {
'dpi': dpi,
>>>>>>>
'icons': [icon_dpi.url]
}, icon_dpi.dpi != 72 ? {
'dpi': icon_dpi.dpi, |
<<<<<<<
* @param {!gettext} gettext Gettext service.
* @param {!angular.$compile} $compile Angular compile service.
* @param {!angular.$filter} $filter Angular filter
=======
* @param {angularGettext.Catalog} gettextCatalog Gettext catalog.
* @param {angular.$compile} $compile Angular compile service.
* @param {angular.$filter} $filter Angular filter
>>>>>>>
* @param {!angularGettext.Catalog} gettextCatalog Gettext catalog.
* @param {!angular.$compile} $compile Angular compile service.
* @param {!angular.$filter} $filter Angular filter
<<<<<<<
const helpMsg = this.gettext_('Click to start drawing length');
const contMsg = this.gettext_(
=======
helpMsg = gettextCatalog.getString('Click to start drawing length');
contMsg = gettextCatalog.getString(
>>>>>>>
const helpMsg = gettextCatalog.getString('Click to start drawing length');
const contMsg = gettextCatalog.getString(
<<<<<<<
const helpMsg = this.gettext_('Click to start drawing area');
const contMsg = this.gettext_(
=======
helpMsg = gettextCatalog.getString('Click to start drawing area');
contMsg = gettextCatalog.getString(
>>>>>>>
const helpMsg = gettextCatalog.getString('Click to start drawing area');
const contMsg = gettextCatalog.getString( |
<<<<<<<
const msg = this.gettextCatalog_.getString(
=======
var gettextCatalog = this.gettextCatalog_;
var msg = gettextCatalog.getString(
>>>>>>>
const gettextCatalog = this.gettextCatalog_;
const msg = gettextCatalog.getString(
<<<<<<<
const msg = this.gettextCatalog_.getString('There are unsaved changes.');
=======
var msg = gettextCatalog.getString('There are unsaved changes.');
>>>>>>>
const msg = gettextCatalog.getString('There are unsaved changes.'); |
<<<<<<<
/**
* @param {String} countryCode - ISO 3166-1 alpha 2 country code whos stores
* should get returned. If the countrycode is not valid or known an empty
* array is returned
* @returns {Array<Store>} one or multiple stores as array
*/
getStoresForCountry: function(countryCode) {
return data.filter(d => d.countryCode === countryCode);
},
/**
* @param {String} query
* @param {String} [countryCode] - optional additional countryCode that must
* match
* @returns {Array<Store>} one or multiple stores as array
*/
getStoresMatchingQuery: function(query, countryCode) {
const regexp = new RegExp(query.toLowerCase(), 'i');
return data
.filter(d => regexp.test(d.name))
.filter(d => countryCode && d.countryCode === countryCode);
},
/**
* @param {Array<String>} storeIds - array of store ids where the store should
* get returned
* @returns {Array<Store>} one or no store matchting the given ids
*/
getStoresById: function(storeIds = []) {
if (!Array.isArray(storeIds)) return [];
return data.filter(d => storeIds.indexOf(d.buCode) > -1);
},
/**
* @param {String} countryCode - ISO 3166-1 alpha 2 country code
* @returns {String} ISO 3166-1 alpha 2 language code
*/
=======
findByCountryCode: function(countryCode) {
const cc = countryCode.trim().toLowerCase();
return data.filter(store => store.countryCode === cc);
},
>>>>>>>
/**
* @param {String} countryCode - ISO 3166-1 alpha 2 country code whos stores
* should get returned. If the countrycode is not valid or known an empty
* array is returned
* @returns {Array<Store>} one or multiple stores as array
*/
getStoresForCountry: function(countryCode) {
return data.filter(d => d.countryCode === countryCode);
},
/**
* @param {String} query
* @param {String} [countryCode] - optional additional countryCode that must
* match
* @returns {Array<Store>} one or multiple stores as array
*/
getStoresMatchingQuery: function(query, countryCode) {
const regexp = new RegExp(query.toLowerCase(), 'i');
return data
.filter(d => regexp.test(d.name))
.filter(d => countryCode && d.countryCode === countryCode);
},
/**
* @param {Array<String>} storeIds - array of store ids where the store should
* get returned
* @returns {Array<Store>} one or no store matchting the given ids
*/
getStoresById: function(storeIds = []) {
if (!Array.isArray(storeIds)) return [];
return data.filter(d => storeIds.indexOf(d.buCode) > -1);
},
/**
* @param {String} countryCode - ISO 3166-1 alpha 2 country code
* @returns {String} ISO 3166-1 alpha 2 language code
*/
findByCountryCode: function(countryCode) {
const cc = countryCode.trim().toLowerCase();
return data.filter(store => store.countryCode === cc);
}, |
<<<<<<<
* @property {OGCLayer[]} [ogcLayers] A list of layer definitions that are used by (WMS) and (WFS)
* queries.
=======
* @property {Array<WMSLayer>} [wmsLayers] A list of layer definitions that are used by WMS queries.
* These are **not** used by the (WMTS) queries (the wmtsLayers is used by WMTS queries).
* @property {Array<WFSLayer>} [wfsLayers] A list of layer definitions that are used by WFS queries.
>>>>>>>
* @property {WMSLayer[]} [wmsLayers] A list of layer definitions that are used by WMS queries.
* These are **not** used by the (WMTS) queries (the wmtsLayers is used by WMTS queries).
* @property {WFSLayer[]} [wfsLayers] A list of layer definitions that are used by WFS queries.
<<<<<<<
* @type {?OGCLayer[]}
=======
* @type {?Array<WFSLayer>}
>>>>>>>
* @type {?WFSLayer[]}
<<<<<<<
if (this.supportsWFS && layers.length) {
let format;
=======
if (this.supportsWFS && wfsLayers.length) {
let format = undefined;
>>>>>>>
if (this.supportsWFS && wfsLayers.length) {
let format;
<<<<<<<
* @return {?OGCLayer[]} OGC layers
=======
* @return {?Array<WMSLayer>} WMS layers
>>>>>>>
* @return {?WMSLayer[]} WMS layers
<<<<<<<
* OGC layer is queryable as well or not. Defaults to `false`.
* @return {string[]} The OGC layer names that are in range.
=======
* WFS layer is queryable as well or not. Defaults to `false`.
* @return {Array<string>} The WFS layer names that are in range.
>>>>>>>
* WFS layer is queryable as well or not. Defaults to `false`.
* @return {string[]} The WFS layer names that are in range.
<<<<<<<
* OGC layer is queryable as well or not. Defaults to `false`.
* @return {string[]} The OGC layer names.
=======
* WFS layer is queryable as well or not. Defaults to `false`.
* @return {Array<string>} The WFS layer names.
>>>>>>>
* WFS layer is queryable as well or not. Defaults to `false`.
* @return {string[]} The WFS layer names. |
<<<<<<<
* Get the snapping configuration object from a Layertree controller
* @param {gmfThemes.GmfLayer} node Layer node from the theme.
* @return {?gmfThemes.GmfSnappingConfig} Snapping configuration, if found.
* @export
*/
gmf.Themes.getSnappingConfig = function(node) {
const config = (node.metadata && node.metadata.snappingConfig !== undefined) ?
node.metadata.snappingConfig : null;
return config;
};
/**
=======
* Get the maximal resolution defined for this layer. Looks in the
* layer itself before to look into its metadata.
* @param {gmfThemes.GmfLayerWMS} gmfLayer the GeoMapFish Layer. WMTS layer is
* also allowed (the type is defined as GmfLayerWMS only to avoid some
* useless tests to know if a maxResolutionHint property can exist
* on the node).
* @return {number|undefined} the max resolution or undefined if any.
*/
gmf.Themes.getNodeMaxResolution = function(gmfLayer) {
const metadata = gmfLayer.metadata;
let maxResolution = gmfLayer.maxResolutionHint;
if (maxResolution === undefined && metadata !== undefined) {
maxResolution = metadata.maxResolution;
}
return maxResolution;
};
/**
* Get the minimal resolution defined for this layer. Looks in the
* layer itself before to look into its metadata.
* @param {gmfThemes.GmfLayerWMS} gmfLayer the GeoMapFish Layer. WMTS layer is
* also allowed (the type is defined as GmfLayerWMS only to avoid some
* useless tests to know if a minResolutionHint property can exist
* on the node).
* @return {number|undefined} the min resolution or undefined if any.
*/
gmf.Themes.getNodeMinResolution = function(gmfLayer) {
const metadata = gmfLayer.metadata;
let minResolution = gmfLayer.minResolutionHint;
if (minResolution === undefined && metadata !== undefined) {
minResolution = metadata.minResolution;
}
return minResolution;
};
/**
>>>>>>>
* Get the snapping configuration object from a Layertree controller
* @param {gmfThemes.GmfLayer} node Layer node from the theme.
* @return {?gmfThemes.GmfSnappingConfig} Snapping configuration, if found.
* @export
*/
gmf.Themes.getSnappingConfig = function(node) {
const config = (node.metadata && node.metadata.snappingConfig !== undefined) ?
node.metadata.snappingConfig : null;
return config;
};
/**
* Get the maximal resolution defined for this layer. Looks in the
* layer itself before to look into its metadata.
* @param {gmfThemes.GmfLayerWMS} gmfLayer the GeoMapFish Layer. WMTS layer is
* also allowed (the type is defined as GmfLayerWMS only to avoid some
* useless tests to know if a maxResolutionHint property can exist
* on the node).
* @return {number|undefined} the max resolution or undefined if any.
*/
gmf.Themes.getNodeMaxResolution = function(gmfLayer) {
const metadata = gmfLayer.metadata;
let maxResolution = gmfLayer.maxResolutionHint;
if (maxResolution === undefined && metadata !== undefined) {
maxResolution = metadata.maxResolution;
}
return maxResolution;
};
/**
* Get the minimal resolution defined for this layer. Looks in the
* layer itself before to look into its metadata.
* @param {gmfThemes.GmfLayerWMS} gmfLayer the GeoMapFish Layer. WMTS layer is
* also allowed (the type is defined as GmfLayerWMS only to avoid some
* useless tests to know if a minResolutionHint property can exist
* on the node).
* @return {number|undefined} the min resolution or undefined if any.
*/
gmf.Themes.getNodeMinResolution = function(gmfLayer) {
const metadata = gmfLayer.metadata;
let minResolution = gmfLayer.minResolutionHint;
if (minResolution === undefined && metadata !== undefined) {
minResolution = metadata.minResolution;
}
return minResolution;
};
/** |
<<<<<<<
const userChange = function(evt) {
const roleId = (evt.user.username !== null) ? evt.user.role_id : undefined;
=======
/**
* Permalink service
* @type {gmf.Permalink}
*/
var permalink = $injector.get('gmfPermalink');
var userChange = function(evt) {
var roleId = (evt.user.username !== null) ? evt.user.role_id : undefined;
>>>>>>>
/**
* Permalink service
* @type {gmf.Permalink}
*/
const permalink = $injector.get('gmfPermalink');
const userChange = function(evt) {
const roleId = (evt.user.username !== null) ? evt.user.role_id : undefined; |
<<<<<<<
const error = this.gettextCatalog.getString('Incorrect old password.');
=======
var error = gettextCatalog.getString('Incorrect old password.');
>>>>>>>
const error = gettextCatalog.getString('Incorrect old password.');
<<<<<<<
const errors = [];
=======
var gettextCatalog = this.gettextCatalog;
var errors = [];
>>>>>>>
const gettextCatalog = this.gettextCatalog;
const errors = [];
<<<<<<<
const error = this.gettextCatalog.getString('Incorrect username or password.');
=======
var error = gettextCatalog.getString('Incorrect username or password.');
>>>>>>>
const error = gettextCatalog.getString('Incorrect username or password.');
<<<<<<<
const error = this.gettextCatalog.getString('Could not log out.');
=======
var gettextCatalog = this.gettextCatalog;
var error = gettextCatalog.getString('Could not log out.');
>>>>>>>
const gettextCatalog = this.gettextCatalog;
const error = gettextCatalog.getString('Could not log out.');
<<<<<<<
const error = this.gettextCatalog.getString('An error occurred while reseting the password.');
=======
var error = gettextCatalog.getString('An error occured while reseting the password.');
>>>>>>>
const error = gettextCatalog.getString('An error occured while reseting the password.'); |
<<<<<<<
* Get the background layer object to use to initialize the map from the
* state manager.
* @param {Array<import("ol/layer/Base.js").default>} layers Array of background layer objects.
=======
* Get the background layer object to use to initialize the map from the state manager.
* @param {!Array.<!import("ol/layer/Base.js").default>} layers Array of background layer objects.
>>>>>>>
* Get the background layer object to use to initialize the map from the state manager.
* @param {Array<import("ol/layer/Base.js").default>} layers Array of background layer objects. |
<<<<<<<
const point = feature.getGeometry();
if (!(point instanceof Point)) {
throw new Error('Wrong geometry type');
}
const coordinates = point.getCoordinates();
=======
const coordinates = /** @type {import('ol/geom/Point.js').default} */(
feature.getGeometry()
).getCoordinates();
const geometryName = feature.getGeometryName();
>>>>>>>
const point = feature.getGeometry();
if (!(point instanceof Point)) {
throw new Error('Wrong geometry type');
}
const coordinates = point.getCoordinates();
const geometryName = feature.getGeometryName(); |
<<<<<<<
/**
* @param {gmfx.AuthenticationEvent} evt Event.
*/
const userChange = function(evt) {
const user = evt.detail.user;
const roleId = (user.username !== null) ? user.role_id : undefined;
=======
const userChange = (evt) => {
const roleId = (evt.user.username !== null) ? evt.user.role_id : undefined;
>>>>>>>
/**
* @param {gmfx.AuthenticationEvent} evt Event.
*/
const userChange = (evt) => {
const user = evt.detail.user;
const roleId = (user.username !== null) ? user.role_id : undefined;
<<<<<<<
if (evt.type !== 'ready') {
this.updateCurrentTheme_();
this.updateCurrentBackgroundLayer_(true);
=======
const previousThemeName = this.gmfThemeManager.getThemeName();
this.gmfThemeManager.setThemeName('', true);
if (evt.type !== gmf.AuthenticationEventType.READY) {
this.updateCurrentTheme_(previousThemeName);
} else {
// initialize default background layer
this.setDefaultBackground_(null, true);
>>>>>>>
const previousThemeName = this.gmfThemeManager.getThemeName();
this.gmfThemeManager.setThemeName('', true);
if (evt.type !== 'ready') {
this.updateCurrentTheme_(previousThemeName);
} else {
// initialize default background layer
this.setDefaultBackground_(null, true);
<<<<<<<
backgroundLayerMgr.on('change', () => {
backgroundLayerMgr.updateDimensions(this.map, this.dimensions);
});
=======
this.backgroundLayerMgr_.on(ngeo.BackgroundEventType.CHANGE, () => {
this.backgroundLayerMgr_.updateDimensions(this.map, this.dimensions);
});
>>>>>>>
this.backgroundLayerMgr_.on('change', () => {
this.backgroundLayerMgr_.updateDimensions(this.map, this.dimensions);
});
<<<<<<<
* @param {boolean} skipPermalink If True, don't use permalink
* background layer.
* @private
*/
this.updateCurrentBackgroundLayer_ = function(skipPermalink) {
this.gmfThemes_.getBgLayers(this.dimensions).then((layers) => {
let background;
if (!skipPermalink) {
// get the background from the permalink
background = this.permalink_.getBackgroundLayer(layers);
}
if (!background) {
// get the background from the user settings
const functionalities = this.gmfUser.functionalities;
if (functionalities) {
const defaultBasemapArray = functionalities.default_basemap;
if (defaultBasemapArray.length > 0) {
const defaultBasemapLabel = defaultBasemapArray[0];
background = ol.array.find(layers, layer => layer.get('label') === defaultBasemapLabel);
}
}
}
if (!background && layers[1]) {
// fallback to the layers list, use the second one because the first
// is the blank layer
background = layers[1];
}
if (background) {
backgroundLayerMgr.set(this.map, background);
}
});
}.bind(this);
this.updateCurrentBackgroundLayer_(false);
=======
* Ngeo create popup factory
* @type {ngeo.CreatePopup}
*/
const ngeoCreatePopup = $injector.get('ngeoCreatePopup');
>>>>>>>
* @param {boolean} skipPermalink If True, don't use permalink
* background layer.
* @private
*/
this.updateCurrentBackgroundLayer_ = function(skipPermalink) {
this.gmfThemes_.getBgLayers(this.dimensions).then((layers) => {
let background;
if (!skipPermalink) {
// get the background from the permalink
background = this.permalink_.getBackgroundLayer(layers);
}
if (!background) {
// get the background from the user settings
const functionalities = this.gmfUser.functionalities;
if (functionalities) {
const defaultBasemapArray = functionalities.default_basemap;
if (defaultBasemapArray.length > 0) {
const defaultBasemapLabel = defaultBasemapArray[0];
background = ol.array.find(layers, layer => layer.get('label') === defaultBasemapLabel);
}
}
}
if (!background && layers[1]) {
// fallback to the layers list, use the second one because the first
// is the blank layer
background = layers[1];
}
if (background) {
this.backgroundLayerMgr_.set(this.map, background);
}
});
}.bind(this);
this.updateCurrentBackgroundLayer_(false); |
<<<<<<<
ThemeManagerService.prototype.updateCurrentTheme = function(themeName, fallbackThemeName) {
=======
exports.prototype.updateCurrentTheme = function(themeName, fallbackThemeName, opt_silent) {
>>>>>>>
ThemeManagerService.prototype.updateCurrentTheme = function(themeName, fallbackThemeName, opt_silent) { |
<<<<<<<
gmf.DisplayquerywindowController = function($element, $scope, ngeoQueryResult,
=======
gmf.DisplayquerywindowController = function($scope, ngeoQueryResult, ngeoMapQuerent,
>>>>>>>
gmf.DisplayquerywindowController = function($element, $scope, ngeoQueryResult, ngeoMapQuerent, |
<<<<<<<
// Validate that the files we were asked to upload are all valid SARIF files
for (const file of sarifFiles) {
if (!validateSarifFileSchema(file)) {
return false;
}
}
const commitOid = util.getRequiredEnvParam('GITHUB_SHA');
=======
const commitOid = await util.getCommitOid();
>>>>>>>
// Validate that the files we were asked to upload are all valid SARIF files
for (const file of sarifFiles) {
if (!validateSarifFileSchema(file)) {
return false;
}
}
const commitOid = await util.getCommitOid(); |
<<<<<<<
goog.require('ol.Observable');
goog.require('ol.math');
=======
goog.require('ol.Map');
goog.require('ol.layer.Group');
>>>>>>>
goog.require('ol.Observable');
goog.require('ol.math');
goog.require('ol.Map');
goog.require('ol.layer.Group');
<<<<<<<
* @param {gmf.PrintStateEnum} gmfPrintState GMF print state.
=======
* @param {gmf.Themes} gmfThemes The gmf Themes service.
>>>>>>>
* @param {gmf.PrintStateEnum} gmfPrintState GMF print state.
* @param {gmf.Themes} gmfThemes The gmf Themes service.
<<<<<<<
gmf.PrintController = function($rootScope, $scope, $timeout, $q, $injector,
gettextCatalog, ngeoLayerHelper, ngeoFeatureOverlayMgr, ngeoPrintUtils,
ngeoCreatePrint, gmfPrintUrl, gmfAuthentication, ngeoQueryResult,
ngeoFeatureHelper, $filter, gmfPrintState) {
=======
gmf.PrintController = function($scope, $timeout, $q, $injector, gettextCatalog,
ngeoLayerHelper, ngeoFeatureOverlayMgr, ngeoPrintUtils, ngeoCreatePrint,
gmfPrintUrl, gmfAuthentication, ngeoQueryResult, ngeoFeatureHelper,
$filter, gmfThemes) {
>>>>>>>
gmf.PrintController = function($rootScope, $scope, $timeout, $q, $injector,
gettextCatalog, ngeoLayerHelper, ngeoFeatureOverlayMgr, ngeoPrintUtils,
ngeoCreatePrint, gmfPrintUrl, gmfAuthentication, ngeoQueryResult,
ngeoFeatureHelper, $filter, gmfPrintState, gmfThemes) {
<<<<<<<
});
// Print on event.
$rootScope.$on('gmfStartPrint', (event, format) => {
this.print(`${format}`);
});
// Cancel print task on event.
$rootScope.$on('gmfCancelPrint', () => {
this.cancel();
});
=======
}.bind(this));
/**
* @type {gmfThemes.GmfOgcServers}
* @private
*/
this.ogcServers_;
gmfThemes.getOgcServersObject().then(function(ogcServersObject) {
this.ogcServers_ = ogcServersObject;
}.bind(this));
>>>>>>>
});
// Print on event.
$rootScope.$on('gmfStartPrint', (event, format) => {
this.print(`${format}`);
});
// Cancel print task on event.
$rootScope.$on('gmfCancelPrint', () => {
this.cancel();
});
/**
* @type {gmfThemes.GmfOgcServers}
* @private
*/
this.ogcServers_;
gmfThemes.getOgcServersObject().then((ogcServersObject) => {
this.ogcServers_ = ogcServersObject;
});
<<<<<<<
const spec = this.ngeoPrint_.createSpec(this.map, scale, this.fields.dpi,
=======
// convert the WMTS layers to WMS
var map = new ol.Map({});
map.setView(this.map.getView());
var ol_layers = this.ngeoLayerHelper_.getFlatLayers(this.map.getLayerGroup());
var new_ol_layers = [];
for (var i = 0, ii = ol_layers.length; i < ii; i++) {
var layer = ol_layers[i];
var metadata = layer.get('metadata');
if (metadata) {
var server_name = metadata.ogcServer;
var layer_names = metadata.printLayers || metadata.layers;
if (server_name && layer_names) {
var server = this.ogcServers_[server_name];
if (server) {
layer = this.ngeoLayerHelper_.createBasicWMSLayer(
server.url,
layer_names,
server.type
);
} else {
console.error('Missing ogcServer:', server_name);
}
}
}
new_ol_layers.push(layer);
}
map.setLayerGroup(new ol.layer.Group({
layers: new_ol_layers
}));
var spec = this.ngeoPrint_.createSpec(map, scale, this.fields.dpi,
>>>>>>>
// convert the WMTS layers to WMS
const map = new ol.Map({});
map.setView(this.map.getView());
const ol_layers = this.ngeoLayerHelper_.getFlatLayers(this.map.getLayerGroup());
const new_ol_layers = [];
for (let i = 0, ii = ol_layers.length; i < ii; i++) {
let layer = ol_layers[i];
const metadata = layer.get('metadata');
if (metadata) {
const server_name = metadata.ogcServer;
const layer_names = metadata.printLayers || metadata.layers;
if (server_name && layer_names) {
const server = this.ogcServers_[server_name];
if (server) {
layer = this.ngeoLayerHelper_.createBasicWMSLayer(
server.url,
layer_names,
server.type
);
} else {
console.error('Missing ogcServer:', server_name);
}
}
}
new_ol_layers.push(layer);
}
map.setLayerGroup(new ol.layer.Group({
layers: new_ol_layers
}));
const spec = this.ngeoPrint_.createSpec(map, scale, this.fields.dpi, |
<<<<<<<
let maxResolution = 0;
let minResolution = 0;
let ogcLayers;
=======
let maxResolution;
let minResolution;
let wmsLayers;
let wfsLayers;
>>>>>>>
let maxResolution = 0;
let minResolution = 0;
let wmsLayers;
let wfsLayers;
<<<<<<<
=======
ogcImageType,
wmsLayers,
wfsLayers,
ogcServerType,
wfsFeatureNS,
>>>>>>> |
<<<<<<<
* @typedef {Object} MarkerOptions
* @property {[number, number]} [position]
* @property {string} [icon]
*/
/**
* @typedef {Object} MapOptions
* @property {string} div
* @property {import("ol/coordinate.js").Coordinate} center
* @property {number} [zoom=10]
* @property {boolean} [showCoords=true]
* @property {boolean} [addMiniMap=false]
* @property {boolean} [miniMapExpanded=true]
* @property {boolean} [addLayerSwitcher=false]
* @property {string[]} [layers]
*/
/**
=======
* @type {Array<string>}
*/
const EXCLUDE_PROPERTIES = ['geom', 'geometry', 'boundedBy'];
/**
>>>>>>>
* @typedef {Object} MarkerOptions
* @property {[number, number]} [position]
* @property {string} [icon]
*/
/**
* @typedef {Object} MapOptions
* @property {string} div
* @property {import("ol/coordinate.js").Coordinate} center
* @property {number} [zoom=10]
* @property {boolean} [showCoords=true]
* @property {boolean} [addMiniMap=false]
* @property {boolean} [miniMapExpanded=true]
* @property {boolean} [addLayerSwitcher=false]
* @property {string[]} [layers]
*/
/**
* @type {Array<string>}
*/
const EXCLUDE_PROPERTIES = ['geom', 'geometry', 'boundedBy'];
/**
<<<<<<<
* @param {string[]} ids List of ids
* @param {boolean} [highlight=false] Whether to add the features on
* the map or not.
=======
* @param {Array.<string>} ids List of ids
* @param {boolean} [highlight=false] Whether to add the features on the map or not.
>>>>>>>
* @param {string[]} ids List of ids
* @param {boolean} [highlight=false] Whether to add the features on the map or not.
<<<<<<<
const element = this.overlay_.getElement();
if (!element) {
throw new Error('Missing element');
}
const content = element.querySelector('.ol-popup-content');
if (!content) {
throw new Error('Missing content');
}
content.innerHTML = '';
content.innerHTML += `<div><b>${properties.title}</b></div>`;
content.innerHTML += `<p>${properties.description}</p>`;
=======
let contentHTML = '';
if (table) {
contentHTML += '<table><tbody>';
for (const key in properties) {
if (!EXCLUDE_PROPERTIES.includes(key)) {
contentHTML += '<tr>';
contentHTML += `<th>${key}</th>`;
contentHTML += `<td>${properties[key]}</td>`;
contentHTML += '</tr>';
}
}
contentHTML += '</tbody></table>';
} else {
contentHTML += `<div><b>${properties.title}</b></div>`;
contentHTML += `<p>${properties.description}</p>`;
}
const content = this.overlay_.getElement().querySelector('.ol-popup-content');
content.innerHTML = contentHTML;
>>>>>>>
let contentHTML = '';
if (table) {
contentHTML += '<table><tbody>';
for (const key in properties) {
if (!EXCLUDE_PROPERTIES.includes(key)) {
contentHTML += '<tr>';
contentHTML += `<th>${key}</th>`;
contentHTML += `<td>${properties[key]}</td>`;
contentHTML += '</tr>';
}
}
contentHTML += '</tbody></table>';
} else {
contentHTML += `<div><b>${properties.title}</b></div>`;
contentHTML += `<p>${properties.description}</p>`;
}
const element = this.overlay_.getElement();
if (!element) {
throw new Error('Missing element');
}
const content = element.querySelector('.ol-popup-content');
if (!content) {
throw new Error('Missing content');
}
content.innerHTML = contentHTML; |
<<<<<<<
const source = {
id,
layer
=======
var source = {
id: id,
layer: layer,
layers: ['bar']
>>>>>>>
const source = {
id,
layer,
layers: ['bar']
<<<<<<<
const url = 'https://geomapfish-demo.camptocamp.net/2.2/wsgi/mapserv_proxy';
const requestUrlBusStop = `${url}?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetFeatureInfo&FORMAT=image%2Fpng&TRANSPARENT=true&QUERY_LAYERS=bus_stop&LAYERS=bus_stop&INFO_FORMAT=application%2Fvnd.ogc.gml&FEATURE_COUNT=50&I=50&J=50&CRS=EPSG%3A21781&STYLES=&WIDTH=101&HEIGHT=101&BBOX=489100%2C119900.00000000003%2C509300%2C140100.00000000003`;
const requestUrlBusStopAndInformation = `${url}?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetFeatureInfo&FORMAT=image%2Fpng&TRANSPARENT=true&LAYERS=information%2Cbus_stop&QUERY_LAYERS=information%2Cbus_stop&INFO_FORMAT=application%2Fvnd.ogc.gml&FEATURE_COUNT=50&I=50&J=50&CRS=EPSG%3A21781&STYLES=&WIDTH=101&HEIGHT=101&BBOX=523700%2C142900.00000000003%2C543900%2C163100.00000000003`;
=======
var url = 'https://geomapfish-demo.camptocamp.net/1.6/wsgi/mapserv_proxy';
var requestUrlBusStop = url + '?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetFeatureInfo&FORMAT=image%2Fpng&TRANSPARENT=true&INFO_FORMAT=application%2Fvnd.ogc.gml&FEATURE_COUNT=50&I=50&J=50&CRS=EPSG%3A21781&STYLES=&WIDTH=101&HEIGHT=101&BBOX=489100%2C119900%2C509300%2C140100&LAYERS=bus_stop&QUERY_LAYERS=bus_stop';
var requestUrlBusStopAndInformation = url + '?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetFeatureInfo&FORMAT=image%2Fpng&TRANSPARENT=true&INFO_FORMAT=application%2Fvnd.ogc.gml&FEATURE_COUNT=50&I=50&J=50&CRS=EPSG%3A21781&STYLES=&WIDTH=101&HEIGHT=101&BBOX=523700%2C142900%2C543900%2C163100&LAYERS=information%2Cbus_stop&QUERY_LAYERS=information%2Cbus_stop';
>>>>>>>
const url = 'https://geomapfish-demo.camptocamp.net/1.6/wsgi/mapserv_proxy';
const requestUrlBusStop = `${url}?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetFeatureInfo&FORMAT=image%2Fpng&TRANSPARENT=true&INFO_FORMAT=application%2Fvnd.ogc.gml&FEATURE_COUNT=50&I=50&J=50&CRS=EPSG%3A21781&STYLES=&WIDTH=101&HEIGHT=101&BBOX=489100%2C119900%2C509300%2C140100&LAYERS=bus_stop&QUERY_LAYERS=bus_stop`;
const requestUrlBusStopAndInformation = `${url}?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetFeatureInfo&FORMAT=image%2Fpng&TRANSPARENT=true&INFO_FORMAT=application%2Fvnd.ogc.gml&FEATURE_COUNT=50&I=50&J=50&CRS=EPSG%3A21781&STYLES=&WIDTH=101&HEIGHT=101&BBOX=523700%2C142900%2C543900%2C163100&LAYERS=information%2Cbus_stop&QUERY_LAYERS=information%2Cbus_stop`;
<<<<<<<
it('Issue request with one source', () => {
const coordinate = [499200, 130000.00000000003];
=======
it('Issue request with one source', function() {
var coordinate = [499200, 130000];
>>>>>>>
it('Issue request with one source', () => {
const coordinate = [499200, 130000];
<<<<<<<
it('Issue request with two sources', () => {
const coordinate = [533800, 153000.00000000003];
=======
it('Issue request with two sources', function() {
var coordinate = [533800, 153000];
>>>>>>>
it('Issue request with two sources', () => {
const coordinate = [533800, 153000];
<<<<<<<
it('When layers are not visible, no request is sent', () => {
const coordinate = [533800, 153000.00000000003];
=======
it('When layers are not visible, no request is sent', function() {
var coordinate = [533800, 153000];
>>>>>>>
it('When layers are not visible, no request is sent', () => {
const coordinate = [533800, 153000];
<<<<<<<
const coordinate = [499200, 130000.00000000003];
=======
var coordinate = [499200, 130000];
>>>>>>>
const coordinate = [499200, 130000];
<<<<<<<
const coordinate = [499200, 130000.00000000003];
=======
var coordinate = [499200, 130000];
>>>>>>>
const coordinate = [499200, 130000];
<<<<<<<
const coordinate = [499200, 130000.00000000003];
=======
var coordinate = [499200, 130000];
>>>>>>>
const coordinate = [499200, 130000]; |
<<<<<<<
=======
import Raven from 'raven-js/src/raven.js';
import RavenPluginsAngular from 'raven-js/plugins/angular.js';
import olSourceVector from 'ol/source/Vector.js';
>>>>>>>
import olSourceVector from 'ol/source/Vector.js'; |
<<<<<<<
module.value('ngeoSnappingSource', new olSourceVector());
module.value('gmfContextualdatacontentTemplateUrl', 'gmf/contextualdata');
module.run(/* @ngInject */ ($templateCache) => {
// @ts-ignore: webpack
=======
exports.module.value('gmfContextualdatacontentTemplateUrl', 'gmf/contextualdata');
exports.module.run(/* @ngInject */ ($templateCache) => {
>>>>>>>
module.value('gmfContextualdatacontentTemplateUrl', 'gmf/contextualdata');
module.run(/* @ngInject */ ($templateCache) => {
// @ts-ignore: webpack |
<<<<<<<
* @return {string|undefined} 'out-of-resolution' or null.
=======
* @return {string|undefined} 'out-of-resolution' or undefined.
>>>>>>>
* @return {string|undefined} 'out-of-resolution' or undefined.
<<<<<<<
const gmfLayer = /** @type {gmfThemes.GmfLayerWMS} */ (treeCtrl.node);
const view = this.map.getView();
const resolution = gmfLayer.minResolutionHint || gmfLayer.maxResolutionHint;
if (resolution !== undefined) {
view.setResolution(view.constrainResolution(resolution, 0, 1));
=======
var gmfLayer = /** @type {gmfThemes.GmfLayerWMS} */ (treeCtrl.node);
var view = this.map.getView();
var resolution = view.getResolution();
if (gmfLayer.minResolutionHint !== undefined && resolution < gmfLayer.minResolutionHint) {
view.setResolution(view.constrainResolution(gmfLayer.minResolutionHint, 0, 1));
}
if (gmfLayer.maxResolutionHint !== undefined && resolution > gmfLayer.maxResolutionHint) {
view.setResolution(view.constrainResolution(gmfLayer.maxResolutionHint, 0, -1));
>>>>>>>
const gmfLayer = /** @type {gmfThemes.GmfLayerWMS} */ (treeCtrl.node);
const view = this.map.getView();
const resolution = view.getResolution();
if (gmfLayer.minResolutionHint !== undefined && resolution < gmfLayer.minResolutionHint) {
view.setResolution(view.constrainResolution(gmfLayer.minResolutionHint, 0, 1));
}
if (gmfLayer.maxResolutionHint !== undefined && resolution > gmfLayer.maxResolutionHint) {
view.setResolution(view.constrainResolution(gmfLayer.maxResolutionHint, 0, -1)); |
<<<<<<<
const osmSource = getSourceById(queryManager.sources_, 115);
expect(osmSource.params.LAYERS).toBe('ch.swisstopo.dreiecksvermaschung');
=======
var osmSource = getSourceById(queryManager.sources_, 115);
expect(osmSource.getLayers(0).join(',')).toBe('ch.swisstopo.dreiecksvermaschung');
>>>>>>>
const osmSource = getSourceById(queryManager.sources_, 115);
expect(osmSource.getLayers(0).join(',')).toBe('ch.swisstopo.dreiecksvermaschung'); |
<<<<<<<
* <p>{{[7.1234, 46.9876] | ngeoDMSCoordinates:2:'[{x}; {y}]'}}</p>
=======
* <p>{{[7.1234, 46.9876] | ngeoDMSCoordinates:2:[{y}; {x]}}</p>
>>>>>>>
* <p>{{[7.1234, 46.9876] | ngeoDMSCoordinates:2:'[{y}; {x]'}}</p>
<<<<<<<
* '{x} {y}'. Where "{x}" will be replaced by the first
* coordinate, {y} by the second one. Note: Use a html entity to use the
* semicolon symbole into a template.
* @return {string} DMS formatted coordinates.
=======
* '{x} {y}'. Where "{x}" will be replaced by the easting
* coordinate, {y} by the northing one. Note: Use a html entity to use the
* semicolon symbol into a template.
* @return {string} DMS formated coordinates.
>>>>>>>
* '{x} {y}'. Where "{x}" will be replaced by the easting
* coordinate, {y} by the northing one. Note: Use a html entity to use the
* semicolon symbol into a template.
* @return {string} DMS formatted coordinates.
<<<<<<<
const xdms = degreesToStringHDMS(coordinates[1], 'NS', fractionDigits);
const ydms = degreesToStringHDMS(coordinates[0], 'EW', fractionDigits);
=======
var xdms = degreesToStringHDMS(coordinates[0], 'EW', fractionDigits);
var ydms = degreesToStringHDMS(coordinates[1], 'NS', fractionDigits);
>>>>>>>
const xdms = degreesToStringHDMS(coordinates[0], 'EW', fractionDigits);
const ydms = degreesToStringHDMS(coordinates[1], 'NS', fractionDigits); |
<<<<<<<
const isQueryable = function(item) {
return item.queryable && resolution >= item.minResolutionHint && resolution <= item.maxResolutionHint;
};
if (!gmfLayerWMS.childLayers.some(isQueryable)) {
return [];
}
const childLayerNames = [];
gmfLayerWMS.childLayers.forEach((childLayer) => {
if (childLayer.queryable) {
=======
var childLayerNames = [];
gmfLayerWMS.childLayers.forEach(function(childLayer) {
if (childLayer.queryable && resolution >= childLayer.minResolutionHint && resolution <= childLayer.maxResolutionHint) {
>>>>>>>
const childLayerNames = [];
gmfLayerWMS.childLayers.forEach((childLayer) => {
if (childLayer.queryable && resolution >= childLayer.minResolutionHint && resolution <= childLayer.maxResolutionHint) { |
<<<<<<<
const id = olUtilGetUid(dataSource.gmfLayer);
=======
if (dataSource.gmfLayer == undefined) {
return;
}
const id = olBase.getUid(dataSource.gmfLayer);
if (id == undefined) {
return;
}
>>>>>>>
if (dataSource.gmfLayer == undefined) {
return;
}
const id = olUtilGetUid(dataSource.gmfLayer);
if (id == undefined) {
return;
} |
<<<<<<<
gmf.DisplayquerywindowController = function($element, $scope, ngeoQueryResult,
ngeoFeatureHelper, ngeoFeatureOverlayMgr) {
=======
gmf.DisplayquerywindowController = function($scope, ngeoQueryResult,
ngeoFeatureOverlayMgr) {
>>>>>>>
gmf.DisplayquerywindowController = function($element, $scope, ngeoQueryResult,
ngeoFeatureOverlayMgr) { |
<<<<<<<
const getAltitudeSuccess = function(resp) {
=======
var getRasterSuccess = function(resp) {
>>>>>>>
const getRasterSuccess = function(resp) {
<<<<<<<
const getAltitudeError = function(resp) {
console.error('Error on getting altitude.');
=======
var getRasterError = function(resp) {
console.error('Error on getting the raster.');
>>>>>>>
const getRasterError = function(resp) {
console.error('Error on getting the raster.'); |
<<<<<<<
StatsWriterPlugin = require('webpack-stats-plugin').StatsWriterPlugin,
=======
HtmlWebpackPlugin = require('html-webpack-plugin'),
>>>>>>>
StatsWriterPlugin = require('webpack-stats-plugin').StatsWriterPlugin,
HtmlWebpackPlugin = require('html-webpack-plugin'), |
<<<<<<<
=======
function isTracedLanguage(language) {
return ['cpp', 'java', 'csharp'].includes(language);
}
exports.isTracedLanguage = isTracedLanguage;
function isScannedLanguage(language) {
return !isTracedLanguage(language);
}
exports.isScannedLanguage = isScannedLanguage;
/**
* Gets the options for `path` of `options` as an array of extra option strings.
*/
function getExtraOptionsFromEnv(path) {
let options = util.getExtraOptionsEnvParam();
return getExtraOptions(options, path, []);
}
/**
* Gets the options for `path` of `options` as an array of extra option strings.
*
* - the special terminal step name '*' in `options` matches all path steps
* - throws an exception if this conversion is impossible.
*/
function getExtraOptions(options, path, pathInfo) {
var _a, _b, _c;
/**
* Gets `options` as an array of extra option strings.
*
* - throws an exception mentioning `pathInfo` if this conversion is impossible.
*/
function asExtraOptions(options, pathInfo) {
if (options === undefined) {
return [];
}
if (!Array.isArray(options)) {
const msg = `The extra options for '${pathInfo.join('.')}' ('${JSON.stringify(options)}') are not in an array.`;
throw new Error(msg);
}
return options.map(o => {
const t = typeof o;
if (t !== 'string' && t !== 'number' && t !== 'boolean') {
const msg = `The extra option for '${pathInfo.join('.')}' ('${JSON.stringify(o)}') is not a primitive value.`;
throw new Error(msg);
}
return o + '';
});
}
let all = asExtraOptions((_a = options) === null || _a === void 0 ? void 0 : _a['*'], pathInfo.concat('*'));
let specific = path.length === 0 ?
asExtraOptions(options, pathInfo) :
getExtraOptions((_b = options) === null || _b === void 0 ? void 0 : _b[path[0]], (_c = path) === null || _c === void 0 ? void 0 : _c.slice(1), pathInfo.concat(path[0]));
return all.concat(specific);
}
exports.getExtraOptions = getExtraOptions;
>>>>>>>
/**
* Gets the options for `path` of `options` as an array of extra option strings.
*/
function getExtraOptionsFromEnv(path) {
let options = util.getExtraOptionsEnvParam();
return getExtraOptions(options, path, []);
}
/**
* Gets the options for `path` of `options` as an array of extra option strings.
*
* - the special terminal step name '*' in `options` matches all path steps
* - throws an exception if this conversion is impossible.
*/
function getExtraOptions(options, path, pathInfo) {
var _a, _b, _c;
/**
* Gets `options` as an array of extra option strings.
*
* - throws an exception mentioning `pathInfo` if this conversion is impossible.
*/
function asExtraOptions(options, pathInfo) {
if (options === undefined) {
return [];
}
if (!Array.isArray(options)) {
const msg = `The extra options for '${pathInfo.join('.')}' ('${JSON.stringify(options)}') are not in an array.`;
throw new Error(msg);
}
return options.map(o => {
const t = typeof o;
if (t !== 'string' && t !== 'number' && t !== 'boolean') {
const msg = `The extra option for '${pathInfo.join('.')}' ('${JSON.stringify(o)}') is not a primitive value.`;
throw new Error(msg);
}
return o + '';
});
}
let all = asExtraOptions((_a = options) === null || _a === void 0 ? void 0 : _a['*'], pathInfo.concat('*'));
let specific = path.length === 0 ?
asExtraOptions(options, pathInfo) :
getExtraOptions((_b = options) === null || _b === void 0 ? void 0 : _b[path[0]], (_c = path) === null || _c === void 0 ? void 0 : _c.slice(1), pathInfo.concat(path[0]));
return all.concat(specific);
}
exports.getExtraOptions = getExtraOptions; |
<<<<<<<
async function addBuiltinSuiteQueries(languages, resultMap, suiteName, configFile) {
=======
async function addBuiltinSuiteQueries(configFile, languages, codeQL, resultMap, suiteName) {
>>>>>>>
async function addBuiltinSuiteQueries(languages, codeQL, resultMap, suiteName, configFile) {
<<<<<<<
async function addLocalQueries(resultMap, localQueryPath, configFile) {
=======
async function addLocalQueries(configFile, codeQL, resultMap, localQueryPath) {
>>>>>>>
async function addLocalQueries(codeQL, resultMap, localQueryPath, configFile) {
<<<<<<<
async function addRemoteQueries(resultMap, queryUses, configFile) {
=======
async function addRemoteQueries(configFile, codeQL, resultMap, queryUses, tempDir) {
>>>>>>>
async function addRemoteQueries(codeQL, resultMap, queryUses, tempDir, configFile) {
<<<<<<<
async function parseQueryUses(languages, resultMap, queryUses, configFile) {
=======
async function parseQueryUses(configFile, languages, codeQL, resultMap, queryUses, tempDir) {
>>>>>>>
async function parseQueryUses(languages, codeQL, resultMap, queryUses, tempDir, configFile) {
<<<<<<<
await addLocalQueries(resultMap, queryUses.slice(2), configFile);
=======
await addLocalQueries(configFile, codeQL, resultMap, queryUses.slice(2));
>>>>>>>
await addLocalQueries(codeQL, resultMap, queryUses.slice(2), configFile);
<<<<<<<
await addBuiltinSuiteQueries(languages, resultMap, queryUses, configFile);
=======
await addBuiltinSuiteQueries(configFile, languages, codeQL, resultMap, queryUses);
>>>>>>>
await addBuiltinSuiteQueries(languages, codeQL, resultMap, queryUses, configFile);
<<<<<<<
await addRemoteQueries(resultMap, queryUses, configFile);
=======
await addRemoteQueries(configFile, codeQL, resultMap, queryUses, tempDir);
>>>>>>>
await addRemoteQueries(codeQL, resultMap, queryUses, tempDir, configFile);
<<<<<<<
await addDefaultQueries(languages, queries);
await addQueriesFromWorkflowIfRequired(languages, queries);
=======
await addDefaultQueries(codeQL, languages, queries);
>>>>>>>
await addDefaultQueries(codeQL, languages, queries);
await addQueriesFromWorkflowIfRequired(codeQL, languages, queries, tempDir);
<<<<<<<
await parseQueryUses(languages, queries, query[QUERIES_USES_PROPERTY], configFile);
=======
await parseQueryUses(configFile, languages, codeQL, queries, query[QUERIES_USES_PROPERTY], tempDir);
>>>>>>>
await parseQueryUses(languages, codeQL, queries, query[QUERIES_USES_PROPERTY], tempDir, configFile); |
<<<<<<<
const dateFormat = (function () {
const token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZWN]|"[^"]*"|'[^']*'/g;
const timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g;
const timezoneClip = /[^-+\dA-Z]/g;
=======
var dateFormat = (() => {
var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZWN]|"[^"]*"|'[^']*'/g;
var timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g;
var timezoneClip = /[^-+\dA-Z]/g;
>>>>>>>
const dateFormat = (() => {
const token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZWN]|"[^"]*"|'[^']*'/g;
const timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g;
const timezoneClip = /[^-+\dA-Z]/g;
<<<<<<<
function getDayOfWeek(date) {
let dow = date.getDay();
=======
const getDayOfWeek = (date) => {
var dow = date.getDay();
>>>>>>>
const getDayOfWeek = (date) => {
let dow = date.getDay(); |
<<<<<<<
/** callback function called when the text is submitted */
onSubmit?: (string) => mixed,
/** height in pixels for the whole component */
=======
/** Callback function called when the text is submitted */
onSubmit: (string) => mixed,
/** Height in pixels for the whole component */
>>>>>>>
/** Callback function called when the text is submitted, by default it adds a
* comment reaction to the provided activity */
onSubmit?: (string) => mixed,
/** Height in pixels for the whole component */
<<<<<<<
/** activity */
activity: ActivityData,
/** event callback handler fired when the enter button is pressed */
onAddReaction: (string, ActivityData, any) => void,
=======
/** Removes KeyboardAccessory. When disabling this keep in mind that the
* input won't move with the keyboard anymore. */
noKeyboardAccessory: boolean,
/** Custom verticalOffset for the KeyboardAccessory if for some reason the
* component is positioned wrongly when the keyboard opens. If the item is
* positioned too high this should be a negative number, if it's positioned
* too low it should be positive. One known case where this happens is when
* using react-navigation with `tabBarPosition: 'bottom'`. */
verticalOffset: number,
/** Any props the React Native TextInput accepts */
textInputProps?: {},
>>>>>>>
/** activity */
activity: ActivityData,
/** event callback handler fired when the enter button is pressed */
onAddReaction: (string, ActivityData, any) => void,
/** Removes KeyboardAccessory. When disabling this keep in mind that the
* input won't move with the keyboard anymore. */
noKeyboardAccessory: boolean,
/** Custom verticalOffset for the KeyboardAccessory if for some reason the
* component is positioned wrongly when the keyboard opens. If the item is
* positioned too high this should be a negative number, if it's positioned
* too low it should be positive. One known case where this happens is when
* using react-navigation with `tabBarPosition: 'bottom'`. */
verticalOffset: number,
/** Any props the React Native TextInput accepts */
textInputProps?: {},
<<<<<<<
<KeyboardAccessory>
<View style={styles.container}>
{this.props.noAvatar || (
<Avatar
size={48}
// $FlowFixMe
styles={this.props.styles.avatar}
{...this.props.avatarProps}
/>
)}
<TextInput
value={this.state.text}
style={styles.textInput}
placeholder="Your comment..."
underlineColorAndroid="transparent"
returnKeyType="send"
onChangeText={(text) => this.setState({ text })}
onSubmitEditing={async (event) => {
this.setState({ text: '' });
this.postComment(event);
}}
/>
</View>
=======
<KeyboardAccessory verticalOffset={this.props.verticalOffset}>
{input}
>>>>>>>
<KeyboardAccessory verticalOffset={this.props.verticalOffset}>
{input} |
<<<<<<<
=======
//Media selection back link
var node = typeof opts.node.current != 'undefined'?opts.node.current:opts.node;
var $media_preview = $('<div class="row selectedItemPreview"><div class="col-xs-12 col-sm-4 col-md-3 left"></div><div class="col-xs-12 col-sm-8 col-md-9 right"><h2>'+node.title+'</h2><p class="description"></p><div class="link"></div></div></div><hr />');
var thumbnail = undefined;
if(typeof opts.node.thumbnail != 'undefined' && opts.node.thumbnail != null){
thumbnail = opts.node.thumbnail;
}else if(typeof opts.node.content != 'undefined' && opts.node.content['http://simile.mit.edu/2003/10/ontologies/artstor#thumbnail'] != 'undefined' && opts.node.content['http://simile.mit.edu/2003/10/ontologies/artstor#thumbnail'] != null){
thumbnail = opts.node.content['http://simile.mit.edu/2003/10/ontologies/artstor#thumbnail'][0].value;
}
var description = '';
if(typeof node.description == 'string' && node.description != ''){
description = node.description;
}else if(typeof node.content == 'string' && node.content != ''){
description = node.content;
}else if(typeof node.content == 'object' && typeof node.version != 'undefined' && typeof node.version['http://purl.org/dc/terms/description'] != 'undefined'){
description = node.version['http://purl.org/dc/terms/description'][0].value;
}
if(description!=''){
var $tmp = $('<div></div>');
$tmp.html(description);
$media_preview.find('.description').text($tmp.text());
}else{
$media_preview.find('.description').remove();
}
if(thumbnail!=undefined){
$media_preview.find('.left').append('<img class="img-responsive center-block" src="'+thumbnail+'">');
}else{
$media_preview.find('.left').remove();
$media_preview.find('.right').removeClass('col-sm-8 col-md-9');
}
if((typeof opts.node.targets != 'undefined' && opts.node.targets.length > 0) || opts.node.parent!=null){
if(typeof opts.node.targets != 'undefined' && opts.node.targets.length > 0){
var parent_slug = opts.node.targets[0].slug;
}else{
var parent_slug = opts.node.parent.slug;
}
$('<img src="" class="parentThumb pull-left"><small class="text-muted">Annotation of <span class="parentTitle"></span></small><br />').appendTo($media_preview.find('.right .link'));
(function($media_preview,parent_slug){
var updateParentInfo = function(){
var node = scalarapi.getNode(parent_slug);
$media_preview.find('.parentTitle').text(node.getDisplayTitle());
if(typeof node.thumbnail != 'undefined' && node.thumbnail != null){
$media_preview.find('.parentThumb').attr('src',node.thumbnail);
}else{
$media_preview.find('.parentThumb').hide();
}
}
if(scalarapi.loadPage( parent_slug, false, function(){
updateParentInfo();
}) == "loaded"){
updateParentInfo();
}
})($media_preview,parent_slug);
}
$('<a href="#">Change Selected '+(((typeof opts.node.targets == 'undefined' || opts.node.targets.length == 0) && opts.node.parent==null)?'Media':'Annotation')+'</a>').data('element',opts.element).click(function(e){
e.preventDefault();
e.stopPropagation();
$(this).closest('.media_options_bootbox').modal( 'hide' ).data( 'bs.modal', null );
var element = $(this).data('element');
if ($(this).closest('.media_options_bootbox').length) {
$(this).parent().closest('.media_options_bootbox').modal( 'hide' ).data( 'bs.modal', null );
} else {
$this.parent();
}
var data = $(element.$).data('selectOptions');
data.forceSelect = true;
CKEDITOR._scalar.selectcontent(data);
}).appendTo($media_preview.find('.right .link'));
$form.append($media_preview);
>>>>>>>
//Media selection back link
var node = typeof opts.node.current != 'undefined'?opts.node.current:opts.node;
var $media_preview = $('<div class="row selectedItemPreview"><div class="col-xs-12 col-sm-4 col-md-3 left"></div><div class="col-xs-12 col-sm-8 col-md-9 right"><h2>'+node.title+'</h2><p class="description"></p><div class="link"></div></div></div><hr />');
var thumbnail = undefined;
if(typeof opts.node.thumbnail != 'undefined' && opts.node.thumbnail != null){
thumbnail = opts.node.thumbnail;
}else if(typeof opts.node.content != 'undefined' && opts.node.content['http://simile.mit.edu/2003/10/ontologies/artstor#thumbnail'] != 'undefined' && opts.node.content['http://simile.mit.edu/2003/10/ontologies/artstor#thumbnail'] != null){
thumbnail = opts.node.content['http://simile.mit.edu/2003/10/ontologies/artstor#thumbnail'][0].value;
}
var description = '';
if(typeof node.description == 'string' && node.description != ''){
description = node.description;
}else if(typeof node.content == 'string' && node.content != ''){
description = node.content;
}else if(typeof node.content == 'object' && typeof node.version != 'undefined' && typeof node.version['http://purl.org/dc/terms/description'] != 'undefined'){
description = node.version['http://purl.org/dc/terms/description'][0].value;
}
if(description!=''){
var $tmp = $('<div></div>');
$tmp.html(description);
$media_preview.find('.description').text($tmp.text());
}else{
$media_preview.find('.description').remove();
}
if(thumbnail!=undefined){
$media_preview.find('.left').append('<img class="img-responsive center-block" src="'+thumbnail+'">');
}else{
$media_preview.find('.left').remove();
$media_preview.find('.right').removeClass('col-sm-8 col-md-9');
}
if((typeof opts.node.targets != 'undefined' && opts.node.targets.length > 0) || opts.node.parent!=null){
if(typeof opts.node.targets != 'undefined' && opts.node.targets.length > 0){
var parent_slug = opts.node.targets[0].slug;
}else{
var parent_slug = opts.node.parent.slug;
}
$('<img src="" class="parentThumb pull-left"><small class="text-muted">Annotation of <span class="parentTitle"></span></small><br />').appendTo($media_preview.find('.right .link'));
(function($media_preview,parent_slug){
var updateParentInfo = function(){
var node = scalarapi.getNode(parent_slug);
$media_preview.find('.parentTitle').text(node.getDisplayTitle());
if(typeof node.thumbnail != 'undefined' && node.thumbnail != null){
$media_preview.find('.parentThumb').attr('src',node.thumbnail);
}else{
$media_preview.find('.parentThumb').hide();
}
}
if(scalarapi.loadPage( parent_slug, false, function(){
updateParentInfo();
}) == "loaded"){
updateParentInfo();
}
})($media_preview,parent_slug);
}
$('<a href="#">Change Selected '+(((typeof opts.node.targets == 'undefined' || opts.node.targets.length == 0) && opts.node.parent==null)?'Media':'Annotation')+'</a>').data('element',opts.element).click(function(e){
e.preventDefault();
e.stopPropagation();
$(this).closest('.media_options_bootbox').modal( 'hide' ).data( 'bs.modal', null );
var element = $(this).data('element');
if ($(this).closest('.media_options_bootbox').length) {
$(this).parent().closest('.media_options_bootbox').modal( 'hide' ).data( 'bs.modal', null );
} else {
$this.parent();
}
var data = $(element.$).data('selectOptions');
data.forceSelect = true;
CKEDITOR._scalar.selectcontent(data);
}).appendTo($media_preview.find('.right .link'));
$form.append($media_preview);
<<<<<<<
$this.append('<div class="clearfix visible-xs-block"></div><p class="buttons"><input type="button" class="btn btn-default generic_button" value="Cancel" /> <input type="button" class="btn btn-primary generic_button default continueButton" value="Continue" /></p>');
$this.find('.close').click(function() {
$this.remove();
});
$this.find('.continueButton').click(function() {
var data_fields = {};
for (var option_name in opts.data) {
if(option_name!='annotations' && option_name!='node'){
data_fields[option_name] = $this.find('select[name="'+option_name+'"] option:selected"').val();
}
}
if($('#bootbox-media-options-content').find('.annotationSelection').length > 0){
//We have an annotation selector
var $selectedAnnotations = $('#bootbox-media-options-content').find('.annotationSelection tbody .glyphicon-eye-open').parents('tr');
var annotations = [];
for(var i = 0; i < $selectedAnnotations.length; i++){
annotations.push($selectedAnnotations.eq(i).data('slug'));
}
data_fields['annotations'] = annotations.length>0?annotations.join(','):'[]';
if($('#bootbox-media-options-content').find('.featuredAnnotation select').val()!='none' && $('#bootbox-media-options-content').find('.featuredAnnotation select').is(':visible')){
data_fields['featured_annotation'] = $('#bootbox-media-options-content').find('.featuredAnnotation select').val();
}
}
if ($form.closest('.media_options_bootbox').length) {
$form.closest('.media_options_bootbox').modal( 'hide' ).data( 'bs.modal', null );
} else {
$this.remove();
}
opts.callback(data_fields);
});
=======
data_fields.node = opts.node
opts.callback(data_fields);
});
>>>>>>>
$this.append('<div class="clearfix visible-xs-block"></div><p class="buttons"><input type="button" class="btn btn-default generic_button" value="Cancel" /> <input type="button" class="btn btn-primary generic_button default continueButton" value="Continue" /></p>');
$this.find('.close').click(function() {
$this.remove();
});
$this.find('.continueButton').click(function() {
var data_fields = {};
data_fields.node = opts.node
for (var option_name in opts.data) {
if(option_name!='annotations' && option_name!='node'){
data_fields[option_name] = $this.find('select[name="'+option_name+'"] option:selected"').val();
}
}
if($('#bootbox-media-options-content').find('.annotationSelection').length > 0){
//We have an annotation selector
var $selectedAnnotations = $('#bootbox-media-options-content').find('.annotationSelection tbody .glyphicon-eye-open').parents('tr');
var annotations = [];
for(var i = 0; i < $selectedAnnotations.length; i++){
annotations.push($selectedAnnotations.eq(i).data('slug'));
}
data_fields['annotations'] = annotations.length>0?annotations.join(','):'[]';
if($('#bootbox-media-options-content').find('.featuredAnnotation select').val()!='none' && $('#bootbox-media-options-content').find('.featuredAnnotation select').is(':visible')){
data_fields['featured_annotation'] = $('#bootbox-media-options-content').find('.featuredAnnotation select').val();
}
}
if ($form.closest('.media_options_bootbox').length) {
$form.closest('.media_options_bootbox').modal( 'hide' ).data( 'bs.modal', null );
} else {
$this.remove();
}
opts.callback(data_fields);
});
<<<<<<<
//Load the previously selected node via the api, then run the callback
(function(slug,callback){
scalarapi.loadPage( slug, true, function(){
callback(scalarapi.getNode(slug));
}, null, 1, false, null, 0, 1 );
})(opts.element.getAttribute('resource'),opts.callback);
return;
=======
//Now that we have the slug, load the page via the api, then run the callback
(function(slug,parent,element,callback){
scalarapi.loadPage( slug, true, function(){
var node = scalarapi.getNode(slug);
node.parent = parent;
callback(node,element);
}, null, 1, false, null, 0, 1 );
})(currentSlug,parent,opts.element, opts.callback);
return;
}else{
var selectOptions = $(opts.element.$).data('selectOptions');
selectOptions.forceSelect = false;
}
>>>>>>>
//Now that we have the slug, load the page via the api, then run the callback
(function(slug,parent,element,callback){
scalarapi.loadPage( slug, true, function(){
var node = scalarapi.getNode(slug);
node.parent = parent;
callback(node,element);
}, null, 1, false, null, 0, 1 );
})(currentSlug,parent,opts.element, opts.callback);
return;
}else{
var selectOptions = $(opts.element.$).data('selectOptions');
selectOptions.forceSelect = false;
}
<<<<<<<
if(typeof opts.element !== 'undefined' && opts.element != null){
currentSlug = opts.element.getAttribute('resource');
=======
if(typeof opts.element != 'undefined' && typeof opts.element.getAttribute('href') != 'undefined' && opts.element.getAttribute('href')!=null){
if(opts.element.getAttribute('href').indexOf('#')>=0){
//with annotation
var temp_anchor = document.createElement('a');
temp_anchor.href = opts.element.getAttribute('href');
currentSlug = temp_anchor.hash.replace('#','');
$(temp_anchor).remove();
}else{
//no annotation
currentSlug = opts.element.getAttribute('resource');
}
>>>>>>>
if(typeof opts.element != 'undefined' && typeof opts.element.getAttribute('href') != 'undefined' && opts.element.getAttribute('href')!=null){
if(opts.element.getAttribute('href').indexOf('#')>=0){
//with annotation
var temp_anchor = document.createElement('a');
temp_anchor.href = opts.element.getAttribute('href');
currentSlug = temp_anchor.hash.replace('#','');
$(temp_anchor).remove();
}else{
//no annotation
currentSlug = opts.element.getAttribute('resource');
} |
<<<<<<<
const {
computed,
run,
get,
set,
Handlebars,
RSVP,
A: emberArray,
String: { htmlSafe } } = Ember;
=======
const { computed, run, get, set, String: { htmlSafe }, RSVP, $, A, observer } = Ember;
>>>>>>>
const {
computed,
run,
get,
set,
Handlebars,
RSVP,
A: emberArray,
String: { htmlSafe } } = Ember;
<<<<<<<
size: computed('initialSize', 'items.length', 'itemHeight', {
get() {
let itemSize = this.get('itemHeight');
let fullSize = this.get('items.length') * itemSize;
if (fullSize <= itemSize) {
return itemSize;
}
return Math.min(fullSize, this.get('initialSize'));
}
}).readOnly(),
height: computed('size', 'horizontal', {
get() {
if (this.get('horizontal')) {
return false;
}
return this.get('size');
}
}),
// Received coordinates {top, left, right, width} from the dropdown
// Convert them to style and cache - they usually don't change
positionStyle: computed('positionCoordinates', {
get() {
let coords = this.get('positionCoordinates') || {};
let style = '';
// {top, left, right, width}
Object.keys(coords).forEach((type) => {
if (coords[type]) {
style += `${type}: ${coords[type]}; `;
}
});
return style.trim();
}
}).readOnly(),
style: computed('height', 'positionStyle', {
get() {
let height = this.get('height') || null;
let style = this.get('positionStyle');
if (height !== null && !isNaN(height)) {
height = Handlebars.Utils.escapeExpression(height);
style += ` height: ${height}px;`;
}
return htmlSafe(style);
}
}).readOnly(),
=======
>>>>>>>
size: computed('initialSize', 'items.length', 'itemHeight', {
get() {
let itemSize = this.get('itemHeight');
let fullSize = this.get('items.length') * itemSize;
if (fullSize <= itemSize) {
return itemSize;
}
return Math.min(fullSize, this.get('initialSize'));
}
}).readOnly(),
height: computed('size', 'horizontal', {
get() {
if (this.get('horizontal')) {
return false;
}
return this.get('size');
}
}),
// Received coordinates {top, left, right, width} from the dropdown
// Convert them to style and cache - they usually don't change
positionStyle: computed('positionCoordinates', {
get() {
let coords = this.get('positionCoordinates') || {};
let style = '';
// {top, left, right, width}
Object.keys(coords).forEach((type) => {
if (coords[type]) {
style += `${type}: ${coords[type]}; `;
}
});
return style.trim();
}
}).readOnly(),
style: computed('height', 'positionStyle', {
get() {
let height = this.get('height') || null;
let style = this.get('positionStyle');
if (height !== null && !isNaN(height)) {
height = Handlebars.Utils.escapeExpression(height);
style += ` height: ${height}px;`;
}
return htmlSafe(style);
}
}).readOnly(),
<<<<<<<
_marginTop: computed('_totalHeight', '_startAt', '_visibleItemCount', 'itemHeight', {
get() {
let itemHeight = this.get('itemHeight');
let totalHeight = get(this, '_totalHeight');
let margin = get(this, '_startAt') * itemHeight;
let visibleItemCount = get(this, '_visibleItemCount');
let maxMargin = Math.max(0, totalHeight - ((visibleItemCount - 1) * itemHeight) + (EXTRA_ROW_PADDING * itemHeight));
=======
>>>>>>>
<<<<<<<
}
let itemHeight = this.get('itemHeight');
let itemOffset = (newIndex + 1) * itemHeight;
let offset = itemOffset - this.get('size');
if (toTop) {
offset = newIndex * itemHeight;
}
if (this.get('horizontal')) {
this.$('.md-virtual-repeat-scroller').scrollLeft(offset);
} else {
this.$('.md-virtual-repeat-scroller').scrollTop(offset);
}
}
});
VirtualRepeatComponent.reopenClass({
positionalParams: ['items']
});
=======
if (this.get('horizontal')) {
this.$('.md-virtual-repeat-scroller').scrollLeft(sanitizedPadding);
} else {
this.$('.md-virtual-repeat-scroller').scrollTop(sanitizedPadding);
}
});
}),
lengthObserver: observer('items.length', function() {
this.set('_totalHeight', Math.max((this.get('length') ? this.get('length') : this.get('items.length')) * this.get('itemHeight'), 0));
})
>>>>>>>
}
let itemHeight = this.get('itemHeight');
let itemOffset = (newIndex + 1) * itemHeight;
let offset = itemOffset - this.get('size');
if (toTop) {
offset = newIndex * itemHeight;
}
if (this.get('horizontal')) {
this.$('.md-virtual-repeat-scroller').scrollLeft(offset);
} else {
this.$('.md-virtual-repeat-scroller').scrollTop(offset);
}
}
});
VirtualRepeatComponent.reopenClass({
positionalParams: ['items']
}); |
<<<<<<<
logger.startGroup('Extracting ' + language);
if (language === languages_1.Language.python) {
await setupPythonExtractor(logger);
}
=======
logger.startGroup(`Extracting ${language}`);
>>>>>>>
logger.startGroup(`Extracting ${language}`);
if (language === languages_1.Language.python) {
await setupPythonExtractor(logger);
} |
<<<<<<<
});
export default Router;
=======
this.route('slider');
});
>>>>>>>
this.route('slider');
});
export default Router; |
<<<<<<<
const { Controller, computed, RSVP, run } = Ember;
=======
const { computed, Controller, A, RSVP, run } = Ember;
>>>>>>>
const { Controller, computed, RSVP, A, run } = Ember;
<<<<<<<
sizes: Ember.A([
'small (12-inch)',
'medium (14-inch)',
'large (16-inch)',
'insane (42-inch)'
]),
vegetables: Ember.A([
=======
vegetables: A([
>>>>>>>
sizes: A([
'small (12-inch)',
'medium (14-inch)',
'large (16-inch)',
'insane (42-inch)'
]),
vegetables: A([
<<<<<<<
}),
groupedToppings: [
{ groupName: 'Meats', options: ['Pepperoni', 'Sausage', 'Ground Beef', 'Bacon'] },
{ groupName: 'Veg', options: ['Mushrooms', 'Onion', 'Green Pepper', 'Green Olives'] } ]
=======
},
userLabelCallback(item) {
// using ember data, this might be 'item.get('name')'
return item.name;
},
vegetableLabelCallback(item) {
return item.name;
},
toppings: A([
{ category: 'meat', name: 'Pepperoni' },
{ category: 'meat', name: 'Sausage' },
{ category: 'meat', name: 'Ground Beef' },
{ category: 'meat', name: 'Bacon' },
{ category: 'veg', name: 'Mushrooms' },
{ category: 'veg', name: 'Onion' },
{ category: 'veg', name: 'Green Pepper' },
{ category: 'veg', name: 'Green Olives' }
]),
meatToppings: computed.filterBy('toppings', 'category', 'meat'),
vegToppings: computed.filterBy('toppings', 'category', 'veg'),
actions: {
searchKeyPressed(e) {
e.stopPropagation();
}
}
>>>>>>>
}),
groupedToppings: [
{ groupName: 'Meats', options: ['Pepperoni', 'Sausage', 'Ground Beef', 'Bacon'] },
{ groupName: 'Veg', options: ['Mushrooms', 'Onion', 'Green Pepper', 'Green Olives'] }
] |
<<<<<<<
var keys, _opts, _view, _ddoc,
=======
var keys, _opts, _view, _list,
>>>>>>>
var keys, _opts, _view, _ddoc, _list
<<<<<<<
_ddoc = this.config.ddoc_name;
=======
_list = this.config.list_name;
>>>>>>>
_ddoc = this.config.ddoc_name;
_list = this.config.list_name;
<<<<<<<
return this.helpers.make_db().view("" + _ddoc + "/" + _view, _opts);
=======
if (_list != null) {
return this.helpers.make_db().list("" + this.config.ddoc_name + "/" + _list, "" + _view, _opts);
} else {
return this.helpers.make_db().view("" + this.config.ddoc_name + "/" + _view, _opts);
}
>>>>>>>
if (_list != null) {
return this.helpers.make_db().list("" + _ddoc + "/" + _list, "" + _view, _opts);
} else {
return this.helpers.make_db().view("" + _ddoc + "/" + _view, _opts);
} |
<<<<<<<
function createNormalNativeApp(projectName, cmd) {
const root = path.resolve(projectName);
=======
function createReactNativeCLIProject(projectName, cmd) {
var root = path.resolve(projectName);
>>>>>>>
function createReactNativeCLIProject(projectName, cmd) {
const root = path.resolve(projectName);
<<<<<<<
function createVueNativeProject(projectName, cmd) {
const root = path.resolve(projectName);
=======
function createExpoProject(projectName, cmd) {
var root = path.resolve(projectName);
>>>>>>>
function createExpoProject(projectName, cmd) {
const root = path.resolve(projectName); |
<<<<<<<
=======
iframe.contentDocument.head.insertAdjacentHTML('beforeend', quotebackjs);
>>>>>>>
iframe.contentDocument.head.insertAdjacentHTML('beforeend', quotebackjs); |
<<<<<<<
const path = require('path');
const vscodeLanguageClient = require('vscode-languageclient');
=======
const humanizeString = require("humanize-string");
const camelcase = require("camelcase");
>>>>>>>
const path = require('path');
const vscodeLanguageClient = require('vscode-languageclient');
const humanizeString = require("humanize-string");
const camelcase = require("camelcase");
<<<<<<<
async function activate(context) {
let translateText = vscode.commands.registerCommand(
"vscodeGoogleTranslate.translateText",
function() {
=======
function activate(context) {
const translateText = vscode.commands.registerCommand(
"extension.translateText",
function () {
>>>>>>>
function activate(context) {
const translateText = vscode.commands.registerCommand(
"extension.translateText",
function () { |
<<<<<<<
this.shaderCache = {};
this.attributeCache = [];
=======
this.shaderCache = new Map();
>>>>>>>
this.shaderCache = new Map();
this.attributeCache = []; |
<<<<<<<
this._mouse = {
position: [0, 0],
oldPosition: [0, 0]
};
this.dirty = false;
=======
>>>>>>>
<<<<<<<
Gizmo.registerHandle = function (handle) {
=======
Gizmo.registerHandle = function (handle) {
>>>>>>>
Gizmo.registerHandle = function (handle) {
<<<<<<<
Gizmo.getHandle = function (id) {
if (id < 16000) {
=======
Gizmo.getHandle = function (id) {
if (id < 16000) {
>>>>>>>
Gizmo.getHandle = function (id) {
if (id < 16000) {
<<<<<<<
Gizmo.prototype.activate = function (properties) {
=======
/**
* Turns snapping on or off
* @param {boolean} snap
*/
Gizmo.prototype.setSnap = function (snap) {
this._snap = snap;
};
Gizmo.prototype.activate = function (properties) {
>>>>>>>
/**
* Turns snapping on or off
* @param {boolean} snap
*/
Gizmo.prototype.setSnap = function (snap) {
this._snap = snap;
};
Gizmo.prototype.activate = function (properties) {
<<<<<<<
Gizmo.prototype.update = function (mousePos) {
this._mouse.position[0] = mousePos[0];
this._mouse.position[1] = mousePos[1];
this.dirty = true;
=======
Gizmo.prototype._postProcess = function (data) {
this.updateTransforms();
if (this.onChange instanceof Function) {
this.onChange(data);
}
};
/**
* Update the transform of the provided renderable.
* @param renderable
*/
Gizmo.prototype.updateRenderableTransform = function (renderable) {
Matrix4x4.combine(
this.transform.matrix,
renderable.transform.matrix,
renderable.transform.matrix
);
>>>>>>>
Gizmo.prototype._postProcess = function (data) {
this.updateTransforms();
if (this.onChange instanceof Function) {
this.onChange(data);
}
};
/**
* Update the transform of the provided renderable.
* @param renderable
*/
Gizmo.prototype.updateRenderableTransform = function (renderable) {
renderable.transform.matrix.mul2(
this.transform.matrix,
renderable.transform.matrix
);
<<<<<<<
Gizmo.prototype.updateTransforms = function () {
=======
/**
* Updates the transforms of the renderables of this gizmo.
* Scale adjustment is also performed.
*/
Gizmo.prototype.updateTransforms = function () {
>>>>>>>
/**
* Updates the transforms of the renderables of this gizmo.
* Scale adjustment is also performed.
*/
Gizmo.prototype.updateTransforms = function () {
<<<<<<<
this._line.set([Vector3.UNIT_X, Vector3.UNIT_Y, Vector3.UNIT_Z][this._activeHandle.axis]);
this._line.applyPostVector(this.transform.matrix);
=======
this._line.copy([Vector3.UNIT_X, Vector3.UNIT_Y, Vector3.UNIT_Z][this._activeHandle.axis]);
this.transform.matrix.applyPostVector(this._line);
>>>>>>>
this._line.copy([Vector3.UNIT_X, Vector3.UNIT_Y, Vector3.UNIT_Z][this._activeHandle.axis]);
this._line.applyPostVector(this.transform.matrix);
<<<<<<<
' vec4 worldPos = worldMatrix * vec4(vertexPosition, 1.0);',
' gl_Position = viewProjectionMatrix * worldPos;',
' normal = vertexNormal;',
' viewPosition = cameraPosition - worldPos.xyz;',
'}'
=======
' vec4 worldPos = worldMatrix * vec4(vertexPosition, 1.0);',
' gl_Position = viewProjectionMatrix * worldPos;',
' normal = vertexNormal;',
'}'
>>>>>>>
' vec4 worldPos = worldMatrix * vec4(vertexPosition, 1.0);',
' gl_Position = viewProjectionMatrix * worldPos;',
' normal = vertexNormal;',
'}'
<<<<<<<
fshader: [
// ShaderBuilder.light.prefragment,
=======
fshader: [
>>>>>>>
fshader: [
<<<<<<<
' gl_FragColor = final_color;',
'}'
=======
' gl_FragColor = final_color;',
'}'
>>>>>>>
' gl_FragColor = final_color;',
'}' |
<<<<<<<
* @returns {object} Object containing 'i0', 'i1', 'f0' and 'f1' members. (Integer, Integer, Float, Float)
=======
* @returns {Object} Object containing "i0", "i1", "f0" and "f1" members. (Integer,Integer,Float,Float)
>>>>>>>
* @returns {Object} Object containing 'i0', 'i1', 'f0' and 'f1' members. (Integer, Integer, Float, Float) |
<<<<<<<
/*
* @class For handling loading of meshrenderercomponents
* @constructor
* @param {World} world The goo world
* @param {function} getConfig The config loader function. See {@see DynamicLoader._loadRef}.
* @param {function} updateObject The handler function. See {@see DynamicLoader.update}.
* @extends ComponentHandler
*/
=======
/**
* @class
* @private
*/
>>>>>>>
/**
* @class For handling loading of meshrenderercomponents
* @constructor
* @param {World} world The goo world
* @param {function} getConfig The config loader function. See {@see DynamicLoader._loadRef}.
* @param {function} updateObject The handler function. See {@see DynamicLoader.update}.
* @extends ComponentHandler
* @private
*/ |
<<<<<<<
plane.normal.x = this._left.x * this._coeffLeft[0] + this._direction.x * this._coeffLeft[1];
plane.normal.y = this._left.y * this._coeffLeft[0] + this._direction.y * this._coeffLeft[1];
plane.normal.z = this._left.z * this._coeffLeft[0] + this._direction.z * this._coeffLeft[1];
plane.constant = this.translation.dot(plane.normal);
=======
plane.normal.x = this._left.x * this._coeffLeft.x + this._direction.x * this._coeffLeft.y;
plane.normal.y = this._left.y * this._coeffLeft.x + this._direction.y * this._coeffLeft.y;
plane.normal.z = this._left.z * this._coeffLeft.x + this._direction.z * this._coeffLeft.y;
plane.constant = this.translation.dotVector(plane.normal);
>>>>>>>
plane.normal.x = this._left.x * this._coeffLeft.x + this._direction.x * this._coeffLeft.y;
plane.normal.y = this._left.y * this._coeffLeft.x + this._direction.y * this._coeffLeft.y;
plane.normal.z = this._left.z * this._coeffLeft.x + this._direction.z * this._coeffLeft.y;
plane.constant = this.translation.dot(plane.normal);
<<<<<<<
plane.normal.x = this._left.x * this._coeffRight[0] + this._direction.x * this._coeffRight[1];
plane.normal.y = this._left.y * this._coeffRight[0] + this._direction.y * this._coeffRight[1];
plane.normal.z = this._left.z * this._coeffRight[0] + this._direction.z * this._coeffRight[1];
plane.constant = this.translation.dot(plane.normal);
=======
plane.normal.x = this._left.x * this._coeffRight.x + this._direction.x * this._coeffRight.y;
plane.normal.y = this._left.y * this._coeffRight.x + this._direction.y * this._coeffRight.y;
plane.normal.z = this._left.z * this._coeffRight.x + this._direction.z * this._coeffRight.y;
plane.constant = this.translation.dotVector(plane.normal);
>>>>>>>
plane.normal.x = this._left.x * this._coeffRight.x + this._direction.x * this._coeffRight.y;
plane.normal.y = this._left.y * this._coeffRight.x + this._direction.y * this._coeffRight.y;
plane.normal.z = this._left.z * this._coeffRight.x + this._direction.z * this._coeffRight.y;
plane.constant = this.translation.dot(plane.normal);
<<<<<<<
plane.normal.x = this._up.x * this._coeffBottom[0] + this._direction.x * this._coeffBottom[1];
plane.normal.y = this._up.y * this._coeffBottom[0] + this._direction.y * this._coeffBottom[1];
plane.normal.z = this._up.z * this._coeffBottom[0] + this._direction.z * this._coeffBottom[1];
plane.constant = this.translation.dot(plane.normal);
=======
plane.normal.x = this._up.x * this._coeffBottom.x + this._direction.x * this._coeffBottom.y;
plane.normal.y = this._up.y * this._coeffBottom.x + this._direction.y * this._coeffBottom.y;
plane.normal.z = this._up.z * this._coeffBottom.x + this._direction.z * this._coeffBottom.y;
plane.constant = this.translation.dotVector(plane.normal);
>>>>>>>
plane.normal.x = this._up.x * this._coeffBottom.x + this._direction.x * this._coeffBottom.y;
plane.normal.y = this._up.y * this._coeffBottom.x + this._direction.y * this._coeffBottom.y;
plane.normal.z = this._up.z * this._coeffBottom.x + this._direction.z * this._coeffBottom.y;
plane.constant = this.translation.dot(plane.normal);
<<<<<<<
plane.normal.x = this._up.x * this._coeffTop[0] + this._direction.x * this._coeffTop[1];
plane.normal.y = this._up.y * this._coeffTop[0] + this._direction.y * this._coeffTop[1];
plane.normal.z = this._up.z * this._coeffTop[0] + this._direction.z * this._coeffTop[1];
plane.constant = this.translation.dot(plane.normal);
=======
plane.normal.x = this._up.x * this._coeffTop.x + this._direction.x * this._coeffTop.y;
plane.normal.y = this._up.y * this._coeffTop.x + this._direction.y * this._coeffTop.y;
plane.normal.z = this._up.z * this._coeffTop.x + this._direction.z * this._coeffTop.y;
plane.constant = this.translation.dotVector(plane.normal);
>>>>>>>
plane.normal.x = this._up.x * this._coeffTop.x + this._direction.x * this._coeffTop.y;
plane.normal.y = this._up.y * this._coeffTop.x + this._direction.y * this._coeffTop.y;
plane.normal.z = this._up.z * this._coeffTop.x + this._direction.z * this._coeffTop.y;
plane.constant = this.translation.dot(plane.normal); |
<<<<<<<
define([
'goo/renderer/light/DirectionalLight',
'goo/math/Vector3',
'test/CustomMatchers'
], function (
DirectionalLight,
Vector3,
CustomMatchers
) {
'use strict';
describe('DirectionalLight', function () {
beforeEach(function () {
jasmine.addMatchers(CustomMatchers);
});
it('gets the color from the first parameter passed to the constructor', function () {
var color = new Vector3(0.2, 0.3, 0.5);
var light = new DirectionalLight(color);
expect(light.color).toBeCloseToVector(color);
expect(light.color).not.toBe(color);
});
});
});
=======
define([
'goo/math/Vector3',
'goo/renderer/light/DirectionalLight',
'test/CustomMatchers'
], function (
Vector3,
DirectionalLight,
CustomMatchers
) {
'use strict';
describe('DirectionalLight', function () {
beforeEach(function () {
jasmine.addMatchers(CustomMatchers);
});
describe('copy', function () {
it('can copy everything from another point light', function () {
var original = new DirectionalLight(new Vector3(11, 22, 33));
var copy = new DirectionalLight(new Vector3(44, 55, 66));
copy.copy(original);
expect(copy).toBeCloned(original);
});
});
describe('clone', function () {
it('can clone a point light', function () {
var original = new DirectionalLight(new Vector3(11, 22, 33));
var clone = original.clone();
expect(clone).toBeCloned(original);
});
});
});
});
>>>>>>>
define([
'goo/renderer/light/DirectionalLight',
'goo/math/Vector3',
'test/CustomMatchers'
], function (
DirectionalLight,
Vector3,
CustomMatchers
) {
'use strict';
describe('DirectionalLight', function () {
beforeEach(function () {
jasmine.addMatchers(CustomMatchers);
});
it('gets the color from the first parameter passed to the constructor', function () {
var color = new Vector3(0.2, 0.3, 0.5);
var light = new DirectionalLight(color);
expect(light.color).toBeCloseToVector(color);
expect(light.color).not.toBe(color);
});
describe('copy', function () {
it('can copy everything from another point light', function () {
var original = new DirectionalLight(new Vector3(11, 22, 33));
var copy = new DirectionalLight(new Vector3(44, 55, 66));
copy.copy(original);
expect(copy).toBeCloned(original);
});
});
describe('clone', function () {
it('can clone a point light', function () {
var original = new DirectionalLight(new Vector3(11, 22, 33));
var clone = original.clone();
expect(clone).toBeCloned(original);
});
});
});
}); |
<<<<<<<
/*
* @class For handling loading of camera components
* @constructor
* @param {World} world The goo world
* @param {function} getConfig The config loader function. See {@see DynamicLoader._loadRef}.
* @param {function} updateObject The handler function. See {@see DynamicLoader.update}.
* @extends ComponentHandler
*/
=======
/**
* @class
* @private
*/
>>>>>>>
/**
* @class For handling loading of camera components
* @constructor
* @param {World} world The goo world
* @param {function} getConfig The config loader function. See {@see DynamicLoader._loadRef}.
* @param {function} updateObject The handler function. See {@see DynamicLoader.update}.
* @extends ComponentHandler
* @private
*/ |
<<<<<<<
'goo/util/PromiseUtil',
'goo/util/ObjectUtil'
],
=======
'goo/loaders/JsonUtils',
'goo/util/PromiseUtil'
],
>>>>>>>
'goo/util/PromiseUtil',
'goo/util/ObjectUtil'
],
<<<<<<<
/*
* @class Handler for loading skeletons into engine
* @extends ConfigHandler
* @param {World} world
* @param {Function} getConfig
* @param {Function} updateObject
*/
=======
/**
* @class
* @private
*/
>>>>>>>
/**
* @class Handler for loading skeletons into engine
* @extends ConfigHandler
* @param {World} world
* @param {Function} getConfig
* @param {Function} updateObject
* @private
*/ |
<<<<<<<
this.clipPlane.setDirect(waterPlane.normal.x, -waterPlane.normal.y, waterPlane.normal.z, waterPlane.constant);
=======
this.clipPlane.setd(waterPlane.normal.x, -waterPlane.normal.y, waterPlane.normal.z, -waterPlane.constant);
>>>>>>>
this.clipPlane.setDirect(waterPlane.normal.x, -waterPlane.normal.y, waterPlane.normal.z, -waterPlane.constant); |
<<<<<<<
'goo/util/PromiseUtil',
'goo/util/ObjectUtil'
], function(
=======
'goo/loaders/JsonUtils',
'goo/util/PromiseUtil'
],
/** @lends */
function(
>>>>>>>
'goo/util/PromiseUtil',
'goo/util/ObjectUtil'
],
/** @lends */
function(
<<<<<<<
/*
* @class Handler for loading skeletons into engine
* @extends ConfigHandler
* @param {World} world
* @param {Function} getConfig
* @param {Function} updateObject
*/
=======
/**
* @class
*/
>>>>>>>
/*
* @class Handler for loading skeletons into engine
* @extends ConfigHandler
* @param {World} world
* @param {Function} getConfig
* @param {Function} updateObject
*/ |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.