code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/README.md b/README.md @@ -45,7 +45,7 @@ SimpleBar is mean to improve the experience of **internal web pages scrolls**: l
### Other usages
You can start SimpleBar mannually if you need to:
- new SimpleBar(document.getElementById('#myElement'))
+ new SimpleBar(document.getElementById('myElement'))
If you want to use jQuery:
@@ -55,7 +55,7 @@ If you want to use jQuery:
Options can be applied to the plugin during initialization:
```
-new SimpleBar(document.getElementById('#myElement'), {
+new SimpleBar(document.getElementById('myElement'), {
option1: value1,
option2: value2
})
@@ -73,7 +73,7 @@ Default value is `false`
By default SimpleBar requires minimal markup. When initialized it will wrap a `simplebar-content`element in a div with the class `simplebar-scroll-content`. If you prefer to include this wrapper element directly in your markup you can switch the default behaviour off by setting the `wrapContent` option to `false`:
- new SimpleBar(document.getElementById('#myElement'), { wrapContent: false });
+ new SimpleBar(document.getElementById('myElement'), { wrapContent: false });
Default value is `true`
@@ -81,7 +81,7 @@ Default value is `true`
By default SimpleBar automatically hides the scrollbar if the user is not scrolling (it emulates Mac OSX Lion's scrollbar). You can make the scrollbar always visible by setting the `autoHide` option to `false`:
- new SimpleBar(document.getElementById('#myElement'), { autoHide: false });
+ new SimpleBar(document.getElementById('myElement'), { autoHide: false });
Default value is `true`
@@ -119,25 +119,25 @@ css: {
If you later dynamically modify your content, for instance changing its height or width, or adding or removing content, you should recalculate the scrollbars like so:
- var el = new SimpleBar(document.getElementById('#myElement'));
+ var el = new SimpleBar(document.getElementById('myElement'));
el.SimpleBar.recalculate()
### Trigger programmatical scrolling
If you want to access to original scroll element, you can retrieve it via a getter :
- var el = new SimpleBar(document.getElementById('#myElement'));
+ var el = new SimpleBar(document.getElementById('myElement'));
el.SimpleBar.getScrollElement()
### Subscribe to `scroll` event
You can subscribe to the `scroll` event just like you do with native scrolling element :
- var el = new SimpleBar(document.getElementById('#myElement'));
+ var el = new SimpleBar(document.getElementById('myElement'));
el.SimpleBar.getScrollElement().addEventListener('scroll', function(...));
### Add content dynamically (ajax)
You can retrieve the element containing datas like this :
- var el = new SimpleBar(document.getElementById('#myElement'));
+ var el = new SimpleBar(document.getElementById('myElement'));
el.SimpleBar.getContentElement();
This is best to use this rather than querying it via the DOM directly cause it avoids problem when the plugin is disabled (like on mobiles).
| 3 |
diff --git a/lib/ejs.js b/lib/ejs.js @@ -507,20 +507,12 @@ Template.prototype = {
if (!this.source) {
this.generateSource();
- if (opts.client) {
- prepended += 'var __output = [], __append = callerAppend || __output.push.bind(__output);' + '\n';
- }
- else {
- prepended += 'var __append = callerAppend;' + '\n';
- }
-
+ prepended += ' var __output = [], __append = __output.push.bind(__output);' + '\n';
if (opts._with !== false) {
prepended += ' with (' + opts.localsName + ' || {}) {' + '\n';
appended += ' }' + '\n';
}
- if (opts.client) {
- appended += ' if (! callerAppend) { return __output.join("");} ' + '\n';
- }
+ appended += ' return __output.join("");' + '\n';
this.source = prepended + this.source + appended;
}
@@ -554,7 +546,7 @@ Template.prototype = {
}
try {
- fn = new Function(opts.localsName + ', escapeFn, include, rethrow, callerAppend', src);
+ fn = new Function(opts.localsName + ', escapeFn, include, rethrow', src);
}
catch(e) {
// istanbul ignore else
@@ -577,22 +569,15 @@ Template.prototype = {
// Return a callable function which will execute the function
// created by the source-code, with the passed data as locals
// Adds a local `include` function which allows full recursive include
- var returnedFn = function (data, callerAppend) {
- var __output;
- var __append = callerAppend;
- if (! callerAppend) {
- __output = [];
- __append = __output.push.bind(__output);
- }
+ var returnedFn = function (data) {
var include = function (path, includeData) {
var d = utils.shallowCopy({}, data);
if (includeData) {
d = utils.shallowCopy(d, includeData);
}
- return includeFile(path, opts)(d, __append);
+ return includeFile(path, opts)(d);
};
- fn.apply(opts.context, [data || {}, escapeFn, include, rethrow, __append]);
- if (! callerAppend) { return __output.join(''); }
+ return fn.apply(opts.context, [data || {}, escapeFn, include, rethrow]);
};
returnedFn.dependencies = this.dependencies;
return returnedFn;
| 13 |
diff --git a/CHANGELOG.md b/CHANGELOG.md # Changelog
+## Unreleased
+
+* Apostrophe now has built-in support for the Node.js cluster module. If the `APOS_CLUSTER_PROCESSES` environment variable is set to a number, that number of child processes are forked, sharing the same listening port. If the variable is set to `0`, one process is forked for each CPU core, with a minimum of `2` to provide availability during restarts. If the variable is set to a negative number, that number is added to the number of CPU cores, e.g. `-1` is a good way to reserve one core for MongoDB if it is running on the same server. This is for production use only (`NODE_ENV=production`). If a child process fails it is restarted automatically.
+
+
## UNRELEASED
### Adds
-* Adds a Slovak localization file. Activate the `sk` locale to use this. Many thanks to [Michael Huna](https://github.com/Miselrkba) for the contribution.
-* Adds a Spanish localization file. Activate the `es` locale to use this. Many thanks to [egonzalezg9](https://github.com/egonzalezg9) for the contribution.
* The `context-editing` apostrophe admin UI bus event can now take a boolean parameter, explicitly indicating whether the user is actively typing or performing a similar active manipulation of controls right now. If a boolean parameter is not passed, the existing 1100-millisecond debounced timeout is used.
* Adds 'no-search' modifier to relationship fields as a UI simplification option.
* Fields can now have their own `modifiers` array. This is combined with the schema modifiers, allowing for finer grained control of field rendering.
-* Apostrophe now has built-in support for the Node.js cluster module. If the `APOS_CLUSTER_PROCESSES` environment variable is set to a number, that number of child processes are forked, sharing the same listening port. If the variable is set to `0`, one process is forked for each CPU core, with a minimum of `2` to provide availability during restarts. If the variable is set to a negative number, that number is added to the number of CPU cores, e.g. `-1` is a good way to reserve one core for MongoDB if it is running on the same server. This is for production use only (`NODE_ENV=production`). If a child process fails it is restarted automatically.
+* Adds a Slovak localization file. Activate the `sk` locale to use this. Many thanks to [Michael Huna](https://github.com/Miselrkba) for the contribution.
+* Adds a Spanish localization file. Activate the `es` locale to use this. Many thanks to [egonzalezg9](https://github.com/egonzalezg9) for the contribution.
### Fixes
| 5 |
diff --git a/src/1_utils.js b/src/1_utils.js @@ -662,7 +662,7 @@ utils.openGraphDataAsObject = function() {
};
utils.scrapeTitle = function() {
- var tags = document.getElementsByTagName([ 'title' ]);
+ var tags = document.getElementsByTagName('title');
return tags.length > 0 ? tags[0].innerText : '';
};
| 2 |
diff --git a/server/preprocessing/other-scripts/base.R b/server/preprocessing/other-scripts/base.R @@ -45,7 +45,7 @@ get_papers <- function(query, params, limit=100,
# add "textus:" to each word/phrase to enable verbatim search
# make sure it is added after any opening parentheses to enable queries such as "(a and b) or (a and c)"
- exact_query = gsub('([\"]+(.*?)[\"]+)|(?<=\\(\\b|\\+|-\\"\\b)|(?!or\\b|and\\b|-[\\"\\(]*\\b)(?<!\\S)(?=\\S)(?!\\(|\\+)'
+ exact_query = gsub('([\"\']+(.*?)[\"\']+)|(?<=\\(\\b|\\+|-\\"\\b)|(?!or\\b|and\\b|-[\\"\\(]*\\b)(?<!\\S)(?=\\S)(?!\\(|\\+)'
, "textus:\\1", query_cleaned, perl=T)
blog$info(paste("BASE query:", exact_query))
| 9 |
diff --git a/src/components/icon/icon.stories.js b/src/components/icon/icon.stories.js @@ -53,7 +53,13 @@ storiesOf('Icon', module)
knobs: { escapeHTML: false }
}
)
- .add('default', () => <Icon { ...commonKnobs() } { ...dlsKnobs() } />, {
+ .add('default', () => {
+ const props = dlsKnobs();
+
+ if (props.iconColor === 'on-dark-background') props.bgTheme = 'info';
+
+ return <Icon { ...commonKnobs() } { ...props } />;
+ }, {
info: { text: Info },
notes: { markdown: notes },
knobs: { escapeHTML: false }
| 12 |
diff --git a/src/components/Picker/index.js b/src/components/Picker/index.js @@ -168,7 +168,7 @@ class Picker extends PureComponent {
// We add a text color to prevent white text on white background dropdown items on Windows
items={_.map(this.props.items, item => ({...item, color: themeColors.pickerOptionsTextColor}))}
- style={this.props.size === 'normal' ? pickerStyles(this.props.isDisabled) : styles.pickerSmall}
+ style={this.props.size === 'normal' ? styles.picker(this.props.isDisabled) : styles.pickerSmall}
useNativeAndroidPickerStyle={false}
placeholder={this.placeholder}
value={this.props.value}
| 4 |
diff --git a/packages/gatsby-cli/src/create-cli.js b/packages/gatsby-cli/src/create-cli.js @@ -99,7 +99,12 @@ function buildLocalCommands(cli, isLocalSite) {
type: `boolean`,
describe: `Open the site in your browser for you.`,
}),
- handler: getCommandHandler(`develop`),
+ handler: handlerP(
+ getCommandHandler(`develop`, (args, cmd) => {
+ process.env.NODE_ENV = process.env.NODE_ENV || `development`
+ return cmd(args)
+ })
+ ),
})
cli.command({
| 12 |
diff --git a/js/bootstrap-select.js b/js/bootstrap-select.js text.className = 'text';
a.className = 'dropdown-item ' + (firstOption ? firstOption.className : '');
newElement.className = this.$menu[0].parentNode.className + ' ' + classNames.SHOW;
+ newElement.style.width = 0; // ensure button width doesn't affect natural width of menu when calculating
if (this.options.width === 'auto') menu.style.minWidth = 0;
menu.className = classNames.MENU + ' ' + classNames.SHOW;
menuInner.className = 'inner ' + classNames.SHOW;
| 12 |
diff --git a/lib/core/processes/processLauncher.js b/lib/core/processes/processLauncher.js @@ -92,11 +92,27 @@ class ProcessLauncher {
// Translates logs from the child process to the logger
_handleLog(msg) {
+ // Sometimes messages come in with line breaks, so we need to break them up accordingly.
+ let processedMessages = [];
+
+ // Ensure that `msg.message` is an array, so we process this consistently. Sometimes it
+ // is an Array, sometimes it is a string.
+ if(typeof msg.message === 'string') {
+ processedMessages = [msg.message];
+ } else {
+ msg.message.forEach((message) => {
+ let lines = message.split("\n");
+ lines.forEach((line) => { processedMessages.push(line); });
+ });
+ }
+
const timestamp = new Date().getTime();
- this.events.emit('process-log-' + this.name, msg.type, msg.message, this.name, timestamp);
+
+ processedMessages.forEach((message) => {
+ this.events.emit('process-log-' + this.name, msg.type, message, this.name, timestamp);
this.logs.push({
- msg: msg.message,
- msg_clear: msg.message.stripColors,
+ msg: message,
+ msg_clear: message.stripColors,
logLevel: msg.logLevel,
name: this.name,
timestamp
@@ -105,9 +121,10 @@ class ProcessLauncher {
return;
}
if (this.logger[msg.type]) {
- return this.logger[msg.type](utils.normalizeInput(msg.message));
+ return this.logger[msg.type](utils.normalizeInput(message));
}
- this.logger.debug(utils.normalizeInput(msg.message));
+ this.logger.debug(utils.normalizeInput(message));
+ });
}
// Handle event calls from the child process
| 1 |
diff --git a/cypress/integration/results.spec.ts b/cypress/integration/results.spec.ts @@ -27,17 +27,17 @@ context('The results card', () => {
describe('results charts', () => {
it('should have default invisible charts', () => {
- for (const testId of resultsCharts) {
+ resultsCharts.forEach((testId) => {
cy.findByTestId(testId).should('be.not.visible')
- }
+ })
})
it('should become visible charts after clicking RunResults button', () => {
cy.findByTestId('RunResults').click()
- for (const testId of resultsCharts) {
+ resultsCharts.forEach((testId) => {
cy.findByTestId(testId).should('be.visible')
- }
+ })
})
})
})
| 14 |
diff --git a/src/lib/gundb/__tests__/UserStorage.js b/src/lib/gundb/__tests__/UserStorage.js @@ -16,27 +16,94 @@ describe('UserStorage', () => {
expect(userStorage.user).not.toBeUndefined()
})
+ it('sets gundb field', async () => {
+ const res = await userStorage.profile
+ .get('x')
+ .put({ z: 1, y: 1 })
+ .then()
+ expect(res).toEqual(expect.objectContaining({ z: 1, y: 1 }))
+ })
+
+ it('updates gundb field', done => {
+ const gunRes = userStorage.profile.get('x').put({ z: 2, y: 2 }, async v => {
+ let res = await userStorage.profile.get('x').then()
+ expect(res).toEqual(expect.objectContaining({ z: 2, y: 2 }))
+ done()
+ })
+ })
+
it('sets profile field', async () => {
- const gunRes = userStorage.setProfileField('name', 'hadar', 'public')
- const res = await gunRes.then()
+ await userStorage.setProfileField('name', 'hadar', 'public')
+ const res = await userStorage.profile.get('name').then()
expect(res).toEqual(expect.objectContaining({ privacy: 'public', display: 'hadar' }))
})
+ it('update profile field', async () => {
+ const ack = await userStorage.setProfileField('name', 'hadar2', 'public')
+ const res = await userStorage.profile.get('name').then()
+ expect(res).toEqual(expect.objectContaining({ privacy: 'public', display: 'hadar2' }))
+ })
+
it('gets profile field', async () => {
const gunRes = userStorage.getProfileField('name')
const res = await gunRes.then()
- expect(res).toEqual('hadar')
+ expect(res).toEqual(expect.objectContaining({ privacy: 'public', display: 'hadar2', value: expect.anything() }))
})
it('sets profile field private (encrypted)', async () => {
- const gunRes = userStorage.setProfileField('id', 'z123', 'private')
- const res = await gunRes.then()
+ const gunRes = await userStorage.setProfileField('id', 'z123', 'private')
+ const res = await userStorage.profile.get('id').then()
expect(res).toEqual(expect.objectContaining({ privacy: 'private', display: '' }))
})
+ it('profile field private is encrypted', async () => {
+ const res = await userStorage.profile
+ .get('id')
+ .get('value')
+ .then()
+ expect(Object.keys(res)).toEqual(['ct', 'iv', 's'])
+ })
+
it('gets profile field private (decrypted)', async () => {
- const gunRes = userStorage.getProfileField('id')
+ const gunRes = userStorage.getProfileFieldValue('id')
const res = await gunRes.then()
expect(res).toEqual('z123')
})
+
+ it('sets profile email field masked', async () => {
+ const gunRes = await userStorage.setProfileField('email', '[email protected]', 'masked')
+ const res = await userStorage.profile.get('email').then()
+ expect(res).toEqual(expect.objectContaining({ privacy: 'masked', display: 'j*****[email protected]' }))
+ })
+
+ it('sets profile mobile field masked', async () => {
+ const gunRes = await userStorage.setProfileField('mobile', '+972-50-7384928', 'masked')
+ const res = await userStorage.profile.get('mobile').then()
+ expect(res).toEqual(expect.objectContaining({ privacy: 'masked', display: '***********4928' }))
+ })
+
+ it('sets profile phone field masked', async () => {
+ const gunRes = await userStorage.setProfileField('phone', '+972-50-7384928', 'masked')
+ const res = await userStorage.profile.get('phone').then()
+ expect(res).toEqual(expect.objectContaining({ privacy: 'masked', display: '***********4928' }))
+ })
+
+ it('doesnt mask non email/phone profile fields', async () => {
+ const gunRes = await userStorage.setProfileField('name', 'John Doe', 'masked')
+ const res = await userStorage.profile.get('name').then()
+ expect(res).toEqual(expect.objectContaining({ privacy: 'masked', display: 'John Doe' }))
+ })
+
+ it('change profile field privacy to public', async () => {
+ const gunRes = await userStorage.setProfileFieldPrivacy('phone', 'public')
+ const res = await userStorage.profile.get('phone').then()
+ expect(res).toEqual(expect.objectContaining({ privacy: 'public', display: '+972-50-7384928' }))
+ })
+
+ it('change profile field privacy to private', async () => {
+ const gunRes = await userStorage.setProfileFieldPrivacy('phone', 'private')
+ const res = await userStorage.profile.get('phone').then()
+ expect(res).toEqual(expect.objectContaining({ privacy: 'private', display: '' }))
+ })
+
})
| 0 |
diff --git a/TooManyCommentsFlagQueueHelper.user.js b/TooManyCommentsFlagQueueHelper.user.js // @description Inserts quicklinks to "Move comments to chat + delete" and "Delete all comments"
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 3.4.4
+// @version 3.4.5
//
// @match */admin/dashboard?flagtype=posttoomanycommentsauto*
// ==/UserScript==
if(typeof pid === 'undefined' || pid == null) return;
if(typeof cid === 'undefined' || cid == null) return;
$.post({
- url: `https://stackoverflow.com/admin/posts/${pid}/comments/${cid}/undelete`,
+ url: `https://${location.hostname}/admin/posts/${pid}/comments/${cid}/undelete`,
data: {
'fkey': fkey
}
if(typeof cid === 'undefined' || cid == null) { reject(); return; }
$.post({
- url: `https://stackoverflow.com/posts/comments/${cid}/vote/10`,
+ url: `https://${location.hostname}/posts/comments/${cid}/vote/10`,
data: {
'fkey': fkey
}
if(typeof pid === 'undefined' || pid == null) { reject(); return; }
$.post({
- url: `https://stackoverflow.com/admin/posts/${pid}/delete-comments`,
+ url: `https://${location.hostname}/admin/posts/${pid}/delete-comments`,
data: {
'fkey': fkey,
'mod-actions': 'delete-comments'
if(typeof pid === 'undefined' || pid == null) { reject(); return; }
$.post({
- url: `https://stackoverflow.com/admin/posts/${pid}/move-comments-to-chat`,
+ url: `https://${location.hostname}/admin/posts/${pid}/move-comments-to-chat`,
data: {
'fkey': fkey,
'delete-moved-comments': 'true'
if(typeof pid === 'undefined' || pid == null) { reject(); return; }
$.post({
- url: `https://stackoverflow.com/messages/delete-moderator-messages/${pid}/${unsafeWindow.renderTimeTicks}?valid=true`,
+ url: `https://${location.hostname}/messages/delete-moderator-messages/${pid}/${unsafeWindow.renderTimeTicks}?valid=true`,
data: {
'fkey': fkey,
'comment': comment
| 3 |
diff --git a/server/services/search.php b/server/services/search.php @@ -44,6 +44,7 @@ function search($repository, $dirty_query, $post_params, $param_types, $keyword_
$ini_array = library\Toolkit::loadIni($INI_DIR);
$query = strip_tags($dirty_query);
$query = trim($query);
+ $query = preg_replace('!\s+!', ' ', $query);
if ($transform_query_tolowercase) {
$query = strtolower($query);
| 14 |
diff --git a/README.md b/README.md @@ -187,8 +187,8 @@ Don't hesitate to contact me if you want to get involved.
yarn lint
-We use [JavaScript Standard Style](https://github.com/feross/standard).
-We recommend you installing [editor plugins](https://github.com/feross/standard#are-there-text-editor-plugins) so you can get real time lint result.
+We use [eslint](https://eslint.org/).
+We recommend you installing [editor plugins](https://eslint.org/docs/user-guide/integrations) so you can get real time lint result.
## Test
| 14 |
diff --git a/spec/solve.spec.js b/spec/solve.spec.js @@ -151,6 +151,7 @@ describe('Solve', function () {
'(-27*a^2*y^4-27*abs(a^2*y^4))^(1/3)*(1+i*sqrt(3))*2^(-1/3)*a^(-1)*y^(-2),(1/6)*'+
'(-27*a^2*y^4-27*abs(a^2*y^4))^(1/3)*(-i*sqrt(3)+1)*2^(-1/3)*a^(-1)*y^(-2)]'
},
+ // logarithms
{
given: 'solve(log(x,2)+log(x,3)=log(x,5), x)',
expected: '[1]'
@@ -158,6 +159,18 @@ describe('Solve', function () {
{
given: 'solve(log(x)-log(x,0.5)=log(x,-3), x)',
expected: '[1]'
+ },
+ {
+ given: 'solve(log(x)=a+b, x)',
+ expected: '[e^(a+b)]'
+ },
+ {
+ given: 'solve(log(a*x+c)=b, x)',
+ expected: '[(e^b-c)/a]'
+ },
+ {
+ given: 'solve(a*log(x-c)+b^2=1/c, x)',
+ expected: '[e^((1/c-b^2)/a)+c]'
}
];
| 0 |
diff --git a/test/jasmine/tests/gl3d_plot_interact_test.js b/test/jasmine/tests/gl3d_plot_interact_test.js @@ -392,6 +392,122 @@ describe('Test gl3d plots', function() {
.then(done);
});
+ it('@gl should set the camera dragmode to orbit if the camera.up.z vector is set to be tilted', function(done) {
+ Plotly.plot(gd, {
+ data: [{
+ type: 'scatter3d',
+ x: [1, 2, 3],
+ y: [2, 3, 1],
+ z: [3, 1, 2]
+ }],
+ layout: {
+ scene: {
+ camera: {
+ up: { x:-0.5777, y:-0.5777, z:0.5777 }
+ }
+ }
+ }
+ })
+ .then(delay(20))
+ .then(function() {
+ expect(gd._fullLayout.scene.dragmode === 'orbit').toBe(true);
+ })
+ .then(done);
+ });
+
+ it('@gl should set the camera dragmode to turntable if the camera.up.z vector is set to be upwards', function(done) {
+ Plotly.plot(gd, {
+ data: [{
+ type: 'scatter3d',
+ x: [1, 2, 3],
+ y: [2, 3, 1],
+ z: [3, 1, 2]
+ }],
+ layout: {
+ scene: {
+ camera: {
+ up: { x:0, y:0, z:100 }
+ }
+ }
+ }
+ })
+ .then(delay(20))
+ .then(function() {
+ expect(gd._fullLayout.scene.dragmode === 'turntable').toBe(true);
+ })
+ .then(done);
+ });
+
+ it('@gl should set the camera dragmode to turntable if the camera.up is not set', function(done) {
+ Plotly.plot(gd, {
+ data: [{
+ type: 'scatter3d',
+ x: [1, 2, 3],
+ y: [2, 3, 1],
+ z: [3, 1, 2]
+ }],
+ layout: {
+ scene: {
+ camera: {
+ eye: { x:1, y:1, z:1 },
+ center: { x:0, y:0, z:0 }
+ }
+ }
+ }
+ })
+ .then(delay(20))
+ .then(function() {
+ expect(gd._fullLayout.scene.dragmode === 'turntable').toBe(true);
+ })
+ .then(done);
+ });
+
+ it('@gl should set the camera dragmode to turntable if any of camera.up.[x|y|z] is missing', function(done) {
+ Plotly.plot(gd, {
+ data: [{
+ type: 'scatter3d',
+ x: [1, 2, 3],
+ y: [2, 3, 1],
+ z: [3, 1, 2]
+ }],
+ layout: {
+ scene: {
+ camera: {
+ up: { x:null, z:0 }
+ }
+ }
+ }
+ })
+ .then(delay(20))
+ .then(function() {
+ expect(gd._fullLayout.scene.dragmode === 'turntable').toBe(true);
+ })
+ .then(done);
+ });
+
+ it('@gl should set the camera dragmode to turntable if all camera.up.[x|y|z] are zero or missing', function(done) {
+ Plotly.plot(gd, {
+ data: [{
+ type: 'scatter3d',
+ x: [1, 2, 3],
+ y: [2, 3, 1],
+ z: [3, 1, 2]
+ }],
+ layout: {
+ scene: {
+ camera: {
+ up: { x:0, y:0, z:0 }
+ }
+ }
+ }
+ })
+ .then(delay(20))
+ .then(function() {
+ expect(gd._fullLayout.scene.dragmode === 'turntable').toBe(true);
+ })
+ .then(done);
+ });
+
it('@gl should be able to reversibly change trace type', function(done) {
var _mock = Lib.extendDeep({}, mock2);
var sceneLayout = { aspectratio: { x: 1, y: 1, z: 1 }, dragmode: 'turntable' };
@@ -405,6 +521,7 @@ describe('Test gl3d plots', function() {
expect(gd.layout.yaxis === undefined).toBe(true);
expect(gd._fullLayout._has('gl3d')).toBe(true);
expect(gd._fullLayout.scene._scene).toBeDefined();
+ expect(gd._fullLayout.scene._scene.camera).toBeDefined(true);
return Plotly.restyle(gd, 'type', 'scatter');
})
| 0 |
diff --git a/lib/util/progress.js b/lib/util/progress.js 'use babel'
/** @jsx dom */
+import { CompositeDisposable, Disposable } from 'atom'
import etch from 'etch'
import { Etch, Progress, view, dom } from './etch';
import Tooltip from './tooltip';
@@ -36,7 +37,7 @@ import Tooltip from './tooltip';
// Destroys `p` and removes it from the display stack.
let stack = []
-let statusBar, overlay, tileView, tooltip, tile, activated
+let subs, activated, overlay, tileView, tooltip, tile
function clamp (x, min, max) {
return Math.min(Math.max(x, min), max)
@@ -105,34 +106,34 @@ function update () {
tileView.update()
}
-export function activate () {
- if (activated) return
- activated = true
-
- overlay = new StackView()
- tileView = view(() => <span className='inline-block'>
+export function consumeStatusBar (statusBar) {
+ subs = new CompositeDisposable()
+ tileView = view(() => (
+ <span className='inline-block' style='display: none'>
<Progress level={globalLevel()} />
- </span>)
- tooltip = new Tooltip(tileView.element, overlay.element, {cond: () => stack.length})
-
- if (statusBar) {
- tile = statusBar.addLeftTile({item: tileView.element, priority: -1})
- }
-}
-
-export function deactivate () {
- activated = false
+ </span>
+ ))
+ overlay = new StackView()
+ tooltip = new Tooltip(tileView.element, overlay.element, {
+ cond: () => stack.length
+ })
+ tile = statusBar.addLeftTile({
+ item: tileView.element,
+ priority: -1
+ })
+ subs.add(new Disposable(() => {
for (let t of [overlay, tileView, tooltip, tile]) {
if (t) t.destroy()
}
-}
-
-export function consumeStatusBar (bar) {
- statusBar = bar
+ activated = false
+ }))
+ activated = true
+ return subs
}
export function add (prog, opts) {
- activate()
+ if (!activated) return
+ show()
let p = new ProgressBar(prog, opts)
stack.push(p)
update()
@@ -144,3 +145,15 @@ export function watch (p, opts) {
p.catch(() => {}).then(() => prog.destroy())
return prog
}
+
+export function show () {
+ tileView.element.style.display = ''
+}
+
+export function hide () {
+ tileView.element.style.display = 'none'
+}
+
+export function deactivate () {
+ if (subs) subs.dispose()
+}
| 7 |
diff --git a/camera-manager.js b/camera-manager.js @@ -13,6 +13,7 @@ const cameraOffset = new THREE.Vector3();
/* const thirdPersonCameraOffset = new THREE.Vector3(0, 0, -1.5);
const isometricCameraOffset = new THREE.Vector3(0, 0, -2); */
+let wasActivated = false;
const requestPointerLock = async () => {
for (const options of [
{
@@ -26,6 +27,8 @@ const requestPointerLock = async () => {
const _pointerlockchange = e => {
accept();
_cleanup();
+
+ wasActivated = true;
};
document.addEventListener('pointerlockchange', _pointerlockchange);
const _pointerlockerror = err => {
@@ -156,6 +159,9 @@ const cameraManager = {
/* birdsEyeHeight,
thirdPersonCameraOffset,
isometricCameraOffset, */
+ wasActivated() {
+ return wasActivated;
+ },
focusCamera,
requestPointerLock,
/* getTool() {
| 0 |
diff --git a/viewer/js/gis/dijit/Identify.js b/viewer/js/gis/dijit/Identify.js @@ -414,7 +414,7 @@ define([
if (typeof feature.infoTemplate === 'undefined') {
var infoTemplate = this.getInfoTemplate(ref, null, result);
if (infoTemplate) {
- if (result.layerId && ref.layerInfos && infoTemplate.info.showAttachments) {
+ if ((typeof result.layerId === 'number') && ref.layerInfos && infoTemplate.info.showAttachments) {
result.feature._layer = this.getFeatureLayerForDynamicSublayer(ref, result.layerId);
}
var featureInfoTemplate = this.buildExpressionInfos(lang.clone(infoTemplate), feature);
| 11 |
diff --git a/README.md b/README.md @@ -117,6 +117,7 @@ You can use a number of parameters to control the behaviour of Bosco. Parameter
|-f, --force|Force over ride of any files|false|
|-s, --service|Inside single service|false|
|--nocache|Ignore local cache for github projects|false|
+|--offline|Ignore expired cache of remote service data and use local if available|false|
To see all possible commands and parameters, just type 'bosco'.
| 3 |
diff --git a/src/functionHelper.js b/src/functionHelper.js @@ -9,7 +9,7 @@ const { createUniqueId } = require('./utils');
const handlerCache = {};
const messageCallbacks = {};
-function runProxyHandler(funOptions, options) {
+function runServerlessProxy(funOptions, options) {
return (event, context) => {
const args = ['invoke', 'local', '-f', funOptions.funName];
const stage = options.s || options.stage;
@@ -211,7 +211,7 @@ exports.createHandler = function createHandler(funOptions, options) {
const handler = funOptions.runtime.startsWith('nodejs')
? require(funOptions.handlerPath)[funOptions.handlerName]
- : runProxyHandler(funOptions, options);
+ : runServerlessProxy(funOptions, options);
if (typeof handler !== 'function') {
throw new Error(
| 10 |
diff --git a/packages/typescript-imba-plugin/src/lexer/grammar.imba b/packages/typescript-imba-plugin/src/lexer/grammar.imba @@ -1043,7 +1043,7 @@ export const states = {
_tag_event: [
'_tag_part'
[/(\@)(@optid)/,['tag.event.start','tag.event.name']]
- [/(\.)(@optid)/,['tag.event-modifier.start','tag.event-modifier.name']]
+ [/(\.)(\!?@optid)/,['tag.event-modifier.start','tag.event-modifier.name']]
[/\(/,token: 'tag.$/.parens.open', next: '@_tag_parens/0']
[/(\s*\=\s*)/,'operator.equals.tagop.tag-$/', '@_tag_value&handler']
[/\s+/,'@rematch','@pop']
| 11 |
diff --git a/package.json b/package.json "dev": "npm run build:dev && npm run build:static",
"watch": "npm run remove-dist && npm run build:static && webpack --watch --mode=development --debug --devtool cheap-module-eval-source-map --output-pathinfo",
"release-zip": "npm run build && gulp release && gulp copy && gulp pre-zip && gulp zip && rm -rf release",
- "release": "rm -rf release && git worktree prune && git worktree add -B stable release origin/stable && npm run build && gulp release && gulp copy",
"remove-dist": "rm -rf dist/*",
"test": "webpack --mode=production --display=none && bundlesize",
"test:visualtest": "npm run build:static && start-server-and-test storybook http-get://localhost:9001 backstopjs",
| 2 |
diff --git a/sandbox/public/index.html b/sandbox/public/index.html });
alloy("event", {
- // NOTE: `viewStart` is a special type of events.
- // View docs for more info.
- type: "viewStart",
+ viewStart: true,
data: {
+ "type": "page-view",
"url": location.href,
"name": location.pathname.substring(1) || "home"
}
| 2 |
diff --git a/server/lib/Room.js b/server/lib/Room.js @@ -165,7 +165,7 @@ class Room extends EventEmitter
}
else if (this._locked) // Don't allow connections to a locked room
{
- notification(socket, 'roomLocked');
+ this._notification(socket, 'roomLocked');
socket.disconnect(true);
return;
}
| 1 |
diff --git a/userscript.user.js b/userscript.user.js @@ -50761,6 +50761,14 @@ var $$IMU_EXPORT$$;
return src.replace(/(\/image_files\/+)[0-9]+\/+/, "$1orig/");
}
+ if (domain_nowww === "cryengine.com") {
+ // https://www.cryengine.com/files/news/480/9b028f1114d8aca8d4600bfbaa3255583d52c390efd63fde86f062bc95528539.webp
+ // https://www.cryengine.com/files/news/9b028f1114d8aca8d4600bfbaa3255583d52c390efd63fde86f062bc95528539.webp
+ // https://www.cryengine.com/files/carousel/768/c0dc875ae417c5a35dd2146f8b80fc34127da9ae0ee3daebfae74b92b973c319.webp
+ // https://www.cryengine.com/files/carousel/c0dc875ae417c5a35dd2146f8b80fc34127da9ae0ee3daebfae74b92b973c319.webp
+ return src.replace(/(\/files\/+[a-z]+\/+)[0-9]+\/+([0-9a-f]{10,}\.[^/.]+)(?:[?#].*)?$/, "$1$2");
+ }
+
@@ -56474,7 +56482,7 @@ var $$IMU_EXPORT$$;
var cached_nextimages = 0;
function lraction(isright) {
- trigger_gallery(isright, function(changed) {
+ trigger_gallery(isright ? 1 : -1, function(changed) {
if (!changed) {
create_ui();
}
@@ -56700,7 +56708,7 @@ var $$IMU_EXPORT$$;
update_imagestotal();
} else {
- count_gallery(leftright, undefined, undefined, function(total) {
+ count_gallery(leftright, undefined, undefined, undefined, function(total) {
if (!leftright) {
prev_images = total;
cached_previmages = prev_images;
@@ -58501,9 +58509,12 @@ var $$IMU_EXPORT$$;
return !!find_source([el]);
}
- function count_gallery(nextprev, origel, el, cb) {
+ function count_gallery(nextprev, max, origel, el, cb) {
var count = 0;
+ if (max === undefined)
+ max = settings.mouseover_ui_gallerymax;
+
var firstel = el;
if (!firstel)
firstel = real_popup_el;
@@ -58526,8 +58537,8 @@ var $$IMU_EXPORT$$;
count++;
- if (count >= settings.mouseover_ui_gallerymax)
- return cb(count);
+ if (count >= max)
+ return cb(count, newel);
el = newel;
loop();
@@ -58537,15 +58548,29 @@ var $$IMU_EXPORT$$;
loop();
}
- function wrap_gallery_cycle(nextprev, origel, el, cb) {
+ function wrap_gallery_cycle(dir, origel, el, cb) {
if (!el)
el = real_popup_el;
- wrap_gallery_func(nextprev, origel, el, function(newel) {
- if (!newel && settings.mouseover_gallery_cycle) {
- count_gallery(!nextprev, origel, el, function(count, newel) {
+ if (dir === 0)
+ return cb();
+
+ var nextprev = true;
+ var max = dir;
+ if (dir < 0) {
+ nextprev = false;
+ max = -dir;
+ }
+
+ count_gallery(nextprev, max, origel, el, function(count, newel) {
+ if (count < max) {
+ if (settings.mouseover_gallery_cycle) {
+ count_gallery(!nextprev, undefined, origel, el, function(count, newel) {
cb(newel);
});
+ } else {
+ cb(null);
+ }
} else {
cb(newel);
}
@@ -58564,12 +58589,12 @@ var $$IMU_EXPORT$$;
});
}
- wrap_gallery_cycle(nextprev, undefined, undefined, function(el) {
+ wrap_gallery_cycle(nextprev ? 1 : -1, undefined, undefined, function(el) {
cb(is_valid_el(el));
});
}
- function trigger_gallery(nextprev, cb) {
+ function trigger_gallery(dir, cb) {
if (!cb) {
cb = nullfunc;
}
@@ -58578,14 +58603,14 @@ var $$IMU_EXPORT$$;
return remote_send_message(popup_el_remote, {
type: "trigger_gallery",
data: {
- nextprev: nextprev
+ dir: dir
}
}, function(triggered) {
cb(triggered);
});
}
- wrap_gallery_cycle(nextprev, undefined, undefined, function(newel) {
+ wrap_gallery_cycle(dir, undefined, undefined, function(newel) {
if (newel) {
var source = find_source([newel]);
if (source) {
@@ -59497,11 +59522,11 @@ var $$IMU_EXPORT$$;
if (popups.length > 0 && popup_el) {
if (trigger_complete(settings.mouseover_gallery_prev_key)) {
- trigger_gallery(false);
+ trigger_gallery(-1);
ret = false;
release_ignore = settings.mouseover_gallery_prev_key;
} else if (trigger_complete(settings.mouseover_gallery_next_key)) {
- trigger_gallery(true);
+ trigger_gallery(1);
ret = false;
release_ignore = settings.mouseover_gallery_next_key;
} else if (trigger_complete(settings.mouseover_download_key)) {
@@ -59774,7 +59799,7 @@ var $$IMU_EXPORT$$;
});
}
} else if (message.type === "count_gallery") {
- count_gallery(message.data.nextprev, undefined, undefined, function(count) {
+ count_gallery(message.data.nextprev, undefined, undefined, undefined, function(count) {
respond(count);
});
} else if (message.type === "is_nextprev_valid") {
@@ -59782,7 +59807,7 @@ var $$IMU_EXPORT$$;
respond(valid);
});
} else if (message.type === "trigger_gallery") {
- trigger_gallery(message.data.nextprev, function(triggered) {
+ trigger_gallery(message.data.dir, function(triggered) {
respond(triggered);
});
} else if (message.type === "resetpopups") {
| 11 |
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js @@ -664,12 +664,12 @@ axes.prepTicks = function(ax, opts) {
// get range min and max to find range delta of axis 1
var minValBaseAxis = Math.min(baseAxis.range[0], baseAxis.range[1]);
var maxValBaseAxis = Math.max(baseAxis.range[0], baseAxis.range[1]);
- var rangeDeltaBaseAxis = Math.abs(maxValBaseAxis - minValBaseAxis);
+ var rangeDeltaBaseAxis = maxValBaseAxis - minValBaseAxis;
// get range min and max to find range delta of axis 2
var minValAxis = Math.min(ax.range[0], ax.range[1]);
var maxValAxis = Math.max(ax.range[0], ax.range[1]);
- var rangeDeltaCurrentAxis = Math.abs(maxValAxis - minValAxis);
+ var rangeDeltaCurrentAxis = maxValAxis - minValAxis;
// set second axis' dtick value to be based off of same ratio as the first axis
var dtickRatio = rangeDeltaBaseAxis / baseAxis.dtick;
| 2 |
diff --git a/articles/scopes/current/index.md b/articles/scopes/current/index.md @@ -158,7 +158,7 @@ Note the differences between the two examples. In the latest, we want to get an
- `response_type`: We appended the value `token`. This tells the Authorization Server (Auth0 in our case) to issue an `access_token` as well, not only an `id_token`. The `access_token` will be sent to the API as credentials.
-## Define Scopes Using the Dashboard
+### Define Scopes Using the Dashboard
::: warning
By default, any user of any client can ask for any scope defined here. You can implement access policies to limit this behaviour via [Rules](/rules).
@@ -176,3 +176,11 @@ Provide the following parameters:
Click **Add** when you've provided the requested values.
+
+### Limiting API Scopes being Issued
+
+A client application can request any scope and the user will be prompted to approve those scopes during the authorization flow. This may not be a desirable situation, as you may want to limit the scopes based on, for example, the permissions (or role) of a user.
+
+You can make use of the [Authorization Extension](/extensions/authorization-extension) in conjunction with a custom [Rule](/rules) to ensure that scopes are granted based on the permissions of a user.
+
+This approach is discussed in more depth in some of our [Architecture Scenarios](/architecture-scenarios). Specifically, you can review the entire [Configure the Authorization Extension](/architecture-scenarios/application/spa-api/part-2#configure-the-authorization-extension) section of our SPA+API Architecture Scenario which demonstrates how to configure the Authorization Extension, and also create a custom Rule which will ensure scopes are granted based on the permissions of a user.
\ No newline at end of file
| 0 |
diff --git a/core/block.js b/core/block.js @@ -3122,19 +3122,6 @@ Blockly.Blocks['variables_get_typed'] = {
variable.setTypeExpr(A);
},
- /**
- * Notification that a variable is renaming.
- * If the name matches one of this block's variables, rename it.
- * @param {string} oldName Previous name of variable.
- * @param {string} newName Renamed variable.
- * @this Blockly.Block
- */
- renameVar: function(oldName, newName) {
- if (Blockly.Names.equals(oldName, this.getField('VAR').getText())) {
- this.setFieldValue(newName, 'VAR');
- }
- },
-
clearTypes: function() {
var variable = this.typedReference['VAR'];
goog.asserts.assert(this.outputConnection.typeExpr ==
@@ -3334,19 +3321,6 @@ Blockly.Blocks['let_typed'] = {
options.push(option);
},
- /**
- * Notification that a variable is renaming.
- * If the name matches one of this block's variables, rename it.
- * @param {string} oldName Previous name of variable.
- * @param {string} newName Renamed variable.
- * @this Blockly.Block
- */
- renameVar: function(oldName, newName) {
- if (Blockly.Names.equals(oldName, this.getField('VAR').getText())) {
- this.setFieldValue(newName, 'VAR');
- }
- },
-
/**
* Create XML to represent argument inputs.
* @return {Element} XML storage element.
| 2 |
diff --git a/changelog/62_UNRELEASED_xxxx-xx-xx.md b/changelog/62_UNRELEASED_xxxx-xx-xx.md - Fixed that due soon products with `due_type` = "Expiration date" were missing in `due_products` of the `/stock/volatile` endpoint
- Fixed that `PUT/DELETE /objects/{entity}/{objectId}` produced an internal server error when the given object id was invalid (now returns `400 Bad Request`)
- Fixed that hyphens in filter values did not work
+- Fixed that cyrillic letters were not allowed in filter values
| 11 |
diff --git a/src/Model.d.ts b/src/Model.d.ts @@ -164,7 +164,8 @@ export type OneProperties = {
export class Paged<T> extends Array {
start: string;
- next: () => Paged<T>;
+ // DEPRECATED
+ next: () => Promise<Paged<T>>;
}
export type AnyModel = {
| 1 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -417,9 +417,11 @@ metaversefile.setApi({
const app = currentAppRender;
if (app) {
const frame = e => {
+ if (!app.paused) {
performanceTracker.startCpuObject(app.name);
fn(e.data);
performanceTracker.endCpuObject();
+ }
};
world.appManager.addEventListener('frame', frame);
const destroy = () => {
| 0 |
diff --git a/Specs/Scene/AxisSpec.js b/Specs/Scene/AxisSpec.js @@ -13,64 +13,33 @@ defineSuite([
Matrix4) {
'use strict';
+ function convertUpAxis(upAxis, transformation, expected) {
+ var transformed = Matrix4.multiplyByVector(transformation, upAxis, new Cartesian4());
+ Cartesian4.normalize(transformed, transformed);
+ expect(transformed).toEqualEpsilon(expected, CesiumMath.EPSILON1);
+ }
+
it('Convert y-up to z-up', function() {
- var upAxis = Cartesian4.UNIT_Y;
- var transformation = Axis.Y_UP_TO_Z_UP;
- var transformed = new Cartesian4();
- Matrix4.multiplyByVector(transformation, upAxis, transformed);
- var result = new Cartesian4();
- Cartesian4.normalize(transformed, result);
- expect(result).toEqualEpsilon(Cartesian4.UNIT_Z, CesiumMath.EPSILON1);
+ convertUpAxis(Cartesian4.UNIT_Y, Axis.Y_UP_TO_Z_UP, Cartesian4.UNIT_Z);
});
it('Convert y-up to x-up', function() {
- var upAxis = Cartesian4.UNIT_Y;
- var transformation = Axis.Y_UP_TO_X_UP;
- var transformed = new Cartesian4();
- Matrix4.multiplyByVector(transformation, upAxis, transformed);
- var result = new Cartesian4();
- Cartesian4.normalize(transformed, result);
- expect(result).toEqualEpsilon(Cartesian4.UNIT_X, CesiumMath.EPSILON1);
+ convertUpAxis(Cartesian4.UNIT_Y, Axis.Y_UP_TO_X_UP, Cartesian4.UNIT_X);
});
it('Convert z-up to x-up', function() {
- var upAxis = Cartesian4.UNIT_Z;
- var transformation = Axis.Z_UP_TO_X_UP;
- var transformed = new Cartesian4();
- Matrix4.multiplyByVector(transformation, upAxis, transformed);
- var result = new Cartesian4();
- Cartesian4.normalize(transformed, result);
- expect(result).toEqualEpsilon(Cartesian4.UNIT_X, CesiumMath.EPSILON1);
+ convertUpAxis(Cartesian4.UNIT_Z, Axis.Z_UP_TO_X_UP, Cartesian4.UNIT_X);
});
it('Convert z-up to y-up', function() {
- var upAxis = Cartesian4.UNIT_Z;
- var transformation = Axis.Z_UP_TO_Y_UP;
- var transformed = new Cartesian4();
- Matrix4.multiplyByVector(transformation, upAxis, transformed);
- var result = new Cartesian4();
- Cartesian4.normalize(transformed, result);
- expect(result).toEqualEpsilon(Cartesian4.UNIT_Y, CesiumMath.EPSILON1);
+ convertUpAxis(Cartesian4.UNIT_Z, Axis.Z_UP_TO_Y_UP, Cartesian4.UNIT_Y);
});
it('Convert x-up to y-up', function() {
- var upAxis = Cartesian4.UNIT_X;
- var transformation = Axis.X_UP_TO_Y_UP;
- var transformed = new Cartesian4();
- Matrix4.multiplyByVector(transformation, upAxis, transformed);
- var result = new Cartesian4();
- Cartesian4.normalize(transformed, result);
- expect(result).toEqualEpsilon(Cartesian4.UNIT_Y, CesiumMath.EPSILON1);
+ convertUpAxis(Cartesian4.UNIT_X, Axis.X_UP_TO_Y_UP, Cartesian4.UNIT_Y);
});
it('Convert x-up to z-up', function() {
- var upAxis = Cartesian4.UNIT_X;
- var transformation = Axis.X_UP_TO_Z_UP;
- var transformed = new Cartesian4();
- Matrix4.multiplyByVector(transformation, upAxis, transformed);
- var result = new Cartesian4();
- Cartesian4.normalize(transformed, result);
- expect(result).toEqualEpsilon(Cartesian4.UNIT_Z, CesiumMath.EPSILON1);
+ convertUpAxis(Cartesian4.UNIT_X, Axis.X_UP_TO_Z_UP, Cartesian4.UNIT_Z);
+ });
});
-
-}, 'WebGL');
| 3 |
diff --git a/src/muncher/ddb.js b/src/muncher/ddb.js @@ -367,7 +367,7 @@ export default class DDBMuncher extends Application {
const sourcesSelected = game.settings.get("ddb-importer", "munching-policy-monster-sources").flat().length > 0;
const homebrewDescription = (tiers.homebrew)
? sourcesSelected
- ? "Homebrew won't be imported with source(s) selected"
+ ? "SOURCES SELECTED! You can't import homebrew with a source filter selected"
: "Include homebrew?"
: "Include homebrew? [Undying or God tier patreon supporters]";
| 7 |
diff --git a/includes/REST_API/Stories_Controller.php b/includes/REST_API/Stories_Controller.php @@ -186,6 +186,9 @@ class Stories_Controller extends WP_REST_Posts_Controller {
$schema['properties']['color_presets'] = [
'description' => __( 'Color presets used by all stories', 'web-stories' ),
'type' => 'array',
+ 'items' => [
+ 'type' => 'object',
+ ],
'context' => [ 'view', 'edit' ],
'default' => [],
];
| 7 |
diff --git a/cypress/integration/labelhelp.spec.js b/cypress/integration/labelhelp.spec.js @@ -9,7 +9,7 @@ describe("Create a Label Help ", () => {
cy.contains("Import Toy Dataset").click()
cy.get('[data-import-toy-dataset-name="Cats"]').click()
cy.contains("Label").click()
- cy.contains("Label Help").click()
+ cy.contains("Crowd Label").click()
// This is a special api key that triggers mock functionality from the server
// e.g. it always has 100 credits
cy.get(".label-help-api-key-text-field").type(
| 1 |
diff --git a/app/controllers/carto/api/groups_controller.rb b/app/controllers/carto/api/groups_controller.rb @@ -16,7 +16,7 @@ module Carto
before_filter :load_user
before_filter :validate_organization_or_user_loaded
before_filter :load_group, :only => [:show, :update, :destroy, :add_users, :remove_users]
- before_filter :org_owner_only, :only => [:create, :update, :destroy, :add_users, :remove_users]
+ before_filter :org_admin_only, :only => [:create, :update, :destroy, :add_users, :remove_users]
before_filter :org_users_only, :only => [:show, :index]
before_filter :load_organization_users, :only => [:add_users, :remove_users]
@@ -123,7 +123,7 @@ module Carto
render json: { errors: ["You can't get other organization users"] }, status: 501
end
- unless @user.id == current_user.id || current_user.organization_owner?
+ unless @user.id == current_user.id || current_user.organization_admin?
render json: { errors: ["You can't get other users groups"] }, status: 501
end
end
@@ -134,12 +134,14 @@ module Carto
def org_users_only
unless @organization.id == current_user.organization_id
- render json: { errors: ["Not organization owner"] }, status: 400
+ render json: { errors: ["Not organization user"] }, status: 400
end
end
- def org_owner_only
- render json: { errors: ["Not org. owner"] }, status: 400 unless @organization.owner_id == current_user.id
+ def org_admin_only
+ unless current_user.belongs_to_organization?(@organization) && current_user.organization_admin?
+ render json: { errors: ["Not org. admin"] }, status: 400
+ end
end
def load_group
| 11 |
diff --git a/src/components/play-mode/hotbar/Hotbar.jsx b/src/components/play-mode/hotbar/Hotbar.jsx @@ -20,6 +20,7 @@ const fullscreenFragmentShader = `\
uniform sampler2D uTex;
uniform float uSelected;
uniform float uSelectFactor;
+ uniform float uTime;
varying vec2 vUv;
//---------------------------------------------------------------------------
@@ -131,6 +132,16 @@ const fullscreenFragmentShader = `\
highlightColor.gb = vUv;
}
} else {
+ float extraIntensity = min(max(0.3 + fbm(uTime * 0.001 * 10., 3, 0.7), 0.), 1.);
+ float distanceToBottomMiddle = length(vUv - vec2(0.5, 1.));
+ float extraFactor = min(max(distanceToBottomMiddle, 0.), 1.);
+
+ vec3 color1 = vec3(${new THREE.Color(0x00F260).toArray().map(n => n.toFixed(8)).join(', ')});
+ vec3 color2 = vec3(${new THREE.Color(0x0575E6).toArray().map(n => n.toFixed(8)).join(', ')});
+ vec3 colorMix = mix(color1, color2, vUv.y);
+
+ highlightColor.rgb += colorMix * extraFactor * extraIntensity * uSelectFactor;
+
const float arrowHeight = 0.25;
Tri t1 = Tri(
vec2(borderWidth, borderWidth),
@@ -185,6 +196,10 @@ const _makeHotboxScene = () => {
value: 0,
needsUpdate: true,
},
+ uTime: {
+ value: 0,
+ needsUpdate: true,
+ },
},
vertexShader: fullscreenVertexShader,
fragmentShader: fullscreenFragmentShader,
@@ -249,6 +264,8 @@ class Hotbox {
this.scene.fullScreenQuadMesh.material.uniforms.uSelected.needsUpdate = true;
this.scene.fullScreenQuadMesh.material.uniforms.uSelectFactor.value = smoothedSelectFactor;
this.scene.fullScreenQuadMesh.material.uniforms.uSelectFactor.needsUpdate = true;
+ this.scene.fullScreenQuadMesh.material.uniforms.uTime.value = timestamp;
+ this.scene.fullScreenQuadMesh.material.uniforms.uTime.needsUpdate = true;
renderer.setViewport(0, 0, this.width, this.height);
renderer.clear();
| 0 |
diff --git a/locale/de.json b/locale/de.json "humanizer_language": "de"
},
"restarter": {
- "crash_detected": "Absturz erkannt",
+ "crash_detected": "Absturz registriert",
"partial_crash_warn": "Aufgrund von Verbindungsproblemen startet dieser Server in 1 Minute neu. Bitte trenne die Verbindung jetzt.",
"partial_crash_warn_discord": "Aufgrund von Verbindungsproblemen, startet **%{servername}** in einer Minute neu.",
"schedule_reason": "Automatisierter Neustart um %{time}",
| 1 |
diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js @@ -72,7 +72,9 @@ function AnchorRenderer({tnode, key, style}) {
// An auth token is needed to download Expensify chat attachments
const isAttachment = Boolean(htmlAttribs['data-expensify-source']);
const fileName = lodashGet(tnode, 'domNode.children[0].data', '');
- const internalExpensifyPath = htmlAttribs.href.startsWith(CONST.NEW_EXPENSIFY_URL) && htmlAttribs.href.replace(CONST.NEW_EXPENSIFY_URL, '');
+ const internalExpensifyPath = (htmlAttribs.href.startsWith(CONST.NEW_EXPENSIFY_URL) && htmlAttribs.href.replace(CONST.NEW_EXPENSIFY_URL, ''))
+ || (htmlAttribs.href.startsWith(CONST.NEW_EXPENSIFY_URL_STAGING) && htmlAttribs.href.replace(CONST.NEW_EXPENSIFY_URL_STAGING, ''));
+
// If we are handling a New Expensify link then we will assume this should be opened by the app internally. This ensures that the links are opened internally via react-navigation
// instead of in a new tab or with a page refresh (which is the default behavior of an anchor tag)
| 11 |
diff --git a/js/fcoin.js b/js/fcoin.js @@ -534,7 +534,7 @@ module.exports = class fcoin extends Exchange {
headers['FC-ACCESS-KEY'] = this.apiKey;
headers['FC-ACCESS-SIGNATURE'] = signature;
headers['FC-ACCESS-TIMESTAMP'] = tsStr;
- headers['Content-Type'] = 'application/json;charset=UTF-8';
+ headers['Content-Type'] = 'application/json';
}
return { 'url': url, 'method': method, 'body': body, 'headers': headers };
}
| 1 |
diff --git a/src/plugins/Dashboard/index.js b/src/plugins/Dashboard/index.js @@ -216,7 +216,7 @@ module.exports = class Dashboard extends Plugin {
handlePopState (event) {
// Check if the state no longer contains our `uppyDashboard: 'open'` flag
if (!event.state || !event.state.uppyDashboard) {
- this.closeModal()
+ this.closeModal({ manualClose: false })
}
}
@@ -257,7 +257,11 @@ module.exports = class Dashboard extends Plugin {
this.setFocusToFirstNode()
}
- closeModal () {
+ closeModal (opts = {}) {
+ const {
+ manualClose = true
+ } = opts
+
this.setPluginState({
isHidden: true
})
@@ -268,6 +272,13 @@ module.exports = class Dashboard extends Plugin {
this.savedActiveElement.focus()
+ if (manualClose) {
+ if (this.opts.browserBackButtonClose) {
+ // Go back in history to clear out the entry we created for `uppyDashboard` in history state
+ history.go(-1)
+ }
+ }
+
window.removeEventListener('popstate', this.handlePopState, false)
}
| 0 |
diff --git a/packages/app/src/server/service/app.ts b/packages/app/src/server/service/app.ts @@ -123,11 +123,11 @@ export default class AppService implements S2sMessageHandlable {
return this.configManager.getConfig('crowi', 'app:isMaintenanceMode');
}
- async startMaintenanceMode() {
+ async startMaintenanceMode(): Promise<void> {
await this.configManager.updateConfigsInTheSameNamespace('crowi', { 'app:isMaintenanceMode': true });
}
- async endMaintenanceMode() {
+ async endMaintenanceMode(): Promise<void> {
await this.configManager.updateConfigsInTheSameNamespace('crowi', { 'app:isMaintenanceMode': false });
}
| 7 |
diff --git a/server/preprocessing/other-scripts/linkedcat.R b/server/preprocessing/other-scripts/linkedcat.R @@ -85,10 +85,11 @@ get_papers <- function(query, params, limit=100) {
}
build_query <- function(query, params, limit){
- fields = c('maintitle', 'keywords', 'ocrtext', 'author', 'host', 'ddc')
- q = paste(paste(fields, query, sep = ":"), collapse = " ")
- pubyear = paste0("pubyear:", "[", params$from, " TO ", params$to, "]")
- return(list(q = q, rows = limit, fq = pubyear))
+ q_fields = c('maintitle', 'keywords', 'ocrtext', 'author', 'host', 'ddc')
+ q = paste(paste(q_fields, query, sep = ":"), collapse = " ")
+ pubyear = paste0("pub_year:", "[", params$from, " TO ", params$to, "]")
+ q_params <- list(q = q, rows = limit, fq = pubyear)
+ return(q_params)
}
| 3 |
diff --git a/lib/models/patch/multi-file-patch.js b/lib/models/patch/multi-file-patch.js @@ -17,6 +17,7 @@ export default class MultiFilePatch {
this.filePatches = filePatches || [];
this.filePatchesByMarker = new Map();
+ this.filePatchesByPath = new Map();
this.hunksByMarker = new Map();
// Store a map of {diffRow, offset} for each FilePatch where offset is the number of Hunk headers within the current
@@ -24,6 +25,7 @@ export default class MultiFilePatch {
this.diffRowOffsetIndices = new Map();
for (const filePatch of this.filePatches) {
+ this.filePatchesByPath.set(filePatch.getPath(), filePatch);
this.filePatchesByMarker.set(filePatch.getMarker(), filePatch);
let diffRow = 1;
@@ -342,16 +344,9 @@ export default class MultiFilePatch {
}
doesPatchExceedLargeDiffThreshold = filePatchPath => {
-
- const patches = this.getFilePatches();
- // can avoid iterating through all patches by adding a map
- const patch = patches.filter(p => p.getPath() === filePatchPath)[0];
+ const patch = this.filePatchesByPath.get(filePatchPath);
+ return patch.getRenderStatus() === TOO_LARGE;
// do I need to handle case where patch is null or something?
- if (patch.getRenderStatus() === TOO_LARGE) {
- return true;
- } else {
- return false;
- }
}
getBufferRowForDiffPosition = (fileName, diffRow) => {
| 4 |
diff --git a/contracts/Havven.sol b/contracts/Havven.sol @@ -197,16 +197,6 @@ contract Havven is ERC20Token, Owned {
penultimateFeePeriodStartTime = now - 2*targetFeePeriodDurationSeconds;
}
- /* ========== VIEW FUNCTIONS ========== */
-
- function lastAverageBalanceNeedsRecomputation(address account)
- public
- view
- returns (bool)
- {
- return lastTransferTimestamp[account] < feePeriodStartTime;
- }
-
/* ========== SETTERS ========== */
function setNomin(EtherNomin _nomin)
| 2 |
diff --git a/CHANGELOG.md b/CHANGELOG.md All notable changes to this project are documented in this file.
-## Head
+## 13.9.0
- Added: TAP formatter ([#5062](https://github.com/stylelint/stylelint/pull/5062)).
- Fixed: incorrect exit code when using `--report` options ([#5079](https://github.com/stylelint/stylelint/pull/5079)).
| 6 |
diff --git a/package.json b/package.json {
"name": "prettier-atom",
"main": "./dist/main.js",
- "version": "0.56.0",
+ "version": "0.56.1",
"description": "Atom plugin for formatting JavaScript using prettier with (optional) prettier-eslint integration",
"keywords": [
"atom",
| 6 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js @@ -932,7 +932,6 @@ RED.subflow = (function() {
function buildEnvUIRow(row, tenv, ui, node) {
- console.log(tenv, ui)
ui.label = ui.label||{};
if ((tenv.type === "cred" || (tenv.parent && tenv.parent.type === "cred")) && !ui.type) {
ui.type = "cred";
| 2 |
diff --git a/userscript.user.js b/userscript.user.js @@ -97474,7 +97474,7 @@ var $$IMU_EXPORT$$;
};
// untested
- // files = array of data, not filenames
+ // files = array of {data: uint8array, mime: ...}, not filenames
var ffmpeg_concat = function(ffmpeg, files, cb) {
if (!ffmpeg) cb(null);
@@ -97488,10 +97488,14 @@ var $$IMU_EXPORT$$;
// todo: file extensions? are they even necessary?
var filename = prefix + i;
+ if (file.mime) {
+ filename += file.mime.replace(/.*\//, ".");
+ }
+
filenames.push(filename);
files_txt_files.push("file '" + filename + "'");
- ffmpeg.FS("writeFile", filename, file);
+ ffmpeg.FS("writeFile", filename, file.data);
});
ffmpeg.FS("writeFile", files_txt_filename, files_txt_files.join("\n"));
@@ -97503,7 +97507,13 @@ var $$IMU_EXPORT$$;
ffmpeg.FS("unlink", filename);
});
ffmpeg.FS("unlink", files_txt_filename);
- if (out) ffmpeg.FS("unlink", out_filename);
+
+ if (out) {
+ try {
+ // this can fail if ffmpeg failed to create the out file entirely
+ ffmpeg.FS("unlink", out_filename);
+ } catch (e) {}
+ }
};
ffmpeg.run("-f", "concat", "-safe", "0", "-i", files_txt_filename, "-c", "copy", out_filename).then(
@@ -97511,7 +97521,8 @@ var $$IMU_EXPORT$$;
cleanup();
cb(out_filename);
},
- function() {
+ function(err) {
+ console_error(err);
cleanup(true);
cb(null);
}
@@ -97669,7 +97680,13 @@ var $$IMU_EXPORT$$;
if (do_stop) return;
if (finished >= single_urls.length) {
- return cb(urls_data);
+ var out_urls = [];
+
+ array_foreach(single_urls, function(url) {
+ out_urls.push(urls_data[url]);
+ });
+
+ return cb(out_urls);
} else if (current_url_i >= single_urls.length) {
return;
}
@@ -97737,6 +97754,7 @@ var $$IMU_EXPORT$$;
};
if (false) {
+ //var progress_el = create_progress_el(true);
request_parsed_stream(our_obj, our_obj.url, function(manifest) {
get_downloadable_playlists(our_obj, manifest, function(final) {
console_log("playlists", final);
@@ -97746,11 +97764,21 @@ var $$IMU_EXPORT$$;
download_urls(our_obj, urls, function(progobj) {
console_log(progobj.percent, progobj);
+ //update_progress_el(progress_el, progobj.percent);
}, function(data) {
console_log("final data", data);
+
+ get_ffmpeg(function(ffmpeg) {
+ if (!ffmpeg) return;
+
+ ffmpeg_join(ffmpeg, data, function(filename) {
+ console_log(filename);
+ });
+ });
});
});
});
+ }
if (false) {
get_ffmpeg(function(ffmpeg) {
@@ -97758,10 +97786,9 @@ var $$IMU_EXPORT$$;
return;
}
- console_log(ffmpeg);
+ ffmpeg.run("-version");
});
}
- }
get_library("shaka", settings, do_request, function(_shaka) {
if (!_shaka) {
| 1 |
diff --git a/tests/phpunit/integration/Core/Authentication/AuthenticationTest.php b/tests/phpunit/integration/Core/Authentication/AuthenticationTest.php @@ -56,7 +56,6 @@ class AuthenticationTest extends TestCase {
$auth->register();
// Authentication::handle_oauth is invoked on init but we cannot test it due to use of filter_input.
- $this->assertTrue( has_action( 'init' ) );
$this->assertTrue( has_action( 'admin_init' ) );
$this->assertTrue( has_action( 'admin_action_' . Google_Proxy::ACTION_SETUP ) );
$this->assertTrue( has_action( OAuth_Client::CRON_REFRESH_PROFILE_DATA ) );
| 2 |
diff --git a/src/__tests__/defaultShouldValidate.spec.js b/src/__tests__/defaultShouldValidate.spec.js @@ -28,9 +28,8 @@ describe('defaultShouldValidate', () => {
foo: 'fooChanged'
})
}
- }),
- true
- )
+ })
+ ).toBe(true)
})
it('should not validate if values have not changed', () => {
@@ -46,9 +45,8 @@ describe('defaultShouldValidate', () => {
foo: 'fooInitial'
})
}
- }),
- false
- )
+ })
+ ).toBe(false)
})
it('should validate if field validator keys have changed', () => {
expect(
@@ -65,9 +63,8 @@ describe('defaultShouldValidate', () => {
},
lastFieldValidatorKeys: [],
fieldValidatorKeys: ['foo']
- }),
- true
- )
+ })
+ ).toBe(true)
})
it('should not validate if field validator keys have not changed', () => {
@@ -85,9 +82,8 @@ describe('defaultShouldValidate', () => {
},
lastFieldValidatorKeys: ['foo'],
fieldValidatorKeys: ['foo']
- }),
- false
- )
+ })
+ ).toBe(false)
})
}
| 1 |
diff --git a/README.md b/README.md @@ -4,8 +4,6 @@ _by [Samuel Liew](https://stackoverflow.com/users/584192/samuel-liew)_
[Bug reports](https://github.com/samliew/SO-mod-userscripts/issues), Forks, and PRs welcome!
-*See also: [Other Stack Overflow Userscripts](https://github.com/samliew/SO-userscripts)*
-
<br>
| 2 |
diff --git a/src/pages/LootTier.jsx b/src/pages/LootTier.jsx @@ -231,6 +231,10 @@ function LootTier(props) {
/>,
<div
className="display-wrapper"
+ style = {{
+ backgroundColor: '#000',
+ height: 'auto',
+ }}
key = {'display-wrapper'}
>
<div
| 1 |
diff --git a/userscript.user.js b/userscript.user.js @@ -12334,6 +12334,8 @@ var $$IMU_EXPORT$$;
(domain_nowww === "fitolsam.com" && string_indexof(src, "/uploads/") >= 0) ||
// https://sevelina.ru/images/uploads/2015/08/1212121-139x120.gif
(domain_nowww === "sevelina.ru" && /\/images\/+uploads\//.test(src)) ||
+ // https://www.cdprojekt.com/en/wp-content/uploads-en/2020/04/cyberpunk2077-running_the_show-rgb-1024x576.jpg
+ (domain_nowww === "cdprojekt.com" && string_indexof(src, "/wp-content/") >= 0) ||
// https://static.acgsoso.com/uploads/2020/02/19bd4f091f03c191195d5e626c3190f9-200x300.jpg
(domain === "static.acgsoso.com" && string_indexof(src, "/uploads/") >= 0)
) {
@@ -19781,7 +19783,7 @@ var $$IMU_EXPORT$$;
// https://e-cdns-images.dzcdn.net/images/cover/79bf0fcde7554320d40681e21e043c0a/1800x1800-000000-100-0-0.jpg
// if the size is larger than the image, it will scale back down to 1200 on the largest side
- newsrc = src.replace(/(\/[0-9a-f]{32}\/+[0-9]+x[0-9]+)(?:(?:-[0-9]+){4})?(\.[^/.]+)(?:[?#].*)?$/, "$1-000000-100-0-0.jpg");
+ newsrc = src.replace(/(\/[0-9a-f]{32}\/+[0-9]+x[0-9]+)(?:(?:-[0-9]+){4})?(\.[^/.]+)(?:[?#].*)?$/, "$1-000000-100-0-0$2");
if (newsrc !== src)
return newsrc;
@@ -19804,8 +19806,13 @@ var $$IMU_EXPORT$$;
var firstrun = true;
var currentsrc = src;
+ // thanks to Rnksts on discord for the idea to use a quality of 1 while testing
+ var get_deezer_image_url = function(origsrc, newsize, newquality) {
+ return origsrc.replace(/(\/[0-9a-f]{32}\/+)[0-9]+x[0-9]+(?:(?:-[0-9]+){4})?(\.[^/.]+)(?:[?#].*)?$/, "$1" + newsize + "-000000-" + newquality + "-0-0$2");
+ }
+
if (current_x <= 1200) {
- currentsrc = currentsrc.replace(/(\/[0-9a-f]{32}\/+)[0-9]+x[0-9]+/, "$11201x0");
+ currentsrc = get_deezer_image_url(currentsrc, "1201x0", 1);
firstrun = false;
}
@@ -19863,10 +19870,10 @@ var $$IMU_EXPORT$$;
//console_log(mingood, minbad, current_x);
- var goodsrc = currentsrc.replace(/(\/[0-9a-f]{32}\/+)[0-9]+x[0-9]+/, "$1" + mingood + "x0");
+ var goodsrc = get_deezer_image_url(currentsrc, mingood + "x0", 100);
if (current_x !== mingood) {
- var newsrc = currentsrc.replace(/(\/[0-9a-f]{32}\/+)[0-9]+x[0-9]+/, "$1" + current_x + "x0");
+ var newsrc = get_deezer_image_url(currentsrc, current_x + "x0", 1);
if (newsrc !== currentsrc) {
currentsrc = newsrc;
| 4 |
diff --git a/lib/JITClient/JITManager.cpp b/lib/JITClient/JITManager.cpp @@ -151,7 +151,7 @@ JITManager::CreateBinding(
FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, errorNumber, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&messageBuffer, 0, NULL);
Output::Print(_u("Last error was 0x%x (%s)"), errorNumber, messageBuffer);
- free(messageBuffer);
+ LocalFree(messageBuffer);
#endif
// wait operation failed for an unknown reason.
Assert(false);
| 4 |
diff --git a/generators/dart/math.js b/generators/dart/math.js @@ -190,7 +190,7 @@ Blockly.Dart['math_number_property'] = function(block) {
var number_to_check = Blockly.Dart.valueToCode(block, 'NUMBER_TO_CHECK',
Blockly.Dart.ORDER_MULTIPLICATIVE);
if (!number_to_check) {
- return ['false', Blockly.Python.ORDER_ATOMIC];
+ return ['false', Blockly.Dart.ORDER_ATOMIC];
}
var dropdown_property = block.getFieldValue('PROPERTY');
var code;
@@ -242,7 +242,7 @@ Blockly.Dart['math_number_property'] = function(block) {
var divisor = Blockly.Dart.valueToCode(block, 'DIVISOR',
Blockly.Dart.ORDER_MULTIPLICATIVE);
if (!divisor) {
- return ['false', Blockly.Python.ORDER_ATOMIC];
+ return ['false', Blockly.Dart.ORDER_ATOMIC];
}
code = number_to_check + ' % ' + divisor + ' == 0';
break;
| 2 |
diff --git a/tests/integration/components/polaris-resource-list/item-test.js b/tests/integration/components/polaris-resource-list/item-test.js @@ -318,6 +318,19 @@ module('Integration | Component | polaris-resource-list/item', function(hooks) {
.dom('[data-test-checkbox-input]')
.hasAttribute('data-test-checkbox-input-checked');
});
+
+ test('renders a disabled checked Checkbox if `loading` context is true', async function(assert) {
+ await render(hbs`
+ {{#polaris-resource-list/provider value=mockLoadingContext}}
+ {{polaris-resource-list/item
+ id=selectedItemId
+ url=url
+ }}
+ {{/polaris-resource-list/provider}}
+ `);
+
+ assert.dom('[data-test-checkbox-input]').hasAttribute('disabled');
+ });
}
);
@@ -342,19 +355,6 @@ module('Integration | Component | polaris-resource-list/item', function(hooks) {
assert.dom('[data-test-id="media"]').doesNotExist();
});
- test('renders a disabled checked Checkbox if `loading` context is true', async function(assert) {
- await render(hbs`
- {{#polaris-resource-list/provider value=mockLoadingContext}}
- {{polaris-resource-list/item
- itemId=selectedItemId
- url=url
- }}
- {{/polaris-resource-list/provider}}
- `);
-
- assert.dom('[data-test-checkbox-input]').hasAttribute('disabled');
- });
-
test('includes an avatar if one is provided', async function(assert) {
await render(hbs`
{{#polaris-resource-list/provider value=mockDefaultContext}}
@@ -432,6 +432,11 @@ module('Integration | Component | polaris-resource-list/item', function(hooks) {
{{/polaris-resource-list/provider}}
`);
+ // Checking the 'Disclosure' class here because the react implementation
+ // tests for ButtonGroup in this case, but our implementation has a
+ // ButtonGroup rendered either way, whereas the 'Disclosure' class only
+ // gets applied if `persisActions` is `true` so its more accurate to
+ // check the class.
assert.dom('.Polaris-ResourceList-Item__Disclosure').exists();
});
}
| 5 |
diff --git a/token-metadata/0x6F87D756DAf0503d08Eb8993686c7Fc01Dc44fB1/metadata.json b/token-metadata/0x6F87D756DAf0503d08Eb8993686c7Fc01Dc44fB1/metadata.json "symbol": "TRADE",
"address": "0x6F87D756DAf0503d08Eb8993686c7Fc01Dc44fB1",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/test/functional/helpers/constants/consent.js b/test/functional/helpers/constants/consent.js export const CONSENT_IN = {
- preferences: [
+ consent: [
{
standard: "Adobe",
version: "1.0",
@@ -10,7 +10,7 @@ export const CONSENT_IN = {
]
};
export const CONSENT_OUT = {
- preferences: [
+ consent: [
{
standard: "Adobe",
version: "1.0",
| 2 |
diff --git a/Gruntfile.js b/Gruntfile.js @@ -471,9 +471,7 @@ module.exports = function (grunt) {
generateConfig: {
command: [
"echo '\n--- Regenerating config files. ---'",
- // "node --experimental-modules src/core/config/scripts/generateOpsIndex.mjs",
"mkdir -p src/core/config/modules",
- "echo 'export default {};\n' > src/core/config/modules/OpModules.mjs",
"echo '[]\n' > src/core/config/OperationConfig.json",
"node --experimental-modules --no-warnings --no-deprecation src/core/config/scripts/generateOpsIndex.mjs",
"node --experimental-modules --no-warnings --no-deprecation src/core/config/scripts/generateConfig.mjs",
@@ -483,8 +481,6 @@ module.exports = function (grunt) {
generateNodeIndex: {
command: [
"echo '\n--- Regenerating node index ---'",
- // Avoid cyclic dependency
- "echo 'export default {};\n' > src/core/config/modules/OpModules.mjs",
"node --experimental-modules src/node/config/scripts/generateNodeIndex.mjs",
"echo '--- Node index generated. ---\n'"
].join(";"),
| 2 |
diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb class StatsController < ApplicationController
-
before_filter :set_time_zone_to_utc
before_filter :load_params, except: [:year, :generate_year]
- before_filter :authenticate_user!, only: [:cnc2017_taxa, :cnc2017_stats, :generate_year]
+ before_action :doorkeeper_authorize!,
+ only: [ :generate_year ],
+ if: lambda { authenticate_with_oauth? }
+ before_filter :authenticate_user!,
+ only: [:cnc2017_taxa, :cnc2017_stats, :generate_year],
+ unless: lambda { authenticated_with_oauth? }
before_filter :allow_external_iframes, only: [:wed_bioblitz]
caches_action :summary, expires_in: 1.hour
| 11 |
diff --git a/src/article/ArticleSnippets.js b/src/article/ArticleSnippets.js -export const FIGURE_SNIPPET = `
+export const FIGURE_SNIPPET = () => `
<fig xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ali="http://www.niso.org/schemas/ali/1.0">
- <label></label>
- <caption>
- <title></title>
- <p></p>
- </caption>
+ <caption></caption>
<graphic mime-subtype="" mimetype="image" xlink:href="" />
- <permissions>
- <copyright-statement></copyright-statement>
- <copyright-year></copyright-year>
- <copyright-holder></copyright-holder>
- <license>
- <ali:license_ref></ali:license_ref>
- <license-p></license-p>
- </license>
- </permissions>
</fig>
`
-export const FOOTNOTE_SNIPPET = `
- <fn>
- <p></p>
- </fn>
+export const FOOTNOTE_SNIPPET = () => `
+ <fn></fn>
`
-export const PERSON_SNIPPET = `
+export const PERSON_SNIPPET = () => `
<contrib contrib-type="person" equal-contrib="no" corresp="no" deceased="no">
<name>
<surname></surname>
<given-names></given-names>
<suffix></suffix>
</name>
- <bio>
- <p></p>
- </bio>
+ <bio></bio>
</contrib>
`
-export const TABLE_SNIPPET = `
- <table-wrap id="table1">
- <label></label>
+export const TABLE_SNIPPET = (nrows, ncols) => `
+ <table-wrap>
<caption>
- <title></title>
- <p></p>
</caption>
<table>
<tbody>
<tr>
- <th></th>
- <th></th>
- <th></th>
- <th></th>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
+ ${Array(ncols).fill().map(() => '<th></th>').join('')}
</tr>
+ ${Array(nrows).fill().map(() => `<tr>
+ ${Array(ncols).fill().map(() => '<td></td>').join('')}
+ </tr>`).join('')}
</tbody>
</table>
</table-wrap>
| 7 |
diff --git a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js @@ -134,7 +134,29 @@ in your Node-RED user directory (${RED.settings.userDir}).
url = "http://"+url;
}
}
- url = encodeURI(url);
+
+ // The Request module used in Node-RED 1.x was tolerant of query strings that
+ // were partially encoded. For example - "?a=hello%20there&b=20%"
+ // The GOT module doesn't like that.
+ // The following is an attempt to normalise the url to ensure it is properly
+ // encoded. We cannot just encode it directly as we don't want any valid
+ // encoded entity to end up doubly encoded.
+ if (url.indexOf("?") > -1) {
+ // Only do this if there is a query string to deal with
+ const [hostPath, ...queryString] = url.split("?")
+ const query = queryString.join("?");
+ if (query) {
+ // Look for any instance of % not followed by two hex chars.
+ // Replace any we find with %25.
+ const escapedQueryString = query.replace(/(%.?.?)/g, function(v) {
+ if (/^%[a-f0-9]{2}/i.test(v)) {
+ return v;
+ }
+ return v.replace(/%/,"%25")
+ })
+ url = hostPath+"?"+escapedQueryString;
+ }
+ }
var method = nodeMethod.toUpperCase() || "GET";
if (msg.method && n.method && (n.method !== "use")) { // warn if override option not set
| 9 |
diff --git a/src/css/ui/components/code-block.css b/src/css/ui/components/code-block.css color: var(--code-violet);
}
-[language="css"] .CodeBlock--token-color,
[language="css"] .CodeBlock--token-attribute.CodeBlock--token-value,
-.CodeBlock--language-css.CodeBlock--token-color,
.CodeBlock--language-css.CodeBlock--token-attribute.CodeBlock--token-value {
color: var(--code-gold);
}
+[language="css"] .CodeBlock--token-color,
+.CodeBlock--language-css.CodeBlock--token-color {
+ color: var(--code-violet);
+}
+
[language="css"] .CodeBlock--token-attribute.CodeBlock--token-punctuation,
.CodeBlock--language-css.CodeBlock--token-attribute.CodeBlock--token-punctuation {
color: inherit;
| 7 |
diff --git a/scc-guide.md b/scc-guide.md @@ -51,10 +51,17 @@ If you want to try SCC on K8s, the simplest way to get started is to sign up to
You can also run SCC using only Node.js version >= 6.x.x.
For simplicity, we will show you how to run everything on your localhost (`127.0.0.1`), but in practice, you will need to change `127.0.0.1` to an appropriate IP, host name or domain name.
-First, you need to download each repository to your machine(s) (E.g. `git clone`).
+First, you need to download each of these repositories to your machine(s):
+
+- `git clone https://github.com/SocketCluster/scc-broker`
+- `git clone https://github.com/SocketCluster/scc-state`
+
Then inside each repo, you should run `npm install` without any arguments to install dependencies.
-Then you should launch the state server first by going inside your local **scc-state** repo and then running the command:
+Then you need to setup a new SocketCluster project to use as your user-facing instance. For info about how to setup a SocketCluster project, see this page: http://socketcluster.io/#!/docs/getting-started
+
+Once you have the two repos mentioned above and your SocketCluster project setup, you should launch the state server first by
+going inside your local **scc-state** repo and then running the command:
```
node server
@@ -66,7 +73,7 @@ Next, to launch a broker, you should navigate to your **scc-broker** repo and ru
SCC_STATE_SERVER_HOST='127.0.0.1' SOCKETCLUSTER_SERVER_PORT='8888' node server
```
-Finally, to run a frontend-facing SocketCluster instance, you can navigate to your **socketcluster** repo and run:
+Finally, to run a frontend-facing SocketCluster instance, you can navigate to your socketcluster project directory and run:
```
SCC_STATE_SERVER_HOST='127.0.0.1' SOCKETCLUSTER_PORT='8000' node server
| 7 |
diff --git a/package.json b/package.json "node": ">= 6.0.0"
},
"scripts": {
- "start": "node src/index.js",
+ "start": "node lib/index.js",
"start-dev": "LOG_LEVEL=debug node src/index.js",
"start:dist": "node dist/index.js",
"lint": "eslint --fix .",
| 10 |
diff --git a/bin/multielasticdump b/bin/multielasticdump @@ -38,7 +38,7 @@ const defaults = {
offset: 0,
direction: 'dump', // default to dump
'support-big-int': false,
- ignoreAnalyzer: false,
+ ignoreAnalyzer: true,
ignoreData: false,
ignoreMapping: false,
ignoreSettings: false,
| 8 |
diff --git a/app/controllers/superadmin/platform_controller.rb b/app/controllers/superadmin/platform_controller.rb @@ -31,14 +31,14 @@ class Superadmin::PlatformController < Superadmin::SuperadminController
def database_validation
if !params[:database_host]
- render json: { error: "Database host parameter is mandatory" }, status: 400
+ return render json: { error: "Database host parameter is mandatory" }, status: 400
end
Carto::Db::Connection.connect(params[:database_host], 'postgres', as: :cluster_admin) do |conn|
db_users = Carto::Db::Database.new(params[:database_host], conn).users
non_carto_users = db_users.select { |u| !CartoDB::SYSTEM_DB_USERS.include?(u.name) && !u.carto_user }
carto_users = db_users.select(&:carto_user)
connected_users = check_for_users_in_database(carto_users, params[:database_host])
- render json: { db_users: non_carto_users, carto_users: connected_users }
+ return render json: { db_users: non_carto_users, carto_users: connected_users }
end
end
| 2 |
diff --git a/store/queries.js b/store/queries.js @@ -174,7 +174,7 @@ function getHeroRankings(db, redis, heroId, options, cb) {
WHERE hero_id = ?
ORDER BY score DESC
LIMIT 100
- `, [heroId]).asCallback((err, result) => {
+ `, [heroId || 0]).asCallback((err, result) => {
if (err) {
return cb(err);
}
| 9 |
diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js @@ -34,13 +34,13 @@ function MetamaskInpageProvider (connectionStream) {
const filterSubprovider = new FilterSubprovider()
engine.addProvider(filterSubprovider)
- const stream = self.stream = new StreamSubprovider()
- engine.addProvider(stream)
+ const streamSubprovider = new StreamSubprovider()
+ engine.addProvider(streamSubprovider)
pipe(
- stream,
+ streamSubprovider,
multiStream.createStream('provider'),
- stream,
+ streamSubprovider,
(err) => logStreamDisconnectWarning('MetaMask RpcProvider', err)
)
| 10 |
diff --git a/token-metadata/0x09fE5f0236F0Ea5D930197DCE254d77B04128075/metadata.json b/token-metadata/0x09fE5f0236F0Ea5D930197DCE254d77B04128075/metadata.json "symbol": "WCK",
"address": "0x09fE5f0236F0Ea5D930197DCE254d77B04128075",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/react/src/components/masthead/SprkMasthead.stories.js b/react/src/components/masthead/SprkMasthead.stories.js @@ -163,7 +163,7 @@ export const defaultStory = () => (
<SprkMasthead
littleNavLinks={links}
narrowNavLinks={links.concat(addedNarrowNavLinks)}
- siteLogo={<svg className="sprk-c-Masthead__logo" xmlns="http://www.w3.org/2000/svg" width="365.4" height="101.35" viewBox="0 0 365.4 101.35">
+ siteLogo={<svg className="sprk-c-Masthead__logo" xmlns="http://www.w3.org/2000/svg" width="365.4" height="48" viewBox="0 0 365.4 101.35">
<title>spark-red-full-outlines</title>
<path
d="M126.15,53.65l5.76-9.25a20.84,20.84,0,0,0,13.34,5c4.37,0,6.56-1.75,6.56-4.89s-2.55-4.44-9.77-6.78c-7.58-2.48-13.85-6.19-13.85-15,0-10,7.51-15.89,18.37-15.89a27.64,27.64,0,0,1,15.75,4.73l-5.47,9.33a18.14,18.14,0,0,0-10.35-3.57c-3.94,0-6.34,1.68-6.34,4.81,0,3.28,3.21,4.16,9.47,6.27,7.88,2.63,14.22,5.83,14.22,15.31,0,10.28-7.66,16.33-19.32,16.33C136.65,60.07,129.94,57,126.15,53.65Z"
@@ -269,7 +269,7 @@ export const extended = () => (
selector={selector}
narrowSelector={selector}
narrowNavLinks={links.concat(addedNarrowNavLinks)}
- siteLogo={<svg className="sprk-c-Masthead__logo" xmlns="http://www.w3.org/2000/svg" width="365.4" height="101.35" viewBox="0 0 365.4 101.35">
+ siteLogo={<svg className="sprk-c-Masthead__logo" xmlns="http://www.w3.org/2000/svg" width="365.4" height="48" viewBox="0 0 365.4 101.35">
<title>spark-red-full-outlines</title>
<path
d="M126.15,53.65l5.76-9.25a20.84,20.84,0,0,0,13.34,5c4.37,0,6.56-1.75,6.56-4.89s-2.55-4.44-9.77-6.78c-7.58-2.48-13.85-6.19-13.85-15,0-10,7.51-15.89,18.37-15.89a27.64,27.64,0,0,1,15.75,4.73l-5.47,9.33a18.14,18.14,0,0,0-10.35-3.57c-3.94,0-6.34,1.68-6.34,4.81,0,3.28,3.21,4.16,9.47,6.27,7.88,2.63,14.22,5.83,14.22,15.31,0,10.28-7.66,16.33-19.32,16.33C136.65,60.07,129.94,57,126.15,53.65Z"
| 3 |
diff --git a/wiki/Community_Meetings/Angular_PF_Community_Meeting_Aug17.md b/wiki/Community_Meetings/Angular_PF_Community_Meeting_Aug17.md -# Angular-PatternFly Community Meeting - August 17, 2017
+# Angular-PatternFly Community Meeting - August 17, 2017 10AM EST
During this meeting we will talk about the problems we are facing with PatternFly 3 CSS. We'll share our plan for a new CSS architecture for the next PatternFly to gather feedback.
## Call in information:
| 0 |
diff --git a/generators/client/files-common.js b/generators/client/files-common.js * See the License for the specific language governing permissions and
* limitations under the License.
*/
-const mkdirp = require('mkdirp');
-const constants = require('../generator-constants');
-
-const MAIN_SRC_DIR = constants.CLIENT_MAIN_SRC_DIR;
-
module.exports = {
writeFiles,
};
@@ -34,6 +29,5 @@ const commonFiles = {
};
function writeFiles() {
- mkdirp(MAIN_SRC_DIR);
this.writeFilesToDisk(commonFiles, this, false, this.fetchFromInstalledJHipster('client/templates/common'));
}
| 2 |
diff --git a/articles/migrations/guides/legacy-lock-api-deprecation.md b/articles/migrations/guides/legacy-lock-api-deprecation.md @@ -19,8 +19,12 @@ If your applications match any of the following cases, you are affected:
If you do not use the above libraries and do not specifically call the above endpoints, you are not affected. No libraries which are not specifically named are affected by this vulnerability, or in turn, by the migration.
-::: panel Legacy Lock API Enabled
-If you see the warning panel `Your tenant has the Legacy Lock API enabled. Please follow our Deprecation Guide then disable the Legacy Lock API in your advanced settings. The Legacy Lock API will be removed on July 16th, 2018 and your applications will no longer work if you have not fully migrated.` when you login to the Dashboard, it is because you have not turned off the Legacy Lock API switch in your [advanced settings](${manage_url}/#/tenant/advanced). If you are unaffected by the migration, or have completed it, you should be able to turn that setting off and remove the warning.
+::: panel-warning Dashboard Warning Banner - Legacy Lock API Enabled
+You may see this warning panel when you log in to the Dashboard:
+
+_Your tenant has the Legacy Lock API enabled. Please follow our Deprecation Guide then disable the Legacy Lock API in your advanced settings. The Legacy Lock API will be removed on July 16th, 2018 and your applications will no longer work if you have not fully migrated._
+
+This is because you have not turned off the Legacy Lock API switch in your [Advanced Settings](${manage_url}/#/tenant/advanced). If you are not affected by the migration, or have already completed it, turn that setting off to remove the warning.
:::
### If you already use Universal Login / Hosted Login Page
@@ -176,6 +180,8 @@ Please take a look at the [Deprecation Error Reference](/errors/deprecation-erro
Auth0 has provided a toggle in the tenant settings in the [Dashboard](${manage_url}) to allow customers to turn off the legacy endpoints manually for their tenant ahead of the deprecation deadline of July 16, 2018. Navigate to the tenant settings screen, **Advanced** tab and scroll down to the block of migration toggles.
+
+
Turn off the **Legacy Lock API** toggle to stop your tenant from being able to use those endpoints. This toggle allows you to test the removal of the deprecated endpoints with the ability to turn them back on if you encounter issues.
::: note
| 3 |
diff --git a/src/views/microbit/microbit.jsx b/src/views/microbit/microbit.jsx @@ -289,7 +289,14 @@ class MicroBit extends ExtensionLanding {
<FormattedMessage id="microbit.cardsDescription" />
</p>
<p>
- <a href={this.props.intl.formatMessage({id: 'cards.microbit-cardsLink'})}>
+ <a
+ href={this.props.intl.formatMessage({
+ id: 'cards.microbit-cardsLink'
+ })}
+ rel="noopener noreferrer"
+ target="_blank"
+ >
+ >
<Button className="download-cards-button large">
<FormattedMessage id="general.downloadPDF" />
</Button>
| 4 |
diff --git a/scss/_variables.scss b/scss/_variables.scss @@ -17,9 +17,9 @@ $siimple-legacy-colors: ("navy", "green", "teal", "blue", "purple", "pink", "red
//Darker/lighter amount
$siimple-default-amount: 20% !default;
-//Defautl colors
+//Default colors
$siimple-default-white: #ffffff !default;
-$siimple-default-dark: #546778 !default;
+$siimple-default-navy: #546778 !default;
$siimple-default-primary: #4e91e4 !default;
$siimple-default-success: #93d260 !default;
$siimple-default-warning: #fbc850 !default;
@@ -57,16 +57,16 @@ $siimple-default-palette: (
"over": $siimple-default-white
),
"dark": (
- "dark": darken($siimple-default-dark, $siimple-default-amount),
- "base": $siimple-default-dark,
- "light": lighten($siimple-default-dark, $siimple-default-amount),
+ "dark": darken($siimple-default-navy, $siimple-default-amount),
+ "base": $siimple-default-navy,
+ "light": lighten($siimple-default-navy, $siimple-default-amount),
"over": $siimple-default-white
),
"light": (
"dark": $siimple-default-grey-dark,
"base": $siimple-default-grey,
"light":$siimple-default-grey-light,
- "over": $siimple-default-dark
+ "over": $siimple-default-navy
)
);
| 10 |
diff --git a/aws/events/event.go b/aws/events/event.go @@ -50,8 +50,7 @@ type APIGatewayRequest struct {
func NewAPIGatewayMockRequest(lambdaName string,
httpMethod string,
whitelistParamValues map[string]string,
- eventData interface{},
- testingURL string) (*APIGatewayRequest, error) {
+ eventData interface{}) (*APIGatewayRequest, error) {
apiGatewayRequest := &APIGatewayRequest{
Method: httpMethod,
| 2 |
diff --git a/assets/sass/components/global/_googlesitekit-cta.scss b/assets/sass/components/global/_googlesitekit-cta.scss }
}
- #google_dashboard_widget & .googlesitekit-cta__title { // stylelint-disable-line selector-id-pattern
- color: $c-surfaces-on-surface;
- font-weight: 700;
- }
-
- #google_dashboard_widget &--error .googlesitekit-cta__title { // stylelint-disable-line selector-id-pattern
- color: $c-primary;
- }
-
*:last-child {
margin-bottom: 0;
}
| 2 |
diff --git a/app/src/components/AddRSSModal.js b/app/src/components/AddRSSModal.js @@ -234,7 +234,7 @@ class AddRSSModal extends React.Component {
});
}}
>
- <span>Import feeds</span>
+ <span>Import OPML</span>
<i
className={`fas fa-chevron-${
this.state.opmlSectionExpanded ? 'up' : 'down'
| 10 |
diff --git a/components/data-table/column.jsx b/components/data-table/column.jsx @@ -45,10 +45,34 @@ DataTableColumn.propTypes = {
* Some columns, such as "date last viewed" or "date recently updated," should sort descending first, since that is what the user probably wants. How often does one want to see their oldest files first in a table? If sortable and the `DataTable`'s parent has not defined the sort order, then ascending (A at the top to Z at the bottom) is the default sort order on first click.
*/
isDefaultSortDescending: PropTypes.bool,
+ /**
+ * Selects this column as the currently sorted column.
+ */
+ isSorted: PropTypes.bool,
+ /**
+ * The column label. If a `string` is not passed in, no `title` attribute will be rendered.
+ */
+ label: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
+ /**
+ * The primary column for a row. This is almost always the first column.
+ */
+ primaryColumn: PropTypes.bool,
+ /**
+ * The property which corresponds to this column.
+ */
+ property: PropTypes.string,
/**
* Whether or not the column is sortable.
*/
sortable: PropTypes.bool,
+ /**
+ * The current sort direction. If left out the component will track this internally. Required if `isSorted` is true.
+ */
+ sortDirection: PropTypes.oneOf(['desc', 'asc']),
+ /**
+ * Width of column. This is required for advanced/fixed layout tables. Please provide units. (`rems` are recommended)
+ */
+ width: PropTypes.string,
};
export default DataTableColumn;
| 3 |
diff --git a/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs b/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs @@ -236,20 +236,6 @@ public class AccountResourceIT <% if (databaseType === 'cassandra') { %>extends
.jsonPath("$.authorities").isEqualTo(AuthoritiesConstants.ADMIN);
<%_ } _%>
}
-
- @Test
- public void testGetUnknownAccount() <% if (!reactive) { %>throws Exception <% } %>{
- <%_ if (!reactive) { _%>
- restAccountMockMvc.perform(get("/api/account")
- .accept(MediaType.APPLICATION_PROBLEM_JSON))
- .andExpect(status().isInternalServerError());
- <%_ } else { _%>
- accountWebTestClient.get().uri("/api/account")
- .accept(MediaType.APPLICATION_JSON)
- .exchange()
- .expectStatus().is5xxServerError();
- <%_ } _%>
- }
}
<%_ } else { // not oauth, not skipUserManagement _%>
| 2 |
diff --git a/token-metadata/0x3A1c1d1c06bE03cDDC4d3332F7C20e1B37c97CE9/metadata.json b/token-metadata/0x3A1c1d1c06bE03cDDC4d3332F7C20e1B37c97CE9/metadata.json "symbol": "VYBE",
"address": "0x3A1c1d1c06bE03cDDC4d3332F7C20e1B37c97CE9",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/tests/test_EtherNomin.py b/tests/test_EtherNomin.py @@ -405,12 +405,6 @@ class TestEtherNomin(unittest.TestCase):
mine_tx(self.setPrice(pre_price).transact({'from': owner}))
- def test_saleProceedsEther(self):
- pass
-
- def test_saleProceedsEther(self):
- pass
-
def test_priceIsStale(self):
pass
| 2 |
diff --git a/src/library/modules/DataBackup.js b/src/library/modules/DataBackup.js // Do not log and alert on:
// picker window aborted by user, or permission refused
if (err && !["AbortError", "NotAllowedError"].includes(err.name)) {
+ // No log for 'handle user gesture to show a file picker'
+ if ("SecurityError" !== err.name) {
console.error("Export unexpectedly rejected", err);
+ }
alert("Backup " + err);
}
};
// Do not log and alert on:
// picker window aborted by user, or permission refused
if (err && !["AbortError", "NotAllowedError"].includes(err.name)) {
+ // No log for 'handle user gesture to show a file picker'
+ if ("SecurityError" !== err.name) {
console.error("Import unexpectedly rejected", err);
+ }
alert("Restore " + err);
}
};
| 8 |
diff --git a/token-metadata/0xfDBc1aDc26F0F8f8606a5d63b7D3a3CD21c22B23/metadata.json b/token-metadata/0xfDBc1aDc26F0F8f8606a5d63b7D3a3CD21c22B23/metadata.json "symbol": "1WO",
"address": "0xfDBc1aDc26F0F8f8606a5d63b7D3a3CD21c22B23",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/token-metadata/0x607C794cDa77efB21F8848B7910ecf27451Ae842/metadata.json b/token-metadata/0x607C794cDa77efB21F8848B7910ecf27451Ae842/metadata.json "symbol": "PIE",
"address": "0x607C794cDa77efB21F8848B7910ecf27451Ae842",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/assets/sass/components/adminbar/_googlesitekit-wp-adminbar.scss b/assets/sass/components/adminbar/_googlesitekit-wp-adminbar.scss opacity: 0.6;
padding: 0;
position: relative;
- speak: none;
- vertical-align: middle;
width: 26px;
@media (min-width: $bp-wpAdminBarTablet) {
| 2 |
diff --git a/src/getstream.js b/src/getstream.js @@ -46,7 +46,7 @@ function connect(apiKey, apiSecret, appId, options) {
return new StreamClient(apiKey, apiSecret, appId, options);
}
-function connectCloud(apiKey, appId, options) {
+function connectCloud(apiKey, appId, options={}) {
/**
* Create StreamCloudClient that's compatible with StreamCloud
* @method connect
| 12 |
diff --git a/avatars/avatars.js b/avatars/avatars.js @@ -446,6 +446,7 @@ const _makeDebugMeshes = () => {
head: _makeCubeMesh(0xFF8080),
chest: _makeCubeMesh(0xFFFF00),
+ upperChest: _makeCubeMesh(0x808000),
leftShoulder: _makeCubeMesh(0x00FF00),
rightShoulder: _makeCubeMesh(0x008000),
leftUpperArm: _makeCubeMesh(0x00FFFF),
| 0 |
diff --git a/Makefile b/Makefile @@ -27,7 +27,7 @@ build: build/lib build/test build/externaltests
.PHONY: ${TARGETS}
${TARGETS}: build
- ./node_modules/.bin/rollup --config --sourcemap --format umd --name weknowhow.expect -o unexpected.js build/lib/index.js
+ ./node_modules/.bin/rollup --config rollup.config.js --sourcemap --format umd --name weknowhow.expect -o unexpected.js build/lib/index.js
create-html-runners: build/test test/tests.tpl.html test/JasmineRunner.tpl.html
@for file in tests JasmineRunner ; do \
| 4 |
diff --git a/test/endtoend/wdio.remote.conf.js b/test/endtoend/wdio.remote.conf.js @@ -21,7 +21,7 @@ exports.config = Object.assign(base.config, {
{ browserName: 'MicrosoftEdge', version: '17', platform: 'Windows 10' },
// { browserName: 'safari', version: '11.0', platform: 'macOS 10.12' },
// { 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' }
+ { browserName: 'chrome', platformName: 'Android', platformVersion: '6.0', deviceOrientation: 'portrait', deviceName: 'Android Emulator' }
].map(createCapability),
// If you only want to run your tests until a specific amount of tests have failed use
| 2 |
diff --git a/components/dashboard/Form.js b/components/dashboard/Form.js @@ -15,7 +15,7 @@ const lastMonthToday = moment.utc().subtract(30, 'day').format('YYYY-MM-DD')
const defaultDefaultValues = {
since: lastMonthToday,
until: tomorrow,
- probe_cc: [], // ['IR', 'CU', 'SA', 'MY']
+ probe_cc: ['CN', 'IR', 'RU']
}
export const Form = ({ onChange, query, availableCountries }) => {
| 4 |
diff --git a/protocols/index/reports/analysis/slither.txt b/protocols/index/reports/analysis/slither.txt Compilation warnings/errors on contracts/Index.sol: commit 2518c58bec77b8b7d7791d225de9f22716294e77
-contracts/Index.sol:18:1: Warning: Experimental features are turned on. Do not use experimental features on live deployments.
pragma experimental ABIEncoderV2;
^-------------------------------^
-contracts/Index.sol:172:5: Warning: This declaration shadows an existing declaration.
- Locator storage Locator = locatorsLinkedList[HEAD][NEXT];
- ^---------------------^
-contracts/Index.sol:48:3: The shadowed declaration is here:
- struct Locator {
- ^ (Relevant source part starts here and spans across multiple lines).
-contracts/Index.sol:209:5: Warning: This declaration shadows an existing declaration.
- Locator storage Locator = locatorsLinkedList[HEAD][NEXT];
- ^---------------------^
-contracts/Index.sol:48:3: The shadowed declaration is here:
- struct Locator {
- ^ (Relevant source part starts here and spans across multiple lines).
INFO:Detectors:
Different versions of Solidity is used in :
- - Version used: ['0.5.9', 'ABIEncoderV2', '^0.5.0']
+ - Version used: ['0.5.10', 'ABIEncoderV2', '^0.5.0']
- ../../node_modules/openzeppelin-solidity/contracts/ownership/Ownable.sol#1 declares pragma solidity^0.5.0
- - contracts/Index.sol#17 declares pragma solidity0.5.9
+ - contracts/Index.sol#17 declares pragma solidity0.5.10
- contracts/Index.sol#18 declares pragma experimentalABIEncoderV2
Reference: https://github.com/crytic/slither/wiki/Detector-Documentation#different-pragma-directives-are-used
INFO:Detectors:
Pragma version "^0.5.0" allows old versions (../../node_modules/openzeppelin-solidity/contracts/ownership/Ownable.sol#1)
-Pragma version "0.5.9" necessitates versions too recent to be trusted. Consider deploying with 0.5.3 (contracts/Index.sol#17)
+Pragma version "0.5.10" necessitates versions too recent to be trusted. Consider deploying with 0.5.3 (contracts/Index.sol#17)
Reference: https://github.com/crytic/slither/wiki/Detector-Documentation#incorrect-versions-of-solidity
INFO:Detectors:
Parameter '_user' of _user (contracts/Index.sol#87) is not in mixedCase
| 3 |
diff --git a/src/libs/NetworkConnection.js b/src/libs/NetworkConnection.js import _ from 'underscore';
+import Onyx from 'react-native-onyx';
import NetInfo from '@react-native-community/netinfo';
import AppStateMonitor from './AppStateMonitor';
import Log from './Log';
import * as NetworkActions from './actions/Network';
import CONFIG from '../CONFIG';
import CONST from '../CONST';
+import ONYXKEYS from '../ONYXKEYS';
+
+let shouldForceOffline;
+Onyx.connect({
+ key: ONYXKEYS.NETWORK,
+ waitForCollectionCallback: true,
+ callback: val => shouldForceOffline = val.network.shouldForceOffline,
+});
let isOffline = false;
let hasPendingNetworkCheck = false;
@@ -65,6 +74,10 @@ function subscribeToNetInfo() {
// whether a user has internet connectivity or not.
NetInfo.addEventListener((state) => {
Log.info('[NetworkConnection] NetInfo state change', false, state);
+ if (shouldForceOffline) {
+ Log.info('[NetworkConnection] Not setting offline status because shouldForceOffline', false, shouldForceOffline);
+ return;
+ }
setOfflineStatus(state.isInternetReachable === false);
});
}
| 8 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -14,7 +14,7 @@ Remove a legacy key code for delete that is used for F16 on keyboards that have
### New features
-Allow [gutters](https://codemirror.net/doc/manual.html#option_gutters) to specify direct CSS stings.
+Allow [gutters](https://codemirror.net/doc/manual.html#option_gutters) to specify direct CSS strings.
## 5.45.0 (2019-03-20)
| 1 |
diff --git a/src/DragAndDrop.jsx b/src/DragAndDrop.jsx @@ -93,7 +93,9 @@ const DragAndDrop = () => {
return false;
}
- case 27: {
+ case 27: { // esc
+ setCurrentApp(null);
+
return false;
}
}
| 0 |
diff --git a/lib/status.js b/lib/status.js @@ -461,6 +461,7 @@ exports.ERR_LUA_FILE_NOT_FOUND = exports.AEROSPIKE_ERR_LUA_FILE_NOT_FOUND = as.s
* Prodeces a human-readable error message for the given status code.
*/
exports.getMessage = function (code) {
+ /* istanbul ignore next */
switch (code) {
case exports.ERR_INVALID_NODE:
return 'Node invalid or could not be found.'
| 8 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.