conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import '/imports/api/2.0/polls/server';
=======
import '/imports/api/2.0/presentations/server';
import '/imports/api/2.0/slides/server';
>>>>>>>
import '/imports/api/2.0/polls/server';
import '/imports/api/2.0/presentations/server';
import '/imports/api/2.0/slides/server'; |
<<<<<<<
this._iceQueues = {};
=======
this._trackRecordedStream();
}
_trackRecordedStream () {
this._bbbGW.on(C.STREAM_IS_RECORDED, (stream) => {
Logger.info("[BaseManager] Server notifies that stream ", stream, " is recorded");
this.setStreamAsRecorded(stream);
});
>>>>>>>
this._iceQueues = {};
this._trackRecordedStream();
}
_trackRecordedStream () {
this._bbbGW.on(C.STREAM_IS_RECORDED, (stream) => {
Logger.info("[BaseManager] Server notifies that stream ", stream, " is recorded");
this.setStreamAsRecorded(stream);
}); |
<<<<<<<
const enableExternalVideo = Meteor.settings.public.app.enableExternalVideo;
return enableExternalVideo && getVideoUrl();
=======
const { enabled: enableExternalVideo } = Meteor.settings.public.externalVideoPlayer;
return enableExternalVideo && getVideoId();
>>>>>>>
const { enabled: enableExternalVideo } = Meteor.settings.public.externalVideoPlayer;
return enableExternalVideo && getVideoUrl(); |
<<<<<<<
});
// Suspect code per ticket: #104 removed for deeper inspection.
// fs.readdir("/dev/serial/by-path", function(err_path, paths) {
// if (err_path) {
// if (err.errno === 34) return callback(null, []);
// return console.log(err);
// }
// var dirName, items;
// //check if multiple devices of the same id are connected
// if (files.length !== paths.length) {
// dirName = "/dev/serial/by-path";
// items = paths;
// } else {
// dirName = "/dev/serial/by-id";
// items = files;
// }
// async.map(items, function (file, callback) {
// var fileName = path.join(dirName, file);
// fs.readlink(fileName, function (err, link) {
// if (err) {
// return callback(err);
// }
// link = path.resolve(dirName, link);
// callback(null, {
// comName: link,
// manufacturer: undefined,
// pnpId: file
// });
// });
// }, callback);
}, callback);
});
}
function listOSX (callback) {
child_process.exec('/usr/sbin/system_profiler SPUSBDataType', function (err, stdout, stderr) {
if (err) {
return callback(err);
}
stderr = stderr.trim();
if (stderr.length > 0) {
return callback(new Error(stderr));
}
var lines = stdout.split('\n');
var items = [];
var currentItem = {};
lines.forEach(function (line) {
line = line.trim();
line = line.replace(/\s+/, ' ');
var m;
if (m = line.match(/^Serial Number: (.+)$/)) {
currentItem['serialNumber'] = m[1];
} else if (m = line.match(/^Location ID: (.+)$/)) {
currentItem['locationId'] = m[1];
} else if (m = line.match(/^Product ID: (.+)$/)) {
currentItem['productId'] = m[1];
} else if (m = line.match(/^Vendor ID: (.+)$/)) {
currentItem['vendorId'] = m[1];
} else if (m = line.match(/^Manufacturer: (.+)$/)) {
currentItem['manufacturer'] = m[1];
} else if (/^$/.test(line)) {
if ('serialNumber' in currentItem) {
currentItem['comName'] = "/dev/cu.usbmodem" + currentItem['locationId'].substring(2, 6) + '1';
items.push(currentItem);
currentItem = {};
}
}
});
callback(null, items);
=======
});
}, callback);
>>>>>>>
});
// Suspect code per ticket: #104 removed for deeper inspection.
// fs.readdir("/dev/serial/by-path", function(err_path, paths) {
// if (err_path) {
// if (err.errno === 34) return callback(null, []);
// return console.log(err);
// }
// var dirName, items;
// //check if multiple devices of the same id are connected
// if (files.length !== paths.length) {
// dirName = "/dev/serial/by-path";
// items = paths;
// } else {
// dirName = "/dev/serial/by-id";
// items = files;
// }
// async.map(items, function (file, callback) {
// var fileName = path.join(dirName, file);
// fs.readlink(fileName, function (err, link) {
// if (err) {
// return callback(err);
// }
// link = path.resolve(dirName, link);
// callback(null, {
// comName: link,
// manufacturer: undefined,
// pnpId: file
// });
// });
// }, callback);
}, callback); |
<<<<<<<
require("./analytics").sendCollect(e);
};
export const isCoreTeam = userId => {
const allCoreTeam = config.coreteam.members;
return !!allCoreTeam.find(member => member === userId);
=======
sendCollect(e);
};
export const analyticsSendBotCollect = e => {
sendBotCollect(e);
>>>>>>>
sendCollect(e);
};
export const analyticsSendBotCollect = e => {
sendBotCollect(e);
};
export const isCoreTeam = userId => {
const allCoreTeam = config.coreteam.members;
return !!allCoreTeam.find(member => member === userId); |
<<<<<<<
const sendWelcomeMessage = async username => {
const message = `Olá, Impulser! Eu sou *Atena*, deusa da sabedoria e guardiã deste reino! Se chegaste até aqui suponho que queiras juntar-se a nós, estou certa?! Vejo que tens potencial, mas terás que me provar que és capaz!
Em meus domínios terás que realizar tarefas para mim, teus feitos irão render-te *Pontos de Experiência* que, além de fortalecer-te, permitirão que obtenhas medalhas de *Conquistas* em forma de reconhecimento! Sou uma deusa amorosa, por isso saibas que, eventualmente, irei premiar-te de maneira especial!
Com o tempo, sentirás a necessidade de acompanhar o teu progresso. Por isso, podes consultar os livros de nossa biblioteca que contém tudo o que fizestes até então, são eles:
- Pergaminhos de *Pontos de Experiência: !meuspontos*;
- e os Tomos de *Conquistas: !minhasconquistas*.
Ah! Claro que não estás só na realização destas tarefas. Os nomes dos(as) Impulsers estão dispostos nos murais no exterior de meu templo, esta é uma forma de reconhecer o teu valor e os teusesforços. Lá, tu encontrarás dois murais:
- O *!ranking* ou *!ranking _nº do mês_* onde estão os nomes dos(das) que mais se esforçaram neste mês. Aquele(a) que estiver em primeiro lugar receberá uma recompensa especial;
- e o *!rankinggeral* onde os nomes ficam dispostos, indicando toda a sua contribuição realizada até o presente momento.
Uma última e importante informação, caso possuas acesso *a maior honraria* entre nós, o *Impulser PRO*, podes conferir o estado dele através do comando *!pro*.
Sei que são muitas informações, mas caso te esqueças de algum dos comandos podes utilizar do *!comandos*. Também podes recorrer a este papiro, nele encontrarás *tudo o que precisa* saber em caso de dúvidas: *atena.impulso.network.*
Espero que aproveite ao máximo *tua jornada* por aqui!`;
return await sendToUser(message, username);
};
=======
const getSlackUsers = async (req, res) => {
try {
let slackUsers = await userModel
.find({
slackId: { $exists: true },
score: { $gt: 5 }
})
.sort({ score: -1 })
.limit(15);
return res.json(slackUsers);
} catch (err) {
const errorMessage = {
error: "Não foi possivel fazer a busca no banco de dados"
};
console.log(err);
return res.json(errorMessage);
}
};
const findByName = async (req, res) => {
try {
const users = await userModel
.find({
$text: {
$search: req.query.name,
$caseSensitive: false,
$diacriticSensitive: false
},
rocketId: { $exists: true }
})
.sort({ score: -1 });
return res.json(users);
} catch (err) {
console.log(err);
}
};
const editScore = async (req, res) => {
const { type, score } = req.body;
const userId = req.params.id;
let updatedUser;
if (type === "slack") {
try {
updatedUser = await userModel.findByIdAndUpdate(
userId,
{ score },
{
new: true
}
);
} catch (error) {
console.log(error);
return;
}
} else if (type === "rocket") {
let user;
try {
user = await userModel.findOne({ _id: userId });
} catch (error) {
console.log(error);
}
const oldLevel = user.level;
const newScore = user.score + score;
user.level = calculateLevel(newScore);
user.score = newScore;
try {
updatedUser = await userModel.findByIdAndUpdate(
userId,
{ score: user.score, level: user.level },
{
new: true
}
);
} catch (error) {
console.log(error);
}
const message = {
msg: `Olá ${
user.name
}, sua pontuação do slack, *${score} pontos*, foi tranferida. Agora sua nova pontuação é de *${
user.score
} pontos!*`,
attachments: []
};
const attachments = {
text: `Ah, e você ainda subiu de nivel. Seu novo nivel é *${
user.level
}* .`
};
if (oldLevel !== user.level) {
message.attachments.push(attachments);
}
try {
await driver.sendDirectToUser(message, user.username);
} catch (error) {
console.log(error);
}
}
return res.json(updatedUser);
};
>>>>>>>
const sendWelcomeMessage = async username => {
const message = `Olá, Impulser! Eu sou *Atena*, deusa da sabedoria e guardiã deste reino! Se chegaste até aqui suponho que queiras juntar-se a nós, estou certa?! Vejo que tens potencial, mas terás que me provar que és capaz!
Em meus domínios terás que realizar tarefas para mim, teus feitos irão render-te *Pontos de Experiência* que, além de fortalecer-te, permitirão que obtenhas medalhas de *Conquistas* em forma de reconhecimento! Sou uma deusa amorosa, por isso saibas que, eventualmente, irei premiar-te de maneira especial!
Com o tempo, sentirás a necessidade de acompanhar o teu progresso. Por isso, podes consultar os livros de nossa biblioteca que contém tudo o que fizestes até então, são eles:
- Pergaminhos de *Pontos de Experiência: !meuspontos*;
- e os Tomos de *Conquistas: !minhasconquistas*.
Ah! Claro que não estás só na realização destas tarefas. Os nomes dos(as) Impulsers estão dispostos nos murais no exterior de meu templo, esta é uma forma de reconhecer o teu valor e os teusesforços. Lá, tu encontrarás dois murais:
- O *!ranking* ou *!ranking _nº do mês_* onde estão os nomes dos(das) que mais se esforçaram neste mês. Aquele(a) que estiver em primeiro lugar receberá uma recompensa especial;
- e o *!rankinggeral* onde os nomes ficam dispostos, indicando toda a sua contribuição realizada até o presente momento.
Uma última e importante informação, caso possuas acesso *a maior honraria* entre nós, o *Impulser PRO*, podes conferir o estado dele através do comando *!pro*.
Sei que são muitas informações, mas caso te esqueças de algum dos comandos podes utilizar do *!comandos*. Também podes recorrer a este papiro, nele encontrarás *tudo o que precisa* saber em caso de dúvidas: *atena.impulso.network.*
Espero que aproveite ao máximo *tua jornada* por aqui!`;
return await sendToUser(message, username);
};
const getSlackUsers = async (req, res) => {
try {
let slackUsers = await userModel
.find({
slackId: { $exists: true },
score: { $gt: 5 }
})
.sort({ score: -1 })
.limit(15);
return res.json(slackUsers);
} catch (err) {
const errorMessage = {
error: "Não foi possivel fazer a busca no banco de dados"
};
console.log(err);
return res.json(errorMessage);
}
};
const findByName = async (req, res) => {
try {
const users = await userModel
.find({
$text: {
$search: req.query.name,
$caseSensitive: false,
$diacriticSensitive: false
},
rocketId: { $exists: true }
})
.sort({ score: -1 });
return res.json(users);
} catch (err) {
console.log(err);
}
};
const editScore = async (req, res) => {
const { type, score } = req.body;
const userId = req.params.id;
let updatedUser;
if (type === "slack") {
try {
updatedUser = await userModel.findByIdAndUpdate(
userId,
{ score },
{
new: true
}
);
} catch (error) {
console.log(error);
return;
}
} else if (type === "rocket") {
let user;
try {
user = await userModel.findOne({ _id: userId });
} catch (error) {
console.log(error);
}
const oldLevel = user.level;
const newScore = user.score + score;
user.level = calculateLevel(newScore);
user.score = newScore;
try {
updatedUser = await userModel.findByIdAndUpdate(
userId,
{ score: user.score, level: user.level },
{
new: true
}
);
} catch (error) {
console.log(error);
}
const message = {
msg: `Olá ${
user.name
}, sua pontuação do slack, *${score} pontos*, foi tranferida. Agora sua nova pontuação é de *${
user.score
} pontos!*`,
attachments: []
};
const attachments = {
text: `Ah, e você ainda subiu de nivel. Seu novo nivel é *${
user.level
}* .`
};
if (oldLevel !== user.level) {
message.attachments.push(attachments);
}
try {
await driver.sendDirectToUser(message, user.username);
} catch (error) {
console.log(error);
}
}
return res.json(updatedUser);
}; |
<<<<<<<
const customUpdate = async (user, interactionScore, interaction) => {
// TODO: Remove argument interaction.
// just added because function calculateReactions need that
return userModel.findOne({ rocketId: user }).then((doc, err) => {
if (err) {
console.log('erro ao fazer update no usuario ', user, interactionScore)
}
const newScore = doc.score + interactionScore
doc.score = newScore
doc.level = calculateLevel(newScore)
doc.reactions = calculateReactions(interaction, 0)
return doc.save()
})
}
const find = async (userId, isCoreTeam = false, selectOptions = '-email') => {
=======
const find = async (userId, isCoreTeam = false, selectOptions = "-email") => {
>>>>>>>
const find = async (userId, isCoreTeam = false, selectOptions = '-email') => {
<<<<<<<
if (interaction.origin != 'sistema') {
query[`${interaction.origin}Id`] = userId
} else {
query = { _id: userId }
=======
if (interaction.origin === "sistema") {
query = { _id: userId };
} else if (interaction.origin === "blog" || interaction.origin === "github") {
query = { rocketId: userId };
} else {
query[`${interaction.origin}Id`] = userId;
>>>>>>>
if (interaction.origin === 'sistema') {
query = { _id: userId }
} else if (interaction.origin === 'blog' || interaction.origin === 'github') {
query = { rocketId: userId }
} else {
query[`${interaction.origin}Id`] = userId
<<<<<<<
sendPro
}
=======
sendPro,
getUserByRocket,
sendWelcomeMessage
};
>>>>>>>
sendPro,
getUserByRocket,
sendWelcomeMessage
} |
<<<<<<<
const updateScore = async (user, score) => {
if (user) {
console.log("Entrou no updateScore");
const newScore = user.score + score;
const newLevel = calculateLevel(newScore);
await doLevelChangeActions(user._id, user.level, newLevel);
user.level = newLevel;
user.score = newScore;
return await user.save();
}
return;
};
=======
const changeTeams = async (userId, teams) => {
const UserModel = mongoose.model("User");
const user = await getNetwork(userId);
let result = {};
try {
result = await UserModel.findByIdAndUpdate(
user._id,
{
teams: teams.split(",") || ""
},
(err, doc) => {
if (err) return false;
console.log(doc);
return doc;
}
);
} catch (e) {
return false;
}
return result;
};
>>>>>>>
const updateScore = async (user, score) => {
if (user) {
console.log("Entrou no updateScore");
const newScore = user.score + score;
const newLevel = calculateLevel(newScore);
await doLevelChangeActions(user._id, user.level, newLevel);
user.level = newLevel;
user.score = newScore;
return await user.save();
}
return;
}
const changeTeams = async (userId, teams) => {
const UserModel = mongoose.model("User");
const user = await getNetwork(userId);
let result = {};
try {
result = await UserModel.findByIdAndUpdate(
user._id,
{
teams: teams.split(",") || ""
},
(err, doc) => {
if (err) return false;
console.log(doc);
return doc;
}
);
} catch (e) {
return false;
}
return result;
};
<<<<<<<
getNetwork,
updateScore
=======
getNetwork,
changeTeams
>>>>>>>
getNetwork,
updateScore,
changeTeams |
<<<<<<<
import blogRoutes from "./blog";
=======
import apiRoutes from "./api";
>>>>>>>
import blogRoutes from "./blog";
import apiRoutes from "./api";
<<<<<<<
router.use("/blog", blogRoutes);
=======
router.use("/api/v1", apiRoutes);
>>>>>>>
router.use("/blog", blogRoutes);
router.use("/api/v1", apiRoutes); |
<<<<<<<
const name = achievement.name.split(' | ')
const level = showLevel ? ` ${user.level}` : ''
=======
const name = achievement.name.split(" | ");
>>>>>>>
const name = achievement.name.split(' | ')
<<<<<<<
} ${achievement.range} | ${name[1]}${level}]!`
=======
} ${achievement.range} | ${name[1]}]!`;
// let publicMessage = `:medal: @${rocketUser.username} obteve a conquista [${
// achievement.rating
// } ${achievement.range} | ${name[1]}]!`;
>>>>>>>
} ${achievement.range} | ${name[1]}]!`
// let publicMessage = `:medal: @${rocketUser.username} obteve a conquista [${
// achievement.rating
// } ${achievement.range} | ${name[1]}]!`; |
<<<<<<<
export const sendToUser = async (message, user) => {
await driver.sendDirectToUser(message, user);
};
=======
runBot();
/*
const files = fs.readdirSync(emojiDir);
for (const file of files) {
const pathToFile = path.join(emojiDir, file);
try {
const stat = fs.statSync(pathToFile);
if (stat.isFile()) {
const mimeType = mime.lookup(pathToFile);
var fileSplit = file.split(".");
const emojiData = {
name: fileSplit[0],
aliases: "",
newFile: true,
extension: fileSplit[1]
};
>>>>>>>
export const sendToUser = async (message, user) => {
await driver.sendDirectToUser(message, user);
};
runBot();
/*
const files = fs.readdirSync(emojiDir);
for (const file of files) {
const pathToFile = path.join(emojiDir, file);
try {
const stat = fs.statSync(pathToFile);
if (stat.isFile()) {
const mimeType = mime.lookup(pathToFile);
var fileSplit = file.split(".");
const emojiData = {
name: fileSplit[0],
aliases: "",
newFile: true,
extension: fileSplit[1]
}; |
<<<<<<<
=======
import AchievementLevelController from "./achievementLevel";
import axios from "axios";
>>>>>>>
<<<<<<<
import { doLevelChangeActions } from "../utils/levels";
=======
import { isValidToken } from "../utils/teams";
import interactionController from "./interaction";
>>>>>>>
import { doLevelChangeActions } from "../utils/levels";
import axios from "axios";
import { isValidToken } from "../utils/teams";
import interactionController from "./interaction";
<<<<<<<
updateScore,
changeTeams
=======
changeTeams,
fromRocket,
details
>>>>>>>
updateScore,
changeTeams,
fromRocket,
details |
<<<<<<<
// @version 3.7.2
=======
// @version 2.30.5
>>>>>>>
// @version 3.7.2
<<<<<<<
* Copyright (c) 2012 Nicolas Stepien <[email protected]>, James Campos <[email protected]>
* http://aeosynth.github.com/4chan-x/
* 4chan X 3.7.2
=======
* Copyright (c) 2012 Nicolas Stepien <[email protected]>
* http://mayhemydg.github.com/4chan-x/
* 4chan X 2.30.5
>>>>>>>
* Copyright (c) 2012 Nicolas Stepien <[email protected]>, James Campos <[email protected]>
* http://aeosynth.github.com/4chan-x/
* 4chan X 3.7.2
<<<<<<<
=======
},
open: function(url) {
return (GM_openInTab || window.open)(location.protocol + url, '_blank');
},
globalEval: function(code) {
var script;
script = $.el('script', {
textContent: code
});
$.add(d.head, script);
return $.rm(script);
>>>>>>>
},
globalEval: function(code) {
var script;
script = $.el('script', {
textContent: code
});
$.add(d.head, script);
return $.rm(script);
<<<<<<<
=======
return setTimeout(this.asyncInit);
},
asyncInit: function() {
var link;
>>>>>>>
<<<<<<<
version: '3.7.2',
=======
version: '2.30.5',
>>>>>>>
version: '3.7.2', |
<<<<<<<
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, _ref;
=======
var $, $$, DAY, Favicon, HOUR, MINUTE, NAMESPACE, Recaptcha, SECOND, Time, anonymize, conf, config, cooldown, d, expandComment, expandThread, firstRun, g, getTitle, imgExpand, imgGif, imgHover, imgPreloading, key, keybinds, log, main, 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, 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;
<<<<<<<
=======
Recaptcha = {
init: function() {
var el, _i, _len, _ref;
_ref = $$('#recaptcha_table a');
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
el = _ref[_i];
el.tabIndex = 1;
}
return $.bind($('#recaptcha_response_field'), 'keydown', Recaptcha.listener);
},
listener: function(e) {
if (e.keyCode === 8 && this.value === '') {
return Recaptcha.reload();
}
},
reload: function() {
return window.location = 'javascript:Recaptcha.reload()';
}
};
>>>>>>>
<<<<<<<
var callback, cutoff, hiddenThreads, id, lastChecked, now, op, pathname, table, temp, timestamp, tzOffset, _i, _j, _k, _l, _len, _len2, _len3, _len4, _ref2, _ref3, _ref4, _ref5, _ref6;
=======
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); |
<<<<<<<
// @version 3.9.5
=======
// @version 2.31.6
>>>>>>>
// @version 3.9.5
<<<<<<<
* Copyright (c) 2012 Nicolas Stepien <[email protected]>, James Campos <[email protected]>
* http://aeosynth.github.com/4chan-x/
* 4chan X 3.9.5
=======
* Copyright (c) 2012 Nicolas Stepien <[email protected]>
* http://mayhemydg.github.com/4chan-x/
* 4chan X 2.31.6
>>>>>>>
* Copyright (c) 2012 Nicolas Stepien <[email protected]>, James Campos <[email protected]>
* http://aeosynth.github.com/4chan-x/
* 4chan X 3.9.5
<<<<<<<
var $, $$, Anonymize, AutoGif, Conf, Config, DeleteButton, ExpandComment, ExpandThread, Favicon, FileInfo, Filter, GetTitle, ImageExpand, ImageHover, Keybinds, Main, Nav, Options, Prefetch, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, QuoteThreading, Quotify, Redirect, ReplyHiding, ReportButton, RevealSpoilers, Sauce, StrikethroughQuotes, ThreadHiding, ThreadStats, Time, TitlePost, UI, Unread, Updater, Watcher, d, g, log, _base;
=======
var $, $$, Anonymize, AutoGif, Conf, Config, DeleteButton, ExpandComment, ExpandThread, Favicon, FileInfo, Filter, GetTitle, ImageExpand, ImageHover, Keybinds, Main, Nav, Options, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, Quotify, Redirect, ReplyHiding, ReportButton, RevealSpoilers, Sauce, StrikethroughQuotes, ThreadHiding, ThreadStats, Time, TitlePost, UI, Unread, Updater, Watcher, d, g, _base;
>>>>>>>
var $, $$, Anonymize, AutoGif, Conf, Config, DeleteButton, ExpandComment, ExpandThread, Favicon, FileInfo, Filter, GetTitle, ImageExpand, ImageHover, Keybinds, Main, Nav, Options, Prefetch, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, QuoteThreading, Quotify, Redirect, ReplyHiding, ReportButton, RevealSpoilers, Sauce, StrikethroughQuotes, ThreadHiding, ThreadStats, Time, TitlePost, UI, Unread, Updater, Watcher, d, g, log, _base;
<<<<<<<
interval: function() {
var val;
val = parseInt(this.value, 10);
this.value = val > 0 ? val : 30;
return $.cb.value.call(this);
},
=======
interval: function() {
var val;
val = parseInt(this.value, 10);
this.value = val > 0 ? val : 1;
return $.cb.value.call(this);
},
>>>>>>>
interval: function() {
var val;
val = parseInt(this.value, 10);
this.value = val > 0 ? val : 30;
return $.cb.value.call(this);
},
<<<<<<<
QuoteThreading = {
init: function() {
return Main.callbacks.push(this.node);
},
node: function(post) {
var id, keys, next, pEl, pid, preply, prev, qid, qreply, qroot, quote, quotes, replies, reply, threadContainer, uniq, _i, _len;
quotes = post.quotes, id = post.id;
replies = Unread.replies;
uniq = {};
for (_i = 0, _len = quotes.length; _i < _len; _i++) {
quote = quotes[_i];
qid = quote.hash.slice(2);
if (!(qid < id)) {
continue;
}
if (qid in replies) {
uniq[qid] = true;
}
}
keys = Object.keys(uniq);
if (keys.length !== 1) {
return;
}
qid = keys[0];
qreply = replies[qid];
reply = replies[id];
qroot = qreply.el.parentNode;
threadContainer = qroot.nextSibling;
if ((threadContainer != null ? threadContainer.className : void 0) !== 'threadContainer') {
threadContainer = $.el('div', {
className: 'threadContainer'
});
$.after(qroot, threadContainer);
}
$.add(threadContainer, reply.el.parentNode);
pEl = $.x('preceding::div[contains(@class,"post reply")][1]/parent::div', reply.el.parentNode);
pid = pEl.id.slice(2);
preply = replies[pid];
prev = reply.prev, next = reply.next;
if (preply === prev) {
return;
}
prev.next = next;
if (next) {
next.prev = prev;
} else {
replies.last = prev;
}
next = preply.next;
preply.next = reply;
reply.next = next;
return Unread.replies = replies;
},
dialog: function() {
var controls, input;
controls = $.el('label', {
id: 'thread',
"class": 'controls',
innerHTML: "Thread<input type=checkbox checked>"
});
input = $('input', controls);
$.on(input, 'click', QuoteThreading.toggle);
return $.prepend($.id('delform'), controls);
},
toggle: function() {
var container, containers, node, nodes, replies, reply, thread, _i, _j, _k, _len, _len1, _len2, _results, _results1;
thread = $('.thread');
replies = $$('.replyContainer', thread);
if (this.checked) {
nodes = (function() {
var _i, _len, _results;
_results = [];
for (_i = 0, _len = replies.length; _i < _len; _i++) {
reply = replies[_i];
_results.push(Main.preParse(reply));
}
return _results;
})();
for (_i = 0, _len = nodes.length; _i < _len; _i++) {
node = nodes[_i];
Unread.node(node);
}
_results = [];
for (_j = 0, _len1 = nodes.length; _j < _len1; _j++) {
node = nodes[_j];
_results.push(QuoteThreading.node(node));
}
return _results;
} else {
replies.sort(function(a, b) {
var aID, bID;
aID = Number(a.id.slice(2));
bID = Number(b.id.slice(2));
return aID - bID;
});
$.add(thread, replies);
containers = $$('.threadContainer', thread);
_results1 = [];
for (_k = 0, _len2 = containers.length; _k < _len2; _k++) {
container = containers[_k];
_results1.push($.rm(container));
}
return _results1;
}
}
};
DeleteButton = {
init: function() {
this.a = $.el('a', {
className: 'delete_button',
innerHTML: '[ X ]',
href: 'javascript:;'
});
return Main.callbacks.push(this.node);
},
node: function(post) {
var a;
if (!(a = $('.delete_button', post.el))) {
a = DeleteButton.a.cloneNode(true);
$.add($('.postInfo', post.el), a);
}
return $.on(a, 'click', DeleteButton["delete"]);
},
"delete": function() {
$.x('preceding-sibling::input', this).checked = true;
return $.id('delPassword').nextElementSibling.click();
}
};
=======
DeleteButton = {
init: function() {
this.a = $.el('a', {
className: 'delete_button',
innerHTML: '[ X ]',
href: 'javascript:;'
});
return Main.callbacks.push(this.node);
},
node: function(post) {
var a;
if (!(a = $('.delete_button', post.el))) {
a = DeleteButton.a.cloneNode(true);
$.add($('.postInfo', post.el), a);
}
return $.on(a, 'click', DeleteButton["delete"]);
},
"delete": function() {
var data, id, m, pwd;
if (m = d.cookie.match(/4chan_pass=([^;]+)/)) {
pwd = decodeURIComponent(m[1]);
} else {
this.textContent = 'Error: no password found';
return;
}
DeleteButton.el = this;
$.off(this, 'click', DeleteButton["delete"]);
this.textContent = 'Deleting...';
id = $.x('preceding-sibling::input', this).name;
data = new FormData();
data.append(id, 'delete');
data.append('mode', 'usrdel');
return $.ajax("https://sys.4chan.org/" + g.BOARD + "/imgboard.php", {
onload: DeleteButton.load,
onerror: DeleteButton.error
}, {
type: 'post',
form: data,
pwd: pwd
});
},
load: function() {
var doc, msg, tc;
doc = d.implementation.createHTMLDocument('');
doc.documentElement.innerHTML = this.response;
if (doc.title === '4chan - Banned') {
tc = 'Banned!';
} else if (msg = doc.getElementById('errmsg')) {
tc = msg.textContent;
} else {
tc = 'Deleted';
}
return DeleteButton.el.textContent = tc;
},
error: function() {
return DeleteButton.el.textContent = 'Error';
}
};
>>>>>>>
QuoteThreading = {
init: function() {
return Main.callbacks.push(this.node);
},
node: function(post) {
var id, keys, next, pEl, pid, preply, prev, qid, qreply, qroot, quote, quotes, replies, reply, threadContainer, uniq, _i, _len;
quotes = post.quotes, id = post.id;
replies = Unread.replies;
uniq = {};
for (_i = 0, _len = quotes.length; _i < _len; _i++) {
quote = quotes[_i];
qid = quote.hash.slice(2);
if (!(qid < id)) {
continue;
}
if (qid in replies) {
uniq[qid] = true;
}
}
keys = Object.keys(uniq);
if (keys.length !== 1) {
return;
}
qid = keys[0];
qreply = replies[qid];
reply = replies[id];
qroot = qreply.el.parentNode;
threadContainer = qroot.nextSibling;
if ((threadContainer != null ? threadContainer.className : void 0) !== 'threadContainer') {
threadContainer = $.el('div', {
className: 'threadContainer'
});
$.after(qroot, threadContainer);
}
$.add(threadContainer, reply.el.parentNode);
pEl = $.x('preceding::div[contains(@class,"post reply")][1]/parent::div', reply.el.parentNode);
pid = pEl.id.slice(2);
preply = replies[pid];
prev = reply.prev, next = reply.next;
if (preply === prev) {
return;
}
prev.next = next;
if (next) {
next.prev = prev;
} else {
replies.last = prev;
}
next = preply.next;
preply.next = reply;
reply.next = next;
return Unread.replies = replies;
},
dialog: function() {
var controls, input;
controls = $.el('label', {
id: 'thread',
"class": 'controls',
innerHTML: "Thread<input type=checkbox checked>"
});
input = $('input', controls);
$.on(input, 'click', QuoteThreading.toggle);
return $.prepend($.id('delform'), controls);
},
toggle: function() {
var container, containers, node, nodes, replies, reply, thread, _i, _j, _k, _len, _len1, _len2, _results, _results1;
thread = $('.thread');
replies = $$('.replyContainer', thread);
if (this.checked) {
nodes = (function() {
var _i, _len, _results;
_results = [];
for (_i = 0, _len = replies.length; _i < _len; _i++) {
reply = replies[_i];
_results.push(Main.preParse(reply));
}
return _results;
})();
for (_i = 0, _len = nodes.length; _i < _len; _i++) {
node = nodes[_i];
Unread.node(node);
}
_results = [];
for (_j = 0, _len1 = nodes.length; _j < _len1; _j++) {
node = nodes[_j];
_results.push(QuoteThreading.node(node));
}
return _results;
} else {
replies.sort(function(a, b) {
var aID, bID;
aID = Number(a.id.slice(2));
bID = Number(b.id.slice(2));
return aID - bID;
});
$.add(thread, replies);
containers = $$('.threadContainer', thread);
_results1 = [];
for (_k = 0, _len2 = containers.length; _k < _len2; _k++) {
container = containers[_k];
_results1.push($.rm(container));
}
return _results1;
}
}
};
DeleteButton = {
init: function() {
this.a = $.el('a', {
className: 'delete_button',
innerHTML: '[ X ]',
href: 'javascript:;'
});
return Main.callbacks.push(this.node);
},
node: function(post) {
var a;
if (!(a = $('.delete_button', post.el))) {
a = DeleteButton.a.cloneNode(true);
$.add($('.postInfo', post.el), a);
}
return $.on(a, 'click', DeleteButton["delete"]);
},
"delete": function() {
var data, id, m, pwd;
if (m = d.cookie.match(/4chan_pass=([^;]+)/)) {
pwd = decodeURIComponent(m[1]);
} else {
this.textContent = 'Error: no password found';
return;
}
DeleteButton.el = this;
$.off(this, 'click', DeleteButton["delete"]);
this.textContent = 'Deleting...';
id = $.x('preceding-sibling::input', this).name;
data = new FormData();
data.append(id, 'delete');
data.append('mode', 'usrdel');
return $.ajax("https://sys.4chan.org/" + g.BOARD + "/imgboard.php", {
onload: DeleteButton.load,
onerror: DeleteButton.error
}, {
type: 'post',
form: data,
pwd: pwd
});
},
load: function() {
var doc, msg, tc;
doc = d.implementation.createHTMLDocument('');
doc.documentElement.innerHTML = this.response;
if (doc.title === '4chan - Banned') {
tc = 'Banned!';
} else if (msg = doc.getElementById('errmsg')) {
tc = msg.textContent;
} else {
tc = 'Deleted';
}
return DeleteButton.el.textContent = tc;
},
error: function() {
return DeleteButton.el.textContent = 'Error';
}
};
<<<<<<<
=======
var _ref;
if ((_ref = g.BOARD) === 'gif' || _ref === 'wsg') {
return;
}
>>>>>>>
<<<<<<<
version: '3.9.5',
=======
version: '2.31.6',
>>>>>>>
version: '3.9.5', |
<<<<<<<
var $, $$, Anonymize, AutoGif, Conf, Config, ExpandComment, ExpandThread, Favicon, FileInfo, Filter, Get, ImageExpand, ImageHover, Keybinds, Main, Nav, Options, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, Quotify, Redirect, ReplyHiding, ReportButton, RevealSpoilers, Sauce, StrikethroughQuotes, ThreadHiding, ThreadStats, Time, TitlePost, UI, Unread, Updater, Watcher, d, g, _base;
=======
var $, $$, Anonymize, AutoGif, Conf, Config, DeleteButton, ExpandComment, ExpandThread, Favicon, FileInfo, Filter, GetTitle, ImageExpand, ImageHover, Keybinds, Main, Nav, Options, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, Quotify, Redirect, ReplyHiding, ReportButton, RevealSpoilers, Sauce, StrikethroughQuotes, ThreadHiding, ThreadStats, Time, TitlePost, UI, Unread, Updater, Watcher, d, g, _base;
>>>>>>>
var $, $$, Anonymize, AutoGif, Conf, Config, DeleteButton, ExpandComment, ExpandThread, Favicon, FileInfo, Filter, Get, ImageExpand, ImageHover, Keybinds, Main, Nav, Options, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, Quotify, Redirect, ReplyHiding, ReportButton, RevealSpoilers, Sauce, StrikethroughQuotes, ThreadHiding, ThreadStats, Time, TitlePost, UI, Unread, Updater, Watcher, d, g, _base; |
<<<<<<<
// @version 3.12.0
=======
// @version 2.33.8
>>>>>>>
// @version 3.12.0
<<<<<<<
* Copyright (c) 2012 Nicolas Stepien <[email protected]>, James Campos <[email protected]>
* http://aeosynth.github.com/4chan-x/
* 4chan X 3.12.0
=======
* Copyright (c) 2012 Nicolas Stepien <[email protected]>
* http://mayhemydg.github.com/4chan-x/
* 4chan X 2.33.8
>>>>>>>
* Copyright (c) 2012 Nicolas Stepien <[email protected]>, James Campos <[email protected]>
* http://aeosynth.github.com/4chan-x/
* 4chan X 3.12.0
<<<<<<<
var $, $$, Anonymize, AutoGif, Conf, Config, DeleteButton, ExpandComment, ExpandThread, Favicon, FileInfo, Filter, Get, ImageExpand, ImageHover, Keybinds, Main, Nav, Options, Prefetch, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, QuoteThreading, Quotify, Redirect, ReplyHiding, ReportButton, RevealSpoilers, Sauce, StrikethroughQuotes, ThreadHiding, ThreadStats, Time, TitlePost, UI, Unread, Updater, Watcher, d, g, log, _base;
=======
var $, $$, Anonymize, ArchiveLink, AutoGif, Conf, Config, DeleteLink, DownloadLink, ExpandComment, ExpandThread, Favicon, FileInfo, Filter, Get, ImageExpand, ImageHover, Keybinds, Main, Menu, Nav, Options, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, Quotify, Redirect, ReplyHiding, ReportLink, RevealSpoilers, Sauce, StrikethroughQuotes, ThreadHiding, ThreadStats, Time, TitlePost, UI, Unread, Updater, Watcher, d, g, _base;
>>>>>>>
var $, $$, Anonymize, ArchiveLink, AutoGif, Conf, Config, DeleteLink, DownloadLink, ExpandComment, ExpandThread, Favicon, FileInfo, Filter, Get, ImageExpand, ImageHover, Keybinds, Main, Menu, Nav, Options, Prefetch, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, QuoteThreading, Quotify, Redirect, ReplyHiding, ReportLink, RevealSpoilers, Sauce, StrikethroughQuotes, ThreadHiding, ThreadStats, Time, TitlePost, UI, Unread, Updater, Watcher, d, g, log, _base;
<<<<<<<
this.lastPost = this.thread.lastElementChild;
=======
this.unsuccessfulFetchCount = 0;
this.lastModified = '0';
>>>>>>>
this.lastPost = this.thread.lastElementChild;
this.unsuccessfulFetchCount = 0;
this.lastModified = '0';
<<<<<<<
this.value = val > 0 ? val : 30;
return $.cb.value.call(this);
=======
this.value = val > 5 ? val : 5;
$.cb.value.call(this);
return Updater.timer.textContent = "-" + (Updater.getInterval());
>>>>>>>
this.value = val > 0 ? val : 30;
$.cb.value.call(this);
return Updater.timer.textContent = "-" + (Updater.getInterval());
<<<<<<<
if (lastPost = nodes[0]) {
Updater.lastPost = lastPost;
}
=======
if (!count) {
return;
}
Updater.unsuccessfulFetchCount = 0;
Updater.timer.textContent = "-" + (Updater.getInterval());
scroll = Conf['Scrolling'] && Updater.scrollBG() && lastPost.getBoundingClientRect().bottom - d.documentElement.clientHeight < 25;
>>>>>>>
if (lastPost = nodes[0]) {
Updater.lastPost = lastPost;
}
if (!count) {
return;
}
Updater.unsuccessfulFetchCount = 0;
Updater.timer.textContent = "-" + (Updater.getInterval());
scroll = Conf['Scrolling'] && Updater.scrollBG() && lastPost.getBoundingClientRect().bottom - d.documentElement.clientHeight < 25;
<<<<<<<
var board, callbacks, form, id, m, opts, pwd, self, url;
$.off(this, 'click', DeleteButton["delete"]);
this.innerHTML = '[ Deleting... ]';
if (m = d.cookie.match(/4chan_pass=([^;]+)/)) {
pwd = decodeURIComponent(m[1]);
} else {
pwd = $.id('delPassword').value;
}
id = $.x('preceding-sibling::input', this).name;
board = $.x('preceding-sibling::span[1]/a', this).pathname.match(/\w+/)[0];
=======
var board, form, id, m, pwd, self;
$.off(this, 'click', DeleteLink["delete"]);
this.textContent = 'Deleting...';
pwd = (m = d.cookie.match(/4chan_pass=([^;]+)/)) ? decodeURIComponent(m[1]) : $.id('delPassword').value;
id = this.parentNode.dataset.id;
board = $('.postNum > a[title="Highlight this post"]', $.id(this.parentNode.dataset.rootid)).pathname.split('/')[1];
>>>>>>>
var board, form, id, m, pwd, self;
$.off(this, 'click', DeleteLink["delete"]);
this.textContent = 'Deleting...';
pwd = (m = d.cookie.match(/4chan_pass=([^;]+)/)) ? decodeURIComponent(m[1]) : $.id('delPassword').value;
id = this.parentNode.dataset.id;
board = $('.postNum > a[title="Highlight this post"]', $.id(this.parentNode.dataset.rootid)).pathname.split('/')[1];
<<<<<<<
url = "https://sys.4chan.org/" + board + "/imgboard.php";
callbacks = {
=======
form = {
mode: 'usrdel',
pwd: pwd
};
form[id] = 'delete';
return $.ajax($.id('delform').action.replace("/" + g.BOARD + "/", "/" + board + "/"), {
>>>>>>>
form = {
mode: 'usrdel',
pwd: pwd
};
form[id] = 'delete';
return $.ajax($.id('delform').action.replace("/" + g.BOARD + "/", "/" + board + "/"), {
<<<<<<<
version: '3.12.0',
=======
version: '2.33.8',
>>>>>>>
version: '3.12.0',
<<<<<<<
right: 0;\
width: 100%;\
height: 100%;\
=======
left: 0;\
width: 100%;\
height: 100%;\
text-align: center;\
>>>>>>>
right: 0;\
width: 100%;\
height: 100%;\
<<<<<<<
z-index: 2;\
position: absolute;\
=======
box-sizing: border-box;\
-moz-box-sizing: border-box;\
>>>>>>>
z-index: 2;\
position: absolute;\ |
<<<<<<<
=======
if (!$('form[name=post]')) return;
if (conf['Scrolling']) {
if (conf['Scroll BG']) {
updater.focus = true;
} else {
$.on(window, 'focus', (function() {
return updater.focus = true;
}));
$.on(window, 'blur', (function() {
return updater.focus = false;
}));
}
}
>>>>>>>
if (!$('form[name=post]')) return;
<<<<<<<
if (input.name === 'Scroll BG') {
$.bind(input, 'click', updater.cb.scrollBG);
updater.cb.scrollBG.call(input);
} else if (input.name === 'Verbose') {
$.bind(input, 'click', updater.cb.verbose);
=======
if (input.name === 'Verbose') {
$.on(input, 'click', updater.cb.verbose);
>>>>>>>
if (input.name === 'Scroll BG') {
$.on(input, 'click', updater.cb.scrollBG);
updater.cb.scrollBG.call(input);
}
if (input.name === 'Verbose') {
$.on(input, 'click', updater.cb.verbose);
<<<<<<<
scroll = conf['Scrolling'] && updater.scrollBG() && arr.length && updater.br.previousElementSibling.getBoundingClientRect().bottom - d.body.clientHeight < 25;
=======
newPosts = frag.childNodes.length;
scroll = conf['Scrolling'] && updater.focus && newPosts && (d.body.scrollHeight - d.body.clientHeight - window.scrollY < 20);
>>>>>>>
newPosts = frag.childNodes.length;
scroll = conf['Scrolling'] && updater.scrollBG() && newPosts && updater.br.previousElementSibling.getBoundingClientRect().bottom - d.body.clientHeight < 25;
<<<<<<<
while (reply = arr.pop()) {
$.before(updater.br, reply);
}
if (scroll) {
return updater.br.previousSibling.scrollIntoView(false);
}
=======
$.before(updater.br, frag);
if (scroll) return scrollTo(0, d.body.scrollHeight);
>>>>>>>
$.before(updater.br, frag);
if (scroll) return updater.br.previousSibling.scrollIntoView(false); |
<<<<<<<
=======
if (location.hostname === 'sys.4chan.org') {
$.onLoad(qr.sys);
return;
}
if (location.hostname === 'images.4chan.org') {
if (conf['404 Redirect']) {
$.onLoad(function() {
if (d.title === '4chan - 404') return redirect.init();
});
}
return;
}
$.onLoad(options.init);
>>>>>>>
if (location.hostname === 'sys.4chan.org') {
$.onLoad(qr.sys);
return;
}
if (location.hostname === 'images.4chan.org') {
if (conf['404 Redirect']) {
$.onLoad(function() {
if (d.title === '4chan - 404') return redirect.init();
});
}
return;
}
$.onLoad(options.init);
<<<<<<<
var callback, node, nodes, _i, _j, _len, _len2, _ref;
$.off(d, 'DOMContentLoaded', Main.onLoad);
=======
var callback, canPost, form, node, nodes, _i, _j, _len, _len2, _ref;
>>>>>>>
var callback, node, nodes, _i, _j, _len, _len2, _ref;
<<<<<<<
if (conf['Quick Reply']) qr.init();
=======
if ((form = $('form[name=post]')) && (canPost = !!$.id('recaptcha_response_field'))) {
Recaptcha.init();
if (g.REPLY && conf['Auto Watch Reply'] && conf['Thread Watcher']) {
$.on(form, 'submit', function() {
if ($('img.favicon').src === Favicon.empty) {
return watcher.watch(null, g.THREAD_ID);
}
});
}
}
if (conf['Auto Noko'] && canPost) form.action += '?noko';
if (conf['Cooldown'] && canPost) cooldown.init();
>>>>>>>
if (conf['Quick Reply']) qr.init(); |
<<<<<<<
// @version 3.8.2
=======
// @version 2.31.1
>>>>>>>
// @version 3.8.2
<<<<<<<
* Copyright (c) 2012 Nicolas Stepien <[email protected]>, James Campos <[email protected]>
* http://aeosynth.github.com/4chan-x/
* 4chan X 3.8.2
=======
* Copyright (c) 2012 Nicolas Stepien <[email protected]>
* http://mayhemydg.github.com/4chan-x/
* 4chan X 2.31.1
>>>>>>>
* Copyright (c) 2012 Nicolas Stepien <[email protected]>, James Campos <[email protected]>
* http://aeosynth.github.com/4chan-x/
* 4chan X 3.8.2
<<<<<<<
var el, saved, _ref;
=======
var el;
>>>>>>>
var el;
<<<<<<<
el.style.cssText = (saved = localStorage["" + Main.namespace + id + ".position"]) ? saved : position;
if ((_ref = el.querySelector('.move')) != null) {
_ref.addEventListener('mousedown', UI.dragstart, false);
}
=======
el.style.cssText = localStorage.getItem("" + Main.namespace + id + ".position") || position;
el.querySelector('.move').addEventListener('mousedown', UI.dragstart, false);
>>>>>>>
el.style.cssText = localStorage.getItem("" + Main.namespace + id + ".position") || position;
el.querySelector('.move').addEventListener('mousedown', UI.dragstart, false);
<<<<<<<
if (!Main.REPLY) {
ThreadHiding.hide(root.parentNode);
=======
if (!g.REPLY) {
ThreadHiding.hide(root.parentNode, result.stub);
>>>>>>>
if (!Main.REPLY) {
ThreadHiding.hide(root.parentNode, result.stub);
<<<<<<<
ReplyHiding.hide(post);
=======
ReplyHiding.hide(root, result.stub);
>>>>>>>
ReplyHiding.hide(post, result.stub);
<<<<<<<
$.addClass(root, result[0]);
=======
$.addClass(root, result["class"]);
if (isOP && result.top && !g.REPLY) {
thisThread = root.parentNode;
if (firstThread = $('div[class="postContainer opContainer"]').parentNode) {
$.before(firstThread, [thisThread, thisThread.nextElementSibling]);
}
}
>>>>>>>
$.addClass(root, result[0]);
<<<<<<<
a = $('.hide_thread_button', thread);
$.addClass(a, 'hidden_thread');
$.addClass(thread, 'hidden');
a.firstChild.textContent = '[ + ]';
return $.add(a, $.tn(" " + opInfo + " (" + text + ")"));
=======
a = $.el('a', {
className: 'hide_thread_button hidden_thread',
innerHTML: '<span>[ + ]</span>',
href: 'javascript:;'
});
$.add(a, $.tn(" " + opInfo + " (" + text + ")"));
$.on(a, 'click', ThreadHiding.cb);
return $.prepend(thread, a);
>>>>>>>
a = $.el('a', {
className: 'hide_thread_button hidden_thread',
innerHTML: '<span>[ + ]</span>',
href: 'javascript:;'
});
$.add(a, $.tn(" " + opInfo + " (" + text + ")"));
$.on(a, 'click', ThreadHiding.cb);
return $.prepend(thread, a);
<<<<<<<
a = $('.hide_thread_button', thread);
$.removeClass(a, 'hidden_thread');
$.removeClass(thread, 'hidden');
a.innerHTML = '<span>[ - ]</span>';
=======
if (a = $('.hidden_thread', thread)) {
$.rm(a);
}
>>>>>>>
if (a = $('.hidden_thread', thread)) {
$.rm(a);
}
<<<<<<<
innerHTML: "<a href=javascript:;>" + (Main.REPLY ? 'Quick Reply' : 'New Thread') + "</a>"
=======
innerHTML: "<a href=javascript:;>" + (g.REPLY ? 'Reply to Thread' : 'Start a Thread') + "</a>"
>>>>>>>
innerHTML: "<a href=javascript:;>" + (Main.REPLY ? 'Reply to Thread' : 'Start a Thread') + "</a>"
<<<<<<<
size: parseFloat(alt),
=======
size: alt.match(/\d+\.?\d*/)[0],
>>>>>>>
size: alt.match(/\d+\.?\d*/)[0],
<<<<<<<
=======
_ref = el.parentNode.className.split(' ');
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
klass = _ref[_i];
if (!/^((op|reply|post)Container|forwarded)$/.test(klass)) {
$.addClass(qp, klass);
}
}
>>>>>>>
_ref = el.parentNode.className.split(' ');
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
klass = _ref[_i];
if (!/^((op|reply|post)Container|forwarded)$/.test(klass)) {
$.addClass(qp, klass);
}
}
<<<<<<<
Main.prettify = Main._prettify;
=======
Main.hasCodeTags = !!$('script[src="//static.4chan.org/js/prettify/prettify.js"]');
>>>>>>>
Main.prettify = Main._prettify;
Main.hasCodeTags = !!$('script[src="//static.4chan.org/js/prettify/prettify.js"]');
<<<<<<<
alert("4chan X has experienced an error. To help fix this, please send the following snippet to:\nhttp://aeosynth.github.com/4chan-x/#bug-report\n\n" + err.message + "\n" + err.stack);
=======
alert("4chan X (" + Main.version + ") error: " + err.message + "\nReport the bug at mayhemydg.github.com/4chan-x/#bug-report\n\nURL: " + window.location + "\n" + err.stack);
>>>>>>>
alert("4chan X (" + Main.version + ") has experienced an error. You can help by sending this snippet to:\nhttps://github.com/aeosynth/4chan-x/issues\n\n" + window.location + "\n" + err.message + "\n" + err.stack);
<<<<<<<
version: '3.8.2',
=======
version: '2.31.1',
>>>>>>>
version: '3.8.2', |
<<<<<<<
// @version 3.7.0
=======
// @version 2.30.4
>>>>>>>
// @version 3.7.0
<<<<<<<
* Copyright (c) 2012 Nicolas Stepien <[email protected]>, James Campos <[email protected]>
* http://aeosynth.github.com/4chan-x/
* 4chan X 3.7.0
=======
* Copyright (c) 2012 Nicolas Stepien <[email protected]>
* http://mayhemydg.github.com/4chan-x/
* 4chan X 2.30.4
>>>>>>>
* Copyright (c) 2012 Nicolas Stepien <[email protected]>, James Campos <[email protected]>
* http://aeosynth.github.com/4chan-x/
* 4chan X 3.7.0
<<<<<<<
$.addClass((isOP ? root.parentNode : root), result[0]);
if (isOP && result[1] && !Main.REPLY) {
=======
$.addClass(root, result[0]);
if (isOP && result[1] && !g.REPLY) {
>>>>>>>
$.addClass(root, result[0]);
if (isOP && result[1] && !Main.REPLY) {
<<<<<<<
threadID = Main.THREAD_ID || $('select', QR.el).value;
=======
>>>>>>>
<<<<<<<
if (board === Main.BOARD && $.id("#p" + id)) {
=======
if (board === g.BOARD && $.id("p" + id)) {
>>>>>>>
if (board === Main.BOARD && $.id("p" + id)) {
<<<<<<<
version: '3.7.0',
=======
version: '2.30.4',
>>>>>>>
version: '3.7.0', |
<<<<<<<
subTitle: 'Easiest option to share events with people!',
formLink: 'https://forms.gle/5Kv3XKJBA5g5FWRC7',
=======
subTitle: 'The easiest option to share events!',
formLink: 'https://goo.gl/forms/u00WBxeK1kQco0uQ2',
>>>>>>>
subTitle: 'The easiest option to share events!',
formLink: 'https://forms.gle/5Kv3XKJBA5g5FWRC7', |
<<<<<<<
'plugins/setlanguage.js',
=======
'plugins/outline.js',
>>>>>>>
'plugins/setlanguage.js',
'plugins/outline.js', |
<<<<<<<
'javax.microedition' : { project:'platform/frameworks/base', tree:'opengl/java' },
=======
'javax.microedition' : { project:null, tree:null },
'javax.xml' : { project:'platform/libcore', tree:'luni/src/main/java' },
>>>>>>>
'javax.microedition' : { project:'platform/frameworks/base', tree:'opengl/java' },
'javax.xml' : { project:'platform/libcore', tree:'luni/src/main/java' }, |
<<<<<<<
let navnotargetPrevented = false; // Indicates the navnotarget event is prevented or not
let navbeforefocusPrevented = false; // Indicates the navbeforefocus event is prevented or not
=======
let navnotargetPrevented = false; // Indicates the navnotarget event is prevented or not
let navbeforescrollPrevented = false; // Indicates the navbeforescroll event is prevented or not
let navbeforefocusPrevented = false; // Indicates the navbeforefocus event is prevented or not
>>>>>>>
let navnotargetPrevented = false; // Indicates the navnotarget event is prevented or not
let navbeforefocusPrevented = false; // Indicates the navbeforefocus event is prevented or not
<<<<<<<
/*
* navbeforefocus EventListener :
* If the navbeforefocus event is triggered, then the navbeforefocusPrevented flag can be set
* for define the prevented default behavior for the event
*/
document.body.addEventListener('navbeforefocus', function(e) {
if (e.defaultPrevented) navbeforefocusPrevented = true;
});
/*
* navnotarget EventListener :
* If the navnotarget event is triggered, then the navnotargetPrevented flag can be set
* for define the prevented default behavior for the event
*/
document.body.addEventListener('navnotarget', function(e) {
if (e.defaultPrevented) navnotargetPrevented = true;
});
=======
/*
* navbeforefocus EventListener :
* If the navbeforefocus event is triggered, then the navbeforefocusPrevented flag can be set
* for define the prevented default behavior for the event
*/
document.body.addEventListener('navbeforefocus', function(e) {
navbeforefocusPrevented = e.defaultPrevented;
});
/*
* navbeforescroll EventListener :
* If the navbeforescroll event is triggered, then the navbeforescrollPrevented flag can be set
* for define the prevented default behavior for the event
*/
document.body.addEventListener('navbeforescroll', function(e) {
navbeforescrollPrevented = e.defaultPrevented;
});
/*
* navnotarget EventListener :
* If the navnotarget event is triggered, then the navnotargetPrevented flag can be set
* for define the prevented default behavior for the event
*/
document.body.addEventListener('navnotarget', function(e) {
navnotargetPrevented = e.defaultPrevented;
});
>>>>>>>
/*
* navbeforefocus EventListener :
* If the navbeforefocus event is triggered, then the navbeforefocusPrevented flag can be set
* for define the prevented default behavior for the event
*/
document.body.addEventListener('navbeforefocus', function(e) {
navbeforefocusPrevented = e.defaultPrevented;
});
/*
* navnotarget EventListener :
* If the navnotarget event is triggered, then the navnotargetPrevented flag can be set
* for define the prevented default behavior for the event
*/
document.body.addEventListener('navnotarget', function(e) {
navnotargetPrevented = e.defaultPrevented;
});
<<<<<<<
createSpatNavEvents('beforefocus', bestCandidate, null, dir);
if (!navbeforefocusPrevented) {
bestCandidate.focus();
return true;
}
else
return false;
=======
createSpatNavEvents('beforefocus', bestCandidate, null, dir);
if (!navbeforefocusPrevented) {
bestCandidate.focus();
return true;
}
>>>>>>>
createSpatNavEvents('beforefocus', bestCandidate, null, dir);
if (!navbeforefocusPrevented) {
bestCandidate.focus();
return true;
}
<<<<<<<
createSpatNavEvents('beforescroll', container, null, dir);
moveScroll(container, dir);
return true;
=======
createSpatNavEvents('beforescroll', container, null, dir);
if (!navbeforescrollPrevented) {
moveScroll(container, dir);
return true;
}
>>>>>>>
createSpatNavEvents('beforescroll', container, null, dir);
moveScroll(container, dir);
return true;
<<<<<<<
createSpatNavEvents('beforescroll', container, null, dir);
moveScroll(document.documentElement, dir);
return true;
=======
createSpatNavEvents('beforescroll', container, null, dir);
if (!navbeforescrollPrevented) {
moveScroll(container, dir);
return true;
}
>>>>>>>
createSpatNavEvents('beforescroll', container, null, dir);
moveScroll(document.documentElement, dir);
return true; |
<<<<<<<
config.moduleName = modules[0];
config.parentModuleName = modules[1];
if (config.appScript === 'ts') {
config.referencePath = path.relative(config.modulePath, config.appDir);
}
=======
config.moduleName = utils.lowerCamel(modules[0]);
config.parentModuleName = utils.lowerCamel(modules[1]);
>>>>>>>
config.moduleName = utils.lowerCamel(modules[0]);
config.parentModuleName = utils.lowerCamel(modules[1]);
if (config.appScript === 'ts') {
config.referencePath = path.relative(config.modulePath, config.appDir);
} |
<<<<<<<
var _readDir = Promise.promisify(RNFSManager.readDir);
var _exists = Promise.promisify(RNFSManager.exists);
var _stat = Promise.promisify(RNFSManager.stat);
var _readFile = Promise.promisify(RNFSManager.readFile);
var _writeFile = Promise.promisify(RNFSManager.writeFile);
var _appendFile = Promise.promisify(RNFSManager.appendFile);
var _moveFile = Promise.promisify(RNFSManager.moveFile);
var _copyFile = Promise.promisify(RNFSManager.copyFile);
var _unlink = Promise.promisify(RNFSManager.unlink);
var _mkdir = Promise.promisify(RNFSManager.mkdir);
var _downloadFile = Promise.promisify(RNFSManager.downloadFile);
var _uploadFiles = RNFSManager.uploadFiles ? Promise.promisify(RNFSManager.uploadFiles) : function () { return Promise.reject('Not implemented on Android'); };
var _pathForBundle = Promise.promisify(RNFSManager.pathForBundle);
var _getFSInfo = Promise.promisify(RNFSManager.getFSInfo);
class RNFSError extends Error {
code: number;
constructor(message) {
super(message);
}
}
var convertError = (err) => {
if (err.isOperational && err.cause) {
err = err.cause;
}
var error = new RNFSError(err.description || err.message);
error.code = err.code;
throw error;
};
=======
>>>>>>>
<<<<<<<
return _appendFile(filepath, b64, options).catch(convertError);
},
moveFile(filepath: string, destPath: string): Promise<void> {
return _moveFile(filepath, destPath).catch(convertError);
},
copyFile(filepath: string, destPath: string): Promise<void> {
return _copyFile(filepath, destPath).catch(convertError);
},
pathForBundle(bundleName: string): Promise<string> {
return _pathForBundle(bundleName);
},
getFSInfo(): Promise<FSInfoResult> {
return _getFSInfo().catch(convertError);
},
unlink(filepath: string): Promise<void> {
return _unlink(filepath).catch(convertError);
=======
return RNFSManager.appendFile(filepath, b64, options);
>>>>>>>
return RNFSManager.appendFile(filepath, b64, options); |
<<<<<<<
/**
* Create a new label for this SAT.
* @param {object} optionalAttributes - Optional attributes that may be used by
* subclasses of SatLabel.
* @return {SatLabel} - The new label.
*/
Sat.prototype.newLabel = function(optionalAttributes) {
=======
Sat.prototype.newLabel = function(labelId = -1) {
>>>>>>>
/**
* Create a new label for this SAT.
* @param {object} optionalAttributes - Optional attributes that may be used by
* subclasses of SatLabel.
* @return {SatLabel} - The new label.
*/
Sat.prototype.newLabel = function(optionalAttributes) {
<<<<<<<
let self = this;
=======
// TODO: save
>>>>>>>
<<<<<<<
/**
* Load this SAT from the back end.
*/
=======
Sat.prototype.loaded = function() {
this.ready = true;
};
// TODO
>>>>>>>
Sat.prototype.loaded = function() {
this.ready = true;
};
/**
* Load this SAT from the back end.
*/
<<<<<<<
xhr.open('POST', './postSave');
xhr.send(JSON.stringify(json));
=======
xhr.open('POST', './postSubmission');
xhr.send(JSON.stringify(json));
>>>>>>>
xhr.open('POST', './postSave');
xhr.send(JSON.stringify(json));
<<<<<<<
ipInfo: self.ipInfo,
=======
ipAddress: self.ipAddress,
assignmentId: self.assignmentId,
projectName: self.projectName,
category: self.categories,
>>>>>>>
ipInfo: self.ipInfo,
<<<<<<<
self.decodeBaseJson(json);
};
/**
* Decode the base SAT objects. This should NOT be overloaded. Instead,
* overload Sat.prototype.fromJson()
* @param {string} json - The JSON representation.
*/
Sat.prototype.decodeBaseJson = function(json) {
let self = this;
for (let i = 0; json.labels && i < json.labels.length; i++) {
// keep track of highest label ID
self.lastLabelId = Math.max(self.lastLabelId, json.labels[i].id);
let newLabel = new self.LabelType(self, json.labels[i].id);
newLabel.fromJsonVariables(json.labels[i]);
self.labelIdMap[newLabel.id] = newLabel;
self.labels.push(newLabel);
=======
if (json.labels) {
for (let i = 0; i < json.labels.length; i++) {
let newLabel = self.newLabel(json.labels[i].id);
newLabel.fromJson(json.labels[i]);
}
>>>>>>>
self.decodeBaseJson(json);
};
/**
* Decode the base SAT objects. This should NOT be overloaded. Instead,
* overload Sat.prototype.fromJson()
* @param {string} json - The JSON representation.
*/
Sat.prototype.decodeBaseJson = function(json) {
let self = this;
for (let i = 0; json.labels && i < json.labels.length; i++) {
// keep track of highest label ID
self.lastLabelId = Math.max(self.lastLabelId, json.labels[i].id);
let newLabel = new self.LabelType(self, json.labels[i].id);
newLabel.fromJsonVariables(json.labels[i]);
self.labelIdMap[newLabel.id] = newLabel;
self.labels.push(newLabel);
<<<<<<<
self.categories = json.categories;
for (let i = 0; json.labels && i < json.labels.length; i++) {
self.labelIdMap[json.labels[i].id].fromJsonPointers(json.labels[i]);
}
self.addEvent('start labeling', self.currentItem.index);
=======
>>>>>>>
self.categories = json.categories;
for (let i = 0; json.labels && i < json.labels.length; i++) {
self.labelIdMap[json.labels[i].id].fromJsonPointers(json.labels[i]);
}
self.addEvent('start labeling', self.currentItem.index);
<<<<<<<
* @param {object} selfJson - JSON representation of this SatItem.
* @param {string} selfJson.url - This SatItem's url.
* @param {number} selfJson.index - This SatItem's index in
* @param {list} selfJson.labelIds - The list of label ids of this SatItem's
=======
* @param {object} json - JSON representation of this SatItem.
* @param {string} json.url - This SatItem's url.
* @param {number} json.index - This SatItem's index in
* @param {list} json.labelIDs - The list of label ids of this SatItem's
>>>>>>>
* @param {object} selfJson - JSON representation of this SatItem.
* @param {string} selfJson.url - This SatItem's url.
* @param {number} selfJson.index - This SatItem's index in
* @param {list} selfJson.labelIds - The list of label ids of this SatItem's
<<<<<<<
self.imageCanvas = document.getElementById('image_canvas');
self.hiddenCanvas = document.getElementById('hidden_canvas');
self.mainCtx = self.imageCanvas.getContext('2d');
self.hiddenCtx = self.hiddenCanvas.getContext('2d');
self.state = 'free';
self.lastLabelID = -1;
self.padBox = self._getPadding();
self.catSel = document.getElementById('category_select');
self.catSel.selectedIndex = 0;
self.occlCheckbox = document.getElementById('occluded_checkbox');
self.truncCheckbox = document.getElementById('truncated_checkbox');
document.getElementById('prev_btn').onclick = function() {
self.sat.gotoItem(self.index - 1);
};
document.getElementById('next_btn').onclick = function() {
self.sat.gotoItem(self.index + 1);
};
=======
self.imageCanvas.height = self.imageHeight;
self.imageCanvas.width = self.imageWidth;
self.hiddenCanvas.height = self.imageHeight;
self.hiddenCanvas.width = self.imageWidth;
self.setScale(self.MIN_SCALE);
// global listeners
>>>>>>>
self.imageCanvas = document.getElementById('image_canvas');
self.hiddenCanvas = document.getElementById('hidden_canvas');
self.mainCtx = self.imageCanvas.getContext('2d');
self.hiddenCtx = self.hiddenCanvas.getContext('2d');
self.state = 'free';
self.lastLabelID = -1;
self.padBox = self._getPadding();
self.catSel = document.getElementById('category_select');
self.catSel.selectedIndex = 0;
self.occlCheckbox = document.getElementById('occluded_checkbox');
self.truncCheckbox = document.getElementById('truncated_checkbox');
document.getElementById('prev_btn').onclick = function() {
self.sat.gotoItem(self.index - 1);
};
document.getElementById('next_btn').onclick = function() {
self.sat.gotoItem(self.index + 1);
};
// there may be some tension between this and the above block of code
// TODO: test
self.imageCanvas.height = self.imageHeight;
self.imageCanvas.width = self.imageWidth;
self.hiddenCanvas.height = self.imageHeight;
self.hiddenCanvas.width = self.imageWidth;
self.setScale(self.MIN_SCALE);
// global listeners
<<<<<<<
=======
/**
* Increase button handler
*/
SatImage.prototype._incHandler = function() {
let self = this;
self.setScale(self.scale * self.SCALE_RATIO);
self.redraw();
};
/**
* Decrease button handler
*/
SatImage.prototype._decHandler = function() {
let self = this;
self.setScale(self.scale / self.SCALE_RATIO);
self.redraw();
};
>>>>>>>
/**
* Increase button handler
*/
SatImage.prototype._incHandler = function() {
let self = this;
self.setScale(self.scale * self.SCALE_RATIO);
self.redraw();
};
/**
* Decrease button handler
*/
SatImage.prototype._decHandler = function() {
let self = this;
self.setScale(self.scale / self.SCALE_RATIO);
self.redraw();
};
<<<<<<<
let self = this;
if (self.state !== 'free') {
if (self.state === 'resize') {
// if we resized, we need to reorder ourselves
if (self.selectedLabel.w < 0) {
self.selectedLabel.x = self.selectedLabel.x + self.selectedLabel.w;
self.selectedLabel.w = -1 * self.selectedLabel.w;
}
if (self.selectedLabel.h < 0) {
self.selectedLabel.y = self.selectedLabel.y + self.selectedLabel.h;
self.selectedLabel.h = -1 * self.selectedLabel.h;
}
// remove the box if it's too small
if (self.selectedLabel.isSmall()) {
self.selectedLabel.delete();
self.selectedLabel = null;
}
}
self.state = 'free';
self.resizeID = null;
self.movePos = null;
self.moveClickPos = null;
}
// if parent label, make this the selected label in all other SatImages
if (self.selectedLabel && self.selectedLabel.parent) {
let currentItem = self.previousItem();
let currentLabel = self.sat.labelIdMap[self.selectedLabel.previousLabelId];
while (currentItem) {
currentItem.selectedLabel = currentLabel;
currentItem.currHandle = currentItem.selectedLabel.INITIAL_HANDLE;
if (currentLabel) {
currentLabel = self.sat.labelIdMap[currentLabel.previousLabelId];
// TODO: make both be functions, not attributes
}
currentItem = currentItem.previousItem();
}
currentItem = self.nextItem();
currentLabel = self.sat.labelIdMap[self.selectedLabel.nextLabelId];
while (currentItem) {
currentItem.selectedLabel = currentLabel;
currentItem.currHandle = currentItem.selectedLabel.INITIAL_HANDLE;
if (currentLabel) {
currentLabel = self.sat.labelIdMap[currentLabel.nextLabelId];
}
currentItem = currentItem.nextItem();
=======
self._isMouseDown = false;
if (this.selectedLabel) {
// label specific handling of mouseup
this.selectedLabel.mouseup();
if (this.selectedLabel.isSmall()) {
this.deleteLabelById(this.selectedLabel.id);
>>>>>>>
self._isMouseDown = false;
if (this.selectedLabel) {
// label specific handling of mouseup
this.selectedLabel.mouseup();
if (this.selectedLabel.isSmall()) {
this.deleteLabelById(this.selectedLabel.id);
<<<<<<<
let self = this;
if (self.selectedLabel) {
let option = self.catSel.options[self.catSel.selectedIndex].innerHTML;
self.selectedLabel.categoryPath = option;
self.redraw();
=======
if (this.selectedLabel) {
this.selectedLabel.name = this.catSel.options[
this.catSel.selectedIndex].innerHTML;
this.redraw();
>>>>>>>
let self = this;
if (self.selectedLabel) {
let option = self.catSel.options[self.catSel.selectedIndex].innerHTML;
self.selectedLabel.categoryPath = option;
self.redraw(); |
<<<<<<<
if (result.value instanceof Date && !isNaN(result.value.getTime())) {
result.errors = null;
=======
if (result.value instanceof Date && !isNaN(result.value.getTime())) {
result.errors = null;
}
else if (!options.convert) {
result.errors = this.createError('date.strict', null, state, options);
}
else {
let type;
if (internals.isIsoDate(this._flags.format)) {
type = 'isoDate';
}
else if (this._flags.timestamp) {
type = 'timestamp.' + this._flags.timestamp;
>>>>>>>
if (result.value instanceof Date && !isNaN(result.value.getTime())) {
result.errors = null;
}
else if (!options.convert) {
result.errors = this.createError('date.strict', null, state, options); |
<<<<<<<
if (schema === undefined) {
delete obj._flags.empty;
}
else {
obj._flags.empty = Cast.schema(schema);
}
=======
obj._flags.empty = schema === undefined ? undefined : Cast.schema(this._currentJoi, schema);
>>>>>>>
if (schema === undefined) {
delete obj._flags.empty;
}
else {
obj._flags.empty = Cast.schema(this._currentJoi, schema);
} |
<<<<<<<
root.extend = function () {
const extensions = Hoek.flatten(Array.prototype.slice.call(arguments));
Hoek.assert(extensions.length > 0, 'You need to provide at least one extension');
this.assert(extensions, internals.extensionsSchema);
const joi = Object.assign({}, this);
for (let i = 0; i < extensions.length; ++i) {
const extension = extensions[i];
const base = (extension.base || this.any()).clone(); // Cloning because we're going to override language afterwards
const ctor = base.constructor;
const type = function () { // eslint-disable-line no-loop-func
ctor.call(this);
if (extension.base) {
Object.assign(this, base);
}
this._type = extension.name;
if (extension.language) {
this._settings = this._settings || { language: {} };
this._settings.language = Hoek.applyToDefaults(this._settings.language, {
[extension.name]: extension.language
});
}
};
Hoek.inherits(type, ctor);
if (extension.pre) {
type.prototype._base = function (value, state, options) {
if (ctor.prototype._base) {
const baseRet = ctor.prototype._base.call(this, value, state, options);
if (baseRet.errors) {
return baseRet;
}
value = baseRet.value;
}
const ret = extension.pre.call(this, value, state, options);
if (ret && ret.isJoi) {
return { value, errors: ret };
}
else if (ret !== null) {
return { value: ret };
}
return { value };
};
}
if (extension.rules) {
for (let j = 0; j < extension.rules.length; ++j) {
const rule = extension.rules[j];
const ruleArgs = rule.params ?
(rule.params instanceof Any ? rule.params._inner.children.map((k) => k.key) : Object.keys(rule.params)) :
[];
const validateArgs = rule.params ? Cast.schema(rule.params) : null;
type.prototype[rule.name] = function () { // eslint-disable-line no-loop-func
if (arguments.length > ruleArgs.length) {
throw new Error('Unexpected number of arguments');
}
const args = Array.prototype.slice.call(arguments);
let hasRef = false;
const arg = {};
for (let k = 0; k < ruleArgs.length; ++k) {
arg[ruleArgs[k]] = args[k];
if (!hasRef && Ref.isRef(args[k])) {
hasRef = true;
}
}
if (validateArgs) {
joi.assert(arg, validateArgs);
}
let schema;
if (rule.validate) {
const validate = rule.validate.bind(this, arg);
schema = this._test(rule.name, arg, validate, {
description: rule.description,
hasRef
});
}
else {
schema = this.clone();
}
if (rule.setup) {
rule.setup.call(schema, arg);
}
return schema;
};
}
}
if (extension.describe) {
type.prototype.describe = function () {
const description = ctor.prototype.describe.call(this);
return extension.describe.call(this, description);
};
}
const instance = new type();
joi[extension.name] = function () {
return instance;
};
}
return joi;
};
=======
root.lazy = function (fn) {
return Lazy.set(fn);
};
>>>>>>>
root.lazy = function (fn) {
return Lazy.set(fn);
};
root.extend = function () {
const extensions = Hoek.flatten(Array.prototype.slice.call(arguments));
Hoek.assert(extensions.length > 0, 'You need to provide at least one extension');
this.assert(extensions, internals.extensionsSchema);
const joi = Object.assign({}, this);
for (let i = 0; i < extensions.length; ++i) {
const extension = extensions[i];
const base = (extension.base || this.any()).clone(); // Cloning because we're going to override language afterwards
const ctor = base.constructor;
const type = function () { // eslint-disable-line no-loop-func
ctor.call(this);
if (extension.base) {
Object.assign(this, base);
}
this._type = extension.name;
if (extension.language) {
this._settings = this._settings || { language: {} };
this._settings.language = Hoek.applyToDefaults(this._settings.language, {
[extension.name]: extension.language
});
}
};
Hoek.inherits(type, ctor);
if (extension.pre) {
type.prototype._base = function (value, state, options) {
if (ctor.prototype._base) {
const baseRet = ctor.prototype._base.call(this, value, state, options);
if (baseRet.errors) {
return baseRet;
}
value = baseRet.value;
}
const ret = extension.pre.call(this, value, state, options);
if (ret && ret.isJoi) {
return { value, errors: ret };
}
else if (ret !== null) {
return { value: ret };
}
return { value };
};
}
if (extension.rules) {
for (let j = 0; j < extension.rules.length; ++j) {
const rule = extension.rules[j];
const ruleArgs = rule.params ?
(rule.params instanceof Any ? rule.params._inner.children.map((k) => k.key) : Object.keys(rule.params)) :
[];
const validateArgs = rule.params ? Cast.schema(rule.params) : null;
type.prototype[rule.name] = function () { // eslint-disable-line no-loop-func
if (arguments.length > ruleArgs.length) {
throw new Error('Unexpected number of arguments');
}
const args = Array.prototype.slice.call(arguments);
let hasRef = false;
const arg = {};
for (let k = 0; k < ruleArgs.length; ++k) {
arg[ruleArgs[k]] = args[k];
if (!hasRef && Ref.isRef(args[k])) {
hasRef = true;
}
}
if (validateArgs) {
joi.assert(arg, validateArgs);
}
let schema;
if (rule.validate) {
const validate = rule.validate.bind(this, arg);
schema = this._test(rule.name, arg, validate, {
description: rule.description,
hasRef
});
}
else {
schema = this.clone();
}
if (rule.setup) {
rule.setup.call(schema, arg);
}
return schema;
};
}
}
if (extension.describe) {
type.prototype.describe = function () {
const description = ctor.prototype.describe.call(this);
return extension.describe.call(this, description);
};
}
const instance = new type();
joi[extension.name] = function () {
return instance;
};
}
return joi;
}; |
<<<<<<<
private: msg.private,
text: () => `${`${c.bold.green(client.getAuthor(msg.author))} : ${msg.private ? `${c.underline(msg.content.text)}` : msg.content.text}`}`,
=======
text: () => `${`${c.bold.green(client.getAuthor(msg.author))} : ${msg.private ? `${c.bgGreen(msg.content.text)}` : msg.content.text}`}`,
>>>>>>>
private: msg.private,
text: () => `${`${c.bold.green(client.getAuthor(msg.author))} : ${msg.private ? `${c.bgGreen(msg.content.text)}` : msg.content.text}`}`, |
<<<<<<<
this.showInlineMessage(loc, message, validationType.type);
=======
this.showInlineError(field, message);
>>>>>>>
this.showInlineError(field, message, validationType.type);
<<<<<<<
//getTimeFromField
if (timepicker) {
timeparts = timepicker.getTimeFromField();
valueHours = timeparts.hours;
valueMins = timeparts.minutes;
if (timepicker.hasSeconds()) {
valueSecs = timeparts.seconds;
}
}
=======
//getTimeFromField
if (timepicker) {
timeparts = timepicker.getTimeFromField();
valueHours = timeparts.hours;
valueMins = timeparts.minutes;
if (timepicker.hasSeconds()) {
valueSecs = timeparts.seconds;
}
}
>>>>>>>
//getTimeFromField
if (timepicker) {
timeparts = timepicker.getTimeFromField();
valueHours = timeparts.hours;
valueMins = timeparts.minutes;
if (timepicker.hasSeconds()) {
valueSecs = timeparts.seconds;
}
} |
<<<<<<<
//ApprovaOS Change - Added parameter checkox and icon to show check box and icon on demand for particular node
decorateNode(a, icon, hideCheckbox) {
=======
decorateNode(a) {
a = this.isjQuery(a) ? a : $(a);
>>>>>>>
//ApprovaOS Change - Added parameter checkox and icon to show check box and icon on demand for particular node
decorateNode(a, icon, hideCheckbox) {
a = this.isjQuery(a) ? a : $(a);
<<<<<<<
//old code: a.prepend($.createIcon({ icon: 'tree-node', classes: ['icon-tree'] }));
//ApprovaOS Change - removed icon of node
if (icon || icon === '') {
a.prepend($.createIcon({ icon: icon, classes: ['icon-tree'] }));
} else {
a.prepend($.createIcon({ icon: 'tree-node', classes: ['icon-tree'] }));
}
=======
a[0].insertAdjacentHTML('afterbegin', $.createIcon({ icon: 'tree-node', classes: ['icon-tree'] }));
>>>>>>>
//old code: a.prepend($.createIcon({ icon: 'tree-node', classes: ['icon-tree'] }));
//ApprovaOS Change - removed icon of node
if (icon || icon === '') {
a[0].insertAdjacentHTML('afterbegin', $.createIcon({ icon: icon, classes: ['icon-tree'] }));
} else {
a[0].insertAdjacentHTML('afterbegin', $.createIcon({ icon: 'tree-node', classes: ['icon-tree'] }));
}
<<<<<<<
//Old code - if (this.isMultiselect && !this.settings.hideCheckboxes) {
//ApprovaOS Change - Show check box for particular node on demand
if (this.isMultiselect && (!this.settings.hideCheckboxes || hideCheckbox === false)) {
a.append('<span class="tree-checkbox"></span>');
=======
if (this.isMultiselect && !this.settings.hideCheckboxes) {
a[0].insertAdjacentHTML('beforeend', '<span class="tree-checkbox"></span>');
>>>>>>>
//Old code - if (this.isMultiselect && !this.settings.hideCheckboxes) {
//ApprovaOS Change - Show check box for particular node on demand
if (this.isMultiselect && (!this.settings.hideCheckboxes || hideCheckbox === false)) {
a[0].insertAdjacentHTML('beforeend', '<span class="tree-checkbox"></span>');
<<<<<<<
//ApprovaOS Change - if tree is multiselect commented because do not select node on expand node
//self.selectNodeFinish(node, focus);
=======
self.selectNodeFinish(node, focus, e);
>>>>>>>
//ApprovaOS Change - if tree is multiselect commented because do not select node on expand node
//self.selectNodeFinish(node, focus, e);
<<<<<<<
//ApprovaOS Change - if tree is multiselect commented because do not select node on expand node
//self.selectNodeFinish(node, focus);
=======
self.selectNodeFinish(node, focus, e);
>>>>>>>
//ApprovaOS Change - if tree is multiselect commented because do not select node on expand node
//self.selectNodeFinish(node, focus, e);
<<<<<<<
//ApprovaOS Change - parameter added to add node before or after the node
addNode(nodeData, location, isBeforeOrAfter) {
let li = $('<li></li>');
const a = $('<a href="#"></a>').appendTo(li);
=======
addNode(nodeData, location) {
>>>>>>>
//ApprovaOS Change - parameter added to add node before or after the node
addNode(nodeData, location, isBeforeOrAfter) {
let li = $('<li></li>');
const a = $('<a href="#"></a>').appendTo(li);
<<<<<<<
//Start ApprovaOS Change - added for dropdown
if (nodeData.type === 'dropdown') {
var selectedOptionText;
a.attr({
'style': 'display: none'
});
if (nodeData.data) {
var selectHtml = '<select class="dropdown" close-on-select="true">';
for (var i = 0; i < nodeData.data.length; i++) {
var option = nodeData.data[i]
if (option.value === nodeData.text) {
selectedOptionText = option.text;
selectHtml += '<option value="' + option.value + '" selected>' + option.text + '</option>';
} else {
selectHtml += '<option value="' + option.value + '">' + option.text + '</option>';
}
}
selectHtml += '</select><div class="dropdown-wrapper"><div class="dropdown"><span>' + selectedOptionText;
selectHtml += '</span></div><svg class="icon" focusable="false" aria-hidden="true" role="presentation"><use xlink:href="#icon-dropdown"></use></svg></div>';
$('<div class="treeDropdown" style="width: 80px; margin-left: 35px; margin-bottom: -15px">' + selectHtml + '</div>').appendTo(li);
if (nodeData.disabled) {
li.find('select.dropdown').dropdown().disable();
} else {
li.find('select.dropdown').dropdown().on('selected.tree', function () {
var node = this.parentElement.previousElementSibling;
node.text = this.value;
self.updateNode(node);
});
}
}
}
//End ApprovaOS Change - added for dropdown
if (nodeData.open) {
a.parent().addClass('is-open');
=======
if (nodeData.text) {
a.textContent = nodeData.text;
>>>>>>>
//Start ApprovaOS Change - added for dropdown
if (nodeData.type === 'dropdown') {
var selectedOptionText;
a.attr({
'style': 'display: none'
});
if (nodeData.data) {
var selectHtml = '<select class="dropdown" close-on-select="true">';
for (var i = 0; i < nodeData.data.length; i++) {
var option = nodeData.data[i]
if (option.value === nodeData.text) {
selectedOptionText = option.text;
selectHtml += '<option value="' + option.value + '" selected>' + option.text + '</option>';
} else {
selectHtml += '<option value="' + option.value + '">' + option.text + '</option>';
}
}
selectHtml += '</select><div class="dropdown-wrapper"><div class="dropdown"><span>' + selectedOptionText;
selectHtml += '</span></div><svg class="icon" focusable="false" aria-hidden="true" role="presentation"><use xlink:href="#icon-dropdown"></use></svg></div>';
$('<div class="treeDropdown" style="width: 80px; margin-left: 35px; margin-bottom: -15px">' + selectHtml + '</div>').appendTo(li);
if (nodeData.disabled) {
li.find('select.dropdown').dropdown().disable();
} else {
li.find('select.dropdown').dropdown().on('selected.tree', function () {
var node = this.parentElement.previousElementSibling;
node.text = this.value;
self.updateNode(node);
});
}
}
}
//End ApprovaOS Change - added for dropdown
if (nodeData.open) {
a.parent().addClass('is-open');
}
if (nodeData.text) {
a.textContent = nodeData.text;
<<<<<<<
(!nodeData.parent || !found) && !(nodeData.parent instanceof jQuery)
&& !(isBeforeOrAfter === 'before' || isBeforeOrAfter === 'after')) {
location.append(li);
=======
(!nodeData.parent || !found) && !(nodeData.parent instanceof jQuery)) {
location[0].appendChild(li);
>>>>>>>
(!nodeData.parent || !found) && !(nodeData.parent instanceof jQuery)
&& !(isBeforeOrAfter === 'before' || isBeforeOrAfter === 'after')) {
location[0].appendChild(li);
<<<<<<<
//ApprovaOS Change - Added parameter to show or hide checkbox according to node.
this.decorateNode(a, nodeData.icon, nodeData.hideCheckbox);
=======
a = $(a);
this.decorateNode(a);
>>>>>>>
a = $(a);
//ApprovaOS Change - Added parameter to show or hide checkbox according to node.
this.decorateNode(a, nodeData.icon, nodeData.hideCheckbox); |
<<<<<<<
if (url.indexOf('/list') === -1 && url !== '/components/applicationmenu') {
customOpts.headerHamburger = true;
=======
if (url.indexOf('/list') === -1) {
customOpts.setOption('headerHamburger', true);
>>>>>>>
if (url.indexOf('/list') === -1 && url !== '/components/applicationmenu') {
customOpts.setOption('headerHamburger', true); |
<<<<<<<
it('Should convert date from Gregorian (if needed) before formatting date (when fromGregorian is true)', () => {
Locale.set('ar-SA');
expect(Locale.formatDate(new Date(2018, 5, 20), { pattern: 'yyyy/MM/dd', fromGregorian: true })).toEqual('1439/10/06');
Locale.set('en-US');
});
it('Should convert date to Gregorian (if needed) before formatting date (when toGregorian is true)', () => {
Locale.set('ar-SA');
expect(Locale.formatDate(Locale.parseDate('1439/10/06', Locale.calendar().dateFormat.short, false), { pattern: 'yyyyMMdd', toGregorian: true })).toEqual('20180620');
Locale.set('en-US');
});
=======
it('Should parse dates with and without spaces, dash, comma format', () => {
Locale.set('en-US');
// Date with spaces, dashes and comma
expect(Locale.parseDate('2014-12-11', 'yyyy-MM-dd').getTime()).toEqual(new Date(2014, 11, 11, 0, 0, 0).getTime());
expect(Locale.parseDate('2014/12/11', 'yyyy/MM/dd').getTime()).toEqual(new Date(2014, 11, 11, 0, 0, 0).getTime());
expect(Locale.parseDate('2014 12 11', 'yyyy MM dd').getTime()).toEqual(new Date(2014, 11, 11, 0, 0, 0).getTime());
// Date without spaces, dashes and comma
expect(Locale.parseDate('20141211', 'yyyyMMdd').getTime()).toEqual(new Date(2014, 11, 11, 0, 0, 0).getTime());
});
>>>>>>>
it('Should convert date from Gregorian (if needed) before formatting date (when fromGregorian is true)', () => {
Locale.set('ar-SA');
expect(Locale.formatDate(new Date(2018, 5, 20), { pattern: 'yyyy/MM/dd', fromGregorian: true })).toEqual('1439/10/06');
Locale.set('en-US');
});
it('Should convert date to Gregorian (if needed) before formatting date (when toGregorian is true)', () => {
Locale.set('ar-SA');
expect(Locale.formatDate(Locale.parseDate('1439/10/06', Locale.calendar().dateFormat.short, false), { pattern: 'yyyyMMdd', toGregorian: true })).toEqual('20180620');
Locale.set('en-US');
});
it('Should parse dates with and without spaces, dash, comma format', () => {
Locale.set('en-US');
// Date with spaces, dashes and comma
expect(Locale.parseDate('2014-12-11', 'yyyy-MM-dd').getTime()).toEqual(new Date(2014, 11, 11, 0, 0, 0).getTime());
expect(Locale.parseDate('2014/12/11', 'yyyy/MM/dd').getTime()).toEqual(new Date(2014, 11, 11, 0, 0, 0).getTime());
expect(Locale.parseDate('2014 12 11', 'yyyy MM dd').getTime()).toEqual(new Date(2014, 11, 11, 0, 0, 0).getTime());
// Date without spaces, dashes and comma
expect(Locale.parseDate('20141211', 'yyyyMMdd').getTime()).toEqual(new Date(2014, 11, 11, 0, 0, 0).getTime());
}); |
<<<<<<<
=======
await browser.driver.sleep(config.sleep);
>>>>>>>
await browser.driver.sleep(config.sleep);
<<<<<<<
=======
await browser.driver.sleep(config.sleep);
>>>>>>>
await browser.driver.sleep(config.sleep);
<<<<<<<
=======
await browser.driver.sleep(config.sleep);
>>>>>>>
await browser.driver.sleep(config.sleep);
<<<<<<<
=======
await browser.driver.sleep(config.sleep);
>>>>>>>
await browser.driver.sleep(config.sleep); |
<<<<<<<
const isTypeColumn = /^(column|column-grouped|column-stacked)$/.test(o.type);
const isTypePie = o.type === 'pie' || o.type === 'donut';
=======
const isTypeColumn = /^(column|column-grouped|column-stacked|column-positive-negative)$/.test(o.type);
const isTypePie = o.type === 'pie';
>>>>>>>
const isTypePie = o.type === 'pie' || o.type === 'donut';
const isTypeColumn = /^(column|column-grouped|column-stacked|column-positive-negative)$/.test(o.type);
<<<<<<<
triggerData.push({ elem: selector.nodes(), data: thisData[o.i] });
=======
triggerData.push({ elem: selector._groups[0][0], data: thisData[o.i] });//eslint-disable-line
>>>>>>>
triggerData.push({ elem: selector.nodes(), data: thisData[o.i] }); |
<<<<<<<
if (this.settings.content instanceof jQuery && !this.settings.beforeShow) {
=======
if (this.settings.content instanceof jQuery) {
this.settings.content.removeClass('hidden is-hidden');
>>>>>>>
if (this.settings.content instanceof jQuery && !this.settings.beforeShow) {
this.settings.content.removeClass('hidden is-hidden'); |
<<<<<<<
const copiedDataAttrs = ` ${self.getDataAttributes(attributes, toExclude).str}`;
const trueValue = (value && 'value' in value ? value.value : text).replace(/"/g, '/quot/');
const iconHtml = self.listIcon.hasIcons ? self.listIcon.items[index].html : '';
=======
const attributesToCopy = self.getDataAttributes(attributes, toExclude);
const trueValue = value && 'value' in value ? value.value : text;
let iconHtml = '';
if (self.listIcon.hasIcons && self.listIcon.items[index]) {
iconHtml = self.listIcon.items[index].html;
}
>>>>>>>
const copiedDataAttrs = ` ${self.getDataAttributes(attributes, toExclude).str}`;
const trueValue = (value && 'value' in value ? value.value : text).replace(/"/g, '/quot/');
let iconHtml = '';
if (self.listIcon.hasIcons && self.listIcon.items[index]) {
iconHtml = self.listIcon.items[index].html;
} |
<<<<<<<
//Class-based detection for IE
if (!!navigator.userAgent.match(/Trident/)) {
$('html').addClass('ie');
}
=======
//Pager
var pager = elem.find('.pager').pager();
pager.on('paging', function (e, args) {
console.log('Paging: '+ args.currentPage);
});
//Class-based detection for IE8/9
>>>>>>>
//Pager
var pager = elem.find('.pager').pager();
pager.on('paging', function (e, args) {
console.log('Paging: '+ args.currentPage);
});
//Class-based detection for IE
if (!!navigator.userAgent.match(/Trident/)) {
$('html').addClass('ie');
} |
<<<<<<<
if (req.params.example === 'list') {
return getFullListing(componentName, req, res, next);
}
=======
if (req.params.component === 'applicationmenu' && (req.params.example.indexOf('example-') > -1 || req.params.example.indexOf('test-') > -1)) {
console.log(req.params.component, req.params.example);
opts.layout = null;
}
>>>>>>>
if (req.params.example === 'list') {
return getFullListing(componentName, req, res, next);
}
if (req.params.component === 'applicationmenu' && (req.params.example.indexOf('example-') > -1 || req.params.example.indexOf('test-') > -1)) {
console.log(req.params.component, req.params.example);
opts.layout = null;
} |
<<<<<<<
import * as debug from '../utils/debug';
import { utils } from '../utils/utils';
import { stringUtils as str } from '../utils/string';
import { Tmpl } from '../tmpl/tmpl';
import { ListFilter } from '../listfilter/listfilter';
import { Locale } from '../locale/locale';
// jQuery Components
import '../utils/animations';
import '../initialize/initialize.jquery';
import '../pager/pager.jquery';
import '../popupmenu/popupmenu.jquery';
import '../searchfield/searchfield.jquery';
/**
*
*/
let PLUGIN_NAME = 'listview';
/**
*
*/
let LISTVIEW_DEFAULTS = {
dataset: [],
template: null,
description: null,
paging: false,
pagesize: 10,
searchable: false,
selectable: 'single',
selectOnFocus: true,
showCheckboxes: true,
hoverable: true,
source: null,
disableItemDeactivation: false
};
/**
* The About Dialog Component is displays information regarding the application.
*
* @class ListView
* @param {Array} dataset - Array of data to feed the template
* @param {String} content - Html Template String
* @param {String} description - Audible Label (or use parent title)
* @param {Boolean} paging - If true, activates paging
* @param {Number} pagesize - If paging is activated, sets the number of listview items available per page
* @param {Boolean} searchable - If true, associates itself with a Searchfield/Autocomplete and allows itself to be filtered
* @param {String|Boolean} selectable - selection mode, can be false, 'single' or 'multiple' or 'mixed'
* @param {Boolean} selectOnFocus - If true the first item in the list will be selected as it is focused.
* @param {Boolean} showCheckboxes - If false will not show checkboxes used with multiple selection mode only
* @param {Boolean} hoverable - If true the list element will show a hover action to indicate its actionable.
* @param {Function|String} source - If source is a string then it serves as the url for an ajax call that returns the dataset. If its a function it is a call back for getting the data asyncronously.
* @param {Boolean} disableItemDeactivation - If true when an item is activated the user should not be able to deactivate it by clicking on the activated item. They can only select another row.
*
*/
function ListView(element, settings) {
this.settings = utils.mergeSettings(element, settings, LISTVIEW_DEFAULTS);
this.element = $(element);
debug.logTimeStart(PLUGIN_NAME);
this.init();
debug.logTimeEnd(PLUGIN_NAME);
}
ListView.prototype = {
/**
* Initialize this component.
* @private
*/
init: function() {
this.setup();
this.refresh();
this.selectedItems = [];
this.lastSelectedItem = 0; // Rember index to use shift key
this.isSelectedAll = false; // Rember if all selected or not
this.sortInit('listview', 'click.listview', 'data-sortlist');
this.handleEvents();
this.handleResize();
},
/**
* Do initial dom and settings setup.
* @private
*/
setup: function() {
var self = this,
card = this.element.closest('.card, .widget'),
selectable = this.element.attr('data-selectable'),
selectOnFocus = this.element.attr('data-select-onfocus');
if (selectable && selectable.length) {
this.settings.selectable = selectable;
=======
/* start-amd-strip-block */
(function(factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module
define(['jquery'], factory);
} else if (typeof exports === 'object') {
// Node/CommonJS
module.exports = factory(require('jquery'));
} else {
// Browser globals
factory(jQuery);
}
}(function($) {
/* end-amd-strip-block */
$.fn.listview = function(options) {
// Settings and Options
var pluginName = 'listview',
defaults = {
dataset: [],
template: null,
description: null,
paging: false,
pagesize: 10,
searchable: false,
selectable: 'single',
selectOnFocus: true,
showCheckboxes: true,
hoverable: true,
emptyMessage: null,
source: null,
disableItemDeactivation: false
},
settings = $.extend({}, defaults, options);
/**
* The About Dialog Component is displays information regarding the application.
*
* @class ListView
* @param {Array} dataset - Array of data to feed the template
* @param {String} content - Html Template String
* @param {String} description - Audible Label (or use parent title)
* @param {Boolean} paging - If true, activates paging
* @param {Number} pagesize - If paging is activated, sets the number of listview items available per page
* @param {Boolean} searchable - If true, associates itself with a Searchfield/Autocomplete and allows itself to be filtered
* @param {String|Boolean} selectable - selection mode, can be false, 'single' or 'multiple' or 'mixed'
* @param {Boolean} selectOnFocus - If true the first item in the list will be selected as it is focused.
* @param {Boolean} showCheckboxes - If false will not show checkboxes used with multiple selection mode only
* @param {Boolean} hoverable - If true the list element will show a hover action to indicate its actionable.
* @param {Function|String} source - If source is a string then it serves as the url for an ajax call that returns the dataset. If its a function it is a call back for getting the data asyncronously.
* @param {Boolean} disableItemDeactivation - If true when an item is activated the user should not be able to deactivate it by clicking on the activated item. They can only select another row.
*
*/
function ListView(element) {
this.settings = $.extend({}, settings);
this.element = $(element);
Soho.logTimeStart(pluginName);
this.init();
Soho.logTimeEnd(pluginName);
>>>>>>>
import * as debug from '../utils/debug';
import { utils } from '../utils/utils';
import { stringUtils as str } from '../utils/string';
import { Tmpl } from '../tmpl/tmpl';
import { ListFilter } from '../listfilter/listfilter';
import { Locale } from '../locale/locale';
// jQuery Components
import '../utils/animations';
import '../initialize/initialize.jquery';
import '../pager/pager.jquery';
import '../popupmenu/popupmenu.jquery';
import '../searchfield/searchfield.jquery';
/**
*
*/
let PLUGIN_NAME = 'listview';
/**
*
*/
let LISTVIEW_DEFAULTS = {
dataset: [],
template: null,
description: null,
paging: false,
pagesize: 10,
searchable: false,
selectable: 'single',
selectOnFocus: true,
showCheckboxes: true,
hoverable: true,
emptyMessage: null,
source: null,
disableItemDeactivation: false
};
/**
* The About Dialog Component is displays information regarding the application.
*
* @class ListView
* @param {Array} dataset - Array of data to feed the template
* @param {String} content - Html Template String
* @param {String} description - Audible Label (or use parent title)
* @param {Boolean} paging - If true, activates paging
* @param {Number} pagesize - If paging is activated, sets the number of listview items available per page
* @param {Boolean} searchable - If true, associates itself with a Searchfield/Autocomplete and allows itself to be filtered
* @param {String|Boolean} selectable - selection mode, can be false, 'single' or 'multiple' or 'mixed'
* @param {Boolean} selectOnFocus - If true the first item in the list will be selected as it is focused.
* @param {Boolean} showCheckboxes - If false will not show checkboxes used with multiple selection mode only
* @param {Boolean} hoverable - If true the list element will show a hover action to indicate its actionable.
* @param {Function|String} source - If source is a string then it serves as the url for an ajax call that returns the dataset. If its a function it is a call back for getting the data asyncronously.
* @param {Boolean} disableItemDeactivation - If true when an item is activated the user should not be able to deactivate it by clicking on the activated item. They can only select another row.
*
*/
function ListView(element, settings) {
this.settings = utils.mergeSettings(element, settings, LISTVIEW_DEFAULTS);
this.element = $(element);
debug.logTimeStart(PLUGIN_NAME);
this.init();
debug.logTimeEnd(PLUGIN_NAME);
}
ListView.prototype = {
/**
* Initialize this component.
* @private
*/
init: function() {
this.setup();
this.refresh();
this.selectedItems = [];
this.lastSelectedItem = 0; // Rember index to use shift key
this.isSelectedAll = false; // Rember if all selected or not
this.sortInit('listview', 'click.listview', 'data-sortlist');
this.handleEvents();
this.handleResize();
},
/**
* Do initial dom and settings setup.
* @private
*/
setup: function() {
var self = this,
card = this.element.closest('.card, .widget'),
selectable = this.element.attr('data-selectable'),
selectOnFocus = this.element.attr('data-select-onfocus');
if (selectable && selectable.length) {
this.settings.selectable = selectable;
<<<<<<<
if (this.settings.dataset) {
// Search the global variable space for a dataset variable name, if provided.
if (typeof this.settings.dataset === 'string') {
var dataset = window[this.settings.dataset];
if (dataset && dataset.length) {
this.settings.dataset = dataset;
=======
if (this.settings.emptyMessage) {
//Object { title: "No Data Available", info: "", icon: "icon-empty-no-data" }
self.emptyMessageContainer = $('<div>').emptymessage(this.settings.emptyMessage);
}
if (this.settings.dataset) {
// Search the global variable space for a dataset variable name, if provided.
if (typeof this.settings.dataset === 'string') {
var dataset = window[this.settings.dataset];
if (dataset && dataset.length) {
this.settings.dataset = dataset;
}
}
}
},
/**
* Calculate the totals for totalling examples. This is done by template {{totals}}.
*
* @private
*/
getTotals: function(dataset) {
var totals = { count: dataset.length },
property;
if (!dataset[0]) {
return;
>>>>>>>
if (this.settings.emptyMessage) {
//Object { title: "No Data Available", info: "", icon: "icon-empty-no-data" }
self.emptyMessageContainer = $('<div>').emptymessage(this.settings.emptyMessage);
}
if (this.settings.dataset) {
// Search the global variable space for a dataset variable name, if provided.
if (typeof this.settings.dataset === 'string') {
var dataset = window[this.settings.dataset];
if (dataset && dataset.length) {
this.settings.dataset = dataset;
<<<<<<<
if (this.settings.template.indexOf('{{#totals}}') > -1) {
totals = this.getTotals(dataset);
}
=======
if (dataset.length > 0) {
this.element.html(renderedTmpl);
} else if (self.emptyMessageContainer) {
this.element.empty().append(this.emptyMessageContainer);
}
}
>>>>>>>
if (this.settings.template.indexOf('{{#totals}}') > -1) {
totals = this.getTotals(dataset);
} |
<<<<<<<
/// <reference path="views/devicerules/removedevicerule.js" />
/// <reference path="moment-with-locales.min.js" />
=======
/// <reference path="moment-with-locales.min.js" />
/// <reference path="jquery-ui-i18n.min.js" />
>>>>>>>
/// <reference path="views/devicerules/removedevicerule.js" />
/// <reference path="moment-with-locales.min.js" />
/// <reference path="jquery-ui-i18n.min.js" /> |
<<<<<<<
elem.find('.homepage').homepage();
=======
//Validation
//Should be one of the last items to invoke
elem.find('[data-validate]').validate();
elem.find('[data-validate-on="submit"]').validate();
>>>>>>>
elem.find('.homepage').homepage();
//Validation
//Should be one of the last items to invoke
elem.find('[data-validate]').validate();
elem.find('[data-validate-on="submit"]').validate(); |
<<<<<<<
=======
var locationsArray = self.locationData.deviceLocationList;
for (var i = 0; i < locationsArray.length; i++) {
// Define the pushpin location
var loc = new Microsoft.Maps.Location(locationsArray[i].latitude, locationsArray[i].longitude);
// Add a pin to the map
var pin = new Microsoft.Maps.Pushpin(loc, {id: locationsArray[i].deviceId});
// Add handler for the pushpin click event.
Microsoft.Maps.Events.addHandler(pin, 'click', displayInfobox);
// Add the pushpin and infobox to the map
self.map.entities.push(pin);
}
>>>>>>> |
<<<<<<<
exec = require('child_process').exec,
fs = require('fs'),
deskTime = 60;
=======
path = require('path'),
fs = require('fs');
>>>>>>>
exec = require('child_process').exec,
deskTime = 60;
path = require('path'),
fs = require('fs'); |
<<<<<<<
imports: [ 'external' ],
=======
description: 'external module names can be specified (affects UMD only)',
>>>>>>>
description: 'external module names can be specified (affects UMD only)',
imports: [ 'external' ], |
<<<<<<<
grunt.registerTask('nested', ['assemble:nested_layouts']);
// this is just for when doing debugging and jshint blows up
grunt.registerTask('dev', ['clean', 'assemble']);
=======
>>>>>>>
grunt.registerTask('nested', ['assemble:nested_layouts']); |
<<<<<<<
const React = require('React');
const ReactNative = require('react-native-desktop');
=======
const AsyncStorage = require('AsyncStorage');
const Linking = require('Linking');
const React = require('react');
const ReactNative = require('react-native');
>>>>>>>
const AsyncStorage = require('AsyncStorage');
const Linking = require('Linking');
const React = require('react');
const ReactNative = require('react-native-desktop'); |
<<<<<<<
const json = JSON.stringify(asset);
const assetRegistryPath = 'react-native-macos/Libraries/Image/AssetRegistry';
=======
const json = JSON.stringify(filterObject(asset, assetPropertyBlacklist));
const assetRegistryPath = 'react-native/Libraries/Image/AssetRegistry';
>>>>>>>
const json = JSON.stringify(filterObject(asset, assetPropertyBlacklist));
const assetRegistryPath = 'react-native-macos/Libraries/Image/AssetRegistry'; |
<<<<<<<
var React = require('react-native-desktop');
=======
var ReactNative = require('react-native');
>>>>>>>
var ReactNative = require('react-native-desktop'); |
<<<<<<<
kuzzle.emit('data:create', requestObject);
if (!requestObject.isPersistent()) {
return kuzzle.dsl.testFilters(requestObject);
}
// simulate an empty result from dsl.testFilters
return Promise.resolve([]);
=======
return kuzzle.pluginsManager.trigger('data:create', requestObject)
.then(function (validRequestObject) {
requestObject = validRequestObject;
if (!requestObject.isPersistent()) {
return kuzzle.dsl.testFilters(requestObject);
}
else {
// simulate an empty result from dsl.testFilters
return Promise.resolve([]);
}
});
>>>>>>>
return kuzzle.pluginsManager.trigger('data:create', requestObject)
.then(function (validRequestObject) {
requestObject = validRequestObject;
if (!requestObject.isPersistent()) {
return kuzzle.dsl.testFilters(requestObject);
}
// simulate an empty result from dsl.testFilters
return Promise.resolve([]);
}); |
<<<<<<<
const View = require('View');
const warning = require('fbjs/lib/warning');
const NativeModules = require('NativeModules');
=======
const ViewPropTypes = require('ViewPropTypes');
>>>>>>>
const ViewPropTypes = require('ViewPropTypes');
<<<<<<<
const processColor = require('processColor');
=======
const warning = require('fbjs/lib/warning');
>>>>>>>
const warning = require('fbjs/lib/warning');
<<<<<<<
viewConfig:
(((Platform.OS === 'ios' || Platform.OS === 'macos') && RCTTextField ?
RCTTextField.viewConfig :
(Platform.OS === 'android' && AndroidTextInput ?
AndroidTextInput.viewConfig :
{})) : Object),
=======
>>>>>>>
<<<<<<<
<TextField
ref="input"
=======
<RCTTextField
ref={this._setNativeRef}
>>>>>>>
<RCTTextField
ref={this._setNativeRef}
<<<<<<<
=======
accessible={props.accessible}
accessibilityLabel={props.accessibilityLabel}
accessibilityTraits={props.accessibilityTraits}
nativeID={this.props.nativeID}
>>>>>>>
accessible={props.accessible}
accessibilityLabel={props.accessibilityLabel}
accessibilityTraits={props.accessibilityTraits}
nativeID={this.props.nativeID}
<<<<<<<
=======
accessible={this.props.accessible}
accessibilityLabel={this.props.accessibilityLabel}
accessibilityComponentType={this.props.accessibilityComponentType}
nativeID={this.props.nativeID}
>>>>>>>
accessible={this.props.accessible}
accessibilityLabel={this.props.accessibilityLabel}
accessibilityComponentType={this.props.accessibilityComponentType}
nativeID={this.props.nativeID} |
<<<<<<<
{verb: 'post', url: '/profiles/_mget', controller: 'security', action: 'mGetProfiles'},
=======
{verb: 'post', url: '/users/_search', controller: 'security', action: 'searchUsers'},
{verb: 'post', url: '/users/_create', controller: 'security', action: 'createUser'},
{verb: 'post', url: '/users/:id', controller: 'security', action: 'updateUser'},
>>>>>>>
{verb: 'post', url: '/profiles/_mget', controller: 'security', action: 'mGetProfiles'},
{verb: 'post', url: '/users/_search', controller: 'security', action: 'searchUsers'},
{verb: 'post', url: '/users/_create', controller: 'security', action: 'createUser'},
{verb: 'post', url: '/users/:id', controller: 'security', action: 'updateUser'}, |
<<<<<<<
onResponderTerminate: this.touchableHandleResponderTerminate,
onMouseEnter: this.props.onMouseEnter,
onMouseLeave: this.props.onMouseLeave,
=======
onResponderTerminate: this.touchableHandleResponderTerminate,
style,
children,
>>>>>>>
onResponderTerminate: this.touchableHandleResponderTerminate,
onMouseEnter: this.props.onMouseEnter,
onMouseLeave: this.props.onMouseLeave,
style,
children, |
<<<<<<<
var React = require('react-native-desktop');
=======
var React = require('react');
var ReactNative = require('react-native');
>>>>>>>
var React = require('react');
var ReactNative = require('react-native-desktop');
<<<<<<<
var originalRenderComponent = React.renderComponent;
=======
>>>>>>> |
<<<<<<<
{verb: 'get', url: '/roles/:_id', controller: 'security', action: 'getRole'},
{verb: 'get', url: '/profiles/:_id', controller: 'security', action: 'getProfile'},
{verb: 'get', url: '/profiles/:_id/_rights', controller: 'security', action: 'getProfileRights'},
=======
{verb: 'get', url: '/_adminExists', controller: 'admin', action: 'adminExists'},
{verb: 'get', url: '/roles/:id', controller: 'security', action: 'getRole'},
{verb: 'get', url: '/profiles/:id', controller: 'security', action: 'getProfile'},
{verb: 'get', url: '/profiles/:id/_rights', controller: 'security', action: 'getProfileRights'},
>>>>>>>
{verb: 'get', url: '/roles/:_id', controller: 'security', action: 'getRole'},
{verb: 'get', url: '/profiles/:_id', controller: 'security', action: 'getProfile'},
{verb: 'get', url: '/profiles/:_id/_rights', controller: 'security', action: 'getProfileRights'},
<<<<<<<
{verb: 'post', url: '/users/:_id', controller: 'security', action: 'updateUser'},
{verb: 'post', url: '/_login', controller: 'auth', action: 'login'},
{verb: 'post', url: '/_checkToken', controller: 'auth', action: 'checkToken'},
{verb: 'post', url: '/_login/:strategy', controller: 'auth', action: 'login'},
{verb: 'post', url: '/_validateSpecifications', controller: 'admin', action: 'validateSpecifications'},
{verb: 'post', url: '/ms/_append/:_id', controller: 'ms', action: 'append'},
=======
{verb: 'post', url: '/users/:id', controller: 'security', action: 'updateUser'},
{verb: 'post', url: '/ms/_append/:id', controller: 'ms', action: 'append'},
>>>>>>>
{verb: 'post', url: '/users/:_id', controller: 'security', action: 'updateUser'},
{verb: 'post', url: '/ms/_append/:_id', controller: 'ms', action: 'append'},
<<<<<<<
{verb: 'put', url: '/roles/:_id', controller: 'security', action: 'createOrReplaceRole'},
{verb: 'put', url: '/roles/:_id/_createOrReplace', controller: 'security', action: 'createOrReplaceRole'},
{verb: 'put', url: '/profiles/:_id', controller: 'security', action: 'createOrReplaceProfile'},
{verb: 'put', url: '/profiles/:_id/_createOrReplace', controller: 'security', action: 'createOrReplaceProfile'},
{verb: 'put', url: '/users/:_id', controller: 'security', action: 'createOrReplaceUser'},
{verb: 'put', url: '/_updateSelf', controller: 'auth', action: 'updateSelf'},
{verb: 'put', url: '/_specifications', controller: 'admin', action: 'updateSpecifications'},
=======
{verb: 'put', url: '/_updateSelf', controller: 'auth', action: 'updateSelf'},
{verb: 'put', url: '/_specifications', controller: 'admin', action: 'updateSpecifications'},
{verb: 'put', url: '/roles/:id', controller: 'security', action: 'createOrReplaceRole'},
{verb: 'put', url: '/roles/:id/_createOrReplace', controller: 'security', action: 'createOrReplaceRole'},
{verb: 'put', url: '/profiles/:id', controller: 'security', action: 'createOrReplaceProfile'},
{verb: 'put', url: '/profiles/:id/_createOrReplace', controller: 'security', action: 'createOrReplaceProfile'},
{verb: 'put', url: '/users/:id', controller: 'security', action: 'createOrReplaceUser'},
>>>>>>>
{verb: 'put', url: '/roles/:_id', controller: 'security', action: 'createOrReplaceRole'},
{verb: 'put', url: '/roles/:_id/_createOrReplace', controller: 'security', action: 'createOrReplaceRole'},
{verb: 'put', url: '/profiles/:_id', controller: 'security', action: 'createOrReplaceProfile'},
{verb: 'put', url: '/profiles/:_id/_createOrReplace', controller: 'security', action: 'createOrReplaceProfile'},
{verb: 'put', url: '/users/:_id', controller: 'security', action: 'createOrReplaceUser'},
{verb: 'put', url: '/_updateSelf', controller: 'auth', action: 'updateSelf'},
{verb: 'put', url: '/_specifications', controller: 'admin', action: 'updateSpecifications'}, |
<<<<<<<
paddingTop: 50,
padding: 20,
elevation:elevation
=======
paddingTop: 5,
elevation: elevation,
>>>>>>>
paddingTop: 50,
padding: 20,
elevation: elevation, |
<<<<<<<
var PRESS_RETENTION_OFFSET = { top: 20, left: 20, right: 20, bottom: 30 };
=======
const PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
>>>>>>>
const PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
<<<<<<<
activeProps: {
style: {
opacity: props.activeOpacity,
},
},
activeUnderlayProps: {
style: {
backgroundColor: props.underlayColor,
},
},
underlayStyle: [INACTIVE_UNDERLAY_PROPS.style, props.style],
hasTVPreferredFocus: props.hasTVPreferredFocus,
=======
...this.touchableGetInitialState(),
extraChildStyle: null,
extraUnderlayStyle: null,
>>>>>>>
...this.touchableGetInitialState(),
extraChildStyle: null,
extraUnderlayStyle: null,
<<<<<<<
getInitialState: function() {
return merge(
this.touchableGetInitialState(),
this._computeSyntheticState(this.props)
);
},
=======
>>>>>>>
<<<<<<<
if (
nextProps.activeOpacity !== this.props.activeOpacity ||
nextProps.underlayColor !== this.props.underlayColor ||
nextProps.style !== this.props.style
) {
this.setState(this._computeSyntheticState(nextProps));
}
=======
>>>>>>>
<<<<<<<
this._hideTimeout = this.setTimeout(
this._hideUnderlay,
this.props.delayPressOut || 100
);
=======
this._hideTimeout = setTimeout(
this._hideUnderlay,
this.props.delayPressOut,
);
>>>>>>>
this._hideTimeout = this.setTimeout(
this._hideUnderlay,
this.props.delayPressOut || 100,
);
<<<<<<<
testID={this.props.testID}
onMouseEnter={this.props.onMouseEnter}
onMouseLeave={this.props.onMouseLeave}>
{React.cloneElement(React.Children.only(this.props.children), {
ref: CHILD_REF,
})}
{Touchable.renderDebugView({
color: 'green',
hitSlop: this.props.hitSlop,
})}
=======
testID={this.props.testID}>
{React.cloneElement(child, {
style: StyleSheet.compose(
child.props.style,
this.state.extraChildStyle,
),
})}
{Touchable.renderDebugView({
color: 'green',
hitSlop: this.props.hitSlop,
})}
>>>>>>>
testID={this.props.testID}>
{React.cloneElement(child, {
style: StyleSheet.compose(
child.props.style,
this.state.extraChildStyle,
),
})}
{Touchable.renderDebugView({
color: 'green',
hitSlop: this.props.hitSlop,
})}
<<<<<<<
var CHILD_REF = keyOf({ childRef: null });
var UNDERLAY_REF = keyOf({ underlayRef: null });
var INACTIVE_CHILD_PROPS = {
style: StyleSheet.create({ x: { opacity: 1.0 } }).x,
};
var INACTIVE_UNDERLAY_PROPS = {
style: StyleSheet.create({ x: { backgroundColor: 'transparent' } }).x,
};
=======
>>>>>>> |
<<<<<<<
var DocumentSelectionState = require('DocumentSelectionState');
var EventEmitter = require('EventEmitter');
var NativeMethodsMixin = require('NativeMethodsMixin');
var Platform = require('Platform');
var PropTypes = require('ReactPropTypes');
var React = require('React');
var ReactNative = require('ReactNative');
var ReactChildren = require('ReactChildren');
var StyleSheet = require('StyleSheet');
var Text = require('Text');
var TextInputState = require('TextInputState');
var TimerMixin = require('react-timer-mixin');
var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
var UIManager = require('UIManager');
var View = require('View');
var NativeModules = require('NativeModules');
var createReactNativeComponentClass = require('createReactNativeComponentClass');
var emptyFunction = require('fbjs/lib/emptyFunction');
var invariant = require('fbjs/lib/invariant');
var requireNativeComponent = require('requireNativeComponent');
var processColor = require('processColor');
var onlyMultiline = {
onTextInput: true, // not supported in Open Source yet
=======
const ColorPropType = require('ColorPropType');
const DocumentSelectionState = require('DocumentSelectionState');
const EventEmitter = require('EventEmitter');
const NativeMethodsMixin = require('react/lib/NativeMethodsMixin');
const Platform = require('Platform');
const PropTypes = require('react/lib/ReactPropTypes');
const React = require('React');
const ReactNative = require('react/lib/ReactNative');
const ReactChildren = require('react/lib/ReactChildren');
const StyleSheet = require('StyleSheet');
const Text = require('Text');
const TextInputState = require('TextInputState');
const TimerMixin = require('react-timer-mixin');
const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
const UIManager = require('UIManager');
const View = require('View');
const warning = require('fbjs/lib/warning');
const emptyFunction = require('fbjs/lib/emptyFunction');
const invariant = require('fbjs/lib/invariant');
const requireNativeComponent = require('requireNativeComponent');
const onlyMultiline = {
onTextInput: true,
>>>>>>>
const ColorPropType = require('ColorPropType');
const DocumentSelectionState = require('DocumentSelectionState');
const EventEmitter = require('EventEmitter');
const NativeMethodsMixin = require('react/lib/NativeMethodsMixin');
const Platform = require('Platform');
const PropTypes = require('react/lib/ReactPropTypes');
const React = require('React');
const ReactNative = require('react/lib/ReactNative');
const ReactChildren = require('react/lib/ReactChildren');
const StyleSheet = require('StyleSheet');
const Text = require('Text');
const TextInputState = require('TextInputState');
const TimerMixin = require('react-timer-mixin');
const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
const UIManager = require('UIManager');
const View = require('View');
const warning = require('fbjs/lib/warning');
const emptyFunction = require('fbjs/lib/emptyFunction');
const invariant = require('fbjs/lib/invariant');
const requireNativeComponent = require('requireNativeComponent');
const onlyMultiline = {
onTextInput: true,
<<<<<<<
* If false, disables auto-correct. The default value is true.
=======
* Can tell `TextInput` to automatically capitalize certain characters.
*
* - `characters`: all characters.
* - `words`: first letter of each word.
* - `sentences`: first letter of each sentence (*default*).
* - `none`: don't auto capitalize anything.
*/
autoCapitalize: PropTypes.oneOf([
'none',
'sentences',
'words',
'characters',
]),
/**
* If `false`, disables auto-correct. The default value is `true`.
>>>>>>>
* If false, disables auto-correct. The default value is true.
<<<<<<<
* Type of border
=======
* If `false`, text is not editable. The default value is `true`.
>>>>>>>
* Type of border
<<<<<<<
* If false, text is not editable. The default value is true.
=======
* Determines which keyboard to open, e.g.`numeric`.
*
* The following values work across platforms:
*
* - `default`
* - `numeric`
* - `email-address`
* - `phone-pad`
>>>>>>>
* If false, text is not editable. The default value is true.
<<<<<<<
focusRingType: PropTypes.oneOf([
'default',
'none',
'exterior',
]),
=======
returnKeyLabel: PropTypes.string,
>>>>>>>
focusRingType: PropTypes.oneOf([
'default',
'none',
'exterior',
]),
<<<<<<<
* If true, the text input can be multiple lines.
* The default value is false.
=======
* If `true`, the keyboard disables the return key when there is no text and
* automatically enables it when there is text. The default value is `false`.
* @platform ios
*/
enablesReturnKeyAutomatically: PropTypes.bool,
/**
* If `true`, the text input can be multiple lines.
* The default value is `false`.
>>>>>>>
* If `true`, the keyboard disables the return key when there is no text and
* automatically enables it when there is text. The default value is `false`.
* @platform ios
*/
enablesReturnKeyAutomatically: PropTypes.bool,
/**
* If `true`, the text input can be multiple lines.
* The default value is `false`.
<<<<<<<
* The color used by caret and selection
*/
selectionColor: PropTypes.string,
/**
* If true, the text input obscures the text entered so that sensitive text
* like passwords stay secure. The default value is false.
=======
* If `true`, the text input obscures the text entered so that sensitive text
* like passwords stay secure. The default value is `false`.
>>>>>>>
* If `true`, the text input obscures the text entered so that sensitive text
* like passwords stay secure. The default value is `false`.
<<<<<<<
* See DocumentSelectionState.js, some state that is responsible for
* maintaining selection information for a document
=======
* The highlight (and cursor on iOS) color of the text input.
*/
selectionColor: ColorPropType,
/**
* An instance of `DocumentSelectionState`, this is some state that is responsible for
* maintaining selection information for a document.
*
* Some functionality that can be performed with this instance is:
*
* - `blur()`
* - `focus()`
* - `update()`
*
* > You can reference `DocumentSelectionState` in
* > [`vendor/document/selection/DocumentSelectionState.js`](https://github.com/facebook/react-native/blob/master/Libraries/vendor/document/selection/DocumentSelectionState.js)
*
>>>>>>>
* The highlight (and cursor on iOS) color of the text input.
*/
selectionColor: ColorPropType,
/**
* An instance of `DocumentSelectionState`, this is some state that is responsible for
* maintaining selection information for a document.
*
* Some functionality that can be performed with this instance is:
*
* - `blur()`
* - `focus()`
* - `update()`
*
* > You can reference `DocumentSelectionState` in
* > [`vendor/document/selection/DocumentSelectionState.js`](https://github.com/facebook/react-native/blob/master/Libraries/vendor/document/selection/DocumentSelectionState.js)
*
<<<<<<<
* multiline fields. Note that for multiline fields, setting blurOnSubmit
* to true means that pressing return will blur the field and trigger the
* onSubmitEditing event instead of inserting a newline into the field.
* @platform ios
=======
* multiline fields. Note that for multiline fields, setting `blurOnSubmit`
* to `true` means that pressing return will blur the field and trigger the
* `onSubmitEditing` event instead of inserting a newline into the field.
>>>>>>>
* multiline fields. Note that for multiline fields, setting `blurOnSubmit`
* to `true` means that pressing return will blur the field and trigger the
* `onSubmitEditing` event instead of inserting a newline into the field.
<<<<<<<
onLayout={this.props.onLayout}
password={this.props.password || this.props.secureTextEntry}
=======
blurOnSubmit={this.props.blurOnSubmit}
>>>>>>>
blurOnSubmit={this.props.blurOnSubmit}
<<<<<<<
=======
secureTextEntry={this.props.secureTextEntry}
selectionColor={this.props.selectionColor}
>>>>>>>
secureTextEntry={this.props.secureTextEntry}
selectionColor={this.props.selectionColor} |
<<<<<<<
} else if (Platform.OS === 'ios' || Platform.OS === 'macos') {
var RCTTextView = requireNativeComponent('RCTTextView', null);
var RCTTextField = requireNativeComponent('RCTTextField', null);
var RCTSecureTextField = requireNativeComponent('RCTSecureTextField', null);
=======
} else if (Platform.OS === 'ios') {
var RCTMultilineTextInputView = requireNativeComponent('RCTMultilineTextInputView', null);
var RCTSinglelineTextInputView = requireNativeComponent('RCTSinglelineTextInputView', null);
>>>>>>>
} else if (Platform.OS === 'ios' || Platform.OS === 'macos') {
var RCTMultilineTextInputView = requireNativeComponent('RCTMultilineTextInputView', null);
var RCTSinglelineTextInputView = requireNativeComponent('RCTSinglelineTextInputView', null);
var RCTSecureTextField = requireNativeComponent('RCTSecureTextField', null);
<<<<<<<
* Type of border
=======
* Specifies whether fonts should scale to respect Text Size accessibility settings. The
* default is `true`.
*/
allowFontScaling: PropTypes.bool,
/**
* If `false`, text is not editable. The default value is `true`.
>>>>>>>
* Specifies whether fonts should scale to respect Text Size accessibility settings. The
* default is `true`.
*/
allowFontScaling: PropTypes.bool,
/**
* If `false`, text is not editable. The default value is `true`.
<<<<<<<
var TextField = props.password ? RCTSecureTextField : RCTTextField;
textContainer = (
<RCTTextField
=======
textContainer =
<RCTSinglelineTextInputView
>>>>>>>
var TextField = props.password ? RCTSecureTextField : RCTSinglelineTextInputView;
textContainer = (
<TextField
<<<<<<<
textContainer = (
<RCTTextView
=======
textContainer =
<RCTMultilineTextInputView
>>>>>>>
textContainer =
<RCTMultilineTextInputView
<<<<<<<
UIManager.AndroidTextInput.Constants.AutoCapitalizationType[
this.props.autoCapitalize
];
=======
UIManager.AndroidTextInput.Constants.AutoCapitalizationType[
props.autoCapitalize || 'sentences'
];
/* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
* suppresses an error when upgrading Flow's support for React. To see the
* error delete this comment and run Flow. */
>>>>>>>
UIManager.AndroidTextInput.Constants.AutoCapitalizationType[
props.autoCapitalize || 'sentences'
];
/* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
* suppresses an error when upgrading Flow's support for React. To see the
* error delete this comment and run Flow. */
<<<<<<<
input: {
alignSelf: 'stretch',
height: NativeModules.ButtonManager.ComponentHeight,
},
=======
>>>>>>>
input: {
alignSelf: 'stretch',
height: NativeModules.ButtonManager.ComponentHeight,
}, |
<<<<<<<
if (__dirname.match(/node_modules[\/\\]react-native-desktop[\/\\]local-cli$/)) {
=======
var root = process.env.REACT_NATIVE_APP_ROOT;
if (root) {
return [path.resolve(root)];
}
if (__dirname.match(/node_modules[\/\\]react-native[\/\\]local-cli$/)) {
>>>>>>>
var root = process.env.REACT_NATIVE_APP_ROOT;
if (root) {
return [path.resolve(root)];
}
if (__dirname.match(/node_modules[\/\\]react-native-desktop[\/\\]local-cli$/)) { |
<<<<<<<
$(".demographics").hide();
$(".attendance").hide();
$(".discipline").hide();
$("#column-group-select").chosen().on('change', function(e, params) {
=======
$(".language").hide();
$(".sped").hide();
$(".program").hide();
$(".free-reduced").hide();
$("#column-group-select").chosen({width: "110%"}).on('change', function(e, params) {
>>>>>>>
$(".attendance").hide();
$(".discipline").hide();
$(".language").hide();
$(".sped").hide();
$(".program").hide();
$(".free-reduced").hide();
$("#column-group-select").chosen({width: "110%"}).on('change', function(e, params) {
<<<<<<<
// Table interactions
=======
>>>>>>> |
<<<<<<<
const shouldShowHomeroom = homeroom && school && isHomeroomMeaningful(school.school_type);
const shouldShowPhoto = (student.has_photo && window.location.search.indexOf('photo') !== -1);
=======
const shouldShowHomeroom = homeroom && isHomeroomMeaningful(school.school_type);
>>>>>>>
const shouldShowHomeroom = homeroom && school && isHomeroomMeaningful(school.school_type); |
<<<<<<<
import SchoolWideAbsences from '../app/assets/javascripts/school_administrator_dashboard/dashboard_components/absences_dashboard/SchoolWideAbsences';
=======
import SchoolCoursesPage from '../app/assets/javascripts/school_courses/SchoolCoursesPage';
>>>>>>>
import SchoolWideAbsences from '../app/assets/javascripts/school_administrator_dashboard/dashboard_components/absences_dashboard/SchoolWideAbsences';
import SchoolCoursesPage from '../app/assets/javascripts/school_courses/SchoolCoursesPage'; |
<<<<<<<
'Notes to principal',
'Principal finalizes',
'Export spreadsheet'
=======
'Share with principal',
'Principal finalizes'
>>>>>>>
'Share with principal',
'Principal finalizes',
'Export spreadsheet'
<<<<<<<
: [0, 1, 2, 3, 4, 5];
=======
: [0, 1, 2, 3];
}
canChangeSchoolOrGrade() {
const {studentIdsByRoom, students, hasFetchedStudents, hasFetchedClassList} = this.state;
if (students !== null || hasFetchedStudents) return false;
if (studentIdsByRoom !== null || hasFetchedClassList) return false;
return true;
>>>>>>>
: [0, 1, 2, 3, 4, 5];
}
canChangeSchoolOrGrade() {
const {studentIdsByRoom, students, hasFetchedStudents, hasFetchedClassList} = this.state;
if (students !== null || hasFetchedStudents) return false;
if (studentIdsByRoom !== null || hasFetchedClassList) return false;
return true; |
<<<<<<<
return this.deleteFromDatabase(profile._id))
.then(deleteResponse => {
=======
return this.deleteFromDatabase(profile._id, options)
.then((deleteResponse) => {
>>>>>>>
return this.deleteFromDatabase(profile._id, options)
.then(deleteResponse => { |
<<<<<<<
import './config/sprockets-shims';
import './legacy';
=======
import './config/sprockets-shims.js';
>>>>>>>
import './config/sprockets-shims'; |
<<<<<<<
module.exports = function (kuzzle) {
var extractRoleIds = function (policies) {
return policies.map(policy => {
if (typeof policy === 'string') {
return policy;
=======
var extractRoleIds = policiesOrRoles => {
return policiesOrRoles.map(element => {
if (element.roleId) {
return element.roleId;
>>>>>>>
module.exports = function (kuzzle) {
var extractRoleIds = policiesOrRoles => {
return policiesOrRoles.map(element => {
if (element.roleId) {
return element.roleId;
<<<<<<<
Object.keys(requestObject.data.body).forEach((key) => {
if (key !== '_id') {
profile[key] = requestObject.data.body[key];
}
});
return Promise.resolve(profile);
=======
return q(profile);
>>>>>>>
return Promise.resolve(profile);
<<<<<<<
return Promise.reject(new NotFoundError(`Unable to hydrate the profile ${data._id}. The following roles don't exist: ${rolesNotFound}`));
=======
return q.reject(new NotFoundError(`Unable to hydrate the profile ${data._id}. The following role(s) don't exist: ${rolesNotFound}`));
>>>>>>>
return Promise.reject(new NotFoundError(`Unable to hydrate the profile ${data._id}. The following role(s) don't exist: ${rolesNotFound}`)); |
<<<<<<<
//= require ./student_profile_v2/mcas_score_chart
=======
//= require ./student_profile_v2/student_profile_header
>>>>>>>
//= require ./student_profile_v2/mcas_score_chart
//= require ./student_profile_v2/student_profile_header |
<<<<<<<
=======
debug('[%s] broker client received a message: %a', this.eventName, msg);
>>>>>>> |
<<<<<<<
return Promise.all(promises);
=======
total = response.total;
return q.all(promises);
>>>>>>>
total = response.total;
return Promise.all(promises);
<<<<<<<
if (!modifiedRequestObject.data.body || !modifiedRequestObject.data.body.profileId) {
return Promise.reject(new BadRequestError('Invalid user object. No profileId property found.'));
=======
if (!modifiedRequestObject.data.body || !modifiedRequestObject.data.body.profilesIds) {
return q.reject(new BadRequestError('Invalid user object. No profilesIds property found.'));
>>>>>>>
if (!modifiedRequestObject.data.body || !modifiedRequestObject.data.body.profilesIds) {
return Promise.reject(new BadRequestError('Invalid user object. No profilesIds property found.'));
<<<<<<<
if (!modifiedRequestObject.data.body || !modifiedRequestObject.data.body.profileId) {
return Promise.reject(new BadRequestError('Invalid user object. No profile property found.'));
=======
if (!modifiedRequestObject.data.body || !modifiedRequestObject.data.body.profilesIds) {
return q.reject(new BadRequestError('Invalid user object. No profile property found.'));
>>>>>>>
if (!modifiedRequestObject.data.body || !modifiedRequestObject.data.body.profilesIds) {
return Promise.reject(new BadRequestError('Invalid user object. No profile property found.')); |
<<<<<<<
export * from './debug';
export * from './utils';
export * from './accessibility';
=======
export * from './debug';
>>>>>>>
export * from './debug';
export * from './accessibility'; |
<<<<<<<
},
{
'path': '/progress',
'title': 'Progress - 进度条'
=======
},
{
'path': '/pagination',
'title': 'Pagination - 分页器'
>>>>>>>
},
{
'path': '/progress',
'title': 'Progress - 进度条'
},
{
'path': '/pagination',
'title': 'Pagination - 分页器' |
<<<<<<<
import Swipeaction from './swipeaction';
=======
import Stepper from './stepper';
>>>>>>>
import Swipeaction from './swipeaction';
import Stepper from './stepper';
<<<<<<<
Swipeaction,
=======
Stepper,
>>>>>>>
Swipeaction,
Stepper,
<<<<<<<
Swipeaction,
=======
Stepper,
>>>>>>>
Swipeaction,
Stepper, |
<<<<<<<
},
{
'path': '/actionsheet',
'title': 'ActionSheet - 动作面板'
=======
},
{
'path': '/search-bar',
'title': 'SearchBar - 搜索栏'
>>>>>>>
},
{
'path': '/actionsheet',
'title': 'ActionSheet - 动作面板'
},
{
'path': '/search-bar',
'title': 'SearchBar - 搜索栏' |
<<<<<<<
const ownerNotification = (req, res) => {
const message = req.body;
message.from = process.env.EMAIL_FROM;
const templateDir = path.join(__dirname, 'templates', 'ownerNotification');
const template = new EmailTemplate(templateDir);
template.render(message, (err, result) => {
=======
const emailTemplateSender = (template, message, res) => {
const templateDir = path.join(__dirname, 'templates', template);
const emailTemplate = new EmailTemplate(templateDir);
message.from = process.env.emailFrom;
emailTemplate.render(message, (err, result) => {
>>>>>>>
const emailTemplateSender = (template, message, res) => {
const templateDir = path.join(__dirname, 'templates', template);
const emailTemplate = new EmailTemplate(templateDir);
message.from = process.env.EMAIL_FROM;
emailTemplate.render(message, (err, result) => { |
<<<<<<<
import ggcalendar from '../../api/gg-calendar';
=======
import stats from '../../api/stats';
>>>>>>>
import ggcalendar from '../../api/gg-calendar';
import stats from '../../api/stats';
<<<<<<<
/* Google Calendar API */
app.use('/api/ggcalendar', ggcalendar);
=======
/* stats API */
app.use('/api/stats', stats);
>>>>>>>
/* Google Calendar API */
app.use('/api/ggcalendar', ggcalendar);
/* stats API */
app.use('/api/stats', stats); |
<<<<<<<
Kuzzle.__with__({
console: {
error: sinon.spy()
},
process: {
exit: processExitSpy,
on: processOnSpy,
emit: sinon.stub(),
removeAllListeners: processRemoveAllListenersSpy
}
})(() => {
mock = new KuzzleMock();
kuzzle = new Kuzzle();
[
'entryPoints',
'funnel',
'hooks',
'indexCache',
'internalEngine',
'notifier',
'pluginsManager',
'remoteActionsController',
'repositories',
'services',
'statistics'
].forEach(k => {
kuzzle[k] = mock[k];
});
=======
Kuzzle.__set__('process', {
exit: processExitSpy,
on: processOnSpy,
emit: sinon.stub(process, 'emit'),
removeAllListeners: processRemoveAllListenersSpy
});
Kuzzle.__set__('console', {
error: sinon.spy()
});
mock = new KuzzleMock();
kuzzle = new Kuzzle();
[
'entryPoints',
'funnel',
'router',
'hooks',
'indexCache',
'internalEngine',
'notifier',
'pluginsManager',
'remoteActionsController',
'repositories',
'services',
'statistics'
].forEach(k => {
kuzzle[k] = mock[k];
});
>>>>>>>
Kuzzle.__with__({
console: {
error: sinon.spy()
},
process: {
exit: processExitSpy,
on: processOnSpy,
emit: sinon.stub(),
removeAllListeners: processRemoveAllListenersSpy
}
})(() => {
mock = new KuzzleMock();
kuzzle = new Kuzzle();
[
'entryPoints',
'funnel',
'router',
'hooks',
'indexCache',
'internalEngine',
'notifier',
'pluginsManager',
'remoteActionsController',
'repositories',
'services',
'statistics'
].forEach(k => {
kuzzle[k] = mock[k];
}); |
<<<<<<<
let
BadRequestError = require('kuzzle-common-objects').errors.BadRequestError,
SizeLimitError = require('kuzzle-common-objects').errors.SizeLimitError,
assertHasBody = require('../../util/requestAssertions').assertHasBody,
assertHasId = require('../../util/requestAssertions').assertHasId,
assertBodyHasAttribute = require('../../util/requestAssertions').assertBodyHasAttribute,
assertHasIndexAndCollection = require('../../util/requestAssertions').assertHasIndexAndCollection,
assertBodyAttributeType = require('../../util/requestAssertions').assertBodyAttributeType,
assertIdStartsNotUnderscore = require('../../util/requestAssertions').assertIdStartsNotUnderscore,
getRequestRoute = require('../../util/string').getRequestRoute,
=======
const
{
BadRequestError,
SizeLimitError,
PartialError
} = require('kuzzle-common-objects').errors,
{
assertHasBody,
assertHasId,
assertBodyHasAttribute,
assertHasIndexAndCollection,
assertBodyAttributeType,
assertIdStartsNotUnderscore
} = require('./util/requestAssertions'),
>>>>>>>
const
{
BadRequestError,
SizeLimitError,
PartialError
} = require('kuzzle-common-objects').errors,
{
assertHasBody,
assertHasId,
assertBodyHasAttribute,
assertHasIndexAndCollection,
assertBodyAttributeType,
assertIdStartsNotUnderscore
} = require('../../util/requestAssertions'),
getRequestRoute = require('../../util/string').getRequestRoute,
<<<<<<<
if (documentsCount > kuzzle.config.limits.documentsFetchCount) {
throw new SizeLimitError(`${getRequestRoute(request)} cannot fetch more documents than the server configured limit (${kuzzle.config.limits.documentsFetchCount})`);
=======
if (documentsCount > this.kuzzle.config.limits.documentsFetchCount) {
throw new SizeLimitError(`document:search cannot fetch more documents than the server configured limit (${this.kuzzle.config.limits.documentsFetchCount})`);
>>>>>>>
if (documentsCount > this.kuzzle.config.limits.documentsFetchCount) {
throw new SizeLimitError(`${getRequestRoute(request)} cannot fetch more documents than the server configured limit (${this.kuzzle.config.limits.documentsFetchCount})`);
<<<<<<<
if (request.input.body.ids.length > kuzzle.config.limits.documentsFetchCount) {
throw new SizeLimitError(`${getRequestRoute(request)} Number of gets to perform exceeds the server configured value (${kuzzle.config.limits.documentsFetchCount})`);
=======
if (request.input.body.ids.length > this.kuzzle.config.limits.documentsFetchCount) {
throw new SizeLimitError(`Number of gets to perform exceeds the server configured value (${this.kuzzle.config.limits.documentsFetchCount})`);
>>>>>>>
if (request.input.body.ids.length > this.kuzzle.config.limits.documentsFetchCount) {
throw new SizeLimitError(`${getRequestRoute(request)} Number of gets to perform exceeds the server configured value (${this.kuzzle.config.limits.documentsFetchCount})`);
<<<<<<<
if (request.input.body.ids.length > kuzzle.config.limits.documentsWriteCount) {
throw new BadRequestError(`${getRequestRoute(request)} Number of delete to perform exceeds the server configured value (${kuzzle.config.limits.documentsWriteCount})`);
=======
if (request.input.body.ids.length > this.kuzzle.config.limits.documentsWriteCount) {
throw new BadRequestError(`Number of delete to perform exceeds the server configured value (${this.kuzzle.config.limits.documentsWriteCount})`);
>>>>>>>
if (request.input.body.ids.length > this.kuzzle.config.limits.documentsWriteCount) {
throw new BadRequestError(`${getRequestRoute(request)} Number of delete to perform exceeds the server configured value (${this.kuzzle.config.limits.documentsWriteCount})`); |
<<<<<<<
var editorHtml = '<div class="\\{classNames.SimpleWysiwyg\\}" data-action-mouseup="onPutCaret" data-selector="simple-wysiwyg" contenteditable data-action-input="onInput" data-action-keydown="onPutCaret" data-action-paste="onPaste"<!-- BEGIN showSource:exist --> style="display:none;"<!-- END showSource:exist --><!-- BEGIN hideEditor:exist --> style="display:none;"<!-- END hideEditor:exist -->>{value}</div>\n<textarea class="\\{classNames.SimpleWysiwygSource\\}" data-selector="simple-wysiwyg-source" <!-- BEGIN showSource:empty --> style="display:none;"<!-- END showSource:empty -->{attr} data-bind="formatedValue" data-action-input="onDirectInput"></textarea>';
var btnHtml = '<div class="\\{classNames.SimpleWysiwygToolBox\\}" data-selector="simple-wysiwyg-toolbox">\n <!-- BEGIN selectOptions.0:exist -->\n <div class="\\{classNames.SimpleWysiwygSelectWrap\\}">\n <select class="\\{classNames.SimpleWysiwygSelect\\}"<!-- BEGIN selectName:exist --> name="{selectName}"<!-- END selectName:exist --> data-action-change="changeOption" data-bind="selectedOption">\n <!-- BEGIN selectOptions:loop -->\n <option value="{value}" data-tag_extend>{label}</option>\n <!-- END selectOptions:loop -->\n </select>\n </div>\n <!-- END selectOptions.0:exist -->\n\n <div class="\\{classNames.SimpleWysiwygBtnGroupWrap\\}" <!-- BEGIN hideBtns:exist --> style="display:none;"<!-- END hideBtns:exist -->>\n <div class="\\{classNames.SimpleWysiwygBtnGroup\\}"><button class="\\{classNames.SimpleWysiwygBtn\\}<!-- BEGIN showSource:exist --> \\{classNames.SimpleWysiwygBtnActive\\}<!-- END showSource:exist -->" data-action-click="toggleSource" type="button">\\{message.sourceBtn\\}</button><button class="\\{classNames.SimpleWysiwygBtn\\}" data-action-click="redo"<!-- BEGIN canRedo:empty --> disabled<!-- END canRedo:empty --> type="button">\\{message.redoBtn\\}</button><button class="\\{classNames.SimpleWysiwygBtn\\}" data-action-click="undo"<!-- BEGIN canUndo:empty --> disabled<!-- END canUndo:empty --> type="button">\\{message.undoBtn\\}</button></div>\n \n <div class="\\{classNames.SimpleWysiwygBtnGroup\\}" data-selector="btn-group">\n <!-- BEGIN btnOptions:loop --><button class="\\\\{classNames.SimpleWysiwygBtn\\\\}<!-- BEGIN selfClassName:exist --> {selfClassName}<!-- END selfClassName:exist --><!-- BEGIN selected:exist --> \\\\{classNames.SimpleWysiwygBtnActive\\\\}<!-- END selected:exist -->" data-tag="{tag}" data-class="{className}"<!-- BEGIN tag:exist --><!-- BEGIN selected:empty --> data-action-click="insertTag({tag},{className})"<!-- END selected:empty --><!-- BEGIN selected:exist --> data-action-click="unwrapTag({tag},{className})"<!-- END selected:exist --><!-- END tag:exist --><!-- BEGIN tag:empty --> data-action-click="onClick({i})"<!-- END tag:empty --><!-- \\BEGIN showSource:exist --> disabled<!-- \\END showSource:exist --> type="button">{label}</button><!-- END btnOptions:loop -->\n </div>\n </div>\n</div>';
var tooltipHtml = '<div data-selector="simple-wysiwyg-tooltip">\n<!-- BEGIN tooltipLabel:exist -->\n<div class="\\{classNames.SimpleWysiwygTooltip\\}" style="left:{tooltipLeft}px;top:{tooltipTop}px">\n <table class="\\{classNames.SimpleWysiwygTooltipTable\\}">\n <tr>\n <th>\u30E9\u30D9\u30EB\u540D</th>\n <td><input type="text" data-bind="tooltipLabel"></td>\n </tr>\n <tr>\n <th>URL</th>\n <td><input type="text" data-bind="tooltipUrl"></td>\n </tr>\n <tr>\n <td></td>\n <td><button data-action-click="updateLink()">\u5909\u66F4</button></td>\n </tr>\n </table>\n</div>\n<!-- END tooltipLabel:exist -->\n</div>';
=======
var editorHtml = '<div class="\\{classNames.SimpleWysiwyg\\}" data-action-mouseup="onPutCaret" data-action-keydown="onKeyDown" data-selector="simple-wysiwyg" contenteditable data-action-input="onInput" data-action-paste="onPaste" style="<!-- BEGIN showSource:exist -->display:none;<!-- END showSource:exist --><!-- BEGIN hideEditor:exist -->display:none;"<!-- END hideEditor:exist --><!-- BEGIN minHeight:exist -->min-height: {minHeight}px;<!-- END minHeight:exist --><!-- BEGIN maxHeight:exist -->max-height:{maxHeight}px;<!-- END maxHeight:exist -->">{value}</div>\n<textarea class="\\{classNames.SimpleWysiwygSource\\}" data-selector="simple-wysiwyg-source" style="<!-- BEGIN showSource:empty -->display:none;<!-- END showSource:empty --><!-- BEGIN sourceHeight:exist -->height:{sourceHeight}px;<!-- END sourceHeight:exist -->"{attr} data-bind="formatedValue"></textarea>';
var btnHtml = '<div class="\\{classNames.SimpleWysiwygToolBox\\}" data-selector="simple-wysiwyg-toolbox">\n <!-- BEGIN selectOptions.0:exist -->\n <div class="\\{classNames.SimpleWysiwygSelectWrap\\}">\n <select class="\\{classNames.SimpleWysiwygSelect\\}"<!-- BEGIN selectName:exist --> name="{selectName}"<!-- END selectName:exist --> data-action-change="changeOption" data-bind="selectedOption">\n <!-- BEGIN selectOptions:loop -->\n <option value="{value}" data-tag_extend>{label}</option>\n <!-- END selectOptions:loop -->\n </select>\n </div>\n <!-- END selectOptions.0:exist -->\n\n <div class="\\{classNames.SimpleWysiwygBtnGroupWrap\\}" <!-- BEGIN hideBtns:exist --> style="display:none;"<!-- END hideBtns:exist -->> \n <!-- BEGIN groups:loop -->\n <div class="\\\\{classNames.SimpleWysiwygBtnGroup\\\\}">\n <!-- \\BEGIN groups.{i}.items:loop -->\n\n <!-- \\BEGIN action:touch#preview -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}<!-- \\\\BEGIN showSource:exist --> \\\\\\{classNames.SimpleWysiwygBtnActive\\\\\\}<!-- \\\\END showSource:exist -->" data-action-click="toggleSource" type="button">\\{label\\}</button>\n <!-- \\END action:touch#preview -->\n\n <!-- \\BEGIN action:touch#redo -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}" data-action-click="redo"<!-- \\\\BEGIN canRedo:empty --> disabled<!-- \\\\END canRedo:empty --> type="button">\\{label\\}</button>\n <!-- \\END action:touch#redo -->\n\n <!-- \\BEGIN action:touch#undo -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}" data-action-click="undo"<!-- \\\\BEGIN canUndo:empty --> disabled<!-- \\\\END canUndo:empty --> type="button">\\{label\\}</button>\n <!-- \\END action:touch#undo -->\n\n <!-- \\BEGIN action:touch#extra -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}<!-- \\BEGIN selfClassName:exist --> \\{selfClassName\\}<!-- \\END selfClassName:exist -->" data-action-click="onClick(\\{index\\})" type="button">\\{label\\}</button>\n <!-- \\END action:touch#extra -->\n\n <!-- \\BEGIN action:empty -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}<!-- \\BEGIN selfClassName:exist --> \\{selfClassName\\}<!-- \\END selfClassName:exist --><!-- \\BEGIN selected:exist --> \\\\\\{classNames.SimpleWysiwygBtnActive\\\\\\}<!-- \\END selected:exist -->"\n <!-- \\BEGIN tag:exist -->\n <!-- \\BEGIN selected:empty --> data-action-click="insertTag(\\{tag\\},\\{className\\})"<!-- \\END selected:empty -->\n <!-- \\BEGIN selected:exist --> data-action-click="unwrapTag(\\{tag\\},\\{className\\})"<!-- \\END selected:exist -->\n <!-- \\END tag:exist -->\n <!-- \\BEGIN tag:empty --> data-action-click="insertTag(span,\\{className\\})"<!-- \\END tag:empty -->\n <!-- \\\\BEGIN showSource:exist --> disabled<!-- \\\\END showSource:exist --> \n type="button">\\{label\\}</button>\n <!-- \\END action:empty -->\n <!-- \\END groups.{i}.items:loop -->\n </div>\n <!-- END groups:loop -->\n </div>\n</div>';
>>>>>>>
var editorHtml = '<div class="\\{classNames.SimpleWysiwyg\\}" data-action-mouseup="onPutCaret" data-action-keydown="onKeyDown" data-selector="simple-wysiwyg" contenteditable data-action-input="onInput" data-action-paste="onPaste" style="<!-- BEGIN showSource:exist -->display:none;<!-- END showSource:exist --><!-- BEGIN hideEditor:exist -->display:none;"<!-- END hideEditor:exist --><!-- BEGIN minHeight:exist -->min-height: {minHeight}px;<!-- END minHeight:exist --><!-- BEGIN maxHeight:exist -->max-height:{maxHeight}px;<!-- END maxHeight:exist -->">{value}</div>\n<textarea class="\\{classNames.SimpleWysiwygSource\\}" data-selector="simple-wysiwyg-source" style="<!-- BEGIN showSource:empty -->display:none;<!-- END showSource:empty --><!-- BEGIN sourceHeight:exist -->height:{sourceHeight}px;<!-- END sourceHeight:exist -->"{attr} data-bind="formatedValue"></textarea>';
var btnHtml = '<div class="\\{classNames.SimpleWysiwygToolBox\\}" data-selector="simple-wysiwyg-toolbox">\n <!-- BEGIN selectOptions.0:exist -->\n <div class="\\{classNames.SimpleWysiwygSelectWrap\\}">\n <select class="\\{classNames.SimpleWysiwygSelect\\}"<!-- BEGIN selectName:exist --> name="{selectName}"<!-- END selectName:exist --> data-action-change="changeOption" data-bind="selectedOption">\n <!-- BEGIN selectOptions:loop -->\n <option value="{value}" data-tag_extend>{label}</option>\n <!-- END selectOptions:loop -->\n </select>\n </div>\n <!-- END selectOptions.0:exist -->\n\n <div class="\\{classNames.SimpleWysiwygBtnGroupWrap\\}" <!-- BEGIN hideBtns:exist --> style="display:none;"<!-- END hideBtns:exist -->> \n <!-- BEGIN groups:loop -->\n <div class="\\\\{classNames.SimpleWysiwygBtnGroup\\\\}">\n <!-- \\BEGIN groups.{i}.items:loop -->\n\n <!-- \\BEGIN action:touch#preview -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}<!-- \\\\BEGIN showSource:exist --> \\\\\\{classNames.SimpleWysiwygBtnActive\\\\\\}<!-- \\\\END showSource:exist -->" data-action-click="toggleSource" type="button">\\{label\\}</button>\n <!-- \\END action:touch#preview -->\n\n <!-- \\BEGIN action:touch#redo -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}" data-action-click="redo"<!-- \\\\BEGIN canRedo:empty --> disabled<!-- \\\\END canRedo:empty --> type="button">\\{label\\}</button>\n <!-- \\END action:touch#redo -->\n\n <!-- \\BEGIN action:touch#undo -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}" data-action-click="undo"<!-- \\\\BEGIN canUndo:empty --> disabled<!-- \\\\END canUndo:empty --> type="button">\\{label\\}</button>\n <!-- \\END action:touch#undo -->\n\n <!-- \\BEGIN action:touch#extra -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}<!-- \\BEGIN selfClassName:exist --> \\{selfClassName\\}<!-- \\END selfClassName:exist -->" data-action-click="onClick(\\{index\\})" type="button">\\{label\\}</button>\n <!-- \\END action:touch#extra -->\n\n <!-- \\BEGIN action:empty -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}<!-- \\BEGIN selfClassName:exist --> \\{selfClassName\\}<!-- \\END selfClassName:exist --><!-- \\BEGIN selected:exist --> \\\\\\{classNames.SimpleWysiwygBtnActive\\\\\\}<!-- \\END selected:exist -->"\n <!-- \\BEGIN tag:exist -->\n <!-- \\BEGIN selected:empty --> data-action-click="insertTag(\\{tag\\},\\{className\\})"<!-- \\END selected:empty -->\n <!-- \\BEGIN selected:exist --> data-action-click="unwrapTag(\\{tag\\},\\{className\\})"<!-- \\END selected:exist -->\n <!-- \\END tag:exist -->\n <!-- \\BEGIN tag:empty --> data-action-click="insertTag(span,\\{className\\})"<!-- \\END tag:empty -->\n <!-- \\\\BEGIN showSource:exist --> disabled<!-- \\\\END showSource:exist --> \n type="button">\\{label\\}</button>\n <!-- \\END action:empty -->\n <!-- \\END groups.{i}.items:loop -->\n </div>\n <!-- END groups:loop -->\n </div>\n</div>';
var tooltipHtml = '<div data-selector="simple-wysiwyg-tooltip">\n<!-- BEGIN tooltipLabel:exist -->\n<div class="\\{classNames.SimpleWysiwygTooltip\\}" style="left:{tooltipLeft}px;top:{tooltipTop}px">\n <table class="\\{classNames.SimpleWysiwygTooltipTable\\}">\n <tr>\n <th>\u30E9\u30D9\u30EB\u540D</th>\n <td><input type="text" data-bind="tooltipLabel"></td>\n </tr>\n <tr>\n <th>URL</th>\n <td><input type="text" data-bind="tooltipUrl"></td>\n </tr>\n <tr>\n <td></td>\n <td><button data-action-click="updateLink()">\u5909\u66F4</button></td>\n </tr>\n </table>\n</div>\n<!-- END tooltipLabel:exist -->\n</div>';
<<<<<<<
selectedOption: '',
btnOptions: [],
useLink: true,
showSource: false,
hideEditor: false,
btnPosition: 'top'
=======
selectedOption: '',
btnOptions: defaultbtnOptions,
btnPosition: 'top',
sampleText: 'sample text'
>>>>>>>
selectedOption: '',
btnOptions: defaultbtnOptions,
btnPosition: 'top',
sampleText: 'sample text'
<<<<<<<
var editor = _this3._getElementByQuery('[data-selector="simple-wysiwyg"]');
var tmp = null;
=======
var editor = _this4._getElementByQuery('[data-selector="simple-wysiwyg"]');
>>>>>>>
var editor = _this4._getElementByQuery('[data-selector="simple-wysiwyg"]');
var tmp = null;
<<<<<<<
_this3.updateTooltip(tmp);
_this3.updateToolBox(tags);
=======
_this4.updateToolBox(tags);
>>>>>>>
_this4.updateTooltip(tmp);
_this4.updateToolBox(tags); |
<<<<<<<
import tooltipHtml from './tooltip.html';
import extend from 'deep-extend';
=======
>>>>>>>
import tooltipHtml from './tooltip.html';
<<<<<<<
selectedOption: '',
btnOptions: [],
useLink: true,
showSource: false,
hideEditor: false,
btnPosition: 'top'
}
=======
selectedOption: '',
btnOptions: defaultbtnOptions,
btnPosition: 'top',
sampleText: 'sample text'
};
>>>>>>>
selectedOption: '',
btnOptions: defaultbtnOptions,
btnPosition: 'top',
sampleText: 'sample text'
};
<<<<<<<
const editor = this._getElementByQuery(`[data-selector="simple-wysiwyg"]`);
let tmp = null;
=======
const editor = this._getElementByQuery('[data-selector="simple-wysiwyg"]');
>>>>>>>
const editor = this._getElementByQuery(`[data-selector="simple-wysiwyg"]`);
let tmp = null;
<<<<<<<
tags.push({tagName:target.tagName.toLowerCase(),className:target.getAttribute('class') || ''});
if (target.tagName.toLowerCase() === 'a') {
tmp = target;
}
=======
tags.push({ tagName: target.tagName.toLowerCase(), className: target.getAttribute('class') || '' });
>>>>>>>
tags.push({tagName:target.tagName.toLowerCase(),className:target.getAttribute('class') || ''});
if (target.tagName.toLowerCase() === 'a') {
tmp = target;
}
<<<<<<<
tagName,
className:parent.getAttribute('class') || ''
=======
tagName: parent.tagName.toLowerCase(),
className: parent.getAttribute('class') || ''
>>>>>>>
tagName,
className:parent.getAttribute('class') || '' |
<<<<<<<
var editorHtml = '<div class="\\{classNames.SimpleWysiwyg\\}" data-action-mouseup="onPutCaret" data-selector="simple-wysiwyg" contenteditable data-action-input="onInput" data-action-keydown="onPutCaret" data-action-paste="onPaste"<!-- BEGIN showSource:exist --> style="display:none;"<!-- END showSource:exist --><!-- BEGIN hideEditor:exist --> style="display:none;"<!-- END hideEditor:exist -->>{value}</div>\n<textarea class="\\{classNames.SimpleWysiwygSource\\}" data-selector="simple-wysiwyg-source" <!-- BEGIN showSource:empty --> style="display:none;"<!-- END showSource:empty -->{attr} data-bind="formatedValue" data-action-input="onDirectInput"></textarea>';
var btnHtml = '<div class="\\{classNames.SimpleWysiwygToolBox\\}" data-selector="simple-wysiwyg-toolbox">\n <!-- BEGIN selectOptions.0:exist -->\n <div class="\\{classNames.SimpleWysiwygSelectWrap\\}">\n <select class="\\{classNames.SimpleWysiwygSelect\\}"<!-- BEGIN selectName:exist --> name="{selectName}"<!-- END selectName:exist --> data-action-change="changeOption" data-bind="selectedOption">\n <!-- BEGIN selectOptions:loop -->\n <option value="{value}" data-tag_extend>{label}</option>\n <!-- END selectOptions:loop -->\n </select>\n </div>\n <!-- END selectOptions.0:exist -->\n\n <div class="\\{classNames.SimpleWysiwygBtnGroupWrap\\}" <!-- BEGIN hideBtns:exist --> style="display:none;"<!-- END hideBtns:exist -->>\n <div class="\\{classNames.SimpleWysiwygBtnGroup\\}"><button class="\\{classNames.SimpleWysiwygBtn\\}<!-- BEGIN showSource:exist --> \\{classNames.SimpleWysiwygBtnActive\\}<!-- END showSource:exist -->" data-action-click="toggleSource" type="button">\\{message.sourceBtn\\}</button><button class="\\{classNames.SimpleWysiwygBtn\\}" data-action-click="redo"<!-- BEGIN canRedo:empty --> disabled<!-- END canRedo:empty --> type="button">\\{message.redoBtn\\}</button><button class="\\{classNames.SimpleWysiwygBtn\\}" data-action-click="undo"<!-- BEGIN canUndo:empty --> disabled<!-- END canUndo:empty --> type="button">\\{message.undoBtn\\}</button></div>\n \n <div class="\\{classNames.SimpleWysiwygBtnGroup\\}" data-selector="btn-group">\n <!-- BEGIN btnOptions:loop --><button class="\\\\{classNames.SimpleWysiwygBtn\\\\}<!-- BEGIN selfClassName:exist --> {selfClassName}<!-- END selfClassName:exist --><!-- BEGIN selected:exist --> \\\\{classNames.SimpleWysiwygBtnActive\\\\}<!-- END selected:exist -->" data-tag="{tag}" data-class="{className}"<!-- BEGIN tag:exist --><!-- BEGIN selected:empty --> data-action-click="insertTag({tag},{className})"<!-- END selected:empty --><!-- BEGIN selected:exist --> data-action-click="unwrapTag({tag},{className})"<!-- END selected:exist --><!-- END tag:exist --><!-- BEGIN tag:empty --> data-action-click="onClick({i})"<!-- END tag:empty --><!-- \\BEGIN showSource:exist --> disabled<!-- \\END showSource:exist --> type="button">{label}</button><!-- END btnOptions:loop -->\n </div>\n </div>\n</div>';
var tooltipHtml = '<div data-selector="simple-wysiwyg-tooltip">\n<!-- BEGIN tooltipLabel:exist -->\n<div class="\\{classNames.SimpleWysiwygTooltip\\}" style="left:{tooltipLeft}px;top:{tooltipTop}px">\n <table class="\\{classNames.SimpleWysiwygTooltipTable\\}">\n <tr>\n <th>\u30E9\u30D9\u30EB\u540D</th>\n <td><input type="text" data-bind="tooltipLabel"></td>\n </tr>\n <tr>\n <th>URL</th>\n <td><input type="text" data-bind="tooltipUrl"></td>\n </tr>\n <tr>\n <td></td>\n <td><button data-action-click="updateLink()">\u5909\u66F4</button></td>\n </tr>\n </table>\n</div>\n<!-- END tooltipLabel:exist -->\n</div>';
=======
var editorHtml = '<div class="\\{classNames.SimpleWysiwyg\\}" data-action-mouseup="onPutCaret" data-action-keydown="onKeyDown" data-selector="simple-wysiwyg" contenteditable data-action-input="onInput" data-action-paste="onPaste" style="<!-- BEGIN showSource:exist -->display:none;<!-- END showSource:exist --><!-- BEGIN hideEditor:exist -->display:none;"<!-- END hideEditor:exist --><!-- BEGIN minHeight:exist -->min-height: {minHeight}px;<!-- END minHeight:exist --><!-- BEGIN maxHeight:exist -->max-height:{maxHeight}px;<!-- END maxHeight:exist -->">{value}</div>\n<textarea class="\\{classNames.SimpleWysiwygSource\\}" data-selector="simple-wysiwyg-source" style="<!-- BEGIN showSource:empty -->display:none;<!-- END showSource:empty --><!-- BEGIN sourceHeight:exist -->height:{sourceHeight}px;<!-- END sourceHeight:exist -->"{attr} data-bind="formatedValue"></textarea>';
var btnHtml = '<div class="\\{classNames.SimpleWysiwygToolBox\\}" data-selector="simple-wysiwyg-toolbox">\n <!-- BEGIN selectOptions.0:exist -->\n <div class="\\{classNames.SimpleWysiwygSelectWrap\\}">\n <select class="\\{classNames.SimpleWysiwygSelect\\}"<!-- BEGIN selectName:exist --> name="{selectName}"<!-- END selectName:exist --> data-action-change="changeOption" data-bind="selectedOption">\n <!-- BEGIN selectOptions:loop -->\n <option value="{value}" data-tag_extend>{label}</option>\n <!-- END selectOptions:loop -->\n </select>\n </div>\n <!-- END selectOptions.0:exist -->\n\n <div class="\\{classNames.SimpleWysiwygBtnGroupWrap\\}" <!-- BEGIN hideBtns:exist --> style="display:none;"<!-- END hideBtns:exist -->> \n <!-- BEGIN groups:loop -->\n <div class="\\\\{classNames.SimpleWysiwygBtnGroup\\\\}">\n <!-- \\BEGIN groups.{i}.items:loop -->\n\n <!-- \\BEGIN action:touch#preview -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}<!-- \\\\BEGIN showSource:exist --> \\\\\\{classNames.SimpleWysiwygBtnActive\\\\\\}<!-- \\\\END showSource:exist -->" data-action-click="toggleSource" type="button">\\{label\\}</button>\n <!-- \\END action:touch#preview -->\n\n <!-- \\BEGIN action:touch#redo -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}" data-action-click="redo"<!-- \\\\BEGIN canRedo:empty --> disabled<!-- \\\\END canRedo:empty --> type="button">\\{label\\}</button>\n <!-- \\END action:touch#redo -->\n\n <!-- \\BEGIN action:touch#undo -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}" data-action-click="undo"<!-- \\\\BEGIN canUndo:empty --> disabled<!-- \\\\END canUndo:empty --> type="button">\\{label\\}</button>\n <!-- \\END action:touch#undo -->\n\n <!-- \\BEGIN action:touch#extra -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}<!-- \\BEGIN selfClassName:exist --> \\{selfClassName\\}<!-- \\END selfClassName:exist -->" data-action-click="onClick(\\{index\\})" type="button">\\{label\\}</button>\n <!-- \\END action:touch#extra -->\n\n <!-- \\BEGIN action:empty -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}<!-- \\BEGIN selfClassName:exist --> \\{selfClassName\\}<!-- \\END selfClassName:exist --><!-- \\BEGIN selected:exist --> \\\\\\{classNames.SimpleWysiwygBtnActive\\\\\\}<!-- \\END selected:exist -->"\n <!-- \\BEGIN tag:exist -->\n <!-- \\BEGIN selected:empty --> data-action-click="insertTag(\\{tag\\},\\{className\\})"<!-- \\END selected:empty -->\n <!-- \\BEGIN selected:exist --> data-action-click="unwrapTag(\\{tag\\},\\{className\\})"<!-- \\END selected:exist -->\n <!-- \\END tag:exist -->\n <!-- \\BEGIN tag:empty --> data-action-click="insertTag(span,\\{className\\})"<!-- \\END tag:empty -->\n <!-- \\\\BEGIN showSource:exist --> disabled<!-- \\\\END showSource:exist --> \n type="button">\\{label\\}</button>\n <!-- \\END action:empty -->\n <!-- \\END groups.{i}.items:loop -->\n </div>\n <!-- END groups:loop -->\n </div>\n</div>';
>>>>>>>
var editorHtml = '<div class="\\{classNames.SimpleWysiwyg\\}" data-action-mouseup="onPutCaret" data-action-keydown="onKeyDown" data-selector="simple-wysiwyg" contenteditable data-action-input="onInput" data-action-paste="onPaste" style="<!-- BEGIN showSource:exist -->display:none;<!-- END showSource:exist --><!-- BEGIN hideEditor:exist -->display:none;"<!-- END hideEditor:exist --><!-- BEGIN minHeight:exist -->min-height: {minHeight}px;<!-- END minHeight:exist --><!-- BEGIN maxHeight:exist -->max-height:{maxHeight}px;<!-- END maxHeight:exist -->">{value}</div>\n<textarea class="\\{classNames.SimpleWysiwygSource\\}" data-selector="simple-wysiwyg-source" style="<!-- BEGIN showSource:empty -->display:none;<!-- END showSource:empty --><!-- BEGIN sourceHeight:exist -->height:{sourceHeight}px;<!-- END sourceHeight:exist -->"{attr} data-bind="formatedValue"></textarea>';
var btnHtml = '<div class="\\{classNames.SimpleWysiwygToolBox\\}" data-selector="simple-wysiwyg-toolbox">\n <!-- BEGIN selectOptions.0:exist -->\n <div class="\\{classNames.SimpleWysiwygSelectWrap\\}">\n <select class="\\{classNames.SimpleWysiwygSelect\\}"<!-- BEGIN selectName:exist --> name="{selectName}"<!-- END selectName:exist --> data-action-change="changeOption" data-bind="selectedOption">\n <!-- BEGIN selectOptions:loop -->\n <option value="{value}" data-tag_extend>{label}</option>\n <!-- END selectOptions:loop -->\n </select>\n </div>\n <!-- END selectOptions.0:exist -->\n\n <div class="\\{classNames.SimpleWysiwygBtnGroupWrap\\}" <!-- BEGIN hideBtns:exist --> style="display:none;"<!-- END hideBtns:exist -->> \n <!-- BEGIN groups:loop -->\n <div class="\\\\{classNames.SimpleWysiwygBtnGroup\\\\}">\n <!-- \\BEGIN groups.{i}.items:loop -->\n\n <!-- \\BEGIN action:touch#preview -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}<!-- \\\\BEGIN showSource:exist --> \\\\\\{classNames.SimpleWysiwygBtnActive\\\\\\}<!-- \\\\END showSource:exist -->" data-action-click="toggleSource" type="button">\\{label\\}</button>\n <!-- \\END action:touch#preview -->\n\n <!-- \\BEGIN action:touch#redo -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}" data-action-click="redo"<!-- \\\\BEGIN canRedo:empty --> disabled<!-- \\\\END canRedo:empty --> type="button">\\{label\\}</button>\n <!-- \\END action:touch#redo -->\n\n <!-- \\BEGIN action:touch#undo -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}" data-action-click="undo"<!-- \\\\BEGIN canUndo:empty --> disabled<!-- \\\\END canUndo:empty --> type="button">\\{label\\}</button>\n <!-- \\END action:touch#undo -->\n\n <!-- \\BEGIN action:touch#extra -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}<!-- \\BEGIN selfClassName:exist --> \\{selfClassName\\}<!-- \\END selfClassName:exist -->" data-action-click="onClick(\\{index\\})" type="button">\\{label\\}</button>\n <!-- \\END action:touch#extra -->\n\n <!-- \\BEGIN action:empty -->\n <button class="\\\\\\{classNames.SimpleWysiwygBtn\\\\\\}<!-- \\BEGIN selfClassName:exist --> \\{selfClassName\\}<!-- \\END selfClassName:exist --><!-- \\BEGIN selected:exist --> \\\\\\{classNames.SimpleWysiwygBtnActive\\\\\\}<!-- \\END selected:exist -->"\n <!-- \\BEGIN tag:exist -->\n <!-- \\BEGIN selected:empty --> data-action-click="insertTag(\\{tag\\},\\{className\\})"<!-- \\END selected:empty -->\n <!-- \\BEGIN selected:exist --> data-action-click="unwrapTag(\\{tag\\},\\{className\\})"<!-- \\END selected:exist -->\n <!-- \\END tag:exist -->\n <!-- \\BEGIN tag:empty --> data-action-click="insertTag(span,\\{className\\})"<!-- \\END tag:empty -->\n <!-- \\\\BEGIN showSource:exist --> disabled<!-- \\\\END showSource:exist --> \n type="button">\\{label\\}</button>\n <!-- \\END action:empty -->\n <!-- \\END groups.{i}.items:loop -->\n </div>\n <!-- END groups:loop -->\n </div>\n</div>';
var tooltipHtml = '<div data-selector="simple-wysiwyg-tooltip">\n<!-- BEGIN tooltipLabel:exist -->\n<div class="\\{classNames.SimpleWysiwygTooltip\\}" style="left:{tooltipLeft}px;top:{tooltipTop}px">\n <table class="\\{classNames.SimpleWysiwygTooltipTable\\}">\n <tr>\n <th>\u30E9\u30D9\u30EB\u540D</th>\n <td><input type="text" data-bind="tooltipLabel"></td>\n </tr>\n <tr>\n <th>URL</th>\n <td><input type="text" data-bind="tooltipUrl"></td>\n </tr>\n <tr>\n <td></td>\n <td><button data-action-click="updateLink()">\u5909\u66F4</button></td>\n </tr>\n </table>\n</div>\n<!-- END tooltipLabel:exist -->\n</div>';
<<<<<<<
selectedOption: '',
btnOptions: [],
useLink: true,
showSource: false,
hideEditor: false,
btnPosition: 'top'
=======
selectedOption: '',
btnOptions: defaultbtnOptions,
btnPosition: 'top',
sampleText: 'sample text'
>>>>>>>
selectedOption: '',
btnOptions: defaultbtnOptions,
btnPosition: 'top',
sampleText: 'sample text'
<<<<<<<
var editor = _this3._getElementByQuery('[data-selector="simple-wysiwyg"]');
var tmp = null;
=======
var editor = _this4._getElementByQuery('[data-selector="simple-wysiwyg"]');
>>>>>>>
var editor = _this4._getElementByQuery('[data-selector="simple-wysiwyg"]');
var tmp = null;
<<<<<<<
_this3.updateTooltip(tmp);
_this3.updateToolBox(tags);
=======
_this4.updateToolBox(tags);
>>>>>>>
_this4.updateTooltip(tmp);
_this4.updateToolBox(tags); |
<<<<<<<
//////////////////////////////
// Zero Unit
//////////////////////////////
it('zero unit', function (done) {
lintFile('zero-unit.scss', {
'rules': {
'zero-unit': 1
}
}, function (data) {
assert.equal(4, data.warningCount);
done();
});
});
=======
//////////////////////////////
// Clean Import Paths
//////////////////////////////
it('clean import paths', function (done) {
lintFile('clean-import-paths.scss', function (data) {
assert.equal(8, data.warningCount);
done();
});
});
>>>>>>>
//////////////////////////////
// Zero Unit
//////////////////////////////
it('zero unit', function (done) {
lintFile('zero-unit.scss', {
'rules': {
'zero-unit': 1
}
}, function (data) {
assert.equal(4, data.warningCount);
done();
});
});
//////////////////////////////
// Clean Import Paths
//////////////////////////////
it('clean import paths', function (done) {
lintFile('clean-import-paths.scss', function (data) {
assert.equal(8, data.warningCount);
done();
});
}); |
<<<<<<<
<button className={styles.loginBtn} onClick={this.login}>
=======
<button
className={styles.loginBtn}
onClick={this.openLoginModal}
>
<People />
>>>>>>>
<button
className={styles.loginBtn}
onClick={this.openLoginModal}
> |
<<<<<<<
import { IMG_HOST, SITE_NAME } from '../../constants/helmetData';
import { queryCampaignInfoList } from '../../actions/campaignInfo';
const campaignListFromEntries = campaignEntries =>
campaignEntries
.valueSeq()
.map(info => ({
name: info.get('name'),
title: info.get('title'),
}))
.toJS();
=======
import { imgHost, SITE_NAME } from '../../constants/helmetData';
>>>>>>>
import { IMG_HOST, SITE_NAME } from '../../constants/helmetData'; |
<<<<<<<
API_HOST: process.env.RAZZLE_API_HOST || 'https://api.goodjob.life',
CONTENTFUL_API_HOST: process.env.RAZZLE_CONTENTFUL_API_HOST || 'https://content.goodjob.life',
FACEBOOK_APP_ID: process.env.RAZZLE_FACEBOOK_APP_ID || '1750216878594984',
GA_ID: process.env.RAZZLE_GA_ID || 'UA-79990667-1',
PIXEL_ID: process.env.RAZZLE_PIXEL_ID || '603414113402034',
=======
API_HOST: process.env.API_HOST || 'https://api-dev.goodjob.life',
CONTENTFUL_API_HOST: process.env.CONTENTFUL_API_HOST || 'https://content-dev.goodjob.life',
FACEBOOK_APP_ID: process.env.FACEBOOK_APP_ID || '1750608541889151',
GA_ID: process.env.GA_ID || 'UA-79990667-2',
PIXEL_ID: process.env.PIXEL_ID || '603414113402034',
>>>>>>>
API_HOST: process.env.RAZZLE_API_HOST || 'https://api-dev.goodjob.life',
CONTENTFUL_API_HOST: process.env.RAZZLE_CONTENTFUL_API_HOST || 'https://content-dev.goodjob.life',
FACEBOOK_APP_ID: process.env.RAZZLE_FACEBOOK_APP_ID || '1750608541889151',
GA_ID: process.env.RAZZLE_GA_ID || 'UA-79990667-2',
PIXEL_ID: process.env.RAZZLE_PIXEL_ID || '603414113402034', |
<<<<<<<
{
id: uuidv4(),
name: "Ashutosh Dwivedi",
img: "https://avatars0.githubusercontent.com/u/42907572?s=460&u=3c5c03fdddeec2483819b845bd549616d48b71e5&v=4",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/ashutosh-dwivedi-b3025b196/",
github: "https://github.com/Ashutosh00710"
},
jobTitle: "Full Stack Developer",
location: {
city: "Lucknow",
state: "Uttar Pradesh",
country: "India"
}
}
=======
{
id: uuidv4(),
name: "Micah Effiong",
img:
"https://media-exp1.licdn.com/dms/image/C4E03AQHiXqHMZKJO2w/profile-displayphoto-shrink_200_200/0?e=1599091200&v=beta&t=AP3H6fvEkCKlCV1fNyBFWU3Wws_iR4Et9g3_ijo7-Sk",
links: {
website: "",
linkedin: "https://ng.linkedin.com/in/micaiah-effiong",
github: "https://github.com/micaiah-effiong",
},
jobTitle: "Web-Developer | NodeJs",
location: {
city: "Uyo",
state: "Akwa Ibom",
country: "Nigeria",
},
},
{
id: uuidv4(),
name: "M Ebraheem Ijaz",
img:
"https://portfolioebraheem.herokuapp.com/assets/img/testimonial-2.jpg",
links: {
website: "https://portfolioebraheem.herokuapp.com/portfolio",
linkedin: "https://www.linkedin.com/in/ebraheem-ijaz-0a685a122/",
github: "https://github.com/ebraheemijaz/",
},
jobTitle: "MERN Stack Developer",
location: {
city: "ISLAMABAD",
state: "Pakistan",
country: "Pakistan",
},
},
{
id: uuidv4(),
name: "Jon Hualde",
img: "https://i.ibb.co/gzjZ6rF/Jon-3.png",
links: {
website: "https://jonhualde.github.io/",
linkedin: "https://www.linkedin.com/in/jonhualde/?locale=en_US",
github: "https://github.com/JonHualde",
},
jobTitle: "Front end developer",
location: {
city: "London",
state: "England",
country: "United Kingdom",
},
},
>>>>>>>
{
id: uuidv4(),
name: "Ashutosh Dwivedi",
img: "https://avatars0.githubusercontent.com/u/42907572?s=460&u=3c5c03fdddeec2483819b845bd549616d48b71e5&v=4",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/ashutosh-dwivedi-b3025b196/",
github: "https://github.com/Ashutosh00710"
},
jobTitle: "Full Stack Developer",
location: {
city: "Lucknow",
state: "Uttar Pradesh",
country: "India"
}
},
{
id: uuidv4(),
name: "Micah Effiong",
img:
"https://media-exp1.licdn.com/dms/image/C4E03AQHiXqHMZKJO2w/profile-displayphoto-shrink_200_200/0?e=1599091200&v=beta&t=AP3H6fvEkCKlCV1fNyBFWU3Wws_iR4Et9g3_ijo7-Sk",
links: {
website: "",
linkedin: "https://ng.linkedin.com/in/micaiah-effiong",
github: "https://github.com/micaiah-effiong",
},
jobTitle: "Web-Developer | NodeJs",
location: {
city: "Uyo",
state: "Akwa Ibom",
country: "Nigeria",
},
},
{
id: uuidv4(),
name: "M Ebraheem Ijaz",
img:
"https://portfolioebraheem.herokuapp.com/assets/img/testimonial-2.jpg",
links: {
website: "https://portfolioebraheem.herokuapp.com/portfolio",
linkedin: "https://www.linkedin.com/in/ebraheem-ijaz-0a685a122/",
github: "https://github.com/ebraheemijaz/",
},
jobTitle: "MERN Stack Developer",
location: {
city: "ISLAMABAD",
state: "Pakistan",
country: "Pakistan",
},
},
{
id: uuidv4(),
name: "Jon Hualde",
img: "https://i.ibb.co/gzjZ6rF/Jon-3.png",
links: {
website: "https://jonhualde.github.io/",
linkedin: "https://www.linkedin.com/in/jonhualde/?locale=en_US",
github: "https://github.com/JonHualde",
},
jobTitle: "Front end developer",
location: {
city: "London",
state: "England",
country: "United Kingdom",
},
}, |
<<<<<<<
{
id: uuidv4(),
name: "Danish Shaikh",
img: "https://avatars3.githubusercontent.com/u/22702540?v=4",
links: {
website: "https://danishsshaikh.github.io/",
linkedin: "https://www.linkedin.com/in/danishsshaikh/",
github: "https://github.com/danishsshaikh",
},
jobTitle: "Unity Developer, App Developer",
location: {
city: "Mumbai",
state: "Maharashtra",
country: "India",
},
},
=======
{
id: uuidv4(),
name: "Abhishek Singh",
img: "https://avatars2.githubusercontent.com/u/28640901?v=4",
links: {
website: "https://singhabhishek16.github.io/",
linkedin: "https://www.linkedin.com/in/abhisheklinkings/",
github: "https://github.com/singhAbhishek16"
},
jobTitle: "aspiring Data Scientist",
location: {
city: "",
state: "",
country: "India"
},
},
>>>>>>>
{
id: uuidv4(),
name: "Danish Shaikh",
img: "https://avatars3.githubusercontent.com/u/22702540?v=4",
links: {
website: "https://danishsshaikh.github.io/",
linkedin: "https://www.linkedin.com/in/danishsshaikh/",
github: "https://github.com/danishsshaikh",
},
jobTitle: "Unity Developer, App Developer",
location: {
city: "Mumbai",
state: "Maharashtra",
country: "India",
},
},
{
id: uuidv4(),
name: "Abhishek Singh",
img: "https://avatars2.githubusercontent.com/u/28640901?v=4",
links: {
website: "https://singhabhishek16.github.io/",
linkedin: "https://www.linkedin.com/in/abhisheklinkings/",
github: "https://github.com/singhAbhishek16"
},
jobTitle: "aspiring Data Scientist",
location: {
city: "",
state: "",
country: "India"
},
}, |
<<<<<<<
},
{
id: uuidv4(),
name: "Tomas Ramirez",
img: "https://avatars1.githubusercontent.com/u/38819979?s=460&u=d910d85c5e360dbe46eacfdc5286194db20d8cf7&v=4",
links: {
website: "https://www.ramireztomas.com/",
linkedin: "www.linkedin.com/in/tomas-ramirez-156820149",
github: "https://github.com/tramirez30"
},
jobTitle: "UX Designer/Front End Dev",
location: {
city: "Los Angeles (REMOTE)",
state: "CA",
country: "US"
}
}
=======
},
{
id: uuidv4(),
name: "Ekin Karadag",
img: "https://pbs.twimg.com/profile_images/1279109891492384768/yVCv9_-0_400x400.png",
links: {
website: "https://ekinkaradag.com",
linkedin: "https://www.linkedin.com/in/ekinkaradag/",
github: "https://github.com/ekinkaradag"
},
jobTitle: "Software Developer",
location: {
city: "Istanbul",
state: "",
country: "Turkey"
}
},
{
id: uuidv4(),
name: "Vipul Jain",
img: "https://avatars3.githubusercontent.com/u/27679225?v=4",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/vipul-jain-38ba98160/",
github: "https://github.com/vipuljain08"
},
jobTitle: "Full Stack Developer",
location: {
city: "New Delhi",
state: "Delhi",
country: "India"
}
},
>>>>>>>
},
{
id: uuidv4(),
name: "Ekin Karadag",
img: "https://pbs.twimg.com/profile_images/1279109891492384768/yVCv9_-0_400x400.png",
links: {
website: "https://ekinkaradag.com",
linkedin: "https://www.linkedin.com/in/ekinkaradag/",
github: "https://github.com/ekinkaradag"
},
jobTitle: "Software Developer",
location: {
city: "Istanbul",
state: "",
country: "Turkey"
}
},
{
id: uuidv4(),
name: "Vipul Jain",
img: "https://avatars3.githubusercontent.com/u/27679225?v=4",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/vipul-jain-38ba98160/",
github: "https://github.com/vipuljain08"
},
jobTitle: "Full Stack Developer",
location: {
city: "New Delhi",
state: "Delhi",
country: "India"
}
},
{
id: uuidv4(),
name: "Tomas Ramirez",
img: "https://avatars1.githubusercontent.com/u/38819979?s=460&u=d910d85c5e360dbe46eacfdc5286194db20d8cf7&v=4",
links: {
website: "https://www.ramireztomas.com/",
linkedin: "www.linkedin.com/in/tomas-ramirez-156820149",
github: "https://github.com/tramirez30"
},
jobTitle: "UX Designer/Front End Dev",
location: {
city: "Los Angeles (REMOTE)",
state: "CA",
country: "US"
}
}, |
<<<<<<<
},
{
id: uuidv4(),
name: "Abhishek Rathore",
img: "https://avatars3.githubusercontent.com/u/40576705?v=4",
links: {
website: "",
linkedin: "www.linkedin.com/in/abhishek-rathore-666972127",
github: "https://github.com/abhishekra07",
},
jobTitle: "Assistance System Engineer",
location: {
city: "Indore",
state: "Madhya Pradesh",
country: "India",
},
=======
},
{
id: uuidv4(),
name: "Abhishek Rathore",
img: "https://avatars3.githubusercontent.com/u/40576705?v=4",
links: {
website: "",
linkedin: "www.linkedin.com/in/abhishek-rathore-666972127",
github: "https://github.com/abhishekra07",
},
jobTitle: "Assistance System Engineer",
location: {
city: "Indore",
state: "Madhya Pradesh",
country: "India",
},
>>>>>>>
},
{
id: uuidv4(),
name: "Abhishek Rathore",
img: "https://avatars3.githubusercontent.com/u/40576705?v=4",
links: {
website: "",
linkedin: "www.linkedin.com/in/abhishek-rathore-666972127",
github: "https://github.com/abhishekra07",
},
jobTitle: "Assistance System Engineer",
location: {
city: "Indore",
state: "Madhya Pradesh",
country: "India",
},
<<<<<<<
{
id: uuidv4(),
name: "Hamza Abdalmajeed",
img:
"https://media-exp1.licdn.com/dms/image/C4E35AQH5xBoMp7xCkg/profile-framedphoto-shrink_200_200/0?e=1601676000&v=beta&t=J5p5HX22O8PZ4mEGLHg3cfKR0nfZC-5lbva-Zmu8I1U",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/hamzazz/",
github: "https://github.com/hamzazdev/",
},
jobTitle: "Full Stack JavaScript Developer",
location: {
city: "Manchester",
state: "",
country: "United Kingdom",
},
},
=======
{
id: uuidv4(),
name: "Abhishek Singh",
img: "https://avatars2.githubusercontent.com/u/28640901?v=4",
links: {
website: "https://singhabhishek16.github.io/",
linkedin: "https://www.linkedin.com/in/abhisheklinkings/",
github: "https://github.com/singhAbhishek16",
},
jobTitle: "aspiring Data Scientist",
location: {
city: "",
state: "",
country: "India",
},
},
{
id: uuidv4(),
name: "Samip Poudel",
img: "https://avatars1.githubusercontent.com/u/59493809?v=4",
links: {
website: "https://samip.ml/",
linkedin: "https://www.linkedin.com/in/samip-poudel-570a371a6/",
github: "https://github.com/SamipPoudel58",
},
jobTitle: "Full-Stack Developer",
location: {
city: "Kathmandu",
state: "",
country: "Nepal",
},
},
{
id: uuidv4(),
name: "Aditya Singh",
img: "https://avatars3.githubusercontent.com/u/68491442?v=4",
links: {
website: "https://adityasingh0925.github.io/",
linkedin: "https://www.linkedin.com/in/aditya2509/",
github: "https://github.com/adityasingh2509"
},
jobTitle: "Student",
location: {
city: "Mumbai",
state: "",
country: "India"
}
}
>>>>>>>
{
id: uuidv4(),
name: "Hamza Abdalmajeed",
img:
"https://media-exp1.licdn.com/dms/image/C4E35AQH5xBoMp7xCkg/profile-framedphoto-shrink_200_200/0?e=1601676000&v=beta&t=J5p5HX22O8PZ4mEGLHg3cfKR0nfZC-5lbva-Zmu8I1U",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/hamzazz/",
github: "https://github.com/hamzazdev/",
},
jobTitle: "Full Stack JavaScript Developer",
location: {
city: "Manchester",
state: "",
country: "United Kingdom",
},
},
{
id: uuidv4(),
name: "Abhishek Singh",
img: "https://avatars2.githubusercontent.com/u/28640901?v=4",
links: {
website: "https://singhabhishek16.github.io/",
linkedin: "https://www.linkedin.com/in/abhisheklinkings/",
github: "https://github.com/singhAbhishek16",
},
jobTitle: "aspiring Data Scientist",
location: {
city: "",
state: "",
country: "India",
},
},
{
id: uuidv4(),
name: "Samip Poudel",
img: "https://avatars1.githubusercontent.com/u/59493809?v=4",
links: {
website: "https://samip.ml/",
linkedin: "https://www.linkedin.com/in/samip-poudel-570a371a6/",
github: "https://github.com/SamipPoudel58",
},
jobTitle: "Full-Stack Developer",
location: {
city: "Kathmandu",
state: "",
country: "Nepal",
},
},
{
id: uuidv4(),
name: "Aditya Singh",
img: "https://avatars3.githubusercontent.com/u/68491442?v=4",
links: {
website: "https://adityasingh0925.github.io/",
linkedin: "https://www.linkedin.com/in/aditya2509/",
github: "https://github.com/adityasingh2509"
},
jobTitle: "Student",
location: {
city: "Mumbai",
state: "",
country: "India"
}
} |
<<<<<<<
{
id: uuidv4(),
name: "Meer Estiyak",
img: "https://avatars3.githubusercontent.com/u/50128043?v=4",
links: {
website: "https://mmestiyak.github.io",
linkedin: "https://www.linkedin.com/in/mmestiyak",
github: "https://github.com/mmestiyak"
},
jobTitle: "Self-Taught Front End Engineer",
location: {
city: "Bogura",
state: "Rajshahi",
country: "Bangladesh"
}
},
=======
{
id: uuidv4(),
name: "ARUN KUMAR G",
img:
"https://avatars1.githubusercontent.com/u/58899747?v=4",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/arun-kumar-g-993400115/",
github: "https://github.com/GudlaArunKumar",
},
jobTitle: "Python Developer/ Junior Machine Learning Engineer",
location: {
city: "Chennai",
state: "Tamil Nadu",
country: "India",
},
},
>>>>>>>
{
id: uuidv4(),
name: "Meer Estiyak",
img: "https://avatars3.githubusercontent.com/u/50128043?v=4",
links: {
website: "https://mmestiyak.github.io",
linkedin: "https://www.linkedin.com/in/mmestiyak",
github: "https://github.com/mmestiyak"
},
jobTitle: "Self-Taught Front End Engineer",
location: {
city: "Bogura",
state: "Rajshahi",
country: "Bangladesh"
}
},
{
id: uuidv4(),
name: "ARUN KUMAR G",
img:
"https://avatars1.githubusercontent.com/u/58899747?v=4",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/arun-kumar-g-993400115/",
github: "https://github.com/GudlaArunKumar",
},
jobTitle: "Python Developer/ Junior Machine Learning Engineer",
location: {
city: "Chennai",
state: "Tamil Nadu",
country: "India",
},
}, |
<<<<<<<
return encodeURI(config.url + '/api/1.0/' + path);
=======
return config.url + encodeURI('/api/1.0/' + path);
>>>>>>>
return encodeURI(config.url + '/api/1.0/' + path);
<<<<<<<
return encodeURI(config.url + '/api/' + path);
=======
return config.url + encodeURI('/api/' + path);
>>>>>>>
return encodeURI(config.url + '/api/' + path);
<<<<<<<
ApiREST.prototype.login = function (strategy, credentials) {
var options = {
url: this.apiPath('_login'),
method: 'POST',
json: {
strategy: strategy,
username: credentials.username,
password: credentials.password
}
};
return this.callApi(options);
};
ApiREST.prototype.logout = function (jwtToken) {
var options = {
url: this.apiPath('_logout'),
method: 'GET',
json: {},
headers: {
authorization: 'Bearer ' + jwtToken
}
};
return this.callApi(options);
};
=======
ApiREST.prototype.putRole = function (id, body) {
var options = {
url: this.apiPath('roles/' + id),
method: 'PUT',
json: body
};
return this.callApi(options);
};
ApiREST.prototype.getRole = function (id) {
var options = {
url: this.apiPath('roles/' + id),
method: 'GET',
json: true
};
return this.callApi(options);
};
ApiREST.prototype.searchRoles = function (body) {
var options = {
url: this.apiPath('roles/_search'),
method: 'POST',
json: body
};
return this.callApi(options);
};
ApiREST.prototype.deleteRole = function (id) {
var options = {
url: this.apiPath('roles/' + id),
method: 'DELETE',
json: true
};
return this.callApi(options);
};
>>>>>>>
ApiREST.prototype.login = function (strategy, credentials) {
var options = {
url: this.apiPath('_login'),
method: 'POST',
json: {
strategy: strategy,
username: credentials.username,
password: credentials.password
}
};
return this.callApi(options);
};
ApiREST.prototype.logout = function (jwtToken) {
var options = {
url: this.apiPath('_logout'),
method: 'GET',
json: {},
headers: {
authorization: 'Bearer ' + jwtToken
}
};
return this.callApi(options);
};
ApiREST.prototype.putRole = function (id, body) {
var options = {
url: this.apiPath('roles/' + id),
method: 'PUT',
json: body
};
return this.callApi(options);
};
ApiREST.prototype.getRole = function (id) {
var options = {
url: this.apiPath('roles/' + id),
method: 'GET',
json: true
};
return this.callApi(options);
};
ApiREST.prototype.searchRoles = function (body) {
var options = {
url: this.apiPath('roles/_search'),
method: 'POST',
json: body
};
return this.callApi(options);
};
ApiREST.prototype.deleteRole = function (id) {
var options = {
url: this.apiPath('roles/' + id),
method: 'DELETE',
json: true
};
return this.callApi(options);
}; |
<<<<<<<
{
id: uuidv4(),
name: "Edwin Boon",
img: "https://www.github.com/edwinboon.png",
links: {
website: "https://www.edwinboon.dev/",
linkedin: "",
github: "https://github.com/edwinboon",
},
jobTitle: "Frontend Developer",
location: {
city: "Ermelo",
state: "Ermelo",
country: "Netherlands",
},
},
=======
{
id: uuidv4(),
name: "Ritu Bala",
img: "https://avatars3.githubusercontent.com/u/16570797?v=4",
links: {
website: "https://ritubala.com/",
linkedin: "https://www.linkedin.com/in/balaritu/",
github: "https://github.com/Ritu734/",
},
jobTitle: "Senior Software Engineer - iOS",
location: {
city: "New Delhi",
state: "Delhi",
country: "India",
},
},
{
id: uuidv4(),
name: "Aditya Tarale",
img:
"https://avatars0.githubusercontent.com/u/67708581?s=400&u=a76517830e4d15c59bc0b1f2a8ce9be41858a011&v=4",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/aditya-tarale-8234261b2/",
github: "https://github.com/AdityaTarale",
},
jobTitle: "Front-end developer",
location: {
city: "Nagpur",
state: "Maharashtra",
country: "India",
},
},{
id: uuidv4(),
name: "Abhishek Rathore",
img: "https://avatars3.githubusercontent.com/u/40576705?v=4",
links: {
website: "",
linkedin: "www.linkedin.com/in/abhishek-rathore-666972127",
github: "https://github.com/abhishekra07"
},
jobTitle: "Assistance System Engineer",
location: {
city: "Indore",
state: "Madhya Pradesh",
country: "India"
}
},
{
id: uuidv4(),
name: "Manoj Jasoliya",
img:
"https://avatars0.githubusercontent.com/u/48120921?s=460&u=59aee8c853b4db000da402dde710648b90123eac&v=4",
links: {
website: "https://manojjasoliya.tech/",
linkedin: "https://www.linkedin.com/in/manoj-jasoliya/",
github: "https://github.com/Manojj999",
},
jobTitle: "Front-End Developer",
location: {
city: "Surat",
state: "Gujarat",
country: "India",
},
},
{
id: uuidv4(),
name: "Jamiu Jimoh",
img: "https://avatars0.githubusercontent.com/u/60991680?v=4",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/jamiu-jimoh/",
github: "https://github.com/JamiuJimoh",
},
jobTitle: "Full Stack/MERN Developer",
location: {
city: "Lagos",
state: "Lagos",
country: "Nigeria",
},
},
>>>>>>>
{
id: uuidv4(),
name: "Edwin Boon",
img: "https://www.github.com/edwinboon.png",
links: {
website: "https://www.edwinboon.dev/",
linkedin: "",
github: "https://github.com/edwinboon",
},
jobTitle: "Frontend Developer",
location: {
city: "Ermelo",
state: "Ermelo",
country: "Netherlands",
}
},
{
id: uuidv4(),
name: "Ritu Bala",
img: "https://avatars3.githubusercontent.com/u/16570797?v=4",
links: {
website: "https://ritubala.com/",
linkedin: "https://www.linkedin.com/in/balaritu/",
github: "https://github.com/Ritu734/",
},
jobTitle: "Senior Software Engineer - iOS",
location: {
city: "New Delhi",
state: "Delhi",
country: "India",
},
},
{
id: uuidv4(),
name: "Aditya Tarale",
img:
"https://avatars0.githubusercontent.com/u/67708581?s=400&u=a76517830e4d15c59bc0b1f2a8ce9be41858a011&v=4",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/aditya-tarale-8234261b2/",
github: "https://github.com/AdityaTarale",
},
jobTitle: "Front-end developer",
location: {
city: "Nagpur",
state: "Maharashtra",
country: "India",
},
},{
id: uuidv4(),
name: "Abhishek Rathore",
img: "https://avatars3.githubusercontent.com/u/40576705?v=4",
links: {
website: "",
linkedin: "www.linkedin.com/in/abhishek-rathore-666972127",
github: "https://github.com/abhishekra07"
},
jobTitle: "Assistance System Engineer",
location: {
city: "Indore",
state: "Madhya Pradesh",
country: "India"
}
},
{
id: uuidv4(),
name: "Manoj Jasoliya",
img:
"https://avatars0.githubusercontent.com/u/48120921?s=460&u=59aee8c853b4db000da402dde710648b90123eac&v=4",
links: {
website: "https://manojjasoliya.tech/",
linkedin: "https://www.linkedin.com/in/manoj-jasoliya/",
github: "https://github.com/Manojj999",
},
jobTitle: "Front-End Developer",
location: {
city: "Surat",
state: "Gujarat",
country: "India",
},
},
{
id: uuidv4(),
name: "Jamiu Jimoh",
img: "https://avatars0.githubusercontent.com/u/60991680?v=4",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/jamiu-jimoh/",
github: "https://github.com/JamiuJimoh",
},
jobTitle: "Full Stack/MERN Developer",
location: {
city: "Lagos",
state: "Lagos",
country: "Nigeria",
},
}, |
<<<<<<<
{
id: uuidv4(),
name: "Charles Loges IV",
img: "https://avatars2.githubusercontent.com/u/4064474?v=4",
links: {
website: "https://www.charlesloges.com/",
linkedin: "https://www.linkedin.com/in/charles-loges-iv-9a534956/",
github: "https://github.com/cloges4",
},
jobTitle: "Full Stack Web Developer",
location: {
city: "Erwin",
state: "North Carolina",
country: "United States",
},
},
=======
{
id: uuidv4(),
name: "Mallory Jane Bruey",
img: "https://github.com/malloryjanecs.png",
links: {
website: "https://malloryjanecs.github.io/",
linkedin: "https://www.linkedin.com/in/mallory-bruey/",
github: "https://github.com/malloryjanecs"
},
jobTitle: "SQL/Java/Python | Computer Science Student",
location: {
city: "",
state: "OH/PA",
country: "USA"
}
}
,
{
id: uuidv4(),
name: "Patricia Felix",
img: "https://avatars1.githubusercontent.com/u/49537577?v=4",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/patriciafelixx/",
github: "https://github.com/patriciafelixx",
},
jobTitle: "Full Stack Web Developer",
location: {
city: "",
state: "São Paulo",
country: "Brazil",
},
},
{
id: uuidv4(),
name: "Guilherme Hebling",
img: "https://avatars3.githubusercontent.com/u/62028115?v=4",
links: {
website: "https://gdhebling.com/",
linkedin: "https://www.linkedin.com/in/gdhebling/",
github: "https://github.com/gdhebling/",
},
jobTitle: "Front-End Developer",
location: {
city: "Oslo",
state: "Oslo",
country: "Norway",
},
},
>>>>>>>
,
{
id: uuidv4(),
name: "Charles Loges IV",
img: "https://avatars2.githubusercontent.com/u/4064474?v=4",
links: {
website: "https://www.charlesloges.com/",
linkedin: "https://www.linkedin.com/in/charles-loges-iv-9a534956/",
github: "https://github.com/cloges4",
},
jobTitle: "Full Stack Web Developer",
location: {
city: "Erwin",
state: "North Carolina",
country: "United States",
},
},
{
id: uuidv4(),
name: "Mallory Jane Bruey",
img: "https://github.com/malloryjanecs.png",
links: {
website: "https://malloryjanecs.github.io/",
linkedin: "https://www.linkedin.com/in/mallory-bruey/",
github: "https://github.com/malloryjanecs"
},
jobTitle: "SQL/Java/Python | Computer Science Student",
location: {
city: "",
state: "OH/PA",
country: "USA"
}
}
,
{
id: uuidv4(),
name: "Patricia Felix",
img: "https://avatars1.githubusercontent.com/u/49537577?v=4",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/patriciafelixx/",
github: "https://github.com/patriciafelixx",
},
jobTitle: "Full Stack Web Developer",
location: {
city: "",
state: "São Paulo",
country: "Brazil",
},
},
{
id: uuidv4(),
name: "Guilherme Hebling",
img: "https://avatars3.githubusercontent.com/u/62028115?v=4",
links: {
website: "https://gdhebling.com/",
linkedin: "https://www.linkedin.com/in/gdhebling/",
github: "https://github.com/gdhebling/",
},
jobTitle: "Front-End Developer",
location: {
city: "Oslo",
state: "Oslo",
country: "Norway",
},
}, |
<<<<<<<
country: "India",
},
},
=======
country: "India"
}
},
{
id: uuidv4(),
name: "Maaz Ahmad Khan",
img: "https://avatars1.githubusercontent.com/u/26876218?s=400&u=04502e2e0d4a1838c7b55f2aa7ac460c5a4ffd54&v=4",
links: {
website: "https://github.com/MAK947/maaz-khan-portfolio",
linkedin: "https://www.linkedin.com/in/maaz-khan-663226147/",
github: "https://github.com/MAK947"
},
jobTitle: "Full-Stack JavaScript",
location: {
city: "New Delhi",
state: "Delhi",
country: "India"
}
}
>>>>>>>
country: "India",
},
},
{
id: uuidv4(),
name: "Maaz Ahmad Khan",
img: "https://avatars1.githubusercontent.com/u/26876218?s=400&u=04502e2e0d4a1838c7b55f2aa7ac460c5a4ffd54&v=4",
links: {
website: "https://github.com/MAK947/maaz-khan-portfolio",
linkedin: "https://www.linkedin.com/in/maaz-khan-663226147/",
github: "https://github.com/MAK947"
},
jobTitle: "Full-Stack JavaScript",
location: {
city: "New Delhi",
state: "Delhi",
country: "India"
}
} |
<<<<<<<
return kuzzle.hotelClerk.removeSubscription(requestObject1, context)
=======
return kuzzle.hotelClerk.removeSubscription(unsubscribeRequest, connection)
>>>>>>>
return kuzzle.hotelClerk.removeSubscription(unsubscribeRequest, context)
<<<<<<<
return kuzzle.hotelClerk.removeSubscription(requestObject1, context)
=======
return kuzzle.hotelClerk.removeSubscription(unsubscribeRequest, connection)
>>>>>>>
return kuzzle.hotelClerk.removeSubscription(unsubscribeRequest, context)
<<<<<<<
return kuzzle.hotelClerk.removeSubscription(requestObject1, context);
=======
return kuzzle.hotelClerk.removeSubscription(unsubscribeRequest, connection);
>>>>>>>
return kuzzle.hotelClerk.removeSubscription(unsubscribeRequest, context);
<<<<<<<
return kuzzle.hotelClerk.removeSubscription(requestObject1, context)
=======
return kuzzle.hotelClerk.removeSubscription(unsubscribeRequest, connection)
>>>>>>>
return kuzzle.hotelClerk.removeSubscription(unsubscribeRequest, context) |
<<<<<<<
}
]
}
,{
id: uuidv4(),
name: "Patrick Oguamanam",
img: "",
links: {
website: "",
linkedin: "https://www.linkedin.com/patrickoguamanam",
github: "https://github.com/thedev-patrick"
},
jobTitle: "Web Developer",
location: {
city: "Lagos",
state: "",
country: "Nigeria"
}
}
=======
},
{
id: uuidv4(),
name: "Vipul Chaurasia",
img: "",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/vipul-chaurasia-5a950a161/",
github: "https://github.com/vipul1298",
},
jobTitle: "Software Developer",
location: {
city: "Varanasi",
state: "U.P.",
country: "India",
},
},
{
id: uuidv4(),
name: "Siddardha Teegela",
img: "https://github.com/sidhumeher.png",
links: {
website: "",
linkedin:
"https://www.linkedin.com/in/siddardha-meher-teegela-04110a112/",
github: "https://github.com/sidhumeher",
},
jobTitle: "Software Developer in Test",
location: {
city: "San Jose",
state: "California",
country: "US",
},
},
],
}
>>>>>>>
},
{
id: uuidv4(),
name: "Vipul Chaurasia",
img: "",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/vipul-chaurasia-5a950a161/",
github: "https://github.com/vipul1298",
},
jobTitle: "Software Developer",
location: {
city: "Varanasi",
state: "U.P.",
country: "India",
},
},
{
id: uuidv4(),
name: "Siddardha Teegela",
img: "https://github.com/sidhumeher.png",
links: {
website: "",
linkedin:
"https://www.linkedin.com/in/siddardha-meher-teegela-04110a112/",
github: "https://github.com/sidhumeher",
},
jobTitle: "Software Developer in Test",
location: {
city: "San Jose",
state: "California",
country: "US",
},
},
],
}
,{
id: uuidv4(),
name: "Patrick Oguamanam",
img: "",
links: {
website: "",
linkedin: "https://www.linkedin.com/patrickoguamanam",
github: "https://github.com/thedev-patrick"
},
jobTitle: "Web Developer",
location: {
city: "Lagos",
state: "",
country: "Nigeria"
}
} |
<<<<<<<
country: "Argentina"
}
},
{
id: uuidv4(),
name: "Min Shin Khant",
img: "https://avatars2.githubusercontent.com/u/47337883?s=400&u=180116e1471ae3ab4cd515bfea088da4725fce02&v=4",
links: {
website: "https://minshinkhant.github.io/",
linkedin: "https://www.linkedin.com/in/minshinkhant/",
github: "https://github.com/minshinkhant"
},
jobTitle: "Python Web Developer",
location: {
city: "Brooklyn",
state: "New York",
country: "United States"
}
},
{
id: uuidv4(),
name: "Bellout Aziz",
img: "https://avatars0.githubusercontent.com/u/63014105?v=4",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/bellout-abdelaaziz-itil-f-013568a/",
github: "https://github.com/bellapp",
},
jobTitle: "Full Stack Developer",
location: {
city: "",
state: "Agadir",
country: "Morocco",
},
},
=======
country: "Argentina",
},
},
{
id: uuidv4(),
name: "Min Shin Khant",
img:
"https://avatars2.githubusercontent.com/u/47337883?s=400&u=180116e1471ae3ab4cd515bfea088da4725fce02&v=4",
links: {
website: "https://minshinkhant.github.io/",
linkedin: "https://www.linkedin.com/in/minshinkhant/",
github: "https://github.com/minshinkhant",
},
jobTitle: "Python Web Developer",
location: {
city: "Brooklyn",
state: "New York",
country: "United States",
},
},
{
id: uuidv4(),
name: "Jared Matta",
img: "https://avatars1.githubusercontent.com/u/56903918?v=4",
links: {
website: "https://jared-matta.web.app",
linkedin: "https://www.linkedin.com/in/jared-matta/",
github: "https://github.com/AlteredArt",
},
jobTitle: "Front End Developer",
location: {
city: "",
state: "Colorado",
country: "United States",
},
},
>>>>>>>
country: "Argentina"
}
},
{
id: uuidv4(),
name: "Min Shin Khant",
img: "https://avatars2.githubusercontent.com/u/47337883?s=400&u=180116e1471ae3ab4cd515bfea088da4725fce02&v=4",
links: {
website: "https://minshinkhant.github.io/",
linkedin: "https://www.linkedin.com/in/minshinkhant/",
github: "https://github.com/minshinkhant"
},
jobTitle: "Python Web Developer",
location: {
city: "Brooklyn",
state: "New York",
country: "United States"
}
},
{
id: uuidv4(),
name: "Bellout Aziz",
img: "https://avatars0.githubusercontent.com/u/63014105?v=4",
links: {
website: "",
linkedin: "https://www.linkedin.com/in/bellout-abdelaaziz-itil-f-013568a/",
github: "https://github.com/bellapp",
},
jobTitle: "Full Stack Developer",
location: {
city: "",
state: "Agadir",
country: "Morocco",
},
},
{
id: uuidv4(),
name: "Jared Matta",
img: "https://avatars1.githubusercontent.com/u/56903918?v=4",
links: {
website: "https://jared-matta.web.app",
linkedin: "https://www.linkedin.com/in/jared-matta/",
github: "https://github.com/AlteredArt",
},
jobTitle: "Front End Developer",
location: {
city: "",
state: "Colorado",
country: "United States",
},
}, |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.