conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import NameEntryPanel from './name-entry-panel';
import { VR_DEVICE_AVAILABILITY } from "../utils/vr-caps-detect";
=======
import { VR_DEVICE_AVAILABILITY } from "../utils/vr-caps-detect.js";
import queryString from "query-string";
import { SCHEMA } from "../storage/store";
const { detect } = require("detect-browser");
const browser = detect();
>>>>>>>
import NameEntryPanel from './name-entry-panel';
import { VR_DEVICE_AVAILABILITY } from "../utils/vr-caps-detect";
import queryString from "query-string";
import { SCHEMA } from "../storage/store";
const { detect } = require("detect-browser");
const browser = detect(); |
<<<<<<<
audioInput.onchange = () => {
=======
console.log("Input fields ready");
const getAudio = () => {
>>>>>>>
const getAudio = () => {
<<<<<<<
dataInput.onchange = () => {
=======
if (audioInput.files && audioInput.files.length > 0) {
getAudio();
} else {
audioInput.onchange = getAudio;
}
const getRecording = () => {
console.log("Recording selected, setting attribute");
>>>>>>>
if (audioInput.files && audioInput.files.length > 0) {
getAudio();
} else {
audioInput.onchange = getAudio;
}
const getRecording = () => { |
<<<<<<<
gripdown: "action_grab",
gripup: "action_release",
=======
gripdown: "middle_ring_pinky_down",
gripup: "middle_ring_pinky_up",
abuttontouchstart: "thumb_down",
abuttontouchend: "thumb_up",
bbuttontouchstart: "thumb_down",
bbuttontouchend: "thumb_up",
xbuttontouchstart: "thumb_down",
xbuttontouchend: "thumb_up",
ybuttontouchstart: "thumb_down",
ybuttontouchend: "thumb_up",
surfacetouchstart: "thumb_down",
surfacetouchend: "thumb_up",
>>>>>>>
gripdown: "action_grab",
gripup: "action_release",
abuttontouchstart: "thumb_down",
abuttontouchend: "thumb_up",
bbuttontouchstart: "thumb_down",
bbuttontouchend: "thumb_up",
xbuttontouchstart: "thumb_down",
xbuttontouchend: "thumb_up",
ybuttontouchstart: "thumb_down",
ybuttontouchend: "thumb_up",
surfacetouchstart: "thumb_down",
surfacetouchend: "thumb_up", |
<<<<<<<
const packageLock = require("./package-lock.json");
=======
const request = require("request");
>>>>>>>
const packageLock = require("./package-lock.json");
const request = require("request"); |
<<<<<<<
const deviceDetect = require("device-detect")();
=======
const mobiledetect = new MobileDetect(navigator.userAgent);
>>>>>>>
const deviceDetect = require("device-detect")();
const mobiledetect = new MobileDetect(navigator.userAgent); |
<<<<<<<
import "./utils/theme";
import "./utils/configs";
=======
>>>>>>>
import "./utils/theme"; |
<<<<<<<
this.scene.addEventListener("object_pinned", e => {
const el = e.detail.el;
const networkId = el.components.networked.data.networkId;
const gltfNode = pinnedEntityToGltf(el);
if (!gltfNode) return;
el.setAttribute("networked", { persistent: true });
this.hubChannel.pin(networkId, gltfNode);
});
this.scene.addEventListener("object_unpinned", e => {
const el = e.detail.el;
const components = el.components;
const networked = components.networked;
if (!networked || !NAF.utils.isMine(el)) return;
const networkId = components.networked.data.networkId;
el.setAttribute("networked", { persistent: false });
this.hubChannel.unpin(networkId);
});
=======
this.scene.addEventListener("object_pinned", e => {
const el = e.detail.el;
const networkId = el.components.networked.data.networkId;
const gltfNode = pinnedEntityToGltf(el);
el.setAttribute("networked", { persistent: true });
this.hubChannel.pin(networkId, gltfNode);
});
this.scene.addEventListener("object_unpinned", e => {
const el = e.detail.el;
const components = el.components;
const networked = components.networked;
if (!networked || !networked.data || !NAF.utils.isMine(el)) return;
const networkId = components.networked.data.networkId;
el.setAttribute("networked", { persistent: false });
this.hubChannel.unpin(networkId);
});
>>>>>>>
this.scene.addEventListener("object_pinned", e => {
const el = e.detail.el;
const networkId = el.components.networked.data.networkId;
const gltfNode = pinnedEntityToGltf(el);
if (!gltfNode) return;
el.setAttribute("networked", { persistent: true });
this.hubChannel.pin(networkId, gltfNode);
});
this.scene.addEventListener("object_unpinned", e => {
const el = e.detail.el;
const components = el.components;
const networked = components.networked;
if (!networked || !networked.data || !NAF.utils.isMine(el)) return;
const networkId = components.networked.data.networkId;
el.setAttribute("networked", { persistent: false });
this.hubChannel.unpin(networkId);
}); |
<<<<<<<
import "./systems/camera-mirror";
=======
import "./systems/userinput/userinput-debug";
>>>>>>>
import "./systems/camera-mirror";
import "./systems/userinput/userinput-debug"; |
<<<<<<<
const has_agreed_to_terms = this.props.store.state.profile.has_agreed_to_terms || this.state.has_agreed_to_terms;
if (!has_agreed_to_terms) return;
=======
const { has_changed_name, display_name } = this.props.store.state.profile;
const hasChangedName = has_changed_name || this.state.display_name !== display_name;
>>>>>>>
const has_agreed_to_terms = this.props.store.state.profile.has_agreed_to_terms || this.state.has_agreed_to_terms;
if (!has_agreed_to_terms) return;
const { has_changed_name, display_name } = this.props.store.state.profile;
const hasChangedName = has_changed_name || this.state.display_name !== display_name;
<<<<<<<
has_saved_profile: true,
has_agreed_to_terms: true,
display_name: this.state.display_name,
avatar_id: this.state.avatar_id
=======
has_changed_name: hasChangedName,
...this.state
>>>>>>>
has_agreed_to_terms: true,
has_changed_name: hasChangedName,
...this.state |
<<<<<<<
import "./components/visibility-on-content-type";
=======
import "./components/hide-when-pinned-and-forbidden";
>>>>>>>
import "./components/visibility-on-content-type";
import "./components/hide-when-pinned-and-forbidden"; |
<<<<<<<
<WithHoverSound>
<button className={styles.linkButton} onClick={this.copyClicked.bind(this, "https://" + shareLink)}>
<span>{this.state.copyButtonActive ? "copied!" : "copy"}</span>
</button>
</WithHoverSound>
=======
<button className={styles.linkButton} onClick={this.copyClicked.bind(this, shortLink)}>
<span>{this.state.copyButtonActive ? "copied!" : "copy"}</span>
</button>
>>>>>>>
<WithHoverSound>
<button className={styles.linkButton} onClick={this.copyClicked.bind(this, shortLink)}>
<span>{this.state.copyButtonActive ? "copied!" : "copy"}</span>
</button>
</WithHoverSound>
<<<<<<<
<WithHoverSound>
<button className={styles.linkButton} onClick={this.shareClicked.bind(this, "https://" + shareLink)}>
<span>{this.state.shareButtonActive ? "sharing..." : "share"}</span>
</button>
</WithHoverSound>
=======
<button className={styles.linkButton} onClick={this.shareClicked.bind(this, shortLink)}>
<span>{this.state.shareButtonActive ? "sharing..." : "share"}</span>
</button>
>>>>>>>
<WithHoverSound>
<button className={styles.linkButton} onClick={this.shareClicked.bind(this, shortLink)}>
<span>{this.state.shareButtonActive ? "sharing..." : "share"}</span>
</button>
</WithHoverSound> |
<<<<<<<
this.startInteractionAndForceCursorUpdate = this.startInteractionAndForceCursorUpdate.bind(this);
this.startInteraction = this.startInteraction.bind(this);
this.moveCursor = this.moveCursor.bind(this);
this.endInteraction = this.endInteraction.bind(this);
this.handleMouseWheel = this.handleMouseWheel.bind(this);
=======
window.APP.touchEventsHandler.registerCursor(this);
window.APP.touchEventsHandler.registerPinchEmitter(this.el);
this.handleTouchStart = this.handleTouchStart.bind(this);
this.handleTouchMove = this.handleTouchMove.bind(this);
this.handleTouchEnd = this.handleTouchEnd.bind(this);
window.APP.mouseEventsHandler.registerCursor(this);
this.handleMouseDown = this.handleMouseDown.bind(this);
this.handleMouseMove = this.handleMouseMove.bind(this);
this.handleMouseUp = this.handleMouseUp.bind(this);
this.handleMouseWheel = this.handleMouseWheel.bind(this);
>>>>>>>
this.startInteractionAndForceCursorUpdate = this.startInteractionAndForceCursorUpdate.bind(this);
this.startInteraction = this.startInteraction.bind(this);
this.moveCursor = this.moveCursor.bind(this);
this.endInteraction = this.endInteraction.bind(this);
this.handleMouseWheel = this.handleMouseWheel.bind(this);
<<<<<<<
=======
this.data.playerRig.addEventListener(this.data.primaryDown, this._handlePrimaryDown);
this.data.playerRig.addEventListener(this.data.primaryUp, this._handlePrimaryUp);
this.data.playerRig.addEventListener(this.data.grabEvent, this._handlePrimaryDown);
this.data.playerRig.addEventListener(this.data.releaseEvent, this._handlePrimaryUp);
this.data.playerRig.addEventListener("cardboardbuttondown", this._handlePrimaryDown);
this.data.playerRig.addEventListener("cardboardbuttonup", this._handlePrimaryUp);
>>>>>>>
<<<<<<<
startInteractionAndForceCursorUpdate: function(touch) {
=======
_startTeleport: function() {
if (this.controller != null) {
this.controller.emit("cursor-teleport_down", {});
} else if (this.inVR) {
this.data.gazeTeleportControls.emit("cursor-teleport_down", {});
}
this._setCursorVisibility(false);
},
_endTeleport: function() {
if (this.controller != null) {
this.controller.emit("cursor-teleport_up", {});
} else if (this.inVR) {
this.data.gazeTeleportControls.emit("cursor-teleport_up", {});
}
this._setCursorVisibility(true);
},
handleTouchStart: function(touch) {
>>>>>>>
startInteractionAndForceCursorUpdate: function(touch) {
<<<<<<<
return false;
=======
return;
>>>>>>>
return false;
<<<<<<<
startInteraction: function() {
=======
handleMouseDown: function() {
>>>>>>>
startInteraction: function() {
<<<<<<<
return true;
=======
return true;
} else if (this.inVR || this.isMobile) {
this._startTeleport();
return;
>>>>>>>
return true;
<<<<<<<
handleMouseWheel: function(e) {
=======
handleMouseMove: function(e) {
this.mousePos.set(e.clientX / window.innerWidth * 2 - 1, -(e.clientY / window.innerHeight) * 2 + 1);
},
handleMouseUp: function() {
this.data.cursor.emit("cursor-release", {});
this._endTeleport();
},
handleMouseWheel: function(e) {
>>>>>>>
handleMouseWheel: function(e) { |
<<<<<<<
has_saved_profile: { type: "boolean" },
has_agreed_to_terms: { type: "boolean" },
=======
has_changed_name: { type: "boolean" },
>>>>>>>
has_agreed_to_terms: { type: "boolean" },
has_changed_name: { type: "boolean" }, |
<<<<<<<
import { isHubsDestinationUrl } from "./utils/media-utils";
=======
const PHYSICS_CONSTANTS = require("aframe-physics-system/src/constants"),
COLLISION_FLAGS = PHYSICS_CONSTANTS.COLLISION_FLAGS,
TYPES = PHYSICS_CONSTANTS.TYPES,
SHAPES = PHYSICS_CONSTANTS.SHAPES;
>>>>>>>
import { isHubsDestinationUrl } from "./utils/media-utils";
const PHYSICS_CONSTANTS = require("aframe-physics-system/src/constants"),
COLLISION_FLAGS = PHYSICS_CONSTANTS.COLLISION_FLAGS,
TYPES = PHYSICS_CONSTANTS.TYPES,
SHAPES = PHYSICS_CONSTANTS.SHAPES; |
<<<<<<<
import { RoomInfoDialog } from "./room-info-dialog.js";
=======
import LeaveRoomDialog from "./leave-room-dialog.js";
>>>>>>>
<<<<<<<
import { LeaveReason, LeaveRoomModal } from "./room/LeaveRoomModal";
=======
import { RoomSidebar } from "./room/RoomSidebar";
import { RoomSettingsSidebarContainer } from "./room/RoomSettingsSidebarContainer";
>>>>>>>
import { LeaveReason, LeaveRoomModal } from "./room/LeaveRoomModal";
import { RoomSidebar } from "./room/RoomSidebar";
import { RoomSettingsSidebarContainer } from "./room/RoomSettingsSidebarContainer"; |
<<<<<<<
=======
import "./components/animation";
import "./components/disable-frustum-culling";
>>>>>>>
import "./components/disable-frustum-culling"; |
<<<<<<<
registerNetworkSchemas();
document.querySelector("a-scene").addEventListener("loaded", onSceneLoad);
=======
const scene = document.querySelector("a-scene");
window.APP.scene = scene;
scene.addEventListener("loaded", onSceneLoad);
>>>>>>>
registerNetworkSchemas();
const scene = document.querySelector("a-scene");
window.APP.scene = scene;
scene.addEventListener("loaded", onSceneLoad); |
<<<<<<<
import jTool from '@jTool';
import { isFunction, each, isArray } from '@jTool/utils';
import { showLoading, hideLoading, getVisibleTh, getTbody } from '@common/base';
import { outError } from '@common/utils';
import { getSettings, getCheckedData, getTableData } from '@common/cache';
import { GM_CREATE, TD_VISIBLE } from '@common/constants';
=======
import jTool from '@common/jTool';
import { showLoading, hideLoading, getFakeVisibleTh, getTbody } from '@common/base';
import { outError, isFunction, jEach } from '@common/utils';
import { getSettings, getCheckedData } from '@common/cache';
import { GM_CREATE, CELL_HIDDEN } from '@common/constants';
>>>>>>>
import jTool from '@jTool';
import { isFunction, each, isArray } from '@jTool/utils';
import { showLoading, hideLoading, getVisibleTh, getTbody } from '@common/base';
import { outError } from '@common/utils';
import { getSettings, getCheckedData, getTableData } from '@common/cache';
import { GM_CREATE, CELL_HIDDEN } from '@common/constants';
<<<<<<<
const selectedList = onlyChecked ? getCheckedData(gridManagerName) : [];
const tableData = getTableData(gridManagerName);
=======
const selectedList = onlyChecked ? getCheckedData(gridManagerName) : undefined;
const handler = exportConfig.handler;
if (!isFunction(handler)) {
return Promise.reject('exportConfig.handler not return promise');
}
>>>>>>>
const selectedList = onlyChecked ? getCheckedData(gridManagerName) : [];
const tableData = getTableData(gridManagerName);
const handler = exportConfig.handler;
<<<<<<<
await this.downBlob(gridManagerName, loadingTemplate, fileName, exportConfig.handler, query, pageData, sortData, selectedList, tableData);
=======
await this.downBlob(gridManagerName, loadingTemplate, fileName, query, handler, pageData, sortData, selectedList);
>>>>>>>
await this.downBlob(gridManagerName, loadingTemplate, fileName, handler, query, pageData, sortData, selectedList, tableData);
<<<<<<<
const res = await exportHandler(fileName, query, pageData, sortData, selectedList, tableData);
=======
const res = await exportHandler(fileName, query, pageData, sortData, selectedList);
>>>>>>>
const res = await exportHandler(fileName, query, pageData, sortData, selectedList, tableData); |
<<<<<<<
cursor.object3D.matrixNeedsUpdate = true;
=======
cursor.object3D.scale.setScalar(Math.pow(this.distance, 0.315) * 0.75);
>>>>>>>
cursor.object3D.scale.setScalar(Math.pow(this.distance, 0.315) * 0.75);
cursor.object3D.matrixNeedsUpdate = true; |
<<<<<<<
import { exit2DInterstitialAndEnterVR, isIn2DInterstitial } from "../utils/vr-interstitial";
import maskEmail from "../utils/mask-email";
import { resetTips } from "../systems/tips";
import { faTimes } from "@fortawesome/free-solid-svg-icons/faTimes";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
=======
import { handleExitTo2DInterstitial, exit2DInterstitialAndEnterVR, isIn2DInterstitial } from "../utils/vr-interstitial";
>>>>>>>
import { handleExitTo2DInterstitial, exit2DInterstitialAndEnterVR, isIn2DInterstitial } from "../utils/vr-interstitial";
import maskEmail from "../utils/mask-email";
<<<<<<<
continueText: getMessages()[signInContinueTextId],
onClose: onContinueAfterSignIn || this.closeDialog,
onContinue: onContinueAfterSignIn || this.closeDialog
=======
onClose: onContinueAfterSignIn,
onContinue: onContinueAfterSignIn
>>>>>>>
onClose: onContinueAfterSignIn || this.closeDialog,
onContinue: onContinueAfterSignIn || this.closeDialog |
<<<<<<<
simpleViewModule.controller('SimpleCtrl', ['$scope', 'propertyService', 'serverContext', 'sfMediaService', '$q', function ($scope, propertyService, serverContext, mediaService, $q) {
=======
simpleViewModule.controller('SimpleCtrl', ['$scope', 'propertyService', 'serverContext', 'serviceHelper', 'sfMediaService', 'sfMediaMarkupService', '$q', function ($scope, propertyService, serverContext, serviceHelper, mediaService, mediaMarkupService, $q) {
>>>>>>>
simpleViewModule.controller('SimpleCtrl', ['$scope', 'propertyService', 'serverContext', 'serviceHelper', 'sfMediaService', '$q', function ($scope, propertyService, serverContext, serviceHelper, mediaService, $q) { |
<<<<<<<
$scope.parentSelector = { selectedItemsIds: [] };
$scope.feedback.showLoadingIndicator = true;
=======
$scope.additionalFilters = {};
>>>>>>>
$scope.parentSelector = { selectedItemsIds: [] };
$scope.feedback.showLoadingIndicator = true;
$scope.additionalFilters = {};
<<<<<<<
$scope.$watch(
'parentSelector.selectedItemsIds',
function (newSelectedItemsIds, oldSelectedItemsIds) {
if (newSelectedItemsIds !== oldSelectedItemsIds) {
$scope.properties.SerializedSelectedParentsIds.PropertyValue = JSON.stringify(newSelectedItemsIds);
}
},
true
);
$scope.$watch(
'properties.ParentFilterMode.PropertyValue',
function (newValue, oldValue) {
if (newValue !== oldValue) {
if (newValue == 'NotApplicable') {
$scope.properties.SelectionMode.PropertyValue = 'SelectedItems';
}
else if (oldValue == 'NotApplicable') {
$scope.properties.SelectionMode.PropertyValue = 'AllItems';
}
}
},
true
);
=======
$scope.$watch(
'additionalFilters.value',
function (newAdditionalFilters, oldAdditionalFilters) {
if (newAdditionalFilters !== oldAdditionalFilters) {
$scope.properties.SerializedAdditionalFilters.PropertyValue = JSON.stringify(newAdditionalFilters);
}
},
true
);
$scope.feedback.showLoadingIndicator = true;
>>>>>>>
$scope.$watch(
'parentSelector.selectedItemsIds',
function (newSelectedItemsIds, oldSelectedItemsIds) {
if (newSelectedItemsIds !== oldSelectedItemsIds) {
$scope.properties.SerializedSelectedParentsIds.PropertyValue = JSON.stringify(newSelectedItemsIds);
}
},
true
);
$scope.$watch(
'additionalFilters.value',
function (newAdditionalFilters, oldAdditionalFilters) {
if (newAdditionalFilters !== oldAdditionalFilters) {
$scope.properties.SerializedAdditionalFilters.PropertyValue = JSON.stringify(newAdditionalFilters);
}
},
true
);
$scope.$watch(
'properties.ParentFilterMode.PropertyValue',
function (newValue, oldValue) {
if (newValue !== oldValue) {
if (newValue == 'NotApplicable') {
$scope.properties.SelectionMode.PropertyValue = 'SelectedItems';
}
else if (oldValue == 'NotApplicable') {
$scope.properties.SelectionMode.PropertyValue = 'AllItems';
}
}
},
true
); |
<<<<<<<
newComment.find('[data-sf-role="comment-date"]').text(this.getDateFromSfString(comment.DateCreated).toDateString());
if (appendPendingApproval) {
newComment.find('[data-sf-role="comment-date"]').after($('<span />').text(this.resources.commentPendingApproval));
}
=======
newComment.find('[data-sf-role="comment-date"]').text(this.getDateFromSfString(comment.DateCreated).format(this.settings.commentDateTimeFormatString));
>>>>>>>
newComment.find('[data-sf-role="comment-date"]').text(this.getDateFromSfString(comment.DateCreated).toDateString()); |
<<<<<<<
const downloadManager = Cc["@mozilla.org/download-manager;1"].createInstance(Ci.nsIDownloadManager);
=======
const downloadManager = Cc["@mozilla.org/download-manager;1"].createInstance(Ci.nsIDownloadManager);
const ioService = services.get("io");
>>>>>>>
const downloadManager = Cc["@mozilla.org/download-manager;1"].createInstance(Ci.nsIDownloadManager);
<<<<<<<
IO.PATH_SEP = (function () {
let file = services.create("file");
file.append("foo");
return file.path[0];
})();
IO.__defineGetter__("runtimePath", function () services.get("environment").get(config.name.toUpperCase() + "_RUNTIME") ||
"~/" + (liberator.has("Win32") ? "" : ".") + config.name.toLowerCase());
=======
IO.__defineGetter__("runtimePath", function () {
const rtpvar = config.name.toUpperCase() + "_RUNTIME";
let rtp = services.get("environment").get(rtpvar);
if (!rtp)
{
rtp = "~/" + (liberator.has("Win32") ? "" : ".") + config.name.toLowerCase();
services.get("environment").set(rtpvar, rtp);
}
return rtp;
});
>>>>>>>
IO.PATH_SEP = (function () {
let file = services.create("file");
file.append("foo");
return file.path[0];
})();
IO.__defineGetter__("runtimePath", function () {
const rtpvar = config.name.toUpperCase() + "_RUNTIME";
let rtp = services.get("environment").get(rtpvar);
if (!rtp)
{
rtp = "~/" + (liberator.has("Win32") ? "" : ".") + config.name.toLowerCase();
services.get("environment").set(rtpvar, rtp);
}
return rtp;
}); |
<<<<<<<
let extensionName = config.name.toUpperCase();
let init = services.get("environment").get(extensionName + "_INIT");
=======
let init = services.get("environment").get(config.name.toUpperCase() + "_INIT");
let rcFile = io.getRCFile("~");
>>>>>>>
let extensionName = config.name.toUpperCase();
let init = services.get("environment").get(extensionName + "_INIT");
let rcFile = io.getRCFile("~"); |
<<<<<<<
=======
#!/usr/bin/env node
const fs = require('fs');
const luxon = require('luxon');
const minimist = require('minimist');
>>>>>>>
#!/usr/bin/env node
<<<<<<<
// happy goodbye
console.log('\nAll done!');
console.log('Look for your output files in: ' + path.resolve(config.output));
})().catch(ex => {
// sad goodbye
console.log('\nSomething went wrong, execution halted early.');
console.error(ex);
});
=======
function parseFileContent(content) {
const processors = { tagNameProcessors: [xml2js.processors.stripPrefix] };
xml2js.parseString(content, processors, (err, data) => {
if (err) {
console.log('Unable to parse file content.');
console.log(err);
} else {
processData(data);
}
});
}
function processData(data) {
let images = collectImages(data);
let posts = collectPosts(data);
mergeImagesIntoPosts(images, posts);
writeFiles(posts);
}
function collectImages(data) {
// start by collecting all attachment images
let images = getItemsOfType(data, 'attachment')
// filter to certain image file types
.filter(attachment => (/\.(gif|jpg|png)$/i).test(attachment.attachment_url[0]))
.map(attachment => ({
id: attachment.post_id[0],
postId: attachment.post_parent[0],
url: attachment.attachment_url[0]
}));
// optionally add images scraped from <img> tags in post content
if (argv.addcontentimages) {
addContentImages(data, images);
}
return images;
}
function addContentImages(data, images) {
let regex = (/<img[^>]*src="(.+?\.(?:gif|jpg|png))"[^>]*>/gi);
let match;
getItemsOfType(data, 'post').forEach(post => {
let postId = post.post_id[0];
let postContent = post.encoded[0];
let postLink = post.link[0];
// reset lastIndex since we're reusing the same regex object
regex.lastIndex = 0;
while ((match = regex.exec(postContent)) !== null) {
// base the matched image URL relative to the post URL
let url = new URL(match[1], postLink).href;
// add image if it hasn't already been added for this post
let exists = images.some(image => image.postId === postId && image.url === url);
if (!exists) {
images.push({
id: -1,
postId: postId,
url: url
});
console.log('Scraped ' + url + '.');
}
}
});
}
function collectPosts(data) {
// this is passed into getPostContent() for the markdown conversion
turndownService = initTurndownService();
return getItemsOfType(data, 'post')
.map(post => ({
// meta data isn't written to file, but is used to help with other things
meta: {
id: getPostId(post),
slug: getPostSlug(post),
coverImageId: getPostCoverImageId(post)
},
frontmatter: {
title: getPostTitle(post),
date: getPostDate(post)
},
content: getPostContent(post, turndownService)
}));
}
function initTurndownService() {
let turndownService = new turndown({
headingStyle: 'atx',
bulletListMarker: '-',
codeBlockStyle: 'fenced'
});
// preserve embedded tweets
turndownService.addRule('tweet', {
filter: node => node.nodeName === 'BLOCKQUOTE' && node.getAttribute('class') === 'twitter-tweet',
replacement: (content, node) => '\n\n' + node.outerHTML
});
// preserve embedded codepens
turndownService.addRule('codepen', {
filter: node => {
// codepen embed snippets have changed over the years
// but this series of checks should find the commonalities
return (
['P', 'DIV'].includes(node.nodeName) &&
node.attributes['data-slug-hash'] &&
node.getAttribute('class') === 'codepen'
);
},
replacement: (content, node) => '\n\n' + node.outerHTML
});
// preserve embedded scripts (for tweets, codepens, gists, etc.)
turndownService.addRule('script', {
filter: 'script',
replacement: (content, node) => {
let before = '\n\n';
let src = node.getAttribute('src');
if (node.previousSibling && node.previousSibling.nodeName !== '#text') {
// keep twitter and codepen <script> tags snug with the element above them
before = '\n';
}
let html = node.outerHTML.replace('async=""', 'async');
return before + html + '\n\n';
}
});
// preserve iframes (common for embedded audio/video)
turndownService.addRule('iframe', {
filter: 'iframe',
replacement: (content, node) => {
let html = node.outerHTML
.replace('allowfullscreen=""', 'allowfullscreen');
return '\n\n' + html + '\n\n';
}
});
return turndownService;
}
function getItemsOfType(data, type) {
return data.rss.channel[0].item.filter(item => item.post_type[0] === type);
}
function getPostId(post) {
return post.post_id[0];
}
function getPostCoverImageId(post) {
if (post.postmeta === undefined) return;
let postmeta = post.postmeta.find(postmeta => postmeta.meta_key[0] === '_thumbnail_id');
let id = postmeta ? postmeta.meta_value[0] : undefined;
return id;
}
function getPostSlug(post) {
return post.post_name[0];
}
function getPostTitle(post) {
return post.title[0].trim().replace(/"/g, '\\"');
}
function getPostDate(post) {
return luxon.DateTime.fromRFC2822(post.pubDate[0], { zone: 'utc' }).toISODate();
}
function getPostContent(post, turndownService) {
let content = post.encoded[0].trim();
// insert an empty div element between double line breaks
// this nifty trick causes turndown to keep adjacent paragraphs separated
// without mucking up content inside of other elemnts (like <code> blocks)
content = content.replace(/(\r?\n){2}/g, '\n<div></div>\n');
if (argv.addcontentimages) {
// writeImageFile() will save all content images to a relative /images
// folder so update references in post content to match
content = content.replace(/(<img[^>]*src=").*?([^\/"]+\.(?:gif|jpg|png))("[^>]*>)/gi, '$1images/$2$3');
}
// this is a hack to make <iframe> nodes non-empty by inserting a "." which
// allows the iframe rule declared in initTurndownService() to take effect
// (using turndown's blankRule() and keep() solution did not work for me)
content = content.replace(/(<\/iframe>)/gi, '.$1');
// use turndown to convert HTML to Markdown
content = turndownService.turndown(content);
// clean up extra spaces in list items
content = content.replace(/(-|\d+\.) +/g, '$1 ');
// clean up the "." from the iframe hack above
content = content.replace(/\.(<\/iframe>)/gi, '$1');
return content;
}
function mergeImagesIntoPosts(images, posts) {
// create lookup table for quicker traversal
let postsLookup = posts.reduce((lookup, post) => {
lookup[post.meta.id] = post;
return lookup;
}, {});
images.forEach(image => {
let post = postsLookup[image.postId];
if (post) {
// save full image URLs for downloading later
post.meta.imageUrls = post.meta.imageUrls || [];
post.meta.imageUrls.push(image.url);
if (image.id === post.meta.coverImageId) {
// save cover image filename to frontmatter
post.frontmatter.coverImage = getFilenameFromUrl(image.url);
}
}
});
}
function writeFiles(posts) {
let delay = 0;
posts.forEach(post => {
const postDir = getPostDir(post);
createDir(postDir);
writeMarkdownFile(post, postDir);
if (argv.saveimages && post.meta.imageUrls) {
post.meta.imageUrls.forEach(imageUrl => {
const imageDir = path.join(postDir, 'images');
createDir(imageDir);
writeImageFile(imageUrl, imageDir, delay);
delay += 25;
});
}
});
}
function writeMarkdownFile(post, postDir) {
const frontmatter = Object.entries(post.frontmatter)
.reduce((accumulator, pair) => {
return accumulator + pair[0] + ': "' + pair[1] + '"\n'
}, '');
const data = '---\n' + frontmatter + '---\n\n' + post.content + '\n';
const postPath = path.join(postDir, getPostFilename(post));
fs.writeFile(postPath, data, (err) => {
if (err) {
console.log('Unable to write file.')
console.log(err);
} else {
console.log('Wrote ' + postPath + '.');
}
});
}
function writeImageFile(imageUrl, imageDir, delay) {
let imagePath = path.join(imageDir, getFilenameFromUrl(imageUrl));
let stream = fs.createWriteStream(imagePath);
stream.on('finish', () => {
console.log('Saved ' + imagePath + '.');
});
// stagger image requests so we don't piss off hosts
setTimeout(() => {
request
.get(imageUrl)
.on('response', response => {
if (response.statusCode !== 200) {
console.log('Response status code ' + response.statusCode + ' received for ' + imageUrl + '.');
}
})
.on('error', err => {
console.log('Unable to download image.');
console.log(err);
})
.pipe(stream);
}, delay);
}
function getFilenameFromUrl(url) {
return url.split('/').slice(-1)[0];
}
function createDir(dir) {
try {
fs.accessSync(dir, fs.constants.F_OK);
} catch (ex) {
fs.mkdirSync(dir, { recursive: true });
}
}
function getPostDir(post) {
let dir = argv.output;
let dt = luxon.DateTime.fromISO(post.frontmatter.date);
if (argv.yearmonthfolders) {
dir = path.join(dir, dt.toFormat('yyyy'), dt.toFormat('LL'));
} else if (argv.yearfolders) {
dir = path.join(dir, dt.toFormat('yyyy'));
}
if (argv.postfolders) {
let folder = post.meta.slug;
if (argv.prefixdate) {
folder = dt.toFormat('yyyy-LL-dd') + '-' + folder;
}
dir = path.join(dir, folder);
}
return dir;
}
function getPostFilename(post) {
if (argv.postfolders) {
// the containing folder name will be unique, just use index.md here
return 'index.md';
} else {
let filename = post.meta.slug + '.md';
if (argv.prefixdate) {
let dt = luxon.DateTime.fromISO(post.frontmatter.date);
filename = dt.toFormat('yyyy-LL-dd') + '-' + filename;
}
return filename;
}
}
// it's go time!
init();
>>>>>>>
// happy goodbye
console.log('\nAll done!');
console.log('Look for your output files in: ' + path.resolve(config.output));
})().catch(ex => {
// sad goodbye
console.log('\nSomething went wrong, execution halted early.');
console.error(ex);
}); |
<<<<<<<
var currentUser = '[email protected]';
var copy = { 'id': '21', 'imageUrl': 'path/to/image' };
var loan = {'id': '12', 'email': currentUser, 'copy': copy };
=======
var user = { 'imageUrl' : 'http://www.gravatar.com/avatar/1dbd3e934b5d9a64f15826f7e9e23e16' };
var lastLoan = { 'id': '1' , 'email': '[email protected]', 'user': user};
var copy = { 'id': '21', 'imageUrl': 'path/to/image', 'lastLoan': lastLoan };
var loan = { 'id': '12', 'email': '[email protected]', 'copy': copy };
>>>>>>>
var currentUser = '[email protected]';
var copy = { 'id': '21', 'imageUrl': 'path/to/image' };
var user = { 'imageUrl' : 'http://www.gravatar.com/avatar/1dbd3e934b5d9a64f15826f7e9e23e16' };
var loan = {'id': '12', 'email': currentUser, 'copy': copy, 'user': user };
<<<<<<<
httpBackend.expectGET(apiEndpoint.concat('/copies/').concat(copy.id).concat('?projection=copyWithBookInline')).respond(200, copyAfterBorrow);
=======
httpBackend.expectGET(apiEndpoint
.concat('/copies/')
.concat(copy.id).concat('?projection=copyWithBookInline')).respond(200, copy);
>>>>>>>
httpBackend.expectGET(apiEndpoint
.concat('/copies/')
.concat(copy.id).concat('?projection=copyWithBookInline')).respond(200, copyAfterBorrow); |
<<<<<<<
require('./connect')
require('./multiple')
require('./data-size')
require('./references')
require('./subscription')
require('./switch')
require('./client')
require('./types')
require('./context')
require('./resolveRefs')
// missing auto remove of context
=======
// require('./connect')
// require('./multiple')
// require('./references')
// require('./subscription')
// require('./switch')
// require('./client')
// require('./types')
// require('./context')
require('./data-size')
>>>>>>>
require('./data-size')
require('./references')
require('./subscription')
require('./switch')
require('./client')
require('./types')
require('./context')
require('./resolveRefs') |
<<<<<<<
options.date =
typeof options.date === 'string'
? format(options.date)
: format('YYYY/MM/DD');
options.relative = options.hasOwnProperty('relative')
? options.relative
: true;
options.linksets = options.linksets || [];
=======
options.date = options.date ? format(options.date) : format('YYYY/MM/DD');
options.relative = options.hasOwnProperty('relative') ? options.relative : true;
options.slug = options.hasOwnProperty('slug') ? options.slug : { mode: 'rfc3986' };
>>>>>>>
options.date =
typeof options.date === 'string'
? format(options.date)
: format('YYYY/MM/DD');
options.relative = options.hasOwnProperty('relative')
? options.relative
: true;
options.linksets = options.linksets || [];
options.slug = options.hasOwnProperty('slug') ? options.slug : { mode: 'rfc3986' }; |
<<<<<<<
});
=======
// in case of any leftover tests that have modified the direction
document.body.dir = 'auto';
}
});
>>>>>>>
// in case of any leftover tests that have modified the direction
document.body.dir = 'auto';
});
<<<<<<<
let subject = this.owner.lookup('service:language-preference');
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, 'fr');
assert.equal(subject.get('intl.locale'), lang, 'intl service was not updated');
});
=======
let subject = this.subject();
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, 'fr');
assert.deepEqual(subject.get('intl.locale'), [lang, DEFAULT_LANGUAGE], 'intl service was not updated');
>>>>>>>
let subject = this.owner.lookup('service:language-preference');
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, 'fr');
assert.equal(subject.get('intl.locale'), [lang, DEFAULT_LANGUAGE], 'intl service was not updated');
});
<<<<<<<
let subject = this.owner.lookup('service:language-preference');
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, DEFAULT_LANGUAGE);
assert.equal(subject.get('intl.locale'), lang, 'intl service was not updated');
});
=======
let subject = this.subject();
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, DEFAULT_LANGUAGE);
assert.deepEqual(subject.get('intl.locale'), [DEFAULT_LANGUAGE], 'intl service was not updated');
>>>>>>>
let subject = this.owner.lookup('service:language-preference');
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, DEFAULT_LANGUAGE);
assert.equal(subject.get('intl.locale'), [DEFAULT_LANGUAGE], 'intl service was not updated');
});
<<<<<<<
let subject = this.owner.lookup('service:language-preference');
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, DEFAULT_LANGUAGE);
assert.equal(subject.get('intl.locale'), lang, 'intl service was not updated');
});
=======
let subject = this.subject();
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, DEFAULT_LANGUAGE);
assert.deepEqual(subject.get('intl.locale'), [DEFAULT_LANGUAGE], 'intl service was not updated');
>>>>>>>
let subject = this.owner.lookup('service:language-preference');
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, DEFAULT_LANGUAGE);
assert.equal(subject.get('intl.locale'), [DEFAULT_LANGUAGE], 'intl service was not updated');
});
<<<<<<<
let subject = this.owner.lookup('service:language-preference');
return subject.saveUserLanguagePreference('ru').then(function() {
sinon.assert.calledOnce(configDb.put);
sinon.assert.calledWith(configDb.put, expectedPreferences);
assert.equal(subject.get('intl.locale'), 'ru', 'intl service was not updated');
});
=======
let subject = this.subject();
return subject.saveUserLanguagePreference('ru').then(function() {
sinon.assert.calledOnce(configDb.put);
sinon.assert.calledWith(configDb.put, expectedPreferences);
assert.deepEqual(subject.get('intl.locale'), ['ru', DEFAULT_LANGUAGE], 'intl service was not updated');
>>>>>>>
let subject = this.owner.lookup('service:language-preference');
return subject.saveUserLanguagePreference('ru').then(function() {
sinon.assert.calledOnce(configDb.put);
sinon.assert.calledWith(configDb.put, expectedPreferences);
assert.equal(subject.get('intl.locale'), ['ru', DEFAULT_LANGUAGE], 'intl service was not updated');
}); |
<<<<<<<
export default AbstractEditController.extend(InventorySelection, PatientId, PatientSubmodule, UserSession, {
needs: ['application','medication'],
=======
export default AbstractEditController.extend(InventorySelection, FulfillRequest, InventoryLocations, PatientId, PatientSubmodule, UserSession, {
needs: ['application','medication','pouchdb'],
>>>>>>>
export default AbstractEditController.extend(InventorySelection, FulfillRequest, InventoryLocations, PatientId, PatientSubmodule, UserSession, {
needs: ['application','medication'], |
<<<<<<<
import localeConfig from 'ember-i18n/config/en';
=======
import { getOwner } from '@ember/application';
>>>>>>>
<<<<<<<
import tHelper from 'ember-i18n/helper';
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
module('Unit | Controller | abstract-report-controller', function(hooks) {
setupTest(hooks);
hooks.beforeEach(function() {
=======
import tHelper from 'ember-intl/helpers/t';
import { moduleFor, test } from 'ember-qunit';
moduleFor('controller:abstract-report-controller', 'Unit | Controller | abstract-report-controller', {
needs: [
'service:intl',
'service:metrics',
'config:environment',
'ember-intl@adapter:default',
'cldr:cn',
'cldr:de',
'cldr:en',
'cldr:es',
'cldr:gr',
'cldr:hi',
'cldr:pt',
'cldr:th',
'cldr:tw',
'cldr:de',
'cldr:es',
'cldr:fr',
'cldr:he',
'cldr:it',
'cldr:ru',
'cldr:tr',
'cldr:ur',
'translation:en',
'util:intl/missing-message'
],
beforeEach() {
>>>>>>>
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
module('Unit | Controller | abstract-report-controller', function(hooks) {
setupTest(hooks);
hooks.beforeEach(function() { |
<<<<<<<
import english from 'hospitalrun/locales/en/translations';
import french from 'hospitalrun/locales/fr/translations';
import german from 'hospitalrun/locales/de/translations';
module('Acceptance | language dropdown', function(hooks) {
setupApplicationTest(hooks);
=======
function selectFromLanguageSelect(locale) {
let select = document.querySelector('.language-select');
let option = document.querySelector(`.language-select [value=${locale}]`);
option.selected = true;
select.dispatchEvent(new Event('change'));
return wait();
}
let lookup;
moduleForAcceptance('Acceptance | language select', {
beforeEach() {
let intl = this.application.__container__.lookup('service:intl');
lookup = intl.lookup.bind(intl);
},
afterEach() {
lookup = undefined;
}
});
>>>>>>>
function selectFromLanguageSelect(locale) {
let select = document.querySelector('.language-select');
let option = document.querySelector(`.language-select [value=${locale}]`);
option.selected = true;
select.dispatchEvent(new Event('change'));
return wait();
}
let lookup;
module('Acceptance | language dropdown', function(hooks) {
setupApplicationTest(hooks);
hooks.beforeEach(function() {
let intl = this.owner.lookup('service:intl');
lookup = intl.lookup.bind(intl);
});
hooks.afterEach(function() {
lookup = undefined;
});
<<<<<<<
=======
await visit('/');
assert.dom('.view-current-title').hasText(lookup('dashboard.title', 'de'), 'Title is in German after 2nd login');
>>>>>>> |
<<<<<<<
module('Unit | Service | Language preference', function(hooks) {
setupTest(hooks);
hooks.beforeEach(function() {
=======
moduleFor('service:language-preference', 'Unit | Service | Language preference', {
needs: ['service:config', 'service:intl'],
beforeEach() {
>>>>>>>
module('Unit | Service | Language preference', function(hooks) {
setupTest(hooks);
hooks.beforeEach(function() {
<<<<<<<
this.owner.register('service:config', config);
this.config = this.owner.lookup('service:config');
this.owner.register('service:i18n', Service.extend({}));
this.i18n = this.owner.lookup('service:i18n');
});
hooks.afterEach(function() {
=======
this.register('service:config', config);
this.inject.service('config');
this.register('service:intl', Service.extend({}));
this.inject.service('intl');
},
afterEach() {
>>>>>>>
this.owner.register('service:config', config);
this.owner.register('service:intl', Service.extend({}));
});
hooks.afterEach(function() {
<<<<<<<
let subject = this.owner.lookup('service:language-preference');
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, 'fr');
assert.equal(subject.get('i18n.locale'), lang, 'i18n service was not updated');
});
=======
let subject = this.subject();
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, 'fr');
assert.equal(subject.get('intl.locale'), lang, 'intl service was not updated');
>>>>>>>
let subject = this.owner.lookup('service:language-preference');
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, 'fr');
assert.equal(subject.get('intl.locale'), lang, 'intl service was not updated');
});
<<<<<<<
let subject = this.owner.lookup('service:language-preference');
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, DEFAULT_LANGUAGE);
assert.equal(subject.get('i18n.locale'), lang, 'i18n service was not updated');
});
=======
let subject = this.subject();
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, DEFAULT_LANGUAGE);
assert.equal(subject.get('intl.locale'), lang, 'intl service was not updated');
>>>>>>>
let subject = this.owner.lookup('service:language-preference');
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, DEFAULT_LANGUAGE);
assert.equal(subject.get('intl.locale'), lang, 'intl service was not updated');
});
<<<<<<<
let subject = this.owner.lookup('service:language-preference');
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, DEFAULT_LANGUAGE);
assert.equal(subject.get('i18n.locale'), lang, 'i18n service was not updated');
});
=======
let subject = this.subject();
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, DEFAULT_LANGUAGE);
assert.equal(subject.get('intl.locale'), lang, 'intl service was not updated');
>>>>>>>
let subject = this.owner.lookup('service:language-preference');
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, DEFAULT_LANGUAGE);
assert.equal(subject.get('intl.locale'), lang, 'intl service was not updated');
});
<<<<<<<
let subject = this.owner.lookup('service:language-preference');
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, DEFAULT_LANGUAGE);
assert.equal(subject.get('i18n.locale'), lang, 'i18n service was not updated');
});
=======
let subject = this.subject();
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, DEFAULT_LANGUAGE);
assert.equal(subject.get('intl.locale'), lang, 'intl service was not updated');
>>>>>>>
let subject = this.owner.lookup('service:language-preference');
return subject.loadUserLanguagePreference().then(function(lang) {
assert.equal(lang, DEFAULT_LANGUAGE);
assert.equal(subject.get('intl.locale'), lang, 'intl service was not updated');
}); |
<<<<<<<
{ name: 'Social Worker', roles: ['Social Worker', 'user'], defaultRoute: 'patients' },
{ name: 'System Administrator', roles: ['System Administrator', 'admin', 'user'] },
=======
{ name: 'Social Worker', roles: ['Social Worker', 'user'], defaultRoute: 'patients.index' },
{ name: 'System Administrator', roles: ['System Administrator', 'admin', 'user'], defaultRoute: 'patients.index' },
>>>>>>>
{ name: 'Social Worker', roles: ['Social Worker', 'user'], defaultRoute: 'patients.index' },
{ name: 'System Administrator', roles: ['System Administrator', 'admin', 'user'] }, |
<<<<<<<
module('Unit | Mixin | dob-days', function(hooks) {
setupTest(hooks);
hooks.beforeEach(function() {
this.subject = function(attrs) {
let subject;
run(() => {
let Test = DS.Model.extend(DOBDays);
this.owner.register('model:test', Test);
subject = this.store().createRecord('test', attrs);
});
return subject;
};
this.store = function() {
return this.owner.lookup('service:store');
};
});
hooks.beforeEach(function() {
=======
moduleFor('mixin:dob-days', 'Unit | Mixin | dob-days', {
needs: [
'config:environment',
'service:intl',
'ember-intl@adapter:default',
'cldr:cn',
'cldr:de',
'cldr:en',
'cldr:es',
'cldr:gr',
'cldr:hi',
'cldr:pt',
'cldr:th',
'cldr:tw',
'cldr:de',
'cldr:es',
'cldr:fr',
'cldr:he',
'cldr:it',
'cldr:ru',
'cldr:tr',
'cldr:ur',
'translation:en',
'util:intl/missing-message'
],
beforeEach() {
>>>>>>>
module('Unit | Mixin | dob-days', function(hooks) {
setupTest(hooks);
hooks.beforeEach(function() { |
<<<<<<<
=======
var queryKey = this.get('queryKey');
// first check if these changes include any of the record types
if(recordTypes && queryKey && recordTypes.contains(queryKey.recordType)) return;
>>>>>>> |
<<<<<<<
_styleProperties: [ "opacity", "display" ],
_layoutStyles: 'width height top bottom marginLeft marginTop left right zIndex minWidth maxWidth minHeight maxHeight centerX centerY'.w(),
=======
_styleProperties: [ "opacity", "display", "-webkit-transform" ],
_layoutStyles: 'width height top bottom marginLeft marginTop left right zIndex minWidth maxWidth minHeight maxHeight centerX centerY'.w(),
>>>>>>>
_styleProperties: [ "opacity", "display", "-webkit-transform" ],
_layoutStyles: 'width height top bottom marginLeft marginTop left right zIndex minWidth maxWidth minHeight maxHeight centerX centerY'.w(),
<<<<<<<
transitionEnd: function(evt){
var propertyName = evt.originalEvent.propertyName,
callback = this._transitionCallbacks[propertyName];
if(callback) SC.Animatable.runCallback(callback);
},
=======
transitionEnd: function(evt){
SC.RunLoop.begin();
var propertyName = evt.originalEvent.propertyName,
callback = this._transitionCallbacks[propertyName];
if(callback) SC.Animatable.runCallback(callback);
SC.RunLoop.end();
},
>>>>>>>
transitionEnd: function(evt){
SC.RunLoop.begin();
var propertyName = evt.originalEvent.propertyName,
callback = this._transitionCallbacks[propertyName];
if(callback) SC.Animatable.runCallback(callback);
SC.RunLoop.end();
},
<<<<<<<
var f = this.computeFrameWithParentFrame();
=======
>>>>>>>
<<<<<<<
},
runCallback: function(callback){
var typeOfAction = SC.typeOf(callback.action);
// if the action is a function, just try to call it.
if (typeOfAction == SC.T_FUNCTION) {
callback.action.call(callback.target);
// otherwise, action should be a string. If it has a period, treat it
// like a property path.
} else if (typeOfAction === SC.T_STRING) {
if (callback.action.indexOf('.') >= 0) {
var path = callback.action.split('.') ;
var property = path.pop() ;
var target = SC.objectForPropertyPath(path, window) ;
var action = target.get ? target.get(property) : target[property];
if (action && SC.typeOf(action) == SC.T_FUNCTION) {
action.call(target);
} else {
throw 'SC.Animator could not find a function at %@'.fmt(callback.action) ;
}
// otherwise, try to execute action direction on target or send down
// responder chain.
} else {
SC.RootResponder.responder.sendAction(callback.action, callback.target);
}
}
=======
},
runCallback: function(callback){
var typeOfAction = SC.typeOf(callback.action);
// if the action is a function, just try to call it.
if (typeOfAction == SC.T_FUNCTION) {
callback.action.call(callback.target, callback.source);
// otherwise, action should be a string. If it has a period, treat it
// like a property path.
} else if (typeOfAction === SC.T_STRING) {
if (callback.action.indexOf('.') >= 0) {
var path = callback.action.split('.') ;
var property = path.pop() ;
var target = SC.objectForPropertyPath(path, window) ;
var action = target.get ? target.get(property) : target[property];
if (action && SC.typeOf(action) == SC.T_FUNCTION) {
action.call(target, callback.source);
} else {
throw 'SC.Animator could not find a function at %@'.fmt(callback.action) ;
}
// otherwise, try to execute action direction on target or send down
// responder chain.
} else {
SC.RootResponder.responder.sendAction(callback.action, callback.target, callback.source);
}
}
>>>>>>>
},
runCallback: function(callback){
var typeOfAction = SC.typeOf(callback.action);
// if the action is a function, just try to call it.
if (typeOfAction == SC.T_FUNCTION) {
callback.action.call(callback.target, callback.source);
// otherwise, action should be a string. If it has a period, treat it
// like a property path.
} else if (typeOfAction === SC.T_STRING) {
if (callback.action.indexOf('.') >= 0) {
var path = callback.action.split('.') ;
var property = path.pop() ;
var target = SC.objectForPropertyPath(path, window) ;
var action = target.get ? target.get(property) : target[property];
if (action && SC.typeOf(action) == SC.T_FUNCTION) {
action.call(target, callback.source);
} else {
throw 'SC.Animator could not find a function at %@'.fmt(callback.action) ;
}
// otherwise, try to execute action direction on target or send down
// responder chain.
} else {
SC.RootResponder.responder.sendAction(callback.action, callback.target, callback.source);
}
} |
<<<<<<<
=======
// const htmlHead = htmlFile.match(/(?:<head.*?>)([\s\S]*?)(?:<\/head>)/gmi);
// const headRegex = new RegExp('head', 'i');
// let htmlHeadContents = htmlHead[0].split(headRegex)[1];
// htmlHeadContents = htmlHeadContents.slice(1, htmlHeadContents.length - 2);
// htmlHeadContents += '<link rel="stylesheet" type="text/css" href="/preview-styles.css" />\n';
// htmlFile = htmlFile.replace(/(?:<head.*?>)([\s\S]*?)(?:<\/head>)/gmi, `<head>\n${htmlHeadContents}\n</head>`);
htmlFile += hijackConsoleScript;
>>>>>>>
// const htmlHead = htmlFile.match(/(?:<head.*?>)([\s\S]*?)(?:<\/head>)/gmi);
// const headRegex = new RegExp('head', 'i');
// let htmlHeadContents = htmlHead[0].split(headRegex)[1];
// htmlHeadContents = htmlHeadContents.slice(1, htmlHeadContents.length - 2);
// htmlHeadContents += '<link rel="stylesheet" type="text/css" href="/preview-styles.css" />\n';
// htmlFile = htmlFile.replace(/(?:<head.*?>)([\s\S]*?)(?:<\/head>)/gmi, `<head>\n${htmlHeadContents}\n</head>`);
htmlFile += hijackConsoleScript;
<<<<<<<
cssFiles: PropTypes.array.isRequired,
files: PropTypes.array.isRequired
=======
cssFiles: PropTypes.array.isRequired,
dispatchConsoleEvent: PropTypes.func.isRequired,
children: PropTypes.element
>>>>>>>
cssFiles: PropTypes.array.isRequired,
files: PropTypes.array.isRequired,
dispatchConsoleEvent: PropTypes.func.isRequired,
children: PropTypes.element |
<<<<<<<
setUnsavedChanges={this.props.setUnsavedChanges}
=======
infiniteLoop={this.props.ide.infiniteLoop}
detectInfiniteLoops={this.props.detectInfiniteLoops}
resetInfiniteLoops={this.props.resetInfiniteLoops}
stopSketch={this.props.stopSketch}
startSketch={this.props.startSketch}
isPlaying={this.props.ide.isPlaying}
>>>>>>>
setUnsavedChanges={this.props.setUnsavedChanges}
infiniteLoop={this.props.ide.infiniteLoop}
detectInfiniteLoops={this.props.detectInfiniteLoops}
resetInfiniteLoops={this.props.resetInfiniteLoops}
stopSketch={this.props.stopSketch}
startSketch={this.props.startSketch}
isPlaying={this.props.ide.isPlaying}
<<<<<<<
keyboardShortcutVisible: PropTypes.bool.isRequired,
unsavedChanges: PropTypes.bool.isRequired
=======
keyboardShortcutVisible: PropTypes.bool.isRequired,
infiniteLoop: PropTypes.bool.isRequired
>>>>>>>
keyboardShortcutVisible: PropTypes.bool.isRequired,
unsavedChanges: PropTypes.bool.isRequired,
infiniteLoop: PropTypes.bool.isRequired, |
<<<<<<<
inputStyle: 'contenteditable',
mode: 'javascript'
=======
mode: 'javascript',
lineWrapping: true
>>>>>>>
inputStyle: 'contenteditable',
mode: 'javascript',
lineWrapping: true |
<<<<<<<
test("should react to object array item value mutation", () => {
let reactionCount = 0;
const tree = new ProxyStateTree({
items: [
{
title: "foo"
},
{
title: "bar"
}
]
});
const state = tree.get();
const trackId = tree.startPathsTracking();
state.items.map(item => item.title);
const paths = tree.clearPathsTracking(trackId);
expect(paths).toEqual(
new Set(["items", "items.0", "items.0.title", "items.1", "items.1.title"])
);
tree.addMutationListener(paths, () => {
reactionCount++;
});
tree.startMutationTracking();
state.items[0].title = "baz";
tree.clearMutationTracking();
tree.flush();
expect(reactionCount).toBe(1);
});
test("should react to int array item mutation", () => {
let reactionCount = 0;
const tree = new ProxyStateTree({
items: [1,2]
});
const state = tree.get();
const trackId = tree.startPathsTracking();
state.items.map(item => item);
const paths = tree.clearPathsTracking(trackId);
expect(paths).toEqual(
new Set(["items", "items.0","items.1"])
);
tree.addMutationListener(paths, () => {
reactionCount++;
});
tree.startMutationTracking();
state.items[0] = 99;
tree.clearMutationTracking();
tree.flush();
expect(reactionCount).toBe(1);
});
=======
});
describe("PRODUCTION", () => {
it("should not track anything that isn't observed", () => {
const tree = new ProxyStateTree(
{
foo: {
bar: true
}
},
{
devmode: false
}
);
tree.startMutationTracking();
tree.get().foo; // eslint-disable-line
tree.get().foo.bar; // eslint-disable-line
const mutations = tree.clearMutationTracking();
expect(mutations).toEqual([]);
});
it("should track mutations for observed paths", () => {
const tree = new ProxyStateTree(
{
items: [
{
title: "foo"
},
{
title: "bar"
}
]
},
{
devmode: false
}
);
tree.addMutationListener(new Set(["items.0.title"]), () => {});
tree.startMutationTracking();
tree.get().items[0].title = "foo1";
delete tree.get().items[0].title;
tree.get().items[1].title = "bar2"; // this mutation should not be tracked
const mutations = tree.clearMutationTracking();
expect(mutations).toEqual([
{
method: "set",
path: "items.0.title",
args: ["foo1"]
},
{
method: "unset",
path: "items.0.title",
args: []
}
]);
});
>>>>>>>
test("should react to object array item value mutation", () => {
let reactionCount = 0;
const tree = new ProxyStateTree({
items: [
{
title: "foo"
},
{
title: "bar"
}
]
});
const state = tree.get();
const trackId = tree.startPathsTracking();
state.items.map(item => item.title);
const paths = tree.clearPathsTracking(trackId);
expect(paths).toEqual(
new Set(["items", "items.0", "items.0.title", "items.1", "items.1.title"])
);
tree.addMutationListener(paths, () => {
reactionCount++;
});
tree.startMutationTracking();
state.items[0].title = "baz";
tree.clearMutationTracking();
tree.flush();
expect(reactionCount).toBe(1);
});
test("should react to int array item mutation", () => {
let reactionCount = 0;
const tree = new ProxyStateTree({
items: [1,2]
});
const state = tree.get();
const trackId = tree.startPathsTracking();
state.items.map(item => item);
const paths = tree.clearPathsTracking(trackId);
expect(paths).toEqual(
new Set(["items", "items.0","items.1"])
);
tree.addMutationListener(paths, () => {
reactionCount++;
});
tree.startMutationTracking();
state.items[0] = 99;
tree.clearMutationTracking();
tree.flush();
expect(reactionCount).toBe(1);
});
});
describe("PRODUCTION", () => {
it("should not track anything that isn't observed", () => {
const tree = new ProxyStateTree(
{
foo: {
bar: true
}
},
{
devmode: false
}
);
tree.startMutationTracking();
tree.get().foo; // eslint-disable-line
tree.get().foo.bar; // eslint-disable-line
const mutations = tree.clearMutationTracking();
expect(mutations).toEqual([]);
});
it("should track mutations for observed paths", () => {
const tree = new ProxyStateTree(
{
items: [
{
title: "foo"
},
{
title: "bar"
}
]
},
{
devmode: false
}
);
tree.addMutationListener(new Set(["items.0.title"]), () => {});
tree.startMutationTracking();
tree.get().items[0].title = "foo1";
delete tree.get().items[0].title;
tree.get().items[1].title = "bar2"; // this mutation should not be tracked
const mutations = tree.clearMutationTracking();
expect(mutations).toEqual([
{
method: "set",
path: "items.0.title",
args: ["foo1"]
},
{
method: "unset",
path: "items.0.title",
args: []
}
]);
}); |
<<<<<<<
import { Router, browserHistory } from 'react-router';
import { createStore, applyMiddleware } from 'redux';
import { routerMiddleware, syncHistoryWithStore } from 'react-router-redux';
=======
import { Router } from 'react-router';
>>>>>>>
import { Router, browserHistory } from 'react-router';
import { syncHistoryWithStore } from 'react-router-redux';
<<<<<<<
=======
import { browserHistory } from 'react-router';
>>>>>>>
<<<<<<<
import { fromJS } from 'immutable';
import sagaMiddleware from 'redux-saga';
=======
import configureStore from './store';
>>>>>>>
import configureStore from './store';
<<<<<<<
// Create the store with two middlewares
// 1. sagaMiddleware: Imports all the asynchronous flows ("sagas") from the
// sagas folder and triggers them
// 2. routerMiddleware: Syncs the location/URL path to the state
import rootReducer from './rootReducer';
import sagas from './sagas';
const createStoreWithMiddleware = applyMiddleware(
routerMiddleware(browserHistory), sagaMiddleware(...sagas)
)(createStore);
const store = createStoreWithMiddleware(rootReducer, fromJS({}));
const history = syncHistoryWithStore(browserHistory, store, {
selectLocationState: selectLocationSelector,
});
// Make reducers hot reloadable, see http://mxs.is/googmo
if (module.hot) {
module.hot.accept('./rootReducer', () => {
const nextRootReducer = require('./rootReducer').default;
store.replaceReducer(nextRootReducer);
});
}
=======
const store = configureStore();
>>>>>>>
// Create redux store with history
// this uses the singleton browserHistory provided by react-router
// Optionally, this could be changed to leverage a created history
// e.g. `const browserHistory = useRouterHistory(createBrowserHistory)();`
const initialState = {};
const store = configureStore(initialState, browserHistory);
// Sync history and store, as the react-router-redux reducer
// is under the non-default key ("routing"), selectLocationState
// must be provided for resolving how to retrieve the "route" in the state
const history = syncHistoryWithStore(browserHistory, store, {
selectLocationState: selectLocationSelector,
}); |
<<<<<<<
actions: [{
type: 'modify',
path: '../../app/routes.js',
pattern: /(\s{\n\s{6}path: '\*',)/g,
templateFile: './route/route.hbs',
}],
=======
actions: data => {
const actions = [];
if (reducerExists(data.component)) {
actions.push({
type: 'modify',
path: '../../app/routes.js',
pattern: /(\s{\n\s{6}path: '\*'\,)/g,
templateFile: './route/routeWithReducer.hbs',
});
} else {
actions.push({
type: 'modify',
path: '../../app/routes.js',
pattern: /(\s{\n\s{6}path: '\*'\,)/g,
templateFile: './route/route.hbs',
});
}
return actions;
},
>>>>>>>
actions: data => {
const actions = [];
if (reducerExists(data.component)) {
actions.push({
type: 'modify',
path: '../../app/routes.js',
pattern: /(\s{\n\s{6}path: '\*',)/g,
templateFile: './route/routeWithReducer.hbs',
});
} else {
actions.push({
type: 'modify',
path: '../../app/routes.js',
pattern: /(\s{\n\s{6}path: '\*',)/g,
templateFile: './route/route.hbs',
});
}
return actions;
}, |
<<<<<<<
module = tryRequire('makara');
=======
// After all engines are registered, apply i18n. It needs to know
// about the state of the current view engine in order to work. :/
module = tryRequire('dustjs-i18n');
>>>>>>>
module = tryRequire('makara');
// After all engines are registered, apply i18n. It needs to know
// about the state of the current view engine in order to work. :/
module = tryRequire('dustjs-i18n'); |
<<<<<<<
selectedTimeZoneOffset: null,
tableDataColumns: [
SC.Object.create(SCTable.Column, {
name: "Name",
valueKey: 'name',
width: 150
}),
SC.Object.create(SCTable.Column, {
name: "Value",
valueKey: 'value',
width: 150
})
],
=======
selectedTimeZoneOffset: null,
timezones: [
{'timezoneName': 'UTC-12', 'timezoneValue': -12},
{'timezoneName': 'UTC-11', 'timezoneValue': -11},
{'timezoneName': 'UTC-10', 'timezoneValue': -10},
{'timezoneName': 'UTC-9', 'timezoneValue': -9},
{'timezoneName': 'UTC-8', 'timezoneValue': -8},
{'timezoneName': 'UTC-7', 'timezoneValue': -7},
{'timezoneName': 'UTC-6','timezoneValue': -6},
{'timezoneName': 'UTC-5','timezoneValue': -5},
{'timezoneName': 'UTC-4','timezoneValue': -4},
{'timezoneName': 'UTC-3','timezoneValue': -3},
{'timezoneName': 'UTC-2','timezoneValue': -2},
{'timezoneName': 'UTC-1','timezoneValue': -1},
{'timezoneName': 'UTC0','timezoneValue': 0},
{'timezoneName': 'UTC+1','timezoneValue': 1},
{'timezoneName': 'UTC+2','timezoneValue': 2},
{'timezoneName': 'UTC+3','timezoneValue': 3},
{'timezoneName': 'UTC+4','timezoneValue': 4},
{'timezoneName': 'UTC+5','timezoneValue': -5},
{'timezoneName': 'UTC+6','timezoneValue': 6},
{'timezoneName': 'UTC+7','timezoneValue': -7},
{'timezoneName': 'UTC+8','timezoneValue': -8},
{'timezoneName': 'UTC+9','timezoneValue': -9},
{'timezoneName': 'UTC+10','timezoneValue': 10},
{'timezoneName': 'UTC+11','timezoneValue': 11},
{'timezoneName': 'UTC+12','timezoneValue': 12}
],
>>>>>>>
selectedTimeZoneOffset: null,
tableDataColumns: [
SC.Object.create(SCTable.Column, {
name: "Name",
valueKey: 'name',
width: 150
}),
SC.Object.create(SCTable.Column, {
name: "Value",
valueKey: 'value',
width: 150
})
],
selectedTimeZoneOffset: null,
timezones: [
{'timezoneName': 'UTC-12', 'timezoneValue': -12},
{'timezoneName': 'UTC-11', 'timezoneValue': -11},
{'timezoneName': 'UTC-10', 'timezoneValue': -10},
{'timezoneName': 'UTC-9', 'timezoneValue': -9},
{'timezoneName': 'UTC-8', 'timezoneValue': -8},
{'timezoneName': 'UTC-7', 'timezoneValue': -7},
{'timezoneName': 'UTC-6','timezoneValue': -6},
{'timezoneName': 'UTC-5','timezoneValue': -5},
{'timezoneName': 'UTC-4','timezoneValue': -4},
{'timezoneName': 'UTC-3','timezoneValue': -3},
{'timezoneName': 'UTC-2','timezoneValue': -2},
{'timezoneName': 'UTC-1','timezoneValue': -1},
{'timezoneName': 'UTC0','timezoneValue': 0},
{'timezoneName': 'UTC+1','timezoneValue': 1},
{'timezoneName': 'UTC+2','timezoneValue': 2},
{'timezoneName': 'UTC+3','timezoneValue': 3},
{'timezoneName': 'UTC+4','timezoneValue': 4},
{'timezoneName': 'UTC+5','timezoneValue': -5},
{'timezoneName': 'UTC+6','timezoneValue': 6},
{'timezoneName': 'UTC+7','timezoneValue': -7},
{'timezoneName': 'UTC+8','timezoneValue': -8},
{'timezoneName': 'UTC+9','timezoneValue': -9},
{'timezoneName': 'UTC+10','timezoneValue': 10},
{'timezoneName': 'UTC+11','timezoneValue': 11},
{'timezoneName': 'UTC+12','timezoneValue': 12}
],
<<<<<<<
this.set('selectedTimeZoneOffset', (-1 * new Date().getTimezoneOffset() / 60));
},
=======
this.set('selectedTimeZoneOffset', (-1 * new Date().getTimezoneOffset() / 60));},
>>>>>>>
this.set('selectedTimeZoneOffset', (-1 * new Date().getTimezoneOffset() / 60));
}, |
<<<<<<<
}
export function hideRuntimeErrorWarning() {
return {
type: ActionTypes.HIDE_RUNTIME_ERROR_WARNING
};
}
export function showRuntimeErrorWarning() {
return {
type: ActionTypes.SHOW_RUNTIME_ERROR_WARNING
};
}
=======
}
export function startSketch() {
return (dispatch) => {
dispatch(clearConsole());
dispatch(startSketchAndRefresh());
};
}
export function startAccessibleSketch() {
return (dispatch) => {
dispatch(clearConsole());
dispatch(startAccessibleOutput());
dispatch(startSketchAndRefresh());
};
}
export function stopSketch() {
return (dispatch) => {
dispatch(stopAccessibleOutput());
dispatch(stopVisualSketch());
};
}
>>>>>>>
}
export function hideRuntimeErrorWarning() {
return {
type: ActionTypes.HIDE_RUNTIME_ERROR_WARNING
};
}
export function showRuntimeErrorWarning() {
return {
type: ActionTypes.SHOW_RUNTIME_ERROR_WARNING
};
}
export function startSketch() {
return (dispatch) => {
dispatch(clearConsole());
dispatch(startSketchAndRefresh());
};
}
export function startAccessibleSketch() {
return (dispatch) => {
dispatch(clearConsole());
dispatch(startAccessibleOutput());
dispatch(startSketchAndRefresh());
};
}
export function stopSketch() {
return (dispatch) => {
dispatch(stopAccessibleOutput());
dispatch(stopVisualSketch());
};
} |
<<<<<<<
import './Dropdown'
=======
import './Emoji'
import './EmojiPicker'
>>>>>>>
import './Dropdown'
import './Emoji'
import './EmojiPicker' |
<<<<<<<
autoWordWrap: PropTypes.bool,
=======
block: PropTypes.bool,
>>>>>>>
autoWordWrap: PropTypes.bool,
block: PropTypes.bool,
<<<<<<<
const {
autoWordWrap,
children,
className,
external,
href,
wordWrap,
...rest
} = props
const forceWordWrap = wordWrap || (autoWordWrap && shouldWordWrap(children))
const componentClassName = classNames(
'c-link',
forceWordWrap && 'is-word-wrap',
className
)
=======
const {
block,
children,
className,
external,
href,
...rest
} = props
const componentClassName = classNames(
'c-Link',
block && 'is-block',
className
)
>>>>>>>
const {
autoWordWrap,
block,
children,
className,
external,
href,
wordWrap,
...rest
} = props
const forceWordWrap = wordWrap || (autoWordWrap && shouldWordWrap(children))
const componentClassName = classNames(
'c-link',
block && 'is-block',
forceWordWrap && 'is-word-wrap',
className
) |
<<<<<<<
lockBodyOnOpen: false,
timeout: 0
=======
timeout: 200
>>>>>>>
lockBodyOnOpen: false,
timeout: 200
<<<<<<<
this.unlockBody()
}, ANIMATION_TIMEOUT)
=======
}, this.state.timeout)
>>>>>>>
this.unlockBody()
}, this.state.timeout) |
<<<<<<<
const InMemoryStorage = require('../test/mockups/in-memory-storage');
const H5PEditorConfig = require('../src/config');
const FileLibraryManager = require('../test/mockups/file-library-manager');
const User = require('../test/mockups/user');
=======
const server = express();
const bodyParser = require('body-parser');
>>>>>>>
const InMemoryStorage = require('../test/mockups/in-memory-storage');
const H5PEditorConfig = require('../src/config');
const FileLibraryManager = require('../test/mockups/file-library-manager');
const User = require('../test/mockups/user');
const server = express();
const bodyParser = require('body-parser');
<<<<<<<
server.use(h5pRoute, express.static(`${path.resolve('')}/h5p`));
=======
server.use(bodyParser.json());
server.use(
bodyParser.urlencoded({
extended: true
})
);
server.use(h5p_route, express.static(`${path.resolve('')}/h5p`));
>>>>>>>
server.use(bodyParser.json());
server.use(
bodyParser.urlencoded({
extended: true
})
);
server.use(h5pRoute, express.static(`${path.resolve('')}/h5p`)); |
<<<<<<<
await expect(repository.install("H5P.Blanks")).rejects.toThrow("hub-install-denied");
=======
await expect(repository.install("H5P.Dialogcards")).resolves.toBe(true);
await expect(repository.install("H5P.ImageHotspotQuestion")).rejects.toThrow("hub-install-denied");
>>>>>>>
await expect(repository.install("H5P.ImageHotspotQuestion")).rejects.toThrow("hub-install-denied"); |
<<<<<<<
.addRuleWhen(this._librariesMustBeValid, checkLibraries)
.addRule(throwErrorsNow)
.addRule(this._returnTrue)
=======
.addRuleWhen(this._librariesMustBeValid.bind(this), checkLibraries)
.addRule(throwErrorsNow.bind(this))
>>>>>>>
.addRuleWhen(this._librariesMustBeValid.bind(this), checkLibraries)
.addRule(throwErrorsNow.bind(this))
.addRule(this._returnTrue)
<<<<<<<
_librariesMustBeValid = async (zipEntries, error) => {
const tld = getTopLevelDirectories(zipEntries);
=======
async _librariesMustBeValid(zipEntries, error) {
const tld = H5pPackageValidator._getTopLevelDirectories(zipEntries);
>>>>>>>
async _librariesMustBeValid(zipEntries, error) {
const tld = getTopLevelDirectories(zipEntries); |
<<<<<<<
require("@babel/register");
=======
require("@babel/core");
>>>>>>>
require("@babel/core");
require("@babel/register");
<<<<<<<
const shortid = require('shortid');
const LibraryManager = require('../src/library-manager');
const FileLibraryStorage = require('../src/file-library-storage');
=======
const FileLibraryManager = require('../test/mockups/file-library-manager');
>>>>>>>
const LibraryManager = require('../src/library-manager');
const FileLibraryStorage = require('../src/file-library-storage');
<<<<<<<
},
saveContent: (contentId, content) => {
return new Promise(resolve => {
const dir = `${path.resolve(
''
)}/h5p/content/${contentId}/content`;
mkdirp(dir, () => {
fs.writeFile(
`${dir}/content.json`,
JSON.stringify(content),
'utf8',
() => {
resolve();
=======
});
},
loadLanguage: (machineName, majorVersion, minorVersion, language) => {
return new Promise(resolve => {
try {
resolve(
require(`../h5p/libraries/${machineName}-${majorVersion}.${minorVersion}/language/${language}.json`)
);
} catch (error) {
resolve(null);
}
});
},
listLanguages: (machineName, majorVersion, minorVersion) => {
return new Promise(resolve => {
try {
fs.readdir(
`${path.resolve()}/h5p/libraries/${machineName}-${majorVersion}.${minorVersion}/language`,
(error, files) => {
if (error) {
resolve([]);
>>>>>>>
},
saveContent: (contentId, content) => {
return new Promise(resolve => {
const dir = `${path.resolve(
''
)}/h5p/content/${contentId}/content`;
mkdirp(dir, () => {
fs.writeFile(
`${dir}/content.json`,
JSON.stringify(content),
'utf8',
() => {
resolve();
<<<<<<<
return new Promise(y => fs.mkdir(path.dirname(fullPath), { recursive: true }, y))
.then(() => new Promise(y =>
stream.pipe(fs.createWriteStream(fullPath))
.on('finish', y)))
},
saveContentFile: (id, filePath, stream) => {
const fullPath = `h5p/content/${id}/${filePath}`;
=======
return new Promise(y => fs.mkdir(path.dirname(fullPath), { recursive: true }, y))
.then(() => new Promise(y =>
stream.pipe(fs.createWriteStream(fullPath))
.on('finish', y)))
},
saveContentFile2: (id, filePath, stream) => {
const fullPath = `h5p/content/${id}/${filePath}`;
>>>>>>>
return new Promise(y => fs.mkdir(path.dirname(fullPath), { recursive: true }, y))
.then(() => new Promise(y =>
stream.pipe(fs.createWriteStream(fullPath))
.on('finish', y)))
},
saveContentFile2: (id, filePath, stream) => {
const fullPath = `h5p/content/${id}/${filePath}`;
<<<<<<<
start();
=======
server.listen(process.env.PORT || 8080, () => {
console.log(`server running at http://${os.hostname()}:${process.env.PORT || 8080}`);
});
>>>>>>>
start(); |
<<<<<<<
import * as EditorHiddenActions from '../actions/editorHidden';
import { getFile, getHTMLFile, getJSFiles, getCSSFiles } from '../reducers/files';
=======
import * as PreferencesActions from '../actions/preferences';
import { getFile, getHTMLFile, getJSFiles, getCSSFiles, setSelectedFile } from '../reducers/files';
>>>>>>>
import * as EditorHiddenActions from '../actions/editorHidden';
import * as PreferencesActions from '../actions/preferences';
import { getFile, getHTMLFile, getJSFiles, getCSSFiles, setSelectedFile } from '../reducers/files'; |
<<<<<<<
var _ = window.jarn.i18n.MessageFactory("bika");
var curDate = new Date();
var y = curDate.getFullYear();
var limitString = "1900:" + y;
var dateFormat = _("date_format_short_datepicker");
$("input.datepicker").live("click", function() {
$(this).datepicker({
showOn:"focus",
showAnim:"",
changeMonth:true,
changeYear:true,
dateFormat: dateFormat,
yearRange: limitString
})
.click(function(){$(this).attr("value", "");})
.focus();
});
$("input.datepicker_nofuture").live("click", function() {
$(this).datepicker({
showOn:"focus",
showAnim:"",
changeMonth:true,
changeYear:true,
maxDate: curDate,
dateFormat: dateFormat,
yearRange: limitString
})
.click(function(){$(this).attr("value", "");})
.focus();
});
$("input.datepicker_2months").live("click", function() {
$(this).datepicker({
showOn:"focus",
showAnim:"",
changeMonth:true,
changeYear:true,
maxDate: "+0d",
numberOfMonths: 2,
dateFormat: dateFormat,
yearRange: limitString
})
.click(function(){$(this).attr("value", "");})
.focus();
});
// Analysis Service popup trigger
$(".service_title").live("click", function(){
var dialog = $("<div></div>");
dialog
.load(window.portal_url + "/analysisservice_popup",
{"service_title":$(this).text(),
"analysis_uid":$(this).parents("tr").attr("uid"),
"_authenticator": $("input[name='_authenticator']").val()}
)
.dialog({
width:450,
height:450,
closeText: _("Close"),
resizable:true,
title: $(this).text()
});
});
$(".numeric").live("keypress", function(event) {
// Backspace, tab, enter, end, home, left, right, ., <, >, and -
// We don't support the del key in Opera because del == . == 46.
var allowedKeys = [8, 9, 13, 35, 36, 37, 39, 46, 60, 62, 45];
// IE doesn't support indexOf
var isAllowedKey = allowedKeys.join(",").match(new RegExp(event.which));
// Some browsers just don't raise events for control keys. Easy.
// e.g. Safari backspace.
if (!event.which || // Control keys in most browsers. e.g. Firefox tab is 0
(48 <= event.which && event.which <= 57) || // Always 0 through 9
isAllowedKey) { // Opera assigns values for control keys.
return;
} else {
event.preventDefault();
}
});
// Archetypes :int and IntegerWidget inputs get filtered
$("input[name*='\\:int'], .ArchetypesIntegerWidget input").keyup(function(e) {
if (/\D/g.test(this.value)) {
this.value = this.value.replace(/\D/g, "");
}
});
// Archetypes :float and DecimalWidget inputs get filtered
$("input[name*='\\:float'], .ArchetypesDecimalWidget input").keyup(function(e) {
if (/[^.\d]/g.test(this.value)) {
this.value = this.value.replace(/[^.\d]/g, "");
}
});
// Check instrument validity and add an alert if needed
$.ajax({
url: window.portal_url + "/get_instruments_alerts",
type: 'POST',
data: {'_authenticator': $('input[name="_authenticator"]').val() },
dataType: 'json'
}).done(function(data) {
if (data != null) {
$('#portal-alert').remove();
var html = "<div id='portal-alert' style='display:none'>";
var outofdate = data['out-of-date'];
if (outofdate.length > 0) {
// Out of date alert
html += "<p class='title'>"+outofdate.length+_(" instruments are out-of-date")+":</p>";
html += "<p>";
$.each(outofdate, function(index, value){
var hrefinstr = value['url']+"/certifications";
var titleinstr = value['title'];
var anchor = "<a href='"+hrefinstr+"'>"+titleinstr+"</a>";
if (index == 0) {
html += anchor;
} else {
html += ", "+anchor;
}
})
html += "</p>";
}
var qcfail = data['qc-fail'];
if (qcfail.length > 0) {
// QC Fail alert
html += "<p class='title'>"+qcfail.length+_(" instruments with QC Internal Calibration Tests failed")+":</p>";
html += "<p>";
$.each(qcfail, function(index, value){
var hrefinstr = value['url']+"/referenceanalyses";
var titleinstr = value['title'];
var anchor = "<a href='"+hrefinstr+"'>"+titleinstr+"</a>";
if (index == 0) {
html += anchor;
} else {
html += ", "+anchor;
}
})
html += "</p>";
}
html += "</div>"
$('#portal-header').append(html);
$('#portal-alert').fadeIn(2000);
}
});
=======
_ = jarn.i18n.MessageFactory('bika');
PMF = jarn.i18n.MessageFactory('plone');
var curDate = new Date();
var y = curDate.getFullYear();
var limitString = '1900:' + y;
var dateFormat = _("date_format_short_datepicker");
$('input.datepicker').live('click', function() {
$(this).datepicker({
showOn:'focus',
showAnim:'',
changeMonth:true,
changeYear:true,
dateFormat: dateFormat,
yearRange: limitString
})
.click(function(){$(this).attr('value', '');})
.focus();
});
$('input.datepicker_nofuture').live('click', function() {
$(this).datepicker({
showOn:'focus',
showAnim:'',
changeMonth:true,
changeYear:true,
maxDate: curDate,
dateFormat: dateFormat,
yearRange: limitString
})
.click(function(){$(this).attr('value', '');})
.focus();
});
$('input.datepicker_2months').live('click', function() {
$(this).datepicker({
showOn:'focus',
showAnim:'',
changeMonth:true,
changeYear:true,
maxDate: '+0d',
numberOfMonths: 2,
dateFormat: dateFormat,
yearRange: limitString
})
.click(function(){$(this).attr('value', '');})
.focus();
});
// Analysis Service popup trigger
$(".service_title").live('click', function(){
var dialog = $('<div></div>');
dialog
.load(window.portal_url + "/analysisservice_popup",
{'service_title':$(this).find("span[class^='state']").html(),
'analysis_uid':$(this).parents('tr').attr('uid'),
'_authenticator': $('input[name="_authenticator"]').val()}
)
.dialog({
width:450,
height:450,
closeText: _("Close"),
resizable:true,
title: $(this).text()
});
});
$(".numeric").live('keypress', function(event) {
// Backspace, tab, enter, end, home, left, right, ., <, >, and -
// We don't support the del key in Opera because del == . == 46.
var allowedKeys = [8, 9, 13, 35, 36, 37, 39, 46, 60, 62, 45];
// IE doesn't support indexOf
var isAllowedKey = allowedKeys.join(",").match(new RegExp(event.which));
// Some browsers just don't raise events for control keys. Easy.
// e.g. Safari backspace.
if (!event.which || // Control keys in most browsers. e.g. Firefox tab is 0
(48 <= event.which && event.which <= 57) || // Always 0 through 9
isAllowedKey) { // Opera assigns values for control keys.
return;
} else {
event.preventDefault();
}
});
// Archetypes :int and IntegerWidget inputs get filtered
$("input[name*='\\:int'], .ArchetypesIntegerWidget input").keyup(function(e) {
if (/\D/g.test(this.value)) {
this.value = this.value.replace(/\D/g, '');
}
});
// Archetypes :float and DecimalWidget inputs get filtered
$("input[name*='\\:float'], .ArchetypesDecimalWidget input").keyup(function(e) {
if (/[^.\d]/g.test(this.value)) {
this.value = this.value.replace(/[^.\d]/g, '');
}
});
>>>>>>>
var _ = window.jarn.i18n.MessageFactory("bika");
var curDate = new Date();
var y = curDate.getFullYear();
var limitString = "1900:" + y;
var dateFormat = _("date_format_short_datepicker");
$("input.datepicker").live("click", function() {
$(this).datepicker({
showOn:"focus",
showAnim:"",
changeMonth:true,
changeYear:true,
dateFormat: dateFormat,
yearRange: limitString
})
.click(function(){$(this).attr("value", "");})
.focus();
});
$("input.datepicker_nofuture").live("click", function() {
$(this).datepicker({
showOn:"focus",
showAnim:"",
changeMonth:true,
changeYear:true,
maxDate: curDate,
dateFormat: dateFormat,
yearRange: limitString
})
.click(function(){$(this).attr("value", "");})
.focus();
});
$("input.datepicker_2months").live("click", function() {
$(this).datepicker({
showOn:"focus",
showAnim:"",
changeMonth:true,
changeYear:true,
maxDate: "+0d",
numberOfMonths: 2,
dateFormat: dateFormat,
yearRange: limitString
})
.click(function(){$(this).attr("value", "");})
.focus();
});
// Analysis Service popup trigger
$(".service_title").live("click", function(){
var dialog = $("<div></div>");
dialog
.load(window.portal_url + "/analysisservice_popup",
{'service_title':$(this).find("span[class^='state']").html(),
"analysis_uid":$(this).parents("tr").attr("uid"),
"_authenticator": $("input[name='_authenticator']").val()}
)
.dialog({
width:450,
height:450,
closeText: _("Close"),
resizable:true,
title: $(this).text()
});
});
$(".numeric").live("keypress", function(event) {
// Backspace, tab, enter, end, home, left, right, ., <, >, and -
// We don't support the del key in Opera because del == . == 46.
var allowedKeys = [8, 9, 13, 35, 36, 37, 39, 46, 60, 62, 45];
// IE doesn't support indexOf
var isAllowedKey = allowedKeys.join(",").match(new RegExp(event.which));
// Some browsers just don't raise events for control keys. Easy.
// e.g. Safari backspace.
if (!event.which || // Control keys in most browsers. e.g. Firefox tab is 0
(48 <= event.which && event.which <= 57) || // Always 0 through 9
isAllowedKey) { // Opera assigns values for control keys.
return;
} else {
event.preventDefault();
}
});
// Archetypes :int and IntegerWidget inputs get filtered
$("input[name*='\\:int'], .ArchetypesIntegerWidget input").keyup(function(e) {
if (/\D/g.test(this.value)) {
this.value = this.value.replace(/\D/g, "");
}
});
// Archetypes :float and DecimalWidget inputs get filtered
$("input[name*='\\:float'], .ArchetypesDecimalWidget input").keyup(function(e) {
if (/[^.\d]/g.test(this.value)) {
this.value = this.value.replace(/[^.\d]/g, "");
}
});
// Check instrument validity and add an alert if needed
$.ajax({
url: window.portal_url + "/get_instruments_alerts",
type: 'POST',
data: {'_authenticator': $('input[name="_authenticator"]').val() },
dataType: 'json'
}).done(function(data) {
if (data != null) {
$('#portal-alert').remove();
var html = "<div id='portal-alert' style='display:none'>";
var outofdate = data['out-of-date'];
if (outofdate.length > 0) {
// Out of date alert
html += "<p class='title'>"+outofdate.length+_(" instruments are out-of-date")+":</p>";
html += "<p>";
$.each(outofdate, function(index, value){
var hrefinstr = value['url']+"/certifications";
var titleinstr = value['title'];
var anchor = "<a href='"+hrefinstr+"'>"+titleinstr+"</a>";
if (index == 0) {
html += anchor;
} else {
html += ", "+anchor;
}
})
html += "</p>";
}
var qcfail = data['qc-fail'];
if (qcfail.length > 0) {
// QC Fail alert
html += "<p class='title'>"+qcfail.length+_(" instruments with QC Internal Calibration Tests failed")+":</p>";
html += "<p>";
$.each(qcfail, function(index, value){
var hrefinstr = value['url']+"/referenceanalyses";
var titleinstr = value['title'];
var anchor = "<a href='"+hrefinstr+"'>"+titleinstr+"</a>";
if (index == 0) {
html += anchor;
} else {
html += ", "+anchor;
}
})
html += "</p>";
}
html += "</div>"
$('#portal-header').append(html);
$('#portal-alert').fadeIn(2000);
}
}); |
<<<<<<<
['SampleView',
'RejectionKickOff'],
=======
['SampleView'],
// Samples fodler
".portaltype-samplesfolder":
['SamplesFolderView'],
>>>>>>>
['SampleView',
'RejectionKickOff'],
// Samples fodler
".portaltype-samplesfolder":
['SamplesFolderView'], |
<<<<<<<
export const SET_UNSAVED_CHANGES = 'SET_UNSAVED_CHANGES';
=======
export const DETECT_INFINITE_LOOPS = 'DETECT_INFINITE_LOOPS';
export const RESET_INFINITE_LOOPS = 'RESET_INFINITE_LOOPS';
>>>>>>>
export const SET_UNSAVED_CHANGES = 'SET_UNSAVED_CHANGES';
export const DETECT_INFINITE_LOOPS = 'DETECT_INFINITE_LOOPS';
export const RESET_INFINITE_LOOPS = 'RESET_INFINITE_LOOPS'; |
<<<<<<<
if (channel && !slack.channel) {
return res
.status(500)
.json({ msg: `Channel not found "${channel}"` });
=======
let chanId;
if (channels) {
let channel = req.body.channel;
if (!channels.includes(channel)) {
return res
.status(400)
.send({ msg: 'Not a permitted channel' });
}
chanId = slack.getChannelId(channel);
if (!chanId) {
return res
.status(400)
.send({ msg: `Channel not found "${channel}"` });
}
>>>>>>>
let chanId;
if (channels) {
let channel = req.body.channel;
if (!channels.includes(channel)) {
return res
.status(400)
.json({ msg: 'Not a permitted channel' });
}
chanId = slack.getChannelId(channel);
if (!chanId) {
return res
.status(400)
.json({ msg: `Channel not found "${channel}"` });
} |
<<<<<<<
displayName: displayName,
render: function() {
=======
displayName: "MobXStoreInjector",
render: function () {
>>>>>>>
displayName: displayName,
render: function () {
<<<<<<<
return observer(createStoreInjector(grabStoresFn, componentClass, grabStoresFn.name));
=======
let injected = createStoreInjector(grabStoresFn, componentClass);
injected.isMobxInjector = false; // supress warning
injected = observer(injected);
injected.isMobxInjector = true; // restore warning
return injected;
>>>>>>>
injected = observer(injected);
injected.isMobxInjector = true; // restore warning
return injected;
<<<<<<<
storeNames[i] = arguments[i];
grabStoresFn = grabStoresByName(storeNames);
return function(componentClass) {
return createStoreInjector(grabStoresFn, componentClass, storeNames.join("_"));
=======
storesNames[i] = arguments[i];
grabStoresFn = grabStoresByName(storesNames);
return function (componentClass) {
return createStoreInjector(grabStoresFn, componentClass);
>>>>>>>
storeNames[i] = arguments[i];
grabStoresFn = grabStoresByName(storeNames);
return function (componentClass) {
return createStoreInjector(grabStoresFn, componentClass, storeNames.join("-")); |
<<<<<<<
};
function observableTypeChecker (type) {
return function(props, propName, componentName) {
if (!mobx['isObservable' + type](props[propName])) {
return new Error(
'Invalid prop `' + propName + '` supplied to' +
' `' + componentName + '`. Expected a mobx observable ' + type + '. Validation failed.'
);
}
};
}
// oneOfType is used for simple isRequired chaining
var propTypes = {
observableArray: React.PropTypes.oneOfType([observableTypeChecker('Array')]),
observableMap: React.PropTypes.oneOfType([observableTypeChecker('Map')]),
observableObject: React.PropTypes.oneOfType([observableTypeChecker('Object')]),
arrayOrObsArray: React.PropTypes.oneOfType([
React.PropTypes.array,
observableTypeChecker('Array')
]),
objectOrObsObject: React.PropTypes.oneOfType([
React.PropTypes.object,
observableTypeChecker('Object')
])
};
=======
Injector.contextTypes = { mobxStores: PropTypes.object };
return Injector;
}
>>>>>>>
Injector.contextTypes = { mobxStores: PropTypes.object };
return Injector;
}
/**
* PropTypes
*/
function observableTypeChecker (type) {
return function(props, propName, componentName) {
if (!mobx['isObservable' + type](props[propName])) {
return new Error(
'Invalid prop `' + propName + '` supplied to' +
' `' + componentName + '`. Expected a mobx observable ' + type + '. Validation failed.'
);
}
};
}
// oneOfType is used for simple isRequired chaining
var propTypes = {
observableArray: React.PropTypes.oneOfType([observableTypeChecker('Array')]),
observableMap: React.PropTypes.oneOfType([observableTypeChecker('Map')]),
observableObject: React.PropTypes.oneOfType([observableTypeChecker('Object')]),
arrayOrObservableArray: React.PropTypes.oneOfType([
React.PropTypes.array,
observableTypeChecker('Array')
]),
objectOrObservableObject: React.PropTypes.oneOfType([
React.PropTypes.object,
observableTypeChecker('Object')
])
};
<<<<<<<
propTypes: propTypes,
=======
Provider: Provider,
>>>>>>>
Provider: Provider,
propTypes: propTypes, |
<<<<<<<
const urlRoot = 'https://zh-hans.reactjs.org';
const version = '16.14.0';
=======
const urlRoot = 'https://reactjs.org';
const version = '17.0.0';
>>>>>>>
const urlRoot = 'https://zh-hans.reactjs.org';
const version = '17.0.0'; |
<<<<<<<
debug('exec', this.name)
func(this.server, this.opts, cb)
}
Plugin.prototype.enqueue = function (obj, cb) {
debug('enqueue', this.name, obj.name)
this.q.push(obj, cb)
=======
// we must defer the loading of the plugin until the
// current execution has ended
process.nextTick(() => {
var promise = func(this.server, this.opts, done)
if (promise && typeof promise.then === 'function') {
promise.then(() => done()).catch(done)
}
})
function done (err) {
if (completed) {
return
}
completed = true
cb(err)
}
>>>>>>>
debug('exec', this.name)
var promise = func(this.server, this.opts, done)
if (promise && typeof promise.then === 'function') {
promise.then(() => done()).catch(done)
}
function done (err) {
if (completed) {
return
}
completed = true
cb(err)
}
}
Plugin.prototype.enqueue = function (obj, cb) {
debug('enqueue', this.name, obj.name)
this.q.push(obj, cb) |
<<<<<<<
shareModalProjectId: null,
shareModalProjectName: null,
shareModalProjectUsername: null,
=======
shareModalProjectId: 'abcd',
shareModalProjectName: 'My Cute Sketch',
shareModalProjectUsername: 'p5_user',
sketchlistModalVisible: false,
>>>>>>>
shareModalProjectId: 'abcd',
shareModalProjectName: 'My Cute Sketch',
shareModalProjectUsername: 'p5_user', |
<<<<<<<
},
Modal: {
background: grays.light,
border: grays.middleLight
}
=======
},
Separator: grays.middleLight,
>>>>>>>
},
Modal: {
background: grays.light,
border: grays.middleLight
},
Separator: grays.middleLight,
<<<<<<<
},
Modal: {
background: grays.dark,
border: grays.middleDark
}
=======
},
Separator: grays.middleDark,
>>>>>>>
},
Modal: {
background: grays.dark,
border: grays.middleDark
},
Separator: grays.middleDark,
<<<<<<<
},
Modal: {
background: grays.dark,
border: grays.middleDark
}
=======
},
Separator: grays.middleDark,
>>>>>>>
},
Modal: {
background: grays.dark,
border: grays.middleDark
},
Separator: grays.middleDark, |
<<<<<<<
tape('should load with callback', function(assert) {
new Bridge({ xml: xml.a, base:__dirname + '/' }, function(err, source) {
=======
it('should load with callback', function(done) {
new Bridge({ xml: xml.a, base:path.join(__dirname,'/') }, function(err, source) {
>>>>>>>
tape('should load with callback', function(assert) {
new Bridge({ xml: xml.a, base:path.join(__dirname,'/') }, function(err, source) {
<<<<<<<
tape('should load query params', function(assert) {
new Bridge('bridge://' + path.resolve(__dirname + '/test-a.xml?blank=1'), function(err, source) {
=======
it('should load query params', function(done) {
new Bridge('bridge://' + path.resolve(path.join(__dirname,'/test-a.xml?blank=1')), function(err, source) {
>>>>>>>
tape('should load query params', function(assert) {
new Bridge('bridge://' + path.resolve(path.join(__dirname,'/test-a.xml?blank=1')), function(err, source) {
<<<<<<<
tape('#open should call all listeners', function(assert) {
var b = new Bridge({ xml: xml.a, base:__dirname + '/' });
=======
it('#open should call all listeners', function(done) {
var b = new Bridge({ xml: xml.a, base:path.join(__dirname,'/') });
>>>>>>>
tape('#open should call all listeners', function(assert) {
var b = new Bridge({ xml: xml.a, base:path.join(__dirname,'/') });
<<<<<<<
tape('should get info', function(assert) {
new Bridge({ xml: xml.a, base:__dirname + '/' }, function(err, source) {
=======
it('should get info', function(done) {
new Bridge({ xml: xml.a, base:path.join(__dirname,'/') }, function(err, source) {
>>>>>>>
tape('should get info', function(assert) {
new Bridge({ xml: xml.a, base:path.join(__dirname,'/') }, function(err, source) {
<<<<<<<
tape('should update xml', function(assert) {
new Bridge({ xml: xml.a, base:__dirname + '/' }, function(err, source) {
=======
it('should update xml', function(done) {
new Bridge({ xml: xml.a, base:path.join(__dirname,'/') }, function(err, source) {
>>>>>>>
tape('should update xml', function(assert) {
new Bridge({ xml: xml.a, base:path.join(__dirname,'/') }, function(err, source) {
<<<<<<<
tape('setup', function(assert) {
new Bridge({ xml:xml.a, base:__dirname + '/', blank:true }, function(err, s) {
=======
before(function(done) {
new Bridge({ xml:xml.a, base:path.join(__dirname,'/'), blank:true }, function(err, s) {
>>>>>>>
tape('setup', function(assert) {
new Bridge({ xml:xml.a, base:path.join(__dirname,'/'), blank:true }, function(err, s) { |
<<<<<<<
self.connectionStatus = ko.computed(function () {
var result = "";
if (self.isReceiving()) {
if (self.isFirewalled()) {
if (self.localRelays()!=null && self.localRelays()>0) {
result = "firewalledRelaying";
}
else {
result = "firewalled";
}
}
else if (self.isRelayFull()) {
if (self.localRelays()!=null && self.localRelays()>0) {
result = "relayFull";
}
else {
result = "notRelayable";
}
}
else {
result = "relayable";
}
}
else {
result = "notReceiving";
}
return result;
});
=======
self.isSourceTracker = ko.computed(function() {
for (var i in self.connections()) {
var conn = self.connections()[i];
if ($.inArray("tracker", conn.remoteHostStatus())>=0) return true;
}
return false;
});
>>>>>>>
self.connectionStatus = ko.computed(function () {
var result = "";
if (self.isReceiving()) {
if (self.isFirewalled()) {
if (self.localRelays()!=null && self.localRelays()>0) {
result = "firewalledRelaying";
}
else {
result = "firewalled";
}
}
else if (self.isRelayFull()) {
if (self.localRelays()!=null && self.localRelays()>0) {
result = "relayFull";
}
else {
result = "notRelayable";
}
}
else {
result = "relayable";
}
}
else {
result = "notReceiving";
}
return result;
});
self.isSourceTracker = ko.computed(function() {
for (var i in self.connections()) {
var conn = self.connections()[i];
if ($.inArray("tracker", conn.remoteHostStatus())>=0) return true;
}
return false;
}); |
<<<<<<<
var src = config.themeSrc + '/resources/javascripts/main.js';
var dest = {
dev: config.themeDev + '/resources/javascripts/',
prod: config.themeProd + '/resources/javascripts/'
};
var bundleMethod = global.isWatching ? watchify : browserify;
var bundler = browserify({
// Specify the entry point of your app
entries: [src],
// Add file extentions to make optional in your requires
extensions: ['.coffee', '.hbs']
//debug: true
});
var bundle = function() {
// Log when bundling starts
bundleLogger.start();
return bundler
// Enable source maps!
.bundle()
// Report compile errors
.on('error', handleErrors)
// Use vinyl-source-stream to make the
// stream gulp compatible. Specifiy the
// desired output filename here.
.pipe(source('app.js'))
// Specify the output destination
.pipe(gulpif(argv.prod, gulp.dest(dest.prod), gulp.dest(dest.dev)))
.pipe(reload({stream:true, once: true}))
// Log when bundling completes!
.on('end', bundleLogger.end);
};
if(global.isWatching) {
// Rebundle with watchify on changes.
bundler.on('update', bundle);
}
return bundle();
=======
var bundler = browserify({
// Required watchify args
cache: {}, packageCache: {}, fullPaths: true,
// Specify the entry point of your app
entries: ['./src/javascript/app.coffee'],
// Add file extentions to make optional in your requires
extensions: ['.coffee', '.hbs'],
// Enable source maps!
debug: true
});
var bundle = function() {
// Log when bundling starts
bundleLogger.start();
return bundler
.bundle()
// Report compile errors
.on('error', handleErrors)
// Use vinyl-source-stream to make the
// stream gulp compatible. Specifiy the
// desired output filename here.
.pipe(source('app.js'))
// Specify the output destination
.pipe(gulp.dest('./build/'))
// Log when bundling completes!
.on('end', bundleLogger.end);
};
if(global.isWatching) {
bundler = watchify(bundler);
// Rebundle with watchify on changes.
bundler.on('update', bundle);
}
return bundle();
>>>>>>>
var src = config.themeSrc + '/resources/javascripts/main.js';
// Required watchify args
var dest = {
dev: config.themeDev + '/resources/javascripts/',
prod: config.themeProd + '/resources/javascripts/'
};
var bundler = browserify({
// Required watchify args
cache: {}, packageCache: {}, fullPaths: true,
// Specify the entry point of your app
entries: [src],
// Add file extentions to make optional in your requires
extensions: ['.coffee', '.hbs']
//debug: true
});
var bundle = function() {
// Log when bundling starts
bundleLogger.start();
return bundler
// Enable source maps!
.bundle()
// Report compile errors
.on('error', handleErrors)
// Use vinyl-source-stream to make the
// stream gulp compatible. Specifiy the
// desired output filename here.
.pipe(source('app.js'))
// Specify the output destination
.pipe(gulpif(argv.prod, gulp.dest(dest.prod), gulp.dest(dest.dev)))
.pipe(reload({stream:true, once: true}))
// Log when bundling completes!
.on('end', bundleLogger.end);
};
if(global.isWatching) {
bundler = watchify(bundler);
// Rebundle with watchify on changes.
bundler.on('update', bundle);
}
return bundle(); |
<<<<<<<
=======
import Pressable from '@enact/ui/Pressable';
import Pure from '@enact/ui/internal/Pure';
>>>>>>>
import Pure from '@enact/ui/internal/Pure';
<<<<<<<
const MoonstoneButton = Uppercase(
TooltipDecorator(
MarqueeDecorator(
{className: componentCss.marquee},
Touchable(
{activeProp: 'pressed'},
Spottable(
Skinnable(
Base
=======
const MoonstoneButton = Pure(
Uppercase(
TooltipDecorator(
MarqueeDecorator(
{className: componentCss.marquee},
Pressable(
Spottable(
Skinnable(
Base
)
>>>>>>>
const MoonstoneButton = Pure(
Uppercase(
TooltipDecorator(
MarqueeDecorator(
{className: componentCss.marquee},
Touchable(
Spottable(
Skinnable(
Base
) |
<<<<<<<
const expected = 100;
const actual = resultScrollTop;
expect(actual).toBe(expected);
=======
>>>>>>>
<<<<<<<
test('should call onScrollStop once', () => {
=======
it('should call onScrollStop once', (done) => {
const onScrollStop = handlerOnScrollStop(done, () => {
const expected = 1;
const actual = onScrollStopCount;
expect(actual).to.equal(expected);
});
>>>>>>>
test('should call onScrollStop once', (done) => {
const onScrollStop = handlerOnScrollStop(done, () => {
const expected = 1;
const actual = onScrollStopCount;
expect(actual).toBe(expected);
});
<<<<<<<
const expected = 1;
const actual = onScrollStopCount;
expect(actual).toBe(expected);
=======
>>>>>>> |
<<<<<<<
=======
import {privatePressable as Pressable} from '@enact/ui/Pressable';
>>>>>>>
<<<<<<<
const IncrementSliderBaseFactory = factory({css: componentCss}, ({css}) => {
const Slider = Touchable({activeProp: 'pressed'}, Spottable(Skinnable(SliderBaseFactory({css}))));
=======
const PrivateIncrementSliderBaseFactory = factory({css: componentCss}, ({css}) => {
const Slider = Pressable(Spottable(Skinnable(SliderBaseFactory({css}))));
>>>>>>>
const PrivateIncrementSliderBaseFactory = factory({css: componentCss}, ({css}) => {
const Slider = Touchable({activeProp: 'pressed'}, Spottable(Skinnable(SliderBaseFactory({css})))); |
<<<<<<<
UNSAFE_componentWillReceiveProps (nextProps) {
// while transitioning, we set `popupOpen` with the given `open` prop value
if (!this.props.noAnimation && this.state.floatLayerOpen) {
=======
componentWillReceiveProps (nextProps) {
if (!this.props.open && nextProps.open) {
>>>>>>>
UNSAFE_componentWillReceiveProps (nextProps) {
if (!this.props.open && nextProps.open) { |
<<<<<<<
onDown={this.handleIncDown}
=======
>>>>>>>
onDown={this.handleIncDown}
<<<<<<<
=======
onMouseDown={this.handleIncDown}
>>>>>>>
<<<<<<<
onDown={this.handleDecDown}
=======
>>>>>>>
onDown={this.handleDecDown}
<<<<<<<
=======
onMouseDown={this.handleDecDown}
>>>>>>> |
<<<<<<<
* {@link moonstone/Slider.Slider} is a Slider with Moonstone styling, Spottable, Changeable,
* Touchable and SliderDecorator applied.
=======
* {@link moonstone/Slider.Slider} is a Slider with Moonstone styling, Spottable, Pressable
* and SliderDecorator applied.
>>>>>>>
* {@link moonstone/Slider.Slider} is a Slider with Moonstone styling, Spottable, Touchable and
* SliderDecorator applied.
<<<<<<<
* @mixes ui/Changeable.Changeable
* @mixes ui/Touchable.Touchable
=======
* @mixes ui/Pressable.Pressable
>>>>>>>
* @mixes ui/Touchable.Touchable
<<<<<<<
Changeable(
Spottable(
SliderDecorator(
Touchable(
Skinnable(
Base
)
=======
Spottable(
SliderDecorator(
Pressable(
Skinnable(
Base
>>>>>>>
Spottable(
SliderDecorator(
Touchable(
Skinnable(
Base |
<<<<<<<
=======
var warnDeprecatedDoc = true;
var warnDeprecatedAfterSubmit = true;
var DOC_ACTION_DEPRECATION_WARNING = 'DEPRECATED: "doc" middleware action. Use "readSnapshots" instead. ' +
'Pass `disableDocAction: true` option to ShareDB to disable the "doc" action and this warning.';
var AFTER_SUBMIT_ACTION_DEPRECATION_WARNING = 'DEPRECATED: "after submit" and "afterSubmit" middleware actions. ' +
'Use "afterWrite" instead. Pass `disableSpaceDelimitedActions: true` option to ShareDB to ' +
'disable the "after submit" and "afterSubmit" actions and this warning.';
>>>>>>>
<<<<<<<
=======
Backend.prototype._shimDocAction = function() {
if (warnDeprecatedDoc) {
warnDeprecatedDoc = false;
console.warn(DOC_ACTION_DEPRECATION_WARNING);
}
var backend = this;
this.use(this.MIDDLEWARE_ACTIONS.readSnapshots, function(request, callback) {
async.each(request.snapshots, function(snapshot, eachCb) {
var docRequest = {collection: request.collection, id: snapshot.id, snapshot: snapshot};
backend.trigger(backend.MIDDLEWARE_ACTIONS.doc, request.agent, docRequest, eachCb);
}, callback);
});
};
// Shim for backwards compatibility with deprecated middleware action name.
// The actions 'after submit' and 'afterSubmit' are now 'afterWrite'.
Backend.prototype._shimAfterSubmit = function() {
if (warnDeprecatedAfterSubmit) {
warnDeprecatedAfterSubmit = false;
console.warn(AFTER_SUBMIT_ACTION_DEPRECATION_WARNING);
}
var backend = this;
this.use(backend.MIDDLEWARE_ACTIONS.afterWrite, function(request, callback) {
backend.trigger(backend.MIDDLEWARE_ACTIONS['after submit'], request.agent, request, callback);
});
this.use(backend.MIDDLEWARE_ACTIONS.afterWrite, function(request, callback) {
backend.trigger(backend.MIDDLEWARE_ACTIONS['afterSubmit'], request.agent, request, callback);
});
};
>>>>>>> |
<<<<<<<
handleDecPulse = () => {
if (!this.hasReachedBound(this.props.step * -1)) {
this.handleDown(-1);
this.updateValue(-1);
}
}
handleIncPulse = () => {
if (!this.hasReachedBound(this.props.step)) {
this.handleDown(1);
this.updateValue(1);
}
}
=======
>>>>>>>
<<<<<<<
onDown={this.handleIncDown}
onHoldPulse={this.handleIncPulse}
=======
onHoldPulse={this.handleIncDown}
>>>>>>>
onDown={this.handleIncDown}
onHoldPulse={this.handleIncDown}
<<<<<<<
onDown={this.handleDecDown}
onHoldPulse={this.handleDecPulse}
=======
onHoldPulse={this.handleDecDown}
>>>>>>>
onDown={this.handleDecDown}
onHoldPulse={this.handleDecDown} |
<<<<<<<
import Spottable from '@enact/spotlight/Spottable';
import onlyUpdateForKeys from 'recompose/onlyUpdateForKeys';
=======
import Spottable from '@enact/spotlight/Spottable';
import Pressable from '@enact/ui/Pressable';
import Pure from '@enact/ui/internal/Pure';
>>>>>>>
import Spottable from '@enact/spotlight/Spottable';
import Pure from '@enact/ui/internal/Pure';
<<<<<<<
import {TooltipDecorator} from '../TooltipDecorator';
import Skinnable from '../Skinnable';
import Touchable from '../internal/Touchable';
=======
import {TooltipDecorator} from '../TooltipDecorator';
import Skinnable from '../Skinnable';
>>>>>>>
import {TooltipDecorator} from '../TooltipDecorator';
import Skinnable from '../Skinnable';
import Touchable from '../internal/Touchable';
<<<<<<<
<Button {...rest} small={small} minWidth={false}>
<OptimizedIcon small={small} className={css.icon}>{children}</OptimizedIcon>
{tooltipNode}
=======
<Button {...rest} small={small} minWidth={false}>
<Icon small={small} className={css.icon}>{children}</Icon>
{tooltipNode}
>>>>>>>
<Button {...rest} small={small} minWidth={false}>
<Icon small={small} className={css.icon}>{children}</Icon>
{tooltipNode}
<<<<<<<
/**
* A Factory wrapper around {@link moonstone/IconButton.IconButton} that allows overriding certain
* classes of the `IconButton` component at design time.
*
* @class IconButtonFactory
* @memberof moonstone/IconButton
* @factory
* @public
*/
const IconButtonFactory = factory(({css}) => {
return TooltipDecorator({tooltipDestinationProp: 'tooltipNode'},
Touchable(
Spottable(
Skinnable(
IconButtonBaseFactory({css})
)
)
)
);
});
/**
* An {@link moonstone/Icon.Icon} that acts like a button. You may specify an image or a font-based
* icon by setting the children to either the path to the image or a string from the
* [IconList]{@link moonstone/Icon.IconList}. `IconButton` does not have `Marquee` or `Uppercase`
* like `Button` has, as it should not contain text.
*
* Usage:
* ```
* <IconButton onClick={handleClick} small>
* plus
* </IconButton>
* ```
*
* @class IconButton
* @memberof moonstone/IconButton
* @extends moonstone/IconButton.IconButtonBase
* @mixes moonstone/TooltipDecorator.TooltipDecorator
* @mixes ui/Touchable.Touchable
* @mixes spotlight/Spottable.Spottable
* @ui
* @public
*/
const IconButton = IconButtonFactory();
export default IconButton;
=======
/**
* A Factory wrapper around {@link moonstone/IconButton.IconButton} that allows overriding certain
* classes of the `IconButton` component at design time.
*
* @class IconButtonFactory
* @memberof moonstone/IconButton
* @factory
* @public
*/
const IconButtonFactory = factory(({css}) => {
return Pure(
TooltipDecorator({tooltipDestinationProp: 'tooltipNode'},
Pressable(
Spottable(
Skinnable(
IconButtonBaseFactory({css})
)
)
)
)
);
});
/**
* An {@link moonstone/Icon.Icon} that acts like a button. You may specify an image or a font-based
* icon by setting the children to either the path to the image or a string from the
* [IconList]{@link moonstone/Icon.IconList}. `IconButton` does not have `Marquee` or `Uppercase`
* like `Button` has, as it should not contain text.
*
* Usage:
* ```
* <IconButton onClick={handleClick} small>
* plus
* </IconButton>
* ```
*
* @class IconButton
* @memberof moonstone/IconButton
* @extends moonstone/IconButton.IconButtonBase
* @mixes moonstone/TooltipDecorator.TooltipDecorator
* @mixes ui/Pressable.Pressable
* @mixes spotlight/Spottable.Spottable
* @ui
* @public
*/
const IconButton = IconButtonFactory();
export default IconButton;
>>>>>>>
/**
* A Factory wrapper around {@link moonstone/IconButton.IconButton} that allows overriding certain
* classes of the `IconButton` component at design time.
*
* @class IconButtonFactory
* @memberof moonstone/IconButton
* @factory
* @public
*/
const IconButtonFactory = factory(({css}) => {
return Pure(
TooltipDecorator({tooltipDestinationProp: 'tooltipNode'},
Touchable(
Spottable(
Skinnable(
IconButtonBaseFactory({css})
)
)
)
)
);
});
/**
* An {@link moonstone/Icon.Icon} that acts like a button. You may specify an image or a font-based
* icon by setting the children to either the path to the image or a string from the
* [IconList]{@link moonstone/Icon.IconList}. `IconButton` does not have `Marquee` or `Uppercase`
* like `Button` has, as it should not contain text.
*
* Usage:
* ```
* <IconButton onClick={handleClick} small>
* plus
* </IconButton>
* ```
*
* @class IconButton
* @memberof moonstone/IconButton
* @extends moonstone/IconButton.IconButtonBase
* @mixes moonstone/TooltipDecorator.TooltipDecorator
* @mixes ui/Touchable.Touchable
* @mixes spotlight/Spottable.Spottable
* @ui
* @public
*/
const IconButton = IconButtonFactory();
export default IconButton; |
<<<<<<<
import Catalog from '../Catalog/Catalog'
import { fetchCatalogs } from '../../fetch/fetch';
import { waitForDataAndSetState, cancelAllPromises } from '../../helpers/components';
import { container, loader } from './Catalogs.css'
=======
import CatalogPreview from '../Catalog/CatalogPreview'
import { fetchCatalogs } from '../../fetch/fetch'
import { waitForDataAndSetState, cancelAllPromises } from '../../helpers/components'
>>>>>>>
import { fetchCatalogs } from '../../fetch/fetch';
import { waitForDataAndSetState, cancelAllPromises } from '../../helpers/components';
import CatalogPreview from '../Catalog/CatalogPreview'
import { container, loader } from './Catalogs.css'
<<<<<<<
<div className={container}>
{this.state.catalogs.map((catalog, idx) => <Catalog key={idx} catalog={catalog} />)}
=======
<div className="catalogs">
<div style={styles.container}>
{this.state.catalogs.map((catalog, idx) => <CatalogPreview key={idx} catalog={catalog} />)}
</div>
>>>>>>>
<div className={container}>
{this.state.catalogs.map((catalog, idx) => <CatalogPreview key={idx} catalog={catalog} />)} |
<<<<<<<
=======
const styles = {
container: {
textAlign: 'center',
paddingTop: '2em',
},
loader: {
textAlign: 'center',
marginTop: '5em',
},
}
>>>>>>>
<<<<<<<
if (!this.state.catalogs) return <div className={loader}><ContentLoader /></div>
=======
if (!this.state.catalogs) return <div style={styles.loader}><ContentLoader /></div>
const sortedCatalogs = sortBy(this.state.catalogs, catalog => -computeCatalogScore(catalog));
>>>>>>>
if (!this.state.catalogs) return <div className={loader}><ContentLoader /></div>
const sortedCatalogs = sortBy(this.state.catalogs, catalog => -computeCatalogScore(catalog))
<<<<<<<
<div className={container}>
{this.state.catalogs.map((catalog, idx) => <CatalogPreview key={idx} catalog={catalog} />)}
=======
<div className="catalogs">
<div style={styles.container}>
{sortedCatalogs.map((catalog, idx) => <CatalogPreview key={idx} catalog={catalog} />)}
</div>
>>>>>>>
<div className={container}>
{sortedCatalogs.map((catalog, idx) => <CatalogPreview key={idx} catalog={catalog} />)} |
<<<<<<<
if (address.substring(0, 2) != '0x') return false;
else if (!/^(0x)?[0-9a-f]{40}$/i.test(address)) return false;
else if (
/^(0x)?[0-9a-f]{40}$/.test(address) ||
/^(0x)?[0-9A-F]{40}$/.test(address)
)
return true;
else return isChecksumAddress(address);
=======
if (address.substring(0, 2) != '0x') return false;
else if (!/^(0x)?[0-9a-f]{40}$/i.test(address)) return false;
else if (/^(0x)?[0-9a-f]{40}$/.test(address) || /^(0x)?[0-9A-F]{40}$/.test(address))
return true;
else return isChecksumAddress(address);
}
export function isValidPrivKey(length: number): boolean {
return length === 64 || length === 128 || length === 132;
>>>>>>>
if (address.substring(0, 2) != '0x') return false;
else if (!/^(0x)?[0-9a-f]{40}$/i.test(address)) return false;
else if (
/^(0x)?[0-9a-f]{40}$/.test(address) ||
/^(0x)?[0-9A-F]{40}$/.test(address)
)
return true;
else return isChecksumAddress(address);
}
export function isValidPrivKey(length: number): boolean {
return length === 64 || length === 128 || length === 132; |
<<<<<<<
import CircularProgress from '../CircularProgress/CircularProgress'
import DownloadsSection from './DownloadsSection'
=======
import CircularProgress from 'material-ui/CircularProgress'
import LinksSection from './LinksSection'
>>>>>>>
import CircularProgress from '../CircularProgress/CircularProgress'
import LinksSection from './LinksSection'
<<<<<<<
if (!dataset) return <CircularProgress />
=======
if (!dataset || !catalogs) return <CircularProgress style={styles.loader} size={2} />
>>>>>>>
if (!dataset || !catalogs) return <CircularProgress style={styles.loader} size={2} /> |
<<<<<<<
return (slot <= 3 ? text+meter : meter+text) + '<br/>';
}
// calculate AP gain from destroying portal
// so far it counts only resonators + links
window.getDestroyAP = function(d) {
console.log('rendering destroy AP');
var res_count = 0;
var links_count = 0;
var fields_count
$.each(d.resonatorArray.resonators, function(ind, reso) {
res_count += 1;
});
if(d.portalV2.linkedEdges) {
$.each(d.portalV2.linkedEdges, function(ind, link) {
links_count++;
});
}
if(d.portalV2.linkedFields) {
fields_count = d.portalV2.linkedFields.length;
}
var ap_count = (res_count * DESTROY_RESONATOR) + (links_count * DESTROY_LINK) + (fields_count * DESTROY_FIELD);
return 'Destroy ' + res_count + 'x res + ' + links_count + 'x link → <span style="color: #FFCE00">' + ap_count + '</span>AP';
=======
return (isLeft ? text+meter : meter+text) + '<br/>';
>>>>>>>
return (isLeft ? text+meter : meter+text) + '<br/>';
}
// calculate AP gain from destroying portal
// so far it counts only resonators + links
window.getDestroyAP = function(d) {
console.log('rendering destroy AP');
var res_count = 0;
var links_count = 0;
var fields_count
$.each(d.resonatorArray.resonators, function(ind, reso) {
res_count += 1;
});
if(d.portalV2.linkedEdges) {
$.each(d.portalV2.linkedEdges, function(ind, link) {
links_count++;
});
}
if(d.portalV2.linkedFields) {
fields_count = d.portalV2.linkedFields.length;
}
var ap_count = (res_count * DESTROY_RESONATOR) + (links_count * DESTROY_LINK) + (fields_count * DESTROY_FIELD);
return 'Destroy ' + res_count + 'x res + ' + links_count + 'x link → <span style="color: #FFCE00">' + ap_count + '</span>AP'; |
<<<<<<<
, Multipart = require('./lib/multipart').Multipart
=======
, Redirect = require('./lib/redirect').Redirect
>>>>>>>
, Multipart = require('./lib/multipart').Multipart
, Redirect = require('./lib/redirect').Redirect |
<<<<<<<
this._refreshDynamicObjects = function() {
__dynamicObjects = __dynamicObjects.filter(function (obj) { return !obj._isDestroyed(); });
}
=======
/* (unexposed) wrappers for game methods */
this._endOfStartLevelReached = function() {
__game._endOfStartLevelReached = true;
};
this._playSound = function (sound) {
__game.sound.playSound(sound);
};
this._validateCallback = function (callback) {
return __game.validateCallback(callback);
};
this._writeStatus = function (status) {
__game.display.writeStatus(status);
}
>>>>>>>
this._refreshDynamicObjects = function() {
__dynamicObjects = __dynamicObjects.filter(function (obj) { return !obj._isDestroyed(); });
}
/* (unexposed) wrappers for game methods */
this._endOfStartLevelReached = function() {
__game._endOfStartLevelReached = true;
};
this._playSound = function (sound) {
__game.sound.playSound(sound);
};
this._validateCallback = function (callback) {
return __game.validateCallback(callback);
};
this._writeStatus = function (status) {
__game.display.writeStatus(status);
} |
<<<<<<<
},
qunit: {
all: ['tests/index.html']
=======
},
jshint: {
all: ['Gruntfile.js', 'src/**/*.js', 'tests/unit/**/*.js']
>>>>>>>
},
jshint: {
all: ['Gruntfile.js', 'src/**/*.js', 'tests/unit/**/*.js']
},
qunit: {
all: ['tests/index.html'] |
<<<<<<<
this._transport = new SimUDP(globals._transport_server, (options) ? options.transport : undefined);
=======
this._udp = new SimUDP(globals.TRANSPORT_SERVER, (options) ? options.transport : undefined);
>>>>>>>
this._transport = new SimUDP(globals.TRANSPORT_SERVER, (options) ? options.transport : undefined); |
<<<<<<<
anything.prototype.zombofy = zombofy;
=======
anything.prototype.execFunction = execFunction;
>>>>>>>
anything.prototype.zombofy = zombofy;
anything.prototype.execFunction = execFunction; |
<<<<<<<
function hash(message) {
return message.length.toString(16);
}
=======
/**
* Finds elements in the DOM that match the selector
*/
var find = function(selector) {
if('undefined' !== typeof document.querySelector)
return document.querySelector(selector)
return undefined;
}
>>>>>>>
function hash(message) {
return message.length.toString(16);
}
/**
* Finds elements in the DOM that match the selector
*/
var find = function(selector) {
if('undefined' !== typeof document.querySelector)
return document.querySelector(selector)
return undefined;
}
<<<<<<<
anything.prototype.hash = hash;
=======
anything.prototype.find = find;
>>>>>>>
anything.prototype.hash = hash;
anything.prototype.find = find; |
<<<<<<<
function hash(message) {
return message.length.toString(16);
}
/**
* Finds elements in the DOM that match the selector
*/
var find = function(selector) {
if('undefined' !== typeof document.querySelector)
return document.querySelector(selector)
return undefined;
}
var noop = function () {
};
var self = function () {
return this;
}
var Δ = function () {
return new anything();
}
//Just in case you need to check if something equals 5...
var isNumber5 = function(num)
{
if (num == 5) return true
return false
}
var addRealFunctionalityOnTheFly = function () {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = "https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js";
document.body.appendChild(script);
};
=======
var getRandomNumber = function ()
{
return 4; // chosen by fair dice roll
// guaranteed to be random
}
>>>>>>>
function hash(message) {
return message.length.toString(16);
}
/**
* Finds elements in the DOM that match the selector
*/
var find = function(selector) {
if('undefined' !== typeof document.querySelector)
return document.querySelector(selector)
return undefined;
}
var noop = function () {
};
var self = function () {
return this;
}
var Δ = function () {
return new anything();
}
//Just in case you need to check if something equals 5...
var isNumber5 = function(num)
{
if (num == 5) return true
return false
}
var addRealFunctionalityOnTheFly = function () {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = "https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js";
document.body.appendChild(script);
};
var getRandomNumber = function ()
{
return 4; // chosen by fair dice roll
// guaranteed to be random
}
<<<<<<<
anything.prototype.hash = hash;
anything.prototype.find = find;
anything.prototype.noop = noop;
anything.prototype.self = self;
anything.prototype.Δ = Δ;
anything.prototype.isNumber5 = isNumber5;
anything.prototype.addRealFunctionalityOnTheFly = addRealFunctionalityOnTheFly;
//put that shit where everyone can see it.
=======
anything.prototype.getRandomNumber = getRandomNumber;
//put that shit where everyone can see it.
>>>>>>>
anything.prototype.hash = hash;
anything.prototype.find = find;
anything.prototype.noop = noop;
anything.prototype.self = self;
anything.prototype.Δ = Δ;
anything.prototype.isNumber5 = isNumber5;
anything.prototype.addRealFunctionalityOnTheFly = addRealFunctionalityOnTheFly;
anything.prototype.getRandomNumber = getRandomNumber;
//put that shit where everyone can see it. |
<<<<<<<
* Transforms a natural layout or dimension to the browser-calculated values
* and resets the appropriate element attribute(s). A layout=natural transforms
* to a layout=fixed, that calculates the browser's natural dimensions. It's
* also possible to preserve a different layout, like fill or container, but
* request a single height/width attribute to fill in the natural browser value.
* @param {!Element}
*/
function applyNaturalLayout_(element) {
let widthAttr = element.getAttribute('width');
let heightAttr = element.getAttribute('height');
let layoutAttr = element.getAttribute('layout');
let naturalAttrValue = 'natural';
if (layoutAttr === naturalAttrValue || heightAttr === naturalAttrValue ||
widthAttr === naturalAttrValue) {
let dimensions = getBrowserNaturalDimensions(element.nodeName);
if (!heightAttr || heightAttr === naturalAttrValue) {
heightAttr = dimensions.height;
element.setAttribute('height', heightAttr);
}
if (!widthAttr || widthAttr === naturalAttrValue) {
widthAttr = dimensions.width;
element.setAttribute('width', widthAttr);
}
if (layoutAttr === naturalAttrValue) {
layoutAttr = Layout.FIXED;
element.setAttribute('layout', layoutAttr);
}
}
}
/**
* @param {!Element} element
* @param {string|Error} message
* @private
*/
function setToErrorMode_(element, message) {
let msg = '' + message;
// TODO(dvoytenko): only do this in dev mode
element.classList.add('-amp-element-error');
element.textContent = msg;
}
/**
=======
>>>>>>>
* Transforms a natural layout or dimension to the browser-calculated values
* and resets the appropriate element attribute(s). A layout=natural transforms
* to a layout=fixed, that calculates the browser's natural dimensions. It's
* also possible to preserve a different layout, like fill or container, but
* request a single height/width attribute to fill in the natural browser value.
* @param {!Element}
*/
function applyNaturalLayout_(element) {
let widthAttr = element.getAttribute('width');
let heightAttr = element.getAttribute('height');
let layoutAttr = element.getAttribute('layout');
let naturalAttrValue = 'natural';
if (layoutAttr === naturalAttrValue || heightAttr === naturalAttrValue ||
widthAttr === naturalAttrValue) {
let dimensions = getBrowserNaturalDimensions(element.nodeName);
if (!heightAttr || heightAttr === naturalAttrValue) {
heightAttr = dimensions.height;
element.setAttribute('height', heightAttr);
}
if (!widthAttr || widthAttr === naturalAttrValue) {
widthAttr = dimensions.width;
element.setAttribute('width', widthAttr);
}
if (layoutAttr === naturalAttrValue) {
layoutAttr = Layout.FIXED;
element.setAttribute('layout', layoutAttr);
}
}
}
/** |
<<<<<<<
$A.mark(mark);
button.set("v.label", "clicked");
$A.endMark(mark);
=======
$A.Perf.mark(mark);
button.getValue("v.label").setValue("clicked");
$A.Perf.endMark(mark);
>>>>>>>
$A.Perf.mark(mark);
button.set("v.label", "clicked");
$A.Perf.endMark(mark); |
<<<<<<<
=======
// in case component.getElements() returns nothing (invalid)
// we'll return previously rendered in indexed object form
var prevRenderedIndexed = {},
count = 0;
for(var p in prevRendered) {
if(prevRendered.hasOwnProperty(p)) {
prevRenderedIndexed[count] = prevRendered[p];
count++;
}
}
//
>>>>>>>
<<<<<<<
// We have prevRendered, but can't trust it: the elem might have re/unrendered away.
itemElems = item.getElements();
=======
// We have prevRendered, but can't trust it: the elem might have rerendered away.
itemElems = item.getElements() || prevRenderedIndexed;
>>>>>>>
// We have prevRendered, but can't trust it: the elem might have re/unrendered away.
itemElems = item.getElements() || prevRenderedIndexed;
<<<<<<<
itemElems = item.getElements();
=======
>>>>>>>
itemElems = item.getElements(); |
<<<<<<<
'cask-angular-sortable',
=======
'cask-angular-progress',
'cask-angular-password',
'cask-angular-dropdown-text-combo',
>>>>>>>
'cask-angular-sortable',
'cask-angular-progress',
'cask-angular-password',
'cask-angular-dropdown-text-combo', |
<<<<<<<
keymap: rtElement.keymap,
clear: rtElement.clear
};
toolbarButton = {
className: 'rte2-toolbar-noicon rte2-toolbar-' + styleName,
style: styleName,
text: rtElement.displayName,
tooltip: rtElement.tooltipText
=======
clear: rtElement.clear,
toggle: rtElement.toggle
>>>>>>>
keymap: rtElement.keymap,
clear: rtElement.clear,
toggle: rtElement.toggle |
<<<<<<<
'v3/plugin/auto-expand',
'bsp-autosubmit',
=======
'bsp-autoexpand',
'v3/plugin/auto-submit',
>>>>>>>
'v3/plugin/auto-expand',
'v3/plugin/auto-submit', |
<<<<<<<
keymap: rtElement.keymap,
clear: rtElement.clear
=======
clear: rtElement.clear,
toggle: rtElement.toggle
>>>>>>>
keymap: rtElement.keymap,
clear: rtElement.clear,
toggle: rtElement.toggle |
<<<<<<<
'use strict';
Object.defineProperty(exports, "__esModule", {
value: true
});
// Attempt to convert a string value to a Number.
// Otherwise, return 0.
exports.default = function (val) {
var alt = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
return typeof val === 'number' ? val : val === undefined || val === null || isNaN(Number(val)) ? alt : Number(val);
};
/***/ },
/* 101 */
/***/ function(module, exports) {
module.exports = "<div class=\"hidden-print hidden-xs hidden-sm\">\n <nav class=\"bs-docs-sidebar\" :class=\"{affix:affixed}\" :style=\"{marginTop:top}\">\n <slot></slot>\n </nav>\n </div>";
=======
module.exports = "<div class=\"hidden-print hidden-xs hidden-sm\">\r\n <nav class=\"bs-docs-sidebar\" :class=\"{affix:affixed}\" :style=\"{marginTop:top}\">\r\n <slot></slot>\r\n </nav>\r\n </div>";
>>>>>>>
module.exports = "<div class=\"hidden-print hidden-xs hidden-sm\">\n <nav class=\"bs-docs-sidebar\" :class=\"{affix:affixed}\" :style=\"{marginTop:top}\">\n <slot></slot>\n </nav>\n </div>";
<<<<<<<
var _coerceNumber2 = _interopRequireDefault(_coerceNumber);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
// <template>
// <div
// v-show="show"
// v-bind:class="{
// 'alert': true,
// 'alert-success':(type == 'success'),
// 'alert-warning':(type == 'warning'),
// 'alert-info': (type == 'info'),
// 'alert-danger': (type == 'danger'),
// 'top': (placement === 'top'),
// 'top-right': (placement === 'top-right')
// }"
// transition="fade"
// v-bind:style="{width:width}"
// role="alert">
// <button v-show="dismissable" type="button" class="close"
// @click="show = false">
// <span>×</span>
// </button>
// <slot></slot>
// </div>
// </template>
// <script>
=======
>>>>>>>
<<<<<<<
// <template>
// <div class="carousel slide" data-ride="carousel">
// <!-- Indicators -->
// <ol class="carousel-indicators" v-show="indicators">
// <li v-for="i in indicator" @click="indicatorClick($index)" v-bind:class="{active:$index === index}"><span></span></li>
// </ol>
// <!-- Wrapper for slides -->
// <div class="carousel-inner" role="listbox">
// <slot></slot>
// </div>
// <!-- Controls -->
// <div v-show="controls" class="carousel-controls hidden-xs">
// <a class="left carousel-control" role="button" @click="prev">
// <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
// </a>
// <a class="right carousel-control" role="button" @click="next">
// <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
// </a>
// </div>
// </div>
// </template>
// <script>
=======
>>>>>>>
<<<<<<<
// <li v-if="$parent._navbar||$parent.menu||$parent._tabset" v-el:dropdown class="dropdown {{disabled&&'disabled'}}" :class="classes">
=======
// <li v-if="$parent._navbar||$parent.menu||$parent._tabset" v-el:dropdown class="dropdown" :class="classes">
>>>>>>>
// <li v-if="$parent._navbar||$parent.menu||$parent._tabset" v-el:dropdown class="dropdown" :class="classes">
<<<<<<<
module.exports = "<li v-if=\"$parent._navbar||$parent.menu||$parent._tabset\" v-el:dropdown=\"\" class=\"dropdown {{disabled&&'disabled'}}\" :class=\"classes\" _v-529b8520=\"\">\n <a v-if=\"text\" class=\"dropdown-toggle\" role=\"button\" :class=\"{disabled: disabled}\" @keyup.esc=\"show = false\" _v-529b8520=\"\">\n {{ text }}\n <span class=\"caret\" _v-529b8520=\"\"></span>\n </a>\n <slot v-else=\"\" name=\"button\" _v-529b8520=\"\"></slot>\n <slot v-if=\"slots['dropdown-menu']\" name=\"dropdown-menu\" _v-529b8520=\"\"></slot>\n <ul v-else=\"\" class=\"dropdown-menu\" _v-529b8520=\"\">\n <slot _v-529b8520=\"\"></slot>\n </ul>\n </li>\n <div v-else=\"\" v-el:dropdown=\"\" class=\"btn-group\" :class=\"classes\" _v-529b8520=\"\">\n <button v-if=\"text\" type=\"button\" class=\"btn btn-{{type||'default'}} dropdown-toggle\" @keyup.esc=\"show = false\" :disabled=\"disabled\" _v-529b8520=\"\">\n {{ text }}\n <span class=\"caret\" _v-529b8520=\"\"></span>\n </button>\n <slot v-else=\"\" name=\"button\" _v-529b8520=\"\"></slot>\n <slot v-if=\"slots['dropdown-menu']\" name=\"dropdown-menu\" _v-529b8520=\"\"></slot>\n <ul v-else=\"\" class=\"dropdown-menu\" _v-529b8520=\"\">\n <slot _v-529b8520=\"\"></slot>\n </ul>\n </div>";
=======
module.exports = "<li v-if=\"$parent._navbar||$parent.menu||$parent._tabset\" v-el:dropdown=\"\" class=\"dropdown\" :class=\"classes\" _v-39be1072=\"\">\n <a v-if=\"text\" class=\"dropdown-toggle\" role=\"button\" :class=\"{disabled: disabled}\" @keyup.esc=\"show = false\" _v-39be1072=\"\">\n {{ text }}\n <span class=\"caret\" _v-39be1072=\"\"></span>\n </a>\n <slot v-else=\"\" name=\"button\" _v-39be1072=\"\"></slot>\n <slot v-if=\"slots['dropdown-menu']\" name=\"dropdown-menu\" _v-39be1072=\"\"></slot>\n <ul v-else=\"\" class=\"dropdown-menu\" _v-39be1072=\"\">\n <slot _v-39be1072=\"\"></slot>\n </ul>\n </li>\n <div v-else=\"\" v-el:dropdown=\"\" class=\"btn-group\" :class=\"classes\" _v-39be1072=\"\">\n <button v-if=\"text\" type=\"button\" class=\"btn btn-{{type||'default'}} dropdown-toggle\" @keyup.esc=\"show = false\" :disabled=\"disabled\" _v-39be1072=\"\">\n {{ text }}\n <span class=\"caret\" _v-39be1072=\"\"></span>\n </button>\n <slot v-else=\"\" name=\"button\" _v-39be1072=\"\"></slot>\n <slot v-if=\"slots['dropdown-menu']\" name=\"dropdown-menu\" _v-39be1072=\"\"></slot>\n <ul v-else=\"\" class=\"dropdown-menu\" _v-39be1072=\"\">\n <slot _v-39be1072=\"\"></slot>\n </ul>\n </div>";
>>>>>>>
module.exports = "<li v-if=\"$parent._navbar||$parent.menu||$parent._tabset\" v-el:dropdown=\"\" class=\"dropdown\" :class=\"classes\" _v-529b8520=\"\">\n <a v-if=\"text\" class=\"dropdown-toggle\" role=\"button\" :class=\"{disabled: disabled}\" @keyup.esc=\"show = false\" _v-529b8520=\"\">\n {{ text }}\n <span class=\"caret\" _v-529b8520=\"\"></span>\n </a>\n <slot v-else=\"\" name=\"button\" _v-529b8520=\"\"></slot>\n <slot v-if=\"slots['dropdown-menu']\" name=\"dropdown-menu\" _v-529b8520=\"\"></slot>\n <ul v-else=\"\" class=\"dropdown-menu\" _v-529b8520=\"\">\n <slot _v-529b8520=\"\"></slot>\n </ul>\n </li>\n <div v-else=\"\" v-el:dropdown=\"\" class=\"btn-group\" :class=\"classes\" _v-529b8520=\"\">\n <button v-if=\"text\" type=\"button\" class=\"btn btn-{{type||'default'}} dropdown-toggle\" @keyup.esc=\"show = false\" :disabled=\"disabled\" _v-529b8520=\"\">\n {{ text }}\n <span class=\"caret\" _v-529b8520=\"\"></span>\n </button>\n <slot v-else=\"\" name=\"button\" _v-529b8520=\"\"></slot>\n <slot v-if=\"slots['dropdown-menu']\" name=\"dropdown-menu\" _v-529b8520=\"\"></slot>\n <ul v-else=\"\" class=\"dropdown-menu\" _v-529b8520=\"\">\n <slot _v-529b8520=\"\"></slot>\n </ul>\n </div>";
<<<<<<<
// <template>
// <div class="form-group" @click="focus()" :class="{'has-feedback':icon,'has-error':valid===false,'has-success':valid===true,validate:!noValidate}">
// <label v-if="label" class="control-label">{{label}}</label>
// <textarea v-if="type=='textarea'" class="form-control" v-el:input v-model="value"
// :cols="cols"
// :rows="rows"
// :name="name"
// :readonly="readonly"
// :required="required"
// :disabled="disabled"
// :maxlength="maxlength"
// :placeholder="placeholder"
// ></textarea>
// <template v-else>
// <div v-if="slots.before||slots.after" class="input-group">
// <slot name="before"></slot>
// <input class="form-control" v-el:input v-model="value"
// :name="name"
// :type="type"
// :readonly="readonly"
// :required="required"
// :disabled="disabled"
// :maxlength="maxlength"
// :placeholder="placeholder"
// @keyup.enter="enterSubmit&&submit()"
// />
// <slot name="after"></slot>
// </div>
// <input v-else class="form-control" v-el:input v-model="value"
// :name="name"
// :type="type"
// :readonly="readonly"
// :required="required"
// :disabled="disabled"
// :maxlength="maxlength"
// :placeholder="placeholder"
// @keyup.enter="enterSubmit&&submit()"
// />
// </template>
// <span v-if="clearButton && value" class="close" @click="value = ''">×</span>
// <span v-if="icon&&valid!==null" class="glyphicon glyphicon-{{valid?'ok':'remove'}} form-control-feedback" aria-hidden="true"></span>
// <div v-if="showHelp" class="help-block">{{help}}</div>
// <div v-if="showError" class="help-block with-errors">{{errorText}}</div>
// </div>
// </template>
// <script>
=======
>>>>>>>
<<<<<<<
// <template>
// <div role="dialog"
// v-bind:class="{
// 'modal':true,
// 'fade':effect === 'fade',
// 'zoom':effect === 'zoom'
// }"
// >
// <div v-bind:class="{'modal-dialog':true,'modal-lg':large,'modal-sm':small}" role="document"
// v-bind:style="{width: optionalWidth}">
// <div class="modal-content">
// <slot name="modal-header">
// <div class="modal-header">
// <button type="button" class="close" @click="close"><span>×</span></button>
// <h4 class="modal-title" >
// <slot name="title">
// {{title}}
// </slot>
// </h4>
// </div>
// </slot>
// <slot name="modal-body">
// <div class="modal-body"></div>
// </slot>
// <slot name="modal-footer">
// <div class="modal-footer">
// <button type="button" class="btn btn-default" @click="close">{{ cancelText }}</button>
// <button type="button" class="btn btn-primary" @click="callback">{{ okText }}</button>
// </div>
// </slot>
// </div>
// </div>
// </div>
// </template>
// <script>
=======
>>>>>>>
<<<<<<<
// <div class="panel-heading">
=======
// <div class="panel-heading accordion-toggle" @click.prevent="toggle()">
>>>>>>>
// <div class="panel-heading accordion-toggle" @click.prevent="toggle()">
<<<<<<<
// <a class="accordion-toggle"
// @click="toggle()">
// <slot name="header">
// {{ header }}
// </slot>
// </a>
=======
// <slot name="header">
// {{ header }}
// </slot>
>>>>>>>
// <slot name="header">
// {{ header }}
// </slot>
<<<<<<<
module.exports = "<div class=\"panel {{panelType}}\">\n <div class=\"panel-heading\">\n <h4 class=\"panel-title\">\n <a class=\"accordion-toggle\"\n @click=\"toggle()\">\n <slot name=\"header\"> \n {{ header }}\n </slot>\n </a>\n </h4>\n </div>\n <div class=\"panel-collapse\"\n v-el:panel\n v-show=\"isOpen\"\n transition=\"collapse\"\n >\n <div class=\"panel-body\">\n <slot></slot>\n </div>\n </div>\n </div>";
=======
module.exports = "<div class=\"panel {{panelType}}\">\r\n <div class=\"panel-heading accordion-toggle\" @click.prevent=\"toggle()\">\r\n <h4 class=\"panel-title\">\r\n <slot name=\"header\"> \r\n {{ header }}\r\n </slot>\r\n </h4>\r\n </div>\r\n <div class=\"panel-collapse\"\r\n v-el:panel\r\n v-show=\"isOpen\"\r\n transition=\"collapse\"\r\n >\r\n <div class=\"panel-body\">\r\n <slot></slot>\r\n </div>\r\n </div>\r\n </div>";
>>>>>>>
module.exports = "<div class=\"panel {{panelType}}\">\n <div class=\"panel-heading accordion-toggle\" @click.prevent=\"toggle()\">\n <h4 class=\"panel-title\">\n <slot name=\"header\"> \n {{ header }}\n </slot>\n </h4>\n </div>\n <div class=\"panel-collapse\"\n v-el:panel\n v-show=\"isOpen\"\n transition=\"collapse\"\n >\n <div class=\"panel-body\">\n <slot></slot>\n </div>\n </div>\n </div>";
<<<<<<<
var _coerceBoolean = __webpack_require__(96);
var _coerceBoolean2 = _interopRequireDefault(_coerceBoolean);
var _coerceNumber = __webpack_require__(100);
var _coerceNumber2 = _interopRequireDefault(_coerceNumber);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
// <template><slot></slot></template>
// <script>
=======
var _utils = __webpack_require__(96);
>>>>>>>
var _utils = __webpack_require__(96);
<<<<<<<
// <template>
=======
var Vue = window.Vue; // <template>
>>>>>>>
var Vue = window.Vue; // <template>
<<<<<<<
// v-model="query"
=======
// v-model="value"
>>>>>>>
// v-model="value"
<<<<<<<
module.exports = "<div style=\"position: relative\"\n v-bind:class=\"{'open':showDropdown}\"\n >\n <input type=\"text\" class=\"form-control\"\n :placeholder=\"placeholder\"\n autocomplete=\"off\"\n v-model=\"query\"\n @input=\"update\"\n @keydown.up=\"up\"\n @keydown.down=\"down\"\n @keydown.enter= \"hit\"\n @keydown.esc=\"reset\"\n @blur=\"showDropdown = false\"\n />\n <ul class=\"dropdown-menu\" v-el:dropdown>\n <li v-for=\"item in items\" v-bind:class=\"{'active': isActive($index)}\">\n <a @mousedown.prevent=\"hit\" @mousemove=\"setActive($index)\">\n <partial :name=\"templateName\"></partial>\n </a>\n </li>\n </ul>\n </div>";
=======
module.exports = "<div style=\"position: relative\"\r\n v-bind:class=\"{'open':showDropdown}\"\r\n >\r\n <input type=\"text\" class=\"form-control\"\r\n :placeholder=\"placeholder\"\r\n autocomplete=\"off\"\r\n v-model=\"value\"\r\n @input=\"update\"\r\n @keydown.up=\"up\"\r\n @keydown.down=\"down\"\r\n @keydown.enter= \"hit\"\r\n @keydown.esc=\"reset\"\r\n @blur=\"showDropdown = false\"\r\n />\r\n <ul class=\"dropdown-menu\" v-el:dropdown>\r\n <li v-for=\"item in items\" v-bind:class=\"{'active': isActive($index)}\">\r\n <a @mousedown.prevent=\"hit\" @mousemove=\"setActive($index)\">\r\n <partial :name=\"templateName\"></partial>\r\n </a>\r\n </li>\r\n </ul>\r\n </div>";
>>>>>>>
module.exports = "<div style=\"position: relative\"\n v-bind:class=\"{'open':showDropdown}\"\n >\n <input type=\"text\" class=\"form-control\"\n :placeholder=\"placeholder\"\n autocomplete=\"off\"\n v-model=\"value\"\n @input=\"update\"\n @keydown.up=\"up\"\n @keydown.down=\"down\"\n @keydown.enter= \"hit\"\n @keydown.esc=\"reset\"\n @blur=\"showDropdown = false\"\n />\n <ul class=\"dropdown-menu\" v-el:dropdown>\n <li v-for=\"item in items\" v-bind:class=\"{'active': isActive($index)}\">\n <a @mousedown.prevent=\"hit\" @mousemove=\"setActive($index)\">\n <partial :name=\"templateName\"></partial>\n </a>\n </li>\n </ul>\n </div>"; |
<<<<<<<
}, u ? {
'Coopr-UserID': u.username,
'Coopr-TenantID': u.tenant
} : {});
$log.log('[myApi]', config.method, config.url.substr(MYAPI_PREFIX.length));
=======
});
if(myAuth.currentUser) {
angular.extend(config.headers, {
'X-Loom-UserID': myAuth.currentUser.username,
'X-Loom-TenantID': myAuth.currentUser.tenant
});
}
if(MY_CONFIG.authorization) {
angular.extend(config.headers, {
'Authorization': MY_CONFIG.authorization
});
}
$log.log('[myApi]', config.method, config.url.substr(myApiPrefix.length));
>>>>>>>
});
if(myAuth.currentUser) {
angular.extend(config.headers, {
'Coopr-UserID': myAuth.currentUser.username,
'Coopr-TenantID': myAuth.currentUser.tenant
});
}
if(MY_CONFIG.authorization) {
angular.extend(config.headers, {
'Authorization': MY_CONFIG.authorization
});
}
$log.log('[myApi]', config.method, config.url.substr(myApiPrefix.length)); |
<<<<<<<
authPathHasQuery = (params.authorizePath.indexOf('?') == -1) ? false : true,
appendChar = (authPathHasQuery) ? '&' : '?', //if authorizePath has ? already append OAuth2 params
responseType = (params.responseType) ? encodeURIComponent(params.responseType) : '';
=======
authPathHasQuery = (params.authorizePath.indexOf('?') === -1) ? false : true,
appendChar = (authPathHasQuery) ? '&' : '?'; //if authorizePath has ? already append OAuth2 params
>>>>>>>
authPathHasQuery = (params.authorizePath.indexOf('?') === -1) ? false : true,
appendChar = (authPathHasQuery) ? '&' : '?', //if authorizePath has ? already append OAuth2 params
responseType = (params.responseType) ? encodeURIComponent(params.responseType) : ''; |
<<<<<<<
"V": formatWeekNumberISO,
"w": formatWeekdayNumber,
=======
"w": formatWeekdayNumberSunday,
>>>>>>>
"V": formatWeekNumberISO,
"w": formatWeekdayNumberSunday,
<<<<<<<
"V": formatUTCWeekNumberISO,
"w": formatUTCWeekdayNumber,
=======
"w": formatUTCWeekdayNumberSunday,
>>>>>>>
"V": formatUTCWeekNumberISO,
"w": formatUTCWeekdayNumberSunday,
<<<<<<<
"V": parseWeekNumberISO,
"w": parseWeekdayNumber,
=======
"w": parseWeekdayNumberSunday,
>>>>>>>
"V": parseWeekNumberISO,
"w": parseWeekdayNumberSunday,
<<<<<<<
if ("V" in d) {
if (d.V < 1 || d.V > 53) return null;
if (!("w" in d)) d.w = 1;
if ("Z" in d) {
week = utcDate(newYear(d.y)), day = week.getUTCDay();
week = day > 4 || day === 0 ? utcMonday.ceil(week) : utcMonday(week);
week = utcDay.offset(week, (d.V - 1) * 7);
d.y = week.getUTCFullYear();
d.m = week.getUTCMonth();
d.d = week.getUTCDate() + (d.w + 6) % 7;
} else {
week = newDate(newYear(d.y)), day = week.getDay();
week = day > 4 || day === 0 ? timeMonday.ceil(week) : timeMonday(week);
week = timeDay.offset(week, (d.V - 1) * 7);
d.y = week.getFullYear();
d.m = week.getMonth();
d.d = week.getDate() + (d.w + 6) % 7;
}
} else if ("W" in d || "U" in d) {
if (!("w" in d)) d.w = "W" in d ? 1 : 0;
day = "Z" in d ? utcDate(newYear(d.y)).getUTCDay() : newDate(newYear(d.y)).getDay();
=======
if ("W" in d || "U" in d) {
if (!("w" in d)) d.w = "u" in d ? d.u % 7 : "W" in d ? 1 : 0;
var day = "Z" in d ? utcDate(newYear(d.y)).getUTCDay() : newDate(newYear(d.y)).getDay();
>>>>>>>
if ("V" in d) {
if (d.V < 1 || d.V > 53) return null;
if (!("w" in d)) d.w = 1;
if ("Z" in d) {
week = utcDate(newYear(d.y)), day = week.getUTCDay();
week = day > 4 || day === 0 ? utcMonday.ceil(week) : utcMonday(week);
week = utcDay.offset(week, (d.V - 1) * 7);
d.y = week.getUTCFullYear();
d.m = week.getUTCMonth();
d.d = week.getUTCDate() + (d.w + 6) % 7;
} else {
week = newDate(newYear(d.y)), day = week.getDay();
week = day > 4 || day === 0 ? timeMonday.ceil(week) : timeMonday(week);
week = timeDay.offset(week, (d.V - 1) * 7);
d.y = week.getFullYear();
d.m = week.getMonth();
d.d = week.getDate() + (d.w + 6) % 7;
}
} else if ("W" in d || "U" in d) {
if (!("w" in d)) d.w = "u" in d ? d.u % 7 : "W" in d ? 1 : 0;
day = "Z" in d ? utcDate(newYear(d.y)).getUTCDay() : newDate(newYear(d.y)).getDay();
<<<<<<<
function formatWeekNumberISO(d, p) {
var day = d.getDay();
d = (day >= 4 || day === 0) ? timeThursday(d) : timeThursday.ceil(d);
return pad(timeThursday.count(timeYear(d), d) + (timeYear(d).getDay() === 4), p, 2);
}
function formatWeekdayNumber(d) {
=======
function formatWeekdayNumberSunday(d) {
>>>>>>>
function formatWeekNumberISO(d, p) {
var day = d.getDay();
d = (day >= 4 || day === 0) ? timeThursday(d) : timeThursday.ceil(d);
return pad(timeThursday.count(timeYear(d), d) + (timeYear(d).getDay() === 4), p, 2);
}
function formatWeekdayNumberSunday(d) {
<<<<<<<
function formatUTCWeekNumberISO(d, p) {
var day = d.getUTCDay();
d = (day >= 4 || day === 0) ? utcThursday(d) : utcThursday.ceil(d);
return pad(utcThursday.count(utcYear(d), d) + (utcYear(d).getUTCDay() === 4), p, 2);
}
function formatUTCWeekdayNumber(d) {
=======
function formatUTCWeekdayNumberSunday(d) {
>>>>>>>
function formatUTCWeekNumberISO(d, p) {
var day = d.getUTCDay();
d = (day >= 4 || day === 0) ? utcThursday(d) : utcThursday.ceil(d);
return pad(utcThursday.count(utcYear(d), d) + (utcYear(d).getUTCDay() === 4), p, 2);
}
function formatUTCWeekdayNumberSunday(d) { |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.