conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import {fetchSelf} from './SelfAction';
import {setLocalStorage, LocalStorageKey} from './LocalStorageAction';
=======
>>>>>>>
import {setLocalStorage, LocalStorageKey} from './LocalStorageAction';
<<<<<<<
.then(() => core.login(loginData))
.then(() => persistAuthData(loginData.persist, core, dispatch))
=======
.then(() => apiClient.login(login))
.then(() => dispatch(SelfAction.fetchSelf()))
.then(() => dispatch(AuthActionCreator.successfulLogin()))
>>>>>>>
.then(() => core.login(loginData))
.then(() => persistAuthData(loginData.persist, core, dispatch))
.then(() => dispatch(SelfAction.fetchSelf()))
.then(() => dispatch(AuthActionCreator.successfulLogin())) |
<<<<<<<
window.z.viewModel = z.viewModel || {};
window.z.viewModel.content = z.viewModel.content || {};
z.viewModel.content.PreferencesDevicesViewModel = class PreferencesDevicesViewModel {
constructor(mainViewModel, contentViewModel, repositories) {
this.click_on_remove_device = this.click_on_remove_device.bind(this);
this.click_on_show_device = this.click_on_show_device.bind(this);
this.update_device_info = this.update_device_info.bind(this);
this.preferences_device_details = contentViewModel.preferencesDeviceDetails;
this.client_repository = repositories.client;
this.conversation_repository = repositories.conversation;
this.cryptography_repository = repositories.cryptography;
this.logger = new z.util.Logger('z.viewModel.content.PreferencesDevicesViewModel', z.config.LOGGER.OPTIONS);
=======
window.z.ViewModel = z.ViewModel || {};
window.z.ViewModel.content = z.ViewModel.content || {};
z.ViewModel.content.PreferencesDevicesViewModel = class PreferencesDevicesViewModel {
constructor(elementId, preferencesDeviceDetails, clientRepository, conversationRepository, cryptographyRepository) {
this.clickOnRemoveDevice = this.clickOnRemoveDevice.bind(this);
this.clickOnShowDevice = this.clickOnShowDevice.bind(this);
this.updateDeviceInfo = this.updateDeviceInfo.bind(this);
this.preferencesDeviceDetails = preferencesDeviceDetails;
this.clientRepository = clientRepository;
this.conversationRepository = conversationRepository;
this.cryptographyRepository = cryptographyRepository;
this.logger = new z.util.Logger('z.ViewModel.content.PreferencesDevicesViewModel', z.config.LOGGER.OPTIONS);
>>>>>>>
window.z.viewModel = z.viewModel || {};
window.z.viewModel.content = z.viewModel.content || {};
z.viewModel.content.PreferencesDevicesViewModel = class PreferencesDevicesViewModel {
constructor(mainViewModel, contentViewModel, repositories) {
this.clickOnRemoveDevice = this.clickOnRemoveDevice.bind(this);
this.clickOnShowDevice = this.clickOnShowDevice.bind(this);
this.updateDeviceInfo = this.updateDeviceInfo.bind(this);
this.preferencesDeviceDetails = contentViewModel.preferencesDeviceDetails;
this.clientRepository = repositories.client;
this.conversationRepository = repositories.conversation;
this.cryptographyRepository = repositories.cryptography;
this.logger = new z.util.Logger('z.viewModel.content.PreferencesDevicesViewModel', z.config.LOGGER.OPTIONS); |
<<<<<<<
const reason = z.util.get_url_parameter(z.auth.URLParameter.REASON);
if (reason) {
const isReasonRegistration = reason === z.auth.SIGN_OUT_REASON.ACCOUNT_REGISTRATION;
if (isReasonRegistration) {
return this._loginFromTeams();
}
=======
const reason = z.util.URLUtil.getParameter(z.auth.URLParameter.REASON);
switch (reason) {
case z.auth.SIGN_OUT_REASON.ACCOUNT_DELETED:
this.reason_info(z.l10n.text(z.string.authAccountDeletion));
break;
case z.auth.SIGN_OUT_REASON.ACCOUNT_REGISTRATION:
return this._login_from_teams();
case z.auth.SIGN_OUT_REASON.CLIENT_REMOVED:
this.reason_info(z.l10n.text(z.string.authAccountClientDeletion));
break;
case z.auth.SIGN_OUT_REASON.SESSION_EXPIRED:
this.reason_info(z.l10n.text(z.string.authAccountExpiration));
break;
default:
break;
>>>>>>>
const reason = z.util.URLUtil.getParameter(z.auth.URLParameter.REASON);
if (reason) {
const isReasonRegistration = reason === z.auth.SIGN_OUT_REASON.ACCOUNT_REGISTRATION;
if (isReasonRegistration) {
return this._loginFromTeams();
}
<<<<<<<
case z.auth.AuthView.MODE.ACCOUNT_LOGIN: {
return {
=======
case z.auth.AuthView.MODE.ACCOUNT_PASSWORD: {
payload = {
label: this.client_repository.constructCookieLabel(username, this.client_type()),
label_key: this.client_repository.constructCookieLabelKey(username, this.client_type()),
password: this.password(),
};
const phone = z.util.phoneNumberToE164(username, this.country() || navigator.language);
if (z.util.isValidEmail(username)) {
payload.email = username;
} else if (z.util.isValidUsername(username)) {
payload.handle = username.replace('@', '');
} else if (z.util.isValidPhoneNumber(phone)) {
payload.phone = phone;
}
break;
}
case z.auth.AuthView.MODE.ACCOUNT_PHONE: {
payload = {
>>>>>>>
case z.auth.AuthView.MODE.ACCOUNT_LOGIN: {
return {
<<<<<<<
=======
/**
* Validate username input.
* @private
* @returns {undefined} No return value
*/
_validate_username() {
const username = this.username()
.trim()
.toLowerCase();
if (!username.length) {
return this._add_error(z.string.authErrorEmailMissing, z.auth.AuthView.TYPE.EMAIL);
}
const phone = z.util.phoneNumberToE164(username, this.country() || navigator.language);
if (!z.util.isValidEmail(username) && !z.util.isValidUsername(username) && !z.util.isValidPhoneNumber(phone)) {
this._add_error(z.string.authErrorEmailMalformed, z.auth.AuthView.TYPE.EMAIL);
}
}
>>>>>>> |
<<<<<<<
constructor(mainViewModel, contentViewModel, repositories) {
this.client_repository = repositories.client;
this.conversation_repository = repositories.conversation;
this.cryptography_repository = repositories.cryptography;
this.logger = new z.util.Logger('z.viewModel.content.PreferencesDeviceDetailsViewModel', z.config.LOGGER.OPTIONS);
=======
constructor(elementId, clientRepository, conversationRepository, cryptographyRepository) {
this.clientRepository = clientRepository;
this.conversationRepository = conversationRepository;
this.cryptographyRepository = cryptographyRepository;
this.logger = new z.util.Logger('z.ViewModel.content.PreferencesDeviceDetailsViewModel', z.config.LOGGER.OPTIONS);
>>>>>>>
constructor(mainViewModel, contentViewModel, repositories) {
this.clientRepository = repositories.client;
this.conversationRepository = repositories.conversation;
this.cryptographyRepository = repositories.cryptography;
this.logger = new z.util.Logger('z.viewModel.content.PreferencesDeviceDetailsViewModel', z.config.LOGGER.OPTIONS);
<<<<<<<
this.device.subscribe(device_et => {
if (device_et) {
this.session_reset_state(z.viewModel.content.PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.RESET);
this.fingerprint([]);
this._update_fingerprint();
this._update_activation_location('?');
this._update_activation_time(device_et.time);
if (device_et.location) {
this._update_device_location(device_et.location);
=======
this.fingerprint = ko.observableArray([]);
this.sessionResetState = ko.observable(PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.RESET);
this.device.subscribe(clientEntity => {
if (clientEntity) {
const {location, time} = clientEntity;
this.sessionResetState(PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.RESET);
this._updateFingerprint();
this._updateActivationLocation('?');
this._updateActivationTime(time);
if (location) {
this._updateLocation(location);
>>>>>>>
this.fingerprint = ko.observableArray([]);
this.sessionResetState = ko.observable(PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.RESET);
this.device.subscribe(clientEntity => {
if (clientEntity) {
const {location, time} = clientEntity;
this.sessionResetState(PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.RESET);
this._updateFingerprint();
this._updateActivationLocation('?');
this._updateActivationTime(time);
if (location) {
this._updateLocation(location);
<<<<<<<
this.session_reset_state = ko.observable(
z.viewModel.content.PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.RESET
);
this.fingerprint = ko.observableArray([]);
this.activated_in = ko.observableArray([]);
this.activated_on = ko.observableArray([]);
=======
>>>>>>>
<<<<<<<
click_on_details_close() {
amplify.publish(z.event.WebApp.CONTENT.SWITCH, z.viewModel.ContentViewModel.STATE.PREFERENCES_DEVICES);
=======
clickOnDetailsClose() {
amplify.publish(z.event.WebApp.CONTENT.SWITCH, z.ViewModel.content.CONTENT_STATE.PREFERENCES_DEVICES);
>>>>>>>
clickOnDetailsClose() {
amplify.publish(z.event.WebApp.CONTENT.SWITCH, z.viewModel.ContentViewModel.STATE.PREFERENCES_DEVICES);
<<<<<<<
click_on_reset_session() {
this.session_reset_state(z.viewModel.content.PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.ONGOING);
=======
clickOnResetSession() {
this.sessionResetState(PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.ONGOING);
>>>>>>>
clickOnResetSession() {
this.sessionResetState(PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.ONGOING);
<<<<<<<
this.session_reset_state(
z.viewModel.content.PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.CONFIRMATION
);
=======
this.sessionResetState(PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.CONFIRMATION);
>>>>>>>
this.sessionResetState(PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.CONFIRMATION);
<<<<<<<
this.session_reset_state(z.viewModel.content.PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.RESET);
=======
this.sessionResetState(PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.RESET);
>>>>>>>
this.sessionResetState(PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.RESET);
<<<<<<<
this.session_reset_state(z.viewModel.content.PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.RESET);
=======
this.sessionResetState(PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.RESET);
>>>>>>>
this.sessionResetState(PreferencesDeviceDetailsViewModel.SESSION_RESET_STATE.RESET);
<<<<<<<
click_on_remove_device() {
amplify.publish(z.event.WebApp.WARNING.MODAL, z.viewModel.ModalsViewModel.TYPE.REMOVE_DEVICE, {
=======
clickOnRemoveDevice() {
// @todo Add failure case ux WEBAPP-3570
amplify.publish(z.event.WebApp.WARNING.MODAL, z.ViewModel.ModalType.REMOVE_DEVICE, {
>>>>>>>
clickOnRemoveDevice() {
// @todo Add failure case ux WEBAPP-3570
amplify.publish(z.event.WebApp.WARNING.MODAL, z.viewModel.WarningsViewModel.TYPE.REMOVE_DEVICE, { |
<<<<<<<
this.container = dom.container;
if (Kiwi.TARGET === Kiwi.TARGET_BROWSER) {
this.offset = this._game.browser.getOffsetPoint(this.container);
this.position.setTo(this.offset.x, this.offset.y);
this.size.setTo(parseInt(this.container.style.width), parseInt(this.container.style.height));
}
=======
return this;
};
Transform.prototype.getParentMatrix = function () {
if (this._parent) {
return this._parent.getConcatenatedMatrix();
}
return null;
};
>>>>>>>
return this;
};
Transform.prototype.getParentMatrix = function () {
if (this._parent) {
return this._parent.getConcatenatedMatrix();
}
return null;
};
<<<<<<<
Stage.prototype._updatedSize = function () {
};
=======
this._matrix = source.matrix.clone();
>>>>>>>
this._matrix = source.matrix.clone();
<<<<<<<
}
this.current.config.isReady = true;
}
};
StateManager.prototype.onLoadProgress = function (percent, bytesLoaded, file) {
if (this.current.config.hasLoadProgress === true) {
this.current.loadProgress(percent, bytesLoaded, file);
}
};
StateManager.prototype.onLoadComplete = function () {
if (this.current.config.hasLoadComplete === true) {
this.current.loadComplete();
}
this.current.config.isReady = true;
if (this.current.config.hasCreate === true) {
klog.info('preload finished - now calling create function');
this.current.config.isCreated = true;
if (this.current.config.createParams) {
this.current.create.apply(this.current, this.current.config.createParams);
} else {
this.current.create.call(this.current);
}
}
};
StateManager.prototype.update = function () {
if (this.current !== null) {
if (this.current.config.isReady === true) {
this.current.preUpdate();
this.current.update();
this.current.postUpdate();
} else {
this.current.loadUpdate();
}
}
};
StateManager.prototype.postRender = function () {
if (this.current !== null) {
if (this.current.config.isReady === true) {
this.current.postRender();
}
}
};
return StateManager;
})();
Kiwi.StateManager = StateManager;
})(Kiwi || (Kiwi = {}));
var Kiwi;
(function (Kiwi) {
(function (DOM) {
var Bootstrap = (function () {
function Bootstrap() {
this.isReady = false;
this.container = null;
this.canvasLayers = null;
this.input = null;
}
Bootstrap.prototype.objType = function () {
return "Bootstrap";
};
=======
},
enumerable: true,
configurable: true
});
>>>>>>>
},
enumerable: true,
configurable: true
});
<<<<<<<
this._callback = callback;
this._domParent = domParent;
this._createContainer = createContainer;
=======
Object.defineProperty(Rectangle.prototype, "volume", {
get: function () {
return this.width * this.height;
},
enumerable: true,
configurable: true
});
>>>>>>>
Object.defineProperty(Rectangle.prototype, "volume", {
get: function () {
return this.width * this.height;
},
enumerable: true,
configurable: true
});
<<<<<<<
if (this._callback !== null) {
this._callback();
}
}
};
Bootstrap.prototype._setupContainer = function (id) {
if (typeof id === "undefined") { id = ''; }
if (id) {
this.container.id = id;
}
this.container.style.width = '800px';
this.container.style.height = '600px';
this.container.style.position = 'relative';
this.container.style.overflow = 'hidden';
};
return Bootstrap;
})();
DOM.Bootstrap = Bootstrap;
})(Kiwi.DOM || (Kiwi.DOM = {}));
var DOM = Kiwi.DOM;
})(Kiwi || (Kiwi = {}));
var Kiwi;
(function (Kiwi) {
(function (DOM) {
var Browser = (function () {
function Browser(game) {
this._game = game;
}
Browser.prototype.objType = function () {
return "Browser";
};
Browser.prototype.boot = function () {
klog.info('DOM.Browser booting');
};
Browser.prototype.getOffsetPoint = function (element, output) {
if (typeof output === "undefined") { output = new Kiwi.Geom.Point(); }
var box = element.getBoundingClientRect();
var clientTop = element.clientTop || document.body.clientTop || 0;
var clientLeft = element.clientLeft || document.body.clientLeft || 0;
var scrollTop = window.pageYOffset || element.scrollTop || document.body.scrollTop;
var scrollLeft = window.pageXOffset || element.scrollLeft || document.body.scrollLeft;
return output.setTo(box.left + scrollLeft - clientLeft, box.top + scrollTop - clientTop);
};
return Browser;
})();
DOM.Browser = Browser;
})(Kiwi.DOM || (Kiwi.DOM = {}));
var DOM = Kiwi.DOM;
})(Kiwi || (Kiwi = {}));
var Kiwi;
(function (Kiwi) {
(function (DOM) {
var Element = (function () {
function Element(id, cache, type) {
if (typeof type === "undefined") { type = 'div'; }
this._cache = cache;
this.id = id;
this.entity = null;
this.type = type;
this.available = true;
this.element = document.createElement(this.type);
this.element.id = this.id;
this.element.style.display = 'block';
this.element.style.position = 'absolute';
}
Element.prototype.objType = function () {
return "Element";
};
Element.prototype.link = function (entity) {
this.entity = entity;
this.entity.domElement = this;
this.available = false;
if (this.entity.isGroup() === true) {
klog.info('DOM.Element ' + this.id + ' linking with Group');
this._cache.domContainer.appendChild(this.element);
} else {
if (this.entity.parent !== null) {
klog.info('DOM.Element ' + this.id + ' linking with Group Member');
this.entity.parent.domElement.element.appendChild(this.element);
} else {
klog.info('DOM.Element ' + this.id + ' linking with Entity');
this._cache.domContainer.appendChild(this.element);
}
}
return this;
};
Element.prototype.unlink = function () {
this.available = true;
this.element.parentNode.removeChild(this.element);
this.element = document.createElement(this.type);
this.element.id = this.id;
this.element.style.display = 'block';
this.element.style.position = 'absolute';
};
return Element;
})();
DOM.Element = Element;
})(Kiwi.DOM || (Kiwi.DOM = {}));
var DOM = Kiwi.DOM;
})(Kiwi || (Kiwi = {}));
var Kiwi;
(function (Kiwi) {
(function (GameObjects) {
var Pixel = (function (_super) {
__extends(Pixel, _super);
function Pixel(x, y, color, size) {
if (typeof x === "undefined") { x = 0; }
if (typeof y === "undefined") { y = 0; }
if (typeof color === "undefined") { color = 0xFF000000; }
if (typeof size === "undefined") { size = 1; }
_super.call(this);
this.position = this.components.add(new Kiwi.Components.Position(x, y));
this.bounds = this.components.add(new Kiwi.Components.Bounds(x, y, size, size));
this.color = this.components.add(new Kiwi.Components.Color());
this.color.setColor(color);
this._pixelSize = size;
=======
>>>>>>> |
<<<<<<<
//If a default animation already exists
=======
>>>>>>>
<<<<<<<
//Otherwise create one.
=======
>>>>>>>
<<<<<<<
/**
* Gets the cell that the current Animation is current at. This is READ ONLY.
=======
get: /**
* Gets the cell that the current animation is current at. This is READ ONLY.
>>>>>>>
get: /**
* Gets the cell that the current Animation is current at. This is READ ONLY.
<<<<<<<
/**
* Gets the current frame index of the cell in the Sequence that is currently playing. This is READ ONLY.
=======
get: /**
* Gets the current frame index of the cell in the sequence that is currently playing. This is READ ONLY.
>>>>>>>
get: /**
* Gets the current frame index of the cell in the Sequence that is currently playing. This is READ ONLY.
<<<<<<<
/**
* Returns the length (Number of cells) of the current Animation that is playing. This is READ ONLY.
=======
get: /**
* Returns the length (Number of cells) of the current animation that is playing. This is READ ONLY.
>>>>>>>
get: /**
* Returns the length (Number of cells) of the current Animation that is playing. This is READ ONLY.
<<<<<<<
/**
* The 'normal' or transformed hitbox for the entity. This is its box after rotation/Kiwi.Geom.Rectangle.
=======
get: /**
* The 'normal' or transformed hitbox for the entity. This is its box after rotation/e.t.c.
>>>>>>>
get: /**
* The 'normal' or transformed hitbox for the entity. This is its box after rotation/Kiwi.Geom.Rectangle.
<<<<<<<
/**
* Separates two GameObject on the y-axis. This method is executed from the 'separate' method.
=======
ArcadePhysics.separateY = /**
* Separated two GameObject on the y-axis. This method is executed from the 'separate' method.
>>>>>>>
ArcadePhysics.separateY = /**
* Separates two GameObject on the y-axis. This method is executed from the 'separate' method.
<<<<<<<
/**
* Separates a GameObject from a tiles on the y-axis.
=======
ArcadePhysics.separateTilesY = /**
* Separates a GameObjects from an Array of Tiles on the y-axis.
>>>>>>>
ArcadePhysics.separateTilesY = /**
* Separates a GameObject from a tiles on the y-axis.
<<<<<<<
/**
* A Static method that checks to see if any objects in one group overlap with objects in another group.
=======
ArcadePhysics.overlapsGroupGroup = /**
* A Static method that checks to see if any objects in a group overlap with objects in another group.
>>>>>>>
ArcadePhysics.overlapsGroupGroup = /**
* A Static method that checks to see if any objects in one group overlap with objects in another group.
<<<<<<<
/**
* A Static method that checks to see if any objects from an Array collide with a Kiwi Group members.
=======
ArcadePhysics.overlapsArrayGroup = /**
* A Statuc method that checks to see if any objects from an Array collide with a Kiwi Group members.
>>>>>>>
ArcadePhysics.overlapsArrayGroup = /**
* A Static method that checks to see if any objects from an Array collide with a Kiwi Group members. |
<<<<<<<
_dispatchEvent(this, rootEl, 'unchoose', dragEl, rootEl, oldIndex, null, evt);
=======
_dispatchEvent(this, rootEl, 'unchoose', dragEl, parentEl, rootEl, oldIndex);
>>>>>>>
_dispatchEvent(this, rootEl, 'unchoose', dragEl, parentEl, rootEl, oldIndex, null, evt);
<<<<<<<
_dispatchEvent(null, parentEl, 'add', dragEl, rootEl, oldIndex, newIndex, evt);
=======
_dispatchEvent(null, parentEl, 'add', dragEl, parentEl, rootEl, oldIndex, newIndex);
>>>>>>>
_dispatchEvent(null, parentEl, 'add', dragEl, parentEl, rootEl, oldIndex, newIndex, evt);
<<<<<<<
_dispatchEvent(this, rootEl, 'remove', dragEl, rootEl, oldIndex, newIndex, evt);
=======
_dispatchEvent(this, rootEl, 'remove', dragEl, parentEl, rootEl, oldIndex, newIndex);
>>>>>>>
_dispatchEvent(this, rootEl, 'remove', dragEl, parentEl, rootEl, oldIndex, newIndex, evt);
<<<<<<<
_dispatchEvent(null, parentEl, 'sort', dragEl, rootEl, oldIndex, newIndex, evt);
_dispatchEvent(this, rootEl, 'sort', dragEl, rootEl, oldIndex, newIndex, evt);
=======
_dispatchEvent(null, parentEl, 'sort', dragEl, parentEl, rootEl, oldIndex, newIndex);
_dispatchEvent(this, rootEl, 'sort', dragEl, parentEl, rootEl, oldIndex, newIndex);
>>>>>>>
_dispatchEvent(null, parentEl, 'sort', dragEl, parentEl, rootEl, oldIndex, newIndex, evt);
_dispatchEvent(this, rootEl, 'sort', dragEl, parentEl, rootEl, oldIndex, newIndex, evt);
<<<<<<<
_dispatchEvent(this, rootEl, 'update', dragEl, rootEl, oldIndex, newIndex, evt);
_dispatchEvent(this, rootEl, 'sort', dragEl, rootEl, oldIndex, newIndex, evt);
=======
_dispatchEvent(this, rootEl, 'update', dragEl, parentEl, rootEl, oldIndex, newIndex);
_dispatchEvent(this, rootEl, 'sort', dragEl, parentEl, rootEl, oldIndex, newIndex);
>>>>>>>
_dispatchEvent(this, rootEl, 'update', dragEl, parentEl, rootEl, oldIndex, newIndex, evt);
_dispatchEvent(this, rootEl, 'sort', dragEl, parentEl, rootEl, oldIndex, newIndex, evt);
<<<<<<<
_dispatchEvent(this, rootEl, 'end', dragEl, rootEl, oldIndex, newIndex, evt);
=======
_dispatchEvent(this, rootEl, 'end', dragEl, parentEl, rootEl, oldIndex, newIndex);
>>>>>>>
_dispatchEvent(this, rootEl, 'end', dragEl, parentEl, rootEl, oldIndex, newIndex, evt);
<<<<<<<
function _dispatchEvent(sortable, rootEl, name, targetEl, fromEl, startIndex, newIndex, originalEvt) {
=======
function _dispatchEvent(sortable, rootEl, name, targetEl, toEl, fromEl, startIndex, newIndex) {
>>>>>>>
function _dispatchEvent(sortable, rootEl, name, targetEl, toEl, fromEl, startIndex, newIndex, originalEvt) { |
<<<<<<<
_on(document, 'dragover', this);
if (!supportDraggable) {
this._onDragStart(tapEvt, true);
}
=======
>>>>>>>
if (!supportDraggable) {
this._onDragStart(tapEvt, true);
}
<<<<<<<
_off(document, 'dragover', this);
_off(document, 'mousemove', this._onTouchMove);
=======
>>>>>>>
_off(document, 'mousemove', this._onTouchMove); |
<<<<<<<
/**
* @param {import('vscode-textmate').IToken} token
* @param {import('vscode-textmate').ITokenizeLineResult2} binaryTokens
*/
function getMetadataForToken(token, binaryTokens) {
const index = binaryTokens.tokens.findIndex((_, i) => {
return !(i % 2) && binaryTokens.tokens[i + 2] > token.startIndex;
});
if (index > -1) {
return binaryTokens.tokens[index + 1];
}
return binaryTokens.tokens[binaryTokens.tokens.length - 1];
}
/**
* @param {*} cache
* @param {string} key
* @param {object} value
*/
async function mergeCache(cache, key, value) {
await cache.set(key, { ...(await cache.get(key)), ...value });
}
=======
/**
* @param {string} themeIdentifier
*/
function getThemeHash(themeIdentifier) {
return createHash('md5')
.update(themeIdentifier)
.digest('base64')
.replace(/[^a-zA-Z0-9-_]/g, '')
.substr(0, 5);
}
/**
* @param {string} canonicalClassName
* @param {string} themeIdentifier
*/
function getThemePrefixedTokenClassName(canonicalClassName, themeIdentifier) {
return 'grvsc-t' + getThemeHash(themeIdentifier) + '-' + canonicalClassName.substr('mtk'.length);
}
/**
* @param {ConditionalTheme} theme
* @returns {string[]}
*/
function getThemeClassNames(theme) {
return theme.conditions.map(({ condition }) => getThemeClassName(theme.identifier, condition));
}
/**
*
* @param {string} themeIdentifier
* @param {ThemeCondition['condition']} conditionKind
*/
function getThemeClassName(themeIdentifier, conditionKind) {
switch (conditionKind) {
case 'default':
return sanitizeForClassName(themeIdentifier);
case 'matchMedia':
return 'grvsc-mm-t' + getThemeHash(themeIdentifier);
case 'parentSelector':
return 'grvsc-ps-t' + getThemeHash(themeIdentifier);
default:
throw new Error(`Unrecognized theme condition '${conditionKind}'`);
}
}
/**
* @template T
* @template U
* @param {T[]} arr
* @param {(element: T) => U | U[]} mapper
* @returns {U[]}
*/
function flatMap(arr, mapper) {
/** @type {U[]} */
const flattened = [];
for (const input of arr) {
const mapped = mapper(input);
if (Array.isArray(mapped)) {
for (const output of mapped) {
flattened.push(output);
}
} else {
flattened.push(mapped);
}
}
return flattened;
}
/**
* @param {ConditionalTheme[] | undefined} arr1
* @param {ConditionalTheme[]} arr2
* @returns {ConditionalTheme[]}
*/
function concatConditionalThemes(arr1, arr2) {
if (!arr1) arr1 = [];
arr2.forEach(addTheme);
return arr1;
/** @param {ConditionalTheme} theme */
function addTheme(theme) {
const existing = arr1.find(t => t.identifier === theme.identifier);
if (existing) {
if (conditionalThemesAreEqual(existing, theme)) return;
existing.conditions = concatConditions(existing.conditions, theme.conditions);
} else {
arr1 = arr1.concat(theme);
}
}
}
/**
* @param {ThemeCondition[]} arr1
* @param {ThemeCondition[]} arr2
*/
function concatConditions(arr1, arr2) {
arr2.forEach(addCondition);
return arr1;
/** @param {ThemeCondition} condition */
function addCondition(condition) {
if (!arr1.some(c => !compareConditions(c, condition))) {
arr1 = arr1.concat(condition);
}
}
}
/**
* @param {ConditionalTheme} a
* @param {ConditionalTheme} b
*/
function conditionalThemesAreEqual(a, b) {
if (a.identifier !== b.identifier) return false;
if (a.conditions.length !== b.conditions.length) return false;
const aConditions = sortConditions(a.conditions);
const bConditions = sortConditions(b.conditions);
for (let i = 0; i < aConditions.length; i++) {
if (compareConditions(aConditions[i], bConditions[i])) {
return false;
}
}
return true;
}
/**
* @param {ThemeCondition[]} conditions
*/
function sortConditions(conditions) {
return conditions.slice().sort(compareConditions);
}
/**
* @param {ThemeCondition} a
* @param {ThemeCondition} b
*/
function compareConditions(a, b) {
if (a.condition < b.condition) return -1;
if (a.condition > b.condition) return 1;
switch (a.condition) {
case 'matchMedia':
// @ts-ignore
const bValue = b.value;
if (a.value < bValue) return -1;
if (a.value > bValue) return 1;
}
return 0;
}
/**
* @param {ThemeCondition[]} conditions
*/
function groupConditions(conditions) {
return {
default: conditions.find(/** @returns {c is DefaultThemeCondition} */ c => c.condition === 'default'),
matchMedia: conditions.filter(/** @returns {c is MatchMediaThemeCondition} */ c => c.condition === 'matchMedia'),
parentSelector: conditions.filter(
/** @returns {c is ParentSelectorThemeCondition} */ c => c.condition === 'parentSelector'
)
};
}
const settingPropertyMap = { 'editor.background': 'background-color', 'editor.foreground': 'color' };
/**
* @param {Record<string, string>} settings
* @returns {grvsc.CSSDeclaration[]}
*/
function getStylesFromThemeSettings(settings) {
/** @type {grvsc.CSSDeclaration[]} */
const decls = [];
for (const key in settings) {
const property = settingPropertyMap[key];
if (property) {
decls.push(declaration(property, settings[key]));
}
}
return decls;
}
/**
* @param {LegacyThemeOption} themeOption
* @returns {ThemeOption}
*/
function convertLegacyThemeOption(themeOption) {
if (typeof themeOption === 'function') {
return data => convertLegacyThemeSettings(themeOption(data));
}
return convertLegacyThemeSettings(themeOption);
}
/**
* @param {LegacyThemeSettings | string} themeSettings
* @returns {ThemeSettings | string}
*/
function convertLegacyThemeSettings(themeSettings) {
if (typeof themeSettings === 'string') {
return themeSettings;
}
/** @type {MediaQuerySetting[]} */
const media = [];
if (themeSettings.prefersDarkTheme) {
media.push({ match: '(prefers-color-scheme: dark)', theme: themeSettings.prefersDarkTheme });
}
if (themeSettings.prefersLightTheme) {
media.push({ match: '(prefers-color-scheme: light)', theme: themeSettings.prefersLightTheme });
}
return {
default: themeSettings.defaultTheme,
media
};
}
function createOnce() {
const onceFns = new Set();
/**
* @template {void | Promise<void>} T
* @param {() => T} fn
* @param {any=} key
* @returns {T | undefined}
*/
return function once(fn, key = fn) {
if (!onceFns.has(key)) {
onceFns.add(key);
return fn();
}
};
}
function deprecationNotice(message) {
logger.warn(`Deprecation notice: ${message}`);
}
/**
* @param {string} p
*/
function isRelativePath(p) {
return /^\.\.?[\\/]/.test(p);
}
>>>>>>>
/**
* @param {import('vscode-textmate').IToken} token
* @param {import('vscode-textmate').ITokenizeLineResult2} binaryTokens
*/
function getMetadataForToken(token, binaryTokens) {
const index = binaryTokens.tokens.findIndex((_, i) => {
return !(i % 2) && binaryTokens.tokens[i + 2] > token.startIndex;
});
if (index > -1) {
return binaryTokens.tokens[index + 1];
}
return binaryTokens.tokens[binaryTokens.tokens.length - 1];
}
/**
* @param {*} cache
* @param {string} key
* @param {object} value
*/
async function mergeCache(cache, key, value) {
await cache.set(key, { ...(await cache.get(key)), ...value });
}
/**
* @param {string} themeIdentifier
*/
function getThemeHash(themeIdentifier) {
return createHash('md5')
.update(themeIdentifier)
.digest('base64')
.replace(/[^a-zA-Z0-9-_]/g, '')
.substr(0, 5);
}
/**
* @param {string} canonicalClassName
* @param {string} themeIdentifier
*/
function getThemePrefixedTokenClassName(canonicalClassName, themeIdentifier) {
return 'grvsc-t' + getThemeHash(themeIdentifier) + '-' + canonicalClassName.substr('mtk'.length);
}
/**
* @param {ConditionalTheme} theme
* @returns {string[]}
*/
function getThemeClassNames(theme) {
return theme.conditions.map(({ condition }) => getThemeClassName(theme.identifier, condition));
}
/**
*
* @param {string} themeIdentifier
* @param {ThemeCondition['condition']} conditionKind
*/
function getThemeClassName(themeIdentifier, conditionKind) {
switch (conditionKind) {
case 'default':
return sanitizeForClassName(themeIdentifier);
case 'matchMedia':
return 'grvsc-mm-t' + getThemeHash(themeIdentifier);
case 'parentSelector':
return 'grvsc-ps-t' + getThemeHash(themeIdentifier);
default:
throw new Error(`Unrecognized theme condition '${conditionKind}'`);
}
}
/**
* @template T
* @template U
* @param {T[]} arr
* @param {(element: T) => U | U[]} mapper
* @returns {U[]}
*/
function flatMap(arr, mapper) {
/** @type {U[]} */
const flattened = [];
for (const input of arr) {
const mapped = mapper(input);
if (Array.isArray(mapped)) {
for (const output of mapped) {
flattened.push(output);
}
} else {
flattened.push(mapped);
}
}
return flattened;
}
/**
* @param {ConditionalTheme[] | undefined} arr1
* @param {ConditionalTheme[]} arr2
* @returns {ConditionalTheme[]}
*/
function concatConditionalThemes(arr1, arr2) {
if (!arr1) arr1 = [];
arr2.forEach(addTheme);
return arr1;
/** @param {ConditionalTheme} theme */
function addTheme(theme) {
const existing = arr1.find(t => t.identifier === theme.identifier);
if (existing) {
if (conditionalThemesAreEqual(existing, theme)) return;
existing.conditions = concatConditions(existing.conditions, theme.conditions);
} else {
arr1 = arr1.concat(theme);
}
}
}
/**
* @param {ThemeCondition[]} arr1
* @param {ThemeCondition[]} arr2
*/
function concatConditions(arr1, arr2) {
arr2.forEach(addCondition);
return arr1;
/** @param {ThemeCondition} condition */
function addCondition(condition) {
if (!arr1.some(c => !compareConditions(c, condition))) {
arr1 = arr1.concat(condition);
}
}
}
/**
* @param {ConditionalTheme} a
* @param {ConditionalTheme} b
*/
function conditionalThemesAreEqual(a, b) {
if (a.identifier !== b.identifier) return false;
if (a.conditions.length !== b.conditions.length) return false;
const aConditions = sortConditions(a.conditions);
const bConditions = sortConditions(b.conditions);
for (let i = 0; i < aConditions.length; i++) {
if (compareConditions(aConditions[i], bConditions[i])) {
return false;
}
}
return true;
}
/**
* @param {ThemeCondition[]} conditions
*/
function sortConditions(conditions) {
return conditions.slice().sort(compareConditions);
}
/**
* @param {ThemeCondition} a
* @param {ThemeCondition} b
*/
function compareConditions(a, b) {
if (a.condition < b.condition) return -1;
if (a.condition > b.condition) return 1;
switch (a.condition) {
case 'matchMedia':
// @ts-ignore
const bValue = b.value;
if (a.value < bValue) return -1;
if (a.value > bValue) return 1;
}
return 0;
}
/**
* @param {ThemeCondition[]} conditions
*/
function groupConditions(conditions) {
return {
default: conditions.find(/** @returns {c is DefaultThemeCondition} */ c => c.condition === 'default'),
matchMedia: conditions.filter(/** @returns {c is MatchMediaThemeCondition} */ c => c.condition === 'matchMedia'),
parentSelector: conditions.filter(
/** @returns {c is ParentSelectorThemeCondition} */ c => c.condition === 'parentSelector'
)
};
}
const settingPropertyMap = { 'editor.background': 'background-color', 'editor.foreground': 'color' };
/**
* @param {Record<string, string>} settings
* @returns {grvsc.CSSDeclaration[]}
*/
function getStylesFromThemeSettings(settings) {
/** @type {grvsc.CSSDeclaration[]} */
const decls = [];
for (const key in settings) {
const property = settingPropertyMap[key];
if (property) {
decls.push(declaration(property, settings[key]));
}
}
return decls;
}
/**
* @param {LegacyThemeOption} themeOption
* @returns {ThemeOption}
*/
function convertLegacyThemeOption(themeOption) {
if (typeof themeOption === 'function') {
return data => convertLegacyThemeSettings(themeOption(data));
}
return convertLegacyThemeSettings(themeOption);
}
/**
* @param {LegacyThemeSettings | string} themeSettings
* @returns {ThemeSettings | string}
*/
function convertLegacyThemeSettings(themeSettings) {
if (typeof themeSettings === 'string') {
return themeSettings;
}
/** @type {MediaQuerySetting[]} */
const media = [];
if (themeSettings.prefersDarkTheme) {
media.push({ match: '(prefers-color-scheme: dark)', theme: themeSettings.prefersDarkTheme });
}
if (themeSettings.prefersLightTheme) {
media.push({ match: '(prefers-color-scheme: light)', theme: themeSettings.prefersLightTheme });
}
return {
default: themeSettings.defaultTheme,
media
};
}
function createOnce() {
const onceFns = new Set();
/**
* @template {void | Promise<void>} T
* @param {() => T} fn
* @param {any=} key
* @returns {T | undefined}
*/
return function once(fn, key = fn) {
if (!onceFns.has(key)) {
onceFns.add(key);
return fn();
}
};
}
function deprecationNotice(message) {
logger.warn(`Deprecation notice: ${message}`);
}
/**
* @param {string} p
*/
function isRelativePath(p) {
return /^\.\.?[\\/]/.test(p);
}
<<<<<<<
requirePlistOrJson,
getMetadataForToken,
mergeCache,
=======
requirePlistOrJson,
getThemePrefixedTokenClassName,
getThemeClassName,
getThemeClassNames,
flatMap,
concatConditionalThemes,
groupConditions,
getStylesFromThemeSettings,
convertLegacyThemeOption,
deprecationNotice,
isRelativePath,
createOnce
>>>>>>>
requirePlistOrJson,
getMetadataForToken,
mergeCache,
getThemePrefixedTokenClassName,
getThemeClassName,
getThemeClassNames,
flatMap,
concatConditionalThemes,
groupConditions,
getStylesFromThemeSettings,
convertLegacyThemeOption,
deprecationNotice,
isRelativePath,
createOnce |
<<<<<<<
// The sprite's current transform, with appropriate caching so that
// you don't trigger reflows.
=======
get _$element() {
if (!this.__$element) {
this.__$element = $(this.element);
}
return this.__$element;
}
/**
Returns the sprite's current transform, with appropriate caching
so that you don't trigger reflows.
@accessor transform
@type {Transform}
*/
>>>>>>>
/**
Returns the sprite's current transform, with appropriate caching
so that you don't trigger reflows.
@accessor transform
@type {Transform}
*/ |
<<<<<<<
var fs = require('fs');
var path = require('path');
=======
var path = require('path');
var fs = require('fs');
var mergeTrees = require('broccoli-merge-trees');
var pickFiles = require('broccoli-static-compiler');
var es3SafeRecast = require('broccoli-es3-safe-recast');
function LiquidFire(project) {
this.project = project;
this.name = 'Liquid Fire';
}
function unwatchedTree(dir) {
return {
read: function() { return dir; },
cleanup: function() { }
};
}
LiquidFire.prototype.treeFor = function treeFor(name) {
var treePath = path.join('node_modules', 'liquid-fire');
if (name === 'templates') {
treePath = path.join(treePath, 'app-addon', 'templates');
} else {
treePath = path.join(treePath, name + '-addon');
}
>>>>>>>
var fs = require('fs');
var path = require('path');
var es3SafeRecast = require('broccoli-es3-safe-recast');
<<<<<<<
treeFor: function(name) {
this._requireBuildPackages();
=======
if (name === 'vendor') {
addon = es3SafeRecast(addon);
var src = unwatchedTree(path.dirname(require.resolve('velocity-animate')));
addon = mergeTrees([addon, pickFiles(src, {srcDir: '/', destDir: 'velocity'})]);
}
>>>>>>>
treeFor: function(name) {
this._requireBuildPackages(); |
<<<<<<<
const { setWinner } = require('./winner/action-creator')
=======
const { roomName, convertStateForFrontEnd } = require('./utils')
>>>>>>>
const { setWinner } = require('./winner/action-creator')
const { roomName, convertStateForFrontEnd } = require('./utils')
<<<<<<<
const roomName = (connectedSocket, roomsList) => {
let roomsNames = Object.keys(roomsList).filter(room => {
return room.length < 12
});
let currentRoomName;
let createdRoom = false;
if (!roomsNames.length) {
return { currentRoomName: worldNames[0], createdRoom: true };
}
for (let i = 0; i < roomsNames.length; i++) {
if (roomsList[roomsNames[i]].length < 4) {
currentRoomName = roomsNames[i];
break;
} else if (i === roomsNames.length - 1) {
connectedSocket.join(worldNames[i + 1]);
currentRoomName = worldNames[i + 1];
createdRoom = true;
}
}
return { currentRoomName, createdRoom };
}
const convertStateForFrontEnd = (state, room) => {
return {
players: state.players[room],
bombs: {
allBombs: state.bombs[room].allBombs
},
mapState: {
mapState: state.mapState[room].mapState
},
timer: state.timer[room].timer,
winner: state.winner[room].winner
}
}
=======
>>>>>>>
<<<<<<<
let currentState = store.getState();
// console.log(currentState.players[socket.currentRoom])
let newState = convertStateForFrontEnd(currentState, socket.currentRoom)
=======
let newState = convertStateForFrontEnd(store.getState(), socket.currentRoom)
>>>>>>>
let newState = convertStateForFrontEnd(store.getState(), socket.currentRoom)
<<<<<<<
players: store.getState().players[socket.currentRoom],
bombs: {
allBombs: []
},
mapState: {
mapState: store.getState().mapState[socket.currentRoom].mapState
},
timer: store.getState().timer[socket.currentRoom].timer,
winner: null
=======
players: state.players[socket.currentRoom],
bombs: {},
map: state.map[socket.currentRoom],
timer: state.timer[socket.currentRoom],
winner: null
>>>>>>>
players: state.players[socket.currentRoom],
bombs: {},
map: state.map[socket.currentRoom],
timer: state.timer[socket.currentRoom],
winner: null |
<<<<<<<
import { initCannon, init, animate, controls } from '../game/main';
import { Login } from './Login';
const fontStyle = {
'fontSize': '40px'
}
=======
import { initCannon, init, animate } from '../game/main';
import Blocker from './Blocker';
>>>>>>>
import { initCannon, init, animate, controls } from '../game/main';
import { Login } from './Login';
const fontStyle = {
'fontSize': '40px'
}
import Blocker from './Blocker';
<<<<<<<
<Login />
<div id="blocker">
<div id="instructions">
<span style={fontStyle}>Click to play</span>
<br />
(W,A,S,D = Move, MOUSE = Look, CLICK = Shoot)
</div>
</div>
{ winnerId && <h1 style={{position: "absolute", right: 500}}>{winnerNickname} Won!</h1>}
{this.props.dead && <h1 style={{position: "absolute", right: 500, top: 50}}> YOU ARE DEAD</h1>}
=======
<Blocker dead={this.props.dead} />
{ this.props.dead && <div style={{ backgroundColor: '#700303',
position: 'absolute',
opacity: '0.7',
width: '100vw',
height: '100vh',
pointerEvents: 'none'}}><h1 style={{position: "absolute", right: 500}}> YOU ARE FUCKING DEAD</h1>
</div>}
>>>>>>>
<Login />
<div id="blocker">
<div id="instructions">
<span style={fontStyle}>Click to play</span>
<br />
(W,A,S,D = Move, MOUSE = Look, CLICK = Shoot)
</div>
</div>
{ winnerId && <h1 style={{position: "absolute", right: 500}}>{winnerNickname} Won!</h1>}
<Blocker dead={this.props.dead} />
{ this.props.dead && <div style={{ backgroundColor: '#700303',
position: 'absolute',
opacity: '0.7',
width: '100vw',
height: '100vh',
pointerEvents: 'none'}}><h1 style={{position: "absolute", right: 500, top: 50}}> YOU ARE DEAD</h1>
</div>}
<<<<<<<
seconds={this.state.time}
color="#ddd"
alpha={0.5}
size={100}
timeFormat="hms"
onComplete={function(){
}}
/>
}
</div>
=======
seconds={+this.state.time}
color="#ddd"
alpha={0.5}
size={100}
timeFormat="hms"
// onComplete={}
/> }
</div>
>>>>>>>
seconds={this.state.time}
color="#ddd"
alpha={0.5}
size={100}
timeFormat="hms"
onComplete={function(){
}}
/>
}
</div> |
<<<<<<<
=======
store.dispatch(removePlayerBombs(socket.id))
io.sockets.emit('remove_player', socket.id)
>>>>>>>
store.dispatch(removePlayerBombs(socket.id)) |
<<<<<<<
// window.ieShivDebug = true;
// uncomment above if you want to test
(function(exports) {
=======
(function (exports) {
>>>>>>>
(function (exports) {
<<<<<<<
=======
>>>>>>>
<<<<<<<
}
=======
}
>>>>>>>
} |
<<<<<<<
import {tokensPage} from "../settings";
import getColorFills from '../getSketchData/getColorFills';
import getTypography from '../getSketchData/getTypographyFonts';
import getSvgPaths from '../getSketchData/getSvgPaths';
import getUtils from '../getSketchData/getUtils';
=======
import { mainSketchFile, tokensPage } from "../settings";
import getColorFills from "../getSketchData/getColorFills";
import getTypography from "../getSketchData/getTypographyFonts";
import getSvgPaths from "../getSketchData/getSvgPaths";
import getUtils from "../getSketchData/getUtils";
>>>>>>>
import { tokensPage } from "../settings";
import getColorFills from "../getSketchData/getColorFills";
import getTypography from "../getSketchData/getTypographyFonts";
import getSvgPaths from "../getSketchData/getSvgPaths";
import getUtils from "../getSketchData/getUtils"; |
<<<<<<<
onFormFactorSelect: PropTypes.func.isRequired,
onRecordIdUpdate: PropTypes.func.isRequired,
onViewRecordClick: PropTypes.func.isRequired,
=======
depGraph: PropTypes.object,
>>>>>>>
onFormFactorSelect: PropTypes.func.isRequired,
onRecordIdUpdate: PropTypes.func.isRequired,
onViewRecordClick: PropTypes.func.isRequired,
depGraph: PropTypes.object, |
<<<<<<<
Use S3, Azure, GCP, SSH, Aliyun OSS, SFTP, rsync or any network-attached storage to store data. The
list of supported protocols is constantly expanding.
=======
Use S3, Azure, GCP, SSH, SFTP, rsync or any network-attached storage
to store data. The list of supported protocols is constantly
expanding.
>>>>>>>
Use S3, Azure, GCP, SSH, SFTP, Aliyun OSS, rsync or any network-attached storage
to store data. The list of supported protocols is constantly
expanding. |
<<<<<<<
<LocalLink href="/doc/tutorials/get-started" as={Button} first>
=======
<LocalLink href="/doc/get-started" as={Button} first="true">
>>>>>>>
<LocalLink href="/doc/tutorials/get-started" as={Button} first="true"> |
<<<<<<<
margin-left: 20px;
=======
width: auto;
height: calc(100% - 60px);
padding-left: 20px;
>>>>>>>
height: calc(100% - 60px);
padding-left: 20px; |
<<<<<<<
message: 'What is the name of your Firebase project (this must match the name on your firebase console)?',
validate(input) {
if (/^([A-Za-z\-_\d])+$/.test(input)) return true;
return 'Firebase project name may only include letters, numbers, underscores and hashes.';
},
=======
message: 'What is the name of your Firebase project? (this must match the name on your firebase console)',
>>>>>>>
message: 'What is the name of your Firebase project? (this must match the name on your firebase console)',
validate(input) {
if (/^([A-Za-z\-_\d])+$/.test(input)) return true;
return 'Firebase project name may only include letters, numbers, underscores and hashes.';
},
<<<<<<<
message: 'What is the name of your firebase project?',
validate(input) {
if (/^([A-Za-z\-_\d])+$/.test(input)) return true;
return 'Firebase project name may only include letters, numbers, underscores and hashes.';
},
=======
message: 'What is the name of your firebase project? (this must match the name on your firebase console)',
>>>>>>>
message: 'What is the name of your firebase project? (this must match the name on your firebase console)',
validate(input) {
if (/^([A-Za-z\-_\d])+$/.test(input)) return true;
return 'Firebase project name may only include letters, numbers, underscores and hashes.';
}, |
<<<<<<<
const status = new Spinner("Forging 🔨, please wait...", [
"🔥",
"🔥",
"🔥",
"🔥",
"💥",
"💥",
"💥",
"💥",
"⚡",
"⚡",
"⚡",
"⚡",
"🌋",
"🌋",
"🌋",
"🌋"
]);
// AWS.config.update({ region: 'us-west-2' });
// const elasticbeanstalk = new AWS.ElasticBeanstalk();
let answers;
let configPath;
=======
const status = new Spinner('Forging 🔨, please wait...', ['🔥', '🔥', '🔥', '🔥', '💥', '💥', '💥', '💥', '⚡', '⚡', '⚡', '⚡', '🌋', '🌋', '🌋', '🌋']);
>>>>>>>
const status = new Spinner("Forging 🔨, please wait...", [
"🔥",
"🔥",
"🔥",
"🔥",
"💥",
"💥",
"💥",
"💥",
"⚡",
"⚡",
"⚡",
"⚡",
"🌋",
"🌋",
"🌋",
"🌋"
]); |
<<<<<<<
if ( response.license ) {
changeLicense(response.license);
fetchOptions().then(r => {
setSettings(r);
});
}
=======
changeLicense(response.license);
fetchOptions().then(r => {
setSettings(r);
refreshSites();
});
>>>>>>>
if ( response.license ) {
changeLicense(response.license);
fetchOptions().then(r => {
setSettings(r);
refreshSites();
});
} |
<<<<<<<
SHADOWS_BITE: {
id: 272944,
name: 'Shadow\'s Bite',
icon: 'spell_shadow_painspike',
},
SHADOWS_BITE_BUFF: {
id: 272945,
name: 'Shadow\'s Bite',
icon: 'spell_shadow_painspike',
},
FORBIDDEN_KNOWLEDGE: {
id: 278738,
name: 'Forbidden Knowledge',
icon: 'inv_offhand_hyjal_d_01',
},
FORBIDDEN_KNOWLEDGE_BUFF: {
id: 279666,
name: 'Forbidden Knowledge',
icon: 'inv_offhand_hyjal_d_01',
},
=======
UMBRAL_BLAZE: {
id: 273523,
name: 'Umbral Blaze',
icon: 'ability_warlock_everlastingaffliction',
},
UMBRAL_BLAZE_DEBUFF: {
id: 273526,
name: 'Umbral Blaze',
icon: 'ability_warlock_everlastingaffliction',
},
>>>>>>>
SHADOWS_BITE: {
id: 272944,
name: 'Shadow\'s Bite',
icon: 'spell_shadow_painspike',
},
SHADOWS_BITE_BUFF: {
id: 272945,
name: 'Shadow\'s Bite',
icon: 'spell_shadow_painspike',
},
FORBIDDEN_KNOWLEDGE: {
id: 278738,
name: 'Forbidden Knowledge',
icon: 'inv_offhand_hyjal_d_01',
},
FORBIDDEN_KNOWLEDGE_BUFF: {
id: 279666,
name: 'Forbidden Knowledge',
icon: 'inv_offhand_hyjal_d_01',
},
UMBRAL_BLAZE: {
id: 273523,
name: 'Umbral Blaze',
icon: 'ability_warlock_everlastingaffliction',
},
UMBRAL_BLAZE_DEBUFF: {
id: 273526,
name: 'Umbral Blaze',
icon: 'ability_warlock_everlastingaffliction',
}, |
<<<<<<<
it('should update styling', function() {
expect(this.typeaheadView.$node).toHaveCss({ direction: 'rtl' });
expect(this.dropdownView.setLanguageDirection)
.toHaveBeenCalledWith('rtl');
=======
it('should update language class name', function() {
expect(this.typeaheadView.$node).toHaveClass('tt-rtl');
expect(this.typeaheadView.$node).not.toHaveClass('tt-ltr');
>>>>>>>
it('should update styling', function() {
expect(this.typeaheadView.$node).toHaveCss({ direction: 'rtl' });
expect(this.dropdownView.setLanguageDirection)
.toHaveBeenCalledWith('rtl');
<<<<<<<
it('should update styling', function() {
expect(this.typeaheadView.$node).toHaveCss({ direction: 'rtl' });
expect(this.dropdownView.setLanguageDirection)
.toHaveBeenCalledWith('rtl');
=======
it('should update language class name', function() {
expect(this.typeaheadView.$node).toHaveClass('tt-rtl');
expect(this.typeaheadView.$node).not.toHaveClass('tt-ltr');
>>>>>>>
it('should update styling', function() {
expect(this.typeaheadView.$node).toHaveCss({ direction: 'rtl' });
expect(this.dropdownView.setLanguageDirection)
.toHaveBeenCalledWith('rtl');
<<<<<<<
this.inputView.trigger(eventType + 'Keyed');
=======
this.$e = $.extend($.Event('keydown'), { keyCode: 38, shiftKey: true });
spyOn(this.$e, 'preventDefault');
this.inputView.trigger('up', this.$e);
});
it('should show the dropdown menu', function() {
expect(this.dropdownView.show).toHaveBeenCalled();
});
it('should not prevent default browser behavior', function() {
expect(this.$e.preventDefault).not.toHaveBeenCalled();
});
it('should not move cursor up', function() {
expect(this.dropdownView.moveCursorUp).not.toHaveBeenCalled();
});
});
describe('if modifier key was not pressed', function() {
beforeEach(function() {
this.$e = $.extend($.Event('keydown'), { keyCode: 38 });
spyOn(this.$e, 'preventDefault');
this.inputView.trigger('up', this.$e);
});
it('should show the dropdown menu', function() {
expect(this.dropdownView.show).toHaveBeenCalled();
});
it('should prevent default browser behavior', function() {
expect(this.$e.preventDefault).toHaveBeenCalled();
});
it('should move cursor up', function() {
expect(this.dropdownView.moveCursorUp).toHaveBeenCalled();
});
});
});
describe('when inputView triggers down', function() {
describe('if modifier key was pressed', function() {
beforeEach(function() {
this.$e = $.extend($.Event('keydown'), { keyCode: 40, shiftKey: true });
spyOn(this.$e, 'preventDefault');
this.inputView.trigger('down', this.$e);
>>>>>>>
this.$e = $.extend($.Event('keydown'), { keyCode: 40, shiftKey: true });
spyOn(this.$e, 'preventDefault');
this.inputView.trigger('downKeyed', this.$e);
<<<<<<<
describe('when inputView triggers tabKeyed', function() {
=======
describe('when inputView triggers tab', function() {
beforeEach(function() {
this.$e = $.extend($.Event('keydown'), { keyCode: 9 });
spyOn(this.$e, 'preventDefault');
});
>>>>>>>
describe('when inputView triggers tabKeyed', function() {
beforeEach(function() {
this.$e = $.extend($.Event('keydown'), { keyCode: 9 });
spyOn(this.$e, 'preventDefault');
});
<<<<<<<
this.inputView.trigger('tabKeyed');
=======
this.inputView.trigger('tab', this.$e);
>>>>>>>
this.inputView.trigger('tabKeyed', this.$e);
<<<<<<<
this.inputView.trigger('tabKeyed');
=======
this.inputView.trigger('tab', this.$e);
>>>>>>>
this.inputView.trigger('tabKeyed', this.$e);
<<<<<<<
describe('if dropdown menu is not visible', function() {
=======
describe('if input\'s value is overflowing', function() {
it('should clear hint', function() {
this.inputView.isOverflow.andReturn(true);
this.inputView.getInputValue.andReturn('bl');
this.dropdownView.getFirstSuggestion.andReturn({ value: 'blah' });
this[view].trigger(eventType);
expect(this.inputView.setHintValue).not.toHaveBeenCalled();
});
});
describe('if dropdown menu is closed', function() {
>>>>>>>
describe('if input\'s value is overflowing', function() {
it('should clear hint', function() {
this.inputView.isOverflow.andReturn(true);
this.inputView.getInputValue.andReturn('bl');
this.dropdownView.getFirstSuggestion.andReturn({ value: 'blah' });
this[view].trigger(eventType);
expect(this.inputView.setHintValue).not.toHaveBeenCalled();
});
});
describe('if dropdown menu is not visible', function() { |
<<<<<<<
'adding-suggested-searches',
'using-recent-searches-plugin',
=======
'using-query-suggestions-plugin',
'adding-recent-searches',
>>>>>>>
'adding-suggested-searches',
'adding-recent-searches', |
<<<<<<<
describe('if query is a blank string', function() {
beforeEach(function() {
this.inputView.getQuery.andReturn(' ');
this.inputView.trigger('queryChange');
});
it('should not call dropdownView.renderSuggestions for each dataset',
function() {
expect(this.dropdownView.renderSuggestions.callCount).toBe(0);
});
});
describe('if query is not a blank string', function() {
beforeEach(function() {
this.inputView.getQuery.andReturn('not blank');
this.inputView.trigger('queryChange');
});
it('should call dropdownView.renderSuggestions for each dataset',
function() {
expect(this.dropdownView.renderSuggestions.callCount).toBe(3);
});
=======
it('should call dropdownView.renderSuggestions for each dataset',
function() {
this.inputView.trigger('queryChanged');
expect(this.dropdownView.renderSuggestions.callCount).toBe(3);
>>>>>>>
describe('if query is a blank string', function() {
beforeEach(function() {
this.inputView.getQuery.andReturn(' ');
this.inputView.trigger('queryChange');
});
it('should not call dropdownView.renderSuggestions for each dataset',
function() {
expect(this.dropdownView.renderSuggestions.callCount).toBe(0);
});
});
describe('if query is not a blank string', function() {
beforeEach(function() {
this.inputView.getQuery.andReturn('not blank');
this.inputView.trigger('queryChanged');
});
it('should call dropdownView.renderSuggestions for each dataset',
function() {
expect(this.dropdownView.renderSuggestions.callCount).toBe(3);
});
<<<<<<<
beforeEach(function() {
this.dropdownView.isOpen.andReturn(true);
});
it('should show hint', function() {
=======
it('should show hint', function() {
this.dropdownView.isVisible.andReturn(true);
>>>>>>>
beforeEach(function() {
this.dropdownView.isVisible.andReturn(true);
});
it('should show hint', function() { |
<<<<<<<
var utils = __webpack_require__(2);
var dragOptions = __webpack_require__(3);
var rootRef = new Firebase(utils.urls.root);
var furnitureRef = new Firebase(utils.urls.furniture);
var furnitureTemplates = {
desk: "<div class='editor-furniture editor-desk'></div>",
plant: "<div class='editor-furniture editor-plant'></div>"
};
var $loggedInElements = $(".mover-header > .logo," +
".mover-header > .title," +
".mover-header > .mover-sign-out," +
".editor");
var $loggedOutElements = $(".buzzwords," +
".error," +
".welcome-hero");
var updateUIForLogout = function(){
$loggedOutElements.removeClass("hide");
$loggedInElements.addClass("hide");
};
var updateUIForLogin = function(){
$loggedOutElements.addClass("hide");
$loggedInElements.removeClass("hide");
};
var editor = {
init: function(){
// SETUP LOGIN BUTTON
$(".google-signin").on("click", function(e){
rootRef.authWithOAuthPopup("google", function(error, authData){
if (error){
$(".error").removeClass("error-hide");
}
else {
updateUIForLogin();
}
});
});
$(".mover-sign-out").on("click", function(e){
rootRef.unauth();
});
rootRef.onAuth(function(authData){
if (authData){
updateUIForLogin(); // USER IS LOGGED IN
}
else {
updateUIForLogout(); // USER IS LOGGED OUT
}
});
// GET FURNITURE POSITIONS
furnitureRef.once("value", function(snapshot){
var state = snapshot.val();
this.render(state);
}.bind(this));
// SET LISTENERS ON NEW FURNITURE BUTTONS
$(".editor-new").on("click", function(e){
// MAKE JQUERY OBJECT FOR PIECE OF FURNITURE
var itemName = $(this).data("name"); // DESK, PLANT, etc.
var $item = $(furnitureTemplates[itemName]); // jQUERY OBJECT
var newItemRef = furnitureRef.push({ // PUSH TO FIREBASE
type: itemName,
top: 0,
left: 0,
locked: false,
name: "",
rotation: 0
});
var itemID = newItemRef.toString();
// MAKE DRAGGABLE WITH dragOptions AND APPEND TO DOM
$item.data('id', itemID);
$item.draggable(dragOptions);
$(".editor").append($item);
});
},
render: function(state){
var $furnitures = _.map(state, function(furniture, index){
var $furniture = $(furnitureTemplates[furniture.type]);
var url = utils.urls.furniture + index;
$furniture.data("id", url);
$furniture.draggable(dragOptions);
$furniture.css({
"top": parseInt(furniture.top, 10),
"left": parseInt(furniture.left, 10)
});
return $furniture;
});
$(".editor").empty().append($furnitures);
}
};
module.exports = editor;
/***/ },
/* 2 */
/***/ function(module, exports, __webpack_require__) {
=======
>>>>>>> |
<<<<<<<
this._needAdvance = true;
=======
if (!this._stage) {
this._currentFrame = 1;
}
>>>>>>>
if (!this._stage) {
this._currentFrame = 1;
}
this._needAdvance = true; |
<<<<<<<
updateFlashRefs('examples/inspector/inspector.html', 'src');
updateFlashRefs('test/harness/slave.html', 'src');
updateFlashRefs('examples/xlsimport/index.html', 'src');
updateFlashRefs('examples/inspector/inspector.player.html', 'src');
=======
updateFlashRefs('examples/inspector/inspector.html', 'src', {shared: true, gfx: true, player: true});
updateFlashRefs('test/harness/slave.html', 'src', {shared: true, gfx: true, player: true});
updateFlashRefs('examples/xlsimport/index.html', 'src', {shared: true, gfx: true, player: true});
updateFlashRefs('examples/inspector/inspector.player.html', 'src', {shared: true, player: true});
updateFlashRefs('test/shell/includes.js', 'test/shell', {shared: true, player: true});
>>>>>>>
updateFlashRefs('examples/inspector/inspector.html', 'src', {shared: true, gfx: true, player: true});
updateFlashRefs('test/harness/slave.html', 'src', {shared: true, gfx: true, player: true});
updateFlashRefs('examples/xlsimport/index.html', 'src', {shared: true, gfx: true, player: true});
updateFlashRefs('examples/inspector/inspector.player.html', 'src', {shared: true, player: true}); |
<<<<<<<
var frameConstructed = new Promise;
avm2.systemDomain.onMessage.register(function waitForFrame(e) {
if (e.data.type === 'frameConstructed') {
frameConstructed.resolve();
avm2.systemDomain.onMessage.unregister(waitForFrame);
}
});
Promise.when(frameConstructed, this._lastPromise).then(function () {
this.contentLoaderInfo.dispatchEvent(
new flash.events.Event("complete"));
}.bind(this));
break;
case 'empty':
this._lastPromise = new Promise();
this._lastPromise.resolve();
=======
this.contentLoaderInfo._dispatchEvent(new flash.events.Event("complete"));
>>>>>>>
var frameConstructed = new Promise;
avm2.systemDomain.onMessage.register(function waitForFrame(e) {
if (e.data.type === 'frameConstructed') {
frameConstructed.resolve();
avm2.systemDomain.onMessage.unregister(waitForFrame);
}
});
Promise.when(frameConstructed, this._lastPromise).then(function () {
this.contentLoaderInfo._dispatchEvent(new flash.events.Event("complete"));
}.bind(this));
break;
case 'empty':
this._lastPromise = new Promise();
this._lastPromise.resolve(); |
<<<<<<<
this.dispatchEvent(new NetStatusEvent(NetStatusEvent.class.NET_STATUS,
false, false, { level : 'status', code : 'NetConnection.Connect.Success'}));
} else {
this.dispatchEvent(new NetStatusEvent(NetStatusEvent.class.NET_STATUS,
false, false, { level : 'status', code : 'NetConnection.Connect.Failed'}));
=======
var info = {
level : 'status',
code : 'NetConnection.Connect.Success'
};
this._dispatchEvent(new flash.events.NetStatusEvent('netStatus', false, false, info));
>>>>>>>
this._dispatchEvent(new NetStatusEvent(NetStatusEvent.class.NET_STATUS,
false, false, { level : 'status', code : 'NetConnection.Connect.Success'}));
} else {
this._dispatchEvent(new NetStatusEvent(NetStatusEvent.class.NET_STATUS,
false, false, { level : 'status', code : 'NetConnection.Connect.Failed'})); |
<<<<<<<
var GREEN = '\033[92m';
var RED = '\033[91m';
var ENDC = '\033[0m';
var PASS_PREFIX = GREEN + "PASS: " + ENDC;
var FAIL_PREFIX = RED + "FAIL: " + ENDC;
=======
var manifestFile = null;
>>>>>>>
var GREEN = '\033[92m';
var RED = '\033[91m';
var ENDC = '\033[0m';
var PASS_PREFIX = GREEN + "PASS: " + ENDC;
var FAIL_PREFIX = RED + "FAIL: " + ENDC;
var manifestFile = null;
<<<<<<<
console.log(FAIL_PREFIX + path + ', error: ' + err);
=======
console.log('FAIL: ' + id + ', error: ' + err);
>>>>>>>
console.log(FAIL_PREFIX + id + ', error: ' + err);
<<<<<<<
console.log(FAIL_PREFIX + path + ', expected output is not available: ' + err);
=======
console.log('FAIL: ' + id + ', expected output is not available: ' + err);
>>>>>>>
console.log(FAIL_PREFIX + id + ', expected output is not available: ' + err);
<<<<<<<
console.log(PASS_PREFIX + path);
=======
console.log('PASS: ' + id);
>>>>>>>
console.log(PASS_PREFIX + id);
<<<<<<<
console.log(FAIL_PREFIX + path + ', see trace.log');
saveDiff(path, expected, output, function () {
=======
console.log('FAIL: ' + id + ', see trace.log');
saveDiff(test.path, expected, output, function () {
>>>>>>>
console.log(FAIL_PREFIX + id + ', see trace.log');
saveDiff(test.path, expected, output, function () { |
<<<<<<<
=======
}
/**
* SwaggerHttp is a wrapper for executing requests
*/
var SwaggerHttp = function () { };
SwaggerHttp.prototype.execute = function (obj) {
if (obj && (typeof obj.useJQuery === 'boolean'))
this.useJQuery = obj.useJQuery;
else
this.useJQuery = this.isIE8();
if (this.useJQuery)
return new JQueryHttpClient().execute(obj);
else
return new ShredHttpClient().execute(obj);
}
SwaggerHttp.prototype.isIE8 = function () {
var detectedIE = false;
if (typeof navigator !== 'undefined' && navigator.userAgent) {
nav = navigator.userAgent.toLowerCase();
if (nav.indexOf('msie') !== -1) {
var version = parseInt(nav.split('msie')[1]);
if (version <= 8) {
detectedIE = true;
}
}
}
return detectedIE;
};
/*
* JQueryHttpClient lets a browser take advantage of JQuery's cross-browser magic.
* NOTE: when jQuery is available it will export both '$' and 'jQuery' to the global space.
* Since we are using closures here we need to alias it for internal use.
*/
var JQueryHttpClient = function (options) {
this.options = options || {};
if (!jQuery) {
var jQuery = window.jQuery;
}
}
JQueryHttpClient.prototype.execute = function (obj) {
var cb = obj.on;
var request = obj;
obj.type = obj.method;
obj.cache = false;
obj.beforeSend = function (xhr) {
var key, results;
if (obj.headers) {
results = [];
var key;
for (key in obj.headers) {
if (key.toLowerCase() === 'content-type') {
results.push(obj.contentType = obj.headers[key]);
} else if (key.toLowerCase() === 'accept') {
results.push(obj.accepts = obj.headers[key]);
} else {
results.push(xhr.setRequestHeader(key, obj.headers[key]));
}
}
return results;
}
};
obj.data = obj.body;
obj.complete = function (response) {
var headers = {},
headerArray = response.getAllResponseHeaders().split('\n');
for (var i = 0; i < headerArray.length; i++) {
var toSplit = headerArray[i].trim();
if (toSplit.length === 0)
continue;
var separator = toSplit.indexOf(':');
if (separator === -1) {
// Name but no value in the header
headers[toSplit] = null;
continue;
}
var name = toSplit.substring(0, separator).trim(),
value = toSplit.substring(separator + 1).trim();
headers[name] = value;
}
var out = {
url: request.url,
method: request.method,
status: response.status,
data: response.responseText,
headers: headers
};
var contentType = (headers['content-type'] || headers['Content-Type'] || null)
if (contentType != null) {
if (contentType.indexOf('application/json') == 0 || contentType.indexOf('+json') > 0) {
if (response.responseText && response.responseText !== '')
out.obj = JSON.parse(response.responseText);
else
out.obj = {}
}
}
if (response.status >= 200 && response.status < 300)
cb.response(out);
else if (response.status === 0 || (response.status >= 400 && response.status < 599))
cb.error(out);
else
return cb.response(out);
};
jQuery.support.cors = true;
return jQuery.ajax(obj);
}
/*
* ShredHttpClient is a light-weight, node or browser HTTP client
*/
var ShredHttpClient = function (options) {
this.options = (options || {});
this.isInitialized = false;
if (typeof window !== 'undefined') {
this.Shred = require('./shred');
this.content = require('./shred/content');
}
else
this.Shred = require('shred');
this.shred = new this.Shred();
}
ShredHttpClient.prototype.initShred = function () {
this.isInitialized = true;
this.registerProcessors(this.shred);
}
ShredHttpClient.prototype.registerProcessors = function () {
var identity = function (x) {
return x;
};
var toString = function (x) {
return x.toString();
};
if (typeof window !== 'undefined') {
this.content.registerProcessor(['application/json; charset=utf-8', 'application/json', 'json'], {
parser: identity,
stringify: toString
});
} else {
this.Shred.registerProcessor(['application/json; charset=utf-8', 'application/json', 'json'], {
parser: identity,
stringify: toString
});
}
}
ShredHttpClient.prototype.execute = function (obj) {
if (!this.isInitialized)
this.initShred();
var cb = obj.on, res;
var transform = function (response) {
var out = {
headers: response._headers,
url: response.request.url,
method: response.request.method,
status: response.status,
data: response.content.data
};
var headers = response._headers.normalized || response._headers;
var contentType = (headers['content-type'] || headers['Content-Type'] || null)
if (contentType != null) {
if (contentType.indexOf('application/json') == 0 || contentType.indexOf('+json') > 0) {
if (response.content.data && response.content.data !== '')
try {
out.obj = JSON.parse(response.content.data);
}
catch (ex) {
// do not set out.obj
log('unable to parse JSON content');
}
else
out.obj = {}
}
}
return out;
};
// Transform an error into a usable response-like object
var transformError = function (error) {
var out = {
// Default to a status of 0 - The client will treat this as a generic permissions sort of error
status: 0,
data: error.message || error
};
if (error.code) {
out.obj = error;
if (error.code === 'ENOTFOUND' || error.code === 'ECONNREFUSED') {
// We can tell the client that this should be treated as a missing resource and not as a permissions thing
out.status = 404;
}
}
return out;
};
var res = {
error: function (response) {
if (obj)
return cb.error(transform(response));
},
// Catch the Shred error raised when the request errors as it is made (i.e. No Response is coming)
request_error: function (err) {
if (obj)
return cb.error(transformError(err));
},
response: function (response) {
if (obj)
return cb.response(transform(response));
}
};
if (obj) {
obj.on = res;
}
return this.shred.request(obj);
};
/**
* SwaggerAuthorizations applys the correct authorization to an operation being executed
*/
var SwaggerAuthorizations = function (name, auth) {
this.authz = {};
if(name && auth) {
this.authz[name] = auth;
}
};
SwaggerAuthorizations.prototype.add = function (name, auth) {
this.authz[name] = auth;
return auth;
};
SwaggerAuthorizations.prototype.remove = function (name) {
return delete this.authz[name];
};
SwaggerAuthorizations.prototype.apply = function (obj, authorizations) {
var status = null;
var key, value, result;
// if the "authorizations" key is undefined, or has an empty array, add all keys
if (typeof authorizations === 'undefined' || Object.keys(authorizations).length == 0) {
for (key in this.authz) {
value = this.authz[key];
result = value.apply(obj, authorizations);
if (result === true)
status = true;
}
}
else {
// 2.0 support
if (Array.isArray(authorizations)) {
for (var i = 0; i < authorizations.length; i++) {
var auth = authorizations[i];
for (name in auth) {
for (key in this.authz) {
if (key == name) {
value = this.authz[key];
result = value.apply(obj, authorizations);
if (result === true)
status = true;
}
}
}
}
}
else {
// 1.2 support
for (name in authorizations) {
for (key in this.authz) {
if (key == name) {
value = this.authz[key];
result = value.apply(obj, authorizations);
if (result === true)
status = true;
}
}
}
}
}
return status;
};
/**
* ApiKeyAuthorization allows a query param or header to be injected
*/
var ApiKeyAuthorization = function (name, value, type, delimiter) {
this.name = name;
this.value = value;
this.type = type;
this.delimiter = delimiter;
};
ApiKeyAuthorization.prototype.apply = function (obj) {
if (this.type === 'query') {
if (obj.url.indexOf('?') > 0)
obj.url = obj.url + '&' + this.name + '=' + this.value;
else
obj.url = obj.url + '?' + this.name + '=' + this.value;
return true;
} else if (this.type === 'header') {
if (typeof obj.headers[this.name] !== 'undefined') {
if (typeof this.delimiter !== 'undefined')
obj.headers[this.name] = obj.headers[this.name] + this.delimiter + this.value;
}
else
obj.headers[this.name] = this.value;
return true;
}
};
/**
* Password Authorization is a basic auth implementation
*/
var PasswordAuthorization = function (name, username, password) {
this.name = name;
this.username = username;
this.password = password;
this._btoa = null;
if (typeof window !== 'undefined')
this._btoa = btoa;
else
this._btoa = require('btoa');
};
PasswordAuthorization.prototype.apply = function (obj) {
var base64encoder = this._btoa;
obj.headers['Authorization'] = 'Basic ' + base64encoder(this.username + ':' + this.password);
return true;
>>>>>>> |
<<<<<<<
visit: function (obj) {
if (MovieClipClass.isInstanceOf(obj)) {
if (obj.isPlaying()) {
obj.nextFrame();
=======
visit: function (child, isContainer, interactiveParent) {
if (MovieClipClass.isInstanceOf(child)) {
if (child.isPlaying()) {
var currentFrame = child._currentFrame;
child.nextFrame();
if (child._currentFrame !== currentFrame)
child._scriptExecutionPending = true;
>>>>>>>
visit: function (child, isContainer, interactiveParent) {
if (MovieClipClass.isInstanceOf(child)) {
if (child.isPlaying()) {
child.nextFrame();
<<<<<<<
stage._callFrameRequested = false;
visitContainer(stage, new EnterFrameVisitor());
while (stage._callFrameRequested) {
stage._callFrameRequested = false;
visitContainer(stage, new ScriptExecutionVisitor());
}
=======
ctx.beginPath();
visitContainer(stage, new PreVisitor(ctx));
>>>>>>>
ctx.beginPath();
stage._callFrameRequested = false;
visitContainer(stage, new PreVisitor(ctx));
while (stage._callFrameRequested) {
stage._callFrameRequested = false;
visitContainer(stage, new ScriptExecutionVisitor());
} |
<<<<<<<
function resolveMultiname(obj, mn) {
assert(!Multiname.isQName(mn), mn, " already resolved");
=======
function resolveMultiname(obj, mn, traitsOnly) {
release || assert(!Multiname.isQName(mn), mn, " already resolved");
>>>>>>>
function resolveMultiname(obj, mn) {
release || assert(!Multiname.isQName(mn), mn, " already resolved"); |
<<<<<<<
initialize: function () {
this._alpha = 1;
this._animated = false;
this._cacheAsBitmap = false;
this._control = document.createElement('div');
this._bbox = null;
this._cxform = null;
this._graphics = null;
this._loaderInfo = null;
this._mouseX = 0;
this._mouseY = 0;
this._name = null;
this._opaqueBackground = null;
this._owned = false;
this._parent = null;
this._root = null;
this._rotation = 0;
this._scaleX = 1;
this._scaleY = 1;
this._stage = null;
this._transform = null;
this._visible = true;
this._x = 0;
this._y = 0;
},
=======
this._alpha = 1;
this._animated = false;
this._cacheAsBitmap = false;
this._control = document.createElement('div');
this._bbox = null;
this._cxform = null;
this._graphics = null;
this._loaderInfo = null;
this._mouseX = 0;
this._mouseY = 0;
this._name = null;
this._opaqueBackground = null;
this._owned = false;
this._parent = null;
this._root = null;
this._rotation = 0;
this._scaleX = 1;
this._scaleY = 1;
this._stage = null;
this._transform = null;
this._visible = true;
this._x = 0;
this._y = 0;
this._updateTransformMatrix();
}
>>>>>>>
initialize: function () {
this._alpha = 1;
this._animated = false;
this._cacheAsBitmap = false;
this._control = document.createElement('div');
this._bbox = null;
this._cxform = null;
this._graphics = null;
this._loaderInfo = null;
this._mouseX = 0;
this._mouseY = 0;
this._name = null;
this._opaqueBackground = null;
this._owned = false;
this._parent = null;
this._root = null;
this._rotation = 0;
this._scaleX = 1;
this._scaleY = 1;
this._stage = null;
this._transform = null;
this._visible = true;
this._x = 0;
this._y = 0;
this._updateTransformMatrix();
},
<<<<<<<
},
getBounds: function (targetCoordSpace) {
var bbox = this._bbox;
=======
}
),
_updateTransformMatrix: describeMethod(function () {
var rotation = this._rotation / 180 * Math.PI;
var scaleX = this._scaleX;
var scaleY = this._scaleY;
var u = Math.cos(rotation);
var v = Math.sin(rotation);
this._currentTransformMatrix = {
a: u * scaleX,
b: v * scaleX,
c: -v * scaleY,
d: u * scaleY,
tx: this._x,
ty: this._y
};
}),
_applyCurrentTransform: describeMethod(function (point) {
var m = this._currentTransformMatrix;
var x = point.x;
var y = point.y;
point.x = m.a * x + m.c * y + m.tx;
point.y = m.d * y + m.b * x + m.ty;
if (this._parent !== this._stage) {
this._parent._applyCurrentTransform(point);
}
}),
_applyCurrentInverseTransform: describeMethod(function (point) {
if (this._parent !== this._stage) {
this._parent._applyCurrentInverseTransform(point);
}
var m = this._currentTransformMatrix;
var x = point.x - m.tx;
var y = point.y - m.ty;
var d = 1 / (m.a * m.d - m.b * m.c);
point.x = (m.d * x - m.c * y) * d;
point.y = (m.a * y - m.b * x) * d;
}),
getBounds: describeMethod(function (targetCoordSpace) {
var bbox = this._bbox;
>>>>>>>
},
getBounds: function (targetCoordSpace) {
var bbox = this._bbox;
<<<<<<<
return new flash.geom.Rectangle(
xMin + tx,
yMin + ty,
(xMax - xMin),
(yMax - yMin)
);
},
getRect: function (targetCoordSpace) {
notImplemented();
},
globalToLocal: function (pt) {
notImplemented();
},
get height() {
=======
return new Rectangle(
xMin + m.tx,
yMin + m.ty,
(xMax - xMin),
(yMax - yMin)
);
}),
getRect: describeMethod(function (targetCoordSpace) {
notImplemented();
}),
globalToLocal: describeMethod(function (pt) {
var result = new Point(pt.x, pt.y);
this._applyCurrentInverseTransform(result);
debugger;
return result;
}),
height: describeAccessor(
function () {
>>>>>>>
return new Rectangle(
xMin + m.tx,
yMin + m.ty,
(xMax - xMin),
(yMax - yMin)
);
},
_updateTransformMatrix: function () {
var rotation = this._rotation / 180 * Math.PI;
var scaleX = this._scaleX;
var scaleY = this._scaleY;
var u = Math.cos(rotation);
var v = Math.sin(rotation);
this._currentTransformMatrix = {
a: u * scaleX,
b: v * scaleX,
c: -v * scaleY,
d: u * scaleY,
tx: this._x,
ty: this._y
};
},
_applyCurrentTransform: function (point) {
var m = this._currentTransformMatrix;
var x = point.x;
var y = point.y;
point.x = m.a * x + m.c * y + m.tx;
point.y = m.d * y + m.b * x + m.ty;
if (this._parent !== this._stage) {
this._parent._applyCurrentTransform(point);
}
},
_applyCurrentInverseTransform: function (point) {
if (this._parent !== this._stage) {
this._parent._applyCurrentInverseTransform(point);
}
var m = this._currentTransformMatrix;
var x = point.x - m.tx;
var y = point.y - m.ty;
var d = 1 / (m.a * m.d - m.b * m.c);
point.x = (m.d * x - m.c * y) * d;
point.y = (m.a * y - m.b * x) * d;
},
getRect: function (targetCoordSpace) {
notImplemented();
},
globalToLocal: function (pt) {
var result = new flash.geom.Point(pt.x, pt.y);
this._applyCurrentInverseTransform(result);
debugger;
return result;
},
get height() {
<<<<<<<
set height(val) {
notImplemented();
},
hitTestObject: function (obj) {
notImplemented();
},
hitTestPoint: function (x, y, shapeFlag) {
notImplemented();
},
get loaderInfo() {
return this._loaderInfo || this._parent.loaderInfo;
},
localToGlobal: function (pt) {
notImplemented();
},
get mask() {
=======
function (val) {
//notImplemented();
}
),
hitTestObject: describeMethod(function (obj) {
notImplemented();
}),
hitTestPoint: describeMethod(function (x, y, shapeFlag) {
notImplemented();
}),
hitTest: describeMethod(function _hitTest(use_xy, x, y, useShape, hitTestObject) {
return false; //notImplemented();
}),
loaderInfo: describeAccessor(function () {
return this._loaderInfo || (this._parent ? this._parent.loaderInfo : null);
}),
localToGlobal: describeMethod(function (pt) {
var result = new Point(pt.x, pt.y);
this._applyCurrentTransform(result);
return result;
}),
mask: describeAccessor(
function () {
>>>>>>>
set height(val) {
notImplemented();
},
hitTestObject: function (obj) {
notImplemented();
},
hitTestPoint: function (x, y, shapeFlag) {
notImplemented();
},
hitTest: function _hitTest(use_xy, x, y, useShape, hitTestObject) {
return false; //notImplemented();
},
get loaderInfo() {
return this._loaderInfo || (this._parent ? this._parent.loaderInfo : null);
},
localToGlobal: function (pt) {
var result = new flash.geom.Point(pt.x, pt.y);
this._applyCurrentTransform(result);
return result;
},
get mask() { |
<<<<<<<
if (b && b.width && b.height) {
child._wireframeStrokeStyle = randomStyle();
=======
if (b && b.xMax - b.xMin > 0 && b.yMax - b.yMin > 0) {
child._wireframeStrokeStyle = '#'+('00000'+(Math.random()*(1<<24)|0).toString(16)).slice(-6);
>>>>>>>
if (b && b.xMax - b.xMin > 0 && b.yMax - b.yMin > 0) {
child._wireframeStrokeStyle = randomStyle();
<<<<<<<
nextRenderAt = frameTime + (1000 / stage._frameRate);
nextRenderAt = frameTime + (1000 / 120);
=======
maxDelay = 1000 / stage._frameRate;
while (nextRenderAt < now) {
nextRenderAt += maxDelay;
}
>>>>>>>
maxDelay = 1000 / stage._frameRate;
while (nextRenderAt < now) {
nextRenderAt += maxDelay;
} |
<<<<<<<
if (replace)
this._control.replaceChild(instance._control, current._control);
else
this._control.appendChild(instance._control);
=======
instance.dispatchEvent(new flash.events.Event("load"));
>>>>>>>
if (replace)
this._control.replaceChild(instance._control, current._control);
else
this._control.appendChild(instance._control);
instance.dispatchEvent(new flash.events.Event("load")); |
<<<<<<<
=======
getBounds: function (targetCoordSpace) {
var bbox = this._bbox;
if (!bbox)
return new flash.geom.Rectangle;
var p1 = {x: bbox.left, y: bbox.top};
this._applyCurrentTransform(p1, targetCoordSpace);
var p2 = {x: bbox.right, y: bbox.top};
this._applyCurrentTransform(p2, targetCoordSpace);
var p3 = {x: bbox.right, y: bbox.bottom};
this._applyCurrentTransform(p3, targetCoordSpace);
var p4 = {x: bbox.left, y: bbox.bottom};
this._applyCurrentTransform(p4, targetCoordSpace);
var xMin = Math.min(p1.x, p2.x, p3.x, p4.x);
var xMax = Math.max(p1.x, p2.x, p3.x, p4.x);
var yMin = Math.min(p1.y, p2.y, p3.y, p4.y);
var yMax = Math.max(p1.y, p2.y, p3.y, p4.y);
return new flash.geom.Rectangle(
xMin,
yMin,
(xMax - xMin),
(yMax - yMin)
);
},
_updateTransformMatrix: function () {
var rotation = this._rotation / 180 * Math.PI;
var scaleX = this._scaleX;
var scaleY = this._scaleY;
var u = Math.cos(rotation);
var v = Math.sin(rotation);
this._currentTransformMatrix = {
a: u * scaleX,
b: v * scaleX,
c: -v * scaleY,
d: u * scaleY,
tx: this._x,
ty: this._y
};
},
_applyCurrentTransform: function (point, targetCoordSpace) {
var m = this._currentTransformMatrix;
var x = point.x;
var y = point.y;
point.x = m.a * x + m.c * y + m.tx;
point.y = m.d * y + m.b * x + m.ty;
if (this._parent !== this._stage && this._parent !== targetCoordSpace) {
this._parent._applyCurrentTransform(point, targetCoordSpace);
}
},
_applyCurrentInverseTransform: function (point, targetCoordSpace) {
if (this._parent !== this._stage && this._parent !== targetCoordSpace) {
this._parent._applyCurrentInverseTransform(point);
}
var m = this._currentTransformMatrix;
var x = point.x - m.tx;
var y = point.y - m.ty;
var d = 1 / (m.a * m.d - m.b * m.c);
point.x = (m.d * x - m.c * y) * d;
point.y = (m.a * y - m.b * x) * d;
},
getRect: function (targetCoordSpace) {
notImplemented();
},
globalToLocal: function (pt) {
var result = new flash.geom.Point(pt.x, pt.y);
this._applyCurrentInverseTransform(result);
return result;
},
>>>>>>>
<<<<<<<
=======
hitTestObject: function (obj) {
return this._hitTest(false, 0, 0, false, obj);
},
hitTestPoint: function (x, y, shapeFlag) {
return this._hitTest(true, x, y, shapeFlag, null);
},
_hitTest: function _hitTest(use_xy, x, y, useShape, hitTestObject) {
if (use_xy) {
debugger;
return false; //notImplemented();
} else {
var box1 = this.getBounds();
var box2 = hitTestObject.getBounds();
return box1.intersects(box2);
}
},
>>>>>>> |
<<<<<<<
onRowClick: PropTypes.func,
=======
resizableColumns: PropTypes.bool,
>>>>>>>
onRowClick: PropTypes.func,
resizableColumns: PropTypes.bool, |
<<<<<<<
sortDirection: 'none',
sortFn: null,
=======
>>>>>>>
sortFn: null, |
<<<<<<<
<Paper
elevation={this.options.elevation}
ref={this.tableContent}
className={classnames(classes.paper, className)}>
{selectedRows.data.length > 0 && this.options.selectToolbarPlacement !== SELECT_TOOLBAR_PLACEMENT_OPTIONS.NONE && (
=======
<Paper elevation={this.options.elevation} ref={this.tableContent} className={paperClasses}>
{selectedRows.data.length && this.options.disableToolbarSelect !== true ? (
>>>>>>>
<Paper elevation={this.options.elevation} ref={this.tableContent} className={paperClasses}>
{selectedRows.data.length > 0 && this.options.selectToolbarPlacement !== SELECT_TOOLBAR_PLACEMENT_OPTIONS.NONE && ( |
<<<<<<<
searchText: null,
isPrinting: false,
=======
sortOrder: {},
>>>>>>>
searchText: null,
sortOrder: {},
<<<<<<<
<Paper elevation={this.options.elevation} className={paperClasses} ref={this.tableContent}>
{selectedRows.data.length && this.options.disableToolbarSelect !== true ? (
<TableToolbarSelect
options={this.options}
selectedRows={selectedRows}
onRowsDelete={this.selectRowDelete}
displayData={displayData}
selectRowUpdate={this.selectRowUpdate}
/>
) : (
=======
<Paper elevation={this.options.elevation} ref={this.tableContent} className={paperClasses}>
{selectedRows.data.length > 0 &&
this.options.selectToolbarPlacement !== STP.NONE && (
<TableToolbarSelectComponent
options={this.options}
selectedRows={selectedRows}
onRowsDelete={this.selectRowDelete}
displayData={displayData}
selectRowUpdate={this.selectRowUpdate}
components={this.props.components}
/>
)}
{(selectedRows.data.length === 0 ||
[STP.ABOVE, STP.NONE].includes(
this.options.selectToolbarPlacement,
)) &&
>>>>>>>
<Paper elevation={this.options.elevation} ref={this.tableContent} className={paperClasses}>
{selectedRows.data.length > 0 &&
this.options.selectToolbarPlacement !== STP.NONE && (
<TableToolbarSelectComponent
options={this.options}
selectedRows={selectedRows}
onRowsDelete={this.selectRowDelete}
displayData={displayData}
selectRowUpdate={this.selectRowUpdate}
components={this.props.components}
/>
)}
{(selectedRows.data.length === 0 ||
[STP.ABOVE, STP.NONE].includes(
this.options.selectToolbarPlacement,
)) &&
<<<<<<<
hasPrintted={this.hasPrintted}
isGoingToPrint={this.isGoingToPrint}
=======
components={this.props.components}
>>>>>>>
hasPrintted={this.hasPrintted}
isGoingToPrint={this.isGoingToPrint}
components={this.props.components}
<<<<<<<
isPrinting={this.state.isPrinting}
=======
sortOrder={sortOrder}
components={this.props.components}
>>>>>>>
isPrinting={this.state.isPrinting}
sortOrder={sortOrder}
components={this.props.components} |
<<<<<<<
customFilterListRender: renderCustomFilterList,
sortFn: null,
=======
customFilterListOptions: { render: renderCustomFilterList },
>>>>>>>
sortFn: null,
customFilterListOptions: { render: renderCustomFilterList },
<<<<<<<
sortDirection: 'none',
sortFn: null,
=======
>>>>>>>
sortFn: null,
<<<<<<<
sortDirection: 'none',
sortFn: null,
=======
>>>>>>>
sortFn: null, |
<<<<<<<
alwaysRenderToolbar: false,
=======
setTableProps: () => ({}),
>>>>>>>
setTableProps: () => ({}),
alwaysRenderToolbar: false,
<<<<<<<
{selectedRows.data.length > 0 && (
=======
{selectedRows.data.length && this.options.disableToolbarSelect !== true ? (
>>>>>>>
{selectedRows.data.length > 0 && this.options.disableToolbarSelect !== true && ( |
<<<<<<<
tableBodyHeight: 'auto',
tableBodyMaxHeight: null, // if set, it will override tableBodyHeight
=======
sortOrder: {},
>>>>>>>
tableBodyHeight: 'auto',
tableBodyMaxHeight: null, // if set, it will override tableBodyHeight
sortOrder: {},
<<<<<<<
if (!['standard', 'vertical', 'simple'].includes(this.options.responsive)) {
if (
[
'scrollMaxHeight',
'scrollFullHeight',
'stacked',
'stackedFullWidth',
'scrollFullHeightFullWidth',
'scroll',
].includes(this.options.responsive)
) {
warnDeprecated(
this.options.responsive + ' has been deprecated. Please use string option: standard | vertical | simple',
);
} else {
warnInfo(
this.options.responsive +
' is not recognized as a valid input for responsive option. Please use string option: standard | vertical | simple',
);
}
=======
if (this.options.onRowsSelect) {
warnDeprecated('onRowsSelect has been renamed onRowSelectionChange.');
}
if (this.options.onRowsExpand) {
warnDeprecated('onRowsSelect has been renamed onRowExpansionChange.');
}
if (
['scrollMaxHeight', 'scrollFullHeight', 'stacked', 'stackedFullWidth', 'scrollFullHeightFullWidth'].indexOf(
this.options.responsive,
) === -1
) {
warnDeprecated(
'Invalid option value for responsive. Please use string option: scrollMaxHeight | scrollFullHeight | stacked | stackedFullWidth | scrollFullHeightFullWidth',
);
}
if (this.options.responsive === 'scroll') {
warnDeprecated('This option has been replaced by scrollMaxHeight');
>>>>>>>
if (!['standard', 'vertical', 'simple'].includes(this.options.responsive)) {
if (
[
'scrollMaxHeight',
'scrollFullHeight',
'stacked',
'stackedFullWidth',
'scrollFullHeightFullWidth',
'scroll',
].includes(this.options.responsive)
) {
warnDeprecated(
this.options.responsive + ' has been deprecated. Please use string option: standard | vertical | simple',
);
} else {
warnInfo(
this.options.responsive +
' is not recognized as a valid input for responsive option. Please use string option: standard | vertical | simple',
);
}
}
if (this.options.onRowsSelect) {
warnDeprecated('onRowsSelect has been renamed onRowSelectionChange.');
}
if (this.options.onRowsExpand) {
warnDeprecated('onRowsSelect has been renamed onRowExpansionChange.');
}
if (
['scrollMaxHeight', 'scrollFullHeight', 'stacked', 'stackedFullWidth', 'scrollFullHeightFullWidth'].indexOf(
this.options.responsive,
) === -1
) {
warnDeprecated(
'Invalid option value for responsive. Please use string option: scrollMaxHeight | scrollFullHeight | stacked | stackedFullWidth | scrollFullHeightFullWidth',
);
}
if (this.options.responsive === 'scroll') {
warnDeprecated('This option has been replaced by scrollMaxHeight'); |
<<<<<<<
import ArrayValueColumns from "./array-value-columns";
import ColumnFilters from "./column-filters";
import ColumnOptionsUpdate from "./column-options-update";
import Component from "./component";
import CSVExport from "./csv-export";
import CustomActionColumns from "./custom-action-columns";
import CustomizeColumns from "./customize-columns";
import CustomizeFilter from "./customize-filter";
import CustomizeFooter from "./customize-footer";
import CustomizeRows from "./customize-rows";
import CustomizeSearch from "./customize-search";
import CustomizeSearchRender from "./customize-search-render";
import CustomizeSorting from "./customize-sorting";
import CustomizeStyling from "./customize-styling";
import CustomizeToolbar from "./customize-toolbar";
import CustomizeToolbarSelect from "./customize-toolbarselect";
import DataAsObjects from "./data-as-objects";
import ExpandableRows from "./expandable-rows";
import FixedHeader from "./fixed-header";
import HideColumnsPrint from "./hide-columns-print";
import OnDownload from "./on-download";
import OnTableInit from "./on-table-init";
import ResizableColumns from "./resizable-columns";
import SelectableRows from "./selectable-rows";
import ServerSideOptions from "./serverside-options";
import ServerSidePagination from "./serverside-pagination";
import Simple from "./simple";
import SimpleNoToolbar from "./simple-no-toolbar";
import TextLocalization from "./text-localization";
import ColumnSort from "./column-sort";
import Themes from "./themes";
=======
import ArrayValueColumns from './array-value-columns';
import ColumnFilters from './column-filters';
import ColumnOptionsUpdate from './column-options-update';
import Component from './component';
import CSVExport from './csv-export';
import CustomActionColumns from './custom-action-columns';
import CustomizeColumns from './customize-columns';
import CustomizeFilter from './customize-filter';
import CustomizeFooter from './customize-footer';
import CustomizeRows from './customize-rows';
import CustomizeSearch from './customize-search';
import CustomizeSearchRender from './customize-search-render';
import CustomizeSorting from './customize-sorting';
import CustomizeStyling from './customize-styling';
import CustomizeToolbar from './customize-toolbar';
import CustomizeToolbarSelect from './customize-toolbarselect';
import DataAsObjects from './data-as-objects';
import DraggableColumns from './draggable-columns';
import ExpandableRows from './expandable-rows';
import FixedHeader from './fixed-header';
import HideColumnsPrint from './hide-columns-print';
import OnDownload from './on-download';
import OnTableInit from './on-table-init';
import ResizableColumns from './resizable-columns';
import SelectableRows from './selectable-rows';
import ServerSideFilters from './serverside-filters';
import ServerSidePagination from './serverside-pagination';
import ServerSideSorting from './serverside-sorting';
import Simple from './simple';
import SimpleNoToolbar from './simple-no-toolbar';
import TextLocalization from './text-localization';
import CustomComponents from './custom-components';
import InfiniteScrolling from './infinite-scrolling';
import Themes from './themes';
import LargeDataSet from './large-data-set';
>>>>>>>
import ArrayValueColumns from './array-value-columns';
import ColumnFilters from './column-filters';
import ColumnOptionsUpdate from './column-options-update';
import ColumnSort from "./column-sort";
import Component from './component';
import CSVExport from './csv-export';
import CustomActionColumns from './custom-action-columns';
import CustomizeColumns from './customize-columns';
import CustomizeFilter from './customize-filter';
import CustomizeFooter from './customize-footer';
import CustomizeRows from './customize-rows';
import CustomizeSearch from './customize-search';
import CustomizeSearchRender from './customize-search-render';
import CustomizeSorting from './customize-sorting';
import CustomizeStyling from './customize-styling';
import CustomizeToolbar from './customize-toolbar';
import CustomizeToolbarSelect from './customize-toolbarselect';
import DataAsObjects from './data-as-objects';
import DraggableColumns from './draggable-columns';
import ExpandableRows from './expandable-rows';
import FixedHeader from './fixed-header';
import HideColumnsPrint from './hide-columns-print';
import OnDownload from './on-download';
import OnTableInit from './on-table-init';
import ResizableColumns from './resizable-columns';
import SelectableRows from './selectable-rows';
import ServerSideFilters from './serverside-filters';
import ServerSidePagination from './serverside-pagination';
import ServerSideSorting from './serverside-sorting';
import Simple from './simple';
import SimpleNoToolbar from './simple-no-toolbar';
import TextLocalization from './text-localization';
import CustomComponents from './custom-components';
import InfiniteScrolling from './infinite-scrolling';
import Themes from './themes';
import LargeDataSet from './large-data-set';
<<<<<<<
'Array Value Columns': ArrayValueColumns,
'Column Filters': ColumnFilters,
'Column Sort': ColumnSort,
'Column Option Update': ColumnOptionsUpdate,
'Component': Component,
'CSV Export': CSVExport,
'Custom ActionColumns': CustomActionColumns,
'Customize columns': CustomizeColumns,
'Customize Filter': CustomizeFilter,
'Customize Footer': CustomizeFooter,
'Customize Rows': CustomizeRows,
'Customize Search': CustomizeSearch,
'Customize Search Render': CustomizeSearchRender,
'Customize Sorting': CustomizeSorting,
'Customize Styling': CustomizeStyling,
'Customize Toolbar': CustomizeToolbar,
'Customize Toolbar Select': CustomizeToolbarSelect,
'Data As Objects': DataAsObjects,
'expandableRows': ExpandableRows,
'fixedHeader': FixedHeader,
'Hide Columns Print': HideColumnsPrint,
'OnDownload': OnDownload,
'OnTableInit': OnTableInit,
'resizableColumns': ResizableColumns,
'selectableRows': SelectableRows,
'serverSide Options': ServerSideOptions,
'serverSide Pagination': ServerSidePagination,
'Simple': Simple,
'Simple No Toolbar': SimpleNoToolbar,
'Text Localization': TextLocalization,
'Themes': Themes,
=======
'Array Value Columns': ArrayValueColumns,
'Column Filters': ColumnFilters,
'Column Option Update': ColumnOptionsUpdate,
Component: Component,
'CSV Export': CSVExport,
'Custom Action Columns': CustomActionColumns,
'Customize Columns': CustomizeColumns,
'Customize Filter': CustomizeFilter,
'Customize Footer': CustomizeFooter,
'Customize Rows': CustomizeRows,
'Customize Search': CustomizeSearch,
'Customize Search Render': CustomizeSearchRender,
'Customize Sorting': CustomizeSorting,
'Customize Styling': CustomizeStyling,
'Customize Toolbar': CustomizeToolbar,
'Customize Toolbar Select': CustomizeToolbarSelect,
'Data As Objects': DataAsObjects,
'Draggable Columns': DraggableColumns,
'Expandable Rows': ExpandableRows,
'Fixed Header': FixedHeader,
'Hide Columns Print': HideColumnsPrint,
'Infinite Scrolling': InfiniteScrolling,
'Large Data Set': LargeDataSet,
'OnDownload': OnDownload,
'OnTableInit': OnTableInit,
'Resizable Columns': ResizableColumns,
'Selectable Rows': SelectableRows,
'ServerSide Filters': ServerSideFilters,
'ServerSide Pagination': ServerSidePagination,
'ServerSide Sorting': ServerSideSorting,
'Simple': Simple,
'Simple No Toolbar': SimpleNoToolbar,
'Text Localization': TextLocalization,
'Custom Components': CustomComponents,
Themes: Themes,
>>>>>>>
'Array Value Columns': ArrayValueColumns,
'Column Filters': ColumnFilters,
'Column Option Update': ColumnOptionsUpdate,
'Column Sort': ColumnSort,
Component: Component,
'CSV Export': CSVExport,
'Custom Action Columns': CustomActionColumns,
'Customize Columns': CustomizeColumns,
'Customize Filter': CustomizeFilter,
'Customize Footer': CustomizeFooter,
'Customize Rows': CustomizeRows,
'Customize Search': CustomizeSearch,
'Customize Search Render': CustomizeSearchRender,
'Customize Sorting': CustomizeSorting,
'Customize Styling': CustomizeStyling,
'Customize Toolbar': CustomizeToolbar,
'Customize Toolbar Select': CustomizeToolbarSelect,
'Data As Objects': DataAsObjects,
'Draggable Columns': DraggableColumns,
'Expandable Rows': ExpandableRows,
'Fixed Header': FixedHeader,
'Hide Columns Print': HideColumnsPrint,
'Infinite Scrolling': InfiniteScrolling,
'Large Data Set': LargeDataSet,
'OnDownload': OnDownload,
'OnTableInit': OnTableInit,
'Resizable Columns': ResizableColumns,
'Selectable Rows': SelectableRows,
'ServerSide Filters': ServerSideFilters,
'ServerSide Pagination': ServerSidePagination,
'ServerSide Sorting': ServerSideSorting,
'Simple': Simple,
'Simple No Toolbar': SimpleNoToolbar,
'Text Localization': TextLocalization,
'Custom Components': CustomComponents,
Themes: Themes, |
<<<<<<<
restrictions: {},
=======
tabindex: -1,
>>>>>>>
restrictions: {},
tabindex: -1,
<<<<<<<
this.get('autocomplete').addListener('place_changed', () => { this.placeChanged(); });
}),
getAutocomplete: function(){
if( Ember.isEmpty(this.get('autocomplete')) ){
let inputElement = document.getElementById(this.elementId).getElementsByTagName('input')[0],
google = this.get('google') || window.google; //TODO: check how to use the inyected google object
this.set('autocomplete', new google.maps.places.Autocomplete(inputElement,
{ types: this._typesToArray(), componentRestrictions: this.get('restrictions') }));
=======
this.get('autocomplete').addListener('place_changed', this.placeChanged.bind(this));
},
willDestroy() {
if (isPresent(this.get('autocomplete'))) {
let google = this.get('google') || window.google;
google.maps.event.clearInstanceListeners(this.get('autocomplete'));
}
},
getAutocomplete() {
if (isEmpty(this.get('autocomplete'))) {
let inputElement = this.$('input')[0],
google = this.get('google') || window.google; //TODO: check how to use the injected google object
this.set('autocomplete', new google.maps.places.Autocomplete(inputElement, { types: this._typesToArray() }));
>>>>>>>
this.get('autocomplete').addListener('place_changed', this.placeChanged.bind(this));
},
willDestroy() {
if (isPresent(this.get('autocomplete'))) {
let google = this.get('google') || window.google;
google.maps.event.clearInstanceListeners(this.get('autocomplete'));
}
},
getAutocomplete(){
if( Ember.isEmpty(this.get('autocomplete')) ){
let inputElement = document.getElementById(this.elementId).getElementsByTagName('input')[0],
google = this.get('google') || window.google; //TODO: check how to use the inyected google object
this.set('autocomplete', new google.maps.places.Autocomplete(inputElement,
{ types: this._typesToArray(), componentRestrictions: this.get('restrictions') })); |
<<<<<<<
return socket && (
(socket.socket && socket.socket.connected) || socket.connected
);
=======
return (socket &&
( ( socket.socket && socket.socket.connected)
|| socket.connected ));
>>>>>>>
return socket && (
(socket.socket && socket.socket.connected) || socket.connected
);
<<<<<<<
=======
}
//
// a stream from chrome to firefox will be missing it's id/label.
// there is no correct solution.
//
if( isFirefox ) {
// if there is a stream called default, return it in preference
if( mediaIds["default"] ) {
return "default";
}
//
// otherwise return the first name we find. If there is more than
// one, complain to Mozilla.
//
for( var anyName in mediaIds ) {
return anyName;
}
>>>>>>>
<<<<<<<
self.showError(self.errCodes.DEVELOPER_ERR,
=======
easyrtc.showError(this.errCodes.DEVELOPER_ERR,
>>>>>>>
self.showError(self.errCodes.DEVELOPER_ERR,
<<<<<<<
* "url": "stun:stun.sipgate.net"
* },
=======
* "url": "stun:stun.sipgate.net"
* },
>>>>>>>
* "url": "stun:stun.sipgate.net"
* },
<<<<<<<
self.showError(self.errCodes.DEVELOPER_ERR,
=======
easyrtc.showError(self.errCodes.DEVELOPER_ERR,
>>>>>>>
self.showError(self.errCodes.DEVELOPER_ERR,
<<<<<<<
self.showError(self.errCodes.ICECANDIDATE_ERR, "bad ice candidate (" + domError.name + "): " +
=======
easyrtc.showError(self.errCodes.ICECANDIDATE_ERR, "bad ice candidate (" + domError.name + "): " +
>>>>>>>
self.showError(self.errCodes.ICECANDIDATE_ERR, "bad ice candidate (" + domError.name + "): " +
<<<<<<<
errorCallback( self.errCodes.SYSTEM_ERROR,
socketErr.toString());
=======
errorCallback( self.errCodes.SYSTEM_ERROR,
socketError.toString());
>>>>>>>
errorCallback( self.errCodes.SYSTEM_ERROR,
socketErr.toString());
<<<<<<<
this.initManaged = this.easyApp;
var preallocatedSocketIo = null;
/**
* Supply a socket.io connection that will be used instead of allocating a new socket.
* The expected usage is that you allocate a websocket, assign options to it, call
* easyrtc.useThisSocketConnection, followed by easyrtc.connect or easyrtc.easyApp. Easyrtc will not attempt to
* close sockets that were supplied with easyrtc.useThisSocketConnection.
* @param {Object} alreadyAllocatedSocketIo A value allocated with the connect method of socket.io.
*/
this.useThisSocketConnection = function(alreadyAllocatedSocketIo) {
preallocatedSocketIo = alreadyAllocatedSocketIo;
};
/**
* Connect to the easyrtc signaling server.
* @param applicationName
* @param successCallback
* @param errorCallback
*/
this.connect = function(applicationName, successCallback, errorCallback) {
if (!window.io) {
self.showError(self.errCodes.DEVELOPER_ERR, "Your HTML has not included the socket.io.js library");
}
if (!preallocatedSocketIo && self.webSocket) {
console.error("Developer error: attempt to connect when already connected to socket server");
return;
}
pc_config = {};
closedChannel = null;
oldConfig = {}; // used internally by updateConfiguration
queuedMessages = {};
self.applicationName = applicationName;
fields = {
rooms: {},
application: {},
connection: {}
};
if (self.debugPrinter) {
self.debugPrinter("attempt to connect to WebRTC signalling server with application name=" + applicationName);
}
if (errorCallback === null) {
errorCallback = function(errorCode, errorText) {
console.error("easyrtc.connect: " + errorText);
};
}
connectToWSServer(successCallback, errorCallback);
};
};
window.easyrtc = new Easyrtc();
var easyrtc_constantStrings = {
"unableToEnterRoom":"Unable to enter room {0} because {1}" ,
"resolutionWarning": "Requested video size of {0}x{1} but got size of {2}x{3}",
"badUserName": "Illegal username {0}",
"localMediaError": "Error getting local media stream: {0}",
"miscSignalError": "Miscellaneous error from signalling server. It may be ignorable.",
"noServer": "Unable to reach the EasyRTC signalling server.",
"badsocket": "Socket.io connect event fired with bad websocket.",
"icf": "Internal communications failure",
"statsNotSupported":"call statistics not supported by this browser, try Chrome.",
"noWebrtcSupport":"Your browser doesn't appear to support WebRTC.",
"gumFailed":"Failed to get access to local media. Error code was {0}.",
"requireAudioOrVideo":"At least one of audio and video must be provided"
=======
easyrtc.initManaged = easyrtc.easyApp;
})();
var easyrtc_constantStrings = {
"unableToEnterRoom":"Unable to enter room {0} because {1}" ,
"resolutionWarning": "Requested video size of {0}x{1} but got size of {2}x{3}",
"badUserName": "Illegal username {0}",
"localMediaError": "Error getting local media stream: {0}",
"miscSignalError": "Miscellaneous error from signalling server. It may be ignorable.",
"noServer": "Unable to reach the EasyRTC signalling server.",
"badsocket": "Socket.io connect event fired with bad websocket.",
"icf": "Internal communications failure",
"statsNotSupported":"call statistics not supported by this browser, try Chrome.",
"noWebrtcSupport":"Your browser doesn't appear to support WebRTC.",
"gumFailed":"Failed to get access to local media. Error code was {0}.",
"requireAudioOrVideo":"At least one of audio and video must be provided"
>>>>>>>
easyrtc.initManaged = easyrtc.easyApp;
})();
var easyrtc_constantStrings = {
"unableToEnterRoom":"Unable to enter room {0} because {1}" ,
"resolutionWarning": "Requested video size of {0}x{1} but got size of {2}x{3}",
"badUserName": "Illegal username {0}",
"localMediaError": "Error getting local media stream: {0}",
"miscSignalError": "Miscellaneous error from signalling server. It may be ignorable.",
"noServer": "Unable to reach the EasyRTC signalling server.",
"badsocket": "Socket.io connect event fired with bad websocket.",
"icf": "Internal communications failure",
"statsNotSupported":"call statistics not supported by this browser, try Chrome.",
"noWebrtcSupport":"Your browser doesn't appear to support WebRTC.",
"gumFailed":"Failed to get access to local media. Error code was {0}.",
"requireAudioOrVideo":"At least one of audio and video must be provided" |
<<<<<<<
/**
=======
/**
>>>>>>>
/**
<<<<<<<
this.getSourceList = function(callback, kind) {
// "getSources" will be replaced with "getMediaDevices", check the for available method.
var getMediaDevices = MediaStreamTrack.getMediaDevices || MediaStreamTrack.getSources;
if(getMediaDevices) {
getMediaDevices(function(sources) {
=======
this.getVideoSourceList = function(callback) {
if (MediaStreamTrack.getSources) {
MediaStreamTrack.getSources(function(sources) {
>>>>>>>
this.getSourceList = function(callback, kind) {
// "getSources" will be replaced with "getMediaDevices", check the for available method.
var getMediaDevices = MediaStreamTrack.getMediaDevices || MediaStreamTrack.getSources;
if(getMediaDevices) {
getMediaDevices(function(sources) {
<<<<<<<
/**
* Gets a list of the available video sources (ie, cameras)
* @param {Function} callback receives list of {facing:String, label:String, id:String, kind:"video"}
* Note: the label string always seems to be the empty string if you aren't using https.
* Note: not supported by Firefox and will return empty array.
* @example easyrtc.getVideoSourceList( function(list) {
* var i;
* for( i = 0; i < list.length; i++ ) {
* console.log("label=" + list[i].label + ", id= " + list[i].id);
* }
* });
*/
this.getVideoSourceList = function(callback) {
this.getSourceList(callback, 'video');
};
/**
* Gets a list of the available audio sources (ie, cameras)
* @param {Function} callback receives list of {facing:String, label:String, id:String, kind:"video"}
* Note: the label string always seems to be the empty string if you aren't using https.
* Note: not supported by Firefox and will return empty array.
* @example easyrtc.getAudioSourceList( function(list) {
* var i;
* for( i = 0; i < list.length; i++ ) {
* console.log("label=" + list[i].label + ", id= " + list[i].id);
* }
* });
*/
this.getAudioSourceList = function(callback) {
this.getSourceList(callback, 'audio');
};
=======
>>>>>>>
/**
* Gets a list of the available video sources (ie, cameras)
* @param {Function} callback receives list of {facing:String, label:String, id:String, kind:"video"}
* Note: the label string always seems to be the empty string if you aren't using https.
* Note: not supported by Firefox and will return empty array.
* @example easyrtc.getVideoSourceList( function(list) {
* var i;
* for( i = 0; i < list.length; i++ ) {
* console.log("label=" + list[i].label + ", id= " + list[i].id);
* }
* });
*/
this.getVideoSourceList = function(callback) {
this.getSourceList(callback, 'video');
};
/**
* Gets a list of the available audio sources (ie, cameras)
* @param {Function} callback receives list of {facing:String, label:String, id:String, kind:"video"}
* Note: the label string always seems to be the empty string if you aren't using https.
* Note: not supported by Firefox and will return empty array.
* @example easyrtc.getAudioSourceList( function(list) {
* var i;
* for( i = 0; i < list.length; i++ ) {
* console.log("label=" + list[i].label + ", id= " + list[i].id);
* }
* });
*/
this.getAudioSourceList = function(callback) {
this.getSourceList(callback, 'audio');
}; |
<<<<<<<
this.route('modal');
=======
this.route('growable-with');
>>>>>>>
this.route('modal');
this.route('growable-with'); |
<<<<<<<
_transition() {
var versions = get(this, 'versions');
var transition;
var firstTime = this.firstTime;
=======
_transition: function() {
let versions = get(this, 'versions');
let transition;
let firstTime = this.firstTime;
>>>>>>>
_transition() {
let versions = get(this, 'versions');
let transition;
let firstTime = this.firstTime;
<<<<<<<
notifyContainer(method, versions) {
var target = get(this, 'notify');
if (target) {
=======
notifyContainer: function(method, versions) {
let target = get(this, 'notify');
if (target && !target.get('isDestroying')) {
>>>>>>>
notifyContainer(method, versions) {
let target = get(this, 'notify');
if (target && !target.get('isDestroying')) {
<<<<<<<
childDidRender(child) {
var version = get(child, 'version');
=======
childDidRender: function(child) {
let version = get(child, 'version');
>>>>>>>
childDidRender(child) {
let version = get(child, 'version'); |
<<<<<<<
const timeformatInput = $('#settings-timeformat-input')
=======
const batteryInput = $('#settings-battery-input')
>>>>>>>
const timeformatInput = $('#settings-timeformat-input')
const batteryInput = $('#settings-battery-input')
<<<<<<<
timeformat: localStorage.getItem('timeformat') || '12',
=======
battery: localStorage.getItem('battery') || 'show',
>>>>>>>
timeformat: localStorage.getItem('timeformat') || '12',
battery: localStorage.getItem('battery') || 'show',
<<<<<<<
$('#settings-timeformat-input option').removeAttribute('selected')
$(`#settings-timeformat-input option[value='${preset.timeformat}']`).setAttribute('selected', 'selected')
=======
$('#settings-battery-input').removeAttribute('checked')
if (preset.battery === 'show') {
$(`#settings-battery-input`).setAttribute('checked', 'checked')
}
>>>>>>>
$('#settings-timeformat-input option').removeAttribute('selected')
$(`#settings-timeformat-input option[value='${preset.timeformat}']`).setAttribute('selected', 'selected')
$('#settings-battery-input').removeAttribute('checked')
if (preset.battery === 'show') {
$(`#settings-battery-input`).setAttribute('checked', 'checked')
}
<<<<<<<
timeformatInput.addEventListener('change', (ev) => {
store.set({ timeformat: ev.target.value }, () => {
localStorage.setItem('timeformat', ev.target.value)
refreshDate()
})
})
=======
batteryInput.addEventListener('change', (ev) => {
store.set({ battery: ev.target.checked ? 'show' : 'hide' }, () => {
localStorage.setItem('battery', ev.target.checked ? 'show' : 'hide')
})
})
>>>>>>>
timeformatInput.addEventListener('change', (ev) => {
store.set({ timeformat: ev.target.value }, () => {
localStorage.setItem('timeformat', ev.target.value)
refreshDate()
})
})
batteryInput.addEventListener('change', (ev) => {
store.set({ battery: ev.target.checked ? 'show' : 'hide' }, () => {
localStorage.setItem('battery', ev.target.checked ? 'show' : 'hide')
})
}) |
<<<<<<<
workingFolder: outDir,
pluginsConfigurationDirectory: Platform.pluginsConfigurationDirectory,
=======
workingFolder: `${Platform.rootDirectory}/containergen`,
>>>>>>>
workingFolder: outDir,
<<<<<<<
workingFolder: outDir,
pluginsConfigurationDirectory: Platform.pluginsConfigurationDirectory,
=======
workingFolder: `${Platform.rootDirectory}/containergen`,
>>>>>>>
workingFolder: outDir, |
<<<<<<<
get text () {
return this.generateString('pg')
}
get sql () {
return this.generateString('mysql')
}
append (statement) {
=======
append (statement, options) {
if (!statement) {
return this
}
if (!(statement instanceof SqlStatement)) {
throw new Error('"append" accepts only template string prefixed with SQL (SQL`...`)')
}
if (options && options.unsafe === true) {
const text = statement.strings.reduce((acc, string, i) => {
acc = `${acc}${string}${statement.values[i] ? statement.values[i] : ''}`
return acc
}, '')
const strings = this.strings.slice(0)
strings[this.strings.length - 1] += text
this.strings = strings
return this
}
>>>>>>>
get text () {
return this.generateString('pg')
}
get sql () {
return this.generateString('mysql')
}
append (statement, options) {
if (!statement) {
return this
}
if (!(statement instanceof SqlStatement)) {
throw new Error('"append" accepts only template string prefixed with SQL (SQL`...`)')
}
if (options && options.unsafe === true) {
const text = statement.strings.reduce((acc, string, i) => {
acc = `${acc}${string}${statement.values[i] ? statement.values[i] : ''}`
return acc
}, '')
const strings = this.strings.slice(0)
strings[this.strings.length - 1] += text
this.strings = strings
return this
} |
<<<<<<<
import s3 from 's3-client'
=======
>>>>>>> |
<<<<<<<
url += '&scope=' + encodeURIComponent(scopes.join(' '));
=======
url += '&scope=' + encodeURIComponent(scopes);
url += '&state=' + encodeURIComponent(state);
>>>>>>>
url += '&scope=' + encodeURIComponent(scopes.join(' '));
url += '&state=' + encodeURIComponent(state); |
<<<<<<<
utils.toArray(els).forEach(function (el) {
if (pseudoElementType) {
var pseudoElPropName = "pseudo" + pseudoElementType;
var pseudoEl = el[pseudoElPropName];
if ( ! pseudoEl) {
pseudoEl = el[pseudoElPropName] = document.createElement("span");
pseudoEl.pseudoElementType = pseudoElementType;
pseudoEl.pseudoElementParent = el;
el["pseudo" + pseudoElementType] = pseudoEl;
editedElements.push(pseudoEl);
}
el = pseudoEl;
}
=======
els.each(function () {
var el = this;
>>>>>>>
els.each(function () {
var el = this;
if (pseudoElementType) {
var pseudoElPropName = "pseudo" + pseudoElementType;
var pseudoEl = el[pseudoElPropName];
if ( ! pseudoEl) {
pseudoEl = el[pseudoElPropName] = $("<span />");
pseudoEl.pseudoElementType = pseudoElementType;
pseudoEl.pseudoElementParent = el;
el["pseudo" + pseudoElementType] = pseudoEl;
editedElements.push(pseudoEl);
}
el = pseudoEl;
}
<<<<<<<
if (style.length > 0) {
el.setAttribute('style', style.join(' '));
}
if (el.pseudoElementType && el.styleProps.content) {
el.innerHTML = parseContent(el.styleProps.content.value);
var parent = el.pseudoElementParent;
if (el.pseudoElementType === "before") {
parent.insertBefore(el, parent.firstChild);
}
else {
parent.appendChild(el);
}
}
=======
$(el).attr('style', style.join(' '));
>>>>>>>
if (el.pseudoElementType && el.styleProps.content) {
el.html(parseContent(el.styleProps.content.value));
var parent = el.pseudoElementParent;
if (el.pseudoElementType === "before") {
$(parent).prepend(el);
}
else {
$(parent).append(el);
}
}
if (style.length > 0) {
$(el).attr('style', style.join(' '));
}
<<<<<<<
function parseContent(content) {
if (content === "none" || content === "normal") {
return "";
}
// Naive parsing, assume well-formed value
content = content.slice(1, content.length - 1);
// Naive unescape, assume no unicode char codes
content = content.replace(/\\/g, "");
return content;
}
// Return "before" or "after" if the given selector is a pseudo element (e.g.,
// a::after).
function getPseudoElementType(selector) {
if (selector.length === 0) {
return;
}
var pseudos = selector[selector.length - 1].pseudos;
if ( ! pseudos) {
return;
}
for (var i = 0; i < pseudos.length; i++) {
if (isPseudoElementName(pseudos[i])) {
return pseudos[i].name;
}
}
}
function isPseudoElementName(pseudo) {
return pseudo.name === "before" || pseudo.name === "after";
}
function filterElementPseudos(pseudos) {
return pseudos.filter(function(pseudo) {
return ! isPseudoElementName(pseudo);
});
}
function juiceDocument(document, options, callback) {
assert.ok(options.url, "options.url is required");
=======
function juiceDocument($, options) {
>>>>>>>
function parseContent(content) {
if (content === "none" || content === "normal") {
return "";
}
// Naive parsing, assume well-formed value
content = content.slice(1, content.length - 1);
// Naive unescape, assume no unicode char codes
content = content.replace(/\\/g, "");
return content;
}
// Return "before" or "after" if the given selector is a pseudo element (e.g.,
// a::after).
function getPseudoElementType(selector) {
if (selector.length === 0) {
return;
}
var pseudos = selector[selector.length - 1].pseudos;
if ( ! pseudos) {
return;
}
for (var i = 0; i < pseudos.length; i++) {
if (isPseudoElementName(pseudos[i])) {
return pseudos[i].name;
}
}
}
function isPseudoElementName(pseudo) {
return pseudo.name === "before" || pseudo.name === "after";
}
function filterElementPseudos(pseudos) {
return pseudos.filter(function(pseudo) {
return ! isPseudoElementName(pseudo);
});
}
function juiceDocument($, options) { |
<<<<<<<
=======
// TODO: Add any missing properties
this._copyProperties(report, this, ["name", "fontSize", "autoPrint", "paperSize", "paperOrientation"]);
if (report.formatterFunctions) {
this.setConfig('formatterFunctions', report.formatterFunctions);
}
>>>>>>>
// TODO: Add any missing properties
this._copyProperties(report, this, ["name", "fontSize", "autoPrint", "paperSize", "paperOrientation"]);
if (report.formatterFunctions) {
this.setConfig('formatterFunctions', report.formatterFunctions);
}
<<<<<<<
=======
// Copy any json based formatters over to the new report
if (this._reportData.formatterFunctions) {
results.formatterFunctions = this._reportData.formatterFunctions;
}
>>>>>>>
// Copy any json based formatters over to the new report
if (this._reportData.formatterFunctions) {
results.formatterFunctions = this._reportData.formatterFunctions;
}
<<<<<<<
{type: 'number', field: 'opacity', default: 1.0, translate: toOpacity},
{type: 'boolean', field: "fontBold", default: false},
{type: 'boolean', field: "fontItalic", default: false}
];
=======
{type: 'number', field: 'opacity', default: 1.0, translate: toOpacity}
]);
>>>>>>>
{type: 'number', field: 'opacity', default: 1.0, translate: toOpacity},
{type: 'boolean', field: "fontBold", default: false},
{type: 'boolean', field: "fontItalic", default: false}
]); |
<<<<<<<
this._deleteProperties(['top','left','width', 'height']);
=======
this._deleteProperties(['top', 'left', 'width', 'height']);
>>>>>>>
this._deleteProperties(['top', 'left', 'width', 'height']);
<<<<<<<
this._addProperties( {type: 'button', field: 'totals', title: 'Totals', click: this._setTotals.bind(this), destination: false}, false);
this._deleteProperties(['width', 'height']);
=======
this._addProperties({
type: 'button',
field: 'totals',
title: 'Totals',
click: this._setTotals.bind(this),
destination: false
}, false);
this._deleteProperties(['top', 'left', 'width', 'height']);
>>>>>>>
this._addProperties({
type: 'button',
field: 'totals',
title: 'Totals',
click: this._setTotals.bind(this),
destination: false
}, false);
this._deleteProperties(['width', 'height']);
<<<<<<<
if(data){
this._copyProperties(data, this, ["absoluteX", "absoluteY","top","left","x","y"]);
=======
if (data) {
>>>>>>>
if(data){
this._copyProperties(data, this, ["absoluteX", "absoluteY","top","left","x","y"]);
<<<<<<<
if (data) {
this._copyProperties(data, this, ["absoluteX", "absoluteY","top","left","x","y"]);
this.count = (typeof data.count === "number" && data.count > 0 && data.count) || 0;
}
=======
if (data.count > 0) {
this.count = data.count;
}
>>>>>>>
if (data) {
this._copyProperties(data, this, ["absoluteX", "absoluteY","top","left","x","y"]);
this.count = (typeof data.count === "number" && data.count > 0) || 0;
}
<<<<<<<
this._deleteProperties(["left", "width", "height"]);
this._addProperties([{type: 'number', field: "thickness", default: 0},{type: 'number', field: "gap", default: 0}]);
=======
this._deleteProperties(["top", "left", "width", "height"]);
this._addProperties([{type: 'number', field: "thickness", default: 0}, {
type: 'number',
field: "gap",
default: 0
}]);
>>>>>>>
this._deleteProperties(["left", "width", "height"]);
this._addProperties([{type: 'number', field: "thickness", default: 0}, {
type: 'number',
field: "gap",
default: 0
}]);
<<<<<<<
if (data) {
this._copyProperties(data, this, ["absoluteX", "absoluteY","top","left","x","y"]);
this.thickness = (typeof data.thickness === "number" && data.thickness > 0 && data.thickness) || 1;
}
=======
if (data.thickness > 0) {
this.thickness = data.thickness;
}
>>>>>>>
if (data) {
this._copyProperties(data, this, ["absoluteX", "absoluteY","top","left","x","y"]);
this.thickness = (typeof data.thickness === "number" && data.thickness > 0) || 1;
}
<<<<<<<
get underline() { return this._underline; }
set underline(val) { this._underline = this.getBooleanOrFunction(val); }
=======
get fontBold() {
return this._fontBold;
}
set fontBold(val) {
this._fontBold = this.getBooleanOrFunction(val);
}
get fontItalic() {
return this._fontItalic;
}
set fontItalic(val) {
this._fontItalic = this.getBooleanOrFunction(val);
}
get fill() {
return this._fill;
}
set fill(val) {
this._fill = val;
}
>>>>>>>
get underline() { return this._underline; }
set underline(val) { this._underline = this.getBooleanOrFunction(val); }
get fontBold() {
return this._fontBold;
}
set fontBold(val) {
this._fontBold = this.getBooleanOrFunction(val);
}
get fontItalic() {
return this._fontItalic;
}
set fontItalic(val) {
this._fontItalic = this.getBooleanOrFunction(val);
}
get fill() {
return this._fill;
}
set fill(val) {
this._fill = val;
}
<<<<<<<
this._deleteProperties(["top","left","label","text"]);
=======
this._deleteProperties(["label", "text"]);
>>>>>>>
this._deleteProperties(["label", "text"]); |
<<<<<<<
dependencies: ["converse-chatview", "converse-headlines-view", "converse-muc-views"],
=======
dependencies: ["converse-chatview", "converse-headline", "converse-muc-views", "converse-mouse-events"],
>>>>>>>
dependencies: ["converse-chatview", "converse-headlines-view", "converse-muc-views", "converse-mouse-events"], |
<<<<<<<
// Constants
var UNENCRYPTED = 0;
var UNVERIFIED= 1;
var VERIFIED= 2;
var FINISHED = 3;
var KEY = {
ENTER: 13
};
// Default values
this.allow_muc = true;
this.allow_otr = true;
=======
// Default values
this.allow_contact_requests = true;
this.allow_muc = true;
this.allow_otr = true;
>>>>>>>
// Constants
var UNENCRYPTED = 0;
var UNVERIFIED= 1;
var VERIFIED= 2;
var FINISHED = 3;
var KEY = {
ENTER: 13
};
// Default values
this.allow_contact_requests = true;
this.allow_muc = true;
this.allow_otr = true;
<<<<<<<
this.show_toolbar = true;
=======
>>>>>>>
this.show_toolbar = true;
<<<<<<<
'allow_muc',
'allow_otr',
=======
'allow_contact_requests',
'allow_muc',
>>>>>>>
'allow_contact_requests',
'allow_muc',
'allow_otr', |
<<<<<<<
tpl_status_message,
tpl_toolbar
=======
tpl_toolbar,
filetransfer
>>>>>>>
tpl_status_message,
tpl_toolbar,
filetransfer |
<<<<<<<
hideElement: function (el) {
el.classList.add('hidden');
},
toggleElement: function (el) {
if (_.includes(el.classList, 'hidden')) {
// XXX: use fadeIn?
el.classList.remove('hidden');
} else {
this.hideElement (el);
}
},
=======
slideDown: function (el, interval=0.6) {
return new Promise((resolve, reject) => {
if (_.isNil(el)) {
const err = "Undefined or null element passed into slideDown"
console.warn(err);
reject(new Error(err));
}
let intval = el.getAttribute('data-slider-intval');
if (intval) {
window.clearInterval(intval);
}
let h = 0;
const end_height = el.getAttribute('data-slider-height');
intval = window.setInterval(function () {
h++;
el.style.height = h + 'px';
if (h >= end_height) {
window.clearInterval(intval);
el.style.height = '';
el.style.overflow = '';
el.removeAttribute('data-slider-intval');
el.removeAttribute('data-slider-height');
resolve();
}
}, interval);
el.setAttribute('data-slider-intval', intval);
});
},
slideUp: function (el, interval=0.6) {
return new Promise((resolve, reject) => {
if (_.isNil(el)) {
const err = "Undefined or null element passed into slideUp";
console.warn(err);
reject(new Error(err));
}
let intval = el.getAttribute('data-slider-intval');
if (intval) {
window.clearInterval(intval);
}
let h = el.offsetHeight;
el.setAttribute('data-slider-height', h);
el.style.overflow = 'hidden';
intval = window.setInterval(function () {
el.style.height = h + 'px';
h--;
if (h < 0) {
window.clearInterval(intval);
el.removeAttribute('data-slider-intval');
resolve();
}
}, interval);
el.setAttribute('data-slider-intval', intval);
});
},
>>>>>>>
hideElement: function (el) {
el.classList.add('hidden');
},
toggleElement: function (el) {
if (_.includes(el.classList, 'hidden')) {
// XXX: use fadeIn?
el.classList.remove('hidden');
} else {
this.hideElement (el);
}
},
slideDown: function (el, interval=0.6) {
return new Promise((resolve, reject) => {
if (_.isNil(el)) {
const err = "Undefined or null element passed into slideDown"
console.warn(err);
reject(new Error(err));
}
let intval = el.getAttribute('data-slider-intval');
if (intval) {
window.clearInterval(intval);
}
let h = 0;
const end_height = el.getAttribute('data-slider-height');
intval = window.setInterval(function () {
h++;
el.style.height = h + 'px';
if (h >= end_height) {
window.clearInterval(intval);
el.style.height = '';
el.style.overflow = '';
el.removeAttribute('data-slider-intval');
el.removeAttribute('data-slider-height');
resolve();
}
}, interval);
el.setAttribute('data-slider-intval', intval);
});
},
slideUp: function (el, interval=0.6) {
return new Promise((resolve, reject) => {
if (_.isNil(el)) {
const err = "Undefined or null element passed into slideUp";
console.warn(err);
reject(new Error(err));
}
let intval = el.getAttribute('data-slider-intval');
if (intval) {
window.clearInterval(intval);
}
let h = el.offsetHeight;
el.setAttribute('data-slider-height', h);
el.style.overflow = 'hidden';
intval = window.setInterval(function () {
el.style.height = h + 'px';
h--;
if (h < 0) {
window.clearInterval(intval);
el.removeAttribute('data-slider-intval');
resolve();
}
}, interval);
el.setAttribute('data-slider-intval', intval);
});
}, |
<<<<<<<
=======
this["Handlebars"]["templates"]["param"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
var stack1, buffer = "";
stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isFile : depth0), {"name":"if","hash":{},"fn":this.program(2, data),"inverse":this.program(4, data),"data":data});
if (stack1 != null) { buffer += stack1; }
return buffer;
},"2":function(depth0,helpers,partials,data) {
var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
return " <input type=\"file\" name='"
+ escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+ "' id='"
+ escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
+ "'/>\n <div class=\"parameter-content-type\" />\n";
},"4":function(depth0,helpers,partials,data) {
var stack1, buffer = "";
stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0['default'] : depth0), {"name":"if","hash":{},"fn":this.program(5, data),"inverse":this.program(7, data),"data":data});
if (stack1 != null) { buffer += stack1; }
return buffer;
},"5":function(depth0,helpers,partials,data) {
var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
return " <div class=\"editor_holder\"></div>\n <textarea class='body-textarea' name='"
+ escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+ "' id='"
+ escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
+ "'>"
+ escapeExpression(((helper = (helper = helpers['default'] || (depth0 != null ? depth0['default'] : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"default","hash":{},"data":data}) : helper)))
+ "</textarea>\n <br />\n <div class=\"parameter-content-type\" />\n";
},"7":function(depth0,helpers,partials,data) {
var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
return " <textarea class='body-textarea' name='"
+ escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+ "' id='"
+ escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
+ "'></textarea>\n <div class=\"editor_holder\"></div>\n <br />\n <div class=\"parameter-content-type\" />\n";
},"9":function(depth0,helpers,partials,data) {
var stack1, buffer = "";
stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isFile : depth0), {"name":"if","hash":{},"fn":this.program(2, data),"inverse":this.program(10, data),"data":data});
if (stack1 != null) { buffer += stack1; }
return buffer;
},"10":function(depth0,helpers,partials,data) {
var stack1, helperMissing=helpers.helperMissing, buffer = "";
stack1 = ((helpers.renderTextParam || (depth0 && depth0.renderTextParam) || helperMissing).call(depth0, depth0, {"name":"renderTextParam","hash":{},"fn":this.program(11, data),"inverse":this.noop,"data":data}));
if (stack1 != null) { buffer += stack1; }
return buffer;
},"11":function(depth0,helpers,partials,data) {
return "";
},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<td class='code'><label for='"
+ escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
+ "'>"
+ escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+ "</label></td>\n<td>\n\n";
stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isBody : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(9, data),"data":data});
if (stack1 != null) { buffer += stack1; }
buffer += "\n</td>\n<td class=\"markdown\">";
stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"description","hash":{},"data":data}) : helper));
if (stack1 != null) { buffer += stack1; }
buffer += "</td>\n<td>";
stack1 = ((helper = (helper = helpers.paramType || (depth0 != null ? depth0.paramType : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"paramType","hash":{},"data":data}) : helper));
if (stack1 != null) { buffer += stack1; }
return buffer + "</td>\n<td>\n <span class=\"model-signature\"></span>\n</td>\n";
},"useData":true});
>>>>>>>
this["Handlebars"]["templates"]["param"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
var stack1, buffer = "";
stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isFile : depth0), {"name":"if","hash":{},"fn":this.program(2, data),"inverse":this.program(4, data),"data":data});
if (stack1 != null) { buffer += stack1; }
return buffer;
},"2":function(depth0,helpers,partials,data) {
var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
return " <input type=\"file\" name='"
+ escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+ "' id='"
+ escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
+ "'/>\n <div class=\"parameter-content-type\" />\n";
},"4":function(depth0,helpers,partials,data) {
var stack1, buffer = "";
stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0['default'] : depth0), {"name":"if","hash":{},"fn":this.program(5, data),"inverse":this.program(7, data),"data":data});
if (stack1 != null) { buffer += stack1; }
return buffer;
},"5":function(depth0,helpers,partials,data) {
var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
return " <div class=\"editor_holder\"></div>\n <textarea class='body-textarea' name='"
+ escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+ "' id='"
+ escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
+ "'>"
+ escapeExpression(((helper = (helper = helpers['default'] || (depth0 != null ? depth0['default'] : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"default","hash":{},"data":data}) : helper)))
+ "</textarea>\n <br />\n <div class=\"parameter-content-type\" />\n";
},"7":function(depth0,helpers,partials,data) {
var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
return " <textarea class='body-textarea' name='"
+ escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+ "' id='"
+ escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
+ "'></textarea>\n <div class=\"editor_holder\"></div>\n <br />\n <div class=\"parameter-content-type\" />\n";
},"9":function(depth0,helpers,partials,data) {
var stack1, buffer = "";
stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isFile : depth0), {"name":"if","hash":{},"fn":this.program(2, data),"inverse":this.program(10, data),"data":data});
if (stack1 != null) { buffer += stack1; }
return buffer;
},"10":function(depth0,helpers,partials,data) {
var stack1, helperMissing=helpers.helperMissing, buffer = "";
stack1 = ((helpers.renderTextParam || (depth0 && depth0.renderTextParam) || helperMissing).call(depth0, depth0, {"name":"renderTextParam","hash":{},"fn":this.program(11, data),"inverse":this.noop,"data":data}));
if (stack1 != null) { buffer += stack1; }
return buffer;
},"11":function(depth0,helpers,partials,data) {
return "";
},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<td class='code'><label for='"
+ escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
+ "'>"
+ escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+ "</label></td>\n<td>\n\n";
stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isBody : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(9, data),"data":data});
if (stack1 != null) { buffer += stack1; }
buffer += "\n</td>\n<td class=\"markdown\">";
stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"description","hash":{},"data":data}) : helper));
if (stack1 != null) { buffer += stack1; }
buffer += "</td>\n<td>";
stack1 = ((helper = (helper = helpers.paramType || (depth0 != null ? depth0.paramType : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"paramType","hash":{},"data":data}) : helper));
if (stack1 != null) { buffer += stack1; }
return buffer + "</td>\n<td>\n <span class=\"model-signature\"></span>\n</td>\n";
},"useData":true});
<<<<<<<
var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<div>\n<ul class=\"signature-nav\">\n <li><a class=\"description-link\" href=\"#\" data-sw-translate>Model</a></li>\n <li><a class=\"snippet-link\" href=\"#\" data-sw-translate>Model Schema</a></li>\n</ul>\n<div>\n\n<div class=\"signature-container\">\n <div class=\"description\">\n ";
=======
var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<div>\r\n<ul class=\"signature-nav\">\r\n <li><a class=\"description-link\" href=\"#\">Model</a></li>\r\n <li><a class=\"snippet-link\" href=\"#\">Model Schema</a></li>\r\n</ul>\r\n<div>\r\n\r\n<div class=\"signature-container\">\r\n <div class=\"description\">\r\n ";
>>>>>>>
var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<div>\n<ul class=\"signature-nav\">\n <li><a class=\"description-link\" href=\"#\" data-sw-translate>Model</a></li>\n <li><a class=\"snippet-link\" href=\"#\" data-sw-translate>Model Schema</a></li>\n</ul>\n<div>\n\n<div class=\"signature-container\">\n <div class=\"description\">\n "; |
<<<<<<<
_converse.core_plugins = ['converse-bookmarks', 'converse-caps', 'converse-chatboxes', 'converse-chatview', 'converse-controlbox', 'converse-core', 'converse-disco', 'converse-dragresize', 'converse-embedded', 'converse-fullscreen', 'converse-headline', 'converse-mam', 'converse-message-view', 'converse-minimize', 'converse-modal', 'converse-muc', 'converse-muc-views', 'converse-notification', 'converse-omemo', 'converse-oauth', 'converse-ping', 'converse-profile', 'converse-push', 'converse-register', 'converse-roomslist', 'converse-roster', 'converse-rosterview', 'converse-singleton', 'converse-spoilers', 'converse-vcard']; // Make converse pluggable
=======
_converse.core_plugins = ['converse-bookmarks', 'converse-caps', 'converse-chatboxes', 'converse-chatview', 'converse-controlbox', 'converse-core', 'converse-disco', 'converse-dragresize', 'converse-embedded', 'converse-fullscreen', 'converse-headline', 'converse-mam', 'converse-message-view', 'converse-minimize', 'converse-modal', 'converse-muc', 'converse-muc-views', 'converse-notification', 'converse-oauth', 'converse-ping', 'converse-profile', 'converse-push', 'converse-register', 'converse-roomslist', 'converse-roster', 'converse-rosterview', 'converse-singleton', 'converse-spoilers', 'converse-vcard']; // Setting wait to 59 instead of 60 to avoid timing conflicts with the
// webserver, which is often also set to 60 and might therefore sometimes
// return a 504 error page instead of passing through to the BOSH proxy.
const BOSH_WAIT = 59; // Make converse pluggable
>>>>>>>
_converse.core_plugins = ['converse-bookmarks', 'converse-caps', 'converse-chatboxes', 'converse-chatview', 'converse-controlbox', 'converse-core', 'converse-disco', 'converse-dragresize', 'converse-embedded', 'converse-fullscreen', 'converse-headline', 'converse-mam', 'converse-message-view', 'converse-minimize', 'converse-modal', 'converse-muc', 'converse-muc-views', 'converse-notification', 'converse-omemo', 'converse-oauth', 'converse-ping', 'converse-profile', 'converse-push', 'converse-register', 'converse-roomslist', 'converse-roster', 'converse-rosterview', 'converse-singleton', 'converse-spoilers', 'converse-vcard']; // Setting wait to 59 instead of 60 to avoid timing conflicts with the
// webserver, which is often also set to 60 and might therefore sometimes
// return a 504 error page instead of passing through to the BOSH proxy.
const BOSH_WAIT = 59; // Make converse pluggable |
<<<<<<<
'crypto.aes': {
exports: 'CryptoJS'
},
'tinysort': { deps: ['jquery'] },
=======
'jquery.tinysort': { deps: ['jquery'] },
>>>>>>>
'crypto.aes': {
exports: 'CryptoJS'
},
'jquery.tinysort': { deps: ['jquery'] }, |
<<<<<<<
if (_.includes(['mobile', 'fullscreen'], _converse.view_mode)) {
el.classList.add('fullscreen');
}
// Converse.js expects a <body> tag to be present.
document.querySelector('body').appendChild(el);
=======
const body = _converse.root.querySelector('body');
if (body) {
body.appendChild(el);
} else {
// Perhaps inside a web component?
_converse.root.appendChild(el);
}
>>>>>>>
const body = _converse.root.querySelector('body');
if (body) {
body.appendChild(el);
} else {
// Perhaps inside a web component?
_converse.root.appendChild(el);
}
}
if (_.includes(['mobile', 'fullscreen'], _converse.view_mode)) {
el.classList.add('fullscreen'); |
<<<<<<<
describe("The Controlbox Tabs", $.proxy(function () {
beforeEach($.proxy(function () {
// Close any remaining open chatboxes
var i, chatbox, num_chatboxes = this.chatboxes.models.length;
for (i=0; i<num_chatboxes; i++) {
chatbox = this.chatboxes.models[i];
if (chatbox.get('id') != 'controlbox') {
this.chatboxesview.views[chatbox.get('id')].closeChat();
}
}
}, converse));
it("contains two tabs, 'Contacts' and 'ChatRooms'", $.proxy(function () {
=======
describe("A Message Counter", $.proxy(function () {
it("is incremented when the message is received and the window is not focused", $.proxy(function () {
expect(this.msg_counter).toBe(0);
spyOn(converse, 'incrementMsgCounter').andCallThrough();
$(window).trigger('blur');
var message = 'This message will increment the message counter';
var sender_jid = cur_names[0].replace(' ','.').toLowerCase() + '@localhost';
msg = $msg({
from: sender_jid,
to: this.connection.jid,
type: 'chat',
id: (new Date()).getTime()
}).c('body').t(message).up()
.c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree();
this.chatboxes.messageReceived(msg);
expect(converse.incrementMsgCounter).toHaveBeenCalled();
expect(this.msg_counter).toBe(1);
}, converse));
it("is cleared when the window is focused", $.proxy(function () {
spyOn(converse, 'clearMsgCounter').andCallThrough();
$(window).trigger('focus');
expect(converse.clearMsgCounter).toHaveBeenCalled();
}, converse));
it("is not incremented when the message is received and the window is focused", $.proxy(function () {
expect(this.msg_counter).toBe(0);
spyOn(converse, 'incrementMsgCounter').andCallThrough();
$(window).trigger('focus');
var message = 'This message will not increment the message counter';
var sender_jid = cur_names[0].replace(' ','.').toLowerCase() + '@localhost';
msg = $msg({
from: sender_jid,
to: this.connection.jid,
type: 'chat',
id: (new Date()).getTime()
}).c('body').t(message).up()
.c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree();
this.chatboxes.messageReceived(msg);
expect(converse.incrementMsgCounter).not.toHaveBeenCalled();
expect(this.msg_counter).toBe(0);
}, converse));
}, converse));
xdescribe("The Controlbox Tabs", $.proxy(function () {
// XXX: Disabled for now, these tests don't pass due to service
// discovery changes.
it("consist of two tabs, 'Contacts' and 'ChatRooms', of which 'Contacts' is by default visible", $.proxy(function () {
>>>>>>>
describe("A Message Counter", $.proxy(function () {
it("is incremented when the message is received and the window is not focused", $.proxy(function () {
expect(this.msg_counter).toBe(0);
spyOn(converse, 'incrementMsgCounter').andCallThrough();
$(window).trigger('blur');
var message = 'This message will increment the message counter';
var sender_jid = cur_names[0].replace(' ','.').toLowerCase() + '@localhost';
msg = $msg({
from: sender_jid,
to: this.connection.jid,
type: 'chat',
id: (new Date()).getTime()
}).c('body').t(message).up()
.c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree();
this.chatboxes.messageReceived(msg);
expect(converse.incrementMsgCounter).toHaveBeenCalled();
expect(this.msg_counter).toBe(1);
}, converse));
it("is cleared when the window is focused", $.proxy(function () {
spyOn(converse, 'clearMsgCounter').andCallThrough();
$(window).trigger('focus');
expect(converse.clearMsgCounter).toHaveBeenCalled();
}, converse));
it("is not incremented when the message is received and the window is focused", $.proxy(function () {
expect(this.msg_counter).toBe(0);
spyOn(converse, 'incrementMsgCounter').andCallThrough();
$(window).trigger('focus');
var message = 'This message will not increment the message counter';
var sender_jid = cur_names[0].replace(' ','.').toLowerCase() + '@localhost';
msg = $msg({
from: sender_jid,
to: this.connection.jid,
type: 'chat',
id: (new Date()).getTime()
}).c('body').t(message).up()
.c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree();
this.chatboxes.messageReceived(msg);
expect(converse.incrementMsgCounter).not.toHaveBeenCalled();
expect(this.msg_counter).toBe(0);
}, converse));
}, converse));
describe("The Controlbox Tabs", $.proxy(function () {
beforeEach($.proxy(function () {
// Close any remaining open chatboxes
var i, chatbox, num_chatboxes = this.chatboxes.models.length;
for (i=0; i<num_chatboxes; i++) {
chatbox = this.chatboxes.models[i];
if (chatbox.get('id') != 'controlbox') {
this.chatboxesview.views[chatbox.get('id')].closeChat();
}
}
}, converse));
it("contains two tabs, 'Contacts' and 'ChatRooms'", $.proxy(function () { |
<<<<<<<
utils.addEmoticons = function (_converse, emojione, text) {
return emojione.shortnameToUnicode(text);
}
utils.marshallEmojis = function (emojione) {
/* Return a dict of emojis with the categories as keys and
* lists of emojis in that category as values.
*/
if (_.isUndefined(this.emojis_by_category)) {
var emojis = _.values(_.mapValues(emojione.emojioneList, function (value, key, o) {
value._shortname = key;
return value
}));
var tones = [':tone1:', ':tone2:', ':tone3:', ':tone4:', ':tone5:'];
var categories = _.uniq(_.map(emojis, _.partial(_.get, _, 'category')));
var emojis_by_category = {};
_.forEach(categories, function (cat) {
var list = _.sortBy(_.filter(emojis, ['category', cat]), ['uc_base']);
list = _.filter(list, function (item) {
return !_.includes(tones, item._shortname);
});
if (cat === 'people') {
var idx = _.findIndex(list, ['uc_base', '1f600']);
list = _.union(_.slice(list, idx), _.slice(list, 0, idx+1));
} else if (cat === 'activity') {
list = _.union(_.slice(list, 27-1), _.slice(list, 0, 27));
} else if (cat === 'objects') {
list = _.union(_.slice(list, 24-1), _.slice(list, 0, 24));
} else if (cat === 'travel') {
list = _.union(_.slice(list, 17-1), _.slice(list, 0, 17));
}
emojis_by_category[cat] = list;
});
this.emojis_by_category = emojis_by_category;
}
return this.emojis_by_category;
}
=======
utils.isPersistableModel = function (model) {
return model.collection && model.collection.browserStorage;
}
utils.safeSave = function (model, attributes) {
if (utils.isPersistableModel(model)) {
model.save(attributes);
} else {
model.set(attributes);
}
}
>>>>>>>
utils.addEmoticons = function (_converse, emojione, text) {
return emojione.shortnameToUnicode(text);
}
utils.marshallEmojis = function (emojione) {
/* Return a dict of emojis with the categories as keys and
* lists of emojis in that category as values.
*/
if (_.isUndefined(this.emojis_by_category)) {
var emojis = _.values(_.mapValues(emojione.emojioneList, function (value, key, o) {
value._shortname = key;
return value
}));
var tones = [':tone1:', ':tone2:', ':tone3:', ':tone4:', ':tone5:'];
var categories = _.uniq(_.map(emojis, _.partial(_.get, _, 'category')));
var emojis_by_category = {};
_.forEach(categories, function (cat) {
var list = _.sortBy(_.filter(emojis, ['category', cat]), ['uc_base']);
list = _.filter(list, function (item) {
return !_.includes(tones, item._shortname);
});
if (cat === 'people') {
var idx = _.findIndex(list, ['uc_base', '1f600']);
list = _.union(_.slice(list, idx), _.slice(list, 0, idx+1));
} else if (cat === 'activity') {
list = _.union(_.slice(list, 27-1), _.slice(list, 0, 27));
} else if (cat === 'objects') {
list = _.union(_.slice(list, 24-1), _.slice(list, 0, 24));
} else if (cat === 'travel') {
list = _.union(_.slice(list, 17-1), _.slice(list, 0, 17));
}
emojis_by_category[cat] = list;
});
this.emojis_by_category = emojis_by_category;
}
return this.emojis_by_category;
}
utils.isPersistableModel = function (model) {
return model.collection && model.collection.browserStorage;
}
utils.safeSave = function (model, attributes) {
if (utils.isPersistableModel(model)) {
model.save(attributes);
} else {
model.set(attributes);
}
} |
<<<<<<<
vibrate: function(param) {
/* Aligning with w3c spec */
//vibrate
if ((typeof param == 'number') && param != 0)
exec(null, null, "Vibration", "vibrate", [param]);
//vibrate with array ( i.e. vibrate([3000]) )
else if ((typeof param == 'object') && param.length == 1)
{
//cancel if vibrate([0])
if (param[0] == 0)
exec(null, null, "Vibration", "cancelVibration", []);
//else vibrate
else
exec(null, null, "Vibration", "vibrate", [param[0]]);
}
//vibrate with a pattern
else if ((typeof param == 'object') && param.length > 1)
{
var repeat = -1; //no repeat
exec(null, null, "Vibration", "vibrateWithPattern", [param, repeat]);
}
//cancel vibration (param = 0 or [])
else
exec(null, null, "Vibration", "cancelVibration", []);
=======
vibrate: function(param) {
/* Aligning with w3c spec */
//vibrate
if ((typeof param == 'number') && param != 0)
exec(null, null, "Vibration", "vibrate", [param]);
//vibrate with a pattern
else if ((typeof param == 'object') && param.length != 0)
{
var repeat = -1; //no repeat
exec(null, null, "Vibration", "vibrateWithPattern", [param, repeat]);
}
//cancel vibration (param = 0 or [])
else
exec(null, null, "Vibration", "cancelVibration", []);
>>>>>>>
vibrate: function(param) {
/* Aligning with w3c spec */
//vibrate
if ((typeof param == 'number') && param != 0)
exec(null, null, "Vibration", "vibrate", [param]);
//vibrate with array ( i.e. vibrate([3000]) )
else if ((typeof param == 'object') && param.length == 1)
{
//cancel if vibrate([0])
if (param[0] == 0)
exec(null, null, "Vibration", "cancelVibration", []);
//else vibrate
else
exec(null, null, "Vibration", "vibrate", [param[0]]);
}
//vibrate with a pattern
else if ((typeof param == 'object') && param.length > 1)
//vibrate with a pattern
else if ((typeof param == 'object') && param.length != 0)
{
var repeat = -1; //no repeat
exec(null, null, "Vibration", "vibrateWithPattern", [param, repeat]);
}
//cancel vibration (param = 0 or [])
else
exec(null, null, "Vibration", "cancelVibration", []); |
<<<<<<<
login: function(creds) {
creds = creds || {};
return $http[method('login')](path('login'), {user: creds}).then(function(response) {
service.currentUser = response.data;
return service.requestCurrentUser();
=======
login: function(opts) {
var user = pick(opts, 'email', 'password');
return $http[method('login')](path('login'), {user: user}).then(function(response) {
service._currentUser = response.data;
return service.currentUser();
>>>>>>>
login: function(creds) {
creds = creds || {};
return $http[method('login')](path('login'), {user: creds}).then(function(response) {
service._currentUser = response.data;
return service.currentUser();
<<<<<<<
register: function(creds) {
creds = creds || {};
return $http[method('register')](path('register'), {user: creds}).then(function(response) {
service.currentUser = response.data;
return service.requestCurrentUser();
=======
register: function(opts) {
var user = pick(opts, 'email', 'password', 'password_confirmation');
if (!user.password_confirmation) {
user.password_confirmation = user.password;
}
return $http[method('register')](path('register'), {user: user}).then(function(response) {
service._currentUser = response.data;
return service.currentUser();
>>>>>>>
register: function(creds) {
creds = creds || {};
return $http[method('register')](path('register'), {user: creds}).then(function(response) {
service._currentUser = response.data;
return service.currentUser(); |
<<<<<<<
it('reports an error when an async expectation occurs after the spec finishes', function(done) {
jasmine.getEnv().requirePromises();
var resolve,
promise = new Promise(function(res) { resolve = res; });
env.describe('a suite', function() {
env.it('does not wait', function() {
// Note: we intentionally don't return the result of each expectAsync.
// This causes the spec to finish before the expectations are evaluated.
env.expectAsync(promise).toBeResolved();
env.expectAsync(promise).toBeResolvedTo('something else');
});
});
env.addReporter({
specDone: function() {
resolve();
},
jasmineDone: function (result) {
expect(result.failedExpectations).toEqual([
jasmine.objectContaining({
passed: false,
globalErrorType: 'lateExpectation',
message: 'Spec "a suite does not wait" ran a "toBeResolved" expectation ' +
'after it finished.\n' +
'Did you forget to return or await the result of expectAsync?',
matcherName: 'toBeResolved'
}),
jasmine.objectContaining({
passed: false,
globalErrorType: 'lateExpectation',
message: 'Spec "a suite does not wait" ran a "toBeResolvedTo" expectation ' +
'after it finished.\n' +
'Message: "Expected a promise to be resolved to \'something else\' ' +
'but it was resolved to undefined."\n' +
'Did you forget to return or await the result of expectAsync?',
matcherName: 'toBeResolvedTo'
})
]);
done();
}
});
env.execute();
});
it('reports an error when an async expectation occurs after the suite finishes', function(done) {
jasmine.getEnv().requirePromises();
var resolve,
promise = new Promise(function(res) { resolve = res; });
env.describe('a suite', function() {
env.afterAll(function() {
// Note: we intentionally don't return the result of expectAsync.
// This causes the suite to finish before the expectations are evaluated.
env.expectAsync(promise).toBeResolved();
});
env.it('is a spec', function() {});
});
env.addReporter({
suiteDone: function() {
resolve();
},
jasmineDone: function (result) {
expect(result.failedExpectations).toEqual([
jasmine.objectContaining({
passed: false,
globalErrorType: 'lateExpectation',
message: 'Suite "a suite" ran a "toBeResolved" expectation ' +
'after it finished.\n' +
'Did you forget to return or await the result of expectAsync?',
matcherName: 'toBeResolved'
})
]);
done();
}
});
env.execute();
});
=======
it("supports asymmetric equality testers that take a matchersUtil", function(done) {
var env = new jasmineUnderTest.Env();
env.it("spec using custom asymmetric equality tester", function() {
var customEqualityFn = function(a, b) {
if (a === 2 && b === "two") {
return true;
}
};
var arrayWithFirstElement = function(sample) {
return {
asymmetricMatch: function (actual, matchersUtil) {
return matchersUtil.equals(sample, actual[0]);
}
};
};
env.addCustomEqualityTester(customEqualityFn);
env.expect(["two"]).toEqual(arrayWithFirstElement(2));
});
var specExpectations = function(result) {
expect(result.status).toEqual('passed');
};
env.addReporter({ specDone: specExpectations, jasmineDone: done });
env.execute();
});
>>>>>>>
it('reports an error when an async expectation occurs after the spec finishes', function(done) {
jasmine.getEnv().requirePromises();
var resolve,
promise = new Promise(function(res) { resolve = res; });
env.describe('a suite', function() {
env.it('does not wait', function() {
// Note: we intentionally don't return the result of each expectAsync.
// This causes the spec to finish before the expectations are evaluated.
env.expectAsync(promise).toBeResolved();
env.expectAsync(promise).toBeResolvedTo('something else');
});
});
env.addReporter({
specDone: function() {
resolve();
},
jasmineDone: function (result) {
expect(result.failedExpectations).toEqual([
jasmine.objectContaining({
passed: false,
globalErrorType: 'lateExpectation',
message: 'Spec "a suite does not wait" ran a "toBeResolved" expectation ' +
'after it finished.\n' +
'Did you forget to return or await the result of expectAsync?',
matcherName: 'toBeResolved'
}),
jasmine.objectContaining({
passed: false,
globalErrorType: 'lateExpectation',
message: 'Spec "a suite does not wait" ran a "toBeResolvedTo" expectation ' +
'after it finished.\n' +
'Message: "Expected a promise to be resolved to \'something else\' ' +
'but it was resolved to undefined."\n' +
'Did you forget to return or await the result of expectAsync?',
matcherName: 'toBeResolvedTo'
})
]);
done();
}
});
env.execute();
});
it('reports an error when an async expectation occurs after the suite finishes', function(done) {
jasmine.getEnv().requirePromises();
var resolve,
promise = new Promise(function(res) { resolve = res; });
env.describe('a suite', function() {
env.afterAll(function() {
// Note: we intentionally don't return the result of expectAsync.
// This causes the suite to finish before the expectations are evaluated.
env.expectAsync(promise).toBeResolved();
});
env.it('is a spec', function() {});
});
env.addReporter({
suiteDone: function() {
resolve();
},
jasmineDone: function (result) {
expect(result.failedExpectations).toEqual([
jasmine.objectContaining({
passed: false,
globalErrorType: 'lateExpectation',
message: 'Suite "a suite" ran a "toBeResolved" expectation ' +
'after it finished.\n' +
'Did you forget to return or await the result of expectAsync?',
matcherName: 'toBeResolved'
})
]);
done();
}
});
env.execute();
});
it("supports asymmetric equality testers that take a matchersUtil", function(done) {
var env = new jasmineUnderTest.Env();
env.it("spec using custom asymmetric equality tester", function() {
var customEqualityFn = function(a, b) {
if (a === 2 && b === "two") {
return true;
}
};
var arrayWithFirstElement = function(sample) {
return {
asymmetricMatch: function (actual, matchersUtil) {
return matchersUtil.equals(sample, actual[0]);
}
};
};
env.addCustomEqualityTester(customEqualityFn);
env.expect(["two"]).toEqual(arrayWithFirstElement(2));
});
var specExpectations = function(result) {
expect(result.status).toEqual('passed');
};
env.addReporter({ specDone: specExpectations, jasmineDone: done });
env.execute();
}); |
<<<<<<<
function asymmetricDiff(a, b, aStack, bStack, customTesters, diffBuilder) {
if (j$.isFunction_(b.valuesForDiff_)) {
var values = b.valuesForDiff_(a);
eq(values.other, values.self, aStack, bStack, customTesters, diffBuilder);
} else {
diffBuilder.record(a, b);
}
}
function asymmetricMatch(a, b, aStack, bStack, customTesters, diffBuilder) {
=======
MatchersUtil.prototype.asymmetricMatch_ = function(a, b, customTesters, diffBuilder) {
>>>>>>>
MatchersUtil.prototype.asymmetricDiff_ = function(a, b, aStack, bStack, customTesters, diffBuilder) {
if (j$.isFunction_(b.valuesForDiff_)) {
var values = b.valuesForDiff_(a);
this.eq_(values.other, values.self, aStack, bStack, customTesters, diffBuilder);
} else {
diffBuilder.recordMismatch();
}
};
MatchersUtil.prototype.asymmetricMatch_ = function(a, b, aStack, bStack, customTesters, diffBuilder) {
<<<<<<<
// TODO: Do we want to build an asymmetric diff when the actual was an
// asymmeteric equality tester? Might be confusing.
diffBuilder.record(a, b);
=======
diffBuilder.recordMismatch();
>>>>>>>
// TODO: Do we want to build an asymmetric diff when the actual was an
// asymmeteric equality tester? Might be confusing.
diffBuilder.recordMismatch();
<<<<<<<
asymmetricDiff(a, b, aStack, bStack, customTesters, diffBuilder);
=======
diffBuilder.recordMismatch();
>>>>>>>
this.asymmetricDiff_(a, b, aStack, bStack, customTesters, diffBuilder);
<<<<<<<
var asymmetricResult = asymmetricMatch(a, b, aStack, bStack, customTesters, diffBuilder);
=======
var asymmetricResult = this.asymmetricMatch_(a, b, customTesters, diffBuilder);
>>>>>>>
var asymmetricResult = this.asymmetricMatch_(a, b, aStack, bStack, customTesters, diffBuilder); |
<<<<<<<
var global = options.global || j$.getGlobal();
=======
var createSpy = options.createSpy;
>>>>>>>
var global = options.global || j$.getGlobal();
var createSpy = options.createSpy; |
<<<<<<<
=======
// TODO: fix this naming, and here's where the value comes in
this.catchExceptions = function(value) {
this.deprecated('The catchExceptions option is deprecated and will be replaced with stopOnSpecFailure in Jasmine 3.0');
catchExceptions = !!value;
return catchExceptions;
};
this.catchingExceptions = function() {
return catchExceptions;
};
>>>>>>>
<<<<<<<
this.suppressLoadErrors = function() {
if (handlingLoadErrors) {
globalErrors.popListener();
}
handlingLoadErrors = false;
};
var queueRunnerFactory = function(options, args) {
var failFast = false;
if (options.isLeaf) {
failFast = throwOnExpectationFailure;
} else if (!options.isReporter) {
failFast = stopOnSpecFailure;
}
=======
this.deprecated = function(msg) {
var runnable = currentRunnable() || topSuite;
runnable.addDeprecationWarning(msg);
if(typeof console !== 'undefined' && typeof console.warn !== 'undefined') {
console.error('DEPRECATION: ' + msg);
}
};
var queueRunnerFactory = function(options) {
options.catchException = catchException;
>>>>>>>
this.suppressLoadErrors = function() {
if (handlingLoadErrors) {
globalErrors.popListener();
}
handlingLoadErrors = false;
};
this.deprecated = function(msg) {
var runnable = currentRunnable() || topSuite;
runnable.addDeprecationWarning(msg);
if(typeof console !== 'undefined' && typeof console.warn !== 'undefined') {
console.error('DEPRECATION: ' + msg);
}
};
var queueRunnerFactory = function(options, args) {
var failFast = false;
if (options.isLeaf) {
failFast = throwOnExpectationFailure;
} else if (!options.isReporter) {
failFast = stopOnSpecFailure;
}
<<<<<<<
options.completeOnFirstError = failFast;
options.onException = options.onException || function(e) {
(currentRunnable() || topSuite).onException(e);
};
=======
options.completeOnFirstError = throwOnExpectationFailure && options.isLeaf;
options.deprecated = self.deprecated;
>>>>>>>
options.completeOnFirstError = failFast;
options.onException = options.onException || function(e) {
(currentRunnable() || topSuite).onException(e);
};
options.deprecated = self.deprecated;
<<<<<<<
var self = this;
this.suppressLoadErrors();
=======
if (hasExecuted) {
this.deprecated('Executing the same Jasmine multiple times will no longer work in Jasmine 3.0');
}
hasExecuted = true;
>>>>>>>
var self = this;
this.suppressLoadErrors();
<<<<<<<
/**
* Information passed to the {@link Reporter#jasmineDone} event.
* @typedef JasmineDoneInfo
* @property {OverallStatus} - The overall result of the sute: 'passed', 'failed', or 'incomplete'.
* @property {IncompleteReason} - Explanation of why the suite was incimplete.
* @property {Order} order - Information about the ordering (random or not) of this execution of the suite.
* @property {Expectation[]} failedExpectations - List of expectations that failed in an {@link afterAll} at the global level.
*/
reporter.jasmineDone({
overallStatus: overallStatus,
incompleteReason: incompleteReason,
order: order,
failedExpectations: topSuite.result.failedExpectations
}, function() {});
=======
currentlyExecutingSuites.push(topSuite);
globalErrors.install();
processor.execute(function() {
clearResourcesForRunnable(topSuite.id);
currentlyExecutingSuites.pop();
globalErrors.uninstall();
/**
* Information passed to the {@link Reporter#jasmineDone} event.
* @typedef JasmineDoneInfo
* @property {Order} order - Information about the ordering (random or not) of this execution of the suite.
* @property {Expectation[]} failedExpectations - List of expectations that failed in an {@link afterAll} at the global level.
* @property {Expectation[]} deprecationWarnings - List of deprecation warnings that occurred at the global level.
*/
reporter.jasmineDone({
order: order,
failedExpectations: topSuite.result.failedExpectations,
deprecationWarnings: topSuite.result.deprecationWarnings
>>>>>>>
/**
* Information passed to the {@link Reporter#jasmineDone} event.
* @typedef JasmineDoneInfo
* @property {OverallStatus} - The overall result of the sute: 'passed', 'failed', or 'incomplete'.
* @property {IncompleteReason} - Explanation of why the suite was incimplete.
* @property {Order} order - Information about the ordering (random or not) of this execution of the suite.
* @property {Expectation[]} failedExpectations - List of expectations that failed in an {@link afterAll} at the global level.
* @property {Expectation[]} deprecationWarnings - List of deprecation warnings that occurred at the global level.
*/
reporter.jasmineDone({
overallStatus: overallStatus,
incompleteReason: incompleteReason,
order: order,
failedExpectations: topSuite.result.failedExpectations,
deprecationWarnings: topSuite.result.deprecationWarnings
}, function() {}); |
<<<<<<<
it("produces an understandable error message when an 'expect' is used outside of a current spec", function(done) {
var env = new j$.Env();
env.describe("A Suite", function() {
env.it("an async spec that is actually synchronous", function(underTestCallback) {
underTestCallback();
expect(function() { env.expect('a').toEqual('a'); }).toThrowError(/'expect' was used when there was no current spec/);
done();
});
});
env.execute();
});
});
=======
it("Custom equality testers for toContain should be per suite", function(done) {
var env = new j$.Env({global: { setTimeout: setTimeout }}),
reporter = jasmine.createSpyObj('fakeReporter', [
"jasmineDone",
"specDone"
]);
reporter.jasmineDone.and.callFake(function() {
var firstSpecResult = reporter.specDone.calls.first().args[0],
secondSpecResult = reporter.specDone.calls.argsFor(1)[0],
thirdSpecResult = reporter.specDone.calls.mostRecent().args[0];
expect(firstSpecResult.status).toEqual("passed");
expect(secondSpecResult.status).toEqual("passed");
expect(thirdSpecResult.status).toEqual("failed");
done();
});
env.addReporter(reporter);
env.describe("testing custom equality testers", function() {
env.beforeAll(function() { env.addCustomEqualityTester(function(a, b) { return true; })});
env.it("with a custom tester", function() {
env.expect(["a"]).toContain("b");
});
env.it("also with the custom tester", function() {
env.expect(["a"]).toContain("b");
});
});
env.describe("another suite", function() {
env.it("without the custom tester", function() {
env.expect(["a"]).toContain("b");
});
});
env.execute();
});
it("Custom matchers should be per spec", function(done) {
var env = new j$.Env({global: { setTimeout: setTimeout }}),
matchers = {
toFoo: function() {}
};
env.describe("testing custom matchers", function() {
env.it("with a custom matcher", function() {
env.addMatchers(matchers);
expect(env.expect().toFoo).toBeDefined();
});
env.it("without a custom matcher", function() {
expect(env.expect().toFoo).toBeUndefined();
});
});
env.addReporter({jasmineDone: done});
env.execute();
});
it("Custom matchers should be per suite", function(done) {
var env = new j$.Env({global: { setTimeout: setTimeout }}),
matchers = {
toFoo: function() {}
};
env.describe("testing custom matchers", function() {
env.beforeAll(function() { env.addMatchers(matchers); });
env.it("with a custom matcher", function() {
expect(env.expect().toFoo).toBeDefined();
});
env.it("with the same custom matcher", function() {
expect(env.expect().toFoo).toBeDefined();
});
});
env.describe("another suite", function() {
env.it("no longer has the custom matcher", function() {
expect(env.expect().toFoo).not.toBeDefined();
});
});
env.addReporter({jasmineDone: done});
env.execute();
});
it('throws an exception if you try to create a spy outside of a runnable', function (done) {
var env = new j$.Env(),
obj = {fn: function () {}},
exception;
env.describe("a suite", function () {
try {
env.spyOn(obj, 'fn');
} catch(e) {
exception = e;
}
});
var assertions = function() {
expect(exception.message).toBe('Spies must be created in a before function or a spec');
done();
};
env.addReporter({jasmineDone: assertions});
env.execute();
});
it('throws an exception if you try to add a matcher outside of a runnable', function (done) {
var env = new j$.Env(),
obj = {fn: function () {}},
exception;
env.describe("a suite", function () {
try {
env.addMatchers({myMatcher: function(actual,expected){return false;}});
} catch(e) {
exception = e;
}
});
var assertions = function() {
expect(exception.message).toBe('Matchers must be added in a before function or a spec');
done();
};
env.addReporter({jasmineDone: assertions});
env.execute();
});
it('throws an exception if you try to add a custom equality outside of a runnable', function (done) {
var env = new j$.Env(),
obj = {fn: function () {}},
exception;
env.describe("a suite", function () {
try {
env.addCustomEqualityTester(function(first, second) {return true;});
} catch(e) {
exception = e;
}
});
var assertions = function() {
expect(exception.message).toBe('Custom Equalities must be added in a before function or a spec');
done();
};
env.addReporter({jasmineDone: assertions});
env.execute();
});
});
>>>>>>>
it("produces an understandable error message when an 'expect' is used outside of a current spec", function(done) {
var env = new j$.Env();
env.describe("A Suite", function() {
env.it("an async spec that is actually synchronous", function(underTestCallback) {
underTestCallback();
expect(function() { env.expect('a').toEqual('a'); }).toThrowError(/'expect' was used when there was no current spec/);
done();
});
});
env.execute();
});
it("Custom equality testers for toContain should be per suite", function(done) {
var env = new j$.Env({global: { setTimeout: setTimeout }}),
reporter = jasmine.createSpyObj('fakeReporter', [
"jasmineDone",
"specDone"
]);
reporter.jasmineDone.and.callFake(function() {
var firstSpecResult = reporter.specDone.calls.first().args[0],
secondSpecResult = reporter.specDone.calls.argsFor(1)[0],
thirdSpecResult = reporter.specDone.calls.mostRecent().args[0];
expect(firstSpecResult.status).toEqual("passed");
expect(secondSpecResult.status).toEqual("passed");
expect(thirdSpecResult.status).toEqual("failed");
done();
});
env.addReporter(reporter);
env.describe("testing custom equality testers", function() {
env.beforeAll(function() { env.addCustomEqualityTester(function(a, b) { return true; })});
env.it("with a custom tester", function() {
env.expect(["a"]).toContain("b");
});
env.it("also with the custom tester", function() {
env.expect(["a"]).toContain("b");
});
});
env.describe("another suite", function() {
env.it("without the custom tester", function() {
env.expect(["a"]).toContain("b");
});
});
env.execute();
});
it("Custom matchers should be per spec", function(done) {
var env = new j$.Env({global: { setTimeout: setTimeout }}),
matchers = {
toFoo: function() {}
};
env.describe("testing custom matchers", function() {
env.it("with a custom matcher", function() {
env.addMatchers(matchers);
expect(env.expect().toFoo).toBeDefined();
});
env.it("without a custom matcher", function() {
expect(env.expect().toFoo).toBeUndefined();
});
});
env.addReporter({jasmineDone: done});
env.execute();
});
it("Custom matchers should be per suite", function(done) {
var env = new j$.Env({global: { setTimeout: setTimeout }}),
matchers = {
toFoo: function() {}
};
env.describe("testing custom matchers", function() {
env.beforeAll(function() { env.addMatchers(matchers); });
env.it("with a custom matcher", function() {
expect(env.expect().toFoo).toBeDefined();
});
env.it("with the same custom matcher", function() {
expect(env.expect().toFoo).toBeDefined();
});
});
env.describe("another suite", function() {
env.it("no longer has the custom matcher", function() {
expect(env.expect().toFoo).not.toBeDefined();
});
});
env.addReporter({jasmineDone: done});
env.execute();
});
it('throws an exception if you try to create a spy outside of a runnable', function (done) {
var env = new j$.Env(),
obj = {fn: function () {}},
exception;
env.describe("a suite", function () {
try {
env.spyOn(obj, 'fn');
} catch(e) {
exception = e;
}
});
var assertions = function() {
expect(exception.message).toBe('Spies must be created in a before function or a spec');
done();
};
env.addReporter({jasmineDone: assertions});
env.execute();
});
it('throws an exception if you try to add a matcher outside of a runnable', function (done) {
var env = new j$.Env(),
obj = {fn: function () {}},
exception;
env.describe("a suite", function () {
try {
env.addMatchers({myMatcher: function(actual,expected){return false;}});
} catch(e) {
exception = e;
}
});
var assertions = function() {
expect(exception.message).toBe('Matchers must be added in a before function or a spec');
done();
};
env.addReporter({jasmineDone: assertions});
env.execute();
});
it('throws an exception if you try to add a custom equality outside of a runnable', function (done) {
var env = new j$.Env(),
obj = {fn: function () {}},
exception;
env.describe("a suite", function () {
try {
env.addCustomEqualityTester(function(first, second) {return true;});
} catch(e) {
exception = e;
}
});
var assertions = function() {
expect(exception.message).toBe('Custom Equalities must be added in a before function or a spec');
done();
};
env.addReporter({jasmineDone: assertions});
env.execute();
});
}); |
<<<<<<<
=======
Suite.prototype.addDeprecationWarning = function(msg) {
this.result.deprecationWarnings.push(this.expectationResultFactory({ message: msg }));
};
function isAfterAll(children) {
return children && children[0].result.status;
}
>>>>>>>
Suite.prototype.addDeprecationWarning = function(msg) {
this.result.deprecationWarnings.push(this.expectationResultFactory({ message: msg }));
}; |
<<<<<<<
jasmine.Spec.prototype.addMatcherResult = function(result) {
this.results_.addResult(result);
};
=======
>>>>>>>
jasmine.Spec.prototype.addMatcherResult = function(result) {
this.results_.addResult(result);
}; |
<<<<<<<
async function main(withSES, argv) {
const config = await loadBasedir(__dirname);
const ldSrcPath = require.resolve(
'@agoric/swingset-vat/src/devices/loopbox-src',
);
config.devices = [['loopbox', ldSrcPath, {}]];
=======
async function main(withSES, basedir, argv) {
const dir = path.resolve('test/swingsetTests', basedir);
const config = await loadBasedir(dir);
>>>>>>>
async function main(withSES, argv) {
const config = await loadBasedir(__dirname); |
<<<<<<<
const config = require('../../config')
const { freeGasLimit, minStateGas, gasPerByte, maxTxGas } = config.contract
=======
const path = require('path')
const fs = require('fs')
>>>>>>>
const config = require('../../config')
const { freeGasLimit, minStateGas, gasPerByte, maxTxGas } = config.contract
const path = require('path')
const fs = require('fs')
<<<<<<<
let gasLimit = maxTxGas
if (context.emitEvent) { // isTx
const userGas = freeGasLimit + Number(context.runtime.msg.fee)
gasLimit = userGas > maxTxGas ? maxTxGas : userGas
}
// Print source with line number - for debug
=======
const contractSrc = `(()=>function(__g){${srcWrapper}})()`
const filename = path.resolve(process.cwd(), 'contract_src', context.address + '.js')
// Print source for debug
>>>>>>>
let gasLimit = maxTxGas
if (context.emitEvent) { // isTx
const userGas = freeGasLimit + Number(context.runtime.msg.fee)
gasLimit = userGas > maxTxGas ? maxTxGas : userGas
}
// Print source with line number - for debug
const contractSrc = `(()=>function(__g){${srcWrapper}})()`
const filename = path.resolve(process.cwd(), 'contract_src', context.address + '.js')
// Print source for debug
<<<<<<<
const f = new Function('__g', srcWrapper) // eslint-disable-line
let gasUsed = 0
const functionInSandbox = vm.runInNewContext(`(() => ${f.toString()})()`, {
process: Object.freeze({
=======
const functionInSandbox = vm.runInNewContext(contractSrc, {
process: {
>>>>>>>
let gasUsed = 0
const functionInSandbox = vm.runInNewContext(contractSrc, {
process: Object.freeze({ |
<<<<<<<
constructor () {
this.stateTable = {};
=======
constructor (stateTable) {
this.stateTable = stateTable || {};
//this.receipts = {};
//this.blocks = [];
>>>>>>>
constructor (stateTable) {
this.stateTable = stateTable || {}; |
<<<<<<<
this.route('member', { path: '/:memberSlug' }, function() {
this.route('project', { path: '/:projectSlug' });
});
=======
this.route('signup');
>>>>>>>
this.route('signup');
this.route('member', { path: '/:memberSlug' }, function() {
this.route('project', { path: '/:projectSlug' });
}); |
<<<<<<<
this.route('member', { path: '/:memberSlug' });
this.route('project', { path: '/:memberSlug/:projectSlug' }, function() {
this.route('posts', function() {
this.route('new');
this.route('post', { path: '/:post_id' });
});
});
=======
this.route('profile', { path: '/settings/profile' });
this.route('slugged-route', { path: '/:sluggedRouteSlug' });
this.route('project', { path: '/:sluggedRouteSlug/:projectSlug' });
>>>>>>>
this.route('profile', { path: '/settings/profile' });
this.route('slugged-route', { path: '/:sluggedRouteSlug' });
this.route('project', { path: '/:sluggedRouteSlug/:projectSlug' }, function() {
this.route('posts', function() {
this.route('new');
this.route('post', { path: '/:post_id' });
});
}); |
<<<<<<<
var Manager = require('../modules/manager');
=======
var _keys = require('babel-runtime/core-js/object/keys');
var _keys2 = _interopRequireDefault(_keys);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
>>>>>>>
var _keys = require('babel-runtime/core-js/object/keys');
var _keys2 = _interopRequireDefault(_keys);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var Manager = require('../modules/manager');
<<<<<<<
if (entryExtNames) {
// 应用后缀转换规则
Object.keys(entryExtNames).map(function (targetExtName) {
if (entryExtNames[targetExtName].indexOf(extName) > -1) {
extName = '.' + targetExtName;
}
});
=======
// 应用后缀转换规则
(0, _keys2.default)(entryExtNames).map(function (targetExtName) {
if (entryExtNames[targetExtName].indexOf(extName) > -1) {
extName = '.' + targetExtName;
>>>>>>>
if (entryExtNames) {
// 应用后缀转换规则
(0, _keys2.default)(entryExtNames).map(function (targetExtName) {
if (entryExtNames[targetExtName].indexOf(extName) > -1) {
extName = '.' + targetExtName;
}
}); |
<<<<<<<
// A cache for potentiallyApplicableRulesets
// Size chosen /completely/ arbitrarily.
this.ruleCache = new cache(1000);
// A cache for cookie hostnames.
this.cookieHostCache = new cache(100);
// A hash of rule name -> active status (true/false).
this.ruleActiveStates = ruleActiveStates;
=======
for(var i = 0; i < rule_list.length; i++) {
var xhr = new XMLHttpRequest();
// Use blocking XHR to ensure everything is loaded by the time
// we return.
//var that = this;
//xhr.onreadystatechange = function() { that.loadRuleSet(xhr); }
xhr.open("GET", chrome.extension.getURL(rule_list[i]), false);
//xhr.open("GET", chrome.extension.getURL(rule_list[i]), true);
xhr.send(null);
this.loadRuleSet(xhr);
}
var t2 = new Date().getTime();
log(NOTE,"Loading rulesets took " + (t2 - t1) / 1000.0 + " seconds");
>>>>>>>
// A cache for potentiallyApplicableRulesets
// Size chosen /completely/ arbitrarily.
this.ruleCache = new cache(1000);
// A cache for cookie hostnames.
this.cookieHostCache = new cache(100);
// A hash of rule name -> active status (true/false).
this.ruleActiveStates = ruleActiveStates;
<<<<<<<
if (/(OPR|Opera)[\/\s](\d+\.\d+)/.test(this.userAgent)) {
log(DBUG, 'Detected that we are running Opera');
=======
var isOpera = navigator.userAgent.match(/(?:OPR|Opera)[\/\s](\d+)(?:\.\d+)/);
if (isOpera && isOpera.length === 2 && parseInt(isOpera[1]) < 23) {
// Opera <23 does not have mixed content blocking
log(DBUG, 'Detected that we are running Opera < 23');
>>>>>>>
var isOpera = navigator.userAgent.match(/(?:OPR|Opera)[\/\s](\d+)(?:\.\d+)/);
if (isOpera && isOpera.length === 2 && parseInt(isOpera[1]) < 23) {
// Opera <23 does not have mixed content blocking
log(DBUG, 'Detected that we are running Opera < 23');
<<<<<<<
=======
loadRuleSet: function(xhr) {
// Get file contents
if (xhr.readyState != 4) {
return;
}
// XXX: Validation + error checking
var sets = xhr.responseXML.getElementsByTagName("ruleset");
for (var i = 0; i < sets.length; ++i) {
this.parseOneRuleset(sets[i]);
}
},
addUserRule : function(params) {
log(INFO, 'adding new user rule for ' + JSON.stringify(params));
var new_rule_set = new RuleSet(params.host, null, true, "user rule");
var new_rule = new Rule(params.urlMatcher, params.redirectTo);
new_rule_set.rules.push(new_rule);
if (!(params.host in this.targets)) {
this.targets[params.host] = [];
}
ruleCache.remove(params.host);
// TODO: maybe promote this rule?
this.targets[params.host].push(new_rule_set);
log(INFO, 'done adding rule');
return true;
},
>>>>>>>
addUserRule : function(params) {
log(INFO, 'adding new user rule for ' + JSON.stringify(params));
var new_rule_set = new RuleSet(params.host, null, true, "user rule");
var new_rule = new Rule(params.urlMatcher, params.redirectTo);
new_rule_set.rules.push(new_rule);
if (!(params.host in this.targets)) {
this.targets[params.host] = [];
}
ruleCache.remove(params.host);
// TODO: maybe promote this rule?
this.targets[params.host].push(new_rule_set);
log(INFO, 'done adding rule');
return true;
}, |
<<<<<<<
newuristr = ruleset.apply(canonical_url);
// only use upgradeToSecure for trivial rulesets
if (newuristr == trivialUpgradeUri) {
upgradeToSecure = true;
}
=======
newuristr = ruleset.apply(uri.href);
>>>>>>>
newuristr = ruleset.apply(uri.href);
// only use upgradeToSecure for trivial rulesets
if (newuristr == trivialUpgradeUri) {
upgradeToSecure = true;
}
<<<<<<<
newuristr = canonical_url.replace(/^http:/, "https:");
=======
return {redirectUrl: uri.href.replace(/^http:/, "https:")};
>>>>>>>
newuristr = uri.href.replace(/^http:/, "https:"); |
<<<<<<<
on_by_default = false;
this.notes = default_off;
=======
this.on_by_default = false;
>>>>>>>
this.notes = default_off;
this.on_by_default = false; |
<<<<<<<
function getRuleXml(url) {
var xhr = new XMLHttpRequest();
// Use blocking XHR to ensure everything is loaded by the time
// we return.
xhr.open("GET", chrome.extension.getURL(url), false);
xhr.send(null);
// Get file contents
if (xhr.readyState != 4) {
return;
}
return xhr.responseXML;
}
var all_rules = new RuleSets(navigator.userAgent, LRUCache, localStorage);
for (var i = 0; i < rule_list.length; i++) {
all_rules.addFromXml(getRuleXml(rule_list[i]));
}
=======
var USER_RULE_KEY = 'userRules';
// Records which tabId's are active in the HTTPS Switch Planner (see
// devtools-panel.js).
var switchPlannerEnabledFor = {};
// Detailed information recorded when the HTTPS Switch Planner is active.
// Structure is:
// switchPlannerInfo[tabId]["rw"/"nrw"][resource_host][active_content][url];
// rw / nrw stand for "rewritten" versus "not rewritten"
var switchPlannerInfo = {};
var getStoredUserRules = function() {
var oldUserRuleString = localStorage.getItem(USER_RULE_KEY);
var oldUserRules = [];
if (oldUserRuleString) {
oldUserRules = JSON.parse(oldUserRuleString);
}
return oldUserRules;
};
var all_rules = new RuleSets();
>>>>>>>
function getRuleXml(url) {
var xhr = new XMLHttpRequest();
// Use blocking XHR to ensure everything is loaded by the time
// we return.
xhr.open("GET", chrome.extension.getURL(url), false);
xhr.send(null);
// Get file contents
if (xhr.readyState != 4) {
return;
}
return xhr.responseXML;
}
var all_rules = new RuleSets(navigator.userAgent, LRUCache, localStorage);
for (var i = 0; i < rule_list.length; i++) {
all_rules.addFromXml(getRuleXml(rule_list[i]));
}
var USER_RULE_KEY = 'userRules';
// Records which tabId's are active in the HTTPS Switch Planner (see
// devtools-panel.js).
var switchPlannerEnabledFor = {};
// Detailed information recorded when the HTTPS Switch Planner is active.
// Structure is:
// switchPlannerInfo[tabId]["rw"/"nrw"][resource_host][active_content][url];
// rw / nrw stand for "rewritten" versus "not rewritten"
var switchPlannerInfo = {};
var getStoredUserRules = function() {
var oldUserRuleString = localStorage.getItem(USER_RULE_KEY);
var oldUserRules = [];
if (oldUserRuleString) {
oldUserRules = JSON.parse(oldUserRuleString);
}
return oldUserRules;
}; |
<<<<<<<
var pbm = this.inPrivateBrowsingMode(channel);
this.log(DBUG, "Private browsing mode: " + pbm);
return !pbm;
}
},
inPrivateBrowsingMode: function(channel) {
// In classic firefox fashion, there are multiple versions of this API
// https://developer.mozilla.org/EN/docs/Supporting_per-window_private_browsing
try {
// Firefox 20+, this state is per-window;
// should raise an exception on FF < 20
CU.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
if (!(channel instanceof CI.nsIHttpChannel)) {
this.log(NOTE, "observatoryActive() without a channel");
// This is a windowless request. We cannot tell if private browsing
// applies. Conservatively, if we have ever seen PBM, it might be
// active now
return this.everSeenPrivateBrowsing;
}
var browser = this.HTTPSEverywhere.getBrowserForChannel(channel);
// windowless request
if (!browser || !browser.contentWindow) {
return this.everSeenPrivateBrowsing;
}
if (PrivateBrowsingUtils.isWindowPrivate(browser.contentWindow)) {
this.everSeenPrivateBrowsing = true;
return true;
}
} catch (e) {
// Firefox < 20, this state is global
=======
>>>>>>>
<<<<<<<
var win = null
if (channel) {
var browser = this.HTTPSEverywhere.getBrowserForChannel(channel);
var win = browser.contentWindow;
}
=======
var HTTPSEverywhere = CC["@eff.org/https-everywhere;1"]
.getService(Components.interfaces.nsISupports)
.wrappedJSObject;
var win = channel ? HTTPSEverywhere.getWindowForChannel(channel) : null;
>>>>>>>
var HTTPSEverywhere = CC["@eff.org/https-everywhere;1"]
.getService(Components.interfaces.nsISupports)
.wrappedJSObject;
var win = null
if (channel) {
var browser = this.HTTPSEverywhere.getBrowserForChannel(channel);
var win = browser.contentWindow;
} |
<<<<<<<
// 将情绪值按日期分类
=======
>>>>>>>
<<<<<<<
style={styles.chart_height}
=======
>>>>>>>
style={styles.chart_height}
<<<<<<<
<View style={[styles.report_container, { display: this.props.user.emotions_basis ? 'none' : 'flex',position: this.props.user.emotions_basis ? 'relative' : 'absolute' }]}>
<Image style={styles.img} source={require('../../../res/images/profile/character/untested.png')} />
=======
<View style={[styles.report_container, { display: this.props.user.emotions_basis ? 'none' : 'flex' }]}>
<Image style={styles.img} resizeMethod='scale' source={require('../../../res/images/profile/character/untested.png')} />
>>>>>>>
<View style={[styles.report_container, { display: this.props.user.emotions_basis ? 'none' : 'flex',position: this.props.user.emotions_basis ? 'relative' : 'absolute' }]}>
<Image style={styles.img} resizeMethod='scale' source={require('../../../res/images/profile/character/untested.png')} /> |
<<<<<<<
BackHandler.removeEventListener('hardwareBackPress',this.onBackAndroid);
=======
this.saveDiary()
>>>>>>>
BackHandler.removeEventListener('hardwareBackPress',this.onBackAndroid);
this.saveDiary()
<<<<<<<
let images = ''
// 复制图片文件
let newPathListPromises = imgPathList.map(async path => {
return await downloadImg(path, this.props.user.id)
})
let newImgPathList = []
for (let newPathListPromise of newPathListPromises) {
newImgPathList.push(await newPathListPromise)
}
// 情绪分析
let mode = 50
if (isLogin && this.state.isConnected) {
const res = await HttpUtils.post(UTILS.get_nlp_result, { content })
mode = res.code === 0 ? Math.floor(res.data * 100) : 50
}
=======
const res = await HttpUtils.post(UTILS.get_nlp_result, { content })
mode = res.code === 0 ? Math.floor(res.data * 100) : 50
} finally {
>>>>>>>
const res = await HttpUtils.post(UTILS.get_nlp_result, { content })
mode = res.code === 0 ? Math.floor(res.data * 100) : 50
} finally {
<<<<<<<
Toast.hide()
} catch(e) {
console.log(e);
Toast.fail('保存失败，请稍后再试', 2)
=======
>>>>>>>
<<<<<<<
=======
<Animated.View
style={{
position: 'absolute',
bottom: this.state.datePickerY,
backgroundColor: '#fff',
zIndex: 100
}}
>
<DatePickerIOS
locale={'zh-Hans'}
style={styles.date_picker}
date={this.state.date}
maximumDate={new Date()}
mode={'datetime'}
onDateChange={date => this.setState({ date })}
/>
</Animated.View>
<TouchableOpacity
style={[styles.mask, { display: this.state.showDatePicker ? 'flex' : 'none' }]}
onPress={() => this._selectDate()}
>
</TouchableOpacity>
>>>>>>>
<<<<<<<
{
Platform.OS=='ios'?
<View style={styles.date_container}>
<TextPingFang style={styles.text_date}>{getMonth(this.state.date.getMonth())} </TextPingFang>
<TextPingFang style={styles.text_date}>{this.state.date.getDate()}，</TextPingFang>
<TextPingFang style={styles.text_date}>{this.state.date.getFullYear()}</TextPingFang>
<TouchableOpacity
style={styles.small_calendar}
onPress={this._selectDate.bind(this)}
>
<Image source={require('../../../res/images/home/diary/icon_calendar_small.png')}/>
</TouchableOpacity>
</View>
:<View style={styles.date_container}>
<DatePicker
style={{width: 200}}
date={this.state.date}
mode="date"
format="MM-DD，YYYY"
maxDate={new Date()}
confirmBtnText="确定"
cancelBtnText="取消"
iconSource={require('../../../res/images/home/diary/icon_calendar_small.png')}
customStyles={{
dateIcon: {
position: 'absolute',
right: getResponsiveWidth(100),
top: 10,
bottom:10,
marginLeft: 0,
width:getResponsiveWidth(20),
height:getResponsiveWidth(20)
},
dateInput: {
marginLeft: 0,
borderWidth:0,
alignItems: 'flex-start',
justifyContent: 'center'
}
}}
onDateChange={(date,date1) => {
this.setState({date: date1})}
}
/>
</View>
}
=======
<View style={styles.date_container}>
<TextPingFang style={styles.text_date}>{getMonth(this.state.date.getMonth())} </TextPingFang>
<TextPingFang style={styles.text_date}>{this.state.date.getDate()}，</TextPingFang>
<TextPingFang style={styles.text_date}>{this.state.date.getFullYear()}</TextPingFang>
<TouchableOpacity
style={styles.small_calendar}
onPress={this._selectDate.bind(this)}
>
<Image source={require('../../../res/images/home/diary/icon_calendar_small.png')} />
</TouchableOpacity>
</View>
>>>>>>>
{
Platform.OS=='ios'?
<View style={styles.date_container}>
<TextPingFang style={styles.text_date}>{getMonth(this.state.date.getMonth())} </TextPingFang>
<TextPingFang style={styles.text_date}>{this.state.date.getDate()}，</TextPingFang>
<TextPingFang style={styles.text_date}>{this.state.date.getFullYear()}</TextPingFang>
<TouchableOpacity
style={styles.small_calendar}
onPress={this._selectDate.bind(this)}
>
<Image source={require('../../../res/images/home/diary/icon_calendar_small.png')}/>
</TouchableOpacity>
</View>
:<View style={styles.date_container}>
<DatePicker
style={{width: 200}}
date={this.state.date}
mode="date"
format="MM-DD，YYYY"
maxDate={new Date()}
confirmBtnText="确定"
cancelBtnText="取消"
iconSource={require('../../../res/images/home/diary/icon_calendar_small.png')}
customStyles={{
dateIcon: {
position: 'absolute',
right: getResponsiveWidth(100),
top: 10,
bottom:10,
marginLeft: 0,
width:getResponsiveWidth(20),
height:getResponsiveWidth(20)
},
dateInput: {
marginLeft: 0,
borderWidth:0,
alignItems: 'flex-start',
justifyContent: 'center'
}
}}
onDateChange={(date,date1) => {
this.setState({date: date1})}
}
/>
</View>
} |
<<<<<<<
Keyboard.addListener('keyboardDidShow', (e) => {
this.setState({
showKeyboard: true,
keyboardHeight: e.endCoordinates.height
})
})
Keyboard.addListener('keyboardDidHide', () => {
this.setState({
showKeyboard: false,
keyboardHeight: 0
})
})
BackHandler.addEventListener('hardwareBackPress', this.onBackAndroid);
=======
>>>>>>>
BackHandler.addEventListener('hardwareBackPress', this.onBackAndroid); |
<<<<<<<
value={this.state.title}
underlineColorAndroid='transparent'
=======
value={this.props.diary.title}
>>>>>>>
value={this.props.diary.title}
underlineColorAndroid='transparent'
<<<<<<<
value={this.state.content}
underlineColorAndroid='transparent'
=======
value={this.props.diary.content}
>>>>>>>
value={this.props.diary.content}
underlineColorAndroid='transparent' |
<<<<<<<
jQuery("#links_editor").tooltip();
jQuery("span").tooltip();
=======
jQuery("a").tooltip();
jQuery("span").tooltip();
>>>>>>>
jQuery("#links_editor").tooltip();
jQuery("a").tooltip(); |
<<<<<<<
loginPromise = handleUserInfo(Object.assign(authData, {createUser, syncUserProfile}))
=======
// handleUserInfo 流程
BaaS.clearSession() // 防止用户在静默登录后又调用了 wx.login 使后端的 session_key 过期
loginPromise = handleUserInfo(Object.assign(authData, {createUser}))
>>>>>>>
// handleUserInfo 流程
BaaS.clearSession() // 防止用户在静默登录后又调用了 wx.login 使后端的 session_key 过期
loginPromise = handleUserInfo(Object.assign(authData, {createUser, syncUserProfile})) |
<<<<<<<
let zmodemBundle = gulp.src([
'./node_modules/zmodem.js/dist/zmodem.js',
'./src/addons/zmodem/zmodem.js',
]).pipe( concat('zmodem.js') ).pipe( gulp.dest( `${buildDir}/addons/zmodem` ) );
let zmodemDemoBundle = gulp.src([
// Copy JS addons
`${outDir}/addons/zmodem/demo/**`,
]).pipe(gulp.dest(`${buildDir}/addons/zmodem/demo`));
=======
let winptyCompatOptions = {
basedir: `${buildDir}/addons/winptyCompat`,
debug: true,
entries: [`${outDir}/addons/winptyCompat/winptyCompat.js`],
cache: {},
packageCache: {}
};
let winptyCompatBundle = browserify(winptyCompatOptions)
.external(path.join(outDir, 'Terminal.js'))
.bundle()
.pipe(source('./addons/winptyCompat/winptyCompat.js'))
.pipe(buffer())
.pipe(sourcemaps.init({loadMaps: true, sourceRoot: ''}))
.pipe(sourcemaps.write('./'))
.pipe(gulp.dest(buildDir));
>>>>>>>
let zmodemBundle = gulp.src([
'./node_modules/zmodem.js/dist/zmodem.js',
'./src/addons/zmodem/zmodem.js',
]).pipe( concat('zmodem.js') ).pipe( gulp.dest( `${buildDir}/addons/zmodem` ) );
let zmodemDemoBundle = gulp.src([
// Copy JS addons
`${outDir}/addons/zmodem/demo/**`,
]).pipe(gulp.dest(`${buildDir}/addons/zmodem/demo`));
let winptyCompatOptions = {
basedir: `${buildDir}/addons/winptyCompat`,
debug: true,
entries: [`${outDir}/addons/winptyCompat/winptyCompat.js`],
cache: {},
packageCache: {}
};
let winptyCompatBundle = browserify(winptyCompatOptions)
.external(path.join(outDir, 'Terminal.js'))
.bundle()
.pipe(source('./addons/winptyCompat/winptyCompat.js'))
.pipe(buffer())
.pipe(sourcemaps.init({loadMaps: true, sourceRoot: ''}))
.pipe(sourcemaps.write('./'))
.pipe(gulp.dest(buildDir));
<<<<<<<
return merge(searchBundle, zmodemBundle, zmodemDemoBundle, copyAddons);
=======
return merge(searchBundle, winptyCompatBundle, copyAddons);
>>>>>>>
return merge(searchBundle, zmodemBundle, zmodemDemoBundle, winptyCompatBundle, copyAddons); |
<<<<<<<
import { C0 } from './EscapeSequences';
import { InputHandler } from './InputHandler';
import { Parser } from './Parser';
=======
import { CharMeasure } from './utils/CharMeasure.js';
>>>>>>>
import { C0 } from './EscapeSequences';
import { InputHandler } from './InputHandler';
import { Parser } from './Parser';
import { CharMeasure } from './utils/CharMeasure.js'; |
<<<<<<<
/**
* Create an Auth0 Custom Domain.
*
* @method create
* @memberOf module:management.CustomDomainsManager.prototype
*
* @example
* management.createCustomDomain(data, function (err) {
* if (err) {
* // Handle error.
* }
*
* // CustomDomain created.
* });
*
* @param {Object} data The custom domain data object.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(ManagementClient, 'createCustomDomain', 'customDomains.create');
/**
* Get all Auth0 CustomDomains.
*
* @method getAll
* @memberOf module:management.CustomDomainsManager.prototype
*
* @example
* management.getCustomDomains(function (err, customDomains) {
* console.log(customDomains.length);
* });
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(ManagementClient, 'getCustomDomains', 'customDomains.getAll');
/**
* Get a Custom Domain.
*
* @method get
* @memberOf module:management.CustomDomainsManager.prototype
*
* @example
* management.getCustomDomain({ id: CUSTOM_DOMAIN_ID }, function (err, customDomain) {
* if (err) {
* // Handle error.
* }
*
* console.log(customDomain);
* });
*
* @param {Object} params Custom Domain parameters.
* @param {String} params.id Custom Domain ID.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(ManagementClient, 'getCustomDomain', 'customDomains.get');
/**
* Verify a Custom Domain.
*
* @method verify
* @memberOf module:management.CustomDomainsManager.prototype
*
* @example
* management.verifyCustomDomain({ id: CUSTOM_DOMAIN_ID }, function (err, customDomain) {
* if (err) {
* // Handle error.
* }
*
* console.log(customDomain);
* });
*
* @param {Object} params Custom Domain parameters.
* @param {String} params.id Custom Domain ID.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(ManagementClient, 'verifyCustomDomain', 'customDomains.verify');
/**
* Delete a Custom Domain.
*
* @method delete
* @memberOf module:management.CustomDomainsManager.prototype
*
* @example
* management.deleteCustomDomain({ id: CUSTOM_DOMAIN_ID }, function (err) {
* if (err) {
* // Handle error.
* }
*
* // CustomDomain deleted.
* });
*
* @param {Object} params Custom Domain parameters.
* @param {String} params.id Custom Domain ID.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(ManagementClient, 'deleteCustomDomain', 'customDomains.delete');
=======
/**
* Create a Guardian enrollment ticket.
*
* @method createGuardianEnrollmentTicket
* @memberOf module:management.GuardianManager.prototype
*
* @example
* management.createGuardianEnrollmentTicket(function (err, ticket) {
* console.log(ticket);
* });
*
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(
ManagementClient,
'createGuardianEnrollmentTicket',
'guardian.tickets.create'
);
/**
* Get a list of Guardian factors and statuses.
*
* @method getGuardianFactors
* @memberOf module:management.GuardianManager.prototype
*
* management.getGuardianFactors(function (err, factors) {
* console.log(factors.length);
* });
*
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(ManagementClient, 'getGuardianFactors', 'guardian.factors.getAll');
/**
* Get Guardian factor provider configuration
*
* @method getGuardianFactorProvider
* @memberOf module:management.GuardianManager.prototype
*
* management.getFactorProvider({ name: 'sms', provider: 'twilio'}, function (err, provider) {
* console.log(provider);
* });
*
* @param {Object} params Factor provider parameters.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(
ManagementClient,
'getGuardianFactorProvider',
'guardian.factorsProviders.get'
);
/**
* Update Guardian's factor provider
*
* @method updateFactorProvider
* @memberOf module:management.GuardianManager.prototype
*
* management.updateGuardianFactorProvider({ name: 'sms', provider: 'twilio' }, {
* messaging_service_sid: 'XXXXXXXXXXXXXX',
* auth_token: 'XXXXXXXXXXXXXX',
* sid: 'XXXXXXXXXXXXXX'
* }, function(err, provider) {
* console.log(provider);
* });
*
* @param {Object} params Factor provider parameters.
* @param {Object} data Updated Factor provider data.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(
ManagementClient,
'updateGuardianFactorProvider',
'guardian.factorsProviders.update'
);
/**
* Get Guardian enrollment and verification factor templates
*
* @method getGuardianFactorTemplates
* @memberOf module:management.GuardianManager.prototype
*
* management.getGuardianFactorTemplates({ name: 'sms' }, function (err, templates) {
* console.log(templates);
* });
*
* @param {Object} params Factor parameters.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(
ManagementClient,
'getGuardianFactorTemplates',
'guardian.factorsTemplates.get'
);
/**
* Update Guardian enrollment and verification factor templates
*
* @method updateGuardianFactorTemplates
* @memberOf module:management.GuardianManager.prototype
*
* management.updateGuardianFactorTemplates({ name: 'sms' }, {
* enrollment_message: "{{code}} is your verification code for {{tenant.friendly_name}}. Please enter this code to verify your enrollment.",
* verification_message: "{{code}} is your verification code for {{tenant.friendly_name}}"
* }, function(err, templates) {
* console.log(templates);
* });
*
* @param {Object} params Factor parameters.
* @param {Object} data Updated factor templates data.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(
ManagementClient,
'updateGuardianFactorTemplates',
'guardian.factorsTemplates.update'
);
/**
* Update Guardian Factor
*
* @method updateGuardianFactor
* @memberOf module.GuardianManager.prototype
*
* management.updateGuardianFactor({ name: 'sms' }, {
* enabled: true
* }, function(err, factor) {
* console.log(factor);
* });
*
* @param {Object} params Factor parameters.
* @param {Object} data Updated factor data.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(ManagementClient, 'updateGuardianFactor', 'guardian.factors.update');
>>>>>>>
/**
* Create an Auth0 Custom Domain.
*
* @method create
* @memberOf module:management.CustomDomainsManager.prototype
*
* @example
* management.createCustomDomain(data, function (err) {
* if (err) {
* // Handle error.
* }
*
* // CustomDomain created.
* });
*
* @param {Object} data The custom domain data object.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(ManagementClient, 'createCustomDomain', 'customDomains.create');
/**
* Get all Auth0 CustomDomains.
*
* @method getAll
* @memberOf module:management.CustomDomainsManager.prototype
*
* @example
* management.getCustomDomains(function (err, customDomains) {
* console.log(customDomains.length);
* });
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(ManagementClient, 'getCustomDomains', 'customDomains.getAll');
/**
* Get a Custom Domain.
*
* @method get
* @memberOf module:management.CustomDomainsManager.prototype
*
* @example
* management.getCustomDomain({ id: CUSTOM_DOMAIN_ID }, function (err, customDomain) {
* if (err) {
* // Handle error.
* }
*
* console.log(customDomain);
* });
*
* @param {Object} params Custom Domain parameters.
* @param {String} params.id Custom Domain ID.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(ManagementClient, 'getCustomDomain', 'customDomains.get');
/**
* Verify a Custom Domain.
*
* @method verify
* @memberOf module:management.CustomDomainsManager.prototype
*
* @example
* management.verifyCustomDomain({ id: CUSTOM_DOMAIN_ID }, function (err, customDomain) {
* if (err) {
* // Handle error.
* }
*
* console.log(customDomain);
* });
*
* @param {Object} params Custom Domain parameters.
* @param {String} params.id Custom Domain ID.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(ManagementClient, 'verifyCustomDomain', 'customDomains.verify');
/**
* Delete a Custom Domain.
*
* @method delete
* @memberOf module:management.CustomDomainsManager.prototype
*
* @example
* management.deleteCustomDomain({ id: CUSTOM_DOMAIN_ID }, function (err) {
* if (err) {
* // Handle error.
* }
*
* // CustomDomain deleted.
* });
*
* @param {Object} params Custom Domain parameters.
* @param {String} params.id Custom Domain ID.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(ManagementClient, 'deleteCustomDomain', 'customDomains.delete');
/**
* Create a Guardian enrollment ticket.
*
* @method createGuardianEnrollmentTicket
* @memberOf module:management.GuardianManager.prototype
*
* @example
* management.createGuardianEnrollmentTicket(function (err, ticket) {
* console.log(ticket);
* });
*
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(
ManagementClient,
'createGuardianEnrollmentTicket',
'guardian.tickets.create'
);
/**
* Get a list of Guardian factors and statuses.
*
* @method getGuardianFactors
* @memberOf module:management.GuardianManager.prototype
*
* management.getGuardianFactors(function (err, factors) {
* console.log(factors.length);
* });
*
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(ManagementClient, 'getGuardianFactors', 'guardian.factors.getAll');
/**
* Get Guardian factor provider configuration
*
* @method getGuardianFactorProvider
* @memberOf module:management.GuardianManager.prototype
*
* management.getFactorProvider({ name: 'sms', provider: 'twilio'}, function (err, provider) {
* console.log(provider);
* });
*
* @param {Object} params Factor provider parameters.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(
ManagementClient,
'getGuardianFactorProvider',
'guardian.factorsProviders.get'
);
/**
* Update Guardian's factor provider
*
* @method updateFactorProvider
* @memberOf module:management.GuardianManager.prototype
*
* management.updateGuardianFactorProvider({ name: 'sms', provider: 'twilio' }, {
* messaging_service_sid: 'XXXXXXXXXXXXXX',
* auth_token: 'XXXXXXXXXXXXXX',
* sid: 'XXXXXXXXXXXXXX'
* }, function(err, provider) {
* console.log(provider);
* });
*
* @param {Object} params Factor provider parameters.
* @param {Object} data Updated Factor provider data.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(
ManagementClient,
'updateGuardianFactorProvider',
'guardian.factorsProviders.update'
);
/**
* Get Guardian enrollment and verification factor templates
*
* @method getGuardianFactorTemplates
* @memberOf module:management.GuardianManager.prototype
*
* management.getGuardianFactorTemplates({ name: 'sms' }, function (err, templates) {
* console.log(templates);
* });
*
* @param {Object} params Factor parameters.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(
ManagementClient,
'getGuardianFactorTemplates',
'guardian.factorsTemplates.get'
);
/**
* Update Guardian enrollment and verification factor templates
*
* @method updateGuardianFactorTemplates
* @memberOf module:management.GuardianManager.prototype
*
* management.updateGuardianFactorTemplates({ name: 'sms' }, {
* enrollment_message: "{{code}} is your verification code for {{tenant.friendly_name}}. Please enter this code to verify your enrollment.",
* verification_message: "{{code}} is your verification code for {{tenant.friendly_name}}"
* }, function(err, templates) {
* console.log(templates);
* });
*
* @param {Object} params Factor parameters.
* @param {Object} data Updated factor templates data.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(
ManagementClient,
'updateGuardianFactorTemplates',
'guardian.factorsTemplates.update'
);
/**
* Update Guardian Factor
*
* @method updateGuardianFactor
* @memberOf module.GuardianManager.prototype
*
* management.updateGuardianFactor({ name: 'sms' }, {
* enabled: true
* }, function(err, factor) {
* console.log(factor);
* });
*
* @param {Object} params Factor parameters.
* @param {Object} data Updated factor data.
* @param {Function} [cb] Callback function.
*
* @return {Promise|undefined}
*/
utils.wrapPropertyMethod(ManagementClient, 'updateGuardianFactor', 'guardian.factors.update'); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.