conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
const progressionMeta = {
529303302: { label: "Cryptarch", color: "#C7990C", scale: ".8", order: 0 },
3233510749: { label: "Vanguard", color: "#161E28", scale: ".5", order: 1 },
1357277120: { label: "Crucible", color: "#a7342d", scale: ".8", order: 2 },
2778795080: { label: "Dead Orbit", color: "#cccccc", scale: ".5", order: 3 },
1424722124: { label: "Future War Cult", color: "#262247", scale: ".5", order: 4 },
3871980777: { label: "New Monarchy", color: "#862529", scale: ".5", order: 5 },
2161005788: { label: "Iron Banner", color: "#4d310a", scale: ".5", order: 6 },
174528503: { label: "Crota's Bane", color: "#9e9381", scale: ".5", order: 7 },
807090922: { label: "Queen's Wrath", color: "#2F1023", scale: ".5", order: 8 },
3641985238: { label: "House of Judgment", color: "#5AAC77", scale: ".5", order: 9 },
2335631936: { label: "Gunsmith", color: "#717272", scale: ".8", order: 10 },
2763619072: { label: "SRL", color: "#e92b38", scale: ".5", order: 11 }
};
=======
// A promise used to dedup parallel calls to reloadStores
var reloadPromise;
>>>>>>>
const progressionMeta = {
529303302: { label: "Cryptarch", color: "#C7990C", scale: ".8", order: 0 },
3233510749: { label: "Vanguard", color: "#161E28", scale: ".5", order: 1 },
1357277120: { label: "Crucible", color: "#a7342d", scale: ".8", order: 2 },
2778795080: { label: "Dead Orbit", color: "#cccccc", scale: ".5", order: 3 },
1424722124: { label: "Future War Cult", color: "#262247", scale: ".5", order: 4 },
3871980777: { label: "New Monarchy", color: "#862529", scale: ".5", order: 5 },
2161005788: { label: "Iron Banner", color: "#4d310a", scale: ".5", order: 6 },
174528503: { label: "Crota's Bane", color: "#9e9381", scale: ".5", order: 7 },
807090922: { label: "Queen's Wrath", color: "#2F1023", scale: ".5", order: 8 },
3641985238: { label: "House of Judgment", color: "#5AAC77", scale: ".5", order: 9 },
2335631936: { label: "Gunsmith", color: "#717272", scale: ".8", order: 10 },
2763619072: { label: "SRL", color: "#e92b38", scale: ".5", order: 11 }
};
// A promise used to dedup parallel calls to reloadStores
var reloadPromise; |
<<<<<<<
'$featureFlags.colorA11y': JSON.stringify(env !== 'release'),
// Whether to log page views for router events
'$featureFlags.googleAnalyticsForRouter': JSON.stringify(env !== 'release')
=======
'$featureFlags.colorA11y': JSON.stringify(env !== 'release'),
// Enable activities tab
'$featureFlags.activities': JSON.stringify(env !== 'release')
>>>>>>>
'$featureFlags.colorA11y': JSON.stringify(env !== 'release'),
// Whether to log page views for router events
'$featureFlags.googleAnalyticsForRouter': JSON.stringify(env !== 'release'),
// Enable activities tab
'$featureFlags.activities': JSON.stringify(env !== 'release') |
<<<<<<<
qualityEnabled: $featureFlags.qualityEnabled,
reviewsEnabled: $featureFlags.reviewsEnabled,
=======
qualityEnabled: $featureFlags.qualityEnabled,
tagsEnabled: $featureFlags.tagsEnabled
>>>>>>>
qualityEnabled: $featureFlags.qualityEnabled,
reviewsEnabled: $featureFlags.reviewsEnabled,
tagsEnabled: $featureFlags.tagsEnabled |
<<<<<<<
StoreBucketCtrl.$inject = [
'$scope',
'loadingTracker',
'dimStoreService',
'dimItemService',
'$q',
'$timeout',
'toaster',
'dimSettingsService',
'ngDialog',
'$rootScope',
'dimActionQueue',
'dimFeatureFlags',
'dimInfoService'];
function StoreBucketCtrl($scope,
loadingTracker,
dimStoreService,
dimItemService,
$q,
$timeout,
toaster,
dimSettingsService,
ngDialog,
$rootScope,
dimActionQueue,
dimFeatureFlags,
dimInfoService) {
=======
StoreBucketCtrl.$inject = ['$scope', 'loadingTracker', 'dimStoreService', 'dimItemService', '$q', '$timeout', 'toaster', 'dimSettingsService', 'ngDialog', '$rootScope', 'dimActionQueue', 'dimInfoService', '$translate'];
function StoreBucketCtrl($scope, loadingTracker, dimStoreService, dimItemService, $q, $timeout, toaster, dimSettingsService, ngDialog, $rootScope, dimActionQueue, dimInfoService, $translate) {
>>>>>>>
StoreBucketCtrl.$inject = [
'$scope',
'loadingTracker',
'dimStoreService',
'dimItemService',
'$q',
'$timeout',
'toaster',
'dimSettingsService',
'ngDialog',
'$rootScope',
'dimActionQueue',
'dimFeatureFlags',
'dimInfoService',
'$translate'];
function StoreBucketCtrl($scope,
loadingTracker,
dimStoreService,
dimItemService,
$q,
$timeout,
toaster,
dimSettingsService,
ngDialog,
$rootScope,
dimActionQueue,
dimFeatureFlags,
dimInfoService,
$translate) { |
<<<<<<<
new CompositeView('network_panel', ui_strings.M_VIEW_LABEL_NETWORK, layouts.network_rough_layout);
new CompositeView('console_new', ui_strings.M_VIEW_LABEL_COMPOSITE_ERROR_CONSOLE, layouts.console_rough_layout);
new CompositeView('js_new', ui_strings.M_VIEW_LABEL_COMPOSITE_SCRIPTS, layouts.js_rough_layout);
new CompositeView('dom_new', ui_strings.M_VIEW_LABEL_COMPOSITE_DOM, layouts.dom_rough_layout);
new CompositeView('export_new', ui_strings.M_VIEW_LABEL_COMPOSITE_EXPORTS, layouts.export_rough_layout);
new CompositeView('js_panel', ui_strings.M_VIEW_LABEL_COMPOSITE_SCRIPTS, layouts.js_rough_layout_panel);
new CompositeView('dom_panel', ui_strings.M_VIEW_LABEL_COMPOSITE_DOM, layouts.dom_rough_layout_panel);
new CompositeView('settings_new', ui_strings.S_BUTTON_LABEL_SETTINGS, layouts.settings_rough_layout);
new CompositeView('utils', ui_strings.M_VIEW_LABEL_UTILITIES, layouts.utils_rough_layout);
new CompositeView('storage', ui_strings.M_VIEW_LABEL_STORAGE, layouts.storage_rough_layout);
new CompositeView('resource_panel', ui_strings.M_VIEW_LABEL_RESOURCES, layouts.resource_rough_layout);
=======
var ui = UI.get_instance();
var modebar_dom = ui.register_modebar('dom', HorizontalNavigation);
var modebar_scripts = ui.register_modebar('scripts', HorizontalNavigation);
new CompositeView('network_panel',
ui_strings.M_VIEW_LABEL_NETWORK,
layouts.network_rough_layout);
new CompositeView('console_new',
ui_strings.M_VIEW_LABEL_COMPOSITE_ERROR_CONSOLE,
layouts.console_rough_layout);
new CompositeView('js_new',
ui_strings.M_VIEW_LABEL_COMPOSITE_SCRIPTS,
layouts.js_rough_layout,
'scripts');
new CompositeView('dom_new',
ui_strings.M_VIEW_LABEL_COMPOSITE_DOM,
layouts.dom_rough_layout,
'dom');
new CompositeView('export_new',
ui_strings.M_VIEW_LABEL_COMPOSITE_EXPORTS,
layouts.export_rough_layout);
new CompositeView('js_panel',
ui_strings.M_VIEW_LABEL_COMPOSITE_SCRIPTS,
layouts.js_rough_layout_panel,
'scripts');
new CompositeView('dom_panel',
ui_strings.M_VIEW_LABEL_COMPOSITE_DOM,
layouts.dom_rough_layout_panel,
'dom');
new CompositeView('utils',
ui_strings.M_VIEW_LABEL_UTILITIES,
layouts.utils_rough_layout);
new CompositeView('storage',
ui_strings.M_VIEW_LABEL_STORAGE,
layouts.storage_rough_layout);
>>>>>>>
var ui = UI.get_instance();
var modebar_dom = ui.register_modebar('dom', HorizontalNavigation);
var modebar_scripts = ui.register_modebar('scripts', HorizontalNavigation);
new CompositeView('network_panel',
ui_strings.M_VIEW_LABEL_NETWORK,
layouts.network_rough_layout);
new CompositeView('console_new',
ui_strings.M_VIEW_LABEL_COMPOSITE_ERROR_CONSOLE,
layouts.console_rough_layout);
new CompositeView('js_new',
ui_strings.M_VIEW_LABEL_COMPOSITE_SCRIPTS,
layouts.js_rough_layout,
'scripts');
new CompositeView('dom_new',
ui_strings.M_VIEW_LABEL_COMPOSITE_DOM,
layouts.dom_rough_layout,
'dom');
new CompositeView('export_new',
ui_strings.M_VIEW_LABEL_COMPOSITE_EXPORTS,
layouts.export_rough_layout);
new CompositeView('js_panel',
ui_strings.M_VIEW_LABEL_COMPOSITE_SCRIPTS,
layouts.js_rough_layout_panel,
'scripts');
new CompositeView('dom_panel',
ui_strings.M_VIEW_LABEL_COMPOSITE_DOM,
layouts.dom_rough_layout_panel,
'dom');
new CompositeView('utils',
ui_strings.M_VIEW_LABEL_UTILITIES,
layouts.utils_rough_layout);
new CompositeView('storage',
ui_strings.M_VIEW_LABEL_STORAGE,
layouts.storage_rough_layout);
new CompositeView('resource_panel',
ui_strings.M_VIEW_LABEL_RESOURCES,
layouts.resource_rough_layout);
<<<<<<<
children: [ { height: 1000, tabs: ['request_list', 'resource_manager',
'request_crafter', 'network_options']
}
]
=======
children: [ { height: 1000, tabbar: { id: "request", tabs: ['request_list'] } } ]
>>>>>>>
children: [ { height: 1000, tabs: ['request_list', 'resource_manager',
'request_crafter', 'network_options']
}
]
<<<<<<<
tabs: ['dom_new', 'js_new', 'network_panel', 'resource_panel', 'storage', 'console_new', 'utils', 'settings_new']
=======
tabs: ['dom_new', 'js_new', 'network_panel', 'storage', 'console_new', 'utils']
>>>>>>>
tabs: ['dom_new', 'js_new', 'network_panel', 'resource_panel', 'storage', 'console_new', 'utils']
<<<<<<<
tabs: ['dom_panel', 'js_panel', 'network_panel', 'resource_panel', 'storage', 'console_new', 'utils', 'settings_new']
=======
tabs: ['dom_panel', 'js_panel', 'network_panel', 'storage', 'console_new', 'utils']
>>>>>>>
tabs: ['dom_panel', 'js_panel', 'network_panel', 'resource_panel', 'storage', 'console_new', 'utils'] |
<<<<<<<
// Disable scaled option when ROI drops
vm.allowScaling = !dimSettingsService.disableQuality;
vm.scaleType = vm.allowScaling ? 'scaled' : 'base';
=======
vm.featureFlags = dimFeatureFlags;
>>>>>>>
vm.featureFlags = dimFeatureFlags;
<<<<<<<
=======
scaleType: vm.featureFlags.qualityEnabled ? 'scaled' : 'base',
>>>>>>>
scaleType: vm.featureFlags.qualityEnabled ? 'scaled' : 'base', |
<<<<<<<
const ForkTsCheckerNotifierWebpackPlugin = require('fork-ts-checker-notifier-webpack-plugin');
const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
=======
const svgToMiniDataURI = require('mini-svg-data-uri');
>>>>>>>
const ForkTsCheckerNotifierWebpackPlugin = require('fork-ts-checker-notifier-webpack-plugin');
const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const svgToMiniDataURI = require('mini-svg-data-uri'); |
<<<<<<<
vm.stats = [];
vm.targets = [];
=======
vm.target = null;
>>>>>>>
vm.stats = null;
vm.target = null;
<<<<<<<
setInfusibleItems: function(items) {
vm.infusable = items;
vm.setView();
},
setView: function() {
// let's remove the used gear and the one that are lower than the infused result
vm.view = _.chain(vm.infusable)
.select(function(item) {
return item.primStat.value > vm.infused;
})
.difference(vm.excluded, vm.targets)
.value();
},
toggleItem: function(e, item) {
e.stopPropagation();
function setManualPath() {
vm.selectedPath = vm.paths[0];
// Value of infused result
vm.infused = vm.calculate();
// The new stats of the item
vm.stats = _.map(vm.source.stats, function(stat) {
return {before: stat.base, after: (stat.base*vm.infused/vm.source.primStat.value).toFixed(0)};
});
// The difference from start to finish
vm.difference = vm.infused - vm.source.primStat.value;
vm.setView();
}
var index = _.indexOf(vm.targets, item);
if (e.shiftKey) {
// Hold shift to toggle excluding the item from calculations
var excludedIndex = _.indexOf(vm.excluded, item);
if (excludedIndex > -1) {
// Remove from exclusions
vm.excluded.splice(excludedIndex, 1);
} else {
// Add to exclusions, and remove from targets if it's there.
vm.excluded.push(item);
if (index > -1) {
vm.targets.splice(index, 1);
setManualPath();
}
}
vm.maximizeAttack();
} else {
// Add or remove the item from the infusion chain
if (index > -1) {
// Remove from targets
vm.targets.splice(index, 1);
} else {
// Check if it's clickable
if (!_.contains(vm.view, item) || _.contains(vm.excluded, item)) {
return;
}
// Add it to targets
var sortedIndex = _.sortedIndex(vm.targets, item, function(i) {
return i.primStat.value + ((item.talentGrid.totalXP / item.talentGrid.totalXPRequired) * 0.5);
});
vm.targets.splice(sortedIndex, 0, item);
}
setManualPath();
}
},
selectInfusionPath: function(reset) {
if (vm.selectedPath === vm.paths[0]) {
if (reset) {
vm.targets = [];
vm.infused = 0;
vm.stats = [];
vm.difference = 0;
}
} else {
vm.infused = vm.selectedPath.light;
vm.stats = _.map(vm.source.stats, function(stat) {
return {before: stat.base, after: (stat.base*vm.infused/vm.source.primStat.value).toFixed(0)};
});
vm.difference = vm.infused - vm.source.primStat.value;
vm.targets = vm.selectedPath.path.map(function(item) {
return vm.infusable.find(function(otherItem) {
return otherItem.id === item.id;
});
});
}
vm.setView();
},
inView: function(item) {
if (_.contains(vm.view, item)) {
return '';
} else if (_.contains(vm.targets, item)) {
return 'infuse-selected';
} else if (_.contains(vm.excluded, item)) {
return 'infuse-excluded';
} else {
return 'infuse-hidden';
=======
selectItem: function(item, e) {
if (e) {
e.stopPropagation();
>>>>>>>
selectItem: function(item, e) {
if (e) {
e.stopPropagation(); |
<<<<<<<
var betaVersion = pkg.version.toString() + "." + (Math.floor(Date.now() / 60000) - 24298773);
var firefoxBrowserSupport = {
"gecko": {
"id": "[email protected]",
"strict_min_version": "46.*"
}
};
=======
var betaVersion = pkg.version.toString() + "." + process.env.TRAVIS_BUILD_NUMBER;
>>>>>>>
var betaVersion = pkg.version.toString() + "." + process.env.TRAVIS_BUILD_NUMBER;
var firefoxBrowserSupport = {
"gecko": {
"id": "[email protected]",
"strict_min_version": "46.*"
}
};
<<<<<<<
beta_icons_chrome: {
cwd: 'beta-icons/',
=======
beta_icons: {
cwd: 'icons/beta/',
>>>>>>>
beta_icons_chrome: {
cwd: 'icons/beta/',
<<<<<<<
beta_version_chrome: {
src: ['dist/chrome*.{json,html,js}'],
overwrite: true,
replacements: [{
from: pkg.version.toString(),
to: betaVersion
}]
},
beta_version_firefox: {
src: ['dist/firefox/*.{json,html,js}'],
=======
beta_version: {
src: ['build/extension/**/*.{json,html,js}'],
>>>>>>>
beta_version_chrome: {
src: ['dist/chrome*.{json,html,js}'],
overwrite: true,
replacements: [{
from: pkg.version.toString(),
to: betaVersion
}, {
from: '$DIM_VERSION',
to: betaVersion
}]
},
beta_version_firefox: {
src: ['dist/firefox/*.{json,html,js}'], |
<<<<<<<
import farmingModule from './farming/farming.module';
=======
import settingsModule from './settings/settings.module';
>>>>>>>
import farmingModule from './farming/farming.module';
import settingsModule from './settings/settings.module';
<<<<<<<
farmingModule,
=======
settingsModule,
>>>>>>>
farmingModule,
settingsModule, |
<<<<<<<
function openBungieNetTab(tabs) {
if (_.size(tabs) === 0) {
chrome.tabs.create({
url: 'http://bungie.net',
active: false
});
}
}
=======
>>>>>>>
function openBungieNetTab(tabs) {
if (_.size(tabs) === 0) {
chrome.tabs.create({
url: 'http://bungie.net',
active: false
});
}
}
<<<<<<<
function processBnetPlatformsRequest(response) {
if (response.data.ErrorCode === 99) {
openBungieNetTab();
return $q.reject(new Error('Please log into Bungie.net before using this extension.'));
} else if (response.data.ErrorCode === 5) {
return $q.reject(new Error('Bungie.net servers are down for maintenance.'));
} else if (response.data.ErrorCode > 1) {
return $q.reject(new Error(response.data.Message));
}
return (response);
}
=======
>>>>>>>
function processBnetPlatformsRequest(response) {
if (response.data.ErrorCode === 99) {
openBungieNetTab();
return $q.reject(new Error('Please log into Bungie.net before using this extension.'));
} else if (response.data.ErrorCode === 5) {
return $q.reject(new Error('Bungie.net servers are down for maintenance.'));
} else if (response.data.ErrorCode > 1) {
return $q.reject(new Error(response.data.Message));
}
return (response);
} |
<<<<<<<
Loadouts: "Loadouts",
=======
Any: "Qualsiasi",
Loadouts: "Loadout",
>>>>>>>
Any: "Qualsiasi",
Loadouts: "Loadouts", |
<<<<<<<
name: 'developer',
parent: 'content',
url: '/developer',
template: developer
}, {
=======
>>>>>>> |
<<<<<<<
{ from: `./icons/${env}/icon128.png` },
{ from: `./icons/${env}/icon16.png` },
{ from: `./icons/${env}/icon19.png` },
{ from: `./icons/${env}/icon38.png` },
{ from: `./icons/${env}/icon48.png` },
{ from: `./icons/${env}/favicon-16x16.png` },
{ from: `./icons/${env}/favicon-32x32.png` },
{ from: `./icons/${env}/favicon-96x96.png` },
=======
{ from: './src/manifest-webapp.json' },
{ from: `./icons/${env}/` },
// TODO: Quick hack to get elemental damage icon for StoreItem
{ from: './src/images/arc.png', to: 'images' },
{ from: './src/images/solar.png', to: 'images' },
{ from: './src/images/void.png', to: 'images' },
>>>>>>>
{ from: './src/manifest-webapp.json' },
{ from: `./icons/${env}/` }, |
<<<<<<<
/************************************************************************************************************************************/
function getBnetCookies() {
return $q(function(resolve, reject) {
chrome.cookies.getAll({
domain: 'www.bungie.net'
}, getAllCallback);
function getAllCallback(cookies) {
if (_.size(cookies) > 0) {
resolve(cookies);
} else {
reject(new Error($translate.instant('BungieService.NoCookies')));
}
}
});
}
/************************************************************************************************************************************/
function getBungleToken() {
tokenPromise = tokenPromise || getBnetCookies()
.then(function(cookies) {
const cookie = _.find(cookies, function(cookie) {
return cookie.name === 'bungled';
});
if (cookie) {
return cookie.value;
} else {
openBungieNetTab();
throw new Error($translate.instant('BungieService.NotLoggedIn'));
}
})
.catch(function() {
tokenPromise = null;
});
return tokenPromise;
}
=======
>>>>>>>
/************************************************************************************************************************************/
function getBnetCookies() {
return $q(function(resolve, reject) {
chrome.cookies.getAll({
domain: 'www.bungie.net'
}, getAllCallback);
function getAllCallback(cookies) {
if (_.size(cookies) > 0) {
resolve(cookies);
} else {
reject(new Error($translate.instant('BungieService.NoCookies')));
}
}
});
}
/************************************************************************************************************************************/
function getBungleToken() {
tokenPromise = tokenPromise || getBnetCookies()
.then(function(cookies) {
const cookie = _.find(cookies, function(cookie) {
return cookie.name === 'bungled';
});
if (cookie) {
return cookie.value;
} else {
openBungieNetTab();
throw new Error($translate.instant('BungieService.NotLoggedIn'));
}
})
.catch(function() {
tokenPromise = null;
});
return tokenPromise;
}
<<<<<<<
const error = new Error($translate.instant('BungieService.ItemUniquenessExplanation', {
name: item.name,
type: item.type.toLowerCase(),
character: store.name
}));
error.code = e.code;
return $q.reject(error);
=======
toaster.pop('warning',
$translate.instant('BungieService.ItemUniqueness'),
$translate.instant('BungieService.ItemUniquenessExplanation', {
name: item.name,
type: item.type.toLowerCase(),
character: store.name
}));
return $q.reject(new Error('move-canceled'));
>>>>>>>
toaster.pop('warning',
$translate.instant('BungieService.ItemUniqueness'),
$translate.instant('BungieService.ItemUniquenessExplanation', {
name: item.name,
type: item.type.toLowerCase(),
character: store.name
}));
return $q.reject(new Error('move-canceled')); |
<<<<<<<
// Ignore these contexts to avoid duplicate messages in the console
// when we get the results from both the ecmascript service and th
// console logger service.
const CONTEXT_BLACKLIST = [ "console.log", "console.debug",
"console.info", "console.warn", "console.error", "console.assert",
"console.dir", "console.dirxml", "console.group",
"console.groupCollapsed", "console.groupEnded", "console.count"
];
=======
const DF_INTERN_TYPE = cls.ReplService.DF_INTERN_TYPE;
const FRIENDLY_PRINTED = cls.ReplService.FRIENDLY_PRINTED;
const INLINE_MODEL = cls.ReplService.INLINE_MODEL;
const INLINE_MODEL_TMPL = cls.ReplService.INLINE_MODEL_TMPL;
const FRIENDLY_PRINTED = cls.ReplService.FRIENDLY_PRINTED;
const RE_DOM_OBJECT = cls.InlineExpander.RE_DOM_OBJECT;
const IS_EXPAND_INLINE_KEY = "expand-objects-inline";
const CLASS_NAME = 4;
>>>>>>>
// Ignore these contexts to avoid duplicate messages in the console
// when we get the results from both the ecmascript service and th
// console logger service.
const CONTEXT_BLACKLIST = [ "console.log", "console.debug",
"console.info", "console.warn", "console.error", "console.assert",
"console.dir", "console.dirxml", "console.group",
"console.groupCollapsed", "console.groupEnded", "console.count"
];
const DF_INTERN_TYPE = cls.ReplService.DF_INTERN_TYPE;
const FRIENDLY_PRINTED = cls.ReplService.FRIENDLY_PRINTED;
const INLINE_MODEL = cls.ReplService.INLINE_MODEL;
const INLINE_MODEL_TMPL = cls.ReplService.INLINE_MODEL_TMPL;
const FRIENDLY_PRINTED = cls.ReplService.FRIENDLY_PRINTED;
const RE_DOM_OBJECT = cls.InlineExpander.RE_DOM_OBJECT;
const IS_EXPAND_INLINE_KEY = "expand-objects-inline";
const CLASS_NAME = 4;
<<<<<<<
// the callback works as error and success callback
// the _list_unpacker replace the VALUE_LIST
// with an unpacked list in the scope message
var callback = this._handle_log.bind(this, msg, rt_id, true);
=======
>>>>>>>
<<<<<<<
this._before_handling_object = function(msg, rt_id, thread_id, frame_id,
is_unpacked, is_friendly_printed)
{
const OBJECT_VALUE = 3;
var do_unpack = !is_unpacked && settings.command_line.get("unpack-list-alikes");
var do_friendly_print = !do_unpack &&
!is_friendly_printed &&
settings.command_line.get("do-friendly-print");
if (do_unpack)
{
var error_cb = this._before_handling_object.bind(this, msg, rt_id,
thread_id, frame_id,
true);
// convert Eval to OnConsoleLog message
// 1 - console.log
var log_msg = [rt_id, 1, [[null, msg[OBJECT_VALUE]]]];
var success_cb = this._handle_log.bind(this, log_msg, rt_id, true);
this._list_unpacker.unpack_list_alikes(log_msg, rt_id, error_cb, success_cb);
}
else if (do_friendly_print)
{
var callback = this._before_handling_object.bind(this, msg, rt_id,
thread_id, frame_id,
true, true);
this._friendly_printer._friendly_print([msg[OBJECT_VALUE]],
rt_id, thread_id, frame_id,
callback);
}
else
{
this._handle_object(msg, rt_id);
}
}
=======
>>>>>>> |
<<<<<<<
}
if (!that.justCounting[turtle]) {
//debugger;
console.log("notes to play " + notes + ' ' + noteBeatValue);
=======
>>>>>>>
<<<<<<<
if (!that.suppressOutput[turtle] && duration > 0) {
if (_THIS_IS_MUSIC_BLOCKS_) {
/*parameters related to effects*/
var params_effects = {
"doVibrato" : false,
"doDistortion" : false,
"doTremolo" : false,
"doPhaser" : false,
"doChorus" : false,
"vibratoIntensity" : vibratoIntensity,
"vibratoFrequency" : vibratoValue,
"distortionAmount" : distortionAmount,
"tremoloFrequency" : tremoloFrequency,
"tremoloDepth" : tremoloDepth,
"rate" : rate,
"octaves" : octaves,
"baseFrequency" : baseFrequency,
"chorusRate" : chorusRate,
"delayTime" : delayTime,
"chorusDepth" : chorusDepth
};
if (that.oscList[turtle].length > 0) {
if (notes.length > 1) {
that.errorMsg(last(that.oscList[turtle]) + ': ' + _('synth cannot play chords.'), blk);
}
// that.synth.triggerWithEffects(notes, beatValue, last(that.oscList[turtle]), [vibratoIntensity, vibratoValue], [distortionAmount], [tremoloFrequency, tremoloDepth], [rate, octaves, baseFrequency], [chorusRate, delayTime, chorusDepth]);
that.synth.trigger(notes, beatValue, last(that.oscList[turtle]), params_effects, null);
} else if (that.drumStyle[turtle].length > 0) {
//that.synth.triggerWithEffects(notes, beatValue, last(that.drumStyle[turtle]), [], [], [], [], []);
that.synth.trigger(notes, beatValue, last(that.drumStyle[turtle]), null, null);
} else if (that.turtles.turtleList[turtle].drum) {
// that.synth.triggerWithEffects(notes, beatValue, 'drum', [], [], [], [], []);
that.synth.trigger(notes, beatValue, 'drum', null, null);
=======
if (!that.suppressOutput[turtle] && duration > 0) {
if (_THIS_IS_MUSIC_BLOCKS_ && !forceSilence) {
// Parameters related to effects
var params_effects = {
'doVibrato' : false,
'doDistortion' : false,
'doTremolo' : false,
'doPhaser' : false,
'doChorus' : false,
'vibratoIntensity' : vibratoIntensity,
'vibratoFrequency' : vibratoValue,
'distortionAmount' : distortionAmount,
'tremoloFrequency' : tremoloFrequency,
'tremoloDepth' : tremoloDepth,
'rate' : rate,
'octaves' : octaves,
'baseFrequency' : baseFrequency,
'chorusRate' : chorusRate,
'delayTime' : delayTime,
'chorusDepth' : chorusDepth
};
if (that.oscList[turtle].length > 0) {
if (notes.length > 1) {
that.errorMsg(last(that.oscList[turtle]) + ': ' + _('synth cannot play chords.'), blk);
}
>>>>>>>
if (!that.suppressOutput[turtle] && duration > 0) {
if (_THIS_IS_MUSIC_BLOCKS_ && !forceSilence) {
// Parameters related to effects
var params_effects = {
'doVibrato' : false,
'doDistortion' : false,
'doTremolo' : false,
'doPhaser' : false,
'doChorus' : false,
'vibratoIntensity' : vibratoIntensity,
'vibratoFrequency' : vibratoValue,
'distortionAmount' : distortionAmount,
'tremoloFrequency' : tremoloFrequency,
'tremoloDepth' : tremoloDepth,
'rate' : rate,
'octaves' : octaves,
'baseFrequency' : baseFrequency,
'chorusRate' : chorusRate,
'delayTime' : delayTime,
'chorusDepth' : chorusDepth
};
if (that.oscList[turtle].length > 0) {
if (notes.length > 1) {
that.errorMsg(last(that.oscList[turtle]) + ': ' + _('synth cannot play chords.'), blk);
}
<<<<<<<
for (var d = 0; d < notes.length; d++) {
if (notes[d] in that.pitchDrumTable[turtle]) {
that.synth.trigger(notes[d], beatValue, that.pitchDrumTable[turtle][notes[d]], null, null);
}
else if (turtle in that.instrument_names && last(that.instrument_names[turtle])) {
var params_filters = null;
if (last(that.instrument_names[turtle]) in instruments_filters){
params_filters = instruments_filters[last(that.instrument_names[turtle])];
console.log('filter params');
console.log('type: ' + typeof(params_filters));
// for(var ky in params_filters){
// console.log('ky: ' + ky + ' val: ' + params_filters[ky]);
// }
}
that.synth.trigger(notes[d], beatValue, last(that.instrument_names[turtle]), params_effects, params_filters);
}
else if (turtle in that.voices && last(that.voices[turtle])) {
that.synth.trigger(notes[d], beatValue, last(that.voices[turtle]), params_effects, null);
}
else {
that.synth.trigger(notes[d], beatValue, 'default', params_effects, null);
}
=======
} else {
// Look for any notes in the chord
// that might be in the
// pitchDrumTable.
for (var d = 0; d < notes.length; d++) {
if (notes[d] in that.pitchDrumTable[turtle]) {
that.synth.trigger(notes[d], beatValue, that.pitchDrumTable[turtle][notes[d]], null);
}
else if (turtle in that.instrument_names && last(that.instrument_names[turtle])) {
that.synth.trigger(notes[d], beatValue, last(that.instrument_names[turtle]), params_effects);
}
else if (turtle in that.voices && last(that.voices[turtle])) {
that.synth.trigger(notes[d], beatValue, last(that.voices[turtle]), params_effects);
}
else {
that.synth.trigger(notes[d], beatValue, 'default', params_effects);
>>>>>>>
} else {
// Look for any notes in the chord
// that might be in the
// pitchDrumTable.
for (var d = 0; d < notes.length; d++) {
if (notes[d] in that.pitchDrumTable[turtle]) {
that.synth.trigger(notes[d], beatValue, that.pitchDrumTable[turtle][notes[d]], null);
}
else if (turtle in that.instrument_names && last(that.instrument_names[turtle])) {
that.synth.trigger(notes[d], beatValue, last(that.instrument_names[turtle]), params_effects);
}
else if (turtle in that.voices && last(that.voices[turtle])) {
that.synth.trigger(notes[d], beatValue, last(that.voices[turtle]), params_effects);
}
else {
that.synth.trigger(notes[d], beatValue, 'default', params_effects);
<<<<<<<
// that.synth.triggerWithEffects(['C2'], beatValue, last(that.drumStyle[turtle]), [], [], [], [], []);
that.synth.trigger(['C2'], beatValue, last(that.drumStyle[turtle]), null, null);
} else {
// that.synth.triggerWithEffects(['C2'], beatValue, drums[i], [], [], [], [], []);
that.synth.trigger(['C2'], beatValue, drums[i], null, null);
}
=======
// that.synth.triggerWithEffects(['C2'], beatValue, last(that.drumStyle[turtle]), [], [], [], [], []);
that.synth.trigger(['C2'], beatValue, last(that.drumStyle[turtle]), null);
} else {
// that.synth.triggerWithEffects(['C2'], beatValue, drums[i], [], [], [], [], []);
that.synth.trigger(['C2'], beatValue, drums[i], null);
>>>>>>>
// that.synth.triggerWithEffects(['C2'], beatValue, last(that.drumStyle[turtle]), [], [], [], [], []);
that.synth.trigger(['C2'], beatValue, last(that.drumStyle[turtle]), null);
} else {
// that.synth.triggerWithEffects(['C2'], beatValue, drums[i], [], [], [], [], []);
that.synth.trigger(['C2'], beatValue, drums[i], null); |
<<<<<<<
toolbar.closeAuxToolbar(_showHideAuxMenu);
=======
deltaY(-55 - LEADING); // DO WE NEED THIS?
toolbar.closeAuxToolbar();
>>>>>>>
toolbar.closeAuxToolbar(_showHideAuxMenu);
<<<<<<<
=======
// Return to home position after loading new blocks.
blocksContainer.x = 0;
blocksContainer.y = 0;
>>>>>>>
// Return to home position after loading new blocks.
blocksContainer.x = 0;
blocksContainer.y = 0;
<<<<<<<
toolbar.closeAuxToolbar(_showHideAuxMenu);
=======
if (auxToolbar.style.display === 'block') {
toolbar.closeAuxToolbar();
deltaY(-55 - LEADING);
}
>>>>>>>
toolbar.closeAuxToolbar(_showHideAuxMenu); |
<<<<<<<
const BUILTINMACROS= ['note', 'rhythmicdot', 'tie', 'dividebeatfactor', 'multiplybeatfactor', 'duplicatenotes', 'skipnotes', 'setbpm', 'drift', 'osctime', 'sharp', 'flat', 'settransposition', 'invert', 'staccato', 'slur', 'swing', 'crescendo', 'setnotevolume2', 'articulation', 'matrix', 'pitchdrummatrix', 'rhythmruler', 'turtlepitch', 'turtlenote', 'setturtlename', 'wholeNote', 'halfNote', 'quarterNote', 'eighthNote', 'sixteenthNote', 'thirtysecondNote', 'sixtyfourthNote', 'tone', 'rest2', 'tuplet2', 'fill', 'hollowline', 'note2', 'note3', 'note4', 'octave', 'fifths', 'tritone', 'fourths', 'thirds', 'steppitch', 'sine', 'triangle', 'square', 'sawtooth', 'setkey2', 'snare', 'hihat', 'kick', 'tom', 'pluck', 'triangle1', 'slap', 'fingercymbals', 'cup', 'cowbell', 'splash', 'ridebell', 'floortom', 'crash', 'chine', 'dog', 'cat', 'clap', 'bubbles', 'cricket', 'duck', 'bottle', 'clang', 'darbuka', 'setdrum', 'playdrum'];
=======
const BUILTINMACROS= ['note', 'rhythmicdot', 'tie', 'dividebeatfactor', 'multiplybeatfactor', 'duplicatenotes', 'skipnotes', 'setbpm', 'drift', 'osctime', 'sharp', 'flat', 'settransposition', 'invert', 'invert2', 'staccato', 'slur', 'swing', 'crescendo', 'setnotevolume2', 'articulation', 'matrix', 'pitchdrummatrix', 'turtlepitch', 'turtlenote', 'setturtlename', 'wholeNote', 'halfNote', 'quarterNote', 'eighthNote', 'sixteenthNote', 'thirtysecondNote', 'sixtyfourthNote', 'tone', 'rest2', 'tuplet2', 'fill', 'hollowline', 'note2', 'note3', 'note4', 'octave', 'fifths', 'tritone', 'fourths', 'thirds', 'steppitch', 'sine', 'triangle', 'square', 'sawtooth', 'setkey2', 'snare', 'hihat', 'kick', 'tom', 'pluck', 'triangle1', 'slap', 'fingercymbals', 'cup', 'cowbell', 'splash', 'ridebell', 'floortom', 'crash', 'chine', 'dog', 'cat', 'clap', 'bubbles', 'cricket', 'duck', 'bottle', 'clang', 'darbuka', 'setdrum', 'playdrum', 'backward', 'status'];
>>>>>>>
const BUILTINMACROS= ['note', 'rhythmicdot', 'tie', 'dividebeatfactor', 'multiplybeatfactor', 'duplicatenotes', 'skipnotes', 'setbpm', 'drift', 'osctime', 'sharp', 'flat', 'settransposition', 'invert', 'invert2', 'staccato', 'slur', 'swing', 'crescendo', 'setnotevolume2', 'articulation', 'matrix', 'pitchdrummatrix', 'rhythmruler', 'turtlepitch', 'turtlenote', 'setturtlename', 'wholeNote', 'halfNote', 'quarterNote', 'eighthNote', 'sixteenthNote', 'thirtysecondNote', 'sixtyfourthNote', 'tone', 'rest2', 'tuplet2', 'fill', 'hollowline', 'note2', 'note3', 'note4', 'octave', 'fifths', 'tritone', 'fourths', 'thirds', 'steppitch', 'sine', 'triangle', 'square', 'sawtooth', 'setkey2', 'snare', 'hihat', 'kick', 'tom', 'pluck', 'triangle1', 'slap', 'fingercymbals', 'cup', 'cowbell', 'splash', 'ridebell', 'floortom', 'crash', 'chine', 'dog', 'cat', 'clap', 'bubbles', 'cricket', 'duck', 'bottle', 'clang', 'darbuka', 'setdrum', 'playdrum', 'backward', 'status']; |
<<<<<<<
this.beginnerBlock(true);
this.setHelpString([_('The Neighbor block rapidly switches between neighboring pitches.'), 'documentation', null, 'neighbor2help']);
=======
this.beginnerBlock(true);
>>>>>>>
this.beginnerBlock(true);
this.setHelpString([_('The Neighbor block rapidly switches between neighboring pitches.'), 'documentation', null, 'neighbor2help']);
<<<<<<<
this.beginnerBlock(true);
this.setHelpString([_('The Slur block lengthens the sustain of notes while maintaining the specified rhythmic value of the notes.'), 'documentation', null, 'slurhelp']);
=======
this.beginnerBlock(true);
>>>>>>>
this.beginnerBlock(true);
this.setHelpString([_('The Slur block lengthens the sustain of notes while maintaining the specified rhythmic value of the notes.'), 'documentation', null, 'slurhelp']);
<<<<<<<
this.setHelpString([_('The Staccato block shortens the length of the actual note while maintaining the specified rhythmic value of the notes.'), 'documentation', null, 'staccatohelp']);
=======
this.beginnerBlock(true);
>>>>>>>
this.beginnerBlock(true);
this.setHelpString([_('The Staccato block shortens the length of the actual note while maintaining the specified rhythmic value of the notes.'), 'documentation', null, 'staccatohelp']); |
<<<<<<<
var logo = that; // For plugin backward compatibility
=======
// console.log('run from block now');
var logo = that; // For plugin backward compatibility
>>>>>>>
var logo = that; // For plugin backward compatibility
<<<<<<<
=======
clearTimeout(this.saveTimeout);
var that = this;
this.saveTimeout = setTimeout(function () {
// Save at the end to save an image
// console.log('in saveTimeout');
that.saveLocally();
}, DEFAULTDELAY * 1.5);
>>>>>>>
<<<<<<<
=======
var that = this;
>>>>>>> |
<<<<<<<
const BUILTINMACROS= ['note', 'rhythmicdot', 'tie', 'dividebeatfactor', 'multiplybeatfactor', 'duplicatenotes', 'skipnotes', 'setbpm', 'drift', 'osctime', 'sharp', 'flat', 'settransposition', 'invert', 'invert2', 'staccato', 'slur', 'swing', 'crescendo', 'setnotevolume2', 'articulation', 'matrix', 'pitchdrummatrix', 'rhythmruler', 'pitchstaircase', 'turtlepitch', 'turtlenote', 'setturtlename', 'wholeNote', 'halfNote', 'quarterNote', 'eighthNote', 'sixteenthNote', 'thirtysecondNote', 'sixtyfourthNote', 'tone', 'rest2', 'tuplet2', 'fill', 'hollowline', 'note2', 'note3', 'note4', 'octave', 'fifths', 'tritone', 'fourths', 'thirds', 'steppitch', 'sine', 'triangle', 'square', 'sawtooth', 'setkey2', 'snare', 'hihat', 'kick', 'tom', 'pluck', 'triangle1', 'slap', 'fingercymbals', 'cup', 'cowbell', 'splash', 'ridebell', 'floortom', 'crash', 'chine', 'dog', 'cat', 'clap', 'bubbles', 'cricket', 'duck', 'bottle', 'clang', 'darbuka', 'setdrum', 'playdrum', 'backward', 'status'];
=======
const BUILTINMACROS= ['note', 'rhythmicdot', 'tie', 'dividebeatfactor', 'multiplybeatfactor', 'duplicatenotes', 'skipnotes', 'setbpm', 'drift', 'osctime', 'sharp', 'flat', 'settransposition', 'invert', 'invert2', 'staccato', 'slur', 'swing', 'crescendo', 'setnotevolume2', 'articulation', 'matrix', 'pitchdrummatrix', 'rhythmruler', 'turtlepitch', 'turtlenote', 'setturtlename', 'wholeNote', 'halfNote', 'quarterNote', 'eighthNote', 'sixteenthNote', 'thirtysecondNote', 'sixtyfourthNote', 'tone', 'rest2', 'tuplet2', 'fill', 'hollowline', 'note2', 'note3', 'note4', 'octave', 'fifths', 'tritone', 'fourths', 'thirds', 'steppitch', 'sine', 'triangle', 'square', 'sawtooth', 'setkey2', 'snare', 'hihat', 'kick', 'tom', 'pluck', 'triangle1', 'slap', 'fingercymbals', 'cup', 'cowbell', 'splash', 'ridebell', 'floortom', 'crash', 'chine', 'dog', 'cat', 'clap', 'bubbles', 'cricket', 'duck', 'bottle', 'clang', 'darbuka', 'setdrum', 'playdrum', 'backward', 'status', 'modewidget'];
>>>>>>>
const BUILTINMACROS= ['note', 'rhythmicdot', 'tie', 'dividebeatfactor', 'multiplybeatfactor', 'duplicatenotes', 'skipnotes', 'setbpm', 'drift', 'osctime', 'sharp', 'flat', 'settransposition', 'invert', 'invert2', 'staccato', 'slur', 'swing', 'crescendo', 'setnotevolume2', 'articulation', 'matrix', 'pitchdrummatrix', 'rhythmruler', 'pitchstaircase', 'turtlepitch', 'turtlenote', 'setturtlename', 'wholeNote', 'halfNote', 'quarterNote', 'eighthNote', 'sixteenthNote', 'thirtysecondNote', 'sixtyfourthNote', 'tone', 'rest2', 'tuplet2', 'fill', 'hollowline', 'note2', 'note3', 'note4', 'octave', 'fifths', 'tritone', 'fourths', 'thirds', 'steppitch', 'sine', 'triangle', 'square', 'sawtooth', 'setkey2', 'snare', 'hihat', 'kick', 'tom', 'pluck', 'triangle1', 'slap', 'fingercymbals', 'cup', 'cowbell', 'splash', 'ridebell', 'floortom', 'crash', 'chine', 'dog', 'cat', 'clap', 'bubbles', 'cricket', 'duck', 'bottle', 'clang', 'darbuka', 'setdrum', 'playdrum', 'backward', 'status', 'modewidget']; |
<<<<<<<
ui_strings.S_TOGGLE_PAUSED_UPDATING_NETWORK_VIEW = "Pause updating network activity";
/* DESC: Context menu item for expanding a node subtree. */
ui_strings.M_CONTEXTMENU_EXPAND_SUBTREE = 'Expand subtree';
/* DESC: Context menu item for collapsing a node subtree. */
ui_strings.M_CONTEXTMENU_COLLAPSE_SUBTREE = 'Collapse subtree';
/* DESC: Context menu item for breakpoints to delete a condition. */
ui_strings.M_CONTEXTMENU_DELETE_CONDITION = 'Delete condition';
=======
ui_strings.S_TOGGLE_PAUSED_UPDATING_NETWORK_VIEW = "Pause updating network activity";
/* DESC: View with a screenshot to select a color. */
ui_strings.M_VIEW_LABEL_COLOR_PICKER = 'Color Picker';
/* DESC: View of the palette of the stored colors. */
ui_strings.M_VIEW_LABEL_COLOR_PALETTE = 'Color Palette';
/* DESC: Context menu item to add a color in the color palette. */
ui_strings.M_CONTEXTMENU_ADD_COLOR = 'Add color';
/* DESC: Context menu item to edit a color in the color palette. */
ui_strings.M_CONTEXTMENU_EDIT_COLOR = 'Edit color';
/* DESC: Context menu item to delete a color in the color palette. */
ui_strings.M_CONTEXTMENU_DELETE_COLOR = 'Delete color';
/* DESC: Setting label to select the zoom level of the color picker */
ui_strings.S_LABEL_COLOR_PICKER_ZOOM = "Zoom";
/* DESC: Setting label to select the sample size of the color picker */
ui_strings.S_LABEL_COLOR_PICKER_SAMPLE_SIZE = "Sample Size";
/* DESC: Button label to update the screenshot */
ui_strings.S_BUTTON_UPDATE_SCREESHOT = "Update screenshot";
/* DESC: Button label to store the color */
ui_strings.S_BUTTON_STORE_COLOR = 'Store color';
/* DESC: Context menu item for removing a breakpoint. */
ui_strings.M_CONTEXTMENU_REMOVE_BREAKPOINT = 'Disable breakpoint';
/* DESC: Context menu item for deleting a breakpoint. */
ui_strings.M_CONTEXTMENU_DELETE_BREAKPOINT = 'Delete breakpoint';
>>>>>>>
ui_strings.S_TOGGLE_PAUSED_UPDATING_NETWORK_VIEW = "Pause updating network activity";
/* DESC: Context menu item for expanding a node subtree. */
ui_strings.M_CONTEXTMENU_EXPAND_SUBTREE = 'Expand subtree';
/* DESC: Context menu item for collapsing a node subtree. */
ui_strings.M_CONTEXTMENU_COLLAPSE_SUBTREE = 'Collapse subtree';
/* DESC: Context menu item for breakpoints to delete a condition. */
ui_strings.M_CONTEXTMENU_DELETE_CONDITION = 'Delete condition';
/* DESC: View with a screenshot to select a color. */
ui_strings.M_VIEW_LABEL_COLOR_PICKER = 'Color Picker';
/* DESC: View of the palette of the stored colors. */
ui_strings.M_VIEW_LABEL_COLOR_PALETTE = 'Color Palette';
/* DESC: Context menu item to add a color in the color palette. */
ui_strings.M_CONTEXTMENU_ADD_COLOR = 'Add color';
/* DESC: Context menu item to edit a color in the color palette. */
ui_strings.M_CONTEXTMENU_EDIT_COLOR = 'Edit color';
/* DESC: Context menu item to delete a color in the color palette. */
ui_strings.M_CONTEXTMENU_DELETE_COLOR = 'Delete color';
/* DESC: Setting label to select the zoom level of the color picker */
ui_strings.S_LABEL_COLOR_PICKER_ZOOM = "Zoom";
/* DESC: Setting label to select the sample size of the color picker */
ui_strings.S_LABEL_COLOR_PICKER_SAMPLE_SIZE = "Sample Size";
/* DESC: Button label to update the screenshot */
ui_strings.S_BUTTON_UPDATE_SCREESHOT = "Update screenshot";
/* DESC: Button label to store the color */
ui_strings.S_BUTTON_STORE_COLOR = 'Store color';
/* DESC: Context menu item for removing a breakpoint. */
ui_strings.M_CONTEXTMENU_REMOVE_BREAKPOINT = 'Disable breakpoint';
/* DESC: Context menu item for deleting a breakpoint. */
ui_strings.M_CONTEXTMENU_DELETE_BREAKPOINT = 'Delete breakpoint'; |
<<<<<<<
=======
var modenameBlock = new ProtoBlock('modename');
modenameBlock.palette = palettes.dict['pitch'];
blocks.protoBlockDict['modename'] = modenameBlock;
modenameBlock.valueBlock();
modenameBlock.dockTypes[0] = 'textout';
var accidentalnameBlock = new ProtoBlock('accidentalname');
accidentalnameBlock.palette = palettes.dict['pitch'];
blocks.protoBlockDict['accidentalname'] = accidentalnameBlock;
accidentalnameBlock.valueBlock();
accidentalnameBlock.dockTypes[0] = 'textout';
accidentalnameBlock.extraWidth = 50;
>>>>>>>
var accidentalnameBlock = new ProtoBlock('accidentalname');
accidentalnameBlock.palette = palettes.dict['pitch'];
blocks.protoBlockDict['accidentalname'] = accidentalnameBlock;
accidentalnameBlock.valueBlock();
accidentalnameBlock.dockTypes[0] = 'textout';
accidentalnameBlock.extraWidth = 50; |
<<<<<<<
const INLINECOLLAPSIBLES = ['newnote'];
const COLLAPSIBLES = ['drum', 'start', 'action', 'matrix', 'pitchdrummatrix', 'rhythmruler2', 'timbre', 'status', 'pitchstaircase', 'tempo', 'pitchslider', 'modewidget', 'newnote', 'musickeyboard'];
=======
const COLLAPSABLES = ['drum', 'start', 'action', 'matrix', 'temperament1', 'pitchdrummatrix', 'rhythmruler', 'timbre', 'status', 'pitchstaircase', 'tempo', 'pitchslider', 'modewidget'];
>>>>>>>
const INLINECOLLAPSIBLES = ['newnote'];
const COLLAPSIBLES = ['drum', 'start', 'action', 'matrix', 'pitchdrummatrix', 'rhythmruler2', 'timbre', 'status', 'pitchstaircase', 'tempo', 'pitchslider', 'modewidget', 'newnote', 'musickeyboard', 'temperament1'];
<<<<<<<
const SPECIALINPUTS = ['text', 'number', 'solfege', 'eastindiansolfege', 'notename', 'voicename', 'modename', 'drumname', 'filtertype', 'oscillatortype', 'boolean', 'intervalname', 'invertmode', 'accidentalname', 'temperamentname', 'noisename'];
const WIDENAMES = ['intervalname', 'accidentalname', 'drumname', 'voicename', 'modename', 'temperamentname', 'modename', 'noisename'];
=======
const SPECIALINPUTS = ['text', 'number', 'solfege', 'customNote', 'eastindiansolfege', 'notename', 'voicename', 'modename', 'drumname', 'filtertype', 'oscillatortype', 'boolean', 'intervalname', 'invertmode', 'accidentalname', 'temperamentname'];
const WIDENAMES = ['intervalname', 'accidentalname', 'drumname', 'voicename', 'modename', 'temperamentname', 'modename'];
>>>>>>>
const SPECIALINPUTS = ['text', 'number', 'solfege', 'eastindiansolfege', 'notename', 'voicename', 'modename', 'drumname', 'filtertype', 'oscillatortype', 'boolean', 'intervalname', 'invertmode', 'accidentalname', 'temperamentname', 'noisename', 'customNote'];
const WIDENAMES = ['intervalname', 'accidentalname', 'drumname', 'voicename', 'modename', 'temperamentname', 'modename', 'noisename'];
<<<<<<<
const PIEMENUS = ['solfege', 'eastindiansolfege', 'notename', 'voicename', 'drumname', 'accidentalname', 'invertmode', 'boolean', 'filtertype', 'oscillatortype', 'intervalname', 'modename', 'temperamentname', 'noisename'];
=======
const PIEMENUS = ['solfege', 'customNote', 'eastindiansolfege', 'notename', 'voicename', 'drumname', 'accidentalname', 'invertmode', 'boolean', 'filtertype', 'oscillatortype', 'intervalname', 'modename', 'temperamentname'];
>>>>>>>
const PIEMENUS = ['solfege', 'eastindiansolfege', 'notename', 'voicename', 'drumname', 'accidentalname', 'invertmode', 'boolean', 'filtertype', 'oscillatortype', 'intervalname', 'modename', 'temperamentname', 'noisename', 'customNote'];
<<<<<<<
case 'rhythmruler2':
that.collapseText = new createjs.Text(_('rhythm ruler'), fontSize + 'px Sans', '#000000');
break;
case 'newnote':
that.collapseText = new createjs.Text(_('note value'), fontSize + 'px Sans', '#000000');
break;
default:
that.collapseText = new createjs.Text('foobar', fontSize + 'px Sans', '#000000');
=======
case 'temperament1':
that.collapseText = new createjs.Text(_('temperament'), fontSize + 'px Sans', '#000000');
break;
>>>>>>>
case 'rhythmruler2':
that.collapseText = new createjs.Text(_('rhythm ruler'), fontSize + 'px Sans', '#000000');
break;
case 'newnote':
that.collapseText = new createjs.Text(_('note value'), fontSize + 'px Sans', '#000000');
break;
case 'temperament1':
that.collapseText = new createjs.Text(_('temperament'), fontSize + 'px Sans', '#000000');
break;
default:
that.collapseText = new createjs.Text('foobar', fontSize + 'px Sans', '#000000');
<<<<<<<
this._piemenuPitches = function (noteLabels, noteValues, accidentals, note, accidental) {
=======
this._noteValueNumber = function (c) {
// Is this a number block being used as a note value
// denominator argument?
var dblk = this.connections[0];
// Are we connected to a divide block?
if (this.name === 'number' && dblk !== null && this.blocks.blockList[dblk].name === 'divide') {
// Are we the denominator (c == 2) or numerator (c == 1)?
if (this.blocks.blockList[dblk].connections[c] === this.blocks.blockList.indexOf(this)) {
// Is the divide block connected to a note value block?
cblk = this.blocks.blockList[dblk].connections[0];
if (cblk !== null) {
// Is it the first or second arg?
switch (this.blocks.blockList[cblk].name) {
case 'newnote':
case 'pickup':
case 'tuplet4':
case 'newstaccato':
case 'newslur':
case 'elapsednotes2':
if (this.blocks.blockList[cblk].connections[1] === dblk) {
return true;
} else {
return false;
}
break;
case 'meter':
case 'setbpm2':
case 'setmasterbpm2':
case 'stuplet':
case 'rhythm2':
case 'newswing2':
case 'vibrato':
case 'neighbor':
case 'neighbor2':
if (this.blocks.blockList[cblk].connections[2] === dblk) {
return true;
} else {
return false;
}
break;
default:
return false;
break;
}
}
}
}
return false;
};
this._noteValueValue = function () {
// Return the number block value being used as a note value
// denominator argument.
var dblk = this.connections[0];
// We are connected to a divide block.
// Is the divide block connected to a note value block?
cblk = this.blocks.blockList[dblk].connections[0];
if (cblk !== null) {
// Is it the first or second arg?
switch (this.blocks.blockList[cblk].name) {
case 'newnote':
case 'pickup':
case 'tuplet4':
case 'newstaccato':
case 'newslur':
case 'elapsednotes2':
if (this.blocks.blockList[cblk].connections[1] === dblk) {
cblk = this.blocks.blockList[dblk].connections[2];
return this.blocks.blockList[cblk].value;
} else {
return 1;
}
break;
case 'meter':
case 'setbpm2':
case 'setmasterbpm2':
case 'stuplet':
case 'rhythm2':
case 'newswing2':
case 'vibrato':
case 'neighbor':
case 'neighbor2':
if (this.blocks.blockList[cblk].connections[2] === dblk) {
if (this.blocks.blockList[cblk].connections[1] === dblk) {
cblk = this.blocks.blockList[dblk].connections[2];
return this.blocks.blockList[cblk].value;
} else {
return 1;
}
} else {
return 1;
}
break;
default:
return 1;
break;
}
}
return 1;
};
this._octaveNumber = function () {
// Is this a number block being used as an octave argument?
return (this.name === 'number' && this.connections[0] !== null && ['pitch', 'setpitchnumberoffset', 'invert1', 'tofrequency', 'scaledegree'].indexOf(this.blocks.blockList[this.connections[0]].name) !== -1 && this.blocks.blockList[this.connections[0]].connections[2] === this.blocks.blockList.indexOf(this));
};
this._piemenuPitches = function (noteLabels, noteValues, accidentals, note, accidental, custom) {
>>>>>>>
this._noteValueNumber = function (c) {
// Is this a number block being used as a note value
// denominator argument?
var dblk = this.connections[0];
// Are we connected to a divide block?
if (this.name === 'number' && dblk !== null && this.blocks.blockList[dblk].name === 'divide') {
// Are we the denominator (c == 2) or numerator (c == 1)?
if (this.blocks.blockList[dblk].connections[c] === this.blocks.blockList.indexOf(this)) {
// Is the divide block connected to a note value block?
cblk = this.blocks.blockList[dblk].connections[0];
if (cblk !== null) {
// Is it the first or second arg?
switch (this.blocks.blockList[cblk].name) {
case 'newnote':
case 'pickup':
case 'tuplet4':
case 'newstaccato':
case 'newslur':
case 'elapsednotes2':
if (this.blocks.blockList[cblk].connections[1] === dblk) {
return true;
} else {
return false;
}
break;
case 'meter':
case 'setbpm2':
case 'setmasterbpm2':
case 'stuplet':
case 'rhythm2':
case 'newswing2':
case 'vibrato':
case 'neighbor':
case 'neighbor2':
if (this.blocks.blockList[cblk].connections[2] === dblk) {
return true;
} else {
return false;
}
break;
default:
return false;
break;
}
}
}
}
return false;
};
this._noteValueValue = function () {
// Return the number block value being used as a note value
// denominator argument.
var dblk = this.connections[0];
// We are connected to a divide block.
// Is the divide block connected to a note value block?
cblk = this.blocks.blockList[dblk].connections[0];
if (cblk !== null) {
// Is it the first or second arg?
switch (this.blocks.blockList[cblk].name) {
case 'newnote':
case 'pickup':
case 'tuplet4':
case 'newstaccato':
case 'newslur':
case 'elapsednotes2':
if (this.blocks.blockList[cblk].connections[1] === dblk) {
cblk = this.blocks.blockList[dblk].connections[2];
return this.blocks.blockList[cblk].value;
} else {
return 1;
}
break;
case 'meter':
case 'setbpm2':
case 'setmasterbpm2':
case 'stuplet':
case 'rhythm2':
case 'newswing2':
case 'vibrato':
case 'neighbor':
case 'neighbor2':
if (this.blocks.blockList[cblk].connections[2] === dblk) {
if (this.blocks.blockList[cblk].connections[1] === dblk) {
cblk = this.blocks.blockList[dblk].connections[2];
return this.blocks.blockList[cblk].value;
} else {
return 1;
}
} else {
return 1;
}
break;
default:
return 1;
break;
}
}
return 1;
};
this._octaveNumber = function () {
// Is this a number block being used as an octave argument?
return (this.name === 'number' && this.connections[0] !== null && ['pitch', 'setpitchnumberoffset', 'invert1', 'tofrequency', 'scaledegree'].indexOf(this.blocks.blockList[this.connections[0]].name) !== -1 && this.blocks.blockList[this.connections[0]].connections[2] === this.blocks.blockList.indexOf(this));
};
this._piemenuPitches = function (noteLabels, noteValues, accidentals, note, accidental, custom) { |
<<<<<<<
this.vibratoIntensity[turtle] = [];
this.vibratoTime[turtle] = [];
=======
this.dispatchFactor[turtle] = 1;
>>>>>>>
this.vibratoIntensity[turtle] = [];
this.vibratoTime[turtle] = [];
this.dispatchFactor[turtle] = 1;
<<<<<<<
if (doVibrato)
vibratoValue = beatValue * (duration / vibratoTime);
logo._dispatchTurtleSignals(turtle, beatValue, blk);
=======
logo._dispatchTurtleSignals(turtle, beatValue, blk, noteBeatValue);
>>>>>>>
if (doVibrato)
vibratoValue = beatValue * (duration / vibratoTime);
logo._dispatchTurtleSignals(turtle, beatValue, blk, noteBeatValue); |
<<<<<<<
_hideTreble();
_hideGrand();
_hideSoprano();
_hideAlto();
_hideTenor();
_hideBass();
=======
if (_THIS_IS_MUSIC_BLOCKS_) {
_hideTreble();
_hideGrand();
_hideSoprano();
_hideAlto();
_hideTenor();
_hideBass();
}
>>>>>>>
if (_THIS_IS_MUSIC_BLOCKS_) {
_hideTreble();
_hideGrand();
_hideSoprano();
_hideAlto();
_hideTenor();
_hideBass();
}
<<<<<<<
this._showTreble();
//.TRANS: show bass clef
turtles.setGridLabel(_("show bass"));
=======
if (_THIS_IS_MUSIC_BLOCKS_) {
_showTreble();
//.TRANS: show bass clef
turtles.setGridLabel(_("show bass"));
} else {
//.TRANS: show Cartesian coordinate overlay grid
turtles.setGridLabel(_("show Cartesian"));
}
>>>>>>>
if (_THIS_IS_MUSIC_BLOCKS_) {
this._showTreble();
//.TRANS: show bass clef
turtles.setGridLabel(_("show bass"));
} else {
//.TRANS: show Cartesian coordinate overlay grid
turtles.setGridLabel(_("show Cartesian"));
}
<<<<<<<
this._showGrand();
//.TRANS: show mezza-soprano staff
turtles.setGridLabel(_("show mezza-soprano"));
=======
_showGrand();
//.TRANS: show mezzo-soprano staff
turtles.setGridLabel(_("show mezzo-soprano"));
>>>>>>>
this._showGrand();
//.TRANS: show mezzo-soprano staff
turtles.setGridLabel(_("show mezzo-soprano"));
<<<<<<<
this._showCartesian();
=======
_showCartesian();
//.TRANS: show Polar coordinate overlay grid
>>>>>>>
this._showCartesian();
//.TRANS: show Polar coordinate overlay grid
<<<<<<<
this._showPolar();
//.TRANS: show Polar coordinate overlay grid
turtles.setGridLabel(_("hide Cartersian"));
=======
_showPolar();
//.TRANS: hide Cartesian coordinate overlay grid
turtles.setGridLabel(_("hide Cartesian"));
>>>>>>>
this._showPolar();
//.TRANS: hide Cartesian coordinate overlay grid
turtles.setGridLabel(_("hide Cartesian")); |
<<<<<<<
const COLLAPSABLES = ['drum', 'start', 'action', 'matrix', 'pitchdrummatrix', 'rhythmruler'];
=======
const COLLAPSABLES = ['drum', 'start', 'action', 'matrix', 'pitchdrummatrix', 'status'];
>>>>>>>
const COLLAPSABLES = ['drum', 'start', 'action', 'matrix', 'pitchdrummatrix', 'rhythmruler', 'status'];
<<<<<<<
=======
this.blocks.newNameddoBlock(newValue, this.blocks.actionHasReturn(c), this.blocks.actionHasArgs(c));
var blockPalette = blocks.palettes.dict['action'];
for (var blk = 0; blk < blockPalette.protoList.length; blk++) {
var block = blockPalette.protoList[blk];
if(oldValue === _('action')) {
if (block.name === 'nameddo' && block.defaults.length === 0) {
block.hidden = true;
}
}
else {
if (block.name === 'nameddo' && block.defaults[0] === oldValue) {
blockPalette.remove(block,oldValue);
}
}
}
>>>>>>> |
<<<<<<<
(function($){
var Checker,
__bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
Checker = (function() {
function Checker($el, field) {
this.run = __bind(this.run, this);
var sel;
sel = field[0], this.metric = field[1];
this.getVal = this.makeGetVal($el, sel);
}
Checker.prototype.run = function() {
return this.verify(this.metric, this.getVal());
};
Checker.prototype.makeGetVal = function($el, sel) {
var inputs, name, type;
type = $el.attr('type');
if (type === 'checkbox') {
return function() {
return $el.is(':checked');
};
} else if (type === 'radio') {
name = $el.attr('name');
return function() {
return $('[name="' + name + '"]').filter(':checked').val();
};
} else {
if (this.metric === 'one-of') {
inputs = $(sel);
return function() {
return inputs.map(function() {
return $.trim(this.value);
}).get().join('');
};
} else {
return function() {
return $.trim($el.val());
};
}
}
};
Checker.prototype.verify = function(m, v) {
var arg, sec, type, _ref;
if (!!(m && m.constructor && m.call && m.apply)) {
return m(v);
}
if (m instanceof RegExp) {
return m.test(v);
}
_ref = $.map(m.split(':'), $.trim), type = _ref[0], arg = _ref[1], sec = _ref[2];
if (type === 'same-as' && $(arg).length !== 1) {
throw new Error('same-as selector must target one and only one element');
}
if (!v && type !== 'presence' && type !== 'one-of') {
return true;
}
switch (type) {
case 'presence':
return !!v;
case 'one-of':
return !!v;
case 'exact':
return v === arg;
case 'not':
return v !== arg;
case 'same-as':
return v === $(arg).val();
case 'min-num':
return +v >= +arg;
case 'max-num':
return +v <= +arg;
case 'between-num':
return +v >= +arg && +v <= +sec;
case 'min-length':
return v.length >= +arg;
case 'max-length':
return v.length <= +arg;
case 'exact-length':
return v.length === +arg;
case 'between':
return v.length >= +arg && v.length <= +sec;
case 'integer':
return /^\s*\d+\s*$/.test(v);
case 'float':
return /^[-+]?[0-9]+(\.[0-9]+)?$/.test(v);
case 'email':
return this.email(v);
default:
throw new Error('I don\'t know ' + type + ', sorry.');
}
};
Checker.prototype.email = function(v) {
var RFC822;
RFC822 = /^([^\x00-\x20\x22\x28\x29\x2c\x2e\x3a-\x3c\x3e\x40\x5b-\x5d\x7f-\xff]+|\x22([^\x0d\x22\x5c\x80-\xff]|\x5c[\x00-\x7f])*\x22)(\x2e([^\x00-\x20\x22\x28\x29\x2c\x2e\x3a-\x3c\x3e\x40\x5b-\x5d\x7f-\xff]+|\x22([^\x0d\x22\x5c\x80-\xff]|\x5c[\x00-\x7f])*\x22))*\x40([^\x00-\x20\x22\x28\x29\x2c\x2e\x3a-\x3c\x3e\x40\x5b-\x5d\x7f-\xff]+|\x5b([^\x0d\x5b-\x5d\x80-\xff]|\x5c[\x00-\x7f])*\x5d)(\x2e([^\x00-\x20\x22\x28\x29\x2c\x2e\x3a-\x3c\x3e\x40\x5b-\x5d\x7f-\xff]+|\x5b([^\x0d\x5b-\x5d\x80-\xff]|\x5c[\x00-\x7f])*\x5d))*$/;
return RFC822.test(v);
};
return Checker;
=======
>>>>>>>
<<<<<<<
Listener = (function() {
function Listener(el, get, field) {
this.get = get;
this.field = field;
this.change_status = __bind(this.change_status, this);
this.runCheck = __bind(this.runCheck, this);
this.delayedCheck = __bind(this.delayedCheck, this);
this.events = __bind(this.events, this);
this.$el = $(el);
this.delayId = "";
this.status = null;
this.checker = new Checker(this.$el, this.field);
this.msg = new Msg(this.$el, this.get, this.field);
this.events();
}
=======
function addMetric (metric) {
var specialTriggers = [],
// The function that will check the value of the element.
checkFunction = nod.getCheckFunction(metric),
// A list of elements that this metric will target.
elements = nod.getElements(metric.selector),
>>>>>>>
function addMetric (metric) {
var specialTriggers = [],
// The function that will check the value of the element.
checkFunction = nod.getCheckFunction(metric),
// A list of elements that this metric will target.
elements = nod.getElements(metric.selector),
<<<<<<<
Msg = (function() {
function Msg($el, get, field) {
this.$el = $el;
this.get = get;
this.createShowMsg = __bind(this.createShowMsg, this);
this.toggle = __bind(this.toggle, this);
this.createMsg = __bind(this.createMsg, this);
this.$msg = this.createMsg(field[2]);
this.showMsg = this.createShowMsg();
}
=======
// Special cases. These `validates` affect each other, and their state
// needs to update each time either of the elements' values change.
if (metric.validate === 'one-of' || metric.validate === 'only-one-of' || metric.validate === 'some-radio') {
specialTriggers.push(metric.selector);
}
if (typeof metric.validate === 'string' && metric.validate.indexOf('same-as') > -1) {
specialTriggers.push(metric.validate.split(':')[1]);
}
>>>>>>>
// Special cases. These `validates` affect each other, and their state
// needs to update each time either of the elements' values change.
if (metric.validate === 'one-of' || metric.validate === 'only-one-of' || metric.validate === 'some-radio') {
specialTriggers.push(metric.selector);
}
if (typeof metric.validate === 'string' && metric.validate.indexOf('same-as') > -1) {
specialTriggers.push(metric.validate.split(':')[1]);
}
<<<<<<<
var Nod,
__bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
Nod = (function() {
function Nod(form, fields, options) {
this.form = form;
this.formIsErrorFree = __bind(this.formIsErrorFree, this);
this.submitForm = __bind(this.submitForm, this);
this.toggleSubmitBtnText = __bind(this.toggleSubmitBtnText, this);
this.toggleSubmitBtn = __bind(this.toggleSubmitBtn, this);
this.toggleGroupClass = __bind(this.toggleGroupClass, this);
this.toggle_status = __bind(this.toggle_status, this);
this.massCheck = __bind(this.massCheck, this);
this.listenForEnter = __bind(this.listenForEnter, this);
this.events = __bind(this.events, this);
this.createListeners = __bind(this.createListeners, this);
if (!fields) {
return;
}
this.form[0].__nod = this;
this.get = $.extend({
'delay': 700,
'disableSubmitBtn': true,
'helpSpanDisplay': 'help-inline',
'groupClass': 'has-error',
'submitBtnSelector': '[type=submit]',
'metricsSplitter': ':',
'errorPosClasses': ['.help-inline', '.add-on', 'button', '.input-append'],
'silentSubmit': false,
'broadcastError': false,
'errorClass': 'nod_msg',
'groupSelector': '.form-group'
}, options);
this.listeners = this.createListeners(fields);
this.submit = this.form.find(this.get.submitBtnSelector);
this.checkIfElementsExist(this.form, this.submit, this.get.disableSubmitBtn);
this.events();
}
Nod.prototype.createListeners = function(fields) {
var el, field, listeners, _i, _j, _len, _len1, _ref;
listeners = [];
for (_i = 0, _len = fields.length; _i < _len; _i++) {
field = fields[_i];
if (field.length !== 3) {
this["throw"]('field', field);
}
_ref = this.form.find(field[0]);
for (_j = 0, _len1 = _ref.length; _j < _len1; _j++) {
el = _ref[_j];
listeners.push(new Listener(el, this.get, field));
}
}
return listeners;
};
Nod.prototype.events = function() {
var l, _i, _len, _ref;
_ref = this.listeners;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
l = _ref[_i];
$(l).on('nod_toggle', this.toggle_status);
}
if (this.submit.length) {
return this.submit.on('click', this.massCheck);
} else {
return this.form.on('keyup', this.listenForEnter);
=======
/**
* makeMediator
*
* Minimal implementation of a mediator pattern, used for communication
* between checkers and checkHandlers (checkers fires events which
* handlers can subscribe to). Unique ID's are used to tell events apart.
*
* Subscribing to 'all' will give you all results from all checks.
*/
nod.makeMediator = function () {
var subscribers = [],
all = [];
return {
subscribe: function subscribe (id, fn) {
if (id === 'all') {
all.push(fn);
} else {
if (!subscribers[id]) {
subscribers[id] = [];
}
if (subscribers[id].indexOf(fn) === -1) {
subscribers[id].push(fn);
}
}
},
fire: function fire (options) {
var subscribedFunctions = subscribers[options.id].concat(all);
subscribedFunctions.forEach(function (subscribedFunction) {
subscribedFunction(options);
});
}
};
};
/**
* makeCollection
*
* A minimal implementation of a "collection", inspired by collections from
* BackboneJS. Used by listeners, checkers, and checkHandlers.
*/
nod.makeCollection = function (maker) {
var collection = [];
function findIndex (el) {
for (var i in collection) {
if (collection[i].element === el) {
return i;
}
}
return -1;
}
function findOrMake (el, mediator) {
var index = findIndex(el);
if (index !== -1) {
return collection[index];
}
// None found, let's make one then.
var item = maker.apply(null, arguments);
collection.push(item);
return item;
}
function removeItem (element) {
var index = findIndex(element),
item = collection[index];
if (index === -1) {
return;
}
// Call .dispose() if it exists
if (typeof item.dispose === 'function') {
item.dispose();
}
// Remove item
collection.splice(index, 1);
>>>>>>>
/**
* makeMediator
*
* Minimal implementation of a mediator pattern, used for communication
* between checkers and checkHandlers (checkers fires events which
* handlers can subscribe to). Unique ID's are used to tell events apart.
*
* Subscribing to 'all' will give you all results from all checks.
*/
nod.makeMediator = function () {
var subscribers = [],
all = [];
return {
subscribe: function subscribe (id, fn) {
if (id === 'all') {
all.push(fn);
} else {
if (!subscribers[id]) {
subscribers[id] = [];
}
if (subscribers[id].indexOf(fn) === -1) {
subscribers[id].push(fn);
}
}
},
fire: function fire (options) {
var subscribedFunctions = subscribers[options.id].concat(all);
subscribedFunctions.forEach(function (subscribedFunction) {
subscribedFunction(options);
});
}
};
};
/**
* makeCollection
*
* A minimal implementation of a "collection", inspired by collections from
* BackboneJS. Used by listeners, checkers, and checkHandlers.
*/
nod.makeCollection = function (maker) {
var collection = [];
function findIndex (el) {
for (var i in collection) {
if (collection[i].element === el) {
return i;
}
}
return -1;
}
function findOrMake (el, mediator) {
var index = findIndex(el);
if (index !== -1) {
return collection[index];
}
// None found, let's make one then.
var item = maker.apply(null, arguments);
collection.push(item);
return item;
}
function removeItem (element) {
var index = findIndex(element),
item = collection[index];
if (index === -1) {
return;
}
// Call .dispose() if it exists
if (typeof item.dispose === 'function') {
item.dispose();
}
// Remove item
collection.splice(index, 1);
<<<<<<<
$.fn.nod = function(fields, settings) {
if (!(fields || settings)) {
return this[0].__nod;
}
new Nod(this, fields, settings);
return this;
=======
return result;
}
throw 'Unknown type of elements in your `selector`: ' + selector;
};
nod.getCheckFunction = function (metric) {
if (typeof metric.validate === 'function') {
return metric.validate;
}
if (metric.validate instanceof RegExp) {
return nod.checkFunctions.regexp(metric.validate);
}
var args = metric.validate.split(':'),
fnName = args.shift();
if (fnName === 'one-of' || fnName === 'only-one-of' ||
fnName === 'same-as' || fnName === 'some-radio') {
args.push(metric.selector);
}
if (typeof nod.checkFunctions[fnName] === 'function') {
return nod.checkFunctions[fnName].apply(null, args);
} else {
throw 'Couldn\'t find your validator function "' + fnName + '" for "' + metric.selector + '"';
}
>>>>>>>
return result;
}
throw 'Unknown type of elements in your `selector`: ' + selector;
};
nod.getCheckFunction = function (metric) {
if (typeof metric.validate === 'function') {
return metric.validate;
}
if (metric.validate instanceof RegExp) {
return nod.checkFunctions.regexp(metric.validate);
}
var args = metric.validate.split(':'),
fnName = args.shift();
if (fnName === 'one-of' || fnName === 'only-one-of' ||
fnName === 'same-as' || fnName === 'some-radio') {
args.push(metric.selector);
}
if (typeof nod.checkFunctions[fnName] === 'function') {
return nod.checkFunctions[fnName].apply(null, args);
} else {
throw 'Couldn\'t find your validator function "' + fnName + '" for "' + metric.selector + '"';
} |
<<<<<<<
function canChrome(){
var location = this.win.wrappedJSObject.location,
protocol = location.protocol;
return protocol === "chrome:" ||
location.toString().indexOf("http://localhost:" + serverPort) == 0;
}
function canServer(){
return canChrome() ||
this.win.wrappedJSObject.location.protocol === "file:";
}
=======
function getTestURL(test) {
return "http://localhost:" + serverPort + "/test" + winID + "/" + test;
}
>>>>>>>
function canChrome(){
var location = this.win.wrappedJSObject.location,
protocol = location.protocol;
return protocol === "chrome:" ||
location.toString().indexOf("http://localhost:" + serverPort) == 0;
}
function canServer(){
return canChrome() ||
this.win.wrappedJSObject.location.protocol === "file:";
}
function getTestURL(test) {
return "http://localhost:" + serverPort + "/test" + winID + "/" + test;
} |
<<<<<<<
//= require sync
=======
//= require rails-timeago
>>>>>>>
//= require rails-timeago
//= require sync |
<<<<<<<
//= require sync
//= require_tree .
=======
//= require api
//= require bootstrap
//= require documentation
//= require scrapers
//= require scraperwiki_forks
//= require static
//= require users
>>>>>>>
//= require api
//= require bootstrap
//= require documentation
//= require scrapers
//= require scraperwiki_forks
//= require static
//= require users
//= require sync
//= require_tree . |
<<<<<<<
import TeamMember from './TeamMember/TeamMember';
import { I18n, Trans } from 'react-i18next';
=======
import styles from './About.scss';
>>>>>>>
import styles from './About.scss';
import { I18n, Trans } from 'react-i18next';
<<<<<<<
<I18n ns="translations">
{(t) => (
<div id="about">
=======
<div id="about" className={styles.about}>
>>>>>>>
<I18n ns="translations">
{(t) => (
<div id="about" className={styles.about}>
<<<<<<<
<h2>{t('about.title')}</h2>
=======
<h2 className="title">About Us</h2>
</div>
>>>>>>>
<h2>{t('about.title')}</h2>
<<<<<<<
<p>{t('about.2')}</p>
=======
<p>We are a group of multi-national, multi-disciplinary cryptocurrency professionals.</p>
>>>>>>>
<p>{t('about.2')}</p>
<<<<<<<
<p>
{t('about.4')}
</p>
=======
<p>We pride ourselves on total transparency:</p>
</div>
<div className="col-xs-12 col-sm-6">
<p>Everything is viewable through our API, starting from order lists and ending with our coin reserves. </p>
>>>>>>>
<p>
{t('about.4')}
</p>
<<<<<<<
<Trans i18nKey="about.6">
=======
>>>>>>>
<Trans i18nKey="about.6">
<<<<<<<
</Trans>
<div id="team-members" className="row">
<TeamMember
id="oleg"
name="Oleg Belousov"
country="IL"
fullCountryName={t('about.israel')}
description={t('about.oleg')}
social={{
linkedin: 'https://www.linkedin.com/in/oleg-belousov-b4112145/',
twitter: 'https://twitter.com/iooleg',
medium: 'https://medium.com/@IoOleg',
github: 'https://github.com/BeOleg',
}}
/>
<TeamMember
id="sarunas"
name="Šarūnas Ažna"
country="LT"
fullCountryName={t('about.lithuania')}
description={t('about.sarunas')}
social={{
linkedin: 'https://www.linkedin.com/in/%C5%A1ar%C5%ABnas-a%C5%BEna-102220b2/',
github: 'https://github.com/SarunasAzna',
}}
/>
<TeamMember
id="karolis"
name="Karolis Ramanauskas"
country="LT"
fullCountryName={t('about.lithuania')}
description={t('about.karolis')}
social={{
linkedin: 'https://www.linkedin.com/in/karolisram/',
github: 'https://github.com/superkarolis/',
medium: 'https://medium.com/@karolisram',
twitter: 'https://twitter.com/superkarolis',
rss: 'https://www.karolisram.com/',
}}
/>
<TeamMember
id="justas"
name="Justas Ažna"
country="LT"
fullCountryName={t('about.lithuania')}
description={t('about.justas')}
social={{
linkedin: 'https://www.linkedin.com/in/justasazna/',
github: 'https://github.com/reederz',
}}
/>
<TeamMember
id="paulina"
name="Paulina Bagińska"
country="PL"
fullCountryName={t('about.poland')}
description={t('about.paulina')}
social={{
linkedin: 'https://www.linkedin.com/in/baginskapaulina/',
twitter: 'https://twitter.com/PaulinaBGGC',
}}
/>
<TeamMember
id="cyrus"
name="Cyrus Ghazanfar"
country="US"
fullCountryName={t('about.US')}
description={
<p>
{t('about.cyrus')}
</p>
}
social={{
linkedin: 'https://www.linkedin.com/in/cyrus-ghazanfar-a0998a53/',
github: 'https://github.com/cyzanfar',
rss: 'https://cyzanfar.github.io/',
'stack-overflow': 'http://stackoverflow.com/users/3307520/cyzanfar',
}}
/>
<TeamMember
id="you"
name={t('about.you')}
description={
<Trans i18nKey="about.youdesc">
<div>
<p>
We are actively hiring for the N.exchange dream team. We are especially on the lookout for talented developers,
marketing personnel, a community manager and content writers.
</p>
<p>
Drop us a line at <a href="mailto:[email protected]">[email protected]</a>.
</p>
</div>
</Trans>
}
/>
</div>
=======
>>>>>>>
</Trans>
</div> |
<<<<<<<
componentDidMount() {
this.focusWalletAddress();
}
=======
componentDidMount() {
if(this.walletInputEl) {
this.walletInputEl.focus();
}
}
>>>>>>>
componentDidMount() {
if(this.walletInputEl) {
this.walletInputEl.focus();
}
}
<<<<<<<
if(this.walletInputEl) {
this.walletInputEl.focus();
}
}
focusDestinationTag() {
this.destinationTagInputEl.focus();
}
focusPaymentId() {
this.paymentIdInputEl.focus();
}
focusMemo() {
this.memoInputEl.focus();
=======
if(this.walletInputEl) {
this.walletInputEl.focus();
}
>>>>>>>
if(this.walletInputEl) {
this.walletInputEl.focus();
}
}
focusDestinationTag() {
this.destinationTagInputEl.focus();
}
focusPaymentId() {
this.paymentIdInputEl.focus();
}
focusMemo() {
this.memoInputEl.focus();
<<<<<<<
<WalletAddress onSubmit={this.placeOrder} inputRef={el => (this.walletInputEl = el)} button={this.button} />
{ this.props.selectedCoin.receive === 'XRP' ? <DestinationTag onSubmit={this.placeOrder} inputRef={el => (this.destinationTagInputEl = el)} /> : null }
{ this.props.selectedCoin.receive === 'XMR' ? <PaymentId onSubmit={this.placeOrder} inputRef={el => (this.paymentIdInputEl = el)} /> : null }
{ this.props.selectedCoin.receive === 'XLM' ? <Memo onSubmit={this.placeOrder} inputRef={el => (this.memoInputEl = el)} /> : null }
=======
<WalletAddress withdraw_coin="receive" onSubmit={this.placeOrder} inputRef={el => (this.walletInputEl = el)} button={this.button} />
>>>>>>>
<WalletAddress withdraw_coin="receive" onSubmit={this.placeOrder} inputRef={el => (this.walletInputEl = el)} button={this.button} />
{ this.props.selectedCoin.receive === 'XRP' ? <DestinationTag onSubmit={this.placeOrder} inputRef={el => (this.destinationTagInputEl = el)} /> : null }
{ this.props.selectedCoin.receive === 'XMR' ? <PaymentId onSubmit={this.placeOrder} inputRef={el => (this.paymentIdInputEl = el)} /> : null }
{ this.props.selectedCoin.receive === 'XLM' ? <Memo onSubmit={this.placeOrder} inputRef={el => (this.memoInputEl = el)} /> : null } |
<<<<<<<
import i18n from '../../../../../../../i18n';
import { I18n } from 'react-i18next';
import equals from 'deep-equal';
=======
import equals from 'shallow-equals';
>>>>>>>
import equals from 'shallow-equals';
import i18n from '../../../../../../../i18n';
import { I18n } from 'react-i18next'; |
<<<<<<<
<I18n ns="translations">
{(t, { i18n }) => (
<div id="header">
=======
<div className={`${styles.header} ${window.location.pathname === '/' ? styles.home : ''}`}>
>>>>>>>
<I18n ns="translations">
{(t, { i18n }) => (
<div className={`${styles.header} ${window.location.pathname === '/' ? styles.home : ''}`}> |
<<<<<<<
/* istanbul ignore next */
if (window.ga) {
window.ga('send', 'event', {
eventCategory: 'Amount input',
eventAction: 'Amount too high/low error',
});
}
=======
window.ga('send', 'event', {
eventCategory: 'Amount input',
eventAction: 'Amount too high/low error',
});
>>>>>>>
/* istanbul ignore next */
if (window.ga) {
window.ga('send', 'event', {
eventCategory: 'Amount input',
eventAction: 'Amount too high/low error',
});
}
<<<<<<<
/* istanbul ignore next */
if (window.ga) {
window.ga('send', 'event', {
eventCategory: 'Coin selector',
eventAction: 'Fetch default amounts',
});
}
=======
window.ga('send', 'event', {
eventCategory: 'Coin selector',
eventAction: 'Fetch default amounts',
});
>>>>>>>
/* istanbul ignore next */
if (window.ga) {
window.ga('send', 'event', {
eventCategory: 'Coin selector',
eventAction: 'Fetch default amounts',
});
}
<<<<<<<
return request
.then(async response => {
if (!response.data.length) return;
const params = urlParams();
const pairs = response.data.filter(pair => {
if (params && params.hasOwnProperty('test')) {
return !pair.disabled;
} else {
return !pair.disabled && !pair.test_mode;
}
});
const processedPairs = preparePairs(pairs);
dispatch({ type: types.PAIRS_FETCHED, payload: processedPairs });
let depositCoin, receiveCoin;
const coinsFromUrlParams = () => {
return new Promise((resolve, reject) => {
axios
.get(`${config.API_BASE_URL}/pair/${params['pair']}`)
.then(res => resolve(res.data))
.catch(/* istanbul ignore next */ err => reject(err));
=======
return dispatch => {
request
.then(async response => {
if (!response.data.length) return;
const params = urlParams();
const pairs = response.data.filter(pair => {
if (params && params.hasOwnProperty('test')) {
return !pair.disabled;
} else {
return !pair.disabled && !pair.test_mode;
}
>>>>>>>
return request
.then(async response => {
if (!response.data.length) return;
const params = urlParams();
const pairs = response.data.filter(pair => {
if (params && params.hasOwnProperty('test')) {
return !pair.disabled;
} else {
return !pair.disabled && !pair.test_mode;
}
});
const processedPairs = preparePairs(pairs);
dispatch({ type: types.PAIRS_FETCHED, payload: processedPairs });
let depositCoin, receiveCoin;
const coinsFromUrlParams = () => {
return new Promise((resolve, reject) => {
axios
.get(`${config.API_BASE_URL}/pair/${params['pair']}`)
.then(res => resolve(res.data))
.catch(/* istanbul ignore next */ err => reject(err));
<<<<<<<
.catch(() => {
let errorMessage = 'Something went wrong. Try again later.';
=======
.catch(error => {
let errorMessage = i18n.t('generalterms.formfailed');
>>>>>>>
.catch(() => {
let errorMessage = i18n.t('generalterms.formfailed'); |
<<<<<<<
<p>
<b>{t('order.fiat.status.reject')}:</b> {user_visible_comment}
</p>
=======
<h3 className={styles.subtitle} style={{ marginBottom: 5 }}>
<b>Reason for rejection:</b> {user_visible_comment}
</h3>
>>>>>>>
<h3 className={styles.subtitle} style={{ marginBottom: 5 }}>
<b>{t('order.fiat.status.reject')}:</b> {user_visible_comment}
</h3> |
<<<<<<<
import CoinProcessed from './CoinProcessed';
import ReferralBox from '../../containers/ReferralBox';
import RefundAddress from '../../containers/RefundAddress'
=======
import Loading from '../../components/Loading';
>>>>>>>
import ReferralBox from '../../containers/ReferralBox';
import RefundAddress from '../../containers/RefundAddress'
<<<<<<<
super();
this.state = {
timeRemaining: '...',
expired: false,
loading: true,
showBookmarkModal: false,
notFound: false,
order: null,
userStatus: null
};
this.getOrderDetails = this.getOrderDetails.bind(this);
this.getUser = this.getUser.bind(this);
this.tick = this.tick.bind(this);
this.trackRefShare = this.trackRefShare.bind(this);
=======
super(props);
this.state = { order: null };
>>>>>>>
super();
this.state = {
expired: false
};
<<<<<<<
this.getOrderDetails();
this.props.fetchCoinDetails();
this.getUser();
}
tick() {
if (!this.state.order) return;
let now = moment().subtract(this.state.order.payment_window, 'minutes');
let createdOn = moment(this.state.order.created_on);
let diff = createdOn.diff(now);
if (diff < 0) {
this.setState({expired: true});
clearInterval(this.interval);
return;
} else {
diff = moment.utc(diff).format('mm:ss')
}
this.setState({
timeRemaining: diff
});
}
getUser() {
axios.get(`${config.API_BASE_URL}/users/me/`)
.then(result => {
this.setState({userStatus: result.response.status});
})
.catch(error => {
this.setState({userStatus: error.response.status});
});
}
getOrderDetails() {
axios.get(`${config.API_BASE_URL}/orders/${this.props.match.params.orderRef}/?_=${Math.round((new Date()).getTime())}`)
.then(response => {
let order = response.data;
if (this.state.order && this.state.order.status_name[0][0] === 11 && order.status_name[0][0] === 12) {
ga('send', 'event', 'Order', 'order paid', order.unique_reference);
}
this.setState({
loading: false,
order: order
}, () => {
if (this.interval)
clearInterval(this.interval);
if (STATUS_CODES[this.state.order.status_name[0][0]] === 'INITIAL') {
this.interval = setInterval(this.tick, 1000);
this.tick();
}
$(function() {
$('[data-toggle="tooltip"], [rel="tooltip"]').tooltip();
});
this.timeout = setTimeout(() => {
this.getOrderDetails();
}, config.ORDER_DETAILS_FETCH_INTERVAL);
})
})
.catch((error) => {
console.log(error);
if (error.response && error.response.status == 429) {
this.timeout = setTimeout(() => {
this.getOrderDetails();
}, config.ORDER_DETAILS_FETCH_INTERVAL * 2);
} else {
this.setState({notFound: true});
}
});
}
trackRefShare() {
ga('send', 'event', 'Referral', 'share', this.props.match.params.orderRef);
=======
this.props.fetchOrder(this.props.match.params.orderRef);
>>>>>>>
this.getOrderDetails();
this.props.fetchCoinDetails();
this.getUser(); |
<<<<<<<
<I18n ns="translations">
{(t) => (
<div id="hero">
<ErrorAlert />
=======
<div className={styles.hero}>
<ErrorAlert />
>>>>>>>
<I18n ns="translations">
{(t) => (
<div className={styles.hero}>
<ErrorAlert />
<<<<<<<
<div className="brand">
<h1>{t('hero.1')}</h1>
<Trans i18nKey="hero.2">
=======
<div className={styles.brand}>
<h1>Exchange Cryptocurrencies</h1>
>>>>>>>
<div className={styles.brand}>
<h1>{t('hero.1')}</h1>
<Trans i18nKey="hero.2"> |
<<<<<<<
ret += "<rule rule-id='" + style_dec[RULE_ID] + "' obj-id='" + obj_id + "'>" +
(sheet ?
"<stylesheet-link rt-id='" + rt_id + "'"+
" index='" + sheet.index + "' handler='display-rule-in-stylesheet'>" + sheet.name +
"</stylesheet-link>" :
"")+
"<selector>" + helpers.escapeTextHtml(style_dec[SELECTOR]) + "</selector>" +
" {\n" +
prettyPrintRuleInInspector(style_dec, false, search_active) +
"\n}</rule>";
=======
if (!search_active || style_dec[HAS_MATCHING_SEARCH_PROPS])
{
ret += "<rule data-menu='style-inspector-rule' rule-id='" + style_dec[RULE_ID] + "' obj-id='" + obj_id + "'>" +
"<stylesheet-link rt-id='" + rt_id + "'"+
" index='" + sheet.index + "' handler='display-rule-in-stylesheet' data-menu=''>" + sheet.name +
"</stylesheet-link>" +
"<selector>" + helpers.escapeTextHtml(style_dec[SELECTOR]) + "</selector>" +
" {\n" +
prettyPrintRuleInInspector(style_dec, false, search_active) +
"\n}</rule>";
}
>>>>>>>
ret += "<rule data-menu='style-inspector-rule' rule-id='" + style_dec[RULE_ID] + "' obj-id='" + obj_id + "'>" +
(sheet ?
"<stylesheet-link rt-id='" + rt_id + "'"+
" index='" + sheet.index + "' handler='display-rule-in-stylesheet'>" + sheet.name +
"</stylesheet-link>" :
"")+
"<selector>" + helpers.escapeTextHtml(style_dec[SELECTOR]) + "</selector>" +
" {\n" +
prettyPrintRuleInInspector(style_dec, false, search_active) +
"\n}</rule>"; |
<<<<<<<
import styles from './CoinSelector.css';
import i18n from '../../../../../../i18n';
=======
import styles from './CoinSelector.scss';
>>>>>>>
import styles from './CoinSelector.scss';
import i18n from '../../../../../../i18n';
<<<<<<<
// Check if pair is valid. If not, show error.
if (nextDepositCoin && nextReceiveCoin && !this.props.pairs[nextDepositCoin][nextReceiveCoin]) {
const validPairs = Object.keys(this.props.pairs[nextDepositCoin])
.map(coin => coin)
.filter(coin => this.props.pairs[nextDepositCoin][coin] === true)
.join(', ');
this.props.errorAlert({
message: `${i18n.t('error.invalidpair')}
${nextReceiveCoin} ${i18n.t('error.with')} ${nextDepositCoin}. ${i18n.t('error.try')} ${validPairs}.`,
show: true,
type: 'INVALID_PAIR',
});
}
=======
>>>>>>> |
<<<<<<<
var textarea = container.clearAndRender(this._tmpl_edit());
textarea.value = this._current_style;
setTimeout(function() {
textarea.focus();
textarea.selectionEnd = textarea.value.length;
textarea.releaseEvent('input');
}, 1);
=======
if (this._stylesheet)
{
var textarea = container.clearAndRender(this._tmpl_edit(this._current_style));
setTimeout(function() {
textarea.focus();
textarea.selectionEnd = textarea.value.length;
}, 1);
}
else
{
container.clearAndRender(this._tmpl_create());
}
>>>>>>>
var textarea = container.clearAndRender(this._tmpl_edit(this._current_style));
textarea.value = this._current_style;
setTimeout(function() {
textarea.focus();
textarea.selectionEnd = textarea.value.length;
}, 1);
<<<<<<<
['div',
[['_auto_height_textarea',
'handler', 'css-update-new-style',
'class', 'css-new-style-sheet'],
['button', ui_strings.S_BUTTON_TEXT_APPLY, 'handler', 'apply-new-style']],
'class', 'padding']);
=======
['_auto_height_textarea',
value || '',
'handler', 'css-update-new-style',
'class', 'css-new-style-sheet']);
};
this._tmpl_create = function()
{
return (
['p',
['input',
'type', 'button',
'handler', 'css-create-new-style',
'value', 'Create new stylesheet'
]
]);
>>>>>>>
['div',
['_auto_height_textarea',
value || '',
'handler', 'css-update-new-style',
'class', 'css-new-style-sheet'],
['button', ui_strings.S_BUTTON_TEXT_APPLY, 'handler', 'apply-new-style'],
'class', 'padding']); |
<<<<<<<
import "./eco-json-schema-fieldset.js";
=======
import "./eco-json-schema-markup.js";
>>>>>>>
import "./eco-json-schema-fieldset.js";
import "./eco-json-schema-markup.js";
<<<<<<<
console.log(
"tabs\nproperty.value",
property.value,
"\nschema.value",
schema.value
);
=======
} else if (ctx._isSchemaMarkup(schema.type)) {
property.component.name =
property.component.name || "eco-json-schema-markup";
if (typeof schema.value === typeof undefined) {
schema.value = "";
}
property.value = schema.value;
>>>>>>>
console.log(
"tabs\nproperty.value",
property.value,
"\nschema.value",
schema.value
);
} else if (ctx._isSchemaMarkup(schema.type)) {
property.component.name =
property.component.name || "eco-json-schema-markup";
if (typeof schema.value === typeof undefined) {
schema.value = "";
}
property.value = schema.value; |
<<<<<<<
this.__tabFocus = 0;
}
get buttons() {
return this.__tabButtons;
=======
this.addEventListener("a11y-tab-changed", (e) => this.updateTabs());
>>>>>>>
this.__tabFocus = 0;
this.addEventListener("a11y-tab-changed", (e) => this.updateTabs());
}
get buttons() {
return this.__tabButtons; |
<<<<<<<
import "@github/time-elements";
=======
import "./lib/threaded-discussion-form.js";
>>>>>>>
import "@github/time-elements";
import "./lib/threaded-discussion-form.js"; |
<<<<<<<
=======
/**
* Set event listeners
* @returns {void}
*/
ready() {
super.ready();
let root = this;
if (this.shadowRoot.querySelector("#listbox") !== undefined) {
this.shadowRoot
.querySelector("#listbox")
.addEventListener("click", function(e) {
root._handleListboxEvent(e, "click");
});
this.shadowRoot
.querySelector("#listbox")
.addEventListener("mousedown", function(e) {
root._handleListboxEvent(e, "mousedown");
});
this.shadowRoot
.querySelector("#listbox")
.addEventListener("keydown", function(e) {
root._handleListboxKeydown(e);
});
this.addEventListener("blur", function(e) {
this.expanded = false;
});
}
}
constructor() {
super();
import("@polymer/iron-icon/iron-icon.js");
import("@polymer/iron-icons/iron-icons.js");
import("./lib/simple-picker-option.js");
}
>>>>>>> |
<<<<<<<
import { LitElement, html, css } from "lit-element/lit-element.js";
import { HAXWiring } from "@lrnwebcomponents/hax-body-behaviors/lib/HAXWiring.js";
import "@polymer/iron-icons/iron-icons.js";
import "@polymer/iron-icon/iron-icon.js";
=======
import { LitElement, html } from "lit-element/lit-element.js";
import "@polymer/iron-icons/iron-icons.js";
import "@polymer/iron-icon/iron-icon.js";
>>>>>>>
import { LitElement, html } from "lit-element/lit-element.js";
import "@polymer/iron-icons/iron-icons.js";
import "@polymer/iron-icon/iron-icon.js";
<<<<<<<
class LrndesignSidenote extends LitElement {
static get properties() {
return {
label: { type: String },
icon: { type: String },
bgColor: { type: String }
};
}
static get haxProperties() {
return {
canScale: false,
canPosition: true,
canEditSource: false,
gizmo: {
title: "Side-Note",
description: "A .",
icon: "icons:bookmark",
color: "blue",
groups: [""],
meta: {
author: "LRNWebComponents"
}
},
settings: {
quick: [
{
property: "label",
title: "Label",
description: "The label of the sidenote.",
inputMethod: "textfield",
icon: "editor:title"
}
],
configure: [
{
property: "icon",
title: "Icon",
description: "The icon of the sidenote.",
inputMethod: "iconpicker",
options: [
"icons:announcement",
"icons:book",
"icons:bookmark",
"icons:check-circle",
"icons:feedback",
"icons:thumb-down",
"icons:thumb-up",
"icons:warning"
]
},
{
property: "bgColor",
title: "Color",
description: "The background color of the sidenote.",
inputMethod: "colorpicker",
icon: "editor:format-color-fill"
}
],
advanced: []
}
};
}
connectedCallback() {
super.connectedCallback();
this.HAXWiring = new HAXWiring();
this.HAXWiring.setup(
LrndesignSidenote.haxProperties,
LrndesignSidenote.tag,
this
);
}
constructor() {
super();
this.label = "";
this.icon = "";
this.bgColor = "lightgray";
}
render() {
const inlineStyle = this.bgColor ? `background-color:${this.bgColor};` : "";
=======
class LrndesignSidenote extends LitElement {
static get properties() {
return {
label: { type: String },
icon: { type: String },
bgColor: { type: String }
};
}
static get haxProperties() {
return {
canScale: false,
canPosition: true,
canEditSource: false,
gizmo: {
title: "Side-Note",
description: "A .",
icon: "icons:bookmark",
color: "blue",
groups: [""],
meta: {
author: "LRNWebComponents"
}
},
settings: {
quick: [
{
property: "label",
title: "Label",
description: "The label of the sidenote.",
inputMethod: "textfield",
icon: "editor:title"
}
],
configure: [
{
property: "icon",
title: "Icon",
description: "The icon of the sidenote.",
inputMethod: "iconpicker",
options: [
"icons:announcement",
"icons:book",
"icons:bookmark",
"icons:check-circle",
"icons:feedback",
"icons:thumb-down",
"icons:thumb-up",
"icons:warning"
]
},
{
property: "bgColor",
title: "Color",
description: "The background color of the sidenote.",
inputMethod: "colorpicker",
icon: "editor:format-color-fill"
}
],
advanced: []
}
};
}
constructor() {
super();
this.label = "";
this.icon = "";
this.bgColor = "";
}
render() {
>>>>>>>
class LrndesignSidenote extends LitElement {
static get properties() {
return {
label: { type: String },
icon: { type: String },
bgColor: { type: String }
};
}
static get haxProperties() {
return {
canScale: false,
canPosition: true,
canEditSource: false,
gizmo: {
title: "Side-Note",
description: "A .",
icon: "icons:bookmark",
color: "blue",
groups: [""],
meta: {
author: "LRNWebComponents"
}
},
settings: {
quick: [
{
property: "label",
title: "Label",
description: "The label of the sidenote.",
inputMethod: "textfield",
icon: "editor:title"
}
],
configure: [
{
property: "icon",
title: "Icon",
description: "The icon of the sidenote.",
inputMethod: "iconpicker",
options: [
"icons:announcement",
"icons:book",
"icons:bookmark",
"icons:check-circle",
"icons:feedback",
"icons:thumb-down",
"icons:thumb-up",
"icons:warning"
]
},
{
property: "bgColor",
title: "Color",
description: "The background color of the sidenote.",
inputMethod: "colorpicker",
icon: "editor:format-color-fill"
}
],
advanced: []
}
};
}
constructor() {
super();
this.label = "";
this.icon = "";
this.bgColor = "lightgray";
}
render() {
const inlineStyle = this.bgColor ? `background-color:${this.bgColor};` : ""; |
<<<<<<<
this.__tabFocus = 0;
}
get buttons() {
return this.__tabButtons;
=======
this.addEventListener("a11y-tab-changed", (e) => this.updateTabs());
>>>>>>>
this.__tabFocus = 0;
this.addEventListener("a11y-tab-changed", (e) => this.updateTabs());
}
get buttons() {
return this.__tabButtons; |
<<<<<<<
const evt = new CustomEvent("user-engagement", {
bubbles: true,
composed: true,
cancelable: false,
detail: { nameOfQuiz: this.quizName, passed: gotRight }
});
this.dispatchEvent(evt);
=======
// start of data passing, this is a prototype atm
this.dispatchEvent(
new CustomEvent("user-engagement", {
bubbles: true,
composed: true,
cancelable: false,
detail: { passed: gotRight }
})
);
>>>>>>>
// start of data passing, this is a prototype atm
this.dispatchEvent(
new CustomEvent("user-engagement", {
bubbles: true,
composed: true,
cancelable: false,
detail: { nameOfQuiz: this.quizName, passed: gotRight }
})
); |
<<<<<<<
};
var test3 = {
"queryInfo":{
"totalRows":"13"
},
"resultset":[["2010-05-02",0],["2010-05-09",0],["2010-05-16",0],["2010-05-23",0],["2010-05-30",0],["2010-06-06",0],["2010-06-13",0],["2010-06-20",0],["2010-06-27",0],["2010-07-04",0],["2010-07-11",0],["2010-07-18",161248.9633616415],["2010-07-25",138137.33637455967]],
"metadata":[{
"colIndex":0,
"colType":"String",
"colName":"[Retailer_Calender].[Continuous_Week]"
},{
"colIndex":1,
"colType":"Numeric",
"colName":"[Measures].[Lost Sales Availability]"
}]
}
=======
};
var testHeatGrid = {
"resultset":[["Product A",null,1278,321,540,110],
["Product B",209,2165,5000,1019,null],
["Product C",3694,5264,15444,9205,312],
["Product D",1257,1040,7215,1512,18],
["Product E",895,14489,null,5171,14]],
"metadata":[{
"colIndex":0,
"colType":"String",
"colName":"Product-line"
},{
"colIndex":1,
"colType":"Numeric",
"colName":"APAC"
},{
"colIndex":2,
"colType":"Numeric",
"colName":"EMEA"
},{
"colIndex":3,
"colType":"Numeric",
"colName":"Japan"
},{
"colIndex":4,
"colType":"Numeric",
"colName":"NA"
},{
"colIndex":5,
"colType":"Numeric",
"colName":"RoW"
}]
};
>>>>>>>
};
var test3 = {
"queryInfo":{
"totalRows":"13"
},
"resultset":[["2010-05-02",0],["2010-05-09",0],["2010-05-16",0],["2010-05-23",0],["2010-05-30",0],["2010-06-06",0],["2010-06-13",0],["2010-06-20",0],["2010-06-27",0],["2010-07-04",0],["2010-07-11",0],["2010-07-18",161248.9633616415],["2010-07-25",138137.33637455967]],
"metadata":[{
"colIndex":0,
"colType":"String",
"colName":"[Retailer_Calender].[Continuous_Week]"
},{
"colIndex":1,
"colType":"Numeric",
"colName":"[Measures].[Lost Sales Availability]"
}]
}
var testHeatGrid = {
"resultset":[["Product A",null,1278,321,540,110],
["Product B",209,2165,5000,1019,null],
["Product C",3694,5264,15444,9205,312],
["Product D",1257,1040,7215,1512,18],
["Product E",895,14489,null,5171,14]],
"metadata":[{
"colIndex":0,
"colType":"String",
"colName":"Product-line"
},{
"colIndex":1,
"colType":"Numeric",
"colName":"APAC"
},{
"colIndex":2,
"colType":"Numeric",
"colName":"EMEA"
},{
"colIndex":3,
"colType":"Numeric",
"colName":"Japan"
},{
"colIndex":4,
"colType":"Numeric",
"colName":"NA"
},{
"colIndex":5,
"colType":"Numeric",
"colName":"RoW"
}]
}; |
<<<<<<<
if (this._filter(message))
{
this.addentry(message);
}
};
this._filter = function(message)
{
if (!this._filters.hasOwnProperty('css'))
{
this._set_css_filter();
}
if (message.source == "css" && this._filters.css)
{
for (var i = 0, filter; filter = this._filters.css[i]; i++)
{
if (message.description.indexOf(filter) != -1)
{
return false;
}
}
}
return true;
};
this._set_css_filter = function()
{
if (!this._setting)
{
this._setting = window.settings.console;
}
this._filters.css = this._setting.get('use-css-filter') ?
this._setting.get('css-filter') :
null;
=======
this.addentry(message);
this.current_error_count++;
window.messages.post("error-count-update", {current_error_count: this.current_error_count});
>>>>>>>
if (this._filter(message))
{
this.addentry(message);
this.current_error_count++;
window.messages.post("error-count-update", {current_error_count: this.current_error_count});
}
};
this._filter = function(message)
{
if (!this._filters.hasOwnProperty('css'))
{
this._set_css_filter();
}
if (message.source == "css" && this._filters.css)
{
for (var i = 0, filter; filter = this._filters.css[i]; i++)
{
if (message.description.indexOf(filter) != -1)
{
return false;
}
}
}
return true;
};
this._set_css_filter = function()
{
if (!this._setting)
{
this._setting = window.settings.console;
}
this._filters.css = this._setting.get('use-css-filter') ?
this._setting.get('css-filter') :
null; |
<<<<<<<
})
OverpassLayer.twig.extendFilter('websiteUrl', function (value) {
if (value.match(/^https?:\/\//)) {
return value
}
return 'http://' + value
=======
})
OverpassLayer.twig.extendFilter('matches', function (value, match) {
return value.match(match)
>>>>>>>
})
OverpassLayer.twig.extendFilter('websiteUrl', function (value) {
if (value.match(/^https?:\/\//)) {
return value
}
return 'http://' + value
})
OverpassLayer.twig.extendFilter('matches', function (value, match) {
return value.match(match) |
<<<<<<<
todayConfirmedString = `( +${formatNumber(
pref.newlyConfirmed
)} )`;
=======
totalNewlyConfirmed += pref.newlyConfirmed;
todayConfirmedString = `( +${pref.newlyConfirmed} )`;
>>>>>>>
totalNewlyConfirmed += pref.newlyConfirmed;
todayConfirmedString = `( +${formatNumber(
pref.newlyConfirmed
)} )`;
<<<<<<<
yesterdayConfirmedString = `( +${formatNumber(
pref.yesterdayConfirmed
)} )`;
=======
yesterdayConfirmedString = `( +${pref.yesterdayConfirmed} )`;
totalYesterdayConfirmed += pref.yesterdayConfirmed;
>>>>>>>
totalYesterdayConfirmed += pref.yesterdayConfirmed;
yesterdayConfirmedString = `( +${formatNumber(
pref.yesterdayConfirmed
)} )`;
<<<<<<<
existingTotalRows.querySelector(".confirmed").innerHTML = formatNumber(
totals.confirmed
);
existingTotalRows.querySelector(".recovered").innerHTML = formatNumber(
totals.recovered
);
existingTotalRows.querySelector(".deceased").innerHTML = formatNumber(
totals.deceased
);
=======
existingTotalRows.querySelector(".confirmed").innerHTML = totals.confirmed;
existingTotalRows.querySelector(".recovered").innerHTML = totals.recovered;
existingTotalRows.querySelector(".deceased").innerHTML = totals.deceased;
let todayConfirmedString = "";
let yesterdayConfirmedString = "";
if (totalNewlyConfirmed > 0) {
todayConfirmedString = `( +${totalNewlyConfirmed} )`;
}
if (totalYesterdayConfirmed > 0) {
yesterdayConfirmedString = `( +${totalYesterdayConfirmed} )`;
}
existingTotalRows.querySelector(".today").innerHTML = todayConfirmedString;
existingTotalRows.querySelector(
".yesterday"
).innerHTML = yesterdayConfirmedString;
>>>>>>>
existingTotalRows.querySelector(".confirmed").innerHTML = formatNumber(
totals.confirmed
);
existingTotalRows.querySelector(".recovered").innerHTML = formatNumber(
totals.recovered
);
existingTotalRows.querySelector(".deceased").innerHTML = formatNumber(
totals.deceased
);
let todayConfirmedString = "";
let yesterdayConfirmedString = "";
if (totalNewlyConfirmed > 0) {
todayConfirmedString = `( +${formatNumber(
totalNewlyConfirmed
)} )`;
}
if (totalYesterdayConfirmed > 0) {
yesterdayConfirmedString = `( +${formatNumber(
totalYesterdayConfirmed
)} )`;
}
existingTotalRows.querySelector(".today").innerHTML = todayConfirmedString;
existingTotalRows.querySelector(
".yesterday"
).innerHTML = yesterdayConfirmedString; |
<<<<<<<
if (pref.name == 'Unspecified') {
=======
if(pref.name == 'Unspecified'){
>>>>>>>
if(pref.name == 'Unspecified'){
<<<<<<<
ddb.prefectures.map(function (prefecture) {
=======
ddb.prefectures.map(function(prefecture){
>>>>>>>
ddb.prefectures.map(function(prefecture){
<<<<<<<
if (cases <= 50) {
=======
if(cases <= 50){
>>>>>>>
if(cases <= 50){
<<<<<<<
i18next.changeLanguage(LANG).then(() => localize('html'));
=======
// Toggle the html lang tags
parseNode(function(el) {
if (!el.dataset[LANG]) return;
el.textContent = el.dataset[LANG]
})
>>>>>>>
i18next.changeLanguage(LANG).then(() => localize('html'));
<<<<<<<
toggleLangPicker(LANG);
=======
if (document.getElementById('travel-restrictions')){
drawTravelRestrictions();
}
// Toggle the lang picker
document.querySelectorAll('a[data-lang-picker]').forEach(function(el){
el.style.display = 'inline'
})
document.querySelector('a[data-lang-picker='+LANG+']').style.display = 'none'
>>>>>>>
if (document.getElementById('travel-restrictions')){
drawTravelRestrictions();
}
toggleLangPicker(LANG);
<<<<<<<
window.onload = function () {
=======
window.onload = function(){
>>>>>>>
window.onload = function(){
<<<<<<<
map.once('style.load', function (e) {
=======
map.once('style.load', function(e) {
>>>>>>>
map.once('style.load', function(e) { |
<<<<<<<
import htmlTemplate from './htmlTemplate';
=======
import resetCSS from './lib/reset-css';
import assets from './lib/assets';
>>>>>>>
import assets from './lib/assets';
import htmlTemplate from './htmlTemplate';
<<<<<<<
const bundle = ['javascript', `${data.site}.${data.page.toLowerCase()}.js`];
=======
const bundle = assets.dist(`${data.site}.${data.page.toLowerCase()}.js`);
const vendor = assets.dist('vendor.js');
const fonts = assets.static('css/fonts.css');
>>>>>>>
const bundle = assets.dist(`${data.site}.${data.page.toLowerCase()}.js`); |
<<<<<<<
import Operations from '@advancedalgos/operations-client'
// import FinancialBeings from '@advancedalgos/financial-beings-client'
import { FINANCIAL_BEINGS } from './constants/routes'
=======
import FinancialBeings from '@advancedalgos/financial-beings-client'
>>>>>>>
import FinancialBeings from '@advancedalgos/financial-beings-client'
import Operations from '@advancedalgos/operations-client' |
<<<<<<<
=======
import { MessageCard, ImageUpload } from '@advancedalgos/web-components'
>>>>>>>
import { MessageCard, ImageUpload } from '@advancedalgos/web-components'
<<<<<<<
console.log(this.props, this.props.slug)
const { classes, team } = this.props
=======
console.log('ManageTeamEdit ', this.props, this.props.slug, this.props.team)
const { classes, team } = this.props
>>>>>>>
console.log('ManageTeamEdit ', this.props, this.props.slug, this.props.team)
const { classes, team } = this.props
<<<<<<<
query: GET_TEAMS_BY_OWNER
=======
query: GET_TEAMS_BY_OWNER,
variables: { authId: this.authId }
>>>>>>>
query: GET_TEAMS_BY_OWNER,
variables: { authId: this.authId }
<<<<<<<
<UploadImage
team={team}
handleAvatar={this.handleAvatar}
handleBanner={this.handleBanner}
/>
=======
<Mutation mutation={GET_AZURE_SAS} >
{(getAzureSAS, { loading, error, data }) => {
console.log('getAzureSAS: ', loading, error, data, team.profile)
const AzureStorageUrl = process.env.AZURE_STORAGE_URL
const containerName = team.slug
let AzureSASURL
if (!loading && data !== undefined) {
AzureSASURL = data.getAzureSAS
} else {
getAzureSAS({ variables: { teamSlug: containerName } })
}
let avatar = null
if (this.state.avatar !== null) avatar = this.state.avatar
if (team.profile !== null && team.profile.avatar !== undefined && team.profile.avatar !== null) avatar = team.profile.avatar
let banner = null
if (this.state.banner !== null) banner = this.state.banner
if (team.profile !== null && team.profile.banner !== undefined && team.profile.banner !== null) banner = team.profile.banner
console.log('team images: ', avatar, banner)
if (loading || data === undefined) {
return (<MessageCard message='Loading...' />)
} else {
return (
<React.Fragment>
<ImageUpload
key='banner'
handleUrl={this.handleBanner}
fileName={`${team.slug}-banner.jpg`}
containerName={containerName}
existingImage={banner}
cropContainer={{ x: 10, y: 10, width: 800, height: 200 }}
cropPreviewBox={{ width: 650, height: 200 }}
saveImageConfig={{
quality: 0.6,
maxWidth: 800,
maxHeight: 200,
autoRotate: true,
mimeType: 'image/jpeg'
}}
AzureStorageUrl={AzureStorageUrl}
AzureSASURL={AzureSASURL}
cropRatio={4}
debug
/>
<ImageUpload
key='avatar'
handleUrl={this.handleAvatar}
fileName={`${team.slug}-avatar.jpg`}
containerName={containerName}
existingImage={avatar}
cropContainer={{ x: 10, y: 10, width: 200, height: 200 }}
cropPreviewBox={{ width: 350, height: 350 }}
saveImageConfig={{
quality: 0.6,
maxWidth: 200,
maxHeight: 200,
autoRotate: true,
mimeType: 'image/jpeg'
}}
AzureStorageUrl={AzureStorageUrl}
AzureSASURL={AzureSASURL}
cropRatio={1}
debug
/>
</React.Fragment>
)
}
}}
</Mutation>
>>>>>>>
<Mutation mutation={GET_AZURE_SAS} >
{(getAzureSAS, { loading, error, data }) => {
console.log('getAzureSAS: ', loading, error, data, team.profile)
const AzureStorageUrl = process.env.AZURE_STORAGE_URL
const containerName = team.slug
let AzureSASURL
if (!loading && data !== undefined) {
AzureSASURL = data.getAzureSAS
} else {
getAzureSAS({ variables: { teamSlug: containerName } })
}
let avatar = null
if (this.state.avatar !== null) avatar = this.state.avatar
if (team.profile !== null && team.profile.avatar !== undefined && team.profile.avatar !== null) avatar = team.profile.avatar
if (this.state.avatar === null && team.profile !== null && team.profile.avatar !== undefined) avatar = 'https://algobotcommstorage.blob.core.windows.net/aateammodule/aa-avatar-default.png'
let banner = null
if (this.state.banner !== null) banner = this.state.banner
if (team.profile !== null && team.profile.banner !== undefined && team.profile.banner !== null) banner = team.profile.banner
if (this.state.banner === null && team.profile !== null && team.profile.banner !== undefined) banner = 'https://algobotcommstorage.blob.core.windows.net/aateammodule/aa-banner-default.png'
console.log('team images: ', avatar, banner)
if (loading || data === undefined) {
return (<MessageCard message='Loading...' />)
} else {
return (
<React.Fragment>
<ImageUpload
key='banner'
handleUrl={this.handleBanner}
fileName={`${team.slug}-banner.jpg`}
containerName={containerName}
existingImage={banner}
cropContainer={{ x: 10, y: 10, width: 800, height: 200 }}
cropPreviewBox={{ width: 650, height: 200 }}
saveImageConfig={{
quality: 0.6,
maxWidth: 800,
maxHeight: 200,
autoRotate: true,
mimeType: 'image/jpeg'
}}
AzureStorageUrl={AzureStorageUrl}
AzureSASURL={AzureSASURL}
cropRatio={4}
debug
/>
<ImageUpload
key='avatar'
handleUrl={this.handleAvatar}
fileName={`${team.slug}-avatar.jpg`}
containerName={containerName}
existingImage={avatar}
cropContainer={{ x: 10, y: 10, width: 200, height: 200 }}
cropPreviewBox={{ width: 350, height: 350 }}
saveImageConfig={{
quality: 0.6,
maxWidth: 200,
maxHeight: 200,
autoRotate: true,
mimeType: 'image/jpeg'
}}
AzureStorageUrl={AzureStorageUrl}
AzureSASURL={AzureSASURL}
cropRatio={1}
debug
/>
</React.Fragment>
)
}
}}
</Mutation>
<<<<<<<
=======
owner: this.authId,
>>>>>>>
owner: this.authId,
<<<<<<<
team: PropTypes.object
=======
team: PropTypes.object,
authId: PropTypes.string.isRequired
>>>>>>>
team: PropTypes.object,
authId: PropTypes.string.isRequired |
<<<<<<<
"cookie_manager":
{
"default":
{
},
"edit":
{
"enter": "submit",
"escape": "cancel"
}
}
=======
"js_source":
{
"default":
{
"up": "scroll-arrow-up",
"down": "scroll-arrow-down",
"page-up": "scroll-page-up",
"page-down": "scroll-page-down",
"cmd l": "show-window-go-to-line"
},
},
"go-to-line":
{
"default":
{
"enter": "submit",
},
},
"watches":
{
"default":
{
},
"edit":
{
"enter": "submit",
"escape": "cancel",
}
},
"breakpoints":
{
"default":
{
},
"edit":
{
"enter": "submit",
"escape": "cancel",
}
},
>>>>>>>
"js_source":
{
"default":
{
"up": "scroll-arrow-up",
"down": "scroll-arrow-down",
"page-up": "scroll-page-up",
"page-down": "scroll-page-down",
"cmd l": "show-window-go-to-line"
},
},
"go-to-line":
{
"default":
{
"enter": "submit",
},
},
"watches":
{
"default":
{
},
"edit":
{
"enter": "submit",
"escape": "cancel",
}
},
"breakpoints":
{
"default":
{
},
"edit":
{
"enter": "submit",
"escape": "cancel",
}
},
"cookie_manager":
{
"default":
{
},
"edit":
{
"enter": "submit",
"escape": "cancel"
}
}, |
<<<<<<<
path='/keys'
=======
exact
path='/key-vault'
>>>>>>>
path='/key-vault' |
<<<<<<<
const { sendTeamMemberInvite, verifyInviteToken } = require('./email/sendgrid')
const {
createStoragePipline,
createServiceURL,
listContainers,
createContainer,
createBlob,
uploadBlob,
downloadBlob,
deleteBlob,
deleteContainer
} = require('./storage/azure')
//var azure = require('azure-storage')
=======
>>>>>>>
<<<<<<<
async teamWithRole(parent, { teamId, role }, ctx, info) {
return ctx.db.query.teamsConnection({where: {AND: [{id: teamId},{members_some:{role: role}}]}, first:1}, info)
},
async teamsByOwner(parent, args, ctx, info) {
const authId = ctx.request.user.sub
return ctx.db.query.teams({where: { owner: authId }, orderBy:'updatedAt_DESC'}, TEAMS_FRAGMENT)
},
async teamsByRole(parent, args, ctx, info) {
const authId = ctx.request.user.sub
let teamAdmin = await ctx.db.query.teams({where: {members_some: {OR: [{role: 'ADMIN'}, {role: 'OWNER'}], AND: [{member: {authId: authId}}]}}, orderBy: 'updatedAt_DESC'}, TEAMS_FRAGMENT)
console.log('teamsByRole teamAdmin: ', teamAdmin)
return teamAdmin
=======
async teamsByOwner(parent, { ownerId }, ctx, info) {
console.log('teamsByOwner: ', ctx)
return ctx.db.query.teams({where: { owner: ownerId }, orderBy:'updatedAt_DESC'}, TEAMS_FRAGMENT)
>>>>>>>
async teamWithRole(parent, { teamId, role }, ctx, info) {
return ctx.db.query.teamsConnection({where: {AND: [{id: teamId},{members_some:{role: role}}]}, first:1}, info)
},
async teamsByOwner(parent, { ownerId }, ctx, info) {
return ctx.db.query.teams({where: { owner: ownerId }, orderBy:'updatedAt_DESC'}, TEAMS_FRAGMENT)
},
async teamsByRole(parent, args, ctx, info) {
const authId = ctx.request.user.sub
let teamAdmin = await ctx.db.query.teams({where: {members_some: {OR: [{role: 'ADMIN'}, {role: 'OWNER'}], AND: [{member: {authId: authId}}]}}, orderBy: 'updatedAt_DESC'}, TEAMS_FRAGMENT)
console.log('teamsByRole teamAdmin: ', teamAdmin)
return teamAdmin
<<<<<<<
// Create start and expiry times
let today = new Date()
let week = new Date()
week.setDate(today.getDate() + 7)
// Create SharedKeyCredential and attach to pipline
const SKC = new Azure.SharedKeyCredential(azureAccount, azureKey)
const pipeline = Azure.StorageURL.newPipeline(SKC)
// Create container URL
const serviceURL = new Azure.ServiceURL(azureStorageUrl, pipeline)
const containerName = teamSlug
const containerURL = Azure.ContainerURL.fromServiceURL(serviceURL, containerName)
let marker
let containerCheck = null
do {
const listContainersResponse = await serviceURL.listContainersSegment(
Azure.Aborter.None,
marker,
)
console.log(`ContainerCheck marker: `, listContainersResponse)
marker = listContainersResponse.marker;
for (const container of listContainersResponse.containerItems) {
console.log(`ContainerCheck: ${container.name} | ${containerName} | ${marker}`)
if(container.name === containerName){
containerCheck = container.name
}
}
} while (marker)
let newContainer
if(containerCheck === null){
newContainer = await containerURL.create(Azure.Aborter.None, { access: 'blob' })
}
console.log('getAzureSAS container: ', containerURL, containerCheck, newContainer)
// Set permissions for service, resource types and containers
const SASServicePerms = Azure.AccountSASServices.parse('b')
const SASResourceTypes = Azure.AccountSASResourceTypes.parse('co')
const SASContainerPerms = Azure.ContainerSASPermissions.parse('rwl')
// Generate SAS url
const SASQueryParameters = Azure.generateAccountSASQueryParameters(
{
version: '2017-11-09',
permissions: SASContainerPerms,
startTime: today,
expiryTime: week,
protocol: 'https',
services: SASServicePerms,
resourceTypes: SASResourceTypes
}, SKC )
return SASQueryParameters
},
async sendMemberInviteSG(parent, { email, teamId }, ctx, info) {
const team = await ctx.db.query.team({ where: { id: teamId } }, TEAMS_FRAGMENT)
const addMember = await ctx.db.mutation.upsertTeamMembers({
where:{email: email},
create:{role:'MEMBER', email:email, team: {connect: {id: teamId}}, status:{create:{status: 'INVITED', reason: `Invited by ${team.members[0].member.alias}`}}},
update:{role: 'MEMBER', email: email, team: {connect: {id: teamId}}, status:{create:{status: 'INVITED', reason: `Invite resent by ${team.members[0].member.alias}`}}}},
`{ id }`)
const sendInvite = await sendTeamMemberInvite(email, team)
return sendInvite
=======
const SASUrl = createSASQueryURL(teamSlug)
console.log('createSASQueryURL: ', SASUrl)
return SASUrl
>>>>>>>
const SASUrl = createSASQueryURL(teamSlug)
console.log('createSASQueryURL: ', SASUrl)
return SASUrl |
<<<<<<<
const transformedOperationsSchema = await createTransformedRemoteSchema(
'operations_',
process.env.OPERATIONS_API_URL,
process.env.OPERATIONS_API_PRESHARED)
=======
logger.info('Financial Beings schema created')
const transformedNotificationsSchema = await createTransformedRemoteSchema(
'notifications_',
process.env.NOTIFICATIONS_API_URL,
process.env.NOTIFICATIONS_API_PRESHARED)
logger.info('Notifications schema created')
>>>>>>>
const transformedOperationsSchema = await createTransformedRemoteSchema(
'operations_',
process.env.OPERATIONS_API_URL,
process.env.OPERATIONS_API_PRESHARED)
const transformedNotificationsSchema = await createTransformedRemoteSchema(
'notifications_',
process.env.NOTIFICATIONS_API_URL,
process.env.NOTIFICATIONS_API_PRESHARED)
logger.info('Notifications schema created')
<<<<<<<
if (transformedOperationsSchema) {
schemas.push(transformedOperationsSchema)
}
=======
if (transformedNotificationsSchema) {
schemas.push(transformedNotificationsSchema)
}
>>>>>>>
if (transformedOperationsSchema) {
schemas.push(transformedOperationsSchema)
}
if (transformedNotificationsSchema) {
schemas.push(transformedNotificationsSchema)
} |
<<<<<<<
this.get_body = function(entry)
{
entry.called_get_body = true;
var contentmode = cls.ResourceUtil.mime_to_content_mode(entry.mime);
var typecode = {datauri: 3, string: 1}[contentmode] || 1;
var tag = window.tagManager.set_callback(this, this._handle_get_resource, [entry.resource_id]);
this._res_service.requestGetResource(tag, [entry.resource_id, [typecode, 1]]);
};
this._handle_get_resource = function(status, data, resource_id)
{
var ctx = this._get_request_context(cls.NetworkLogger.CONTEXT_TYPE_LOGGER);
if (status)
{
// the object passed to _current_context represents empty event_data. will set no_used_mimetype.
ctx.update("responsebody", {resourceID: resource_id});
}
else
{
var msg = new cls.ResourceManager["1.2"].ResourceData(data);
ctx.update("responsebody", msg);
}
// Post update message from here. This is only needed when the generic updating per event is paused.
if (this.is_paused)
ctx.post_on_context_or_logger("resource-update", {id: event.resourceID});
};
this.init();
};
cls.NetworkLogger.CONTEXT_TYPE_LOGGER = 1;
cls.NetworkLogger.CONTEXT_TYPE_CRAFTER = 2;
cls.NetworkLogger.CONTEXT_TYPE_MAIN = cls.NetworkLogger.CONTEXT_TYPE_LOGGER;
=======
this.get_resource_info = function(resource_id)
{
// Returns a ResourceInfo based on the most recent Entry with that resource_id.
var entry = this._current_context &&
this._current_context.get_entries_with_res_id(resource_id).last;
if (entry && entry.current_response && entry.current_response.responsebody)
{
return new cls.ResourceInfo(entry);
}
return null;
};
this.get_request_context = function()
{
return this._current_context;
};
>>>>>>>
this.get_resource_info = function(resource_id)
{
// Returns a ResourceInfo based on the most recent Entry with that resource_id.
var entry = this._current_context &&
this._current_context.get_entries_with_res_id(resource_id).last;
if (entry && entry.current_response && entry.current_response.responsebody)
{
return new cls.ResourceInfo(entry);
}
return null;
};
this.get_request_context = function()
{
return this._current_context;
};
this.init();
};
cls.NetworkLogger.CONTEXT_TYPE_LOGGER = 1;
cls.NetworkLogger.CONTEXT_TYPE_CRAFTER = 2;
cls.NetworkLogger.CONTEXT_TYPE_MAIN = cls.NetworkLogger.CONTEXT_TYPE_LOGGER;
<<<<<<<
if (eventname == "urlload" || changed_request_id)
{
var id = this._get_uid();
logger_entry = new cls.NetworkLoggerEntry(id, event.resourceID, event.documentID, this.get_starttime());
this._logger_entries.push(logger_entry);
// Store the id in the list of entries in the window_context
var window_context = (event.windowID && this.get_window_context(event.windowID, true));
if (window_context)
window_context.entry_ids.push(id);
}
logger_entry.request_id = event.requestID;
// Add a mapped crafter_request_id when applicable
var crafter_request_id = this.allocated_res_ids[res_id];
if (crafter_request_id && !logger_entry.crafter_request_id)
logger_entry.crafter_request_id = crafter_request_id;
if (res_id in this.allocated_res_ids)
logger_entry.crafter_request_id = this.allocated_res_ids[res_id];
logger_entry.update(eventname, event);
=======
if (eventname == "urlload" || changed_request_id)
{
var id = this._get_uid();
logger_entry = new cls.NetworkLoggerEntry(id, event.resourceID, event.documentID, this.get_starttime());
this._logger_entries.push(logger_entry);
// Store the id in the list of entries in the window_context
var window_context = this.get_window_context(event.windowID);
window_context.entry_ids.push(id);
>>>>>>>
if (eventname == "urlload" || changed_request_id)
{
var id = this._get_uid();
logger_entry = new cls.NetworkLoggerEntry(id, event.resourceID, event.documentID, this.get_starttime());
this._logger_entries.push(logger_entry);
// Store the id in the list of entries in the window_context
var window_context = (event.windowID && this.get_window_context(event.windowID, true));
if (window_context)
window_context.entry_ids.push(id);
<<<<<<<
this.check_to_request_body = function(logger)
=======
this.check_to_get_body = function()
>>>>>>>
this.check_to_get_body = function()
<<<<<<<
logger.get_body(this);
=======
var data = new cls.ResourceManager["1.2"].ResourceData(msg);
this.responsebody = data;
this._current_response.update_responsebody(data);
>>>>>>>
var data = new cls.ResourceManager["1.2"].ResourceData(msg);
this.responsebody = data;
this._current_response.update_responsebody(data);
<<<<<<<
// In 99% of the cases, _current_response is used. It's only
// exposed for getting the ResourceInfo from the logger directly.
return this._current_response;
=======
return this._current_response;
>>>>>>>
return this._current_response; |
<<<<<<<
// PREF: Disable clipboard event detection (onCut/onCopy/onPaste) via Javascript
=======
// PREF: Disable clipboard manipulation via JavaScript
// NOTICE: Disabling clipboard events breaks Ctrl+C/X/V copy/cut/paste functionaility in JS-based web applications (Google Docs...)
>>>>>>>
// PREF: Disable clipboard event detection (onCut/onCopy/onPaste) via Javascript
// NOTICE: Disabling clipboard events breaks Ctrl+C/X/V copy/cut/paste functionaility in JS-based web applications (Google Docs...) |
<<<<<<<
.pipe(source(destination.fileName))
=======
.on('error', onError)
.pipe(source(destination.saveFile))
>>>>>>>
.on('error', onError)
.pipe(source(destination.fileName)) |
<<<<<<<
autoStart: false,
timeout: 180,
ignoreCors: false
=======
autoStart: false,
timeout: 180,
branchTracking: false
>>>>>>>
autoStart: false,
timeout: 180,
ignoreCors: false,
branchTracking: false
<<<<<<<
=======
var branches = _blanket.options("branchTracking");
>>>>>>>
var branches = _blanket.options("branchTracking");
<<<<<<<
var intro = "";
intro += "if (typeof "+covVar+" === 'undefined') "+covVar+" = {};\n";
=======
var intro = "";
intro += "if (typeof "+covVar+" === 'undefined') "+covVar+" = {};\n";
if (branches){
intro += "var _$branchFcn=function(f,l,c,r){ ";
intro += covVar+"[f].branchData[l][c].push(r);";
intro += "return r;};\n";
}
>>>>>>>
var intro = "";
intro += "if (typeof "+covVar+" === 'undefined') "+covVar+" = {};\n";
if (branches){
intro += "var _$branchFcn=function(f,l,c,r){ ";
intro += covVar+"[f].branchData[l][c].push(r);";
intro += "return r;};\n";
}
<<<<<<<
=======
if (branches){
intro += covVar+"['"+filename+"'].branchData=[];\n";
}
>>>>>>>
if (branches){
intro += covVar+"['"+filename+"'].branchData=[];\n";
}
<<<<<<<
=======
if (branches){
_blanket._branchingArraySetup.sort(function(a,b){
return a.line > b.line;
}).sort(function(a,b){
return a.column > b.column;
}).forEach(function(item){
if (item.file === filename){
intro += "if (typeof "+ covVar+"['"+filename+"'].branchData["+item.line+"] === 'undefined'){\n";
intro += covVar+"['"+filename+"'].branchData["+item.line+"]=[];\n";
intro += "}";
intro += covVar+"['"+filename+"'].branchData["+item.line+"]["+item.column+"] = [];\n";
intro += covVar+"['"+filename+"'].branchData["+item.line+"]["+item.column+"].consequent = "+JSON.stringify(item.consequent)+";\n";
intro += covVar+"['"+filename+"'].branchData["+item.line+"]["+item.column+"].alternate = "+JSON.stringify(item.alternate)+";\n";
}
});
}
>>>>>>>
if (branches){
_blanket._branchingArraySetup.sort(function(a,b){
return a.line > b.line;
}).sort(function(a,b){
return a.column > b.column;
}).forEach(function(item){
if (item.file === filename){
intro += "if (typeof "+ covVar+"['"+filename+"'].branchData["+item.line+"] === 'undefined'){\n";
intro += covVar+"['"+filename+"'].branchData["+item.line+"]=[];\n";
intro += "}";
intro += covVar+"['"+filename+"'].branchData["+item.line+"]["+item.column+"] = [];\n";
intro += covVar+"['"+filename+"'].branchData["+item.line+"]["+item.column+"].consequent = "+JSON.stringify(item.consequent)+";\n";
intro += covVar+"['"+filename+"'].branchData["+item.line+"]["+item.column+"].alternate = "+JSON.stringify(item.alternate)+";\n";
}
});
}
<<<<<<<
if (flags.indexOf(" ignoreCors ") > -1){
newOptions.ignoreCors = true;
}
=======
if (flags.indexOf(" branchTracking ") > -1){
newOptions.branchTracking = true;
}
>>>>>>>
if (flags.indexOf(" ignoreCors ") > -1){
newOptions.ignoreCors = true;
}
if (flags.indexOf(" branchTracking ") > -1){
newOptions.branchTracking = true;
} |
<<<<<<<
autoStart: false,
timeout: 180,
ignoreCors: false
=======
autoStart: false,
timeout: 180,
branchTracking: false
>>>>>>>
autoStart: false,
timeout: 180,
ignoreCors: false,
branchTracking: false
<<<<<<<
=======
var branches = _blanket.options("branchTracking");
>>>>>>>
var branches = _blanket.options("branchTracking");
<<<<<<<
var intro = "";
intro += "if (typeof "+covVar+" === 'undefined') "+covVar+" = {};\n";
=======
var intro = "";
intro += "if (typeof "+covVar+" === 'undefined') "+covVar+" = {};\n";
if (branches){
intro += "var _$branchFcn=function(f,l,c,r){ ";
intro += covVar+"[f].branchData[l][c].push(r);";
intro += "return r;};\n";
}
>>>>>>>
var intro = "";
intro += "if (typeof "+covVar+" === 'undefined') "+covVar+" = {};\n";
if (branches){
intro += "var _$branchFcn=function(f,l,c,r){ ";
intro += covVar+"[f].branchData[l][c].push(r);";
intro += "return r;};\n";
}
<<<<<<<
=======
if (branches){
intro += covVar+"['"+filename+"'].branchData=[];\n";
}
>>>>>>>
if (branches){
intro += covVar+"['"+filename+"'].branchData=[];\n";
}
<<<<<<<
=======
if (branches){
_blanket._branchingArraySetup.sort(function(a,b){
return a.line > b.line;
}).sort(function(a,b){
return a.column > b.column;
}).forEach(function(item){
if (item.file === filename){
intro += "if (typeof "+ covVar+"['"+filename+"'].branchData["+item.line+"] === 'undefined'){\n";
intro += covVar+"['"+filename+"'].branchData["+item.line+"]=[];\n";
intro += "}";
intro += covVar+"['"+filename+"'].branchData["+item.line+"]["+item.column+"] = [];\n";
intro += covVar+"['"+filename+"'].branchData["+item.line+"]["+item.column+"].consequent = "+JSON.stringify(item.consequent)+";\n";
intro += covVar+"['"+filename+"'].branchData["+item.line+"]["+item.column+"].alternate = "+JSON.stringify(item.alternate)+";\n";
}
});
}
>>>>>>>
if (branches){
_blanket._branchingArraySetup.sort(function(a,b){
return a.line > b.line;
}).sort(function(a,b){
return a.column > b.column;
}).forEach(function(item){
if (item.file === filename){
intro += "if (typeof "+ covVar+"['"+filename+"'].branchData["+item.line+"] === 'undefined'){\n";
intro += covVar+"['"+filename+"'].branchData["+item.line+"]=[];\n";
intro += "}";
intro += covVar+"['"+filename+"'].branchData["+item.line+"]["+item.column+"] = [];\n";
intro += covVar+"['"+filename+"'].branchData["+item.line+"]["+item.column+"].consequent = "+JSON.stringify(item.consequent)+";\n";
intro += covVar+"['"+filename+"'].branchData["+item.line+"]["+item.column+"].alternate = "+JSON.stringify(item.alternate)+";\n";
}
});
}
<<<<<<<
if (flags.indexOf(" ignoreCors ") > -1){
newOptions.ignoreCors = true;
}
=======
if (flags.indexOf(" branchTracking ") > -1){
newOptions.branchTracking = true;
}
>>>>>>>
if (flags.indexOf(" ignoreCors ") > -1){
newOptions.ignoreCors = true;
}
if (flags.indexOf(" branchTracking ") > -1){
newOptions.branchTracking = true;
} |
<<<<<<<
(no_contextmenu ? "" : "data-menu='dom-element' ") +
(is_script_node ? "class='non-editable'" : "") + ">" +
(node[CHILDREN_LENGTH] ?
=======
"data-menu='dom-element' " +
"class='spotlight-node " + (is_script_node ? "non-editable" : "") + "'>" +
(children_length ?
>>>>>>>
(no_contextmenu ? "" : "data-menu='dom-element' ") +
"class='spotlight-node " + (is_script_node ? "non-editable" : "") + "'>" +
(children_length ?
<<<<<<<
"</div>";
closing_tags.push("<div" + this._get_indent(node, depth_first_ele) +
"ref-id='" + node[ID] + "' handler='spotlight-node' " +
(no_contextmenu ? "" : "data-menu='dom-element' ") +
"><node>" +
"</" + node_name + ">" +
=======
"</div>" +
(show_pseudo_elements
? ((pseudo_elements[PSEUDO_ELEMENT_BEFORE] || "") +
(pseudo_elements[PSEUDO_ELEMENT_FIRST_LETTER] || "") +
(pseudo_elements[PSEUDO_ELEMENT_FIRST_LINE] || ""))
: "");
closing_tags.push((show_pseudo_elements ? (pseudo_elements[PSEUDO_ELEMENT_AFTER] || "") : "") +
"<div" + this._get_indent(node) +
"ref-id='" + node[ID] + "' handler='spotlight-node' " +
"class='spotlight-node' " +
"data-menu='dom-element'><node>" +
"</" + node_name + ">" +
>>>>>>>
"</div>" +
(show_pseudo_elements
? ((pseudo_elements[PSEUDO_ELEMENT_BEFORE] || "") +
(pseudo_elements[PSEUDO_ELEMENT_FIRST_LETTER] || "") +
(pseudo_elements[PSEUDO_ELEMENT_FIRST_LINE] || ""))
: "");
closing_tags.push((show_pseudo_elements ? (pseudo_elements[PSEUDO_ELEMENT_AFTER] || "") : "") +
"<div" + this._get_indent(node, depth_first_ele) +
"ref-id='" + node[ID] + "' handler='spotlight-node' " +
"class='spotlight-node' " +
(no_contextmenu ? "" : "data-menu='dom-element' ") +
"><node>" +
"</" + node_name + ">" +
<<<<<<<
(no_contextmenu ? "" : "data-menu='dom-element' ") +
(is_script_node ? "class='non-editable'" : "") + ">" +
=======
"data-menu='dom-element' " +
"class='spotlight-node " + (is_script_node ? "non-editable" : "") + "'>" +
>>>>>>>
(no_contextmenu ? "" : "data-menu='dom-element' ") +
"class='spotlight-node " + (is_script_node ? "non-editable" : "") + "'>" +
<<<<<<<
tree += "<div" + this._get_indent(node, depth_first_ele) +
(no_contextmenu ? "" : "data-menu='dom-element' ") +
">" +
=======
var class_attr = re_formatted.test(parent_node[NAME]) ? " class='pre-wrap' " : "";
tree += "<div" + this._get_indent(node) + "data-menu='dom-element'>" +
>>>>>>>
var class_attr = re_formatted.test(parent_node[NAME]) ? " class='pre-wrap' " : "";
tree += "<div" + this._get_indent(node, depth_first_ele) +
(no_contextmenu ? "" : "data-menu='dom-element' ") +
">" +
<<<<<<<
var nodeNameMap =
{
3: "<span class='text-node'>#text</span> ",
4: "<span class='cdata-node'>#cdata-section</span>"
};
var _escape = function(string)
{
var
_char = '',
i = 0,
map =
{
'\t': '\\t',
'\v': '\\v',
'\f': '\\f',
'\u0020': '\\u0020',
'\u00A0': '\\u00A0',
'\r': '\\r',
'\n': '\\n',
'\u2028': '\\u2028',
'\u2029': '\\u2029'
},
ret = '';
for ( ; _char = string.charAt(i); i++)
ret += map[_char];
return ret;
};
this._inspected_dom_node_tree_style = function(model, target, editable, no_contextmenu)
=======
this._inspected_dom_node_tree_style = function(model, target, editable)
>>>>>>>
this._inspected_dom_node_tree_style = function(model, target, editable)
<<<<<<<
this._get_indent(node, depth_first_ele) +
"ref-id='"+node[ID] + "' handler='spotlight-node' " +
(no_contextmenu ? "" : "data-menu='dom-element' ") +
(is_script_node ? "class='non-editable'" : "") + ">" +
(children_length && !has_only_one_child ?
=======
this._get_indent(node) +
"ref-id='"+node[ID] + "' handler='spotlight-node' " +
"data-menu='dom-element' " +
"class='spotlight-node " + (is_script_node ? "non-editable" : "") + "'>" +
(children_length && !has_only_text_content ?
>>>>>>>
this._get_indent(node, depth_first_ele) +
"ref-id='"+node[ID] + "' handler='spotlight-node' " +
(no_contextmenu ? "" : "data-menu='dom-element' ") +
"class='spotlight-node " + (is_script_node ? "non-editable" : "") + "'>" +
(children_length && !has_only_text_content ?
<<<<<<<
this._get_indent(node, depth_first_ele) +
"ref-id='"+node[ID] + "' handler='spotlight-node' " +
(no_contextmenu ? "" : "data-menu='dom-element' ") +
(is_script_node ? "class='non-editable'" : "") + ">" +
(node[CHILDREN_LENGTH] ?
=======
this._get_indent(node) +
"ref-id='"+node[ID] + "' handler='spotlight-node' " +
"data-menu='dom-element' " +
"class='spotlight-node " + (is_script_node ? "non-editable" : "") + "'>" +
(children_length ?
>>>>>>>
this._get_indent(node, depth_first_ele) +
"ref-id='"+node[ID] + "' handler='spotlight-node' " +
(no_contextmenu ? "" : "data-menu='dom-element' ") +
"class='spotlight-node " + (is_script_node ? "non-editable" : "") + "'>" +
(children_length ?
<<<<<<<
tree += "<div" + this._get_indent(node, depth_first_ele) +
current_formatting +
(no_contextmenu ? "" : "data-menu='dom-element' ") +
">" +
(node[NAME] ? node[NAME] : nodeNameMap[node[TYPE]]) +
=======
tree += "<div" + this._get_indent(node) +
current_formatting + " data-menu='dom-element'>" +
(node[NAME] ? node[NAME] : this._node_name_map[node[TYPE]]) +
>>>>>>>
tree += "<div" + this._get_indent(node, depth_first_ele) +
current_formatting +
(no_contextmenu ? "" : "data-menu='dom-element' ") +
">" +
(node[NAME] ? node[NAME] : this._node_name_map[node[TYPE]]) +
<<<<<<<
tree += "<div" + this._get_indent(node, depth_first_ele) +
current_formatting +
(no_contextmenu ? "" : "data-menu='dom-element' ") +
">" +
(node[NAME] ? node[NAME] : nodeNameMap[node[TYPE]]) +
"<text" + (!is_script_node ? " ref-id='" + node[ID]+ "' " : "") + ">" +
(/^\s*$/.test(node[VALUE]) ? _escape(node[VALUE]) : helpers.escapeTextHtml(node[VALUE])) +
=======
var only_whitespace = /^\s*$/.test(node[VALUE]);
tree += "<div" + this._get_indent(node) +
current_formatting + " data-menu='dom-element'>" +
(node[NAME] ? node[NAME] : this._node_name_map[node[TYPE]]) +
"<text" + (!is_script_node ? " ref-id='" + node[ID]+ "' " : "") +
" class='" + (only_whitespace ? "only-whitespace" : "") + "'>" +
(only_whitespace ? helpers.escape_whitespace(node[VALUE])
: helpers.escapeTextHtml(node[VALUE])) +
>>>>>>>
var only_whitespace = /^\s*$/.test(node[VALUE]);
tree += "<div" + this._get_indent(node, depth_first_ele) +
current_formatting +
(no_contextmenu ? "" : "data-menu='dom-element' ") +
">" +
(node[NAME] ? node[NAME] : this._node_name_map[node[TYPE]]) +
"<text" + (!is_script_node ? " ref-id='" + node[ID]+ "' " : "") +
" class='" + (only_whitespace ? "only-whitespace" : "") + "'>" +
(only_whitespace ? helpers.escape_whitespace(node[VALUE])
: helpers.escapeTextHtml(node[VALUE])) + |
<<<<<<<
=======
var skipped = 0;
>>>>>>>
var skipped = 0; |
<<<<<<<
function stopAudioPreview() {
// stop any preview playing
$('#jquery_jplayer_1').jPlayer('stop');
}
function isFadeValid(fade) {
var regExpr = new RegExp("^\\d{2}([.]\\d{1,6})?$");
return regExpr.test(fade);
}
function isTimeValid(time) {
var regExpr = new RegExp("^\\d{2}[:]\\d{2}[:]\\d{2}([.]\\d{1,6})?$");
if (!regExpr.test(time)) {
return false;
}
return true;
}
function showError(el, error) {
$(el).parent().next()
.empty()
.append(error)
.show();
}
function hideError(el) {
$(el).parent().next()
.empty()
.hide();
}
function changeCueIn(event) {
event.stopPropagation();
var pos, url, cueIn, li, unqid;
span = $(this);
pos = span.parent().attr("id").split("_").pop();
url = "/Playlist/set-cue";
cueIn = $.trim(span.text());
li = span.parent().parent().parent().parent();
unqid = li.attr("unqid");
if(!isTimeValid(cueIn)){
showError(span, "please put in a time '00:00:00 (.000000)'");
return;
=======
var AIRTIME = (function(AIRTIME){
AIRTIME.playlist = {};
var mod = AIRTIME.playlist;
function stopAudioPreview() {
// stop any preview playing
$('#jquery_jplayer_1').jPlayer('stop');
>>>>>>>
var AIRTIME = (function(AIRTIME){
AIRTIME.playlist = {};
var mod = AIRTIME.playlist;
function isTimeValid(time) {
var regExpr = new RegExp("^\\d{2}[:]\\d{2}[:]\\d{2}([.]\\d{1,6})?$");
return regExpr.test(time);
}
function isFadeValid(fade) {
var regExpr = new RegExp("^\\d{2}([.]\\d{1,6})?$");
return regExpr.test(fade);
}
function stopAudioPreview() {
// stop any preview playing
$('#jquery_jplayer_1').jPlayer('stop');
<<<<<<<
if(!isFadeValid(fadeOut)){
showError(span, "please put in a time in seconds '00 (.000000)'");
return;
}
$.post(url, {format: "json", fadeOut: fadeOut}, function(json){
if(json.playlist_error == true){
alertPlaylistErrorAndReload();
}
if(json.response.error) {
=======
if(!isTimeValid(fadeOut)){
showError(span, "please put in a time '00:00:00 (.000000)'");
>>>>>>>
if(!isFadeValid(fadeOut)){
showError(span, "please put in a time in seconds '00 (.000000)'"); |
<<<<<<<
/**
* Start detection.
*
* @method on
* @param {Function} [callback] Callback after starting detection.
*/
proto.on = function (callback) {
=======
proto.measure = proto.on = function(callback) {
>>>>>>>
/**
* Start detection.
*
* @method on
* @param {Function} [callback] Callback after starting detection.
*/
proto.measure = proto.on = function(callback) { |
<<<<<<<
last_spotlight_commands = join.call(arguments);
services['ecmascript-debugger'].post
(
"<spotlight-objects>" +
get_command(node_id, scroll_into_view, type || "default") +
( settings.dom.get('lock-selecked-elements')
&& locked_elements.map(get_locked_commands).join("")
|| "" ) +
"</spotlight-objects>"
)
=======
last_spotlight_commands = arguments.join();
services['ecmascript-debugger'].requestSpotlightObjects(0,
[[get_command(node_id, scroll_into_view, type || "default")].concat(
settings.dom.get('lock-selecked-elements') &&
locked_elements.map(get_locked_commands) || [])])
>>>>>>>
last_spotlight_commands = join.call(arguments);
services['ecmascript-debugger'].requestSpotlightObjects(0,
[[get_command(node_id, scroll_into_view, type || "default")].concat(
settings.dom.get('lock-selecked-elements') &&
locked_elements.map(get_locked_commands) || [])]) |
<<<<<<<
=======
this.registerTask('amd', ['babel:amd', 'requirejs']);
this.registerTask('test', ['test:bin', 'test:cov']);
>>>>>>>
this.registerTask('test', ['test:bin', 'test:cov']); |
<<<<<<<
SafeString.prototype.toString = function() {
return this.string.toString();
=======
Handlebars.SafeString.prototype.toString = function() {
return "" + this.string;
>>>>>>>
SafeString.prototype.toString = function() {
return "" + this.string;
<<<<<<<
export function extend(obj, value) {
for(var key in value) {
if(value.hasOwnProperty(key)) {
obj[key] = value[key];
=======
Handlebars.Utils = {
extend: function(obj, value) {
for(var key in value) {
if(value.hasOwnProperty(key)) {
obj[key] = value[key];
}
}
},
escapeExpression: function(string) {
// don't escape SafeStrings, since they're already safe
if (string instanceof Handlebars.SafeString) {
return string.toString();
} else if (string == null || string === false) {
return "";
}
// Force a string conversion as this will be done by the append regardless and
// the regex test will do this transparently behind the scenes, causing issues if
// an object's to string has escaped characters in it.
string = "" + string;
if(!possible.test(string)) { return string; }
return string.replace(badChars, escapeChar);
},
isEmpty: function(value) {
if (!value && value !== 0) {
return true;
} else if(toString.call(value) === "[object Array]" && value.length === 0) {
return true;
} else {
return false;
>>>>>>>
export function extend(obj, value) {
for(var key in value) {
if(value.hasOwnProperty(key)) {
obj[key] = value[key]; |
<<<<<<<
validateInput(input, options);
=======
if (input == null || (typeof input !== 'string' && input.type !== 'Program')) {
throw new Exception('You must pass a string or Handlebars AST to Handlebars.compile. You passed ' + input);
}
options = extend({}, options);
if (!('data' in options)) {
options.data = true;
}
if (options.compat) {
options.useDepths = true;
}
>>>>>>>
options = extend({}, options);
validateInput(input, options); |
<<<<<<<
this.toyParts = []
=======
this.id = id;
>>>>>>>
this.toyParts = []
this.id = id;
<<<<<<<
=======
this.animations['death'].container.classList.add('is-active')
window.setTimeout(() => {
this.dead = false
this.animations['death'].container.classList.remove('is-active')
window.santaApp.fire('sound-trigger', 'buildandbolt_respawn');
window.santaApp.fire('sound-trigger', 'buildandbolt_ice_stop', this.id);
this.resetPosition()
this.clearToyParts()
this.game.board.updateEntityPosition(this,
this.prevPosition.x, this.prevPosition.y,
this.position.x, this.position.y)
>>>>>>>
<<<<<<<
=======
this.onIce = false
this.playingIceSound = false
>>>>>>>
<<<<<<<
=======
registerWin() {
this.score++
window.santaApp.fire('sound-trigger', 'buildandbolt_yay_2', this.id);
}
>>>>>>>
<<<<<<<
this.addAnimationToQueueOnce(walk)
=======
this.addAnimationToQueueOnce(Constants.PLAYER_FRAMES.WALK)
window.santaApp.fire('sound-trigger', 'buildandbolt_player_walk_start', this.id);
>>>>>>>
this.addAnimationToQueueOnce(walk)
window.santaApp.fire('sound-trigger', 'buildandbolt_player_walk_start', this.id);
<<<<<<<
this.animationQueue.push({
animation: rest
})
=======
this.animationQueue.push(Constants.PLAYER_FRAMES.REST)
window.santaApp.fire('sound-trigger', 'buildandbolt_player_walk_stop', this.id);
>>>>>>>
this.animationQueue.push({
animation: rest
})
window.santaApp.fire('sound-trigger', 'buildandbolt_player_walk_stop', this.id); |
<<<<<<<
this.container.classList.remove('is-grabbing');
Transition.trigger();
=======
const direction = this.slider.value > this.activeIndex + 1 ? 'next' : 'prev';
Transition.trigger(direction);
>>>>>>>
this.container.classList.remove('is-grabbing');
Transition.trigger();
Transition.trigger(); |
<<<<<<<
updateScore(id, score) {
=======
updateScore(id) {
const { toysCapacity } = app.LevelManager
>>>>>>>
updateScore(id, score) {
<<<<<<<
const domNumber = this.elem.querySelector(`.toys-board__player--${id} .toys-board__number`)
domNumber.innerHTML = score
=======
const domScore = this.elem.querySelector(`.toys-board__player--${id} [data-toys-board-score]`)
domScore.innerHTML = toysCapacity - app.ScoreManager.scoresDict[id].toysInLevel
>>>>>>>
const domScore = this.elem.querySelector(`.toys-board__player--${id} [data-toys-board-score]`)
domScore.innerHTML = score |
<<<<<<<
this.body.position.set(-this.size / 2, 100, -this.size / 2) // y: 100 to prevent the body to interact with anything in the scene
=======
this.currentMass = this.mass
this.body.position.set(-this.size / 2, -100, -this.size / 2) // y: -100 to prevent the body to interact with anything in the scene
>>>>>>>
this.currentMass = this.mass
this.body.position.set(-this.size / 2, 100, -this.size / 2) // y: 100 to prevent the body to interact with anything in the scene
<<<<<<<
// this.body.mass = this.mass * Math.pow(this.size * this.scaleFactor, 3)
=======
this.body.mass = this.mass * this.scaleFactor
this.currentMass = this.body.mass // the body.mass value is not updated in the collide event for some reason, storing the value here for now
this.body.updateMassProperties()
>>>>>>>
this.body.mass = this.mass * this.scaleFactor
this.currentMass = this.body.mass // the body.mass value is not updated in the collide event for some reason, storing the value here for now
this.body.updateMassProperties() |
<<<<<<<
this.slider.addEventListener('mousedown', () => {
this.container.classList.add('is-grabbing');
});
this.slider.addEventListener('mouseup', () => {
this.container.classList.remove('is-grabbing');
Transition.trigger();
Scene.update(this.slider.value);
Nav.update(this.slider.value - 1);
Nav.handleBtnVisibility();
})
=======
this.slider.addEventListener('mouseup', this.handleSliderMouseUp)
this.slider.addEventListener('input', this.handleSliderProgress)
}
handleSliderMouseUp() {
if(this.slider.value == this.activeIndex + 1) { return; }
Transition.trigger();
Scene.update(this.slider.value);
Nav.update(this.slider.value - 1);
Nav.handleBtnVisibility();
this.activeIndex = this.slider.value - 1;
}
handleSliderProgress() {
this.slider.style.background = `linear-gradient(to right, #FFE14D 0%, #FFE14D ${this.slider.value / 22 * 100 - 1}%, #9FCEFF ${this.slider.value / 22 * 100 - 1}%, #9FCEFF 100%)`;
>>>>>>>
this.slider.addEventListener('mousedown', () => {
this.container.classList.add('is-grabbing');
});
this.slider.addEventListener('mouseup', this.handleSliderMouseUp)
this.slider.addEventListener('input', this.handleSliderProgress)
}
handleSliderMouseUp() {
if(this.slider.value == this.activeIndex + 1) { return; }
this.container.classList.remove('is-grabbing');
Transition.trigger();
Scene.update(this.slider.value);
Nav.update(this.slider.value - 1);
Nav.handleBtnVisibility();
this.activeIndex = this.slider.value - 1;
}
handleSliderProgress() {
this.slider.style.background = `linear-gradient(to right, #FFE14D 0%, #FFE14D ${this.slider.value / 22 * 100 - 1}%, #9FCEFF ${this.slider.value / 22 * 100 - 1}%, #9FCEFF 100%)`; |
<<<<<<<
// // LEVEL 1 - FENCES
// {
// type: 'fence',
// config: {
// x: 24,
// y: 10,
// cells: [
// [
// {
// top: true,
// },
// {
// top: true,
// },
// {
// top: true,
// },
// {
// top: true,
// }
// ],
// ],
// }
// },
// {
// type: 'fence',
// config: {
// x: 6,
// y: 7,
// cells: [
// [
// {
// top: true,
// },
// {
// top: true,
// },
// {
// top: true,
// },
// {
// top: true,
// right: true
// }
// ],
// [
// {},
// {},
// {},
// {
// right: true,
// }
// ],
// [
// {},
// {},
// {},
// {
// right: true,
// }
// ],
// [
// {},
// {},
// {},
// {
// right: true,
// }
// ],
// [
// {},
// {},
// {},
// {
// right: true,
// }
// ],
// ],
// }
// },
// ]
// },
=======
// LEVEL 2
{
time: 60,
hurryUpMusicTime: 25,
players: [
{
startPos: {
x: 1,
y: 7
}
},
{
startPos: {
x: 1,
y: 9
}
}
],
toyType: Constants.TOY_TYPES.CAR,
toysCapacity: 2,
entities: [
// LEVEL 2 - WALLS
{
type: 'wall',
config: {
height: 4,
width: 23,
x: 5,
y: 0,
}
},
{
type: 'wall',
config: {
height: 4,
width: 23,
x: 5,
y: 12,
}
},
>>>>>>>
// // LEVEL 1 - FENCES
// {
// type: 'fence',
// config: {
// x: 24,
// y: 10,
// cells: [
// [
// {
// top: true,
// },
// {
// top: true,
// },
// {
// top: true,
// },
// {
// top: true,
// }
// ],
// ],
// }
// },
// {
// type: 'fence',
// config: {
// x: 6,
// y: 7,
// cells: [
// [
// {
// top: true,
// },
// {
// top: true,
// },
// {
// top: true,
// },
// {
// top: true,
// right: true
// }
// ],
// [
// {},
// {},
// {},
// {
// right: true,
// }
// ],
// [
// {},
// {},
// {},
// {
// right: true,
// }
// ],
// [
// {},
// {},
// {},
// {
// right: true,
// }
// ],
// [
// {},
// {},
// {},
// {
// right: true,
// }
// ],
// ],
// }
// },
// ]
// },
// LEVEL 2
{
time: 60,
hurryUpMusicTime: 25,
players: [
{
startPos: {
x: 1,
y: 7
}
},
{
startPos: {
x: 1,
y: 9
}
}
],
toyType: Constants.TOY_TYPES.CAR,
toysCapacity: 2,
entities: [
// LEVEL 2 - WALLS
{
type: 'wall',
config: {
height: 4,
width: 23,
x: 5,
y: 0,
}
},
{
type: 'wall',
config: {
height: 4,
width: 23,
x: 5,
y: 12,
}
}, |
<<<<<<<
this.updateLevel()
=======
this.updateLevelAndShow();
>>>>>>>
this.updateLevel();
<<<<<<<
this.elem.classList.remove('is-hidden')
=======
this.game.pause();
this.elem.classList.remove('is-hidden');
// To do: start countdown
setTimeout(() => {
// unfreeze game
this.game.resume();
this.hide();
}, 3000);
>>>>>>>
this.elem.classList.remove('is-hidden');
<<<<<<<
updateLevel() {
const { toyType, toysCapacity } = app.LevelManager
=======
updateLevelAndShow() {
const { toyType, toysCapacity } = app.LevelManager;
>>>>>>>
updateLevel() {
const { toyType, toysCapacity } = app.LevelManager;
<<<<<<<
this.dom.toys.appendChild(domToyfull)
=======
this.dom.toys.appendChild(domToyfull);
// wait level transition before showing the walkthrough
setTimeout(() => {
this.show();
}, Constants.LEVEL_TRANSITION_TIMING);
>>>>>>>
this.dom.toys.appendChild(domToyfull); |
<<<<<<<
'presenthavoc': _msg`scene_presenthavoc`,
'press': _msg`press`,
=======
>>>>>>>
'presenthavoc': _msg`scene_presenthavoc`, |
<<<<<<<
resetControls(terrain) {
// reset controls where the camera is currently looking at
const target = this.getLookAtPointOnTerrain(terrain)
this.controls.target.set(target[0].point.x, target[0].point.y, target[0].point.z) // final pos
}
showHelpers() {
=======
showHelpers(scene) {
>>>>>>>
resetControls(terrain) {
// reset controls where the camera is currently looking at
const target = this.getLookAtPointOnTerrain(terrain)
this.controls.target.set(target[0].point.x, target[0].point.y, target[0].point.z) // final pos
}
showHelpers(scene) { |
<<<<<<<
this._on_setting_change_bound = function(msg)
{
if (msg.id == "repl" && msg.key == "max-typed-history-length")
{
this._max_typed = settings.command_line.get(msg.key);
}
}.bind(this);
this._on_profile_disabled_bound = function(msg)
{
if (msg.profile == window.app.profiles.DEFAULT)
this._repllog = [];
}.bind(this);
messages.addListener("setting-changed", this._on_setting_change_bound);
messages.addListener("profile-disabled", this._on_profile_disabled_bound);
=======
>>>>>>>
this._on_profile_disabled_bound = function(msg)
{
if (msg.profile == window.app.profiles.DEFAULT)
this._repllog = [];
}.bind(this);
messages.addListener("profile-disabled", this._on_profile_disabled_bound); |
<<<<<<<
import Sky from '../SceneSubjects/Sky/index.js'
=======
import PlaneHelper from '../SceneSubjects/PlaneHelper/index.js'
>>>>>>>
import Sky from '../SceneSubjects/Sky/index.js'
import PlaneHelper from '../SceneSubjects/PlaneHelper/index.js'
<<<<<<<
this.cameraCtrl.rotate('left', false, true)
=======
CameraController.rotate('left', false, true)
if (this.debug) {
this.buildHelpers()
this.cannonDebugRenderer = new THREE.CannonDebugRenderer( this.scene, this.world )
}
>>>>>>>
CameraController.rotate('left', false, true)
if (this.debug) {
this.buildHelpers()
this.cannonDebugRenderer = new THREE.CannonDebugRenderer( this.scene, this.world )
} |
<<<<<<<
import SoundManager from '../managers/SoundManager.js'
=======
import CameraController from '../components/CameraController/index.js'
>>>>>>>
import SoundManager from '../managers/SoundManager.js'
import CameraController from '../components/CameraController/index.js' |
<<<<<<<
import SceneManager from '../SceneManager/index.js'
import SoundManager from '../../managers/SoundManager.js'
=======
>>>>>>>
import SoundManager from '../../managers/SoundManager.js' |
<<<<<<<
if (levelWasCleared) {
return;
}
=======
localStorage.setItem('level_' + window.level.id, "solved");
>>>>>>>
if (levelWasCleared) {
return;
}
localStorage.setItem('level_' + window.level.id, "solved");
<<<<<<<
$('#win-next-level').click(goToNextLevel);
=======
$('#win-next-level').click(function() {
var next = findNextLevelInCampaign(window.levelName);
startLevel(next);
winScreen.fadeOut(300);
// TODO: go to next level
});
$('#win-go-to-menu').click(function() {
returnToMainMenu();
winScreen.fadeOut(300);
});
>>>>>>>
$('#win-next-level').click(goToNextLevel);
$('#win-go-to-menu').click(function() {
returnToMainMenu();
winScreen.fadeOut(300);
}); |
<<<<<<<
// add ( something something (something something) ) to buffer
buffer += str.substring(i, j);
=======
// add ( something something (something something) ) to codeBuffer
// TODO: may need to substring j+1
codeBuffer += str.substring(i, j+1);
>>>>>>>
// add ( something something (something something) ) to buffer
buffer += str.substring(i, j+1); |
<<<<<<<
, fs = require('fs')
, eslint = require('gulp-eslint')
, nunjucks_extensions = require('./js/nunjucks_extensions');
=======
, fs = require('fs');
>>>>>>>
, eslint = require('gulp-eslint')
, fs = require('fs');
<<<<<<<
gulp.task('lint', () => {
// ESLint ignores files with "node_modules" paths.
// So, it's best to have gulp ignore the directory as well.
// Also, Be sure to return the stream from the task;
// Otherwise, the task may end before the stream has finished.
return gulp.src(['js/**/*.js','!node_modules/**'])
// eslint() attaches the lint output to the "eslint" property
// of the file object so it can be used by other modules.
.pipe(eslint({ quiet: true }))
// eslint.format() outputs the lint results to the console.
// Alternatively use eslint.formatEach() (see Docs).
.pipe(eslint.format())
// To have the process exit with an error code (1) on
// lint error, return the stream and pipe to failAfterError last.
.pipe(eslint.failAfterError());
});
=======
>>>>>>>
gulp.task('lint', () => {
return gulp.src(['js/**/*.js','!node_modules/**'])
.pipe(eslint({ quiet: true }))
.pipe(eslint.format())
.pipe(eslint.failAfterError());
}); |
<<<<<<<
'api', '$q', '$scope', 'blog', 'notify', 'gettext',
'upload', 'config', '$rootScope', 'embedService', 'postsService', 'modal'
=======
'api', '$q', '$scope', 'blog', 'notify', 'gettext', '$route',
'upload', 'config', '$rootScope', 'embedService', 'postsService', 'modal',
'blogService'
>>>>>>>
'api', '$q', '$scope', 'blog', 'notify', 'gettext',
'upload', 'config', '$rootScope', 'embedService', 'postsService', 'modal',
'blogService'
<<<<<<<
function BlogEditController(api, $q, $scope, blog, notify, gettext,
upload, config, $rootScope, embedService, postsService, modal) {
=======
function BlogEditController(api, $q, $scope, blog, notify, gettext, $route,
upload, config, $rootScope, embedService, postsService, modal, blogService) {
>>>>>>>
function BlogEditController(api, $q, $scope, blog, notify, gettext,
upload, config, $rootScope, embedService, postsService, modal, blogService) {
<<<<<<<
postsService.savePost(blog._id, current_post, getItemsFromEditor(), 'open').then(function(post) {
=======
postsService.savePost(current_blog_id,
current_post,
getItemsFromEditor(),
{post_status: 'open'}
).then(function(post) {
>>>>>>>
postsService.savePost(blog._id,
current_post,
getItemsFromEditor(),
{post_status: 'open'}
).then(function(post) { |
<<<<<<<
gettext, modal, $q, upload, datetimeHelper, moment, config) {
=======
gettext, modal, $q, upload, config, blogSecurityService) {
>>>>>>>
gettext, modal, $q, upload, datetimeHelper, moment, config, blogSecurityService) {
<<<<<<<
'gettext', 'modal', '$q', 'upload', 'datetimeHelper', 'moment', 'config'];
=======
'gettext', 'modal', '$q', 'upload', 'config', 'blogSecurityService'];
>>>>>>>
'gettext',
'modal',
'$q',
'upload',
'datetimeHelper',
'moment',
'config',
'blogSecurityService'
]; |
<<<<<<<
window.addEventListener('keyup', globalKeyHandler, false);
function globalKeyHandler(e) { // global hotkey navigation
if ((e.keyCode || e.which) === 27) {
$window.history.back(); // close on ESC
}
}
=======
$window.addEventListener('keyup', globalKeyHandler, false);
function globalKeyHandler(e) { // global hotkey navigation
if ((e.keyCode || e.which) == 27) $window.history.back(); // close on ESC
}
>>>>>>>
window.addEventListener('keyup', globalKeyHandler, false);
function globalKeyHandler(e) { // global hotkey navigation
if ((e.keyCode || e.which) === 27) {
$window.history.back(); // close on ESC
} |
<<<<<<<
var splitDate = datetimeHelper.splitDateTime(
vm.newBlog.start_date,
config.defaultTimezone
);
vm.start_date = splitDate.date;
vm.start_time = splitDate.time;
} else {
var today = moment.tz(config.defaultTimezone);
vm.start_date = today.format(config.model.dateformat);
vm.start_time = today.format(config.model.timeformat);
=======
var datetime = vm.splitDateTime(vm.newBlog.start_date);
vm.start_date = datetime.date;
vm.start_time = datetime.time;
>>>>>>>
var splitDate = datetimeHelper.splitDateTime(
vm.newBlog.start_date,
config.defaultTimezone
);
vm.start_date = splitDate.date;
vm.start_time = splitDate.time;
} else {
var datetime = vm.splitDateTime(vm.newBlog.start_date);
vm.start_date = datetime.date;
vm.start_time = datetime.time; |
<<<<<<<
themeCreationRestrictions: {team: 3},
excludedTheme: 'angular',
=======
assignableUsers: {
solo: 3,
team: 10
},
>>>>>>>
themeCreationRestrictions: {team: 3},
excludedTheme: 'angular',
assignableUsers: {
solo: 3,
team: 10
}, |
<<<<<<<
self.ready();
$('[data-icon="close"]').show();
=======
addContentBtns.show();
>>>>>>>
self.ready();
$('[data-icon="close"]').show();
addContentBtns.show(); |
<<<<<<<
if (state.error) handleError();
=======
scope.consumerBlogId = state.consumerBlogId;
>>>>>>>
scope.consumerBlogId = state.consumerBlogId;
if (state.error) handleError(); |
<<<<<<<
} else {
// return the options when there is no more parent theme
// set default settings value from options default values
options.forEach(function(option) {
if (!angular.isDefined(theme.settings[option.name])) {
theme.settings[option.name] = option.default;
}
});
=======
>>>>>>> |
<<<<<<<
/* DESC: Button title for button that sets the start time to the first event, can be removed when DFL-3501 is integrated */
ui_strings.S_SWITCH_CHANGE_START_TO_FIRST_EVENT = "Change start time to first event";
=======
>>>>>>> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.