code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/components/views/Messaging/index.js b/src/components/views/Messaging/index.js @@ -173,9 +173,11 @@ class Messaging extends Component {
<div>{c.convo}</div>
<div>
<small>
- {`${c.content.substr(0, 25)}${
+ {c.content
+ ? `${c.content.substr(0, 25)}${
c.content.length > 25 ? "..." : ""
- }`}
+ }`
+ : null}
</small>
</div>
</li>
@@ -201,7 +203,9 @@ class Messaging extends Component {
{s.name}
</DropdownItem>
))}
+ {messageGroups && (
<DropdownItem disabled>--------------</DropdownItem>
+ )}
{messageGroups &&
messageGroups.map(g => (
<DropdownItem
@@ -211,7 +215,13 @@ class Messaging extends Component {
{g}
</DropdownItem>
))}
- <DropdownItem disabled>--------------</DropdownItem>
+ {teams &&
+ teams.filter(
+ t =>
+ messageGroups.findIndex(
+ m => m.toLowerCase().indexOf(t.type.toLowerCase()) > -1
+ ) > -1
+ ) && <DropdownItem disabled>--------------</DropdownItem>}
{teams &&
teams
.filter(
| 1 |
diff --git a/rendersettings-manager.js b/rendersettings-manager.js @@ -78,6 +78,16 @@ class RenderSettingsManager {
} = (renderSettings ?? {});
localPostProcessing.setPasses(passes);
}
+ push(srcScene, dstScene = srcScene) {
+ const renderSettings = this.findRenderSettings(srcScene);
+ // console.log('push render settings', renderSettings);
+ this.applyRenderSettingsToScene(renderSettings, dstScene);
+
+ return () => {
+ // console.log('pop render settings');
+ this.applyRenderSettingsToScene(null, dstScene);
+ };
+ }
}
const renderSettingsManager = new RenderSettingsManager();
export default renderSettingsManager;
\ No newline at end of file
| 0 |
diff --git a/src/lib/urlHelper.js b/src/lib/urlHelper.js -import url from 'url';
import sanitizeFilename from 'sanitize-filename';
import { isString, escapeRegExp, flow, partialRight } from 'lodash';
@@ -58,31 +57,3 @@ export function sanitizeSlug(str, { replacement = '-' } = {}) {
return normalizedSlug;
}
-export function urlize(string) {
- const sanitized = makePathSanitized(string);
- const parsedURL = url.parse(sanitized);
-
- return url.format(parsedURL);
-}
-
-function makePathSanitized(string) {
- return makePath(string.toLowerCase());
-}
-
-function makePath(string) {
- return unicodeSanitize(string).trim().replace(/[\s]/g, '-').replace(/-+/g, '-');
-}
-
-function unicodeSanitize(string) {
- let target = [];
- const runes = string.split('');
- for (let i=0; i < string.length; i++) {
- const r = runes[i];
- if (r == '%' && i+2 < string.length && string.substr(i+1, 2).match(/^[0-9a-f]+$/)) {
- target = target.concat([r, runes[i+1], runes[i+2]]);
- } else if (r.match(/[\w .\/\\_#\+-]/u)) {
- target.push(r);
- }
- }
- return target.join('');
-}
| 2 |
diff --git a/src/commands/Silly/Echo.js b/src/commands/Silly/Echo.js @@ -19,13 +19,14 @@ class Echo extends Command {
* Run the command
* @param {Message} message Message with a command to handle, reply to,
* or perform an action based on parameters.
+ * @param {Object} ctx command call context
* @returns {string} success status
*/
- async run(message) {
+ async run(message, ctx) {
if (message.deleteable) {
await message.delete();
}
- await this.messageManager.sendMessage(message, message.cleanContent.replace(this.call, '').trim(), false, false);
+ await this.messageManager.sendMessage(message, message.cleanContent.replace(this.call, '').replace(ctx.prefix, '').trim(), false, false);
return this.messageManager.statuses.SUCCESS;
}
}
| 2 |
diff --git a/packages/app/src/stores/ui.tsx b/packages/app/src/stores/ui.tsx @@ -12,7 +12,7 @@ import loggerFactory from '~/utils/logger';
import { useStaticSWR } from './use-static-swr';
import {
useCurrentPagePath, useIsEditable, useIsPageExist, useIsTrashPage, useIsUserPage,
- useIsNotCreatable, useIsSharedUser, useNotFoundTargetPathOrId, useIsForbidden,
+ useIsNotCreatable, useIsSharedUser, useNotFoundTargetPathOrId, useIsForbidden, useIsIdenticalPath,
} from './context';
import { IFocusable } from '~/client/interfaces/focusable';
import { isSharedPage } from '^/../core/src/utils/page-path-utils';
@@ -329,17 +329,18 @@ export const useIsAbleToShowTagLabel = (): SWRResponse<boolean, Error> => {
const key = 'isAbleToShowTagLabel';
const { data: isUserPage } = useIsUserPage();
const { data: currentPagePath } = useCurrentPagePath();
+ const { data: isIdenticalPath } = useIsIdenticalPath();
const { data: notFoundTargetPathOrId } = useNotFoundTargetPathOrId();
const { data: editorMode } = useEditorMode();
- const includesUndefined = [isUserPage, currentPagePath, notFoundTargetPathOrId, editorMode].some(v => v === undefined);
+ const includesUndefined = [isUserPage, currentPagePath, isIdenticalPath, notFoundTargetPathOrId, editorMode].some(v => v === undefined);
const isViewMode = editorMode === EditorMode.View;
const isNotFoundPage = notFoundTargetPathOrId != null;
return useSWRImmutable(
includesUndefined ? null : key,
- () => !isUserPage && !isSharedPage(currentPagePath!) && !(isViewMode && isNotFoundPage));
+ () => !isUserPage && !isSharedPage(currentPagePath!) && !isIdenticalPath && !(isViewMode && isNotFoundPage));
};
export const useIsAbleToShowPageEditorModeManager = (): SWRResponse<boolean, Error> => {
@@ -358,14 +359,12 @@ export const useIsAbleToShowPageEditorModeManager = (): SWRResponse<boolean, Err
export const useIsAbleToShowPageAuthors = (): SWRResponse<boolean, Error> => {
const key = 'isAbleToShowPageAuthors';
- const { data: notFoundTargetPathOrId } = useNotFoundTargetPathOrId();
+ const { data: isPageExist } = useIsPageExist();
const { data: isUserPage } = useIsUserPage();
- const includesUndefined = [notFoundTargetPathOrId, isUserPage].some(v => v === undefined);
-
- const isNotFoundPage = notFoundTargetPathOrId != null;
+ const includesUndefined = [isPageExist, isUserPage].some(v => v === undefined);
return useSWRImmutable(
includesUndefined ? null : key,
- () => !isNotFoundPage && !isUserPage);
+ () => isPageExist! && !isUserPage);
};
| 7 |
diff --git a/README.md b/README.md @@ -437,7 +437,7 @@ Additions to this document that are properly formatted will automatically be pus
- [Persgroep, de](https://www.persgroep.nl/werken-bij-it) | Amsterdam, Netherlands | Tech interview (technical background and experiences) and culture fit, both on-site
- [Phoodster](https://www.phoodster.com) | Stockholm, Sweden | Take-home exercise + on-site discussion
- [Pillar Technology](http://pillartechnology.com/careers) | Ann Arbor, MI; Columbus, OH; Des Moines, IA | Phone, take home exercise, in-person pairing session and site visit.
-- [Pilot](https://pilot.co/become-a-partner) | Remote | Two calls. Introduction one [30m] + verification of communication skills and remote work experience [15m]
+- [Pilot](https://pilot.co/become-a-partner) | Remote | Two calls. Introduction one (30m) + verification of communication skills and remote work experience (15m)
- [Pivotal](https://pivotal.io/careers) | San Francisco, CA; Los Angeles, CA; New York, NY; Boston, MA; Denver, CO; Atlanta, GA; Chicago, IL; Seattle, WA; Washington, D.C.; London, UK; Sydney, Australia; Toronto, Canada; Paris, France; Berlin, Germany; Tokyo, Japan | Initial remote technical screen featuring pair programming; on-site pair programming interview, generally a full day pairing on production code using test-driven development.
- [Platform.sh](https://platform.sh) | Paris, International | Remote Interview, Wide-Ranging discussions on many diverse subjects. Remote interviews with team members.
- [Platform45](https://platform45.com) | Johannesburg, South Africa; Cape Town, South Africa | On-site interview, take-home project and culture fit day
| 14 |
diff --git a/src/GuildConfig.js b/src/GuildConfig.js @@ -111,11 +111,7 @@ class GuildConfig extends Config {
* @return {String}
*/
listModRoles() {
- let roles = '';
- for (let role of this.#modRoles) {
- roles += `<@&${role}>, `
- }
- return roles.length ? roles.substring(0, roles.length-2) : 'none';
+ return this.#modRoles.map(role => `<@&${role}>`).join(', ') || 'none';
}
/**
@@ -168,11 +164,7 @@ class GuildConfig extends Config {
* @return {String}
*/
listProtectedRoles() {
- let roles = '';
- for (let role of this.#protectedRoles) {
- roles += `<@&${role}>, `
- }
- return roles.length ? roles.substring(0, roles.length-2) : 'none';
+ return this.#protectedRoles.map(role => `<@&${role}>`).join(', ') || 'none';
}
/**
| 7 |
diff --git a/public/src/game/GameSettings.jsx b/public/src/game/GameSettings.jsx @@ -10,11 +10,11 @@ const GameSettings = () => (
<span>
<Checkbox side="left" text="Show chat" link="chat" />
{!App.state.isSealed &&
- <Checkbox side="left" text="Beep on new packs" link="beep" />
+ <Checkbox side="left" text="Enable notifications on new packs" link="beep" />
}
{!App.state.isSealed &&
<Checkbox side="left"
- text={App.state.notificationBlocked ? "Browser notifications blocked" : "Use desktop notifications"}
+ text={App.state.notificationBlocked ? "Web notifications blocked in browser" : "Use desktop notifications over beep"}
link="notify"
disabled={!App.state.beep || App.state.notificationBlocked}
onChange={App._emit("notification")} />
| 7 |
diff --git a/ui/app/components/send/currency-display.js b/ui/app/components/send/currency-display.js @@ -98,9 +98,8 @@ CurrencyDisplay.prototype.handleChange = function (newVal) {
CurrencyDisplay.prototype.getInputWidth = function (valueToRender, readOnly) {
const valueString = String(valueToRender)
const valueLength = valueString.length || 1
- const dynamicBuffer = readOnly ? 0 : 1
- const decimalPointDeficit = !readOnly && valueString.match(/\./) ? -0.5 : 0
- return (valueLength + dynamicBuffer + decimalPointDeficit) + 'ch'
+ const decimalPointDeficit = valueString.match(/\./) ? -0.5 : 0
+ return (valueLength + decimalPointDeficit + 0.75) + 'ch'
}
CurrencyDisplay.prototype.render = function () {
| 7 |
diff --git a/metro/log-collector.js b/metro/log-collector.js @@ -44,7 +44,9 @@ module.exports = function logCollector () {
if (end === true) {
const accEntry = logs.get(id);
- accEntry.level = LEVELS[accEntry.level];
+ // rename level => levelname to avoid type clashing in ES
+ accEntry.levelname = LEVELS[accEntry.level];
+ delete accEntry.level;
accEntry.time = entry.time;
this.push(`${JSON.stringify(accEntry)}\n`);
logs.delete(id);
| 10 |
diff --git a/src/extensions/scratch3_boost/index.js b/src/extensions/scratch3_boost/index.js @@ -471,7 +471,7 @@ class BoostMotor {
* @param {number} direction - rotate in this direction
*/
turnOnForDegrees (degrees, direction) {
- if (this._power === 0) {
+ if (this.power === 0) {
this.pendingPromiseFunction();
return;
}
| 4 |
diff --git a/website/riot/main.riot b/website/riot/main.riot },
needAuthorization(content, subPage){
- if(['e404', 'open-dict-list', 'dict-public', 'dict-public-entry', 'docs-intro', 'docs-about'].includes(content)
+ if(['e404', 'open-dict-list', 'dict-public', 'dict-public-entry', 'docs-intro', 'docs-about', 'api'].includes(content)
|| content == 'main-page' && !['new', 'userprofile'].includes(subPage)){
return false
}
})
route('/api', () => {
- this.goTo.bind(this, 'api')
+ this.goTo('api')
})
route('/e404', () => {
this.goTo('e404')
| 11 |
diff --git a/userscript.user.js b/userscript.user.js @@ -374,7 +374,7 @@ var $$IMU_EXPORT$$;
name: "Popup UI",
description: "Enables a UI on top of the popup",
requires: {
- mouseover: true
+ mouseover_open_behavior: "popup"
},
category: "popup"
},
@@ -382,7 +382,6 @@ var $$IMU_EXPORT$$;
name: "Popup UI opacity",
description: "Opacity of the UI on top of the popup",
requires: {
- mouseover: true,
mouseover_ui: true
},
type: "number",
@@ -396,7 +395,6 @@ var $$IMU_EXPORT$$;
name: "Popup UI gallery counter",
description: "Enables a gallery counter on top of the UI",
requires: {
- mouseover: true,
mouseover_ui: true
},
category: "popup"
@@ -405,8 +403,6 @@ var $$IMU_EXPORT$$;
name: "Gallery counter max",
description: "Maximum amount of images to check in the counter",
requires: {
- mouseover: true,
- mouseover_ui: true,
mouseover_ui_gallerycounter: true
},
type: "number",
@@ -417,9 +413,10 @@ var $$IMU_EXPORT$$;
name: "Popop UI Options Button",
description: "Enables a button to go to the options screen for IMU",
requires: {
- mouseover: true,
mouseover_ui: true
},
+ // While it works for the extension, it's more or less useless
+ userscript_only: true,
category: "popup"
},
mouseover_open_behavior: {
@@ -462,7 +459,7 @@ var $$IMU_EXPORT$$;
}
},
requires: {
- mouseover: true
+ mouseover_open_behavior: "popup"
},
category: "popup"
},
@@ -483,7 +480,7 @@ var $$IMU_EXPORT$$;
}
},
requires: {
- mouseover: true
+ mouseover_open_behavior: "popup"
},
category: "popup"
},
@@ -502,7 +499,7 @@ var $$IMU_EXPORT$$;
}
},
requires: {
- mouseover: true
+ mouseover_open_behavior: "popup"
},
category: "popup"
},
@@ -522,7 +519,7 @@ var $$IMU_EXPORT$$;
}
},
requires: {
- mouseover: true
+ mouseover_open_behavior: "popup"
},
category: "popup"
},
@@ -540,7 +537,6 @@ var $$IMU_EXPORT$$;
}
},
requires: {
- mouseover: true,
mouseover_scroll_behavior: "zoom"
},
category: "popup"
@@ -559,7 +555,7 @@ var $$IMU_EXPORT$$;
}
},
requires: {
- mouseover: true
+ mouseover_open_behavior: "popup"
},
category: "popup"
},
@@ -576,7 +572,7 @@ var $$IMU_EXPORT$$;
description: "CSS style rules for the mouseover popup",
type: "textarea",
requires: {
- mouseover: true
+ mouseover_open_behavior: "popup"
},
category: "popup"
},
@@ -28209,6 +28205,13 @@ var $$IMU_EXPORT$$;
return src.replace(/(\/[0-9]+_[0-9]+_)[sr](\.[^/.]*)(?:[?#].*)?$/, "$1o$2");
}
+ if (domain === "cdn.lengmenjun.com") {
+ // http://cdn.lengmenjun.com/post/5ce0041b0425de5bcd4c3d95.jpg!lengmenjun-640
+ // http://cdn.lengmenjun.com/post/5ce0041b0425de5bcd4c3d95.jpg!lengmenjun
+ // removing ! altogether returns an error: "Forbidden access to the original image."
+ return src.replace(/!lengmenjun-[0-9]+(?:[?#].*)?$/, "!lengmenjun");
+ }
+
@@ -30170,17 +30173,29 @@ var $$IMU_EXPORT$$;
function check_disabled_options() {
var options = options_el.querySelectorAll("div.option");
- for (var i = 0; i < options.length; i++) {
- var setting = options[i].id.replace(/^option_/, "");
+ var enabled_map = {};
+ function check_option(setting) {
var meta = settings_meta[setting];
var enabled = true;
+
+ enabled_map[setting] = "processing";
+
if (meta.requires) {
// fixme: this only works for one option in meta.requires
for (var required_setting in meta.requires) {
var value = settings[required_setting];
- if (value === meta.requires[required_setting]) {
+ if (!(required_setting in enabled_map)) {
+ check_option(required_setting);
+ }
+
+ if (enabled_map[required_setting] === "processing") {
+ console_error("Dependency cycle detected for: " + setting + ", " + required_setting);
+ return;
+ }
+
+ if (enabled_map[required_setting] && value === meta.requires[required_setting]) {
enabled = true;
} else {
enabled = false;
@@ -30189,6 +30204,32 @@ var $$IMU_EXPORT$$;
}
}
+ enabled_map[setting] = enabled;
+
+ return enabled;
+ }
+
+ for (var i = 0; i < options.length; i++) {
+ var setting = options[i].id.replace(/^option_/, "");
+
+ //var meta = settings_meta[setting];
+ /*var enabled = true;
+ if (meta.requires) {
+ // fixme: this only works for one option in meta.requires
+ for (var required_setting in meta.requires) {
+ var value = settings[required_setting];
+
+
+ if (value === meta.requires[required_setting]) {
+ enabled = true;
+ } else {
+ enabled = false;
+ break;
+ }
+ }
+ }*/
+ var enabled = check_option(setting);
+
if (enabled) {
options[i].classList.remove("disabled");
| 7 |
diff --git a/vis/js/mediator.js b/vis/js/mediator.js @@ -191,11 +191,7 @@ MyMediator.prototype = {
mediator.manager.call('io', 'setContext', [context, data.length]);
mediator.manager.call('io', 'setInfo', [context]);
- mediator.init_modern_frontend_intermediate();
-
- if (config.is_streamgraph) {
- mediator.manager.call('canvas', 'setupStreamgraphCanvas', []);
- } else {
+ if (!config.is_streamgraph) {
if (config.is_force_papers && config.dynamic_force_papers)
mediator.manager.call('headstart', 'dynamicForcePapers', [data.length]);
if (config.is_force_area && config.dynamic_force_area)
@@ -204,6 +200,12 @@ MyMediator.prototype = {
mediator.manager.call('headstart', 'dynamicSizing', [data.length]);
}
+ mediator.init_modern_frontend_intermediate();
+
+ if (config.is_streamgraph) {
+ mediator.manager.call('canvas', 'setupStreamgraphCanvas', []);
+ }
+
mediator.manager.call('io', 'prepareAreas', []);
mediator.bubbles_update_data_and_areas(mediator.current_bubble);
@@ -326,6 +328,9 @@ MyMediator.prototype = {
config.base_unit = base_unit;
config.content_based = content_based;
config.initial_sort = initial_sort;
+ // TODO this might cause a bug (or there might be more params that require setting to false)
+ // bug description: map different after rescaling to the same metric
+ config.dynamic_sizing = false;
window.headstartInstance.tofile(mediator.current_file_number);
}
| 1 |
diff --git a/learn/configuration/typo_tolerance.md b/learn/configuration/typo_tolerance.md @@ -61,9 +61,15 @@ With the above settings, matches in the `title` attribute will not tolerate any
## Impact of typo tolerance on the `typo` ranking rule
-The [`typo` ranking rule](/learn/core_concepts/relevancy.md#_2-typo) sorts the results by increasing number of typos on matched query words. Documents with 0 typos will rank highest. This rule does not impact the typo tolerance setting.
+The [`typo` ranking rule](/learn/core_concepts/relevancy.md#_2-typo) sorts search results by increasing number of typos on matched query words. Documents with 0 typos will rank highest, followed by those with 1 and then 2 typos.
-If you don't use the `typo` ranking rule but enable typo tolerance for an index, Meilisearch will use typo tolerance to match documents but won't sort them based on increasing number of typos.
+The presence or absence of the `typo` ranking rule has no impact on the typo tolerance setting. However, [disabling the typo tolerance setting](#configuring-typo-tolerance) effectively also disables the `typo` ranking rule. This is because all returned documents will contain `0` typos.
+
+To summarize:
+
+- Typo tolerance affects how lenient Meilisearch is when matching documents
+- The `typo` ranking rule affects how Meilisearch sorts its results
+- Disabling typo tolerance also disables `typo`
## How are typos calculated
| 7 |
diff --git a/src/content/developers/docs/gas/index.md b/src/content/developers/docs/gas/index.md @@ -73,8 +73,8 @@ The base fee is calculated by a formula that compares the size of the previous b
| Block Number | Included Gas | Fee Increase | Current Base Fee |
| ------------ | -----------: | -----------: | ---------------: |
-| 1 | 15M | 0% | 100.0 gwei |
-| 2 | 30M | 0% | 100.0 gwei |
+| 1 | 15M | 0% | 100 gwei |
+| 2 | 30M | 0% | 100 gwei |
| 3 | 30M | 12.5% | 112.5 gwei |
| 4 | 30M | 12.5% | 126.6 gwei |
| 5 | 30M | 12.5% | 142.4 gwei |
| 13 |
diff --git a/src/physics/collision.js b/src/physics/collision.js @@ -322,7 +322,7 @@ var collision = {
for (var i = candidates.length, objB; i--, (objB = candidates[i]);) {
// fast AABB check if both bounding boxes are overlaping
- if (objB.body && line.getBounds().overlaps(objB.body.getBounds())) {
+ if (objB.body && line.getBounds().overlaps(objB.getBounds())) {
// go trough all defined shapes in B (if any)
var bLen = objB.body.shapes.length;
| 1 |
diff --git a/includes/Modules/Site_Verification.php b/includes/Modules/Site_Verification.php @@ -32,16 +32,6 @@ use Exception;
final class Site_Verification extends Module implements Module_With_Scopes {
use Module_With_Scopes_Trait;
- /**
- * Temporary storage for very specific data for 'verification' datapoint.
- *
- * Bad to have, but works for now.
- *
- * @since 1.0.0
- * @var array|null
- */
- private $_siteverification_list_data = null;
-
/**
* Registers functionality through WordPress hooks.
*
@@ -99,11 +89,6 @@ final class Site_Verification extends Module implements Module_With_Scopes {
case 'verified-sites':
return $this->get_siteverification_service()->webResource->listWebResource();
case 'verification':
- // This is far from optimal and hacky, but works for now.
- if ( ! empty( $data['siteURL'] ) ) {
- $this->_siteverification_list_data = $data;
- }
-
return $this->get_siteverification_service()->webResource->listWebResource();
case 'verification-token':
$existing_token = $this->authentication->verification_tag()->get();
@@ -244,9 +229,8 @@ final class Site_Verification extends Module implements Module_With_Scopes {
return $data;
case 'verification':
- if ( is_array( $this->_siteverification_list_data ) && isset( $this->_siteverification_list_data['siteURL'] ) ) {
- $current_url = trailingslashit( $this->_siteverification_list_data['siteURL'] );
- $this->_siteverification_list_data = null;
+ if ( $data['siteURL'] ) {
+ $current_url = trailingslashit( $data['siteURL'] );
} else {
$current_url = trailingslashit( $this->context->get_reference_site_url() );
}
| 2 |
diff --git a/assets/js/components/legacy-notifications/index.js b/assets/js/components/legacy-notifications/index.js @@ -31,7 +31,6 @@ import DashboardCoreSiteAlerts from './DashboardCoreSiteAlerts';
import DashboardSetupAlerts from './dashboard-setup-alerts';
import DashboardModulesAlerts from './dashboard-modules-alerts';
import UserInputPromptNotification from '../notifications/UserInputPromptNotification';
-import UnsatisfiedScopesAlert from '../notifications/UnsatisfiedScopesAlert';
const { setup } = global._googlesitekitLegacyData;
const notification = getQueryParameter( 'notification' );
@@ -40,19 +39,11 @@ const addCoreSiteNotifications = createAddToFilter( <DashboardCoreSiteAlerts />
const addSetupNotifications = createAddToFilter( <DashboardSetupAlerts /> );
const addModulesNotifications = createAddToFilter( <DashboardModulesAlerts /> );
const addUserInputPrompt = createAddToFilter( <UserInputPromptNotification /> );
-const addAuthNotification = createAddToFilter( <UnsatisfiedScopesAlert /> );
addFilter( 'googlesitekit.DashboardNotifications',
'googlesitekit.SetupNotification',
addCoreSiteNotifications, 10 );
-if ( setup.needReauthenticate ) {
- // TODO: This filter needs replacing with the store action setInternalServerError
- addFilter( 'googlesitekit.ErrorNotification',
- 'googlesitekit.AuthNotification',
- addAuthNotification, 1 );
-}
-
if ( isFeatureEnabled( 'userInput' ) ) {
addFilter( 'googlesitekit.DashboardNotifications',
'googlesitekit.UserInputSettings',
| 2 |
diff --git a/test/browse.es b/test/browse.es @@ -23,7 +23,8 @@ module.exports = async function ( url = new URL ('https://snuggsi.com') ) {
console.warn ('Browsing to', data (html))
void await (await browser.newPage ``)
- .goto (url)
+ //.goto ( data (html) )
+ .setContent ( html )
await browser.close ``
}
| 12 |
diff --git a/.travis.yml b/.travis.yml @@ -10,8 +10,6 @@ matrix:
- libxext-dev
- libxss-dev
- libxkbfile-dev
- - os: osx
- osx_image: xcode13.1
language: node_js
@@ -23,6 +21,7 @@ before_script:
script:
- npm run test
+- if [ "$TRAVIS_OS_NAME" = "linux" ]; npm config set python python3.10; fi
- travis_wait 60 npm run build
cache: npm
| 12 |
diff --git a/userscript.user.js b/userscript.user.js @@ -34443,16 +34443,44 @@ var $$IMU_EXPORT$$;
// https://media.salon.com/2019/05/Game_Of_Thrones_Finale_Dany.jpg
domain === "mediaproxy.salon.com") {
// https://docs.cloudimage.io/go/cloudimage-documentation-v7/en/introduction (thanks to https://github.com/qsniyg/maxurl/issues/312)
+ // https://docs.cloudimage.io/go/cloudimage-documentation/en/operations (v6)
// https://c6oxm85c.cloudimg.io/cdno/n/q10/https://az617363.vo.msecnd.net/imgmodels/models/MD30001282/gallery-1502272667-cara1a74d8ff2128d26eea7a6b74247a45669_thumb.jpg
// https://az617363.vo.msecnd.net/imgmodels/models/MD30001282/gallery-1502272667-cara1a74d8ff2128d26eea7a6b74247a45669_thumb.jpg
// https://ce8737e8c.cloudimg.io/width/359/q90/https://twg-live.s3.amazonaws.com/artist_image/twg_11_1519846018_0.jpg
// https://twg-live.s3.amazonaws.com/artist_image/twg_11_1519846018_0.jpg
// https://doc.cloudimg.io/v7/sample.li/paris.jpg?width=400&wat=1&wat_scale=35&wat_gravity=northeast&wat_pad=10&grey=1
// https://doc.cloudimg.io/v7/sample.li/paris.jpg
- newsrc = src.replace(/^[a-z]+:\/\/[^/]*\/(?:cdn[a-z]\/n\/)?(?:(?:width|height)\/[0-9]+\/)*(?:q[0-9]*\/)?([a-z]*:\/\/)/, "$1");
+ // https://demo.cloudimg.io/cdn/n/n/http://sample.li/positionning-test-1.jpg
+ // http://sample.li/positionning-test-1.jpg
+ // https://demo.cloudimg.io/crop_px/1000,0,1500,800-200/n/sample.li/girls.jpg
+ // http://sample.li/girls.jpg
+ // https://demo.cloudimg.io/crop_px/2000,0,2500,800-x350/n/sample.li/girls.jpg
+ // http://sample.li/girls.jpg
+ // https://demo.cloudimg.io/crop_px/1500,400,2000,1300-200x300/n/sample.li/girls.jpg
+ // http://sample.li/girls.jpg
+ // https://demo.cloudimg.io/fit/200x180/c3498db/sample.li/tesla.jpg
+ // http://sample.li/tesla.jpg
+ // https://demo.cloudimg.io/width/500/none/sample.li/frog.png
+ // http://sample.li/frog.png
+ // https://demo.cloudimg.io/crop/400x340/n/sample.li/flat2.jpg?v&mark_url=http://sample.li/sothebys-blue.jpg&mark_height=58&mark_pos=southwest&mark_pad=10
+ // http://sample.li/flat2.jpg
+ //newsrc = src.replace(/^[a-z]+:\/\/[^/]*\/(?:cdn[a-z]?\/)?(?:(?:(?:width|height)\/[0-9]+|n|q[0-9]+|fit\/[0-9]+x[0-9]+\/+)\/)*((?:[a-z]+:\/\/)?[^/]+\.[^/.]+\/)/, "$1");
+ newsrc = src.replace(/^[a-z]+:\/\/[^/]+\/+(?:cdn|cdno|fit|width|height|crop(?:_px)?|cover|fit|bound)\/(?:[0-9]+|[0-9]+(?:,[0-9]+){3}-[0-9]*x?[0-9]+|[0-9]+x[0-9]+|n(?:one)?)\/[^/]+\/((?:[a-z]+:\/\/)?[^/]+\.[^/.]+\/.*?)(?:[?#].*)?$/, "$1");
if (newsrc !== src)
- return newsrc;
+ return add_http(newsrc);
+
+ // https://abrgsyenen.cloudimg.io/v7/https://fi.bigshopper.com/logos/agradi.jpg?func=bound&force_format=webp&q=95&org_if_sml=1&ci_sign=12fdf6a4b3a9fc2518de55d0f6329aee22b35bac
+ // https://abrgsyenen.cloudimg.io/v7/https://fi.bigshopper.com/logos/agradi.jpg -- 401 unauthorized
+ // https://fi.bigshopper.com/logos/agradi.jpg
+ newsrc = src.replace(/^[a-z]+:\/\/[^/]+\/+v7\/+(.*?)(?:[?#].*)?$/, "$1");
+ if (newsrc !== src)
+ return add_http(newsrc);
+ // https://docs.cloudimage.io/go/cloudimage-documentation-v7/en/security/token-security/url-signature
+ // TODO: check for &ci_sign=?
+ // https://abrgsyenen.cloudimg.io/v7/https://fi.bigshopper.com/logos/agradi.jpg?func=bound&force_format=webp&q=95&org_if_sml=1&ci_sign=12fdf6a4b3a9fc2518de55d0f6329aee22b35bac
+ // https://abrgsyenen.cloudimg.io/v7/https://fi.bigshopper.com/logos/agradi.jpg -- 401 unauthorized
+ // https://fi.bigshopper.com/logos/agradi.jpg
return src.replace(/\?.*/, "");
}
| 7 |
diff --git a/__tests__/sliderStyles.test.js b/__tests__/sliderStyles.test.js @@ -2,7 +2,7 @@ import { mount } from 'enzyme'
import assign from 'object-assign'
import { getRequiredLazySlides } from '../src/utils/innerSliderUtils'
import { createInnerSliderWrapper, clickNext, clickPrev,
- tryAllConfigs, actualTrackLeft
+ tryAllConfigs, actualTrackLeft, testTrackLeft
} from './testUtils'
import { getTrackLeft } from '../src/mixins/trackHelper'
| 0 |
diff --git a/Specs/Scene/Cesium3DTilesetSpec.js b/Specs/Scene/Cesium3DTilesetSpec.js @@ -2909,12 +2909,8 @@ describe(
conditions: [["${id} > 0", 'color("black")']],
},
});
- expect(
- tileset.root.content.getFeature(0).hasProperty('color("white")')
- );
- expect(
- tileset.root.content.getFeature(1).hasProperty('color("black")')
- );
+ expect(tileset.root.content.getFeature(0).color).toEqual(Color.WHITE);
+ expect(tileset.root.content.getFeature(1).color).toEqual(Color.BLACK);
}
);
});
@@ -2927,23 +2923,15 @@ describe(
conditions: [["${id} > 0", 'show("false")']],
},
});
- expect(
- tileset.root.content.getFeature(0).hasProperty('show("true")')
- );
- expect(
- tileset.root.content.getFeature(1).hasProperty('show("false")')
- );
+ expect(tileset.root.content.getFeature(0).show).toBe(true);
+ expect(tileset.root.content.getFeature(1).show).toBe(false);
tileset.style = new Cesium3DTileStyle({
show: {
conditions: [["${id} > 0", 'show("true")']],
},
});
- expect(
- tileset.root.content.getFeature(0).hasProperty('show("true")')
- );
- expect(
- tileset.root.content.getFeature(1).hasProperty('show("true")')
- );
+ expect(tileset.root.content.getFeature(0).show).toBe(true);
+ expect(tileset.root.content.getFeature(1).show).toBe(true);
}
);
});
| 13 |
diff --git a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs @@ -106,7 +106,7 @@ export const <%= entityReactName %> = (props: I<%= entityReactName %>Props) => {
<%_ } else { _%>
props.getEntities();
<%_ } _%>
- }, []);
+ }, [<%_ if (searchEngine === 'elasticsearch' && pagination === 'no') { _%>search<%_ } _%>]);
<%_ if (pagination === 'infinite-scroll') { _%>
useEffect(() => {
@@ -133,12 +133,6 @@ export const <%= entityReactName %> = (props: I<%= entityReactName %>Props) => {
}
};
- <%_ if (pagination === 'no') { _%>
- useEffect(() => {
- props.getEntities()
- }, [search]);
- <%_ } _%>
-
const clear = () => {
<%_ if (pagination === 'infinite-scroll') { _%>
props.reset();
| 1 |
diff --git a/site/tutorials/tutorial-two-javascript.md b/site/tutorials/tutorial-two-javascript.md @@ -82,7 +82,7 @@ var msg = process.argv.slice(2).join(' ') || "Hello World!";
channel.assertQueue(queue, {
durable: true
});
-channel.sendToQueue(queue, new Buffer(msg), {
+channel.sendToQueue(queue, Buffer.from(msg), {
persistent: true
});
console.log(" [x] Sent '%s'", msg);
| 14 |
diff --git a/lib/pool.js b/lib/pool.js @@ -217,17 +217,10 @@ Pool.prototype.escapeId = function escapeId(value) {
function spliceConnection(queue, connection) {
var len = queue.length;
- if (len) {
- if (queue.get(len - 1) === connection) {
- queue.pop();
- } else {
- for (; --len; ) {
- if (queue.get(0) === connection) {
- queue.shift();
+ for (var i = 0; i < len; i++) {
+ if (queue.get(i) === connection) {
+ queue.removeOne(i);
break;
}
- queue.push(queue.shift());
- }
- }
}
}
| 7 |
diff --git a/src/lib/gundb/UserStorage.js b/src/lib/gundb/UserStorage.js @@ -1144,8 +1144,8 @@ export class UserStorage {
* @returns {Promise<boolean>|Promise<boolean>}
*/
async userAlreadyExist(): Promise<boolean> {
- logger.debug('userAlreadyExist', this.profile, await this.profile)
const profile = await this.profile
+ logger.debug('userAlreadyExist', profile)
return !!profile
}
| 2 |
diff --git a/includes/Modules/TagManager.php b/includes/Modules/TagManager.php @@ -32,16 +32,6 @@ final class TagManager extends Module implements Module_With_Scopes {
const OPTION = 'googlesitekit_tagmanager_settings';
- /**
- * Temporary storage for requested account ID while retrieving containers.
- *
- * Bad to have, but works for now.
- *
- * @since 1.0.0
- * @var string|null
- */
- private $_containers_account_id = null;
-
/**
* Registers functionality through WordPress hooks.
*
@@ -356,8 +346,6 @@ final class TagManager extends Module implements Module_With_Scopes {
/* translators: %s: Missing parameter name */
return new WP_Error( 'missing_required_param', sprintf( __( 'Request parameter is empty: %s.', 'google-site-kit' ), 'accountId' ), array( 'status' => 400 ) );
}
- $this->_containers_account_id = $data['accountId'];
-
$service = $this->get_service( 'tagmanager' );
return $service->accounts_containers->listAccountsContainers( "accounts/{$data['accountId']}" );
}
@@ -503,13 +491,7 @@ final class TagManager extends Module implements Module_With_Scopes {
return array_merge( $response, compact( 'containers' ) );
case 'containers':
- $account_id = null;
- if ( ! empty( $this->_containers_account_id ) ) {
- $account_id = $this->_containers_account_id;
-
- $this->_containers_account_id = null;
- }
-
+ $account_id = $data['accountId'];
$response = $response->getContainer();
if ( empty( $response ) && ! empty( $account_id ) ) {
| 2 |
diff --git a/src/common/i18n.js b/src/common/i18n.js import sha1 from 'sha1';
+import RenderHTML from 'react-render-html';
import zhTw from './translations/zh_TW/i10n.json';
import zhCn from './translations/zh_CN/i10n.json';
import it from './translations/it_IT/i10n.json';
@@ -11,7 +12,6 @@ import fr from './translations/fr_FR/i10n.json';
import en from './translations/en/i10n.json';
import ach from './translations/ach_UG/i10n.json';
import id from './translations/id_ID/i10n.json';
-import RenderHTML from 'react-render-html';
export const supportedLanguages = {
zh_tw: zhTw,
| 3 |
diff --git a/packages/cx/src/widgets/form/variables.scss b/packages/cx/src/widgets/form/variables.scss @@ -316,7 +316,7 @@ $cx-dependencies: map-merge(
"cx/widgets/NumberField": "cx/widgets/Field",
"cx/widgets/MonthField": "cx/widgets/Field" "cx/widgets/MonthPicker" "cx/widgets/Dropdown",
"cx/widgets/ColorField": "cx/widgets/Field" "cx/widgets/ColorPicker" "cx/widgets/Dropdown",
- "cx/widgets/LookupField": "cx/widgets/Field" "cx/widgets/Dropdown",
+ "cx/widgets/LookupField": "cx/widgets/Field" "cx/widgets/Dropdown" "cx/widgets/List",
"cx/widgets/Select": "cx/widgets/Field",
"cx/widgets/Slider": "cx/widgets/Field",
"cx/widgets/Switch": "cx/widgets/Field",
| 0 |
diff --git a/lib/shared/addon/components/cluster-driver/driver-amazoneks/component.js b/lib/shared/addon/components/cluster-driver/driver-amazoneks/component.js @@ -10,6 +10,7 @@ import { equal } from '@ember/object/computed';
import { inject as service } from '@ember/service';
import $ from 'jquery';
import { rcompare, coerce } from 'semver';
+import { isEmpty } from '@ember/utils';
const REGIONS = ['us-east-2', 'us-east-1', 'us-west-2', 'ap-east-1', 'ap-south-1', 'ap-northeast-1', 'ap-northeast-2', 'ap-southeast-1', 'ap-southeast-2', 'ca-central-1', 'eu-central-1', 'eu-west-1', 'eu-west-2', 'eu-west-3', 'eu-north-1', 'me-south-1', 'sa-east-1'];
const RANCHER_GROUP = 'rancher-nodes';
@@ -504,4 +505,16 @@ export default Component.extend(ClusterDriver, {
});
});
},
+
+ willSave() {
+ // temporary measure put in place for rancher/rancher#24652
+ const { config: { subnets } } = this;
+
+ if (isEmpty(subnets)) {
+ set(this, 'config.subnets', []);
+ }
+
+ return this._super(...arguments);
+ },
+
});
| 12 |
diff --git a/packages/wast-parser/src/tokenizer.js b/packages/wast-parser/src/tokenizer.js @@ -128,13 +128,13 @@ function tokenize(input: string) {
/**
* Can be used to look at the last few character(s).
*
- * The default behavior `lookback()` simply returns the last character.
+ * The default behavior `lookbehind()` simply returns the last character.
*
* @param int length How many characters to query. Default = 1
* @param int offset How many characters to skip back from current one. Default = 1
*
*/
- function lookback(length = 1, offset = 1) {
+ function lookbehind(length = 1, offset = 1) {
return input.substring(current - offset, current - offset + length);
}
@@ -292,8 +292,8 @@ function tokenize(input: string) {
while (
numberLiterals.test(char) ||
- (lookback() === "p" && char === "+") ||
- (lookback().toUpperCase() === "E" && char === "-") ||
+ (lookbehind() === "p" && char === "+") ||
+ (lookbehind().toUpperCase() === "E" && char === "-") ||
(value.length > 0 && char.toUpperCase() === "E")
) {
if (char === "p" && value.includes("p")) {
| 10 |
diff --git a/docs/deep/openapi.yml b/docs/deep/openapi.yml @@ -119,3 +119,58 @@ paths:
type: string
type: object
+ /tribes:
+ get:
+ tags:
+ - tribes
+ summary: Add a new channel for tribe in tribe server
+ description: Create new tribe text channel.
+ operationId: createChannel
+ responses:
+ '200':
+ content:
+ application/json:
+ schema:
+ properties:
+ success:
+ type: boolean
+ response:
+ type: object
+ properties:
+ id:
+ type: integer
+ tribe_uuid:
+ type: string
+ name:
+ type: string
+ created:
+ type: string
+ format: date-time
+ deleted:
+ type: boolean
+ type: object
+ description: Success
+ '405':
+ description: Invalid input
+ parameters:
+ - description: "Authentication token."
+ in: header
+ name: x-user-token
+ required: true
+ schema:
+ type: string
+ requestBody:
+ content:
+ application/json:
+ schema:
+ properties:
+ tribe_uuid:
+ description: The id of the tribe to add channel to.
+ type: string
+ host:
+ description: the domain of the host tribe server.
+ type: string
+ name:
+ type: string
+ type: object
+
| 0 |
diff --git a/contracts/ERC20FeeToken.sol b/contracts/ERC20FeeToken.sol @@ -109,6 +109,14 @@ contract ERC20FeeToken is Owned, SafeDecimalMath {
TransferFeeRateUpdate(newFeeRate);
}
+ function setFeeAuthority(address newFeeAuthority)
+ public
+ onlyOwner
+ {
+ feeAuthority = newFeeAuthority;
+ FeeAuthorityUpdate(newFeeAuthority);
+ }
+
/* ========== VIEW FUNCTIONS ========== */
@@ -226,5 +234,7 @@ contract ERC20FeeToken is Owned, SafeDecimalMath {
event TransferFeeRateUpdate(uint newFeeRate);
event FeeWithdrawal(address indexed account, uint value);
+
+ event FeeAuthorityUpdate(address feeAuthority)
}
| 11 |
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml @@ -6,7 +6,7 @@ name: Android release
# events but only for the master branch
on:
push:
- branches: [master, staging, next, 3493-code-push]
+ branches: [master, staging, next]
pull_request:
branches: [master]
types:
| 2 |
diff --git a/weapons-manager.js b/weapons-manager.js @@ -1613,6 +1613,60 @@ renderer.domElement.addEventListener('drop', async e => {
}));
scene.add(cubeMesh); */
+const radius = 1/2;
+const height = 1;
+const halfHeight = height/2;
+const cylinderMesh = new THREE.Mesh(
+ new THREE.CylinderBufferGeometry(radius, radius, height),
+ new THREE.MeshBasicMaterial({
+ color: 0x00FFFF,
+ })
+);
+scene.add(cylinderMesh);
+const _handleDamageUpdate = () => {
+ const transforms = rigManager.getRigTransforms();
+ const {position, quaternion} = transforms[0];
+ const outPosition = position.clone()
+ .add(new THREE.Vector3(0, 0, -1).applyQuaternion(quaternion));
+ cylinderMesh.position.copy(outPosition);
+ cylinderMesh.quaternion.copy(quaternion);
+};
+const _handleDamageCick = () => {
+ if (document.pointerLockElement) {
+ // cylinderMesh.position
+ /* _getAvatarCapsule(localVector);
+ localVector.add(p); */
+ const collision = geometryManager.geometryWorker.collidePhysics(geometryManager.physics, radius, halfHeight, cylinderMesh.position, cylinderMesh.quaternion, 1);
+ console.log('got collision', collision);
+ /* if (highlightedPhysicsObject) {
+ if (highlightPhysicsMesh.physicsId !== highlightedPhysicsId) {
+ const physics = physicsManager.getGeometry(highlightedPhysicsId);
+
+ if (physics) {
+ let geometry = new THREE.BufferGeometry();
+ geometry.setAttribute('position', new THREE.BufferAttribute(physics.positions, 3));
+ geometry.setIndex(new THREE.BufferAttribute(physics.indices, 1));
+ geometry = geometry.toNonIndexed();
+ geometry.computeVertexNormals();
+
+ highlightPhysicsMesh.geometry.dispose();
+ highlightPhysicsMesh.geometry = geometry;
+ // highlightPhysicsMesh.scale.setScalar(1.05);
+ highlightPhysicsMesh.physicsId = highlightedPhysicsId;
+ }
+ }
+
+ const physicsTransform = physicsManager.getPhysicsTransform(highlightedPhysicsId);
+
+ highlightPhysicsMesh.position.copy(physicsTransform.position);
+ highlightPhysicsMesh.quaternion.copy(physicsTransform.quaternion);
+ highlightPhysicsMesh.material.uniforms.uTime.value = (Date.now()%1500)/1500;
+ highlightPhysicsMesh.material.uniforms.uTime.needsUpdate = true;
+ highlightPhysicsMesh.visible = true;
+ } */
+ }
+};
+
const weaponsManager = {
// weapons,
// cubeMesh,
@@ -1713,6 +1767,7 @@ const weaponsManager = {
},
menuClick() {
_click();
+ _handleDamageCick();
},
menuMouseDown() {
_mousedown();
@@ -1887,6 +1942,7 @@ const weaponsManager = {
},
update() {
_updateWeapons();
+ _handleDamageUpdate();
},
};
export default weaponsManager;
\ No newline at end of file
| 0 |
diff --git a/src/jspdf.js b/src/jspdf.js @@ -1634,25 +1634,25 @@ var jsPDF = (function(global) {
out("/Resources " + page.resourceDictionaryObjId + " 0 R");
out(
"/MediaBox [" +
- parseFloat(f2(page.mediaBox.bottomLeftX)) +
+ parseFloat(hpf(page.mediaBox.bottomLeftX)) +
" " +
- parseFloat(f2(page.mediaBox.bottomLeftY)) +
+ parseFloat(hpf(page.mediaBox.bottomLeftY)) +
" " +
- f2(page.mediaBox.topRightX) +
+ hpf(page.mediaBox.topRightX) +
" " +
- f2(page.mediaBox.topRightY) +
+ hpf(page.mediaBox.topRightY) +
"]"
);
if (page.cropBox !== null) {
out(
"/CropBox [" +
- f2(page.cropBox.bottomLeftX) +
+ hpf(page.cropBox.bottomLeftX) +
" " +
- f2(page.cropBox.bottomLeftY) +
+ hpf(page.cropBox.bottomLeftY) +
" " +
- f2(page.cropBox.topRightX) +
+ hpf(page.cropBox.topRightX) +
" " +
- f2(page.cropBox.topRightY) +
+ hpf(page.cropBox.topRightY) +
"]"
);
}
@@ -1660,13 +1660,13 @@ var jsPDF = (function(global) {
if (page.bleedBox !== null) {
out(
"/BleedBox [" +
- f2(page.bleedBox.bottomLeftX) +
+ hpf(page.bleedBox.bottomLeftX) +
" " +
- f2(page.bleedBox.bottomLeftY) +
+ hpf(page.bleedBox.bottomLeftY) +
" " +
- f2(page.bleedBox.topRightX) +
+ hpf(page.bleedBox.topRightX) +
" " +
- f2(page.bleedBox.topRightY) +
+ hpf(page.bleedBox.topRightY) +
"]"
);
}
@@ -1674,13 +1674,13 @@ var jsPDF = (function(global) {
if (page.trimBox !== null) {
out(
"/TrimBox [" +
- f2(page.trimBox.bottomLeftX) +
+ hpf(page.trimBox.bottomLeftX) +
" " +
- f2(page.trimBox.bottomLeftY) +
+ hpf(page.trimBox.bottomLeftY) +
" " +
- f2(page.trimBox.topRightX) +
+ hpf(page.trimBox.topRightX) +
" " +
- f2(page.trimBox.topRightY) +
+ hpf(page.trimBox.topRightY) +
"]"
);
}
@@ -1688,13 +1688,13 @@ var jsPDF = (function(global) {
if (page.artBox !== null) {
out(
"/ArtBox [" +
- f2(page.artBox.bottomLeftX) +
+ hpf(page.artBox.bottomLeftX) +
" " +
- f2(page.artBox.bottomLeftY) +
+ hpf(page.artBox.bottomLeftY) +
" " +
- f2(page.artBox.topRightX) +
+ hpf(page.artBox.topRightX) +
" " +
- f2(page.artBox.topRightY) +
+ hpf(page.artBox.topRightY) +
"]"
);
}
@@ -3238,7 +3238,7 @@ var jsPDF = (function(global) {
charSpace = options.charSpace || activeCharSpace;
if (typeof charSpace !== "undefined") {
- xtra += f3(scale(charSpace)) + " Tc\n";
+ xtra += hpf(scale(charSpace)) + " Tc\n";
this.setCharSpace(this.getCharSpace() || 0);
}
@@ -3391,7 +3391,7 @@ var jsPDF = (function(global) {
newY = l === 0 ? getVerticalCoordinate(y) : -leading;
newX = l === 0 ? getHorizontalCoordinate(x) : 0;
if (l < len - 1) {
- wordSpacingPerLine.push(f2(scale(((maxWidth - lineWidths[l]) / (da[l].split(" ").length - 1)))));
+ wordSpacingPerLine.push(hpf(scale(((maxWidth - lineWidths[l]) / (da[l].split(" ").length - 1)))));
}
text.push([da[l], newX, newY]);
}
@@ -3460,7 +3460,7 @@ var jsPDF = (function(global) {
parmTransformationMatrix.ty = parmPosY;
position = parmTransformationMatrix.join(" ") + " Tm\n";
} else {
- position = f2(parmPosX) + " " + f2(parmPosY) + " Td\n";
+ position = hpf(parmPosX) + " " + hpf(parmPosY) + " Td\n";
}
return position;
};
@@ -3499,7 +3499,7 @@ var jsPDF = (function(global) {
var result = "BT\n/";
result += activeFontKey + " " + activeFontSize + " Tf\n"; // font face, style, size
- result += f2(activeFontSize * lineHeight) + " TL\n"; // line spacing
+ result += hpf(activeFontSize * lineHeight) + " TL\n"; // line spacing
result += textColor + "\n";
result += xtra;
result += text;
@@ -4397,7 +4397,7 @@ var jsPDF = (function(global) {
* @name setLineWidth
*/
var setLineWidth = (API.__private__.setLineWidth = API.setLineWidth = function(width) {
- out(f2(scale(width)) + " w");
+ out(hpf(scale(width)) + " w");
return this;
});
@@ -4428,10 +4428,10 @@ var jsPDF = (function(global) {
dashArray = dashArray
.map(function(x) {
- return f3(scale(x));
+ return hpf(scale(x));
})
.join(" ");
- dashPhase = f3(scale(dashPhase));
+ dashPhase = hpf(scale(dashPhase));
out("[" + dashArray + "] " + dashPhase + " d");
return this;
@@ -4518,14 +4518,14 @@ var jsPDF = (function(global) {
var getHorizontalCoordinateString = (API.__private__.getHorizontalCoordinateString = API.getHorizontalCoordinateString = function(
value
) {
- return f2(scale(value));
+ return hpf(scale(value));
});
var getVerticalCoordinateString = (API.__private__.getVerticalCoordinateString = API.getVerticalCoordinateString = function(
value
) {
var pageHeight = pagesContext[currentPage].mediaBox.topRightY - pagesContext[currentPage].mediaBox.bottomLeftY;
- return f2(pageHeight - scale(value));
+ return hpf(pageHeight - scale(value));
});
var strokeColor = options.strokeColor || "0 G";
| 14 |
diff --git a/src/components/AppSwitch.js b/src/components/AppSwitch.js @@ -73,7 +73,13 @@ class AppSwitch extends React.Component<LoadingProps, {}> {
if (jwt) {
log.debug('New account, not verified, or did not finish signup', jwt)
+
+ if (this.props.store.get('destinationPath') !== '') {
+ this.props.navigation.navigate(JSON.parse(this.props.store.get('destinationPath')))
+ this.props.store.set('destinationPath')('')
+ } else {
this.props.navigation.navigate('Auth')
+ }
} else {
// TODO: handle other statuses (4xx, 5xx), consider exponential backoff
log.error('Failed to sign in', credsOrError)
| 9 |
diff --git a/src/connectors/joox.js b/src/connectors/joox.js const playerSelector = '.kIpMXu';
const artistSelector = `${playerSelector} .kOwKMw a`;
+Connector.useMediaSessionApi();
+
Connector.playerSelector = playerSelector;
Connector.trackSelector = '.xXMwE';
@@ -14,4 +16,8 @@ Connector.getArtist = () => {
return Util.joinArtists(Array.from(artistNodes));
};
+Connector.currentTimeSelector = '#currentTime';
+
+Connector.durationSelector = '.GeFxq';
+
Connector.playButtonSelector = '.playerIcon--play';
| 7 |
diff --git a/src/core/Core.test.js b/src/core/Core.test.js @@ -534,7 +534,7 @@ describe('src/Core', () => {
remote: '',
size: 17175,
source: 'jest',
- type: { general: 'image', specific: 'jpeg' }
+ type: { general: 'image', specific: 'jpeg', mime: 'image/jpeg' }
}
expect(core.state.files[fileId]).toEqual(newFile)
newFile.preview = undefined // not sure why this happens.. needs further investigation
| 0 |
diff --git a/src/DragAndDrop.jsx b/src/DragAndDrop.jsx @@ -139,20 +139,33 @@ const DragAndDrop = () => {
}
}, [canvasRef]);
+ const _currentFileClick = () => {
+ e.preventDefault();
+ e.stopPropagation();
+ };
const _drop = e => {
+ e.preventDefault();
+ e.stopPropagation();
+
console.log('drop', currentFile);
};
const _equip = e => {
+ e.preventDefault();
+ e.stopPropagation();
+
console.log('equip', currentFile);
};
const _mint = e => {
+ e.preventDefault();
+ e.stopPropagation();
+
console.log('mint', currentFile);
};
return (
<div className={style.dragAndDrop}>
{currentFile ? (
- <div className={style.currentFile}>
+ <div className={style.currentFile} onClick={_currentFileClick}>
<h1 className={style.heading}>Upload object</h1>
<div className={style.body}>
<canvas className={style.canvas} width={canvasWidth} height={canvasHeight} ref={canvasRef} />
| 9 |
diff --git a/test/functional/specs/Command Logic/C2580.js b/test/functional/specs/Command Logic/C2580.js @@ -36,7 +36,7 @@ const getAlloyCommandQueueLength = ClientFunction(() => {
return window.alloy.q.length;
});
-test.only("C2580: Command queueing test.", async () => {
+test("C2580: Command queueing test.", async () => {
await configureAlloy(debugEnabledConfig);
await getLibraryInfoCommand();
await t.expect(getAlloyCommandQueueLength()).eql(2);
| 2 |
diff --git a/modules/xerte/parent_templates/Nottingham/common_html5/css/mainStyles.css b/modules/xerte/parent_templates/Nottingham/common_html5/css/mainStyles.css @@ -972,6 +972,7 @@ a:focus .wcagLogo {
}
.audioTranscript .mejs-container .mejs-controls .audioTranscriptBtn button, #x_footerBlock .audioTranscript .mejs-container .mejs-controls .audioTranscriptBtn button {
+ font-family: "Font Awesome 5 Free";
background-image: none;
font-size: 15px !important;
color: #eee;
| 1 |
diff --git a/CHANGES.md b/CHANGES.md - Fixed a bug where updating `ModelExperimental`'s model matrix would not update its bounding sphere. [#10078](https://github.com/CesiumGS/cesium/pull/10078)
- Fixed feature ID texture artifacts on Safari. [#10111](https://github.com/CesiumGS/cesium/pull/10111)
- Fixed a bug where a translucent shader applied to a `ModelExperimental` with opaque features was not being rendered. [#10110](https://github.com/CesiumGS/cesium/pull/10110)
+- Fixed an inconsitenly handled exception in `camera.getPickRay` that arrises when the scene is not rendered. [#10139](https://github.com/CesiumGS/cesium/pull/10139)
### 1.90 - 2022-02-01
| 3 |
diff --git a/tests/spec/functional.js b/tests/spec/functional.js @@ -210,24 +210,24 @@ describe('core', () => {
const instance = tippy(el, {
duration: 0,
- show() {
+ onShow() {
show = counter
showThis = this === popper
counter++
},
- shown() {
+ onShown() {
shown = counter
shownThis = this === popper
counter++
instance.hide(popper)
},
- hide() {
+ onHide() {
hide = counter
hideThis = this === popper
counter++
hideCalled = true
},
- hidden() {
+ onHidden() {
hidden = counter
hiddenThis = this === popper
counter++
@@ -433,7 +433,7 @@ describe('core', () => {
const instance = tippy(el, {
trigger: 'mouseenter',
- hide() {
+ onHide() {
mouseleaveWorked = true
done()
}
@@ -701,13 +701,13 @@ describe('core', () => {
duration: 0,
trigger: 'click',
interactive: true,
- show() {
+ onShow() {
setTimeout(() => {
done()
instance.destroyAll()
}, 20)
},
- hide() {
+ onHide() {
hideFired = true
}
})
| 4 |
diff --git a/packages/cx/src/widgets/form/LookupField.js b/packages/cx/src/widgets/form/LookupField.js @@ -358,7 +358,10 @@ class LookupComponent extends VDOM.Component {
onMeasureDropdownNaturalSize: () => {
if (this.dom.dropdown && this.dom.list) {
return {
- height: this.dom.dropdown.offsetHeight + this.dom.list.scrollHeight - this.dom.list.offsetHeight,
+ height:
+ this.dom.dropdown.offsetHeight -
+ this.dom.list.offsetHeight +
+ (this.dom.list.firstElementChild?.offsetHeight || 0),
};
}
},
| 7 |
diff --git a/articles/clients/enable-universal-links.md b/articles/clients/enable-universal-links.md @@ -34,3 +34,25 @@ Select the *Mobile Settings* tab and provide the **Team ID** and the **App bundl
Click **Save Changes** when done.
+
+## Test Your Universal Link
+
+To test this, check whether the universal links apple app site association file is available for your application. Go to your browser and open: https://YOURACCOUNT.auth0.com/apple-app-site-association (replace YOURACCOUNT with your Auth0 account name).
+
+You can test your universal link by navigating to the following URL using your browser:
+
+`${account.namespace}/apple-app-site-association`
+
+If the link is successful, you will return the following JSON (formatted for readability):
+
+```json
+{
+ "applinks": {
+ "apps": [],
+ "details": [{
+ "appID": "86WQXF56BC.com.auth0.Passwordless-Email",
+ "paths": ["/ios/com.auth0.Passwordless-Email/*"]
+ }]
+ }
+}
+```
| 0 |
diff --git a/source/guides/testing-strategies/amazon-cognito-authentication.md b/source/guides/testing-strategies/amazon-cognito-authentication.md @@ -176,7 +176,7 @@ The {% url "runnable version of this test" https://github.com/cypress-io/cypress
describe('Cognito', function () {
beforeEach(function () {
cy.task('db:seed')
- cy.loginByOktaApi(Cypress.env('cognito_username'), Cypress.env('cognito_password'))
+ cy.loginByCognitoApi(Cypress.env('cognito_username'), Cypress.env('cognito_password'))
})
it('shows onboarding', function () {
| 4 |
diff --git a/src/modules/Markers.js b/src/modules/Markers.js @@ -134,10 +134,12 @@ export default class Markers {
let pStyle = this.getMarkerStyle(seriesIndex)
let pSize = w.globals.markers.size[seriesIndex]
+ const m = w.config.markers
+
// discrete markers is an option where user can specify a particular marker with different size and color
- if (dataPointIndex !== null && w.config.markers.discrete.length) {
- w.config.markers.discrete.map((marker) => {
+ if (dataPointIndex !== null && m.discrete.length) {
+ m.discrete.map((marker) => {
if (
marker.seriesIndex === seriesIndex &&
marker.dataPointIndex === dataPointIndex
@@ -151,17 +153,23 @@ export default class Markers {
return {
pSize,
- pRadius: w.config.markers.radius,
- pWidth: w.config.markers.strokeWidth,
+ pRadius: m.radius,
+ pWidth:
+ m.strokeWidth instanceof Array
+ ? m.strokeWidth[seriesIndex]
+ : m.strokeWidth,
pointStrokeColor: pStyle.pointStrokeColor,
pointFillColor: pStyle.pointFillColor,
- shape:
- w.config.markers.shape instanceof Array
- ? w.config.markers.shape[seriesIndex]
- : w.config.markers.shape,
+ shape: m.shape instanceof Array ? m.shape[seriesIndex] : m.shape,
class: cssClass,
- pointStrokeOpacity: w.config.markers.strokeOpacity,
- pointFillOpacity: w.config.markers.fillOpacity,
+ pointStrokeOpacity:
+ m.strokeOpacity instanceof Array
+ ? m.strokeOpacity[seriesIndex]
+ : m.strokeOpacity,
+ pointFillOpacity:
+ m.fillOpacity instanceof Array
+ ? m.fillOpacity[seriesIndex]
+ : m.fillOpacity,
seriesIndex
}
}
| 11 |
diff --git a/spec/shape.coffee b/spec/shape.coffee @@ -768,7 +768,7 @@ describe 'Shape ->', ->
spyOn byte, '_fillTransform'
byte._draw()
expect(byte._fillTransform).not.toHaveBeenCalled()
- it 'should set transform if x changed #1', ->
+ it 'should set transform if x changed', ->
byte = new Byte radius: 25, top: 10, x: { 0: 10 }
byte._props.x = '4px'
spyOn(byte, '_fillTransform').and.callThrough()
@@ -782,7 +782,7 @@ describe 'Shape ->', ->
isTr4 = tr is 'translate(4px, 0px) rotate(0deg) scale(1)'
expect(isTr or isTr2 or isTr3 or isTr4).toBe true
- it 'should set transform if x changed #2', ->
+ it 'should set transform if y changed', ->
byte = new Byte radius: 25, top: 10, y: { 0: 10 }
byte._props.y = '4px'
spyOn(byte, '_fillTransform').and.callThrough()
@@ -796,7 +796,7 @@ describe 'Shape ->', ->
isTr4 = tr is 'translate(0px, 4px) rotate(0deg) scale(1)'
expect(isTr or isTr2 or isTr3 or isTr4).toBe true
- it 'should set transform if x changed #3', ->
+ it 'should set transform if scale changed', ->
byte = new Byte radius: 25, top: 10, scale: { 0: 10 }
byte._props.scale = 3
spyOn(byte, '_fillTransform').and.callThrough()
| 10 |
diff --git a/docs/release.md b/docs/release.md @@ -8,8 +8,11 @@ To release the Zenko and Zenko-base ISOs:
2. Start a new promotion using the [Github Actions release workflow](https://github.com/scality/Zenko/actions/workflows/release.yaml)
* Select the branch to release.
* Specify the tag from the step 1 (e.g., `2.4.15`).
- * Specify the artifacts to promote.
+ * Specify the artifacts name to promote.
The artifact URL can be found in the commit build you want to promote, under `Annotations`.
- For example: `https://artifacts.scality.net/builds/github:scality:Zenko:staging-d13ed9e848.build-iso-and-end2end-test.230`
+ For example, given
+ `https://artifacts.scality.net/builds/github:scality:Zenko:staging-d13ed9e848.build-iso-and-end2end-test.230`
+ the name will be
+ `github:scality:Zenko:staging-d13ed9e848.build-iso-and-end2end-test.230`
The workflow will automatically create a new GitHub release.
| 7 |
diff --git a/.github/workflows/CI-CD.yml b/.github/workflows/CI-CD.yml @@ -50,17 +50,17 @@ jobs:
needs: publish
runs-on: ubuntu-latest
steps:
- - name: develop deploy
- if: github.ref == 'refs/heads/develop'
- uses: garygrossgarten/[email protected]
- with:
-# command: cd feathers-giveth-develop && git checkout develop && git pull origin develop && [[ -s $HOME/.nvm/nvm.sh ]] && . $HOME/.nvm/nvm.sh && nvm use 10 && npm ci && NODE_ENV=develop ./node_modules/.bin/migrate-mongo up && npm run serve
- # pull images, restart docker, then remove unused docker images
- command: cd feathers-giveth-develop && git checkout develop && git pull origin develop && git pull origin develop && docker-compose -f docker-compose-develop.yml pull && docker-compose -f docker-compose-develop.yml down && docker-compose -f docker-compose-develop.yml up -d && docker image prune -a --force
- host: ${{ secrets.DEVELOP_HOST }}
- username: ${{ secrets.DEVELOP_USERNAME }}
- # passphrase: ${{ secrets.PASSPHRASE }}
- privateKey: ${{ secrets.DEVELOP_PRIVATE_KEY}}
+# - name: develop deploy
+# if: github.ref == 'refs/heads/develop'
+# uses: garygrossgarten/[email protected]
+# with:
+## command: cd feathers-giveth-develop && git checkout develop && git pull origin develop && [[ -s $HOME/.nvm/nvm.sh ]] && . $HOME/.nvm/nvm.sh && nvm use 10 && npm ci && NODE_ENV=develop ./node_modules/.bin/migrate-mongo up && npm run serve
+# # pull images, restart docker, then remove unused docker images
+# command: cd feathers-giveth-develop && git checkout develop && git pull origin develop && git pull origin develop && docker-compose -f docker-compose-develop.yml pull && docker-compose -f docker-compose-develop.yml down && docker-compose -f docker-compose-develop.yml up -d && docker image prune -a --force
+# host: ${{ secrets.DEVELOP_HOST }}
+# username: ${{ secrets.DEVELOP_USERNAME }}
+# # passphrase: ${{ secrets.PASSPHRASE }}
+# privateKey: ${{ secrets.DEVELOP_PRIVATE_KEY}}
- name: production deploy
if: github.ref == 'refs/heads/master'
| 10 |
diff --git a/articles/connections/social/microsoft-account.md b/articles/connections/social/microsoft-account.md @@ -99,7 +99,3 @@ If you see the **It Works!** page, you have successfully configured your connect
<%= include('../_quickstart-links.md') %>
-
-::: panel-warning Single log out
-Microsoft connections does not support redirecting back to the application when the user is redirected to the logout url. That means than when you redirect the user to the logout endpoint with the federated param `https://${account.namespace}/v2/logout?federated`, the user will be redirected to the MSN homepage instead of redirecting them back to your application.
-:::
| 2 |
diff --git a/migrations/0025.sql b/migrations/0025.sql @@ -21,9 +21,9 @@ SELECT
rp.id AS recipe_pos_id,
rp.product_id AS product_id,
rp.amount AS recipe_amount,
- sc.amount AS stock_amount,
+ IFNULL(sc.amount, 0) AS stock_amount,
CASE WHEN IFNULL(sc.amount, 0) >= rp.amount THEN 1 ELSE 0 END AS need_fulfilled,
- CASE WHEN IFNULL(sc.amount, 0) - rp.amount < 0 THEN ABS(sc.amount - rp.amount) ELSE 0 END AS missing_amount,
+ CASE WHEN IFNULL(sc.amount, 0) - IFNULL(rp.amount, 0) < 0 THEN ABS(IFNULL(sc.amount, 0) - IFNULL(rp.amount, 0)) ELSE 0 END AS missing_amount,
IFNULL(sl.amount, 0) AS amount_on_shopping_list,
CASE WHEN IFNULL(sc.amount, 0) + IFNULL(sl.amount, 0) >= rp.amount THEN 1 ELSE 0 END AS need_fulfilled_with_shopping_list
FROM recipes r
| 1 |
diff --git a/token-metadata/0x7dEe371A788f9BD6c546dF83F0d74fBe37cbf006/metadata.json b/token-metadata/0x7dEe371A788f9BD6c546dF83F0d74fBe37cbf006/metadata.json "symbol": "TECN",
"address": "0x7dEe371A788f9BD6c546dF83F0d74fBe37cbf006",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/README.md b/README.md @@ -52,9 +52,11 @@ For starter apps and templates, see [create-snowpack-app](./packages/create-snow
### Featured Community Plugins
- [@prefresh/snowpack](https://github.com/JoviDeCroock/prefresh)
+- [snowpack-plugin-imagemin](https://github.com/jaredLunde/snowpack-plugin-imagemin) Use [imagemin](https://github.com/imagemin/imagemin) to optimize your build images.
- [snowpack-plugin-import-map](https://github.com/zhoukekestar/snowpack-plugin-import-map) A more easy way to map your imports to Pika CDN instead of [import-maps.json](https://github.com/WICG/import-maps).
- [snowpack-plugin-less](https://github.com/fansenze/snowpack-plugin-less) Use the [Less](https://github.com/less/less.js) compiler to build `.less` files from source.
- [snowpack-plugin-mdx](https://github.com/jaredLunde/snowpack-plugin-mdx) Use the [MDX](https://github.com/mdx-js/mdx/tree/master/packages/mdx) compiler to build `.mdx` and `.md` files from source.
+- [snowpack-plugin-resize-images](https://github.com/jaredLunde/snowpack-plugin-resize-images) Resize and process your build images with [Sharp](https://sharp.pixelplumbing.com/api-constructor).
- [snowpack-plugin-sass](https://github.com/fansenze/snowpack-plugin-sass) Use the [node-sass](https://github.com/sass/node-sass) to build `.sass/.scss` files from source.
- [snowpack-plugin-svgr](https://github.com/jaredLunde/snowpack-plugin-svgr) Use [SVGR](https://github.com/gregberge/svgr) to transform `.svg` files into React components.
- [snowpack-plugin-stylus](https://github.com/fansenze/snowpack-plugin-stylus) Use the [Stylus](https://github.com/stylus/stylus) compiler to build `.styl` files from source.
| 0 |
diff --git a/modules/carto/src/layers/carto-layer.js b/modules/carto/src/layers/carto-layer.js @@ -126,7 +126,7 @@ export default class CartoLayer extends CompositeLayer {
layer = GeoJsonLayer;
}
- const props = {...layer.defaultProps, ...this.props};
+ const props = {...this.props};
delete props.data;
// eslint-disable-next-line new-cap
| 2 |
diff --git a/app/partials/project-card.cjsx b/app/partials/project-card.cjsx @@ -25,7 +25,12 @@ ProjectCard = createReactClass
if [email protected]
conditionalStyle.backgroundImage = "url('#{ @props.imageSrc }')"
else if [email protected]_src
- conditionalStyle.backgroundImage = "url('//#{ @props.project.avatar_src }')"
+ try
+ backgroundImageSrc = new URL(@props.project.avatar_src)
+ catch error
+ backgroundImageSrc = "//#{ @props.project.avatar_src }"
+
+ conditionalStyle.backgroundImage = "url('#{ backgroundImageSrc }')"
else
conditionalStyle.background = "url('/assets/simple-pattern.png') center center repeat"
| 9 |
diff --git a/articles/api-auth/tutorials/password-grant.md b/articles/api-auth/tutorials/password-grant.md @@ -59,6 +59,9 @@ The response from `/oauth/token` (if successful) contains an `access_token`, for
In case the scopes issued to the client differ from the scopes requested, a `scope` parameter will be included in the response JSON, listing the issued scopes.
+::: panel-info On requesting specific `scope`s
+Use of any password-based exchange gives access to all scopes because a password is equivalent to full access. This means that even if you request a `scope` of only `openid`, the resulting response will still include other standard scopes, such as `openid profile email address phone` (and any others that you've configured such as `read:notes`). In this case, a `scope` parameter will be included listing the issued scopes as mentioned above.
+
::: panel-info A note about user's claims
If the client needs the user's claims you can include the scopes `openid profile` to the `scope` value in the POST to the token endpoint. If the audience uses RS256 as the signing algorithm, the `access_token` will now also include `/userinfo` as a valid audience. You can now send the `access_token` to `https://${account.namespace}/userinfo` to retrieve the user's claims.
:::
| 0 |
diff --git a/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/PFD/CJ4_PFD.css b/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/PFD/CJ4_PFD.css @@ -678,3 +678,35 @@ cj4-pfd-element #Mainframe #NDMapOverlay #NDInfo #TopBox text.Wind {
#VORDMENavaid_Right #ID {
padding-left: 4px;
}
+
+#VSpeeds text {
+ font-size: 22px;
+}
+
+#Airspeed #CursorGroup text {
+ font-size: 38px;
+}
+
+#Airspeed #CursorGroup path {
+ transform: translateY(-1px)
+}
+
+#Altimeter #CenterGroup #graduationGroup > text[font-size="25"] {
+ font-size: 38px;
+ letter-spacing: 0px;
+}
+
+#Altimeter #CenterGroup #graduationGroup > text[font-size="18"] {
+ font-size: 24px;
+ letter-spacing: 0px;
+}
+
+#Altimeter #CenterGroup #CursorGroup > text[font-size="31.25"] {
+ font-size: 40px;
+ letter-spacing: 0px;
+}
+
+#Altimeter #CenterGroup #CursorGroup > text[font-size="23.75"] {
+ font-size: 26px;
+ letter-spacing: 0px;
+}
\ No newline at end of file
| 7 |
diff --git a/src/index.js b/src/index.js @@ -95,7 +95,7 @@ class Dayjs {
const unit = Utils.prettyUnit(units)
const instanceFactory = (d, m, y = this.$y) => {
const ins = new Dayjs(new Date(y, m, d))
- return isStartOf ? ins : ins.endOf(this.$C.D)
+ return isStartOf ? ins : ins.endOf(C.D)
}
const instanceFactorySet = (method, slice) => {
const argumentStart = [0, 0, 0, 0]
@@ -106,23 +106,23 @@ class Dayjs {
))
}
switch (unit) {
- case this.$C.Y:
+ case C.Y:
return isStartOf ? instanceFactory(1, 0) :
instanceFactory(31, 11, this.$y)
- case this.$C.M:
+ case C.M:
return isStartOf ? instanceFactory(1, this.$M) :
instanceFactory(0, this.$M + 1, this.$y)
- case this.$C.W:
+ case C.W:
return isStartOf ? instanceFactory(this.$D - this.$W, this.$M) :
instanceFactory(this.$D + (6 - this.$W), this.$M, this.$y)
- case this.$C.D:
- case this.$C.DATE:
+ case C.D:
+ case C.DATE:
return instanceFactorySet('setHours', 0)
- case this.$C.H:
+ case C.H:
return instanceFactorySet('setMinutes', 1)
- case this.$C.MIN:
+ case C.MIN:
return instanceFactorySet('setSeconds', 2)
- case this.$C.S:
+ case C.S:
return instanceFactorySet('setMilliseconds', 3)
default:
return this.clone()
@@ -136,25 +136,25 @@ class Dayjs {
mSet(units, int) {
const unit = Utils.prettyUnit(units)
switch (unit) {
- case this.$C.DATE:
+ case C.DATE:
this.$d.setDate(int)
break
- case this.$C.M:
+ case C.M:
this.$d.setMonth(int)
break
- case this.$C.Y:
+ case C.Y:
this.$d.setFullYear(int)
break
- case this.$C.H:
+ case C.H:
this.$d.setHours(int)
break
- case this.$C.MIN:
+ case C.MIN:
this.$d.setMinutes(int)
break
- case this.$C.S:
+ case C.S:
this.$d.setSeconds(int)
break
- case this.$C.MS:
+ case C.MS:
this.$d.setMilliseconds(int)
break
default:
@@ -171,34 +171,34 @@ class Dayjs {
add(number, units) {
const unit = (units && units.length === 1) ? units : Utils.prettyUnit(units)
- if (['M', this.$C.M].indexOf(unit) > -1) {
- let date = this.set(this.$C.DATE, 1).set(this.$C.M, this.$M + number)
- date = date.set(this.$C.DATE, Math.min(this.$D, date.daysInMonth()))
+ if (['M', C.M].indexOf(unit) > -1) {
+ let date = this.set(C.DATE, 1).set(C.M, this.$M + number)
+ date = date.set(C.DATE, Math.min(this.$D, date.daysInMonth()))
return date
}
- if (['y', this.$C.Y].indexOf(unit) > -1) {
- return this.set(this.$C.Y, this.$y + number)
+ if (['y', C.Y].indexOf(unit) > -1) {
+ return this.set(C.Y, this.$y + number)
}
let step
switch (unit) {
case 'm':
- case this.$C.MIN:
- step = this.$C.MILLISECONDS_A_MINUTE
+ case C.MIN:
+ step = C.MILLISECONDS_A_MINUTE
break
case 'h':
- case this.$C.H:
- step = this.$C.MILLISECONDS_A_HOUR
+ case C.H:
+ step = C.MILLISECONDS_A_HOUR
break
case 'd':
- case this.$C.D:
- step = this.$C.MILLISECONDS_A_DAY
+ case C.D:
+ step = C.MILLISECONDS_A_DAY
break
case 'w':
- case this.$C.W:
- step = this.$C.MILLISECONDS_A_WEEK
+ case C.W:
+ step = C.MILLISECONDS_A_WEEK
break
default: // s seconds
- step = this.$C.MILLISECONDS_A_SECOND
+ step = C.MILLISECONDS_A_SECOND
}
const nextTimeStamp = this.valueOf() + (number * step)
return new Dayjs(nextTimeStamp)
@@ -260,22 +260,22 @@ class Dayjs {
const diff = this - that
let result = Utils.monthDiff(this, that)
switch (unit) {
- case this.$C.Y:
+ case C.Y:
result /= 12
break
- case this.$C.M:
+ case C.M:
break
- case this.$C.Q:
+ case C.Q:
result /= 3
break
- case this.$C.W:
- result = diff / this.$C.MILLISECONDS_A_WEEK
+ case C.W:
+ result = diff / C.MILLISECONDS_A_WEEK
break
- case this.$C.D:
- result = diff / this.$C.MILLISECONDS_A_DAY
+ case C.D:
+ result = diff / C.MILLISECONDS_A_DAY
break
- case this.$C.S:
- result = diff / this.$C.MILLISECONDS_A_SECOND
+ case C.S:
+ result = diff / C.MILLISECONDS_A_SECOND
break
default: // milliseconds
result = diff
@@ -284,7 +284,7 @@ class Dayjs {
}
daysInMonth() {
- return this.endOf(this.$C.M).$D
+ return this.endOf(C.M).$D
}
clone() {
| 2 |
diff --git a/projects/ngx-extended-pdf-viewer/src/lib/ngx-extended-pdf-viewer.component.ts b/projects/ngx-extended-pdf-viewer/src/lib/ngx-extended-pdf-viewer.component.ts @@ -1770,7 +1770,7 @@ export class NgxExtendedPdfViewerComponent implements OnInit, AfterViewInit, OnC
}
if ('scrollMode' in changes) {
if (this.scrollMode || this.scrollMode === ScrollModeType.vertical) {
- PDFViewerApplication.pdfViewer.scrollMode = Number(this.scrollMode);
+ PDFViewerApplication.eventBus.dispatch('', { mode: this.scrollMode });
}
}
if ('sidebarVisible' in changes) {
| 11 |
diff --git a/src/moments.js b/src/moments.js @@ -16,6 +16,7 @@ const THIS_YEAR = moment().year();
function validateMoment(moment: moment$Moment): moment$Moment {
// This is a noop in production, for perf reasons
+ /* istanbul ignore if */
if (process.env.NODE_ENV === 'production') {
return moment;
}
| 8 |
diff --git a/lib/assets/core/javascripts/cartodb3/components/code-mirror/colorpicker.code-mirror.js b/lib/assets/core/javascripts/cartodb3/components/code-mirror/colorpicker.code-mirror.js @@ -28,7 +28,7 @@ module.exports = CoreView.extend({
this['_' + item] = opts[item];
}, this);
- this._updateColors = _.debounce(this._updateColors.bind(this), 5);
+ this._updateColors = _.debounce(this._updateColors, 5).bind(this);
this._editor = opts.editor;
this._initBinds();
},
@@ -43,11 +43,11 @@ module.exports = CoreView.extend({
this._editor.on('mousedown', function (cm, ev) {
_.delay(self._onClick.bind(self, cm, ev), 50);
- }, this);
+ });
- this._editor.on('keydown', destroyPicker, this);
- this._editor.on('viewportChange', destroyPicker, this);
- this._editor.on('scroll', destroyPicker, this);
+ this._editor.on('keydown', destroyPicker);
+ this._editor.on('viewportChange', destroyPicker);
+ this._editor.on('scroll', destroyPicker);
},
_disableBinds: function () {
| 1 |
diff --git a/src/components/AvatarCropModal/AvatarCropModal.js b/src/components/AvatarCropModal/AvatarCropModal.js @@ -60,18 +60,23 @@ const AvatarCropModal = memo((props) => {
const containerSize = props.isSmallScreenWidth ? Math.min(props.windowWidth, 500) - 40 : variables.sideBarWidth - 40;
const sliderLineWidth = containerSize - 105;
- useEffect(() => {
- if (!props.imageUri) { return; }
- Image.getSize(props.imageUri, (width, height) => {
+ const initializeImage = useCallback(() => {
+ rotation.value += 360; // needed to triger recalculation of image styles
translateY.value = 0;
translateX.value = 0;
scale.value = 1;
rotation.value = 0;
translateSlider.value = 0;
+ }, []);
+
+ useEffect(() => {
+ if (!props.imageUri) { return; }
+ initializeImage();
+ Image.getSize(props.imageUri, (width, height) => {
imageHeight.value = height;
imageWidth.value = width;
});
- }, [props.imageUri]);
+ }, [props.imageUri, initializeImage]);
const panGestureEvent = useAnimatedGestureHandler({
onStart: (_, context) => {
@@ -175,10 +180,6 @@ const AvatarCropModal = memo((props) => {
];
}, []);
- const initializeImage = useCallback(() => {
- rotation.value += 360; // needed to triger recalculation of image styles
- }, []);
-
const handleCrop = useCallback(() => {
const smallerSize = Math.min(imageHeight.value, imageWidth.value);
const size = smallerSize / scale.value;
| 7 |
diff --git a/articles/architecture-scenarios/application/spa-api/index.md b/articles/architecture-scenarios/application/spa-api/index.md @@ -37,6 +37,8 @@ ExampleCo wants to build a flexible solution. At the moment only a SPA is requir
It is required that only authorized users and applications are allowed access to the Timesheets API.
+Two kind of users will use this SPA: employees and managers. The employees should be able to read, create and delete their own timesheet entries, while the managers should be able to approve timesheets as well.
+
<%= include('./_stepnav', {
next: ["1. Solution Overview", "/architecture-scenarios/application/spa-api/part-1"]
}) %>
| 0 |
diff --git a/README.md b/README.md @@ -79,17 +79,39 @@ Note:
<script src="node_modules/angular-patternfly/node_modules/patternfly/node_modules/c3/c3.min.js"></script>
<script src="node_modules/angular-patternfly/node_modules/patternfly/node_modules/d3/d3.min.js"></script>
-5. (optional) The 'patternfly.charts' and 'patternfly.table' modules are not dependencies in the default angular 'patternfly' module.
- In order to use patternfly charts and/or patternfly.table, you must add them as dependencies in your application:
+5. (optional) The 'patternfly.charts' module is not a dependency in the default angular 'patternfly' module.
+ In order to use patternfly charts you must add it as a dependency in your application:
+
+ my-app.module.js:
+
+ angular.module('myApp', [
+ 'patternfly',
+ 'patternfly.charts'
+ ]);
+
+6. (optional) The 'patternfly.table' module is not a dependency in the default angular 'patternfly' module.
+ In order to use pfTableView, you must add 'patternfly.table' as a dependency in your application:
my-app.module.js:
angular.module('myApp', [
'patternfly',
- 'patternfly.charts',
'patternfly.table'
]);
+ Add the following CSS includes to your HTML file(s):
+
+ <!-- Place before any patternfly css -->
+ <link rel="stylesheet" href="node_modules/datatables.net-dt/css/jquery.dataTables.css" />
+
+ Add the following Javascript includes to your HTML file(s):
+
+ <script src="node_modules/jquery/dist/jquery.js"></script>
+ <script src="node_modules/datatables.net/js/jquery.dataTables.js"></script>
+ <script src="node_modules/datatables.net-select/js/dataTables.select.js"></script>
+ <script src="node_modules/angular-datatables/dist/angular-datatables.min.js"></script>
+ <script src="node_modules/angular-datatables/dist/plugins/select/angular-datatables.select.min.js"></script>
+
### Using with Webpack
In order to use Angular-Patternfly in a Webpack-bundled application there are some things you need to keep in mind:
| 3 |
diff --git a/app/models/visualization/member.rb b/app/models/visualization/member.rb @@ -933,10 +933,14 @@ module CartoDB
end
def remove_layers_from(table)
- related_layers_from(table).each { |layer|
+ related_layers_from(table).each do |layer|
+ # Using delete to avoid hooks, as they generate a conflict between ORMs and are
+ # not needed in this case since they are already triggered by deleting the layer
+ Carto::Analysis.find_by_natural_id(id, layer.source_id).try(:delete) if layer.source_id
+
map.remove_layer(layer)
layer.destroy
- }
+ end
self.active_layer_id = layers(:cartodb).first.nil? ? nil : layers(:cartodb).first.id
store
end
| 2 |
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md # Contributing
-Thanks for your interest in contributing! Please see our [developer documentation](../docs/index.md) for more information.
+Thanks for your interest in contributing! Please see our [developer documentation](https://github.com/adobe/alloy/wiki) for more information.
| 3 |
diff --git a/package.json b/package.json "test": "npm run lint && jest",
"test-watch": "npm run lint && jest --onlyChanged --watch",
"prepublishOnly": "npm test && npm run build",
- "postpublish": "git push origin main --follow-tags"
+ "postversion": "git push origin main --follow-tags"
},
"repository": {
"type": "git",
| 4 |
diff --git a/docs/en/edu/dream/dream1-3.md b/docs/en/edu/dream/dream1-3.md @@ -54,7 +54,7 @@ This is included in ROBOTIS DREAM Level 1.
| 6. Electric Guitar<br /> | [Download][ex_06] |
| 7. Flag Game Robot<br /> | [Download][ex_07] |
| 8. Crane<br /> | [Download][ex_08] |
-| 9. Basket<br /> | [Download][ex_09] |
+| 9. Drunken Basket<br /> | [Download][ex_09] |
| 10. Viking<br /> | [Download][ex_10] |
| 11. Whac-A-Mole<br /> | [Download][ex_11] |
| 12. Goblin Robot<br /> | [Download][ex_12] |
| 13 |
diff --git a/packages/build/tests/helpers/main.js b/packages/build/tests/helpers/main.js @@ -123,19 +123,25 @@ const removeDir = async function(dir) {
// Create a temporary directory with a `.git` directory, which can be used as
// the current directory of a build. Otherwise the `git` utility does not load.
-const createRepoDir = async function() {
+const createRepoDir = async function({ git = true } = {}) {
const id = String(Math.random()).replace('.', '')
const cwd = `${tmpdir()}/netlify-build-${id}`
-
await makeDir(cwd)
+ await createGit(cwd, git)
+ return cwd
+}
+
+const createGit = async function(cwd, git) {
+ if (!git) {
+ return
+ }
+
await execa.command('git init', { cwd })
await execa.command('git config user.email [email protected]', { cwd })
await execa.command('git config user.name test', { cwd })
await execa.command('git commit --allow-empty -m one', { cwd })
await execa.command('git config --unset user.email', { cwd })
await execa.command('git config --unset user.name', { cwd })
-
- return cwd
}
module.exports = { runFixture, FIXTURES_DIR, removeDir, createRepoDir }
| 7 |
diff --git a/packages/menu/src/presenters/MenuPresenter.js b/packages/menu/src/presenters/MenuPresenter.js @@ -57,7 +57,7 @@ const MenuPresenter = (props) => {
? {
...(getHighlightIndex() !== 0 && {
"aria-activedescendant":
- getOptionsInfo()[getHighlightIndex() - 1].id,
+ getOptionsInfo()?.[getHighlightIndex() - 1]?.id,
}),
...(multiple && { "aria-multiselectable": multiple }),
}
| 1 |
diff --git a/.eslintrc.json b/.eslintrc.json "sort-vars": 2,
"comma-dangle": [2, "never"],
"no-console": 0,
+ "quotes": [2, "single", { "avoidEscape": true }],
"no-unused-vars" : [2, { "args": "none" }],
"react/jsx-equals-spacing": ["warn", "never"],
"react/jsx-no-duplicate-props": ["warn", { "ignoreCase": true }],
| 12 |
diff --git a/src/cn.js b/src/cn.js @@ -228,10 +228,10 @@ D.cn=_=>{ //set up Connect page
q.cln.disabled=!u;q.del.disabled=!$sel.length;q.rhs.hidden=!u
sel=u?$sel[0].cnData:null
if(u){
- q.type.value=sel.type||'connect';updFormDtl();updExes()
- q.fav_name.value=sel.name||''
$(':text[name],textarea[name]',q.rhs).each((_,x)=>{x.value=sel[x.name]||''})
$(':checkbox[name]',q.rhs).each((_,x)=>{x.checked=!!+sel[x.name]})
+ q.type.value=sel.type||'connect';updFormDtl();updExes()
+ q.fav_name.value=sel.name||''
q.exes.value=sel.exe;q.exes.value||(q.exes.value='') //use sel.exe if available, otherwise use "Other..."
var a=q.rhs.querySelectorAll('input,textarea')
for(var i=0;i<a.length;i++)if(/^text(area)?$/.test(a[i].type))D.util.elastic(a[i])
| 12 |
diff --git a/edit.js b/edit.js @@ -865,11 +865,13 @@ let buildMode = null;
let stairsMesh = null;
let platformMesh = null;
let wallMesh = null;
+let spikesMesh = null;
let woodMesh = null;
let stoneMesh = null;
let metalMesh = null;
(async () => {
const buildModels = await _loadGltf('./build.glb');
+
stairsMesh = buildModels.children.find(c => c.name === 'SM_Bld_Snow_Platform_Stairs_01001');
stairsMesh.buildMeshType = 'stair';
stairsMesh.visible = false;
@@ -912,6 +914,20 @@ let metalMesh = null;
wallMesh.hullMesh.visible = false;
wallMesh.hullMesh.parent.remove(wallMesh.hullMesh);
+ spikesMesh = buildModels.children.find(c => c.name === 'SM_Prop_MetalSpikes_01');
+ spikesMesh.buildMeshType = 'floor';
+ spikesMesh.visible = false;
+ spikesMesh.traverse(o => {
+ if (o.isMesh) {
+ o.isBuildMesh = true;
+ }
+ });
+ worldContainer.add(spikesMesh);
+ /* spikesMesh.hullMesh = buildModels.children.find(c => c.name === 'SM_Env_Wood_Platform_01hull');
+ spikesMesh.hullMesh.geometry = spikesMesh.hullMesh.geometry.toNonIndexed();
+ spikesMesh.hullMesh.visible = false;
+ spikesMesh.hullMesh.parent.remove(spikesMesh.hullMesh); */
+
woodMesh = buildModels.children.find(c => c.name === 'SM_Prop_Plank_01');
woodMesh.visible = false;
worldContainer.add(woodMesh);
| 0 |
diff --git a/src/sections/Community/Handbook/contributing.js b/src/sections/Community/Handbook/contributing.js @@ -3,9 +3,9 @@ import { Container } from "../../../reusecore/Layout";
import { HandbookWrapper } from "./Handbook.style";
import TOC from "../../../components/handbook-navigation/index";
import Code from "../../../components/CodeBlock";
-import Signoff from "../../../../.github/assets/images/git-signoff-vscode.png";
import TocPagination from "../../../components/handbook-navigation/TocPagination";
import IntraPage from "../../../components/handbook-navigation/intra-page";
+import { StaticImage } from "gatsby-plugin-image";
const contents = [
{ id: 0, link: "#Clone your fork", text: "Clone your fork" },
@@ -16,6 +16,7 @@ const contents = [
];
const contributingGuide = () => {
+ const Signoff = "../../../../.github/assets/images/git-signoff-vscode.png";
return (
<HandbookWrapper>
<div className="page-header-section">
@@ -193,7 +194,7 @@ const contributingGuide = () => {
Or you may configure your IDE, for example, Visual Studio Code to
automatically sign-off commits for you:
</p>
- <img src={ Signoff } width="74%" id="sign-off" />
+ <StaticImage src={ Signoff } width="74%" id="sign-off" alt="Signoff" />
<TocPagination />
</Container>
| 7 |
diff --git a/app/components/member/New.js b/app/components/member/New.js @@ -5,6 +5,7 @@ import shallowCompare from 'react-addons-shallow-compare';
import Button from '../shared/Button';
import FormCheckbox from '../shared/FormCheckbox';
+import FormRadioGroup from '../shared/FormRadioGroup';
import FormTextarea from '../shared/FormTextarea';
import FormInputLabel from '../shared/FormInputLabel';
import FormInputHelp from '../shared/FormInputHelp';
@@ -43,7 +44,7 @@ class MemberNew extends React.Component {
state = {
emails: '',
teams: [],
- isAdmin: false
+ role: OrganizationMemberRoleConstants.MEMBER
};
shouldComponentUpdate(nextProps, nextState) {
@@ -68,12 +69,19 @@ class MemberNew extends React.Component {
onChange={this.handleEmailsChange}
rows={3}
/>
- <FormCheckbox
- label="Administrator"
- help="Allow these people to edit organization details, manage billing information, invite new members, manage teams, change notification services and see the agent registration token."
- checked={this.state.isAdmin}
+
+ <FormRadioGroup
+ name="role"
+ label="Role"
+ help="What type of organization-wide permissions will the invited users have?"
+ value={this.state.role}
onChange={this.handleAdminChange}
+ options={[
+ { label: "User", value: OrganizationMemberRoleConstants.MEMBER, help: "Can view, create and manage pipelines and builds." },
+ { label: "Administrator", value: OrganizationMemberRoleConstants.ADMIN, help: "Has full administrative access to all parts of the organization." }
+ ]}
/>
+
{this.renderTeamSection()}
</Panel.Section>
<Panel.Section>
@@ -98,7 +106,7 @@ class MemberNew extends React.Component {
handleAdminChange = (evt) => {
this.setState({
- isAdmin: evt.target.checked
+ role: evt.target.value
});
};
@@ -115,7 +123,7 @@ class MemberNew extends React.Component {
// browsers (those compliant with ES2017)
.split(/[ \t\r\n\f\v]+/gi);
- const role = this.state.isAdmin ? OrganizationMemberRoleConstants.ADMIN : OrganizationMemberRoleConstants.MEMBER;
+ const role = this.state.role;
const teams = this.state.teams.map((id) => {
return { id: id, role: TeamMemberRoleConstants.MEMBER };
| 4 |
diff --git a/sirepo/package_data/static/js/radia.js b/sirepo/package_data/static/js/radia.js @@ -32,6 +32,7 @@ SIREPO.app.factory('radiaService', function(appState, fileUpload, panelState, re
};
self.isEditing = false;
+ self.objBounds = null;
self.pointFieldTypes = appState.enumVals('FieldType').slice(1);
self.selectedObj = null;
@@ -77,6 +78,16 @@ SIREPO.app.factory('radiaService', function(appState, fileUpload, panelState, re
id: numPathsOfType(appState.models.fieldPaths.path),
};
appState.models[t] = appState.setModelDefaults(model, t);
+
+ // set to fill bounds if any actors exist
+ if (t === 'fieldMapPath' && self.objBounds) {
+ appState.models[t].lenX = Math.abs(self.objBounds[1] - self.objBounds[0]);
+ appState.models[t].lenY = Math.abs(self.objBounds[3] - self.objBounds[2]);
+ appState.models[t].lenZ = Math.abs(self.objBounds[5] - self.objBounds[4]);
+ appState.models[t].ctrX = (self.objBounds[1] + self.objBounds[0]) / 2.0;
+ appState.models[t].ctrY = (self.objBounds[3] + self.objBounds[2]) / 2.0;
+ appState.models[t].ctrZ = (self.objBounds[5] + self.objBounds[4]) / 2.0;
+ }
};
/*
@@ -388,6 +399,7 @@ SIREPO.app.directive('fieldPathPicker', function(appState, panelState, radiaServ
].join(''),
controller: function($scope, $element) {
$scope.modelsLoaded = false;
+ $scope.pathType = null;
$scope.pathTypes = appState.enumVals('PathType');
$scope.pathTypeModels = $scope.pathTypes.map(radiaService.pathTypeModel);
$scope.radiaService = radiaService;
@@ -396,15 +408,6 @@ SIREPO.app.directive('fieldPathPicker', function(appState, panelState, radiaServ
return ($scope.model || {}).path;
};
- function numPathsOfType(type) {
- if (! $scope.model.paths) {
- return 0;
- }
- return $scope.model.paths.filter(function (p) {
- return p.type === type;
- }).length;
- }
-
appState.whenModelsLoaded($scope, function () {
$scope.model = appState.models[$scope.modelName];
$scope.pathTypes.forEach(function (t) {
@@ -418,7 +421,13 @@ SIREPO.app.directive('fieldPathPicker', function(appState, panelState, radiaServ
radiaService.showPathPicker(false);
}
});
-
+ $scope.$watch('model.path', function (m) {
+ var o = $($element).find('.modal').css('opacity');
+ if (o == 1 && ! radiaService.isEditing) {
+ // displaying editor but not editing, must be new
+ radiaService.createPathModel();
+ }
+ });
$scope.modelsLoaded = true;
});
},
@@ -952,6 +961,7 @@ SIREPO.app.directive('radiaViewer', function(appState, errorService, frameCache,
}
var b = renderer.computeVisiblePropBounds();
+ radiaService.objBounds = b;
//srdbg('bnds', b);
var points = new window.Float32Array([
b[0], b[2], b[4], b[1], b[2], b[4], b[1], b[3], b[4], b[0], b[3], b[4],
@@ -1540,6 +1550,7 @@ SIREPO.app.directive('radiaViewer', function(appState, errorService, frameCache,
//srdbg('update v');
sceneData = {};
actorInfo = {};
+ radiaService.objBounds = null;
//enableWatchFields(false);
var inData = {
method: 'get_geom',
| 12 |
diff --git a/src/components/map/MapboxGlMap.jsx b/src/components/map/MapboxGlMap.jsx @@ -124,6 +124,7 @@ export default class MapboxGlMap extends React.Component {
container: this.container,
style: this.props.mapStyle,
hash: true,
+ maxZoom: 24
}
const map = new MapboxGl.Map(mapOpts);
| 12 |
diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js @@ -189,6 +189,13 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
//Error is already formated
return popupService.showAlert(err);
}
+
+ if (item.recipientType && item.recipientType == 'contact') {
+ if (addr.indexOf('bch') == 0 || addr.indexOf('btc') == 0) {
+ addr = addr.substring(3);
+ }
+ }
+
$log.debug('Got toAddress:' + addr + ' | ' + item.name);
return $state.transitionTo('tabs.send.amount', {
recipientType: item.recipientType,
@@ -197,7 +204,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
toEmail: item.email,
toColor: item.color,
coin: item.coin
- })
+ });
});
});
};
| 1 |
diff --git a/.travis.yml b/.travis.yml @@ -54,11 +54,7 @@ matrix:
- npm run test-admin
env:
- JOB=unit_tests_node_4
-# - node_js: '0.12'
-# script:
-# - npm run test-admin
-# env:
-# - JOB=unit_tests_node_0.12
+
before_script:
- sleep 15
@@ -68,7 +64,9 @@ script:
sudo: required
notifications:
email:
- - [email protected]
+ - [email protected]
+ slack:
+ secure: AqayzYjoHTlwE85pgB0h5yqpyBDWbdrpiXKXhb8tSqWPKi6unhkfZ4r11kQRowoDQXb+fue9367u+lJ9lKBfMv+SSFnKY+OccasfrW6JwJ8Wi258aB7bjcSP9kUtUfvbbvPSwQjY6Z8+9TlMxP6kyabeZ69SGnhnaJNt+vbAJzc=
services:
- mongodb
git:
| 3 |
diff --git a/core/type_infer.js b/core/type_infer.js 'use strict';
goog.provide('Blockly.TypeInfer');
-goog.provide('Blockly.TypeInfer.Exp');
+goog.provide('Blockly.TypeInfer.Ast');
goog.require('goog.asserts');
/**
* @constructor
*/
-Blockly.TypeInfer.Exp = function() {
+Blockly.TypeInfer.Ast = function() {
};
| 10 |
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb @@ -25,11 +25,21 @@ class HomeController < ApplicationController
@show_bulletin = true
end
end
- @sign_in_strategy = params.key?(:auth0) ? 'AUTH0' : 'DEVISE'
+ @sign_in_strategy = sign_in_strategy
render 'landing'
end
end
+ private def sign_in_strategy
+ auth0_default_for_new_users = get_app_config(AppConfig::USE_AUTH0_FOR_NEW_USERS) == "1"
+ if !params.key?(:devise) &&
+ (auth0_default_for_new_users || params.key?(:auth0))
+ 'AUTH0'
+ else
+ 'DEVISE'
+ end
+ end
+
def index
project_id = params[:project_id]
project = project_id.present? ? Project.find(params[:project_id]) : nil
| 12 |
diff --git a/package.json b/package.json {
"name": "cesium",
- "version": "1.98.0",
+ "version": "1.98.1",
"description": "CesiumJS is a JavaScript library for creating 3D globes and 2D maps in a web browser without a plugin.",
"homepage": "http://cesium.com/cesiumjs/",
"license": "Apache-2.0",
| 3 |
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js @@ -25,7 +25,7 @@ module.exports = class TransactionController extends EventEmitter {
this.query = opts.ethQuery
this.txProviderUtils = new TxProviderUtil(this.query)
this.blockTracker.on('block', this.checkForTxInBlock.bind(this))
- this.blockTracker.on('block', this.continuallyResubmitPendingTxs.bind(this))
+ this.blockTracker.on('block', this.resubmitPendingTxs.bind(this))
this.signEthTx = opts.signTransaction
this.nonceLock = Semaphore(1)
@@ -407,7 +407,7 @@ module.exports = class TransactionController extends EventEmitter {
this.memStore.updateState({ unapprovedTxs, selectedAddressTxList })
}
- continuallyResubmitPendingTxs () {
+ resubmitPendingTxs () {
const pending = this.getTxsByMetaData('status', 'submitted')
// only try resubmitting if their are transactions to resubmit
if (!pending.length) return
| 10 |
diff --git a/package.json b/package.json {
"name": "minimap",
"main": "./lib/main",
- "version": "4.29.8",
+ "version": "4.29.9",
"private": true,
"description": "A preview of the full source code.",
"author": "Fangdun Cai <[email protected]>",
| 6 |
diff --git a/package.json b/package.json "cookie-parser": "^1.4.3",
"corser": "~2.0.0",
"couchdb-calculate-session-id": "^1.1.0",
- "couchdb-harness": "*",
"couchdb-log-parse": "^0.0.4",
"crypto-lite": "^0.1.0",
"denodeify": "^1.2.1",
},
"devDependencies": {
"assert": "^1.4.1",
+ "couchdb-harness": "*",
"bluebird": "^3.4.7",
"builtin-modules": "^1.1.1",
"chai": "^4.1.2",
| 5 |
diff --git a/spark/manifests/spark/package.json b/spark/manifests/spark/package.json {
"name": "@sparkdesignsystem/spark",
- "version": "12.1.1",
+ "version": "12.2.0",
"description": "Spark is the main package for the Spark Design System. This package contains the style and components that make up the basic interfaces for Quicken Loans Fintech products.",
"main": "es5/sparkExports.js",
"scripts": {
| 3 |
diff --git a/app/src/config.ts b/app/src/config.ts @@ -757,7 +757,7 @@ let config: any = {};
let configError = '';
// Load config from window object
-if (typeof window !== 'undefined')
+if (typeof window !== 'undefined' && (window as any).config !== undefined)
{
configSchema.load((window as any).config);
}
| 9 |
diff --git a/token-metadata/0x3AeF8e803BD9be47e69b9f36487748d30D940b96/metadata.json b/token-metadata/0x3AeF8e803BD9be47e69b9f36487748d30D940b96/metadata.json "symbol": "VESTA",
"address": "0x3AeF8e803BD9be47e69b9f36487748d30D940b96",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/lib/plugins/create/create.js b/lib/plugins/create/create.js @@ -72,10 +72,24 @@ const validTemplates = [
'hello-world',
];
-const humanReadableTemplateList = `${validTemplates
- .slice(0, -1)
- .map(template => `"${template}"`)
- .join(', ')} and "${validTemplates.slice(-1)}"`;
+const humanReadableTemplateList = (() => {
+ let lastGroupName = null;
+ let result = '';
+ let lineCount = 0;
+ const templateGroupRe = /^([a-z]+)(-|$)/;
+ for (const templateName of validTemplates) {
+ const groupName = templateName.match(templateGroupRe)[1];
+ if (groupName !== lastGroupName || lineCount === 8) {
+ result += `\n${' '.repeat(45)}"${templateName}"`;
+ lastGroupName = groupName;
+ lineCount = 1;
+ } else {
+ result += `, "${templateName}"`;
+ ++lineCount;
+ }
+ }
+ return result;
+})();
const handleServiceCreationError = error => {
if (error.code !== 'EACCESS') throw error;
| 7 |
diff --git a/handlebars/encounters.hbs b/handlebars/encounters.hbs <label class="encounter-config"><input {{#if this.isChecked}}checked{{/if}} type="checkbox"
name="encounter-import-policy-{{this.name}}" data-section="{{this.name}}"
id="encounter-import-policy-{{this.name}}"
- {{#if this.enabled}}enabled{{else}}disabled{{/if}}>{{this.description}}
+ {{#if this.enabled}}enabled{{else}}disabled{{/if}}>{{{this.description}}}
</label>
</div>
{{/each}}
<div class="character-import-config">
<label class="import-config"><input {{#if this.isChecked}}checked{{/if}} type="checkbox"
name="character-import-policy-{{this.name}}" data-section="{{this.name}}"
- {{#if this.enabled}}enabled{{else}}disabled{{/if}}>{{this.description}}
+ {{#if this.enabled}}enabled{{else}}disabled{{/if}}>{{{this.description}}}
</label>
</div>
{{/each}}
<div class="munching-generic-config"><input {{#if this.isChecked}}checked{{/if}} type="checkbox"
id="munching-generic-policy-{{this.name}}"
name="munching-policy-{{this.name}}"
- data-section="{{this.name}}" {{#if this.enabled}}enabled{{else}}disabled{{/if}}>{{this.description}}
+ data-section="{{this.name}}" {{#if this.enabled}}enabled{{else}}disabled{{/if}}>{{{this.description}}}
</div>
{{/each}}
{{#each monsterConfig}}
<div class="munching-monster-config"><input {{#if this.isChecked}}checked{{/if}} type="checkbox"
name="munching-policy-{{this.name}}" id="munching-policy-{{this.name}}"
- data-section="{{this.name}}" {{#if this.enabled}}enabled{{else}}disabled{{/if}}>{{this.description}}
+ data-section="{{this.name}}" {{#if this.enabled}}enabled{{else}}disabled{{/if}}>{{{this.description}}}
</div>
{{/each}}
<hr>
| 7 |
diff --git a/assets/src/edit-story/components/header/buttons.js b/assets/src/edit-story/components/header/buttons.js @@ -140,7 +140,7 @@ function PreviewButton() {
return (
<>
<Outline onClick={openPreviewLink} isDisabled={isSaving}>
- {__('Preview', 'web-stories')}
+ {__('Save & Preview', 'web-stories')}
</Outline>
<Dialog
open={Boolean(previewLinkToOpenViaDialog)}
| 10 |
diff --git a/src/injected.js b/src/injected.js @@ -603,7 +603,11 @@ var comm = {
];
comm.forEach(require, function (key) {
var script = data.require[key];
- script && code.push(script + ';');
+ if (script) {
+ code.push(script);
+ // Add `;` to a new line in case script ends with comment lines
+ code.push(';');
+ }
});
// wrap code to make 'use strict' work
code.push('!function(){' + script.code + '\n}.call(this)');
| 1 |
diff --git a/package.json b/package.json "node-sass": "^4.5.3",
"sass-loader": "^6.0.6",
"sequelize-cli": "3",
- "sqlite3": "^3.1.13",
+ "sqlite3": "^4.0.2",
"style-loader": "0.19",
"webpack": "^3.0.0",
"webpack-dev-server": "^2.5.0"
| 3 |
diff --git a/polyfills/Intl/ListFormat/config.toml b/polyfills/Intl/ListFormat/config.toml @@ -12,7 +12,7 @@ repo = "https://github.com/formatjs/formatjs/tree/master/packages/intl-listforma
docs = "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/listformat"
notes = [
"Locales must be specified separately by prefixing the locale name with `Intl.ListFormat.~locale`, eg `Intl.ListFormat.~locale.en-GB`.",
- "Safari version can be set to the first version that isn't installable on macOS Catalina. At this time there is no such version."
+ "Safari 16 is the first version that isn't installable on macOS Catalina. macOS Catalina and older do not include OS level dependencies for this feature"
]
[browsers]
@@ -26,7 +26,7 @@ ie = ">=9"
ie_mob = ">=9"
opera = "<60"
op_mob = "<51"
-safari = "*"
+safari = "<16.0"
ios_saf = "<14.5"
samsung_mob = "<11.0"
| 3 |
diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE **Organics hook version** _(sails-hook-organics)_:
**Grunt hook version** _(sails-hook-grunt)_:
**Uploads hook version** _(sails-hook-uploads)_:
-**DB adapter & version** _(e.g. sails-mysql@^5.55.5)_:
-**Skipper adapter & version** _(e.g. skipper-s3@^5.55.5)_:
+**DB adapter & version** _(e.g. [email protected])_:
+**Skipper adapter & version** _(e.g. [email protected])_:
<hr/>
| 4 |
diff --git a/camera-manager.js b/camera-manager.js @@ -43,7 +43,9 @@ const requestPointerLock = () => new Promise((accept, reject) => {
document.removeEventListener('pointerlockerror', _pointerlockerror);
};
const renderer = getRenderer();
- renderer.domElement.requestPointerLock();
+ renderer.domElement.requestPointerLock({
+ unadjustedMovement: true,
+ });
} else {
accept();
}
| 0 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.