code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/generators/cursor.js b/src/generators/cursor.js @@ -2,6 +2,8 @@ import defineClasses from '../util/defineClasses'
export default function() {
return defineClasses({
- 'clickable': { 'cursor': 'pointer' },
+ 'cursor-auto': { 'cursor': 'auto' },
+ 'cursor-pointer': { 'cursor': 'pointer' },
+ 'cursor-not-allowed': { 'cursor': 'not-allowed' },
})
}
| 10 |
diff --git a/assets/js/modules/thank-with-google/datastore/constants.js b/assets/js/modules/thank-with-google/datastore/constants.js export const MODULES_THANK_WITH_GOOGLE = 'modules/thank-with-google';
-export const STATE_ACTIVE = 'ACTIVE';
-export const STATE_ACTION_REQUIRED = 'ACTION_REQUIRED';
-export const STATE_PENDING_VERIFICATION = 'PENDING_VERIFICATION';
+export const ONBOARDING_STATE_COMPLETE = 'ONBOARDING_COMPLETE';
+export const ONBOARDING_STATE_ACTION_REQUIRED = 'ONBOARDING_ACTION_REQUIRED';
+export const ONBOARDING_STATE_PENDING_VERIFICATION = 'PENDING_VERIFICATION';
export const CTA_PLACEMENT_DYNAMIC_LOW = 'dynamic_low';
export const CTA_PLACEMENT_DYNAMIC_HIGH = 'dynamic_high';
| 10 |
diff --git a/src/content/en/updates/2017/03/chrome-58-deprecations.md b/src/content/en/updates/2017/03/chrome-58-deprecations.md @@ -70,29 +70,33 @@ Starting with Chrome 58, a mouse on Android M or later will:
[Chromium Bug](https://bugs.chromium.org/p/chromium/issues/detail?id=468806)
-## Remove EME from unsecure contexts
+## Remove EME from non-secure contexts
Some usages of
-[Encrypted Media Extensions (EME)](https://www.w3.org/TR/encrypted-media/)
-expose digital rights management (DRM) implementations that are not open source,
+[Encrypted Media Extenions (EME)](https://developer.mozilla.org/en-US/docs/Web/API/Encrypted_Media_Extensions_API)
+expose digital rights management implementations that are not open source,
involve access to persistent unique identifiers, and/or run unsandboxed or with
-privileged access. The risks are increased when exposed via insecure HTTP,
-because the persistent unique IDs could be stolen by anyone on the network. In
-addition, for implementations that require explicit permissions, permission for
-an insecure HTTP site can be exploited.
-
-Because of these issues, support for non-secure contexts was removed from the
-EME spec before it became a Proposed Recommendation and it is not expected to be
-in the final Recommendation. This functionality was deprecated in Chrome 44 and
-is now being removed.
-
-This may break a small number of media sites that do not use HTTPS. As these
-sites transition to HTTPS, the risk becomes lower.
+privileged access. Security risks are increased for sites exposed via non-secure
+HTTP because they can be attacked by anyone on the channel. Additionally, when
+user consent is required, acceptance persisted for a non-secure HTTP site can be
+exploited by such an attacker.
+
+
+Support for non-secure contexts was removed from the
+[EME version 1 spec](https://w3c.github.io/encrypted-media/)
+and is not supported in the
+[proposed recommendation](https://www.w3.org/TR/encrypted-media/) nor
+anticipated in the subsequent final. will not be in the upcoming proposed
+recommendation or subsequent final recommendation. The API has been showing a
+deprecation message on non-secure origins since Chrome 44 (May 2015). In Chrome
+58, it is now removed. This change is part of our broader effort to
+[remove powerful features from unsecure origins](https://bugs.chromium.org/p/chromium/issues/detail?id=520765).
[Intent to Remove](https://groups.google.com/a/chromium.org/d/topic/blink-dev/tXmKPlXsnCQ/discussion) |
[Chromestatus Tracker](https://www.chromestatus.com/feature/5724389932793856) |
[Chromium Bug](https://bugs.chromium.org/p/chromium/issues/detail?id=672605)
+
## Deprecate insecure usage of notifications
Notifications are a powerful feature as they allow websites to invoke a system
| 5 |
diff --git a/src/utils/blockchainHelpers.js b/src/utils/blockchainHelpers.js @@ -160,22 +160,19 @@ export function deployContract(i, web3, abi, bin, params, state, cb) {
gasPrice: 21000000000
};
- let errorArised;
-
contractInstance.deploy(deployOpts).send(sendOpts)
//contractInstance.new(...totalParams)
.on('error', function(error) {
- errorArised = error;
- console.log(errorArised);
- //return cb(error, null);
+ console.log(error);
+ return cb(error, null);
})
//.on('transactionHash', function(transactionHash){ console.log(transactionHash); })
- .on('receipt', function(receipt){
+ /*.on('receipt', function(receipt){
if (errorArised) {
console.log(receipt.contractAddress) // contains the new contract address
cb(null, receipt.contractAddress);
}
- })
+ })*/
.on('confirmation', function(confirmationNumber, receipt){
//console.log(confirmationNumber, receipt);
/*if (errorArised) {
@@ -185,11 +182,11 @@ export function deployContract(i, web3, abi, bin, params, state, cb) {
})
.then(function(newContractInstance){
- if (!errorArised) {
+ //if (!errorArised) {
//console.log(newContractInstance);
console.log(newContractInstance.options.address) // instance with the new contract address
cb(null, newContractInstance.options.address);
- }
+ //}
});
function deployContractCB(err, txHash) {
| 2 |
diff --git a/LightCrumb/script.json b/LightCrumb/script.json {
"name": "LightCrumbTrails",
"script": "LightCrumb.js",
- "version": "0.75",
+ "version": "0.76",
"previousversions": [],
"description": "LightCrumbTrails is a script to produce lit, shared-vision breadcrumbs behind character tokens. This allows them to see where they've been on maps with dynamic lighting. Great for dungeon-crawls and hex-crawls. Enter !LightCrumb in chat to get started.",
- "authors": "Plexsoup, The Aaron",
+ "authors": "Plexsoup, The Aaron, Tritlo",
"roll20userid": "258125",
"useroptions": [
{
| 3 |
diff --git a/test/browser/suspense.test.js b/test/browser/suspense.test.js @@ -5,8 +5,7 @@ import { createElement as h, render, Component, Suspense, lazy } from '../../src
import { setupScratch, teardown } from '../_util/helpers';
function schedule(cb) {
- setImmediate(cb);
- // setTimeout(cb, 0);
+ setTimeout(cb, 0);
}
class LazyComp extends Component {
| 14 |
diff --git a/composer.json b/composer.json "creativeorange/gravatar": "~1.0",
"nesbot/carbon": "^2.14.0",
"ocramius/package-versions": "^1.4",
- "laravel/helpers": "^1.1",
+ "laravel/helpers": "^1.1|dev-master",
"doctrine/dbal": "^2.5",
"venturecraft/revisionable": "1.*",
"intervention/image": "^2.3",
| 11 |
diff --git a/src/components/dashboard/FeedList.js b/src/components/dashboard/FeedList.js @@ -112,12 +112,13 @@ class FeedList extends PureComponent<FeedListProps, FeedListState> {
return horizontal ? <FeedModalItem {...itemProps} /> : <FeedListItem {...itemProps} />
}
- renderList = (feeds: any) => {
+ renderList = (feeds: any, loading: boolean) => {
const { fixedHeight, onEndReached, initialNumToRender, horizontal } = this.props
if (horizontal) {
return (
<View style={styles.horizontalContainer}>
+ {loading ? <ActivityIndicator style={styles.loading} animating={true} color="gray" size="large" /> : null}
<AnimatedFlatList
initialNumToRender={5}
ItemSeparatorComponent={ItemSeparatorComponent}
@@ -142,6 +143,7 @@ class FeedList extends PureComponent<FeedListProps, FeedListState> {
} else {
return (
<View style={styles.verticalContainer}>
+ {loading ? <ActivityIndicator style={styles.loading} animating={true} color="gray" size="large" /> : null}
<AnimatedSwipeableFlatList
bounceFirstRowOnMount={true}
maxSwipeDistance={160}
@@ -173,7 +175,7 @@ class FeedList extends PureComponent<FeedListProps, FeedListState> {
const feeds = data && data instanceof Array && data.length ? data : undefined
const { loading } = this.props.store.get('currentScreen')
return feeds ? (
- this.renderList(feeds)
+ this.renderList(feeds, loading)
) : (
<View style={styles.verticalContainer}>
{loading ? (
@@ -196,6 +198,9 @@ export class ItemSeparatorComponent extends PureComponent<ItemSeparatorComponent
}
const styles = StyleSheet.create({
+ loading: {
+ marginTop: normalize(10)
+ },
horizontalContainer: {
backgroundColor: 'rgba(0, 0, 0, 0.7)',
flex: 1,
| 0 |
diff --git a/bl-plugins/rss/plugin.php b/bl-plugins/rss/plugin.php @@ -76,7 +76,7 @@ class pluginRSS extends Plugin {
$xml .= '<title>'.$page->title().'</title>';
$xml .= '<link>'.$this->urlRSS($page->permalink()).'</link>';
$xml .= '<description>'.Sanitize::html($page->contentBreak()).'</description>';
- $xml .= '<pubDate>'.$page->date(DATE_RSS).'</pubDate>';
+ $xml .= '<pubDate>'.date('r',strtotime($page->getValue('dateRaw'))).'</pubDate>';
$xml .= '<guid isPermaLink="false">'.$page->uuid().'</guid>';
$xml .= '</item>';
} catch (Exception $e) {
| 8 |
diff --git a/test/image/compare_pixels_test.js b/test/image/compare_pixels_test.js @@ -101,7 +101,9 @@ if(allMock || argv.filter) {
}
var FLAKY_LIST = [
- 'treemap_textposition'
+ 'treemap_textposition',
+ 'trace_metatext',
+ 'gl3d_directions-streamtube1'
];
console.log('');
| 0 |
diff --git a/apps/antonclk/README.md b/apps/antonclk/README.md @@ -41,8 +41,8 @@ The main menu contains several settings covering Anton clock in general.
Weekday name depends on the current locale.
If seconds are shown, the weekday is never shown as there is not enough space on the watch face.
* **Show Weeknumber** - Week-number (ISO-8601) is shown. (default: Off)
-If "Show Weekday" is "Off" the week-number is displayed as week #:<num>.
-If "Show Weekday" is "On" the weekday name is cut at 6th position and .#<week num> is added.
+If "Show Weekday" is "Off" the week-number is displayed as "week #:<num>".
+If "Show Weekday" is "On" the weekday name is cut at 6th position and suffixed with ".#<week num>".
If seconds are shown, the week number is never shown as there is not enough space on the watch face.
* **Vector font** - Use the built-in vector font for dates and weekday.
This can improve readability.
| 3 |
diff --git a/test/Air/AirParser.test.js b/test/Air/AirParser.test.js @@ -2,7 +2,6 @@ import { expect } from 'chai';
import assert from 'assert';
import fs from 'fs';
import path from 'path';
-import moment from 'moment';
import airParser from '../../src/Services/Air/AirParser';
import {
@@ -1206,21 +1205,17 @@ describe('#AirParser', () => {
const jsonResult = parseFunction.call(uParser, json);
testBooking(jsonResult, false, true);
const [booking] = jsonResult;
- expect(
- moment(booking.fareQuotes[0].effectiveDate).format('YYYY-MM-DD')
- ).to.be.equal('2017-07-11');
+ expect(booking.fareQuotes[0].effectiveDate)
+ .to.be.equal('2017-07-11T00:00:00.000+02:00');
- expect(
- moment(booking.fareQuotes[1].effectiveDate).format('YYYY-MM-DD')
- ).to.be.equal('2017-07-17');
+ expect(booking.fareQuotes[1].effectiveDate)
+ .to.be.equal('2017-07-17T00:00:00.000+02:00');
- expect(
- moment(booking.fareQuotes[2].effectiveDate).format('YYYY-MM-DD')
- ).to.be.equal('2017-07-29');
+ expect(booking.fareQuotes[2].effectiveDate)
+ .to.be.equal('2017-07-29T00:00:00.000+02:00');
- expect(
- moment(booking.fareQuotes[3].effectiveDate).format('YYYY-MM-DD')
- ).to.be.equal('2017-07-30');
+ expect(booking.fareQuotes[3].effectiveDate)
+ .to.be.equal('2017-07-30T00:00:00.000+02:00');
}).catch(err => assert(false, 'Error during parsing' + err.stack));
});
});
| 2 |
diff --git a/src/pages/Group/ComponentList.js b/src/pages/Group/ComponentList.js @@ -594,6 +594,7 @@ export default class ComponentList extends Component {
}
dataSource={apps || []}
footer={() => footer}
+ scroll={{ y: 240 }}
/>
</ScrollerX>
{batchDeleteShow && (
| 1 |
diff --git a/src/page/home/sidebar/SidebarLinks.js b/src/page/home/sidebar/SidebarLinks.js @@ -9,7 +9,7 @@ import withIon from '../../../components/withIon';
import IONKEYS from '../../../IONKEYS';
import {fetchAll} from '../../../lib/actions/Report';
import Ion from '../../../lib/Ion';
-import PageTitleUpdater from '../../../lib/PageTitleUpdater/index.native';
+import PageTitleUpdater from '../../../lib/PageTitleUpdater';
import ChatSwitcherView from './ChatSwitcherView';
import SafeAreaInsetPropTypes from '../../SafeAreaInsetPropTypes';
| 4 |
diff --git a/crypto.js b/crypto.js @@ -2,7 +2,7 @@ import {web3, contracts, runSidechainTransaction} from './blockchain.js';
import {loginManager} from './login.js';
import {storageHost} from './constants.js';
-const mintToken = async file => {
+const mintToken = async (file, {description = ''} = {}) => {
const res = await fetch(storageHost, {
method: 'POST',
body: file,
@@ -36,8 +36,8 @@ const mintToken = async file => {
tokenId = null;
}
if (status) {
- console.log('minting', ['NFT', 'mint', address, '0x' + hash, file.name, 'captured video', quantity]);
- const result = await runSidechainTransaction(mnemonic)('NFT', 'mint', address, '0x' + hash, file.name, 'captured video', quantity);
+ console.log('minting', ['NFT', 'mint', address, '0x' + hash, file.name, description, quantity]);
+ const result = await runSidechainTransaction(mnemonic)('NFT', 'mint', address, '0x' + hash, file.name, description, quantity);
status = result.status;
transactionHash = result.transactionHash;
tokenId = new web3['sidechain'].utils.BN(result.logs[0].topics[3].slice(2), 16).toNumber();
| 0 |
diff --git a/.electron-vue/webpack.renderer.config.js b/.electron-vue/webpack.renderer.config.js @@ -184,7 +184,8 @@ if (!proMode) {
)
}
-if (process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test') {
+if (process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test' &&
+ !process.env.MARKTEXT_DEV_HIDE_BROWSER_ANALYZER) {
rendererConfig.plugins.push(
new BundleAnalyzerPlugin()
)
| 7 |
diff --git a/circle.yml b/circle.yml @@ -3,13 +3,3 @@ machine:
version: 8
environment:
PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
-
-dependencies:
- override:
- - yarn
- cache_directories:
- - ~/.cache/yarn
-
-test:
- override:
- - yarn test
| 2 |
diff --git a/sirepo/pkcli/srw.py b/sirepo/pkcli/srw.py @@ -25,6 +25,26 @@ def create_predefined(out_dir=None):
import srwl_uti_src
import pykern.pkjson
+ def lib_file_path(file_type):
+ return sim_data.srw_lib_file_paths_for_type(
+ file_type,
+ lambda f: PKDict(fileName=f.basename),
+ want_user_lib_dir=False,
+ )
+
+ def predefined_json_path(out_dir):
+ b = srw_common.PREDEFINED_JSON
+ if out_dir:
+ return pkio.py_path(out_dir).join(b)
+ from sirepo.template import template_common
+ # Assume a good location for PREDEFINED_JSON is the same dir
+ # as PARAMETERS_PYTHON_FILE.jinja.
+ return sim_data.resource_path(
+ template_common.jinja_filename(
+ template_common.PARAMETERS_PYTHON_FILE,
+ ),
+ ).dirpath(b)
+
sim_data = sirepo.sim_data.get_class('srw')
beams = []
for beam in srwl_uti_src.srwl_uti_src_e_beam_predef():
@@ -54,33 +74,13 @@ def create_predefined(out_dir=None):
)),
)
- def f(file_type):
- return sim_data.srw_lib_file_paths_for_type(
- file_type,
- lambda f: PKDict(fileName=f.basename),
- want_user_lib_dir=False,
- )
-
- def p(out_dir):
- b = srw_common.PREDEFINED_JSON
- if out_dir:
- return pkio.py_path(out_dir).join(b)
- from sirepo.template import template_common
- # Assume a good location for PREDEFINED_JSON is the same dir
- # as PARAMETERS_PYTHON_FILE.jinja.
- return sim_data.resource_path(
- template_common.jinja_filename(
- template_common.PARAMETERS_PYTHON_FILE,
- ),
- ).dirpath(b)
-
- n = p(out_dir)
+ n = predefined_json_path(out_dir)
pykern.pkjson.dump_pretty(
PKDict(
beams=beams,
- magnetic_measurements=f('undulatorTable'),
- mirrors=f('mirror'),
- sample_images=f('sample'),
+ magnetic_measurements=lib_file_path('undulatorTable'),
+ mirrors=lib_file_path('mirror'),
+ sample_images=lib_file_path('sample'),
),
filename=n,
)
| 4 |
diff --git a/lib/GoogleHome.js b/lib/GoogleHome.js @@ -1369,6 +1369,10 @@ class GoogleHome {
} else if (smartEnum) {
try {
// try to detect device
+ if (id.match(/^hm-rpc\..*?\.CUX/)) {
+ this.adapter.log.debug('[GHOME] Ignore "' + id + '": Because it is a virtual device');
+ return
+ }
const options = {
objects: objects,
id: id,
| 8 |
diff --git a/userscript.user.js b/userscript.user.js @@ -54820,15 +54820,21 @@ var $$IMU_EXPORT$$;
}
function find_els_at_point(xy, els, prev) {
+ // test for pointer-events: none: https://www.shacknews.com/article/114834/should-you-choose-vulkan-or-directx-12-in-red-dead-redemption-2
+
+ if (false && _nir_debug_)
+ console_log("find_els_at_point", deepcopy(xy), deepcopy(els), deepcopy(prev));
+
if (!prev) {
prev = [];
}
var ret = [];
+ var afterret = [];
if (!els) {
els = document.elementsFromPoint(xy[0], xy[1]);
- ret = els;
+ afterret = els;
}
for (var i = 0; i < els.length; i++) {
@@ -54839,27 +54845,44 @@ var $$IMU_EXPORT$$;
prev.push(el);
- var rect = el.getBoundingClientRect();
- if (rect && rect.width > 0 && rect.height > 0 &&
- rect.left <= xy[0] && rect.right >= xy[0] &&
- rect.top <= xy[1] && rect.bottom >= xy[1] &&
- ret.indexOf(el) < 0) {
- ret.push(el);
- }
-
// FIXME: should we stop checking if not in bounding client rect?
// this would depend on the fact that children are always within the bounding rect
-
+ // - probably not, there are cases where the parent div has a size of 0, but children have proper sizes
if (el.children && el.children.length > 0) {
- var newels = find_els_at_point(xy, el.children, prev);
+ // reverse, because the last element is (usually) the highest z
+ var newchildren = [];
+ for (var j = el.children.length - 1; j >= 0; j--) {
+ newchildren.push(el.children[j]);
+ }
+
+ var newels = find_els_at_point(xy, newchildren, prev);
for (var j = 0; j < newels.length; j++) {
var newel = newels[j];
- if (ret.indexOf(newel) < 0)
+ //console_log("about to add", newel, deepcopy(ret))
+ if (ret.indexOf(newel) < 0) {
+ //console_log("adding", newel);
ret.push(newel);
}
}
}
+ var rect = el.getBoundingClientRect();
+ if (rect && rect.width > 0 && rect.height > 0 &&
+ rect.left <= xy[0] && rect.right >= xy[0] &&
+ rect.top <= xy[1] && rect.bottom >= xy[1] &&
+ ret.indexOf(el) < 0) {
+ ret.push(el);
+ }
+ }
+
+ for (var i = 0; i < afterret.length; i++) {
+ if (ret.indexOf(afterret[i]) < 0)
+ ret.push(afterret[i]);
+ }
+
+ if (_nir_debug_ && ret.length > 0)
+ console_log("find_els_at_point (ret)", els, ret, xy);
+
return ret;
}
| 7 |
diff --git a/scss/form/_label.scss b/scss/form/_label.scss @@ -19,7 +19,8 @@ $siimple-label-color: $siimple-default-color;
//Label class
.siimple-label {
display: inline-block;
- height: $siimple-label-height;
+ //height: $siimple-label-height;
+ min-height: $siimple-label-height;
line-height: $siimple-label-line-height;
//font-family: $siimple-default-text-font;
font-size: $siimple-label-font-size;
| 1 |
diff --git a/src/index.scss b/src/index.scss // Global settings
$govuk-assets-path: "~govuk-frontend/govuk/assets/";
-$govuk-page-width: calc(100vw - 1px);
-$govuk-gutter: 3rem;
+$govuk-page-width: 1920px;
$govuk-font-family: "GDS Transport", Arial, sans-serif;
// GOVUK Frontend
| 12 |
diff --git a/conf/evolutions/default/14.sql b/conf/evolutions/default/14.sql @@ -4,4 +4,15 @@ INSERT INTO label_type VALUES (8, 'Problem', 'Composite type: represents cluster
# --- !Downs
+DELETE FROM global_attribute_user_attribute
+WHERE global_attribute_id IN ( SELECT global_attribute_id FROM global_attribute WHERE label_type_id = 8 )
+ OR user_attribute_id IN ( SELECT user_attribute_id FROM user_attribute WHERE label_type_id = 8 );
+
+DELETE FROM global_attribute WHERE label_type_id = 8;
+
+DELETE FROM user_attribute_label
+WHERE user_attribute_id IN ( SELECT user_attribute_id FROM user_attribute WHERE label_type_id = 8 );
+
+DELETE FROM user_attribute WHERE label_type_id = 8;
+
DELETE FROM label_type WHERE label_type.label_type = 'Problem';
| 7 |
diff --git a/src/og/utils/Loader.js b/src/og/utils/Loader.js @@ -77,12 +77,12 @@ export class Loader {
let request = this._senderRequestCounter[sender._id];
if (request) {
request.counter--;
- clearTimeout(this._requestCounterTimeout);
- this._requestCounterTimeout = setTimeout(() => {
+ cancelAnimationFrame(this._requestCounterFrame);
+ this._requestCounterFrame = requestAnimationFrame(() => {
if (request.counter === 0 && sender._planet._renderCompletedActivated) {
sender.events.dispatch(sender.events.loadend);
}
- }, 20);
+ });
}
}
this._exec();
| 14 |
diff --git a/clients/python-client/parsr_client/parsr_client.py b/clients/python-client/parsr_client/parsr_client.py @@ -72,8 +72,8 @@ class ParsrClient():
def send_document(
self,
- file: str,
- config: str,
+ file_path: str,
+ config_path: str,
server: str = "",
document_name: str = None,
revision: str = 'major',
@@ -100,15 +100,20 @@ class ParsrClient():
else:
server = self.server
packet = {
- 'file': (file, open(file, 'rb'), 'application/pdf'),
- 'config': (config, open(config, 'rb'), 'application/json'),
+ 'file': (
+ file_path,
+ open(file_path, 'rb'),
+ 'application/pdf'),
+ 'config': (config_path,
+ open(config_path, 'rb'),
+ 'application/json'),
}
r = post(
'http://' + server + '/api/v1/document',
files=packet)
jobId = r.text
if not document_name:
- document_name = path.splitext(path.basename(file))[0]
+ document_name = path.splitext(path.basename(file_path))[0]
if document_name not in self.revision_history:
self.revision_history[document_name] = {
str(VersionInfo.parse('1.0.0')): jobId
@@ -125,8 +130,8 @@ class ParsrClient():
self.set_current_request_id(jobId)
if not wait_till_finished:
return {
- 'file': file,
- 'config': config,
+ 'file': file_path,
+ 'config': config_path,
'status_code': r.status_code,
'server_response': r.text}
else:
| 10 |
diff --git a/lib/node_modules/@stdlib/math/base/complex/flipsign/benchmark/benchmark.js b/lib/node_modules/@stdlib/math/base/complex/flipsign/benchmark/benchmark.js var bench = require( '@stdlib/bench' );
var randu = require( '@stdlib/random/base/randu' );
-var isnan = require( '@stdlib/math/base/assert/is-nan' );
+var isArray = require( '@stdlib/assert/is-array' );
var pkg = require( './../package.json' ).name;
var cflipsign = require( './../lib' );
@@ -30,7 +30,7 @@ var cflipsign = require( './../lib' );
// MAIN //
bench( pkg, function benchmark( b ) {
- var ans;
+ var out;
var re;
var im;
var y;
@@ -41,24 +41,24 @@ bench( pkg, function benchmark( b ) {
re = ( randu()*1000.0 ) - 500.0;
im = ( randu()*1000.0 ) - 500.0;
y = ( randu()*1000.0 ) - 500.0;
- ans = cflipsign( re, im, y );
- if ( ans.length === 0 ) {
+ out = cflipsign( re, im, y );
+ if ( out.length === 0 ) {
b.fail( 'should not be empty' );
}
}
b.toc();
- if ( isnan( ans ) ) {
- b.fail( 'should not return NaN' );
+ if ( !isArray( out ) ) {
+ b.fail( 'should return an array' );
}
b.pass( 'benchmark finished' );
b.end();
});
bench( pkg+'::memory_reuse', function benchmark( b ) {
- var ans;
var out;
var re;
var im;
+ var v;
var y;
var i;
@@ -69,21 +69,21 @@ bench( pkg+'::memory_reuse', function benchmark( b ) {
re = ( randu()*1000.0 ) - 500.0;
im = ( randu()*1000.0 ) - 500.0;
y = ( randu()*1000.0 ) - 500.0;
- ans = cflipsign( out, re, im, y );
- if ( ans.length === 0 ) {
+ v = cflipsign( out, re, im, y );
+ if ( v.length === 0 ) {
b.fail( 'should not be empty' );
}
}
b.toc();
- if ( isnan( ans ) ) {
- b.fail( 'should not return NaN' );
+ if ( !isArray( v ) ) {
+ b.fail( 'should return an array' );
}
b.pass( 'benchmark finished' );
b.end();
});
bench( pkg+'::manual', function benchmark( b ) {
- var ans;
+ var out;
var re;
var im;
var y;
@@ -94,27 +94,27 @@ bench( pkg+'::manual', function benchmark( b ) {
re = ( randu()*1000.0 ) - 500.0;
im = ( randu()*1000.0 ) - 500.0;
y = ( randu()*1000.0 ) - 500.0;
- ans = ( y < 0 ) ? [ -re, -im ] : [ re, im ];
- if ( ans.length === 0 ) {
+ out = ( y < 0 ) ? [ -re, -im ] : [ re, im ];
+ if ( out.length === 0 ) {
b.fail( 'should not be empty' );
}
}
b.toc();
- if ( isnan( ans ) ) {
- b.fail( 'should not return NaN' );
+ if ( !isArray( out ) ) {
+ b.fail( 'should return an array' );
}
b.pass( 'benchmark finished' );
b.end();
});
bench( pkg+'::manual,memory_reuse', function benchmark( b ) {
- var ans;
+ var out;
var re;
var im;
var y;
var i;
- ans = new Array( 2 );
+ out = new Array( 2 );
b.tic();
for ( i = 0; i < b.iterations; i++ ) {
@@ -125,15 +125,15 @@ bench( pkg+'::manual,memory_reuse', function benchmark( b ) {
re *= -1;
im *= -1;
}
- ans[ 0 ] = re;
- ans[ 1 ] = im;
- if ( ans.length === 0 ) {
+ out[ 0 ] = re;
+ out[ 1 ] = im;
+ if ( out.length === 0 ) {
b.fail( 'should not be empty' );
}
}
b.toc();
- if ( isnan( ans ) ) {
- b.fail( 'should not return NaN' );
+ if ( !isArray( out ) ) {
+ b.fail( 'should return an array' );
}
b.pass( 'benchmark finished' );
b.end();
| 10 |
diff --git a/src/ui/GlobalSearch.hx b/src/ui/GlobalSearch.hx @@ -162,10 +162,17 @@ using tools.HtmlTools;
ctxLast = ctxLink;
var head = '\n\n// in @[$ctxLink]:\n' + line;
if (isRepl) {
- var next:String = isReplFn ? repl(curr, {
+ var next:String;
+ if (isReplFn) {
+ next = repl(curr, {
ctx: ctxName,
row: pos.row,
- }) : repl;
+ });
+ } else if (mt.length > 1) {
+ var li = rx.lastIndex;
+ next = NativeString.replaceExt(mt[0], rx, repl);
+ rx.lastIndex = li;
+ } else next = repl;
out += q.substring(replStart, ofs) + next;
replStart = ofs + mt[0].length;
if (mt[0] != next) {
| 1 |
diff --git a/src/components/nodes/association/association.vue b/src/components/nodes/association/association.vue @@ -180,9 +180,6 @@ export default {
mounted() {
this.shape = new joint.shapes.standard.Link({ router: { name: 'normal' } });
this.shape.attr({
- wrapper: {
- cursor: 'grab',
- },
line: {
stroke: 'black',
strokeWidth: '4',
| 2 |
diff --git a/admin-base/materialize/custom/_explorer.scss b/admin-base/materialize/custom/_explorer.scss background-color: color("blue-grey", "lighten-5");
border-left: 1px solid color("blue-grey", "lighten-4");
color: color("blue-grey", "darken-4");
+ overflow: auto;
.asset-preview {
height: 100%;
padding: 0.75rem 0;
| 11 |
diff --git a/README.md b/README.md @@ -23,7 +23,16 @@ To install from source just do:
Then to start TileMill do:
- ./index.js # and then view http://localhost:20009 in your web browser
+As a Desktop application:
+
+ ./index.js
+
+To run the **web version** pass `server=true`:
+
+ ./index.js --server=true
+
+and then go to `localhost:20009` in your web browser
+
For more extended details follow:
| 7 |
diff --git a/articles/libraries/auth0js/migration-guide.md b/articles/libraries/auth0js/migration-guide.md @@ -8,7 +8,9 @@ url: /libraries/auth0js/migration-guide
The following instructions assume you are migrating from **auth0.js v7** to **auth0.js v8**.
-The goal of this migration guide is to provide you with all of the information you would need to update Auth0.js in your application. Of course, your first step is to include the latest version of auth0.js. Beyond that, take a careful look at each of the areas on this page. You will need to change your implementation of auth0.js to reflect the new changes. Take a look below for more information!
+The goal of this migration guide is to provide you with all of the information you would need to update Auth0.js in your application. Of course, your first step is to include the latest version of auth0.js. Beyond that, take a careful look at each of the areas on this page. You will need to change your implementation of auth0.js to reflect the new changes. Note that we especially recommend migrating to auth0.js v8 if you have the OAuth2 flag enabled in your tenant.
+
+Take a look below for more information about changes and additions to auth0.js in version 8!
## Initialization of auth0.js
@@ -25,30 +27,78 @@ Initialization of auth0.js in your application will now use `auth0.WebAuth` inst
## Login
-Logging in has changed in v8 as well. Rather than using the `login` method, to [login using the Hosted Login page](/libraries/auth0js#hosted-login-page) you will need to use the `authorize` method. To [login using a custom username/password](/libraries/auth0js#custom-username-and-password), you'll use the `client.login` method.
+The `login` method of version 7 was divided into several different methods in version 8, based on the type of auth you need, rather than the old `login` method.
+
+### webAuth.authorize()
+
+The `authorize` method can be used for logging in users via the [Hosted Login Page](/libraries/auth0js#hosted-login-page), or via social connections, as exhibited below. The default behavior for `authorize` is redirect, but popup can be specified.
+
+For hosted login, one must call the authorize endpoint
+
+
+```js
+webAuth.authorize({ //Any additional options can go here });
+```
-Hosted Login:
+For social logins, the connection will need to be specified
```js
webAuth.authorize({
- audience: 'url:auth:some-audience',
- scope: 'read:something write:otherthing',
- responseType: 'token',
- redirectUri: 'https://example.com/auth/callback'
+ connection: 'twitter'
+});
+```
+
+Hosted login with popup
+
+```js
+webAuth.popup.authorize({ //Any additional options can go here });
+```
+
+And social login with popup
+
+```js
+webAuth.popup.authorize({
+ connection: 'twitter'
});
```
-Custom Username/Password Login:
+### webAuth.loginWithCredentials()
+
+To login with credentials to enterprise connections, the `loginWithCredentials` method is used. Redirect or popup should be specified.
+
+With redirect
+
+```js
+webAuth.redirect.loginWithCredentials({
+ connection: 'Username-Password-Authentication',
+ username: 'testuser',
+ password: 'testpass',
+ scope: 'openid'
+});
+```
+
+Or with popup
+
+```js
+webAuth.popup.loginWithCredentials({
+ connection: 'Username-Password-Authentication',
+ username: 'testuser',
+ password: 'testpass',
+ scope: 'openid'
+});
+```
+
+### webAuth.client.login()
+
+The `client.login` method allows for non rediret auth using custom database connections, using /oauth/token.
```js
webAuth.client.login({
- realm: 'Username-Password-Authentication', //connection name or HRD domain
- username: '[email protected]',
- password: 'areallystrongpassword',
- audience: 'https://mystore.com/api/v2',
- scope: 'read:order write:order',
- }, function(err, authResult) {
- // Auth tokens in the result or an error
+ realm: 'tests',
+ username: 'testuser',
+ password: 'testpass',
+ scope: 'openid profile',
+ audience: 'urn:test'
});
```
| 3 |
diff --git a/app/templates/components/notification-dropdown.hbs b/app/templates/components/notification-dropdown.hbs <div class="ui segment empty-message">
<a href="{{href-to 'notifications'}}">{{t 'Go to notifications panel'}}</a>
</div>
- <div class="ui fluid link celled selection list">
+ <div class="ui fluid list {{if unreadNotifications 'link celled selection' ''}}">
<div class="item active">
{{t 'No new notifications'}}
</div>
| 7 |
diff --git a/token-metadata/0x675E7d927Af7e6D0082e0153dc3485B687a6F0ad/metadata.json b/token-metadata/0x675E7d927Af7e6D0082e0153dc3485B687a6F0ad/metadata.json "symbol": "CREED",
"address": "0x675E7d927Af7e6D0082e0153dc3485B687a6F0ad",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/html/components/modal.stories.js b/html/components/modal.stories.js @@ -90,13 +90,18 @@ export const defaultStory = () => {
class="
sprk-c-Button
sprk-c-Button--tertiary
- sprk-o-Stack__item"
+ sprk-o-Stack__item
+ sprk-o-Stack__item--flex@xxs"
data-sprk-modal-cancel="exampleChoiceModal"
>
Cancel
</button>
- <button class="sprk-c-Button sprk-o-Stack__item">
+ <button
+ class="
+ sprk-c-Button
+ sprk-o-Stack__item
+ sprk-o-Stack__item--flex@xxs">
Confirm
</button>
</footer>
| 3 |
diff --git a/src/css/docs/components/docs-markdown.css b/src/css/docs/components/docs-markdown.css @@ -645,12 +645,16 @@ blockquote .DocsMarkdown--header-anchor-positioner {
margin-bottom: 1em;
}
-.DocsMarkdown details p {
- padding-left: 1.9em;
+.DocsMarkdown details summary + div {
+ padding: 1em 1.9em;
+ border: 1px solid rgba(var(--color-rgb), .1);
+ border-top: 0;
+ border-bottom-left-radius: .25em;
+ border-bottom-right-radius: .25em;
}
@media (max-width: 414px) {
- .DocsMarkdown details p {
+ .DocsMarkdown details summary + div {
padding-left: 0;
}
}
@@ -660,7 +664,9 @@ blockquote .DocsMarkdown--header-anchor-positioner {
}
.DocsMarkdown details[open] summary {
- margin-bottom: .5em;
+ background: rgba(var(--color-rgb), .1);
+ border-bottom-left-radius: 0;
+ border-bottom-right-radius: 0;
}
.DocsMarkdown sub {
@@ -792,6 +798,7 @@ blockquote .DocsMarkdown--header-anchor-positioner {
.DocsMarkdown li > *:first-child,
.DocsMarkdown blockquote > *:first-child,
.DocsMarkdown details > *:first-child,
+.DocsMarkdown details summary + div > *:first-child,
.DocsMarkdown--content-column > *:first-child,
.DocsMarkdown--example > *:first-child,
.DocsMarkdown--aside > *:first-child {
@@ -804,6 +811,7 @@ blockquote .DocsMarkdown--header-anchor-positioner {
.DocsMarkdown li > *:not(ul):not(ol):not(pre):not(figure):not(table):last-child,
.DocsMarkdown blockquote > *:last-child,
.DocsMarkdown details > *:last-child,
+.DocsMarkdown details summary + div > *:last-child,
.DocsMarkdown--content-column > *:last-child,
.DocsMarkdown--example > *:last-child,
.DocsMarkdown--aside > *:last-child {
| 7 |
diff --git a/src/server/views/widget/page_alerts.html b/src/server/views/widget/page_alerts.html {% endif %}
{% if isTrashPage() %}
+ <div class="alert alert-warning py-3 px-4 d-flex align-items-center justify-content-between">
<div>
This page is in the trash <i class="icon-trash" aria-hidden="true"></i>.
{% if page.isDeleted() %}
| 14 |
diff --git a/src/ui/InfoWindow.js b/src/ui/InfoWindow.js @@ -295,7 +295,7 @@ class InfoWindow extends UIComponent {
// Find the point with the shortest distance
for (let i = 0, len = pts.length; i < len; i++) {
const pt = pts[i];
- const dis = Math.sqrt(Math.pow(mousePt.x - pt.x, 2) + Math.pow(mousePt.y - pt.y, 2));
+ const dis = mousePt.distanceTo(pt);
if (dis < minDis) {
minDis = dis;
coordinateIndex = i;
@@ -317,11 +317,8 @@ class InfoWindow extends UIComponent {
if (pt1.x === pt2.x) {
const miny = Math.max(0, Math.min(pt1.y, pt2.y));
const maxy = Math.min(height, Math.max(pt1.y, pt2.y));
- for (let j = miny; j <= maxy; j++) {
- xys.push({
- x: pt1.x,
- y: j
- });
+ for (let y = miny; y <= maxy; y++) {
+ xys.push(new Point(pt1.x, y));
}
} else {
const k = (pt2.y - pt1.y) / (pt2.x - pt1.x);
@@ -329,12 +326,9 @@ class InfoWindow extends UIComponent {
// y-pt1.y=k(x-pt1.x)
const minx = Math.max(0, Math.min(pt1.x, pt2.x));
const maxx = Math.min(width, Math.max(pt1.x, pt2.x));
- for (let j = minx; j <= maxx; j++) {
- const y = k * (j - pt1.x) + pt1.y;
- xys.push({
- x: j,
- y
- });
+ for (let x = minx; x <= maxx; x++) {
+ const y = k * (x - pt1.x) + pt1.y;
+ xys.push(new Point(x, y));
}
}
}
@@ -342,7 +336,7 @@ class InfoWindow extends UIComponent {
// Find the point with the shortest distance
for (let i = 0, len = xys.length; i < len; i++) {
const pt = xys[i];
- const dis = Math.sqrt(Math.pow(mousePt.x - pt.x, 2) + Math.pow(mousePt.y - pt.y, 2));
+ const dis = mousePt.distanceTo(pt);
if (dis < minPtDis) {
minPtDis = dis;
ptIndex = i;
@@ -350,7 +344,7 @@ class InfoWindow extends UIComponent {
}
if (ptIndex < 0) {
return {
- dist: minPtDis,
+ dis: minPtDis,
coordinate: mouseCoordinate
};
}
| 1 |
diff --git a/activity/views.py b/activity/views.py @@ -591,12 +591,12 @@ def register_organization(request):
activity_url=activity_url
)
if org:
- user = ActivityUser.objects.filter(user=request.user).first()
- if not user.organization:
+ user = ActivityUser.objects.get(user=request.user)
+
user.organization = org
user.save()
user.organizations.add(org)
- return redirect('admin_profile_settings')
+ return redirect('/')
else:
return redirect('register_organization')
else:
| 3 |
diff --git a/audio-manager.js b/audio-manager.js @@ -9,8 +9,9 @@ const loadPromise = (async () => {
Avatar.setAudioContext(audioContext);
await audioContext.audioWorklet.addModule('avatars/microphone-worklet.js');
})();
-const waitForLoad = () => loadPromise;
+export const waitForLoad = () => loadPromise;
-export {
- waitForLoad,
+export const setVolume = volume => {
+ const audioContext = WSRTC.getAudioContext();
+ audioContext.gain.gain.value = volume;
};
\ No newline at end of file
| 0 |
diff --git a/data.js b/data.js @@ -3008,8 +3008,8 @@ module.exports = [
name: "husl",
tags: ["color"],
description: "A human-friendly alternative to the HSL color space.",
- url: "http://boronine.github.io/husl",
- source: "https://raw.githubusercontent.com/boronine/husl/master/husl.js"
+ url: "http://www.husl-colors.org/",
+ source: "https://raw.githubusercontent.com/husl-colors/husl/master/husl.coffee"
},
{
name: "Fayer",
| 3 |
diff --git a/packages/slackbot-proxy/src/controllers/growi-to-slack.ts b/packages/slackbot-proxy/src/controllers/growi-to-slack.ts @@ -3,6 +3,7 @@ import {
} from '@tsed/common';
import axios from 'axios';
import createError from 'http-errors';
+import { addHours } from 'date-fns';
import { WebAPICallResult } from '@slack/web-api';
@@ -168,8 +169,7 @@ export class GrowiToSlackCtrl {
logger.debug('relation test is success', order);
// temporary cache for 48 hours
- const now = new Date();
- const expiredAtCommands = new Date(now.setHours(now.getHours() + 48));
+ const expiredAtCommands = addHours(new Date(), 48);
// Transaction is not considered because it is used infrequently,
const response = await this.relationRepository.createQueryBuilder('relation')
| 4 |
diff --git a/components/date_picker/theme.css b/components/date_picker/theme.css }
}
+.week {
+ display: flex;
+ flex-wrap: wrap;
+ font-size: var(--calendar-day-font-size);
+ height: var(--calendar-row-height);
+ line-height: var(--calendar-row-height);
+ opacity: 0.5;
+
+ & > span {
+ flex: 0 0 calc(100% / 7);
+ }
+}
+
.calendar {
background: var(--calendar-primary-contrast-color);
font-size: var(--font-size-small);
}
}
+.day {
+ flex: 0 0 calc(100% / 7);
+ padding: var(--calendar-day-padding-topbottom) var(--calendar-day-padding-leftright);
+
+ & > span {
+ border-radius: 50%;
+ display: inline-block;
+ height: var(--calendar-row-height);
+ line-height: var(--calendar-row-height);
+ width: var(--calendar-row-height);
+ }
+
+ &.active > span {
+ background: var(--calendar-primary-color);
+ color: var(--calendar-primary-contrast-color);
+ }
+
+ &:hover:not(.disabled) > span {
+ cursor: pointer;
+ }
+
+ &:hover:not(.active):not(.disabled) > span {
+ background: var(--calendar-primary-hover-color);
+ color: var(--calendar-primary-contrast-color);
+ }
+
+ &.disabled {
+ opacity: var(--calendar-day-disable-opacity);
+ }
+}
+
.title {
display: inline-block;
font-weight: 500;
}
}
-.week {
- display: flex;
- flex-wrap: wrap;
- font-size: var(--calendar-day-font-size);
- height: var(--calendar-row-height);
- line-height: var(--calendar-row-height);
- opacity: 0.5;
-
- & > span {
- flex: 0 0 calc(100% / 7);
- }
-}
-
.days {
display: flex;
flex-wrap: wrap;
font-size: var(--calendar-day-font-size);
}
-.day {
- flex: 0 0 calc(100% / 7);
- padding: var(--calendar-day-padding-topbottom) var(--calendar-day-padding-leftright);
-
- & > span {
- border-radius: 50%;
- display: inline-block;
- height: var(--calendar-row-height);
- line-height: var(--calendar-row-height);
- width: var(--calendar-row-height);
- }
-
- &:hover:not(.active):not(.disabled) > span {
- background: var(--calendar-primary-hover-color);
- color: var(--calendar-primary-contrast-color);
- }
-
- &.active > span {
- background: var(--calendar-primary-color);
- color: var(--calendar-primary-contrast-color);
- }
-
- &:hover:not(.disabled) > span {
- cursor: pointer;
- }
-
- &.disabled {
- opacity: var(--calendar-day-disable-opacity);
- }
-}
-
.month {
background-color: var(--calendar-primary-contrast-color);
width: 100%;
| 1 |
diff --git a/generators/generator-base.js b/generators/generator-base.js @@ -1672,7 +1672,7 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
}
return limit === 0
? joinTableName
- : this.calculateDbNameWithLimit(entityName, relationshipName, limit, { prefix, separator, legacyDbNames });
+ : this.calculateDbNameWithLimit(entityName, relationshipName, limit, { prefix, separator, appendHash: !legacyDbNames });
}
/**
@@ -1725,7 +1725,7 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
separator,
noSnakeCase,
prefix,
- legacyDbNames,
+ appendHash: !legacyDbNames,
});
}
@@ -1734,14 +1734,16 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
*
* @param {string} entityName - name of the entity
* @param {string} columnOrRelationName - name of the column or related entity
- * @param {object} options - database type
+ * @param {object} options
* @param {boolean} options.noSnakeCase - do not convert names to snakecase
- * @param {string} options.prefix - constraintName prefix for the constraintName
+ * @param {string} options.prefix
+ * @param {string} options.separator
+ * @param {boolean} options.appendHash - adds a calculated hash based on entityName and columnOrRelationName to prevent trimming conflict.
*/
calculateDbNameWithLimit(entityName, columnOrRelationName, limit, options) {
- const { noSnakeCase, prefix, separator, legacyDbNames } = options;
+ const { noSnakeCase, prefix, separator, appendHash } = options;
const halfLimit = Math.floor(limit / 2);
- const suffix = legacyDbNames
+ const suffix = !appendHash
? ''
: `_${crypto
.createHash('shake256', { outputLength: 1 })
@@ -1751,7 +1753,7 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
let entityTable = noSnakeCase ? entityName : this.getTableName(entityName);
let otherTable = noSnakeCase ? columnOrRelationName : this.getTableName(columnOrRelationName);
- entityTable = entityTable.substring(0, halfLimit - (legacyDbNames ? 0 : separator.length));
+ entityTable = entityTable.substring(0, halfLimit - (!appendHash ? 0 : separator.length));
otherTable = otherTable.substring(0, limit - entityTable.length - separator.length - prefix.length - suffix.length);
return `${prefix}${entityTable}${separator}${otherTable}${suffix}`;
| 7 |
diff --git a/server/damageReports/constants.js b/server/damageReports/constants.js @@ -33,7 +33,7 @@ export const defaultOptionalSteps = [
{ name: "damageTeamMessage", args: {} },
{ name: "sendInventory", args: {} },
{ name: "longRangeMessage", args: {} },
- { name: "probeLaunch", args: {} },
+ //{ name: "probeLaunch", args: {} },
{ name: "exocomps", args: {} },
{ name: "softwarePanel", args: {} }
];
| 2 |
diff --git a/js/plugins/urlHandler.js b/js/plugins/urlHandler.js }
function handleQuery(key, val) {
+ var promise = Promise.resolve();
//Espruino.Core.Code.switchToCode(); // if in blockly
switch(key){
case "code": // Passing "encodedURIcomponent code" within the URL
Espruino.Core.EditorJavaScript.setCode(val);
break;
case "codeurl": // Passing a URL for code within the URL
+ promise = promise.then(new Promise(function(resolve,reject) {
Espruino.Core.EditorJavaScript.setCode("// Loading from "+val+"...");
$.ajax({ url: val, cache: false }).done(function( data ) {
Espruino.Core.EditorJavaScript.setCode(data);
+ resolve();
}).error(function(){
Espruino.Core.EditorJavaScript.setCode("// Error loading "+val);
+ reject();
});
+ }));
break;
case "upload": // Get "encodedURIcomponent code" from URL and upload it
+ promise = promise.then(new Promise(function(resolve,reject) {
Espruino.Core.MenuPortSelector.ensureConnected(function() {
Espruino.Core.Terminal.focus(); // give the terminal focus
Espruino.callProcessor("sending");
- Espruino.Core.CodeWriter.writeToEspruino(val);
- Espruino.Core.EditorJavaScript.setCode(val);
+ Espruino.Core.Code.getEspruinoCode(function(code) {
+ Espruino.Core.CodeWriter.writeToEspruino(code, function() {
+ resolve();
+ });
});
+ });
+ }));
break;
case "gist": // Get code from a gist number in the URL
+ promise = promise.then(new Promise(function(resolve,reject) {
Espruino.Core.EditorJavaScript.setCode("// Loading Gist "+val+"...");
$.getJSON("https://api.github.com/gists/"+ val, function(data){
if(data && data.files){
var keys = Object.keys(data.files);
if(keys.length > 0){
Espruino.Core.EditorJavaScript.setCode(data.files[keys[0]].content);
- }
+ resolve();
+ } else reject();
}
}).error(function(){
Espruino.Core.EditorJavaScript.setCode("// Error loading Gist "+val);
+ reject();
});
+ }));
break;
case "settings":
Espruino.Plugins.SettingsProfile.updateFromJson(val);
| 9 |
diff --git a/src/resources/views/crud/buttons/clone.blade.php b/src/resources/views/crud/buttons/clone.blade.php @if ($crud->hasAccess('clone'))
- <a href="javascript:void(0)" onclick="cloneEntry(this)" data-route="{{ url($crud->route.'/'.$entry->getKey().'/clone') }}" class="btn btn-sm btn-link" data-button-type="clone"><i class="fa fa-clone"></i> Clone</a>
+ <a href="javascript:void(0)" onclick="cloneEntry(this)" data-route="{{ url($crud->route.'/'.$entry->getKey().'/clone') }}" class="btn btn-sm btn-link" data-button-type="clone"><i class="fa fa-clone"></i> {{ trans('backpack::crud.clone') }}</a>
@endif
{{-- Button Javascript --}}
// Show an alert with the result
new Noty({
type: "success",
- text: "<strong>Entry cloned</strong><br>A new entry has been added, with the same information as this one."
+ text: "{!! trans('backpack::crud.clone_success') !!}"
}).show();
// Hide the modal, if any
// Show an alert with the result
new Noty({
type: "warning",
- text: "<strong>Cloning failed</strong><br>The new entry could not be created. Please try again."
+ text: "{!! trans('backpack::crud.clone_failure') !!}"
}).show();
}
});
| 14 |
diff --git a/src/options.d.ts b/src/options.d.ts @@ -276,6 +276,10 @@ export interface SunEditorOptions {
* Choose whether the image height input is visible.
*/
imageHeightShow?: boolean;
+ /**
+ * Choose whether the image align radio buttons are visible.
+ */
+ imageAlignShow?: boolean;
/**
* The default width size of the image frame
*/
@@ -352,6 +356,10 @@ export interface SunEditorOptions {
* Choose whether the video height input is visible.
*/
videoHeightShow?: boolean;
+ /**
+ * Choose whether the video align radio buttons are visible.
+ */
+ videoAlignShow?: boolean;
/**
* Choose whether the video ratio options is visible.
*/
| 3 |
diff --git a/site/shovel-dynamic.xml b/site/shovel-dynamic.xml @@ -295,19 +295,50 @@ limitations under the License.
<dt><code>src-uri</code></dt>
<dd>
<p>
- The AMQP URI(s) for the source. Mandatory.
+ The AMQP URI for the source. Mandatory. AMQP 1.0 URIs implement
+ as subset of what is described in the <a href="uri-spec.html">AMQP URI reference</a>.
+ Direct connections are not supported for AMQP 1.0 endpoints and there
+ is no vhost concept.
+ The set of query parameters it supports are different from AMQP 0.9.1
+ URI(s):
</p>
+ <dl>
+ <dt><code>idle_time_out</code></dt>
+ <dd>heartbeat interval</dd>
+ <dt><code>hostname</code></dt>
+ <dd>
+ The name of the target host. Certain vendors (such as Azure ServiceBus)
+ require this to be set even if it is the same as the host segment
+ in the uri.
+ </dd>
+ <dt><code>sasl</code></dt>
+ <dd>
+ <code>anon</code>, <code>none</code> or <code>plain</code>
+ Defaults to: <code>none</code>. When using <code>plain</code> the
+ user and password segments of the URI need to be set.
+ </dd>
+ <dt>
+ <code>cacertfile, certfile, keyfile</code>
+ </dt>
+ <dd>
+ Paths to files to use in order to present a client-side SSL certificate to the server.
+ Only of use for the amqps scheme.
+ </dd>
+ <dt>
+ <code>verify, fail_if_no_peer_cert</code>
+ </dt>
+ <dd>
+ Use to configure verification of the server's SSL certificate.
+ See the <a href="ssl.html">SSL guide</a> for details of SSL in RabbitMQ in general.
+ Only of use for the amqps scheme.
+ </dd>
+ </dl>
</dd>
<dt><code>src-address</code></dt>
<dd>
<p>
- The queue from which to consume. Either this
- or <code>src-exchange</code> (but not both) must be set. Mandatory.
- </p>
- <p>
- If the source queue does not exist on the source broker, it will
- be declared as a durable queue with no arguments.
+ The AMQP 1.0 link address. Mandatory.
</p>
</dd>
@@ -341,8 +372,8 @@ limitations under the License.
<dt><code>dest-uri</code></dt>
<dd>
<p>
- The AMQP URI(s) for the
- destination. Mandatory. See <code>src-uri</code> above. Mandatory.
+ The AMQP URI for the destination. Mandatory.
+ See AMQP 1.0 <code>src-uri</code> above. Mandatory.
</p>
</dd>
| 7 |
diff --git a/packages/app/src/server/models/notification.ts b/packages/app/src/server/models/notification.ts import {
Types, Document, Model, Schema /* , Query */, model,
} from 'mongoose';
-import Debug from 'debug';
import { subDays } from 'date-fns';
import ActivityDefine from '../util/activityDefine';
+import loggerFactory from '../../utils/logger';
import Crowi from '../crowi';
import { ActivityDocument } from './activity';
import User = require('./user');
+const logger = loggerFactory('growi:models:notification');
+
const STATUS_UNREAD = 'UNREAD';
const STATUS_UNOPENED = 'UNOPENED';
const STATUS_OPENED = 'OPENED';
@@ -41,7 +43,6 @@ export interface NotificationModel extends Model<NotificationDocument> {
}
export default (crowi: Crowi) => {
- const debug = Debug('crowi:models:notification');
const notificationEvent = crowi.event('Notification');
const notificationSchema = new Schema<NotificationDocument, NotificationModel>({
@@ -188,7 +189,7 @@ export default (crowi: Crowi) => {
return count;
}
catch (err) {
- debug('Error on getUnreadCountByUser', err);
+ logger.error('Error on getUnreadCountByUser', err);
throw err;
}
};
| 14 |
diff --git a/README.md b/README.md [](https://travis-ci.org/react-materialize/react-materialize)
[](https://npmjs.org/package/react-materialize "View this project on npm")
-[](http://standardjs.com/)
+[](https://github.com/prettier/prettier)
# [react-materialize](https://react-materialize.github.io/)
| 14 |
diff --git a/README.md b/README.md @@ -9,17 +9,15 @@ rendering PDFs.
## Contributing
PDF.js is an open source project and always looking for more contributors. To
-get involved checkout:
+get involved, visit:
+ [Issue Reporting Guide](https://github.com/mozilla/pdf.js/blob/master/.github/CONTRIBUTING.md)
+ [Code Contribution Guide](https://github.com/mozilla/pdf.js/wiki/Contributing)
+ [Frequently Asked Questions](https://github.com/mozilla/pdf.js/wiki/Frequently-Asked-Questions)
+ [Good Beginner Bugs](https://github.com/mozilla/pdf.js/issues?direction=desc&labels=5-good-beginner-bug&page=1&sort=created&state=open)
-+ [Priorities](https://github.com/mozilla/pdf.js/milestones)
-+ [Attend a Public Meeting](https://github.com/mozilla/pdf.js/wiki/Weekly-Public-Meetings)
++ [Projects](https://github.com/mozilla/pdf.js/projects)
-For further questions or guidance feel free to stop by #pdfjs on
-irc.mozilla.org.
+Feel free to stop by #pdfjs on irc.mozilla.org for questions or guidance.
## Getting Started
@@ -79,8 +77,8 @@ It is also possible to view all test PDF files on the right side by opening
## Building PDF.js
-In order to bundle all `src/` files into two productions scripts and build the generic
-viewer, issue:
+In order to bundle all `src/` files into two production scripts and build the generic
+viewer, run:
$ gulp generic
@@ -99,12 +97,12 @@ the `pdfjs-dist` name. For more information and examples please refer to the
## Learning
-You can play with the PDF.js API directly from your browser through the live
+You can play with the PDF.js API directly from your browser using the live
demos below:
+ [Interactive examples](http://mozilla.github.io/pdf.js/examples/index.html#interactive-examples)
-The repo contains a hello world example that you can run locally:
+The repository contains a hello world example that you can run locally:
+ [examples/helloworld/](https://github.com/mozilla/pdf.js/blob/master/examples/helloworld/)
@@ -113,12 +111,7 @@ contributor Julian Viereck:
+ http://www.youtube.com/watch?v=Iv15UY-4Fg8
-You can read more about PDF.js here:
-
-+ http://andreasgal.com/2011/06/15/pdf-js/
-+ http://blog.mozilla.com/cjones/2011/06/15/overview-of-pdf-js-guts/
-
-Even more learning resources can be found at:
+More learning resources can be found at:
+ https://github.com/mozilla/pdf.js/wiki/Additional-Learning-Resources
@@ -144,7 +137,3 @@ Subscribe either using lists.mozilla.org or Google Groups:
Follow us on twitter: @pdfjs
+ http://twitter.com/#!/pdfjs
-
-Weekly Public Meetings
-
-+ https://github.com/mozilla/pdf.js/wiki/Weekly-Public-Meetings
| 7 |
diff --git a/assets/src/libraries/BookList.js b/assets/src/libraries/BookList.js @@ -59,7 +59,7 @@ export default class BookList extends Component {
isLoading: false,
nextPage: 2
})
- };
+ }
_loadMoreBooks() {
const {nextPage, searchTerm} = this.state;
| 2 |
diff --git a/engine.html b/engine.html <title>Offscreen Webaverse Engine</title>
</head>
<body>
+ <div id=iframe-container></div>
<canvas id=canvas width="512" height="512"></canvas>
<script type=module src="engine-worker.js"></script>
</body>
| 0 |
diff --git a/src/assets/js/customise-page-code.js b/src/assets/js/customise-page-code.js @@ -8,7 +8,7 @@ var queryObject = QueryToObject();
// Reset button event handler
AddEvent(resetBtn[0], "click", function( event, $this ) {
- ResetFilters();
+ ResetInputs();
});
// // Share button event handler
@@ -156,16 +156,9 @@ function ApplyFilter( element ) {
/**
- * Reset form input.
+ * Reset page inputs.
*/
-function ResetFilters() {
- /**
- * @todo This fails when QueryToObject() returns "".
- * Cannot reset form inputs with no window query.
- */
- // var queryObject = QueryToObject();
- // var queryObjectKeys = getKeys( queryObject );
-
+function ResetInputs() {
/**
* Reset form inputs
* ---
| 10 |
diff --git a/userscript.user.js b/userscript.user.js @@ -18475,15 +18475,28 @@ var $$IMU_EXPORT$$;
// https://alcdn.img.xiaoka.tv/20161017/a33/379/27774175/a333797899a6aa5d2766de56d58dc7a3.jpg@1e_1c_0o_0l_330h_330w
// https://alcdn.img.xiaoka.tv/20161017/a33/379/27774175/a333797899a6aa5d2766de56d58dc7a3.jpg
(domain_nosub === "xiaoka.tv" && domain.match(/alcdn\.img\.xiaoka\.tv/))) {
+ // thanks to liraqb on github for reporting: https://github.com/qsniyg/maxurl/issues/346
+ // https://i0.hdslb.com/bfs/videoshot/[email protected]
+ if (/:\/\/[^/]+\/+bfs\/+videoshot\/+[0-9]+\.[^/]+(?:[?#].*)?$/.test(src)) {
+ return {
+ url: src,
+ bad: "mask"
+ };
+ }
// https://i0.hdslb.com/bfs/bangumi/546991a5d3add9b550925b1168abf0a460e5f552.jpg@240w_320h.jpg
// https://i2.hdslb.com/bfs/archive/[email protected]
// https://i2.hdslb.com/bfs/archive/6b1d06f79ec31b6e23e4ecb7eb87c53ccd86f965.jpg
// http://i0.hdslb.com/320_180/u_user/a5ab2c18e8e4a62240fad3f0b040ba00.jpg
// http://i0.hdslb.com/u_user/a5ab2c18e8e4a62240fad3f0b040ba00.jpg
+ // https://i2.hdslb.com/bfs/archive/be06808687a0eb892744bc7ec701372fab74357e.jpg@560w_350h_100Q_1c.webp
+ // https://i2.hdslb.com/bfs/archive/be06808687a0eb892744bc7ec701372fab74357e.jpg
+ // https://i2.hdslb.com/bfs/face/a63f3fb3fd63574ca52e09574fa0f2e4a531746f.jpg_64x64.jpg
+ // https://i2.hdslb.com/bfs/face/a63f3fb3fd63574ca52e09574fa0f2e4a531746f.jpg
return src
.replace(/(:\/\/[^/]*\/)[0-9]+_[0-9]+\//, "$1")
//.replace(/(\.[^/.]*)@(?:[0-9]*[a-z](?:_[0-9]*[wh])?)?(\.[^/.]*)$/, "$1");
- .replace(/(\.[^/.]*)@[_0-9a-z]*(?:\.[^/.]*)?$/, "$1");
+ .replace(/(\.[^/.]*)@[_0-9a-zQ]*(?:\.[^/.]*)?$/, "$1")
+ .replace(/(\/[0-9a-f]{20,}\.[^/._]+)_[0-9]+x[0-9]+\.[^/]+(?:[?#].*)?$/, "$1")
}
if (domain === "d.ifengimg.com") {
@@ -60729,6 +60742,19 @@ var $$IMU_EXPORT$$;
return src.replace(/(\/pictures\/.*\/)THUMBS\/+THUMB_/, "$1");
}
+ if (domain === "dyw7ncnq1en5l.cloudfront.net" ||
+ // https://img2.lesnumeriques.com/optim/article/2225/beyond-two-souls__w800.jpg
+ // https://img2.lesnumeriques.com/article/2225/beyond-two-souls.jpg
+ (domain_nosub === "lesnumeriques.com" && /^img[0-9]*\./.test(domain))) {
+ // https://dyw7ncnq1en5l.cloudfront.net/optim/article/2225/beyond-two-souls__w800.webp
+ // https://dyw7ncnq1en5l.cloudfront.net/article/2225/beyond-two-souls.jpg
+ // https://dyw7ncnq1en5l.cloudfront.net/optim/article/14/146359/6da6fbee-dr-kawashima-switch-life-is-strange-2-shovel-knight-king-of-cards-boneworks-les-meilleurs-jeux-du-mois_png__312_176__overflow.webp
+ // https://dyw7ncnq1en5l.cloudfront.net/article/14/146359/6da6fbee-dr-kawashima-switch-life-is-strange-2-shovel-knight-king-of-cards-boneworks-les-meilleurs-jeux-du-mois.png
+ newsrc = src.replace(/\/optim\/+(article\/+[0-9/]+\/+[^/]+?)(?:_png)?__(?:w[0-9]+|[0-9]+_[0-9]+)(?:__overflow)?(\.[^/.]+)(?:[?#].*)?$/, "/$1$2");
+ if (newsrc !== src)
+ return add_full_extensions(newsrc);
+ }
+
| 7 |
diff --git a/js/binance.js b/js/binance.js @@ -990,12 +990,10 @@ module.exports = class binance extends Exchange {
}
async fetchMyDustTrades (symbol = undefined, since = undefined, limit = undefined, params = {}) {
- /**
- * Bianance provides an opportunity to trade insignificant (i.e. non-tradable and non-withdrawable)
- * token leftovers (of any asset) into `BNB` coin which in turn can be used to pay trading fees with it.
- * The corresponding trades history is called the `Dust Log` and can be requested via the following end-point:
- * https://github.com/binance-exchange/binance-official-api-docs/blob/master/wapi-api.md#dustlog-user_data
- */
+ // Bianance provides an opportunity to trade insignificant (i.e. non-tradable and non-withdrawable)
+ // token leftovers (of any asset) into `BNB` coin which in turn can be used to pay trading fees with it.
+ // The corresponding trades history is called the `Dust Log` and can be requested via the following end-point:
+ // https://github.com/binance-exchange/binance-official-api-docs/blob/master/wapi-api.md#dustlog-user_data
let request = this.extend ({}, params);
let response = await this.wapiGetUserAssetDribbletLog (request);
// { success: true,
@@ -1046,13 +1044,11 @@ module.exports = class binance extends Exchange {
break;
}
}
- /**
- * Warning!
- * Binance dust trade `fee` is already excluded from the `BNB` earning reported in the `Dust Log`.
- * So the parser should either set the `fee.cost` to `0` or add it on top of the earned
- * BNB `amount` (or `cost` depending on the trade `side`). The second of the above options
- * is much more illustrative and therefore preferable.
- */
+ // Warning!
+ // Binance dust trade `fee` is already excluded from the `BNB` earning reported in the `Dust Log`.
+ // So the parser should either set the `fee.cost` to `0` or add it on top of the earned
+ // BNB `amount` (or `cost` depending on the trade `side`). The second of the above options
+ // is much more illustrative and therefore preferable.
let fee = {
'currency': earnedCurrency,
'cost': this.safeFloat (trade, 'serviceChargeAmount'),
| 14 |
diff --git a/src/charts/topology-map/examples/topology-map-view.js b/src/charts/topology-map/examples/topology-map-view.js },{
id: 'blabla',
title: 'testNode3',
- fileicon: "/img/OpenShift-logo.svg",
+ fileicon: "http://www.patternfly.org/angular-patternfly/img/patternfly-orb.svg",
iconType: "fileicon",
size: 64,
utilization: 25,
"id": 5,
"title": "Maddox",
"size": 16,
- fileicon: "/img/OpenShift-logo.svg",
+ fileicon: "http://www.patternfly.org/angular-patternfly/img/patternfly-orb.svg",
},
{
"id": 6,
"id": 9,
"title": "Stanton",
"size": 12,
- fileicon: "/img/OpenShift-logo.svg",
+ fileicon: "http://www.patternfly.org/angular-patternfly/img/patternfly-orb.svg",
},
{
"id": 10,
"id": 12,
"title": "Stephanie",
"size": 30,
- fileicon: "/img/OpenShift-logo.svg",
+ fileicon: "http://www.patternfly.org/angular-patternfly/img/patternfly-orb.svg",
},
{
"id": 13,
"id": 14,
"title": "Natalia",
"size": 21,
- fileicon: "/img/OpenShift-logo.svg",
+ fileicon: "http://www.patternfly.org/angular-patternfly/img/patternfly-orb.svg",
},
{
"id": 15,
"id": 18,
"title": "Decker",
"size": 21,
- fileicon: "/img/OpenShift-logo.svg",
+ fileicon: "http://www.patternfly.org/angular-patternfly/img/patternfly-orb.svg",
},
{
"id": 19,
"id": 20,
"title": "Coleman",
"size": 30,
- fileicon: "/img/OpenShift-logo.svg",
+ fileicon: "http://www.patternfly.org/angular-patternfly/img/patternfly-orb.svg",
},
{
"id": 21,
"id": 22,
"title": "Morton",
"size": 28,
- fileicon: "/img/OpenShift-logo.svg",
+ fileicon: "http://www.patternfly.org/angular-patternfly/img/patternfly-orb.svg",
},
{
"id": 23,
"title": "Fitzpatrick",
"size": 16,
- fileicon: "/img/OpenShift-logo.svg",
+ fileicon: "http://www.patternfly.org/angular-patternfly/img/patternfly-orb.svg",
},
{
"id": 24,
"id": 25,
"title": "Kaufman",
"size": 30,
- fileicon: "/img/OpenShift-logo.svg",
+ fileicon: "http://www.patternfly.org/angular-patternfly/img/patternfly-orb.svg",
},
{
"id": 26,
| 14 |
diff --git a/generators/entity-client/templates/react/src/test/javascript/spec/app/entities/entity-reducer.spec.ts.ejs b/generators/entity-client/templates/react/src/test/javascript/spec/app/entities/entity-reducer.spec.ts.ejs @@ -165,7 +165,7 @@ describe('Entities reducer tests', () => {
<%_ if (pagination !== 'no') { _%>
totalItems: payload.headers['x-total-count'],
<%_ } _%>
- entities: payload.data
+ entities: <% if (pagination === 'infinite-scroll') { %>[payload.data]<% } else { %>payload.data<% } %>
});
});
| 3 |
diff --git a/rig.js b/rig.js @@ -369,6 +369,10 @@ class RigManager {
oldPeerRig.aux.setPose(aux);
}
+ setLocalMicMediaStream(mediaStream) {
+ this.localRig.setMicrophoneMediaStream(mediaStream);
+ }
+
setPeerMicMediaStream(mediaStream, peerId) {
const peerRig = this.peerRigs.get(peerId);
peerRig.setMicrophoneMediaStream(mediaStream);
| 0 |
diff --git a/src/lib/service/cdn-resources-downloader.js b/src/lib/service/cdn-resources-downloader.js @@ -100,7 +100,7 @@ class CdnResourcesDownloader {
*/
generateReplaceUrlInCssStream(cdnResource, assetsResourcesStore, webroot) {
return replaceStream(
- /url\((?!"data:)["']?(.+?)["']?\)/g, // https://regex101.com/r/Sds38A/2
+ /url\((?!['"]?data:)["']?(.+?)["']?\)/g, // https://regex101.com/r/Sds38A/3
(match, url) => {
// generate URL Object
const parsedUrl = url.startsWith('http')
| 7 |
diff --git a/src/configure-webpack/index.js b/src/configure-webpack/index.js @@ -78,10 +78,11 @@ const buildSharedWebpackConfig = (saguiConfig) => {
// Duplicates equal or similar files
...(action === actions.BUILD ? [new WebpackMd5Hash()] : []),
- new CleanWebpackPlugin(['dist'], {
+ // We should not clean on any other action
+ ...(action === actions.BUILD ? [new CleanWebpackPlugin(['dist'], {
root: projectPath,
verbose: false
- }),
+ })] : []),
new DefinePlugin({
'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)
| 1 |
diff --git a/desktop/sources/scripts/programs/t.js b/desktop/sources/scripts/programs/t.js @@ -8,7 +8,7 @@ function program_T(x,y)
this.operation = function()
{
- if(this.up("1")){
+ if(this.up("1") || this.up("r") || this.up("l") || this.up("u") || this.up("d") || this.up("b")){
this.fire();
}
}
| 7 |
diff --git a/stories/Shapes.stories.js b/stories/Shapes.stories.js @@ -41,63 +41,38 @@ function Story({ comp, args }) {
)
}
-export const Box = () => <Story comp='Box' />
-export const Circle = () => <Story comp='Circle' />
-export const Cone = () => <Story comp='Cone' />
-export const Cylinder = () => <Story comp='Cylinder' />
-export const Sphere = () => <Story comp='Sphere' />
-export const Plane = () => <Story comp='Plane' />
-export const Tube = () => <Story comp='Tube' />
-export const Torus = () => <Story comp='Torus' />
-export const TorusKnot = () => <Story comp='TorusKnot' />
-export const Tetrahedron = () => <Story comp='Tetrahedron' />
-export const Ring = () => <Story comp='Ring' />
+export const Box = () => <Story comp="Box" />
+export const Circle = () => <Story comp="Circle" />
+export const Cone = () => <Story comp="Cone" />
+export const Cylinder = () => <Story comp="Cylinder" />
+export const Sphere = () => <Story comp="Sphere" />
+export const Plane = () => <Story comp="Plane" />
+export const Tube = () => <Story comp="Tube" />
+export const Torus = () => <Story comp="Torus" />
+export const TorusKnot = () => <Story comp="TorusKnot" />
+export const Tetrahedron = () => <Story comp="Tetrahedron" />
+export const Ring = () => <Story comp="Ring" />
-var verticesOfCube = [-1, -1, -1, 1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, 1, 1, -1, 1, 1, 1, 1, -1, 1, 1]
+// prettier-ignore
+const verticesOfCube = [
+ -1, -1, -1, 1, -1, -1, 1, 1, -1, -1, 1, -1,
+ -1, -1, 1, 1, -1, 1, 1, 1, 1, -1, 1, 1,
+];
-var indicesOfFaces = [
- 2,
- 1,
- 0,
- 0,
- 3,
- 2,
- 0,
- 4,
- 7,
- 7,
- 3,
- 0,
- 0,
- 1,
- 5,
- 5,
- 4,
- 0,
- 1,
- 2,
- 6,
- 6,
- 5,
- 1,
- 2,
- 3,
- 7,
- 7,
- 6,
- 2,
- 4,
- 5,
- 6,
- 6,
- 7,
- 4,
-]
+// prettier-ignore
+const indicesOfFaces = [
+ 2, 1, 0, 0, 3, 2,
+ 0, 4, 7, 7, 3, 0,
+ 0, 1, 5, 5, 4, 0,
+ 1, 2, 6, 6, 5, 1,
+ 2, 3, 7, 7, 6, 2,
+ 4, 5, 6, 6, 7, 4
+];
-export const Polyhedron = () => <Story comp='Polyhedron' args={[verticesOfCube, indicesOfFaces]} />
-export const Icosahedron = () => <Story comp='Icosahedron' />
-export const Octahedron = () => <Story comp='Octahedron' />
-export const Dodecahedron = () => <Story comp='Dodecahedron' />
-export const Extrude = () => <Story comp='Extrude' />
-export const Lathe = () => <Story comp='Lathe' />
-export const Parametric = () => <Story comp='Parametric' />
+export const Polyhedron = () => <Story comp="Polyhedron" args={[verticesOfCube, indicesOfFaces]} />
+export const Icosahedron = () => <Story comp="Icosahedron" />
+export const Octahedron = () => <Story comp="Octahedron" />
+export const Dodecahedron = () => <Story comp="Dodecahedron" />
+export const Extrude = () => <Story comp="Extrude" />
+export const Lathe = () => <Story comp="Lathe" />
+export const Parametric = () => <Story comp="Parametric" />
| 8 |
diff --git a/token-metadata/0x3b62F3820e0B035cc4aD602dECe6d796BC325325/metadata.json b/token-metadata/0x3b62F3820e0B035cc4aD602dECe6d796BC325325/metadata.json "symbol": "DEUS",
"address": "0x3b62F3820e0B035cc4aD602dECe6d796BC325325",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/articles/dev-lifecycle/local-testing-and-development.md b/articles/dev-lifecycle/local-testing-and-development.md ---
description: How to develop and test Auth0 applications.
---
-
# Work with Auth0 Locally
In most cases, authenticating users through Auth0 requires an Internet connection. However, you can still develop and test apps that use Auth0 locally. In some cases, you might not need access to an Internet connection.
@@ -16,11 +15,9 @@ Because [JSON Web Tokens (JWT)](/jwt) are stateless (that is, the app that consu
You can obtain JWTs for testing using any of the following methods:
-1. Manually [generate a JWT](https://jwt.io#libraries-io) with the needed data, and sign it with your [Auth0 client secret](${manage_url}/#/clients/${account.clientId}/settings). Omit the `exp` claim from a token; most JWT libraries will interpret it as a token which never expires (it's possible some libraries might reject a perpetual token). **This method doesn't require Internet access.**
-
-2. Create a test user for a database [connection](/identityproviders), and programatically log this user in. Essentially, you are using the recommended process for [calling an API using a highly-trusted client](/api-auth/grant/password). For detailed implementation instructions, see [Execute the Resource Owner Password Grant](/api-auth/tutorials/password-grant).
+1. Create a test user for a database [connection](/identityproviders), and programatically log this user in. Essentially, you are using the recommended process for [calling an API using a highly-trusted client](/api-auth/grant/password). For detailed implementation instructions, see [Execute the Resource Owner Password Grant](/api-auth/tutorials/password-grant).
-3. Use a browser bot (e.g. Selenium) to play the role of a user, log in and retrieve a JWT. While this approach may take some effort to develop and maintain, it will allow you to test any [redirection rules](/rules/redirect) or [MFA prompts](/multifactor-authentication) that you have configured.
+2. Use a browser bot (e.g. Selenium) to play the role of a user, log in and retrieve a JWT. While this approach may take some effort to develop and maintain, it will allow you to test any [redirection rules](/rules/redirect) or [MFA prompts](/multifactor-authentication) that you have configured.
## Use Sessions with Server-Side Applications
| 2 |
diff --git a/src/renderer/marketplace/services/service-details.jsx b/src/renderer/marketplace/services/service-details.jsx @@ -48,7 +48,7 @@ const styles = theme => ({
fontWeight: 400,
lineHeight: 1.67,
margin: 0,
- padding: '16px',
+ padding: '44px 16px 16px',
textAlign: 'justify',
width: '100%'
},
@@ -165,7 +165,7 @@ const styles = theme => ({
height: 'initial',
marginBottom: '15px',
opacity: '1 !important',
- padding: '3px 0',
+ padding: '6px 0',
'& span': {
display: 'flex',
justifyContent: 'space-around'
| 1 |
diff --git a/src/prerenderContent/prerenderObj.js b/src/prerenderContent/prerenderObj.js @@ -3,7 +3,7 @@ import * as React from "react";
import * as ReactDOMServer from "react-dom/server";
import * as Scrivito from "scrivito";
import Helmet from "react-helmet";
-import App from "../App";
+import App, { helmetContext } from "../App";
import filenameFromUrl from "./filenameFromUrl";
import generateHtml from "./generateHtml";
import generatePreloadDump from "./generatePreloadDump";
@@ -15,7 +15,7 @@ export default async function prerenderObj(obj) {
const { result, preloadDump } = await Scrivito.renderPage(obj, () => {
const bodyContent = ReactDOMServer.renderToString(<App />);
- const helmet = Helmet.renderStatic();
+ const { helmet } = helmetContext;
return {
objId: obj.id(),
| 4 |
diff --git a/app/controllers/wiki_pages_controller.rb b/app/controllers/wiki_pages_controller.rb +# frozen_string_literal: true
+
class WikiPagesController < ApplicationController
acts_as_wiki_pages_controller
accept_formats :html
@@ -7,14 +9,16 @@ class WikiPagesController < ApplicationController
def edit_allowed?
return false unless logged_in?
return true if current_user.is_admin?
+
if current_user.is_site_admin_of?( @site )
return true if @page.creator.blank?
return true if [email protected]_admin? && @page.creator.is_site_admin_of?( @site )
end
- if [email protected]_page_wiki_path.blank? && @page.path == @site.home_page_wiki_path
- return false unless current_user.site_id == @site.id
+ if [email protected]_page_wiki_path.blank? && @page.path == @site.home_page_wiki_path && current_user.site_id != @site.id
+ return false
end
return false if @page.admin_only?
+
current_user.is_curator?
end
@@ -30,8 +34,14 @@ class WikiPagesController < ApplicationController
end
end
- def wiki_page_permitted_params
- [:previous_version_number, :title, :content, :comment, :admin_only]
+ def permitted_page_params
+ params.require( :page ).permit(
+ :admin_only,
+ :comment,
+ :content,
+ :previous_version_number,
+ :title
+ )
end
def not_allowed
| 4 |
diff --git a/reader/readerView.css b/reader/readerView.css #backtoarticle {
- padding: 0 2.5em;
+ padding: 2em 0 0 44px;
color: dodgerblue;
max-width: 800px;
margin: auto;
display: block;
box-sizing: border-box;
- margin-top: 2em;
cursor: pointer;
- font-family: ".SFNSText-Regular", sans-serif;
+ font-family: system-ui, ".SFNSText-Regular", sans-serif;
}
#backtoarticle i {
vertical-align: baseline;
@@ -45,7 +44,7 @@ iframe.reader-frame {
display: none;
}
h1.article-title {
- padding: 0.5em 1em;
+ padding: 0 1em 0.5em 1em;
margin-top: 0.5em;
margin: 0;
font-size: 2em;
@@ -105,14 +104,18 @@ ol li {
padding: 0.25rem 0;
}
a {
- color: inherit;
+ color: #1b74bb;
font-size: 1em;
text-decoration: none;
- opacity: 0.6;
+}
+body.dark-mode a {
+ color: #65a9ed;
}
a:hover {
- color: #2196F3;
- opacity: 1.0;
+ background-image: linear-gradient(to bottom, transparent 70%, currentColor 0%);
+ background-size: 1px 3px;
+ background-position: 0px 0.98em;
+ background-repeat: repeat-x;
}
figure {
max-width: 50%;
@@ -154,9 +157,6 @@ body.dark-mode {
background-color: rgb(33, 37, 43);
color: lightgrey;
}
-body.dark-mode a {
- color: dodgerblue;
-}
/* site-specific styles */
| 3 |
diff --git a/src/content/en/fundamentals/performance/lazy-loading-guidance/images-and-video/index.md b/src/content/en/fundamentals/performance/lazy-loading-guidance/images-and-video/index.md @@ -573,7 +573,7 @@ These changes can be disorienting for users and trigger expensive DOM layout
operations that consume system resources and contribute to jank. At a minimum,
consider using a solid color placeholder occupying the same dimensions as the
target image, or techniques such as
-[LQIP](http://www.guypo.com/introducing-lqip-low-quality-image-placeholders/) or
+[LQIP](http://www.guypo.com/introducing-lqip-low-quality-image-placeholders) or
[SQIP](https://github.com/technopagan/sqip) that hint at the content of a media
item before it loads.
| 1 |
diff --git a/lib/windshaft/renderers/pg_mvt/renderer.js b/lib/windshaft/renderers/pg_mvt/renderer.js @@ -83,7 +83,7 @@ Renderer.prototype = {
}
var tile_sql =
- "SELECT ST_AsMVT('clayer', NULL, 'mvt_geom', q) " +
+ "SELECT ST_AsMVT('{layer_id}', NULL, 'mvt_geom', q) " +
"FROM (SELECT the_geom_webmercator AS mvt_geom, \"cartodb_id\" FROM " + // TODO here goes the list of columns needed
"({_sql}) as cdbq WHERE \"the_geom_webmercator\" &&" +
"ST_MakeEnvelope({b_xmin}, {b_ymin}, {b_xmax}, {b_ymax}, {srid})) as q;";
@@ -109,7 +109,8 @@ Renderer.prototype = {
y: coord.y,
xyz_resolution: xyz_resolution,
srid: geom_column_srid,
- gcol: geom_column
+ gcol: geom_column,
+ layer_id: this.layer.id
}, extent);
var timer = new Timer();
| 4 |
diff --git a/packages/docs/docs/docs/architecture.md b/packages/docs/docs/docs/architecture.md @@ -37,7 +37,7 @@ openzeppelin set-admin [NEW_ADMIN_ADDRESS]
### Contract upgrades via ProxyAdmin
-The `ProxyAdmin.sol` also responsible for upgrading our contracts. When you run the `openzeppelin upgrade` command, it goes through `ProxyAdmin`'s [`upgrade`](upgradeability_ProxyAdmin.html#upgrade) method. The `ProxyAdmin` contract also provides another method [`getProxyImplementation`](upgradeability_ProxyAdmin.html#getProxyImplementation) which returns the current implementation of a given proxy.
+The `ProxyAdmin.sol` also responsible for upgrading our contracts. When you run the `openzeppelin upgrade` command, it goes through `ProxyAdmin's` [`upgrade`](upgradeability_ProxyAdmin.html#upgrade) method. The `ProxyAdmin` contract also provides another method [`getProxyImplementation`](upgradeability_ProxyAdmin.html#getProxyImplementation) which returns the current implementation of a given proxy.
You can find your `ProxyAdmin` contract address in `.openzeppelin/<network>.json` under the same name.
@@ -48,6 +48,12 @@ You can find your `ProxyAdmin` contract address in `.openzeppelin/<network>.json
```
The [`ProxyAdmin.sol`](https://github.com/OpenZeppelin/openzeppelin-sdk/blob/v2.2.0/packages/lib/contracts/upgradeability/ProxyAdmin.sol) comes with `@openzeppelin/upgrades` package.
+
+## [ProxyFactory](https://docs.zeppelinos.org/docs/2.3.0/upgradeability_ProxyFactory.html)
+
+
+The [ProxyFactory contract](https://docs.zeppelinos.org/docs/2.3.0/upgradeability_ProxyFactory.html#docsNav) comes with `@openzeppelin/upgrades` package and helps in creating `CREATE2` contracts using `zos create2` command. This contract contains all the necessary methods to deploy a `CREATE2` contract. Some important methods in `ProxyFactory.sol` are [_createProxy](https://docs.zeppelinos.org/docs/2.3.0/upgradeability_ProxyFactory.html#_createProxy), [_deployProxy](https://docs.zeppelinos.org/docs/2.3.0/upgradeability_ProxyFactory.html#_deployProxy) and [deploy](https://docs.zeppelinos.org/docs/2.3.0/upgradeability_ProxyFactory.html#deploy) which helps in deploying a proxy contract. You can find the full source code of `ProxyFactory` contract [here](https://github.com/zeppelinos/zos/blob/v2.4.0/packages/lib/contracts/upgradeability/ProxyFactory.sol#L81).
+
## [App.sol](https://github.com/OpenZeppelin/openzeppelin-sdk/blob/v2.0.0/packages/lib/contracts/application/App.sol)
The App contract is the project's main entry point. Its most important function is to manage your project's "providers". A provider is basically an Ethereum Package identified by a name at a specific version. For example, a project may track your application's contracts in one provider named "my-application" at version "0.0.1", an OpenZeppelin Contracts provider named "@openzeppelin/contracts-ethereum-package" at version "2.0.0", and a few other providers. These providers are your project's sources of on-chain logic.
| 0 |
diff --git a/app/templates/webpack.config.dev_vue2.js b/app/templates/webpack.config.dev_vue2.js @@ -72,7 +72,17 @@ module.exports = {
use: [
'file-loader',
]
+ },
+ {
+ test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
+ use: [{
+ loader: 'file-loader',
+ options: {
+ name: '[name].[ext]',
+ outputPath: 'fonts/'
}
+ }]
+ },
]
},
plugins: [
| 0 |
diff --git a/index.html b/index.html <html lang="en">
<head>
<meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+ <meta name="viewport" content="width=device-width, initial-scale=0.8,maximum-scale=0.8, minimum-scale=0.8, shrink-to-fit=no">
<link rel="stylesheet" href="css/spectre.min.css">
<link rel="stylesheet" href="css/spectre-exp.min.css">
<link rel="stylesheet" href="css/spectre-icons.min.css">
| 12 |
diff --git a/test/endtoend/wdio.remote.conf.js b/test/endtoend/wdio.remote.conf.js @@ -14,7 +14,7 @@ exports.config = Object.assign(base.config, {
{ browserName: 'chrome', version: '50.0', platform: 'Windows 7' },
{ browserName: 'MicrosoftEdge', version: '14.14393', platform: 'Windows 10' },
// { browserName: 'safari', version: '11.0', platform: 'macOS 10.12' },
- { browserName: 'safari', version: '11.0', platformName: 'iOS', platformVersion: '10.0', deviceOrientation: 'portrait', deviceName: 'iPhone 6 Simulator', appiumVersion: '1.7.1' },
+ { browserName: 'safari', version: '10.0', platformName: 'iOS', platformVersion: '10.0', deviceOrientation: 'portrait', deviceName: 'iPhone 6 Simulator', appiumVersion: '1.7.1' },
{ browserName: 'chrome', platformName: 'Android', platformVersion: '6.0', deviceOrientation: 'portrait', deviceName: 'Android Emulator', appiumVersion: '1.7.1' }
].map(createCapability),
| 4 |
diff --git a/.github/workflows/php-tests-wp-latest-php-8-0.yml b/.github/workflows/php-tests-wp-latest-php-8-0.yml @@ -76,7 +76,9 @@ jobs:
- name: Composer Install
run: composer install --no-interaction --no-progress
- name: Update PHPUnit
- run: composer update phpunit/phpunit --with-dependencies --ignore-platform-reqs --no-scripts
+ run: |
+ composer config --unset platform.php
+ composer update phpunit/phpunit --with-dependencies --no-scripts
- name: Set up PHP test data
run: tests/phpunit/bin/install-wp-tests.sh ${MYSQL_DATABASE} ${MYSQL_USER} ${MYSQL_PASSWORD} ${DB_HOST}:${DB_PORT} ${WP_VERSION}
- name: Run Unit Tests
| 2 |
diff --git a/token-metadata/0xeb269732ab75A6fD61Ea60b06fE994cD32a83549/metadata.json b/token-metadata/0xeb269732ab75A6fD61Ea60b06fE994cD32a83549/metadata.json "symbol": "USDX",
"address": "0xeb269732ab75A6fD61Ea60b06fE994cD32a83549",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/ApiGatewayWebSocket.js b/src/ApiGatewayWebSocket.js @@ -35,7 +35,7 @@ module.exports = class ApiGatewayWebSocket {
this._hasWebsocketRoutes = false;
this._experimentalWarningNotified = false;
- this._wsServer = null;
+ this._server = null;
this._init();
}
@@ -85,10 +85,10 @@ module.exports = class ApiGatewayWebSocket {
}
// Hapijs server
- this._wsServer = new Server(serverOptions);
+ this._server = new Server(serverOptions);
// Enable CORS preflight response
- this._wsServer.ext('onPreResponse', (request, h) => {
+ this._server.ext('onPreResponse', (request, h) => {
if (request.headers.origin) {
const response = request.response.isBoom
? request.response.output
@@ -123,7 +123,7 @@ module.exports = class ApiGatewayWebSocket {
async createServer() {
try {
- await this._wsServer.register(hapiPluginWebsocket);
+ await this._server.register(hapiPluginWebsocket);
} catch (e) {
serverlessLog(e);
}
@@ -186,7 +186,7 @@ module.exports = class ApiGatewayWebSocket {
}
};
- this._wsServer.route({
+ this._server.route({
method: 'POST',
path: '/',
config: {
@@ -300,13 +300,13 @@ module.exports = class ApiGatewayWebSocket {
},
});
- this._wsServer.route({
+ this._server.route({
handler: (request, h) => h.response().code(426),
method: 'GET',
path: '/{path*}',
});
- this._wsServer.route({
+ this._server.route({
config: {
payload: {
parse: false,
@@ -341,7 +341,7 @@ module.exports = class ApiGatewayWebSocket {
},
});
- this._wsServer.route({
+ this._server.route({
config: {
payload: {
parse: false,
@@ -433,7 +433,7 @@ module.exports = class ApiGatewayWebSocket {
async startServer() {
try {
- await this._wsServer.start();
+ await this._server.start();
} catch (error) {
console.error(
`Unexpected error while starting serverless-offline websocket server on port ${this._options.websocketPort}:`,
| 10 |
diff --git a/upload.js b/upload.js @@ -60,6 +60,7 @@ export class UploadInstance extends EventEmitter {
check(this.config, {
ddp: Match.Any,
file: Match.Any,
+ fileId: Match.Optional(String),
meta: Match.Optional(Object),
type: Match.Optional(String),
onError: Match.Optional(Function),
@@ -151,7 +152,7 @@ export class UploadInstance extends EventEmitter {
this.sentChunks = 0;
this.fileLength = 1;
this.EOFsent = false;
- this.fileId = Match.Optional(String) || Random.id();
+ this.fileId = this.config.fileId || Random.id();
this.FSName = this.collection.namingFunction ? this.collection.namingFunction(this.fileData) : this.fileId;
this.pipes = [];
| 11 |
diff --git a/src/navigator/view/ItemView.js b/src/navigator/view/ItemView.js @@ -68,7 +68,7 @@ module.exports = Backbone.View.extend({
const model = this.model;
const components = model.get('components');
model.set('open', false);
- this.listenTo(components, 'remove add change reset', this.checkChildren);
+ this.listenTo(components, 'remove add reset', this.checkChildren);
this.listenTo(model, 'change:status', this.updateStatus);
this.listenTo(model, 'change:open', this.updateOpening);
this.listenTo(model, 'change:style:display', this.updateVisibility);
@@ -277,7 +277,7 @@ module.exports = Backbone.View.extend({
* */
checkChildren() {
const model = this.model;
- const c = this.countChildren(model);
+ const count = this.countChildren(model);
const pfx = this.pfx;
const noChildCls = this.clsNoChild;
const title = this.$el
@@ -288,9 +288,9 @@ module.exports = Backbone.View.extend({
this.cnt = this.$el.children(`.${this.clsCount}`);
}
- if (c) {
+ if (count) {
title.removeClass(noChildCls);
- this.cnt.html(c);
+ this.cnt.html(count);
} else {
title.addClass(noChildCls);
this.cnt.empty();
| 1 |
diff --git a/src/angular/projects/spark-core-angular/src/lib/components/sprk-alert/sprk-alert.component.spec.ts b/src/angular/projects/spark-core-angular/src/lib/components/sprk-alert/sprk-alert.component.spec.ts @@ -25,15 +25,6 @@ describe('SparkAlertComponent', () => {
expect(component).toBeTruthy();
});
- it('getClasses should match what gets set on the icon', () => {
- const icon = alertElement.querySelector('div');
- fixture.detectChanges();
-
- expect(icon.classList.toString()).toEqual(
- component.getClassesAlertContainer()
- );
- });
-
it('getClassesAlertContainer should match what gets set on the container', () => {
fixture.detectChanges();
expect(alertElement.classList.toString()).toEqual(
@@ -44,14 +35,14 @@ describe('SparkAlertComponent', () => {
it('should add the correct class if alertType is not set', () => {
component.alertType = '';
fixture.detectChanges();
- expect(component.getClassesAlertContainer()).toEqual('sprk-c-Alert__icon');
+ expect(component.getClassesAlertContainer()).toEqual('sprk-c-Alert');
});
it('should add the correct class if alertType is success', () => {
component.alertType = 'success';
fixture.detectChanges();
expect(component.getClassesAlertContainer()).toEqual(
- 'sprk-c-Alert__icon sprk-c-Alert__icon--success'
+ 'sprk-c-Alert sprk-c-Alert--success'
);
});
@@ -59,7 +50,7 @@ describe('SparkAlertComponent', () => {
component.alertType = 'fail';
fixture.detectChanges();
expect(component.getClassesAlertContainer()).toEqual(
- 'sprk-c-Alert__icon sprk-c-Alert__icon--fail'
+ 'sprk-c-Alert sprk-c-Alert--fail'
);
});
@@ -67,7 +58,7 @@ describe('SparkAlertComponent', () => {
component.alertType = 'info';
fixture.detectChanges();
expect(component.getClassesAlertContainer()).toEqual(
- 'sprk-c-Alert__icon sprk-c-Alert__icon--info'
+ 'sprk-c-Alert sprk-c-Alert--info'
);
});
@@ -75,7 +66,7 @@ describe('SparkAlertComponent', () => {
component.additionalClasses = 'sprk-u-pam sprk-u-man';
fixture.detectChanges();
expect(component.getClassesAlertContainer()).toEqual(
- 'sprk-c-Alert__icon sprk-u-pam sprk-u-man'
+ 'sprk-c-Alert sprk-u-pam sprk-u-man'
);
});
@@ -84,7 +75,16 @@ describe('SparkAlertComponent', () => {
component.additionalClasses = 'sprk-u-pam sprk-u-man';
fixture.detectChanges();
expect(component.getClassesAlertContainer()).toEqual(
- 'sprk-c-Alert__icon sprk-c-Alert__icon--info sprk-u-pam sprk-u-man'
+ 'sprk-c-Alert sprk-c-Alert--info sprk-u-pam sprk-u-man'
+ );
+ });
+
+ it('should add the correct classes if alertType and dismissible have values', () => {
+ component.alertType = 'info';
+ component.dismissible = false;
+ fixture.detectChanges();
+ expect(component.getClassesAlertContainer()).toEqual(
+ 'sprk-c-Alert sprk-c-Alert--info sprk-c-Alert--no-dismiss'
);
});
| 3 |
diff --git a/token-metadata/0x4946Fcea7C692606e8908002e55A582af44AC121/metadata.json b/token-metadata/0x4946Fcea7C692606e8908002e55A582af44AC121/metadata.json "symbol": "FOAM",
"address": "0x4946Fcea7C692606e8908002e55A582af44AC121",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/lib/assets/core/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view.js b/lib/assets/core/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/static-asset-item-view.js @@ -10,11 +10,7 @@ module.exports = CoreView.extend({
},
initialize: function () {
- this._initBinds();
- },
-
- _initBinds: function () {
- this.model.bind('change:state', this._changeState, this);
+ this.listenTo(this.model, 'change:state', this._changeState);
},
render: function () {
| 2 |
diff --git a/sirepo/package_data/static/js/hellweg.js b/sirepo/package_data/static/js/hellweg.js @@ -273,7 +273,6 @@ SIREPO.app.controller('HellwegVisualizationController', function (appState, fram
self.panelState = panelState;
function handleStatus(data) {
- frameCache.setFrameCount(data.frameCount);
if (data.startTime && ! data.error) {
plotRangeService.computeFieldRanges(self, 'beamAnimation', data.percentComplete);
['beamAnimation', 'beamHistogramAnimation', 'particleAnimation', 'parameterAnimation'].forEach(function(modelName) {
@@ -286,6 +285,7 @@ SIREPO.app.controller('HellwegVisualizationController', function (appState, fram
frameCache.setFrameCount(1, 'parameterAnimation');
}
}
+ frameCache.setFrameCount(data.frameCount);
}
self.handleModalShown = function(name) {
| 12 |
diff --git a/jobs/starlink.js b/jobs/starlink.js @@ -87,7 +87,7 @@ module.exports = async () => {
longitude: position.lng || null,
latitude: position.lat || null,
height_km: position.height || null,
- velocity_kms: position.velocity_kms || null,
+ velocity_kms: position.velocity || null,
spaceTrack: {
CCSDS_OMM_VERS: sat.CCSDS_OMM_VERS,
COMMENT: sat.COMMENT,
| 1 |
diff --git a/src/notifications/Broadcaster.js b/src/notifications/Broadcaster.js 'use strict';
-const { resolveRoles } = require('../CommonFunctions');
-
-const makePingsMentionable = async (ping, { guild, client }) => {
- if (guild.members.get(client.user.id).hasPermission('MANAGE_ROLES', false, true, true)) {
- const roles = resolveRoles({ content: ping, guild });
- const alteredRoles = [];
- await Promise.all(roles.map(async (role) => {
- if (!role.mentionable) {
- await role.setMentionable(true, `${role.name} set pingable`);
- alteredRoles.push(role);
- }
- }));
- return alteredRoles;
- }
-
- return [];
-};
-
-const makePingsUnmentionable = async (roles) => {
- if (Array.isArray(roles)) {
- for (const role in roles) {
- if (role && role.mentionable) {
- // eslint-disable-next-line
- setTimeout(() => role.setMentionable(false, `${role.name} set unpingable`), 100);
- }
- }
- }
-};
-
/**
* Broadcast updates out to subscribing channels
* @param {Discord.Client} client bot client
@@ -88,23 +59,11 @@ class Broadcaster {
const ctx = await this.settings.getCommandContext(channel);
if (embed.locale && ctx.language.toLowerCase() !== embed.locale.toLowerCase()) return false;
ctx.deleteAfterDuration = deleteAfter;
- let roles = [];
- if (prepend && prepend.length) {
- roles.unshift(await makePingsMentionable(
- prepend,
- { client: this.client, guild: channel.guild },
- ));
- roles = roles[0].filter(role => typeof role !== 'undefined');
- }
await this.messageManager.webhook(
ctx,
{ text: prepend, embed: this.messageManager.webhookWrapEmbed(embed, ctx) },
);
-
- if (roles.length) {
- setTimeout(() => { makePingsUnmentionable(roles); }, 1000);
- }
return true;
}
}
| 2 |
diff --git a/src/createAuthScheme.js b/src/createAuthScheme.js @@ -37,7 +37,7 @@ module.exports = function createAuthScheme(authFun, authorizerOptions, funName,
const event = {
type: 'TOKEN',
authorizationToken: authorization,
- methodArn: `arn:aws:execute-api:${options.region}:random-account-id:random-api-id/${options.stage}/${request.method.toUpperCase()}${request.path}`,
+ methodArn: `arn:aws:execute-api:${options.region}:random-account-id:random-api-id/${options.stage}/${request.method.toUpperCase()}${request.path.replace(new RegExp(`^/${options.stage}`), '')}`,
};
// Create the Authorization function handler
| 2 |
diff --git a/lib/ui/components/common/Icon.js b/lib/ui/components/common/Icon.js @@ -4,12 +4,25 @@ import edit from '!!raw-loader!ui/icons/pencil.svg';
import spin from '!!raw-loader!ui/icons/spin.svg';
import mocked from '!!raw-loader!ui/icons/mocked.svg';
import unmocked from '!!raw-loader!ui/icons/unmocked.svg';
+import remove from '!!raw-loader!ui/icons/trash.svg';
+import record from '!!raw-loader!ui/icons/rec.svg';
import recording from '!!raw-loader!ui/icons/recording.svg';
+import search from '!!raw-loader!ui/icons/loupe.svg';
import delay from '!!raw-loader!ui/icons/stopwatch.svg';
import select from '!!raw-loader!ui/icons/select.svg';
+import add from '!!raw-loader!ui/icons/new.svg';
+import clear from '!!raw-loader!ui/icons/clear.svg';
+import expand from '!!raw-loader!ui/icons/expanded.svg';
+import close from '!!raw-loader!ui/icons/close.svg';
+import settings from '!!raw-loader!ui/icons/settings.svg';
+import halfScreen from '!!raw-loader!ui/icons/half-size.svg';
+import fullScreen from '!!raw-loader!ui/icons/full-size.svg';
+import help from '!!raw-loader!ui/icons/help.svg';
+import collapseAll from '!!raw-loader!ui/icons/collapse-all.svg';
+import expandAll from '!!raw-loader!ui/icons/expand-all.svg';
import filter from '!!raw-loader!ui/icons/funnel.svg';
+import undo from '!!raw-loader!ui/icons/undo.svg';
import check from '!!raw-loader!ui/icons/tick.svg';
-import add from '!!raw-loader!ui/icons/new.svg';
const StyledIcon = styled.div`
display: inline-block;
@@ -19,7 +32,11 @@ const StyledIcon = styled.div`
line-height: ${(props) => props.src === 'mocked' || props.src === 'unmocked' ? '22px' : '16px'};
`;
-const ICONS = { edit, spin, mocked, unmocked, recording, delay, filter, select, check, add };
+const ICONS = {
+ edit, spin, mocked, unmocked, remove, record, recording, search, delay,
+ add, clear, expand, close, settings, halfScreen, fullScreen, help,
+ collapseAll, expandAll, filter, undo, select, check
+};
const Icon = ({ src, style, onClick, className }) => (
<StyledIcon style={ style }
| 13 |
diff --git a/src/templates/parsers/_getTemplates.js b/src/templates/parsers/_getTemplates.js @@ -13,7 +13,8 @@ const findFlat = function(wiki) {
let list = [];
let carry = [];
let chars = wiki.split('');
- chars.forEach((c) => {
+ for(var i = 0; i < chars.length; i++) {
+ c = chars[i];
//open it
if (c === open) {
depth += 1;
@@ -29,19 +30,18 @@ const findFlat = function(wiki) {
if (/\{\{/.test(tmpl) && /\}\}/.test(tmpl)) {
list.push(tmpl);
}
- return;
+ continue;
}
}
//require two '{{' to open it
if (depth === 1 && c !== open && c !== close) {
depth = 0;
carry = [];
- return;
+ continue;
}
carry.push(c);
- return;
}
- });
+ }
return list;
};
| 4 |
diff --git a/server/dump.js b/server/dump.js @@ -57,7 +57,7 @@ var Dumper = function(intrp, pristine, spec) {
this.intrp = intrp;
this.pristine = pristine;
this.config = new Config(spec);
- /** @type {!Map<!Interpreter.Scope,!ScopeInfo>} */
+ /** @type {!Map<!Interpreter.Scope,!ScopeDumper>} */
this.scopeInfo = new Map;
/** @type {!Map<!Interpreter.prototype.Object,!ObjectDumper>} */
this.objDumpers = new Map;
@@ -164,7 +164,7 @@ var Dumper = function(intrp, pristine, spec) {
Dumper.prototype.dumpBinding = function(selector, todo) {
if (selector.isVar()) {
var ref = undefined;
- var dumper = this.getScopeInfo(this.scope);
+ var dumper = this.getScopeDumper(this.scope);
} else {
ref = new Selector(selector);
ref.pop();
@@ -502,14 +502,14 @@ Dumper.prototype.exprForBuiltin = function(builtin) {
};
/**
- * Get ObjectDumper or ScopeInfo of the parent scope/object for the
+ * Get ObjectDumper or ScopeDumper of the parent scope/object for the
* given selector.
* @param {!Selector} selector A selector for the binding in question.
- * @return {!ObjectDumper|!ScopeInfo};
+ * @return {!ObjectDumper|!ScopeDumper};
*/
Dumper.prototype.getDumperForSelectorParent = function(selector) {
if (selector.isVar()) {
- return this.getScopeInfo(this.scope);
+ return this.getScopeDumper(this.scope);
} else {
var ref = new Selector(selector);
ref.pop();
@@ -522,15 +522,15 @@ Dumper.prototype.getDumperForSelectorParent = function(selector) {
};
/**
- * Get interned ScopeInfo for sope.
+ * Get interned ScopeDumper for sope.
* @param {!Interpreter.Scope} scope The scope to get info for.
- * @return {!ScopeInfo} The ScopeInfo for scope.
+ * @return {!ScopeDumper} The ScopeDumper for scope.
*/
-Dumper.prototype.getScopeInfo = function(scope) {
+Dumper.prototype.getScopeDumper = function(scope) {
if (this.scopeInfo.has(scope)) return this.scopeInfo.get(scope);
- var si = new ScopeInfo(scope);
- this.scopeInfo.set(scope, si);
- return si;
+ var scopeDumper = new ScopeDumper(scope);
+ this.scopeInfo.set(scope, scopeDumper);
+ return scopeDumper;
};
/**
@@ -623,14 +623,17 @@ Dumper.prototype.isShadowed = function(name, scope) {
};
///////////////////////////////////////////////////////////////////////////////
-// ScopeInfo
+// ScopeDumper
/**
- * Dump-state information for a single scope.
+ * ScopeDumper encapsulates all machinery to dump an Interpreter.Scope
+ * to eval-able JS, including maintaining all the dump-state info
+ * required to keep track of what variable bindings have and haven't
+ * yet been dumped.
* @constructor
* @param {!Interpreter.Scope} scope The scope to keep state for.
*/
-var ScopeInfo = function(scope) {
+var ScopeDumper = function(scope) {
this.scope = scope;
/**
* Map of variable name -> dump status.
@@ -642,13 +645,13 @@ var ScopeInfo = function(scope) {
/**
* Generate JS source text to create and/or initialize a single
* variable binding.
- * @param {!Dumper} dumper Dumper to which this ScopeInfo belongs.
+ * @param {!Dumper} dumper Dumper to which this ScopeDumper belongs.
* @param {!Selector.Part} part The part to dump. Must be simple string.
* @param {Do} todo How much to do. Must be >= Do.DECL; > Do.SET ignored.
* @param {!Selector=} ref Ignored.
* @return {string} An eval-able program to initialise the specified variable.
*/
-ScopeInfo.prototype.dumpBinding = function(dumper, part, todo, ref) {
+ScopeDumper.prototype.dumpBinding = function(dumper, part, todo, ref) {
if (dumper.scope !== this.scope) {
throw new Error("Can't create binding other than in current scope");
} else if (typeof part !== 'string') {
@@ -686,7 +689,7 @@ ScopeInfo.prototype.dumpBinding = function(dumper, part, todo, ref) {
* @param {!Selector.Part} part The part get status for. Must be simple string.
* @return {Do} The done status of the binding.
*/
-ScopeInfo.prototype.getDone = function(part) {
+ScopeDumper.prototype.getDone = function(part) {
if (typeof part !== 'string') {
throw new TypeError('Invalid part (not a variable name)');
}
@@ -699,7 +702,7 @@ ScopeInfo.prototype.getDone = function(part) {
* @param {!Selector.Part} part The part set status for. Must be simple string.
* @param {Do} done The new done status of the binding.
*/
-ScopeInfo.prototype.setDone = function(part, done) {
+ScopeDumper.prototype.setDone = function(part, done) {
if (typeof part !== 'string') {
throw new TypeError('Invalid part (not a variable name)');
} else if (done < this.getDone(part)) {
| 10 |
diff --git a/types/index.d.ts b/types/index.d.ts @@ -287,22 +287,15 @@ export const MTableToolbar: (props: any) => React.ReactElement<any>;
export const MTable: (props: any) => React.ReactElement<any>;
export interface Icons {
- Add?: React.ForwardRefExoticComponent<any> &
- React.RefAttributes<SVGSVGElement>;
- Check?: React.ForwardRefExoticComponent<any> &
- React.RefAttributes<SVGSVGElement>;
- Clear?: React.ForwardRefExoticComponent<any> &
- React.RefAttributes<SVGSVGElement>;
- Delete?: React.ForwardRefExoticComponent<any> &
- React.RefAttributes<SVGSVGElement>;
+ Add?: React.ForwardRefExoticComponent<any> & React.RefAttributes<SVGSVGElement>;
+ Check?: React.ForwardRefExoticComponent<any> & React.RefAttributes<SVGSVGElement>;
+ Clear?: React.ForwardRefExoticComponent<any> & React.RefAttributes<SVGSVGElement>;
+ Delete?: React.ForwardRefExoticComponent<any> & React.RefAttributes<SVGSVGElement>;
DetailPanel?: React.ForwardRefExoticComponent<any> &
React.RefAttributes<SVGSVGElement>;
- Edit?: React.ForwardRefExoticComponent<any> &
- React.RefAttributes<SVGSVGElement>;
- Export?: React.ForwardRefExoticComponent<any> &
- React.RefAttributes<SVGSVGElement>;
- Filter?: React.ForwardRefExoticComponent<any> &
- React.RefAttributes<SVGSVGElement>;
+ Edit?: React.ForwardRefExoticComponent<any> & React.RefAttributes<SVGSVGElement>;
+ Export?: React.ForwardRefExoticComponent<any> & React.RefAttributes<SVGSVGElement>;
+ Filter?: React.ForwardRefExoticComponent<any> & React.RefAttributes<SVGSVGElement>;
FirstPage?: React.ForwardRefExoticComponent<any> &
React.RefAttributes<SVGSVGElement>;
SortArrow?: React.ForwardRefExoticComponent<any> &
@@ -315,14 +308,12 @@ export interface Icons {
React.RefAttributes<SVGSVGElement>;
ResetSearch?: React.ForwardRefExoticComponent<any> &
React.RefAttributes<SVGSVGElement>;
- Search?: React.ForwardRefExoticComponent<any> &
- React.RefAttributes<SVGSVGElement>;
+ Search?: React.ForwardRefExoticComponent<any> & React.RefAttributes<SVGSVGElement>;
ThirdStateCheck?: React.ForwardRefExoticComponent<any> &
React.RefAttributes<SVGSVGElement>;
ViewColumn?: React.ForwardRefExoticComponent<any> &
React.RefAttributes<SVGSVGElement>;
- Retry?: React.ForwardRefExoticComponent<any> &
- React.RefAttributes<SVGSVGElement>;
+ Retry?: React.ForwardRefExoticComponent<any> & React.RefAttributes<SVGSVGElement>;
}
export interface Options<RowData extends object> {
| 13 |
diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json "express": "4.17.1",
"fs-extra": "8.1.0",
"node-red-node-rbe": "^0.2.5",
- "node-red-node-sentiment": "^0.1.4",
"node-red-node-tail": "^0.0.3",
"nopt": "4.0.1",
"semver": "6.3.0"
| 2 |
diff --git a/app-template/package-template.json b/app-template/package-template.json "bezier-easing": "^2.0.3",
"bhttp": "1.2.1",
"bitauth": "^0.2.1",
- "bitcore-wallet-client": "https://github.com/Bitcoin-com/bitcore-wallet-client.git",
+ "bitcore-wallet-client": "6.7.1",
"bower": "^1.7.9",
"cordova-custom-config": "^3.0.5",
"cordova-plugin-qrscanner": "^2.5.0",
| 4 |
diff --git a/src/index.js b/src/index.js @@ -580,6 +580,7 @@ class Offline {
let result = data;
let responseName = 'default';
const responseContentType = endpoint.responseContentType;
+ const contentHandling = endpoint.contentHandling;
/* RESPONSE SELECTION (among endpoint's possible responses) */
@@ -727,8 +728,15 @@ class Offline {
override: false, // Maybe a responseParameter set it already. See #34
});
response.statusCode = statusCode;
+ if (contentHandling === 'CONVERT_TO_BINARY') {
+ response.encoding = 'binary';
+ response.source = new Buffer(result, 'base64');
+ response.variety = 'buffer';
+ }
+ else {
response.source = result;
}
+ }
else if (integration === 'lambda-proxy') {
response.statusCode = statusCode = result.statusCode || 200;
| 0 |
diff --git a/package.json b/package.json "tap-spot": "^1.1.1",
"unexpected-documentation-site-generator": "git://github.com/unexpectedjs/unexpected-documentation-site-generator.git#ec2e34b",
"unexpected-magicpen": "^2.1.0",
- "unexpected-markdown": "git://github.com/unexpectedjs/unexpected-markdown.git#72762c1"
+ "unexpected-markdown": "git://github.com/unexpectedjs/unexpected-markdown.git#2954f9b"
},
"files": [
"unexpected.js",
| 4 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js @@ -1959,6 +1959,16 @@ RED.view = (function() {
clearSelection();
RED.history.pop();
mouse_mode = 0;
+ } else if (mouse_mode === RED.state.SLICING) {
+ if (slicePath) {
+ slicePath.remove();
+ slicePath = null;
+ resetMouseVars()
+ }
+ clearSelection();
+ } else if (lasso) {
+ lasso.remove();
+ lasso = null;
} else if (activeGroup) {
exitActiveGroup()
} else {
| 11 |
diff --git a/src/core/operations/DNSOverHTTPS.mjs b/src/core/operations/DNSOverHTTPS.mjs @@ -54,7 +54,8 @@ class DNSOverHTTPS extends Operation {
"TXT",
"MX",
"DNSKEY",
- "NS"
+ "NS",
+ "PTR"
]
},
{
| 0 |
diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-detail.component.html.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-detail.component.html.ejs <span jhiTranslate="{{ '<%= angularAppName %>.<%= fieldType %>.' + <%= entityInstance %>.<%= fieldName %> }}">{{ <%= entityInstance %>.<%= fieldName %> }}</span>
<%_ } else if (['byte[]', 'ByteBuffer'].includes(fieldType) && fieldTypeBlobContent === 'image') { _%>
<div *ngIf="<%= entityInstance %>.<%= fieldName %>">
- <a (click)="openFile(<%= entityInstance %>.<%= fieldName %>ContentType!, <%= entityInstance %>.<%= fieldName %>)">
+ <a (click)="openFile(<%= entityInstance %>?.<%= fieldName %>ContentType!, <%= entityInstance %>.<%= fieldName %>)">
<img [src]="'data:' + <%= entityInstance %>.<%= fieldName %>ContentType + ';base64,' + <%= entityInstance %>.<%= fieldName %>" style="max-width: 100%;" alt="<%= entityInstance %> image"/>
</a>
{{ <%= entityInstance %>.<%= fieldName %>ContentType }}, {{ byteSize(<%= entityInstance %>.<%= fieldName %>) }}
</div>
<%_ } else if (['byte[]', 'ByteBuffer'].includes(fieldType) && fieldTypeBlobContent === 'any') { _%>
<div *ngIf="<%= entityInstance %>.<%= fieldName %>">
- <a (click)="openFile(<%= entityInstance %>.<%= fieldName %>ContentType!, <%= entityInstance %>.<%= fieldName %>)" jhiTranslate="entity.action.open">open</a>
+ <a (click)="openFile(<%= entityInstance %>?.<%= fieldName %>ContentType!, <%= entityInstance %>.<%= fieldName %>)" jhiTranslate="entity.action.open">open</a>
{{ <%= entityInstance %>.<%= fieldName %>ContentType }}, {{ byteSize(<%= entityInstance %>.<%= fieldName %>) }}
</div>
<%_ } else { _%>
| 1 |
diff --git a/test/acceptance/layergroup-metadata.js b/test/acceptance/layergroup-metadata.js @@ -5,7 +5,7 @@ const TestClient = require('../support/test-client');
describe('layergroup metadata', function () {
[1234, 'default_public', false].forEach(api_key => {
- it(`tiles base urls ${api_key ? 'with api key' : 'without api key'}`, function (done) {
+ it(`tiles base urls ${api_key ? `with api key: ${api_key}` : 'without api key'}`, function (done) {
const mapConfig = {
version: '1.7.0',
layers: [
| 7 |
diff --git a/src/app.js b/src/app.js @@ -119,7 +119,7 @@ module.exports = app;
// Mongo Connection + Server Start
(async () => {
try {
- const client = await MongoClient.connect(url, { poolSize: 20, useNewUrlParser: true });
+ const client = await MongoClient.connect(url, { useNewUrlParser: true });
global.db = client.db('spacex-api');
| 4 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.