code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/lib/optionsSchema.json b/lib/optionsSchema.json "type": "string"
},
"requestCert": {
- "description": "Enables request for client certificate.",
+ "description": "Enables request for client certificate. This is passed directly to the https server.",
"type": "boolean"
},
"inline": {
| 7 |
diff --git a/src/core/Core.js b/src/core/Core.js @@ -128,9 +128,9 @@ class Uppy {
*/
setState (stateUpdate) {
const newState = Object.assign({}, this.state, stateUpdate)
- this.emit('core:state-update', this.state, newState, stateUpdate)
this.state = newState
+ this.emit('core:state-update', this.state, newState, stateUpdate)
this.updateAll(this.state)
}
| 12 |
diff --git a/src/util/logger/create.js b/src/util/logger/create.js @@ -2,7 +2,7 @@ const pino = require('pino')
const serializers = require('./serializers.js')
const getConfig = require('../../config.js').get
-function createLogger (tag, base = {}) {
+function createLogger (tag = '-', base = {}) {
const config = getConfig()
const prettyPrint = {
translateTime: 'yyyy-mm-dd HH:MM:ss',
| 12 |
diff --git a/src/sweetalert2.js b/src/sweetalert2.js @@ -590,7 +590,7 @@ const sweetAlert = (...args) => {
const e = event || window.event
const keyCode = e.keyCode || e.which
- if ([9, 13, 32, 27].indexOf(keyCode) === -1) {
+ if ([9, 13, 32, 27, 37, 38, 39, 40].indexOf(keyCode) === -1) {
// Don't do work on keys we don't care about.
return
}
@@ -618,6 +618,16 @@ const sweetAlert = (...args) => {
e.stopPropagation()
e.preventDefault()
+ // ARROWS - switch focus between buttons
+ } else if (keyCode === 37 || keyCode === 38 || keyCode === 39 || keyCode === 40) {
+ // focus Cancel button if Confirm button is currently focused
+ if (document.activeElement === confirmButton && dom.isVisible(cancelButton)) {
+ cancelButton.focus()
+ // and vice versa
+ } else if (document.activeElement === cancelButton && dom.isVisible(confirmButton)) {
+ confirmButton.focus()
+ }
+
// ENTER/SPACE
} else if (keyCode === 13 || keyCode === 32) {
if (btnIndex === -1 && params.allowEnterKey) {
@@ -630,6 +640,7 @@ const sweetAlert = (...args) => {
e.stopPropagation()
e.preventDefault()
}
+
// ESC
} else if (keyCode === 27 && params.allowEscapeKey === true) {
sweetAlert.closeModal(params.onClose)
| 11 |
diff --git a/src/messages/MessageForm.scss b/src/messages/MessageForm.scss }
.MessageForm__emojiContainer {
- position: relative;
+ position: absolute;
width: 100%;
- height: 250px;
+ height: 295px;
+ bottom: 0;
/* generated by lib itself */
.emoji-dialog {
position: absolute;
- right: 0;
+ right: 30px;
top: 0;
}
}
| 1 |
diff --git a/nerdamer.core.js b/nerdamer.core.js @@ -5196,7 +5196,10 @@ var nerdamer = (function(imports) {
for(var j=0; j<e.length; j++) {
rowTeX.push(this.latex(e[j]));
}
- TeX += rowTeX.join(' & ')+'\\\\\n';
+ TeX += rowTeX.join(' & ');
+ if (i<symbol.elements.length-1){
+ TeX+='\\\\\n';
+ }
}
TeX += '\\end{pmatrix}';
return TeX;
| 1 |
diff --git a/packages/composables/use-drawing/use-drawing-polyline.ts b/packages/composables/use-drawing/use-drawing-polyline.ts /*
* @Author: zouyaoji@https://github.com/zouyaoji
* @Date: 2021-10-21 10:43:32
- * @LastEditTime: 2022-02-05 23:40:49
+ * @LastEditTime: 2022-02-18 20:39:09
* @LastEditors: zouyaoji
* @Description:
* @FilePath: \vue-cesium@next\packages\composables\use-drawing\use-drawing-polyline.ts
@@ -821,6 +821,7 @@ export default function (props, ctx, cmpName: string) {
h(VcPolygon, {
positions: positions,
onReady: onVcPrimitiveReady,
+ clampToGround: props.clampToGround,
...props.polygonOpts,
show: polyline.show && props.polygonOpts?.show
})
| 1 |
diff --git a/getfile.php b/getfile.php @@ -43,7 +43,6 @@ if ($realpath !== false && $realpath === $full_unsafe_file_path) {
if ($has_perms) {
if (is_user_an_editor($template_id, $_SESSION['toolkits_logon_id'])) {
- if ($username == $_SESSION['toolkits_logon_username']) {
// they're logged in, and hopefully have access to the media contents.
$file = dirname(__FILE__) . '/USER-FILES/' . $unsafe_file_path;
if (!is_file($file)) {
@@ -63,5 +62,4 @@ if ($realpath !== false && $realpath === $full_unsafe_file_path) {
}
}
}
-}
echo "You do not appear to have permission to view this resource.";
| 11 |
diff --git a/packages/gatsby/lib/utils/query-runner.js b/packages/gatsby/lib/utils/query-runner.js @@ -249,12 +249,7 @@ const q = queue(({ file, graphql, directory }, callback) => {
ast = babylon.parse(fileStr, {
sourceType: `module`,
sourceFilename: true,
- plugins: [
- `asyncFunctions`,
- `jsx`,
- `flow`,
- `objectRestSpread`,
- ],
+ plugins: [`*`],
})
} catch (e) {
console.log(`Failed to parse ${file}`)
| 4 |
diff --git a/content/articles/creating-a-flipped-box-card-in-android-jetpack-compose/index.md b/content/articles/creating-a-flipped-box-card-in-android-jetpack-compose/index.md @@ -83,13 +83,13 @@ Let us get started.
### Step 1 - Creating a Compose project
Launch your Android Studio and create an empty Compose project.
-
+
> Make sure you have selected empty Compose activity.
Give it the name of your choice.
-
+
### Step 2 - Creating a custom composable
In this step, we will create a composable that we will apply some `Canvas` operations. In your `MainActivity`, outside everything, define a composable and name it `FlippedCard`.
@@ -145,7 +145,7 @@ Let us create a variable that represents a `Path` that will go through our recta
This will be our graph:
-
+
```kotlin
val path = Path().apply {
| 14 |
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb @@ -222,12 +222,7 @@ class ProjectsController < ApplicationController
end
def new
- unless logged_in? && current_user.has_role?(:admin)
- flash[:error] = t(:only_administrators_may_access_that_page)
- redirect_to projects_path
- return
- end
- return render layout: "bootstrap"
+ render layout: "bootstrap"
end
def edit
| 11 |
diff --git a/embark-ui/src/containers/EditorContainer.js b/embark-ui/src/containers/EditorContainer.js @@ -49,7 +49,7 @@ class EditorContainer extends React.Component {
}
textEditorMdSize() {
- return this.state.currentAsideTab.length ? 5 : 10;
+ return this.state.currentAsideTab.length ? 7 : 10
}
textEditorXsSize() {
@@ -64,13 +64,13 @@ class EditorContainer extends React.Component {
isContract={this.isContract()}
currentFile={this.props.currentFile} />
</Col>
- <Col xs={4} md={2} className="border-right">
+ <Col xs={4} md={2} xl={2} lg={2} className="border-right">
<FileExplorerContainer showHiddenFiles={this.state.showHiddenFiles} toggleShowHiddenFiles={() => this.toggleShowHiddenFiles()} />
</Col>
<Col xs={this.textEditorXsSize()} md={this.textEditorMdSize()}>
<TextEditorContainer currentFile={this.props.currentFile} onFileContentChange={(newContent) => this.onFileContentChange(newContent)} />
</Col>
- {this.state.currentAsideTab && <Col xs={6} md={5}>
+ {this.state.currentAsideTab && <Col xs={6} md={3}>
<TextEditorAsideContainer currentAsideTab={this.state.currentAsideTab} currentFile={this.props.currentFile} />
</Col>}
</Row>
| 7 |
diff --git a/website/src/_posts/2019-04-liftoff-08.md b/website/src/_posts/2019-04-liftoff-08.md @@ -38,7 +38,7 @@ After:<br />
- We are currently investigating an [issue](https://github.com/tus/tus-js-client/issues/146) with `tus-js-client`, which affects uploads where the file size is larger than 500MB. Artur is now trying to execute a 600MB upload and then see if it crashes. After that, he will set chunkSize, test the upload again, and report back his findings so we can evaluate our next steps.
-- We are also doing more research on `tus-js-client` fingerprints. Since these are identical for each file on React Native, the team is figuring out how to properly identify files on that platform, because [the standard file properties that tus-js-client relies on](https://github.com/tus/tus-js-client/blob/master/lib/fingerprint.js#L10) are not available.
+- We are also doing more research on `tus-js-client` fingerprints. Since these are identical for each file on React Native, the team is figuring out how to properly identify files on that platform, because [the standard file properties that tus-js-client relies on](https://github.com/tus/tus-js-client/blob/master/lib/node/fingerprint.js) are not available.
- We have our first WIP screenshot for the React Native implementation:
| 1 |
diff --git a/datalad_service/handlers/objects.py b/datalad_service/handlers/objects.py @@ -2,12 +2,10 @@ import logging
import os
import hashlib
import struct
-import zlib
+import subprocess
import falcon
-import git
-
def annex_key_to_path(annex_key):
word = struct.unpack('<I', hashlib.md5(
@@ -33,6 +31,7 @@ class ObjectsResource(object):
ds_path = self.store.get_dataset_path(dataset)
if filekey:
try:
+ # Annexed files
if filekey.startswith('MD5E'):
filepath = '.git/annex/objects/{}/{}/{}'.format(
annex_key_to_path(filekey), filekey, filekey)
@@ -41,23 +40,24 @@ class ObjectsResource(object):
resp.stream = fd
resp.stream_len = os.fstat(fd.fileno()).st_size
resp.status = falcon.HTTP_OK
+ # Git objects
else:
- dir = filekey[:2]
- remaining_hex = filekey[2:]
- filepath = '.git/objects/{}/{}'.format(dir, remaining_hex)
- path = '{}/{}'.format(ds_path, filepath)
- compressed_contents = open(path, 'rb').read()
- decompressed_contents = zlib.decompress(
- compressed_contents)
- split_char = b'\x00'
- contents = decompressed_contents[decompressed_contents.index(
- split_char) + len(split_char):]
- resp.body = contents
+ gitCommand = subprocess.run(
+ ['git', '-C', ds_path, 'cat-file', 'blob', filekey], stdout=subprocess.PIPE)
+ if (gitCommand.returncode == 0):
+ resp.body = gitCommand.stdout
resp.status = falcon.HTTP_OK
- except IOError:
+ elif (gitCommand.returncode == 128):
# File is not kept locally
resp.media = {'error': 'file not found'}
resp.status = falcon.HTTP_NOT_FOUND
+ else:
+ resp.media = {
+ 'error': 'git object command exited with non-zero'}
+ resp.status = falcon.HTTP_INTERNAL_SERVER_ERROR
+ except subprocess.CalledProcessError as err:
+ resp.media = {'error': 'git cat-file failed to run'}
+ resp.status = falcon.HTTP_INTERNAL_SERVER_ERROR
except:
# Some unknown error
resp.media = {
| 11 |
diff --git a/lib/Common/DataStructures/GrowingArray.h b/lib/Common/DataStructures/GrowingArray.h @@ -35,7 +35,7 @@ namespace JsUtil
{
if (buffer != nullptr)
{
- AllocatorFree(alloc, (TypeAllocatorFunc<AllocatorType, int>::GetFreeFunc()), buffer, UInt32Math::Mul(length, sizeof(TValue)));
+ AllocatorFree(alloc, (TypeAllocatorFunc<TAllocator, int>::GetFreeFunc()), buffer, UInt32Math::Mul(length, sizeof(TValue)));
}
}
@@ -76,7 +76,7 @@ namespace JsUtil
{
pNewArray->buffer = AllocateArray<AllocatorType, TValue, false>(
TRACK_ALLOC_INFO(alloc, TValue, AllocatorType, 0, length),
- TypeAllocatorFunc<AllocatorType, TValue>::GetAllocFunc(),
+ TypeAllocatorFunc<TAllocator, TValue>::GetAllocFunc(),
length);
CopyArray<TValue, TValue, TAllocator>(pNewArray->buffer, length, buffer, length);
}
@@ -96,7 +96,7 @@ namespace JsUtil
{
buffer = AllocateArray<AllocatorType, TValue, false>(
TRACK_ALLOC_INFO(alloc, TValue, AllocatorType, 0, length),
- TypeAllocatorFunc<AllocatorType, TValue>::GetAllocFunc(),
+ TypeAllocatorFunc<TAllocator, TValue>::GetAllocFunc(),
length);
count = 0;
}
@@ -105,7 +105,7 @@ namespace JsUtil
uint32 newLength = UInt32Math::AddMul<1, 2>(length);
TValue * newbuffer = AllocateArray<AllocatorType, TValue, false>(
TRACK_ALLOC_INFO(alloc, TValue, AllocatorType, 0, newLength),
- TypeAllocatorFunc<AllocatorType, TValue>::GetAllocFunc(),
+ TypeAllocatorFunc<TAllocator, TValue>::GetAllocFunc(),
newLength);
CopyArray<TValue, TValue, TAllocator>(newbuffer, newLength, buffer, length);
#ifdef DIAG_MEM
@@ -114,7 +114,7 @@ namespace JsUtil
if (length != 0)
{
const size_t lengthByteSize = UInt32Math::Mul(length, sizeof(TValue));
- AllocatorFree(alloc, (TypeAllocatorFunc<AllocatorType, int>::GetFreeFunc()), buffer, lengthByteSize);
+ AllocatorFree(alloc, (TypeAllocatorFunc<TAllocator, int>::GetFreeFunc()), buffer, lengthByteSize);
}
length = newLength;
buffer = newbuffer;
| 11 |
diff --git a/lib/prepare.js b/lib/prepare.js @@ -189,7 +189,7 @@ async function genComponentRegistrationFile ({ sourceDir }) {
return `import Vue from 'vue'\n` + components.map(genImport).join('\n')
}
-const indexRE = /\breadme\.md$/i
+const indexRE = /\b(index|readme)\.md$/i
const extRE = /\.(vue|md)$/
function fileToPath (file) {
| 11 |
diff --git a/packages/openneuro-client/src/datasetGenerator.js b/packages/openneuro-client/src/datasetGenerator.js @@ -14,9 +14,13 @@ export default async function* datasetGenerator(client, query = getDatasets) {
variables: { filterBy: { public: true }, cursor },
errorPolicy: 'ignore',
})
- for (let i = 0; i < data.datasets.edges.length; i++) {
- // Yield one dataset result
- yield data.datasets.edges[i].node
+ for (const edge of data.datasets.edges) {
+ if (edge.hasOwnProperty('node')) {
+ // Yield one dataset if it did not error
+ yield edge.node
+ } else {
+ continue
+ }
}
if (data.datasets.pageInfo.hasNextPage) {
// Next query with new cursor
| 7 |
diff --git a/lib/i18n.js b/lib/i18n.js @@ -62,10 +62,21 @@ module.exports.getLocale = function() {
cache.locale = systemLocale;
} else if (availableLocales.indexOf(systemLocale.split("_")[0]) !== -1) {
cache.locale = systemLocale.split("_")[0];
+ } else {
+ var looseLocaleMatch;
+ for (let i = 0, l = availableLocales.length; i < l; i++) {
+ if (availableLocales[i].split("_")[0] === systemLocale) {
+ looseLocaleMatch = availableLocales[i];
+ break;
+ }
+ }
+ if (looseLocaleMatch) {
+ cache.locale = looseLocaleMatch;
} else {
cache.locale = cache.defaultLocale;
}
}
+ }
return cache.locale;
};
| 11 |
diff --git a/userscript.user.js b/userscript.user.js @@ -30459,6 +30459,49 @@ var $$IMU_EXPORT$$;
}
}
+ function strip_whitespace(str) {
+ if (!str || typeof str !== "string")
+ return str;
+
+ return str
+ .replace(/^\s+/, "")
+ .replace(/\s+$/, "");
+ }
+
+ function apply_styles(el, str) {
+ if (!str || typeof str !== "string" || !strip_whitespace(str))
+ return;
+
+ var splitted = str.split(/[;\n]/);
+ for (var i = 0; i < splitted.length; i++) {
+ var current = strip_whitespace(splitted[i]);
+ if (!current)
+ continue;
+
+ if (current.indexOf(":") < 0)
+ continue;
+
+ var property = strip_whitespace(current.replace(/^(.*?)\s*:.*/, "$1"));
+ var value = strip_whitespace(current.replace(/^.*?:\s*(.*)$/, "$1"));
+
+ var important = false;
+ if (value.match(/!important$/)) {
+ important = true;
+ value = strip_whitespace(value.replace(/!important$/, ""));
+ }
+
+ if (value.match(/^['"].*['"]$/)) {
+ value = value.replace(/^["'](.*)["']$/, "$1");
+ }
+
+ if (important) {
+ el.style.setProperty(property, value, "important");
+ } else {
+ el.style.setProperty(property, value);
+ }
+ }
+ }
+
function makePopup(obj, orig_url, processing, data) {
var openb = get_single_setting("mouseover_open_behavior");
if (openb === "newtab") {
@@ -30511,8 +30554,11 @@ var $$IMU_EXPORT$$;
img.onmousedown = estop;
var div = document.createElement("div");
- //div.style.all = "initial";
- var styles = settings.mouseover_styles.replace("\n", ";");
+ div.style.all = "initial";
+ div.style.boxShadow = "0 0 15px rgba(0,0,0,.5)";
+ div.style.border = "3px solid white";
+
+ /*var styles = settings.mouseover_styles.replace("\n", ";");
div.setAttribute("style", styles);
if (!styles.match(/^\s*box-shadow\s*:/) &&
!styles.match(/;\s*box-shadow\s*:/)) {
@@ -30521,7 +30567,9 @@ var $$IMU_EXPORT$$;
if (!styles.match(/^\s*border(?:-[a-z]+)?\s*:/) &&
!styles.match(/;\s*border(?:-[a-z]+)?\s*:/)) {
div.style.border = "3px solid white";
- }
+ }*/
+
+ apply_styles(div, settings.mouseover_styles);
div.style.position = "fixed"; // instagram has top: -...px
div.style.zIndex = maxzindex;
@@ -30552,7 +30600,8 @@ var $$IMU_EXPORT$$;
vh -= border_thresh * 2;
img.style.all = "initial";
img.style.cursor = "pointer";
- //img.style.display = "block";
+ // https://stackoverflow.com/questions/7774814/remove-white-space-below-image
+ img.style.verticalAlign = "bottom";
img.style.setProperty("display", "block", "important");
if (initial_zoom_behavior === "fit") {
@@ -30751,6 +30800,8 @@ var $$IMU_EXPORT$$;
};
a.style.all = "initial";
a.style.cursor = "pointer";
+ a.style.setProperty("vertical-align", "bottom", "important");
+ a.style.setProperty("display", "block", "important");
a.href = url;
a.target = "_blank";
a.appendChild(img);
| 1 |
diff --git a/js/bootstrap-select.js b/js/bootstrap-select.js isVirtual = that.isVirtual(),
position0 = isVirtual === true ? that.selectpicker.view.position0 : 0;
+ // do nothing if a function key is pressed
+ if (e.which >= 112 && e.which <= 123) return;
+
isActive = that.$newElement.hasClass(classNames.SHOW);
if (
| 11 |
diff --git a/.travis.yml b/.travis.yml @@ -19,6 +19,7 @@ cache:
env:
global:
- REACT_ENV=development
+ - TEST_REACT_NATIVE=false
- BUNDLESIZE_GITHUB_TOKEN=63f6d1717c6652d63234cf9629977b08f4bac3fd
# - REACT_APP_NETWORK_ID=4447
- MNEMONIC="myth like bonus scare over problem client lizard pioneer submit female collect"
| 3 |
diff --git a/package.json b/package.json "description": "React components with highly customizable logic, markup and styles.",
"version": "0.9.0-rc.15",
"scripts": {
- "build": "cross-env npm run clean && npm run sass && npm run js",
+ "build": "cross-env yarn clean && yarn sass && yarn js",
+ "build:watch": "concurrently 'yarn js:watch' 'yarn sass:watch'",
"clean": "rimraf ./lib",
"flow:test": "flow; test $? -eq 0 -o $? -eq 2",
"js": "babel source -d lib -s",
+ "js:watch": "yarn js --watch",
"lint": "eslint --format=node_modules/eslint-formatter-pretty source stories *.js",
- "prepare": "npm run clean && npm run build",
+ "prepare": "yarn clean && yarn build",
"postinstall": "postinstall-build lib --only-as-dependency",
"sass": "cpx \"./source/themes/**/*\" ./lib/themes",
+ "sass:watch": "nodemon -e scss --watch source/themes --exec 'yarn sass'",
"storybook": "start-storybook -p 6543 -c storybook",
"storybook:build": "build-storybook -c storybook -o dist/storybook",
"test": "cross-env NODE_ENV=test jest",
"test:clean": "cross-env NODE_ENV=test jest -u",
- "test:watch": "cross-env NODE_ENV=test jest --watchAll",
- "watch": "nodemon npm run js && npm run sass"
+ "test:watch": "cross-env NODE_ENV=test jest --watchAll"
},
"dependencies": {
"create-react-context": "0.2.2",
| 7 |
diff --git a/test/jasmine/tests/geo_test.js b/test/jasmine/tests/geo_test.js @@ -740,56 +740,6 @@ describe('Test Geo layout defaults', function() {
});
});
});
-
- describe([
- 'geo.visible should honor template.layout.geo.show* defaults',
- 'when template.layout.geo.visible is set to false,',
- 'and does NOT set layout.geo.visible template'
- ].join(' '), function() {
- var keys = [
- 'lonaxis.showgrid',
- 'lataxis.showgrid',
- 'showcoastlines',
- 'showocean',
- 'showland',
- 'showlakes',
- 'showrivers',
- 'showcountries',
- 'showsubunits',
- 'showframe'
- ];
-
- function _assert(extra) {
- var geo = layoutOut.geo;
- keys.forEach(function(k) {
- var actual = Lib.nestedProperty(geo, k).get();
- if(extra && k in extra) {
- expect(actual).toBe(extra[k], k);
- } else {
- expect(actual).toBe(false, k);
- }
- });
- }
-
- it('- disable geo.visible via template', function() {
- layoutIn = {
- template: {
- layout: {
- geo: {
- visible: false
- }
- }
- }
- };
-
- supplyLayoutDefaults(layoutIn, layoutOut, fullData);
- _assert({
- showcoastlines: true,
- showframe: true,
- showsubunits: undefined
- });
- });
- });
});
describe('geojson / topojson utils', function() {
@@ -1670,6 +1620,94 @@ describe('Test geo interactions', function() {
.then(done);
});
+ it([
+ 'geo.visible should honor template.layout.geo.show* defaults',
+ 'when template.layout.geo.visible is set to false,',
+ 'and does NOT set layout.geo.visible template'
+ ].join(' '), function(done) {
+ var gd = createGraphDiv();
+
+ Plotly.react(gd, [{
+ type: 'scattergeo',
+ lat: [0],
+ lon: [0],
+ marker: { size: 100 }
+ }], {
+ template: {
+ layout: {
+ geo: {
+ visible: false,
+ showcoastlines: true,
+ showcountries: true,
+ showframe: true,
+ showland: true,
+ showlakes: true,
+ showocean: true,
+ showrivers: true,
+ showsubunits: true,
+ lonaxis: { showgrid: true },
+ lataxis: { showgrid: true }
+ }
+ }
+ },
+ geo: {}
+ })
+ .then(function() {
+ expect(gd._fullLayout.geo.showcoastlines).toBe(true);
+ expect(gd._fullLayout.geo.showcountries).toBe(true);
+ expect(gd._fullLayout.geo.showframe).toBe(true);
+ expect(gd._fullLayout.geo.showland).toBe(true);
+ expect(gd._fullLayout.geo.showlakes).toBe(true);
+ expect(gd._fullLayout.geo.showocean).toBe(true);
+ expect(gd._fullLayout.geo.showrivers).toBe(true);
+ expect(gd._fullLayout.geo.showsubunits).toBe(undefined);
+ expect(gd._fullLayout.geo.lonaxis.showgrid).toBe(true);
+ expect(gd._fullLayout.geo.lataxis.showgrid).toBe(true);
+ })
+ .then(function() {
+ return Plotly.react(gd, [{
+ type: 'scattergeo',
+ lat: [0],
+ lon: [0],
+ marker: {size: 100}
+ }], {
+ template: {
+ layout: {
+ geo: {
+ showcoastlines: true,
+ showcountries: true,
+ showframe: true,
+ showland: true,
+ showlakes: true,
+ showocean: true,
+ showrivers: true,
+ showsubunits: true,
+ lonaxis: { showgrid: true },
+ lataxis: { showgrid: true }
+ }
+ }
+ },
+ geo: {
+ visible: false
+ }
+ });
+ })
+ .then(function() {
+ expect(gd._fullLayout.geo.showcoastlines).toBe(false);
+ expect(gd._fullLayout.geo.showcountries).toBe(false);
+ expect(gd._fullLayout.geo.showframe).toBe(false);
+ expect(gd._fullLayout.geo.showland).toBe(false);
+ expect(gd._fullLayout.geo.showlakes).toBe(false);
+ expect(gd._fullLayout.geo.showocean).toBe(false);
+ expect(gd._fullLayout.geo.showrivers).toBe(false);
+ expect(gd._fullLayout.geo.showsubunits).toBe(undefined);
+ expect(gd._fullLayout.geo.lonaxis.showgrid).toBe(false);
+ expect(gd._fullLayout.geo.lataxis.showgrid).toBe(false);
+ })
+ .catch(failTest)
+ .then(done);
+ });
+
describe('should not make request for topojson when not needed', function() {
var gd;
| 7 |
diff --git a/examples/material-UI-components/src/App.js b/examples/material-UI-components/src/App.js @@ -15,7 +15,6 @@ function Table({ columns, data }) {
// Use the state and functions returned from useTable to build your UI
const {
getTableProps,
- getTableHeaderProps,
headerGroups,
rows,
prepareRow,
| 2 |
diff --git a/stories/utils/generate-widget-stories.js b/stories/utils/generate-widget-stories.js @@ -39,7 +39,6 @@ const { components: { Widget } } = Widgets;
* Generates stories for a report based widget using provided data.
*
* @since 1.16.0
- *
* @private
*
* @param {Object} args Widget arguments.
| 2 |
diff --git a/src-css/mavo.scss b/src-css/mavo.scss @@ -287,6 +287,16 @@ button.mv-close {
input.mv-editor {
max-width: 100%;
+
+ &[type="number"] {
+ min-width: 3ch; /* If input is empty, we should still be able to see the controls */
+
+ /* Do not hide spinner arrows */
+ &::-webkit-inner-spin-button,
+ &::-webkit-outer-spin-button {
+ opacity: 1;
+ }
+ }
}
select.mv-editor {
| 7 |
diff --git a/src/core/config/OperationConfig.js b/src/core/config/OperationConfig.js @@ -797,12 +797,37 @@ const OperationConfig = {
value: ByteRepr.DELIM_OPTIONS
}
],
- patterns: [ // TODO
- //{
- // match: "^$",
- // flags: "",
- // args: []
- //},
+ patterns: [
+ {
+ match: "^(?:[0-7]{1,2}|[123][0-7]{2})(?: (?:[0-7]{1,2}|[123][0-7]{2}))*$",
+ flags: "",
+ args: ["Space"]
+ },
+ {
+ match: "^(?:[0-7]{1,2}|[123][0-7]{2})(?:,(?:[0-7]{1,2}|[123][0-7]{2}))*$",
+ flags: "",
+ args: ["Comma"]
+ },
+ {
+ match: "^(?:[0-7]{1,2}|[123][0-7]{2})(?:;(?:[0-7]{1,2}|[123][0-7]{2}))*$",
+ flags: "",
+ args: ["Semi-colon"]
+ },
+ {
+ match: "^(?:[0-7]{1,2}|[123][0-7]{2})(?::(?:[0-7]{1,2}|[123][0-7]{2}))*$",
+ flags: "",
+ args: ["Colon"]
+ },
+ {
+ match: "^(?:[0-7]{1,2}|[123][0-7]{2})(?:\\n(?:[0-7]{1,2}|[123][0-7]{2}))*$",
+ flags: "",
+ args: ["Line feed"]
+ },
+ {
+ match: "^(?:[0-7]{1,2}|[123][0-7]{2})(?:\\r\\n(?:[0-7]{1,2}|[123][0-7]{2}))*$",
+ flags: "",
+ args: ["CRLF"]
+ },
]
},
"To Octal": {
@@ -874,12 +899,42 @@ const OperationConfig = {
value: ByteRepr.BIN_DELIM_OPTIONS
}
],
- patterns: [ // TODO
- //{
- // match: "^$",
- // flags: "",
- // args: []
- //},
+ patterns: [
+ {
+ match: "^(?:[01]{8})+$",
+ flags: "",
+ args: ["None"]
+ },
+ {
+ match: "^(?:[01]{8})(?: [01]{8})*$",
+ flags: "",
+ args: ["Space"]
+ },
+ {
+ match: "^(?:[01]{8})(?:,[01]{8})*$",
+ flags: "",
+ args: ["Comma"]
+ },
+ {
+ match: "^(?:[01]{8})(?:;[01]{8})*$",
+ flags: "",
+ args: ["Semi-colon"]
+ },
+ {
+ match: "^(?:[01]{8})(?::[01]{8})*$",
+ flags: "",
+ args: ["Colon"]
+ },
+ {
+ match: "^(?:[01]{8})(?:\\n[01]{8})*$",
+ flags: "",
+ args: ["Line feed"]
+ },
+ {
+ match: "^(?:[01]{8})(?:\\r\\n[01]{8})*$",
+ flags: "",
+ args: ["CRLF"]
+ },
]
},
"To Binary": {
@@ -909,12 +964,37 @@ const OperationConfig = {
value: ByteRepr.DELIM_OPTIONS
}
],
- patterns: [ // TODO
- //{
- // match: "^$",
- // flags: "",
- // args: []
- //},
+ patterns: [
+ {
+ match: "^(?:\\d{1,2}|1\\d{2}|2[0-4]\\d|25[0-5])(?: (?:\\d{1,2}|1\\d{2}|2[0-4]\\d|25[0-5]))*$",
+ flags: "",
+ args: ["Space"]
+ },
+ {
+ match: "^(?:\\d{1,2}|1\\d{2}|2[0-4]\\d|25[0-5])(?:,(?:\\d{1,2}|1\\d{2}|2[0-4]\\d|25[0-5]))*$",
+ flags: "",
+ args: ["Comma"]
+ },
+ {
+ match: "^(?:\\d{1,2}|1\\d{2}|2[0-4]\\d|25[0-5])(?:;(?:\\d{1,2}|1\\d{2}|2[0-4]\\d|25[0-5]))*$",
+ flags: "",
+ args: ["Semi-colon"]
+ },
+ {
+ match: "^(?:\\d{1,2}|1\\d{2}|2[0-4]\\d|25[0-5])(?::(?:\\d{1,2}|1\\d{2}|2[0-4]\\d|25[0-5]))*$",
+ flags: "",
+ args: ["Colon"]
+ },
+ {
+ match: "^(?:\\d{1,2}|1\\d{2}|2[0-4]\\d|25[0-5])(?:\\n(?:\\d{1,2}|1\\d{2}|2[0-4]\\d|25[0-5]))*$",
+ flags: "",
+ args: ["Line feed"]
+ },
+ {
+ match: "^(?:\\d{1,2}|1\\d{2}|2[0-4]\\d|25[0-5])(?:\\r\\n(?:\\d{1,2}|1\\d{2}|2[0-4]\\d|25[0-5]))*$",
+ flags: "",
+ args: ["CRLF"]
+ },
]
},
"To Decimal": {
@@ -938,12 +1018,12 @@ const OperationConfig = {
inputType: "string",
outputType: "byteArray",
args: [],
- patterns: [ // TODO
- //{
- // match: "^$",
- // flags: "",
- // args: []
- //},
+ patterns: [
+ {
+ match: "^(?:(?:[\\dA-F]{4,16}:?)?\\s*((?:[\\dA-F]{2}\\s){1,8}(?:\\s|[\\dA-F]{2}-)(?:[\\dA-F]{2}\\s){1,8}|(?:[\\dA-F]{2}\\s|[\\dA-F]{4}\\s)+)[^\\n]*\\n?)+$",
+ flags: "i",
+ args: []
+ },
]
},
"To Hexdump": {
@@ -1003,12 +1083,12 @@ const OperationConfig = {
inputType: "string",
outputType: "string",
args: [],
- patterns: [ // TODO
- //{
- // match: "^$",
- // flags: "",
- // args: []
- //},
+ patterns: [
+ {
+ match: "&(?:#\\d{2,3}|#x[\\da-f]{2}|[a-z]{2,6});",
+ flags: "i",
+ args: []
+ },
]
},
"To HTML Entity": {
@@ -1053,12 +1133,12 @@ const OperationConfig = {
inputType: "string",
outputType: "string",
args: [],
- patterns: [ // TODO
- //{
- // match: "^$",
- // flags: "",
- // args: []
- //},
+ patterns: [
+ {
+ match: "%[\\da-f]{2}",
+ flags: "i",
+ args: []
+ },
]
},
"URL Encode": {
@@ -1093,12 +1173,22 @@ const OperationConfig = {
value: Unicode.PREFIXES
}
],
- patterns: [ // TODO
- //{
- // match: "^$",
- // flags: "",
- // args: []
- //},
+ patterns: [
+ {
+ match: "\\\\u(?:[\\da-f]{4,6})",
+ flags: "i",
+ args: ["\\u"]
+ },
+ {
+ match: "%u(?:[\\da-f]{4,6})",
+ flags: "i",
+ args: ["%u"]
+ },
+ {
+ match: "U\\+(?:[\\da-f]{4,6})",
+ flags: "i",
+ args: ["U+"]
+ },
]
},
"From Quoted Printable": {
@@ -1107,12 +1197,12 @@ const OperationConfig = {
inputType: "string",
outputType: "byteArray",
args: [],
- patterns: [ // TODO
- //{
- // match: "^$",
- // flags: "",
- // args: []
- //},
+ patterns: [
+ {
+ match: "(?:=[\\da-f]{2}|=\\n)(?:[\\x21-\\x3d\\x3f-\\x7e \\t]|=[\\da-f]{2}|=\\n)*$",
+ flags: "i",
+ args: []
+ },
]
},
"To Quoted Printable": {
@@ -1133,13 +1223,6 @@ const OperationConfig = {
type: "boolean",
value: Punycode.IDN
}
- ],
- patterns: [ // TODO
- //{
- // match: "^$",
- // flags: "",
- // args: []
- //},
]
},
"To Punycode": {
| 0 |
diff --git a/src/components/form-checkbox/form-checkbox.js b/src/components/form-checkbox/form-checkbox.js @@ -56,12 +56,12 @@ export default {
let indicator = h(false)
if (!t.is_ButtonMode && !t.is_Plain) {
- indicator = h('span', { class: 'custom-control-indicator', attrs: { 'aria-hidden': 'true' } })
+ indicator = h('span', { attrs: { 'aria-hidden': 'true' } })
}
const description = h(
'span',
- { class: t.is_ButtonMode ? null : (t.is_Plain ? 'form-check-description' : 'custom-control-description') },
+ { class: t.is_ButtonMode ? null : (t.is_Plain ? 'form-check-label' : 'custom-control-label') },
[t.$slots.default]
)
| 3 |
diff --git a/userscript.user.js b/userscript.user.js @@ -2971,9 +2971,8 @@ var $$IMU_EXPORT$$;
"es": "Comportamiento del Popup"
},
"subcategory_video": {
- "en": "Video",
- "es": "Video",
- "ko": "\uC601\uC0C1"
+ "en": "Video/Audio",
+ "ko": "\uC601\uC0C1/\uC624\uB514\uC624"
},
"subcategory_gallery": {
"en": "Gallery",
| 10 |
diff --git a/website/ops.py b/website/ops.py @@ -1901,7 +1901,7 @@ def getLinkList(headword: str, sourceLang: str, sourceDict: str, targetLang: str
except IOError:
dictDB = None
if dictDB:
- query = "SELECT DISTINCT l.entry_id AS entry_id, l.txt AS link_id, l.element AS link_el, s.txt AS hw FROM searchables AS s, linkables AS l WHERE s.entry_id=l.entry_id AND s.txt LIKE ? AND s.level=1"
+ query = "SELECT DISTINCT l.entry_id AS entry_id, l.txt AS link_id, l.element AS link_el, s.txt AS hw FROM searchables AS s, linkables AS l WHERE s.entry_id=l.entry_id AND s.txt LIKE ? "
c = dictDB.execute(query, (headword+"%", ))
for entry in c.fetchall():
info0 = {"sourceDict": d["id"], "sourceHeadword": entry["hw"]}
| 11 |
diff --git a/src/lib/default-project/project-data.js b/src/lib/default-project/project-data.js @@ -74,22 +74,22 @@ const projectData = translateFunction => {
currentCostume: 0,
costumes: [
{
- assetId: '09dc888b0b7df19f70d81588ae73420e',
+ assetId: 'b7853f557e4426412e64bb3da6531a99',
name: translator(messages.costume, {index: 1}),
bitmapResolution: 1,
- md5ext: '09dc888b0b7df19f70d81588ae73420e.svg',
+ md5ext: 'b7853f557e4426412e64bb3da6531a99.svg',
dataFormat: 'svg',
- rotationCenterX: 47,
- rotationCenterY: 55
+ rotationCenterX: 48,
+ rotationCenterY: 50
},
{
- assetId: '3696356a03a8d938318876a593572843',
+ assetId: 'e6ddc55a6ddd9cc9d84fe0b4c21e016f',
name: translator(messages.costume, {index: 2}),
bitmapResolution: 1,
- md5ext: '3696356a03a8d938318876a593572843.svg',
+ md5ext: 'e6ddc55a6ddd9cc9d84fe0b4c21e016f.svg',
dataFormat: 'svg',
- rotationCenterX: 47,
- rotationCenterY: 55
+ rotationCenterX: 46,
+ rotationCenterY: 53
}
],
sounds: [
| 4 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -9,6 +9,17 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.54.1] -- 2020-04-04
+
+### Changed
+ - Update dependencies in package.json & package-lock.json [#4799, #4800, #4802, #4805, #4811]
+
+### Fixed
+ - Set pointer-events only for editable shapes to allow pan, zoom & hover
+ events to work inside shapes (regression introduced in 1.54.0) [#4810]
+ - Update and validate various mocks [#4762]
+
+
## [1.54.0] -- 2020-04-30
### Added
| 3 |
diff --git a/tests/schemas/ship.schema.json b/tests/schemas/ship.schema.json "value": {
"type": "integer",
"minimum": 0
+ },
+ "recovers": {
+ "type": "integer",
+ "minimum": 0
}
},
"required": ["type", "value"],
| 11 |
diff --git a/token-metadata/0x539F3615C1dBAfa0D008d87504667458acBd16Fa/metadata.json b/token-metadata/0x539F3615C1dBAfa0D008d87504667458acBd16Fa/metadata.json "symbol": "FERA",
"address": "0x539F3615C1dBAfa0D008d87504667458acBd16Fa",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/ModPopupDialogImprovements.user.js b/ModPopupDialogImprovements.user.js // @description Some simple improvements for posts' Mod popup dialog
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.5.1
+// @version 1.6
//
// @match https://stackoverflow.com/*
// @match https://serverfault.com/*
function listenToPageUpdates() {
- $(document).ajaxStop(function() {
- var $popupForm = $('.popup._hidden-descriptions form');
- if($popupForm) {
+ $(document).ajaxComplete(function(evt, jqXHR, settings) {
+
+ // When post mod menu link is clicked
+ if(settings.url.indexOf('/admin/posts/') === 0 && settings.url.indexOf('/moderator-menu') > 0) {
+
+ const $popupForm = $('.popup._hidden-descriptions form');
+ if($popupForm.length === 0) return;
// Move comments to chat is selected by default
$('#tab-actions input[value="move-comments-to-chat"]').prop('checked', true).triggerHandler('click');
setTimeout(() => $(this).parents('tr.flagged-post-row').hide(), 300);
});
}
+
+
+ // When post decline link is clicked in mod queue
+ if(settings.url.indexOf('/admin/dismiss-flag') === 0) {
+
+ // Default decline option to second option "a moderator reviewed your flag, but found no evidence to support it"
+ $('#dis_2').prop('checked', true);
+ }
+
});
}
+
// On page load
listenToPageUpdates();
| 7 |
diff --git a/game.js b/game.js @@ -936,6 +936,7 @@ const _gameUpdate = (timestamp, timeDiff) => {
// const willDie = app.willDieFrom(damage);
app.hit(damage, {
+ type: 'sword',
collisionId,
physicsObject,
hitPosition,
| 0 |
diff --git a/runner/src/main/resources/view/app.js b/runner/src/main/resources/view/app.js @@ -126,6 +126,7 @@ function PlayerCtrl ($scope, $timeout, $interval, $element) {
}
function onFrameChange (frame) {
+ // one frame in this method is one game turn, and contians subframes for each agent's actions
for (let i in ctrl.data.ids) {
$scope.agents[i].stdout = null
$scope.agents[i].stderr = null
@@ -134,7 +135,14 @@ function PlayerCtrl ($scope, $timeout, $interval, $element) {
$scope.referee = {}
const frameData = ctrl.parsedGameInfo.frames[frame]
for (let i in ctrl.data.ids) {
- const subframe = frameData.subframes[i]
+ let subframe
+ if (frameData.subframes.length > 1) {
+ subframe = frameData.subframes[i]
+ } else {
+ if (frameData.subframes[0].agentId === i) {
+ subframe = frameData.subframes[0]
+ }
+ }
if (subframe) {
if (subframe.stdout) {
$scope.agents[i].stdout = subframe.stdout
@@ -148,9 +156,11 @@ function PlayerCtrl ($scope, $timeout, $interval, $element) {
$scope.referee.stdout = frameData.referee.stdout
$scope.referee.stderr = frameData.referee.stderr
$scope.summary = frameData.gameSummary
+ console.log(frameData)
}
function convertFrameFormat (data) {
+ // one frame in this method means one output, if in a single game turn two agents act, the two actions are put in separate frames
const frames = data.views.map(v => {
let f = v.split('\n')
let header = f[0].split(' ')
@@ -168,12 +178,17 @@ function PlayerCtrl ($scope, $timeout, $interval, $element) {
frames[i].referee[newKey] = data[key].referee[i]
}
}
-
for (let pi in data.ids) {
frames[i].stderr = frames[i].stderr || data.errors[pi][i]
frames[i].stdout = frames[i].stdout || data.outputs[pi][i]
+ for (let agentId in data.outputs) {
+ let output = data.outputs[agentId]
+ // check that at turn i, agent has output not null, so it is agent's turn
+ if (output[i] != null && agentId !== 'referee') {
+ frames[i].agentId = agentId
+ }
+ }
}
- frames[i].agentId = -1
}
const agents = data.agents.map(a => Object.assign(a, { avatarUrl: a.avatar }))
const tooltips = data.tooltips.map(JSON.stringify)
| 1 |
diff --git a/lib/waterline/utils/query/forge-stage-two-query.js b/lib/waterline/utils/query/forge-stage-two-query.js @@ -879,7 +879,7 @@ module.exports = function forgeStageTwoQuery(query, orm) {
if (query.populates[populateAttrName] !== true) {
throw buildUsageError(
'E_INVALID_POPULATES',
- 'Could not populate `'+populateAttrName+'` because of ambiguous usage. '+
+ 'Could not populate `'+populateAttrName+'`. '+
'This is a singular ("model") association, which means it never refers to '+
'more than _one_ associated record. So passing in subcriteria (i.e. as '+
'the second argument to `.populate()`) is not supported for this association, '+
| 2 |
diff --git a/tasks/stats.js b/tasks/stats.js @@ -58,7 +58,8 @@ function getInfoContent() {
'<script src="mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>',
'```',
'',
- 'You can get the relevant MathJax files (version 2) from the internet.',
+ 'You can get the relevant MathJax files in `./vendor/extras/mathjax/` or from the internet',
+ 'e.g. "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.3/MathJax.js?config=TeX-AMS-MML_SVG.js"',
'',
'By default, plotly.js will modify the global MathJax configuration on load.',
'This can lead to undesirable behavior if plotly.js is loaded alongside',
| 3 |
diff --git a/lib/dependencies/ContextDependencyHelpers.js b/lib/dependencies/ContextDependencyHelpers.js */
"use strict";
+const ConstDependency = require("./ConstDependency");
+
const ContextDependencyHelpers = exports;
/**
@@ -86,10 +88,24 @@ ContextDependencyHelpers.create = (
);
dep.loc = expr.loc;
const replaces = [];
- const templateLiteral =
- paramExpr.type === "TaggedTemplateExpression"
- ? paramExpr.quasi
- : paramExpr;
+ let templateLiteral = paramExpr;
+ if (paramExpr.type === "ConditionalExpression") {
+ const test = parser.evaluateExpression(paramExpr.test);
+ let replace;
+ if (test.asBool()) {
+ templateLiteral = paramExpr.consequent;
+ replace = paramExpr.alternate;
+ } else {
+ templateLiteral = paramExpr.alternate;
+ replace = paramExpr.consequent;
+ }
+ const dep = new ConstDependency(JSON.stringify(""), replace.range);
+ dep.loc = replace.loc;
+ parser.state.current.addDependency(dep);
+ }
+ if (templateLiteral.type === "TaggedTemplateExpression") {
+ templateLiteral = templateLiteral.quasi;
+ }
templateLiteral.expressions.forEach(e => {
// expressions in postfix are needed to be walked
if (e.range[0] > prefixRange[1]) {
| 9 |
diff --git a/src/components/LIcon.vue b/src/components/LIcon.vue @@ -92,8 +92,10 @@ export default {
mounted() {
this.parentContainer = findRealParent(this.$parent);
-
- propsBinder(this, this.$parent.mapObject, this.$options.props);
+ if (!this.parentContainer) {
+ throw new Error('No parent container with mapObject found for LIcon');
+ }
+ propsBinder(this, this.parentContainer.mapObject, this.$options.props);
this.observer = new MutationObserver(() => {
this.scheduleHtmlSwap();
| 1 |
diff --git a/packages/cx/src/ui/layout/ContentPlaceholder.js b/packages/cx/src/ui/layout/ContentPlaceholder.js import {Widget} from '../Widget';
import {PureContainer} from '../PureContainer';
+import {isString} from "../../util/isString";
export class ContentPlaceholder extends PureContainer {
@@ -30,16 +31,14 @@ export class ContentPlaceholder extends PureContainer {
}
prepare(context, instance) {
- if (instance.content && instance.content.shouldUpdate)
+ let {content} = instance;
+ if (instance.cache('content', content) || (content && content.shouldUpdate))
instance.markShouldUpdate(context);
}
setContent(context, instance, content) {
instance.content = content;
content.contentPlaceholder = instance;
-
- if (instance.cache('content', content) || content.shouldUpdate)
- instance.markShouldUpdate(context);
}
render(context, instance, key) {
@@ -55,3 +54,27 @@ ContentPlaceholder.prototype.name = 'body';
ContentPlaceholder.prototype.scoped = false;
Widget.alias('content-placeholder', ContentPlaceholder);
+
+export class ContentPlaceholderScope extends PureContainer {
+ init() {
+ super.init();
+
+ if (isString(this.name))
+ this.name = [this.name];
+ }
+
+ explore(context, instance) {
+ this.name.forEach(name => {
+ context.pushNamedValue('contentPlaceholder', name, null);
+ context.pushNamedValue('content', name, null);
+ });
+ super.explore(context, instance);
+ }
+
+ exploreCleanup(context, instance) {
+ this.name.forEach(name => {
+ context.popNamedValue('contentPlaceholder', name);
+ context.popNamedValue('content', name);
+ });
+ }
+}
\ No newline at end of file
| 0 |
diff --git a/server/game/cards/index.js b/server/game/cards/index.js @@ -11,12 +11,6 @@ const events = require('./events');
var cards = {};
-_.each(fs.readdirSync(path.join(__dirname, 'agendas')), file => {
- var card = require('./agendas/' + file);
-
- cards[card.code] = card;
-});
-
cards = _.extend(cards, strongholds, provinces, holdings, characters, attachments, events);
module.exports = cards;
| 2 |
diff --git a/src/sdk/conference/conference.js b/src/sdk/conference/conference.js };
stream.channel.addStream(stream.mediaStream);
stream.channel.createOffer(false);
+ }, (err) => {
+ safeCall(onFailure, err);
});
} else {
return safeCall(onFailure, 'already published');
| 9 |
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js @@ -52,7 +52,7 @@ Onyx.connect({
let myPersonalDetails;
Onyx.connect({
key: ONYXKEYS.PERSONAL_DETAILS,
- callback: val => myPersonalDetails = _.findWhere(val, {isCurrentUser: true});
+ callback: val => myPersonalDetails = _.findWhere(val, {isCurrentUser: true}),
});
const allReports = {};
| 14 |
diff --git a/contributors.json b/contributors.json "linkedin": "https://www.linkedin.com/in/leonardo-alvarenga-035a52104/",
"name": "Leonardo Alvarenga"
},
+ "mohammadanang": {
+ "country": "Indonesia",
+ "name": "Mohammad Anang",
+ "linkedin": "https://www.linkedin.com/in/anangm182",
+ "twitter": "https://twitter.com/anangm182"
+ },
"nisargpawade": {
"country": "India",
"name": "Nisarg Pawade"
"WickedInvi": {
"country": "United Kingdom",
"name": "Deyan Petrov"
- },
- "mohammadanang": {
- "country": "Indonesia",
- "name": "Mohammad Anang",
- "linkedin": "https://www.linkedin.com/in/anangm182",
- "twitter": "https://twitter.com/anangm182"
}
}
| 3 |
diff --git a/camera-manager.js b/camera-manager.js @@ -159,8 +159,10 @@ const cameraManager = {
const f = -cameraOffset.z;
if (f < 0.5) {
return 'firstperson';
- } else {
+ } else if (f < 2) {
return 'thirdperson';
+ } else {
+ return 'isometric';
}
},
getCameraOffset() {
| 0 |
diff --git a/token-metadata/0x047686fB287e7263A23873dEa66b4501015a2226/metadata.json b/token-metadata/0x047686fB287e7263A23873dEa66b4501015a2226/metadata.json "symbol": "CUTE",
"address": "0x047686fB287e7263A23873dEa66b4501015a2226",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/Api.js b/src/Api.js @@ -266,9 +266,11 @@ class Api {
/**
* Enable sourcemap support.
+ *
+ * @param {string} type
*/
- sourceMaps() {
- global.options.sourcemaps = (this.Mix.inProduction ? false : '#inline-source-map');
+ sourceMaps(type = '#inline-source-map') {
+ global.options.sourcemaps = (this.Mix.inProduction ? false : type);
return this;
};
| 11 |
diff --git a/test/session.test.js b/test/session.test.js @@ -40,26 +40,7 @@ const {
const { PROTOCOL_ERROR, SESSION_EXPIRED } = error
-describe('#integration session', () => {
- let driver
- let session
- // eslint-disable-next-line no-unused-vars
- let protocolVersion
-
- beforeEach(async () => {
- driver = neo4j.driver(
- `bolt://${sharedNeo4j.hostname}`,
- sharedNeo4j.authToken
- )
- session = driver.session()
-
- protocolVersion = await sharedNeo4j.cleanupAndGetProtocolVersion(driver)
- })
-
- afterEach(async () => {
- await driver.close()
- })
-
+describe('#unit session', () => {
it('close should return promise', done => {
const connection = new FakeConnection()
const session = newSessionWithConnection(connection)
@@ -114,6 +95,27 @@ describe('#integration session', () => {
done()
})
}, 70000)
+})
+
+describe('#integration session', () => {
+ let driver
+ let session
+ // eslint-disable-next-line no-unused-vars
+ let protocolVersion
+
+ beforeEach(async () => {
+ driver = neo4j.driver(
+ `bolt://${sharedNeo4j.hostname}`,
+ sharedNeo4j.authToken
+ )
+ session = driver.session()
+
+ protocolVersion = await sharedNeo4j.cleanupAndGetProtocolVersion(driver)
+ })
+
+ afterEach(async () => {
+ await driver.close()
+ })
it('should be possible to close driver after closing session with failed tx ', done => {
const driver = neo4j.driver(
@@ -1194,15 +1196,6 @@ describe('#integration session', () => {
.then(() => callback())
}
- function newSessionWithConnection (connection) {
- const connectionProvider = new SingleConnectionProvider(
- Promise.resolve(connection)
- )
- const session = new Session({ mode: READ, connectionProvider })
- session.beginTransaction() // force session to acquire new connection
- return session
- }
-
function idleConnectionCount (driver) {
const connectionProvider = driver._connectionProvider
const address = connectionProvider._address
@@ -1311,3 +1304,12 @@ describe('#integration session', () => {
})
}
})
+
+function newSessionWithConnection (connection) {
+ const connectionProvider = new SingleConnectionProvider(
+ Promise.resolve(connection)
+ )
+ const session = new Session({ mode: READ, connectionProvider })
+ session.beginTransaction() // force session to acquire new connection
+ return session
+}
| 5 |
diff --git a/website/src/docs/dashboard.md b/website/src/docs/dashboard.md @@ -113,11 +113,11 @@ By default, progress in StatusBar is shown as a simple percentage. If you would
Hide the upload button. Use this if you are providing a custom upload button somewhere, and using the `uppy.upload()` API.
-## `hideRetryButton: false`
+### `hideRetryButton: false`
Hide the retry button. Use this if you are providing a custom retry button somewhere, and using the `uppy.retryAll()` or `uppy.retryUpload(fileID)` API.
-## `hidePauseResumeCancelButtons: false`
+### `hidePauseResumeCancelButtons: false`
Hide the cancel or pause/resume buttons (for resumable uploads, via [tus](http://tus.io), for example). Use this if you are providing custom cancel or pause/resume buttons somewhere, and using the `uppy.pauseResume(fileID)`, `uppy.cancelAll()` or `uppy.removeFile(fileID)` API.
@@ -158,7 +158,7 @@ Set to true to automatically close the modal when the user clicks outside of it.
Page scrolling is disabled by default when the Dashboard modal is open, so when you scroll a list of files in Uppy, the website in the background stays still. Set to false to override this behaviour and leave page scrolling intact.
-## `animateOpenClose: true`
+### `animateOpenClose: true`
Add light animations when the modal dialog is opened or closed, for a more satisfying user experience.
| 1 |
diff --git a/src/index.js b/src/index.js @@ -13,7 +13,7 @@ import { HttpLink } from 'apollo-link-http';
const client = new ApolloClient({
link: new HttpLink({
- uri: 'http://localhost:4000/graphql',
+ uri: 'https://platform-api.now.sh/graphql',
}),
cache: new InMemoryCache(),
});
| 4 |
diff --git a/config/initializers/warden.rb b/config/initializers/warden.rb @@ -300,7 +300,7 @@ module Carto::Api::AuthApiAuthentication
@request_api_key = user.api_keys.where(token: token).first
# TODO: remove this block when all api keys are in sync 'auth_api'
- if !@request_api_key && user.api_key == token
+ if !@request_api_key && current_user
@request_api_key = user.api_keys.create_in_memory_master
end
| 11 |
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -28,8 +28,6 @@ articles:
url: /get-started/create-apps/machine-to-machine-apps
- title: Register APIs
url: /get-started/set-up-apis
- - title: Set Up Multiple Environments
- url: /dev-lifecycle/set-up-multiple-environments
- title: Authentication and Authorization
url: /get-started/authentication-and-authorization
- title: Glossary
| 2 |
diff --git a/MidgardTurnTrackerHelper/script.json b/MidgardTurnTrackerHelper/script.json "modifies": {
"msg.playerid": "read",
"msg.content": "read",
- "campaign.turnorder": "read,write",
+ "campaign.turnorder": "read,write"
},
"conflicts": []
}
| 1 |
diff --git a/package.json b/package.json {
"name": "julia-client",
"main": "./lib/julia-client",
- "version": "0.5.11",
+ "version": "0.5.12",
"description": "Julia Evaluation",
"keywords": [],
"repository": "https://github.com/JunoLab/atom-julia-client",
| 6 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js @@ -391,15 +391,15 @@ RED.sidebar.info.outliner = (function() {
if (parent.children.length === 0) {
parent.treeList.addChild(getEmptyItem(parent.id));
}
- if (existingObject.children && (existingObject.children.length > 0)) {
- existingObject.children.forEach(function (nc) {
- if (!nc.empty) {
- var childObject = objects[nc.id];
- nc.parent = parent;
- objects[parent.id].treeList.addChild(childObject);
- }
- });
- }
+ // if (existingObject.children && (existingObject.children.length > 0)) {
+ // existingObject.children.forEach(function (nc) {
+ // if (!nc.empty) {
+ // var childObject = objects[nc.id];
+ // nc.parent = parent;
+ // objects[parent.id].treeList.addChild(childObject);
+ // }
+ // });
+ // }
}
function getGutter(n) {
var span = $("<span>",{class:"red-ui-info-outline-gutter"});
| 2 |
diff --git a/src/deploy/NVA_build/mongo_upgrade.js b/src/deploy/NVA_build/mongo_upgrade.js @@ -257,6 +257,7 @@ function upgrade_system(system) {
});
});
+ let support_account_found = false;
db.accounts.find().forEach(function(account) {
if (account.sync_credentials_cache &&
@@ -285,7 +286,15 @@ function upgrade_system(system) {
}
});
- } else if (account.is_support && String(account.password) !== String(param_bcrypt_secret)) {
+ } else if (account.is_support) {
+ if (support_account_found) {
+ print('\n*** more than one support account exists! deleting');
+ db.accounts.deleteMany({
+ _id: account._id
+ });
+ } else {
+ support_account_found = true;
+ if (String(account.password) !== String(param_bcrypt_secret)) {
print('\n*** updated old support account', param_bcrypt_secret);
db.accounts.update({
_id: account._id
@@ -297,6 +306,8 @@ function upgrade_system(system) {
__v: 1
}
});
+ }
+ }
} else {
db.accounts.update({
_id: account._id
| 2 |
diff --git a/voice-input/voice-input.js b/voice-input/voice-input.js @@ -3,8 +3,10 @@ import {chatManager} from '../chat-manager.js';
import {world} from '../world.js';
import metaversefile from 'metaversefile';
-class VoiceInput {
+class VoiceInput extends EventTarget {
constructor() {
+ super();
+
this.mediaStream = null;
this.speechRecognition = null;
}
@@ -23,9 +25,15 @@ class VoiceInput {
if (wsrtc) {
wsrtc.enableMic(this.mediaStream);
}
+
+ this.dispatchEvent(new MessageEvent('micchange', {
+ data: {
+ enabled: true,
+ }
+ }));
}
disableMic() {
- if (this.micEnabled()) {
+ /* if (this.micEnabled()) */ {
const wsrtc = world.getConnection();
if (wsrtc) {
wsrtc.disableMic();
@@ -36,6 +44,12 @@ class VoiceInput {
const localPlayer = metaversefile.useLocalPlayer();
localPlayer.setMicMediaStream(null);
+
+ this.dispatchEvent(new MessageEvent('micchange', {
+ data: {
+ enabled: false,
+ }
+ }));
}
if (this.speechEnabled()) {
this.disableSpeech();
@@ -98,10 +112,22 @@ class VoiceInput {
localSpeechRecognition.start();
this.speechRecognition = localSpeechRecognition;
+
+ this.dispatchEvent(new MessageEvent('speechchange', {
+ data: {
+ enabled: true,
+ }
+ }));
}
disableSpeech() {
this.speechRecognition.stop();
this.speechRecognition = null;
+
+ this.dispatchEvent(new MessageEvent('speechchange', {
+ data: {
+ enabled: false,
+ }
+ }));
}
toggleSpeech() {
if (this.speechEnabled()) {
| 0 |
diff --git a/OpenRobertaServer/src/test/java/de/fhg/iais/roberta/javaServer/integrationTest/CompilerWorkflowRobotSpecificIT.java b/OpenRobertaServer/src/test/java/de/fhg/iais/roberta/javaServer/integrationTest/CompilerWorkflowRobotSpecificIT.java @@ -62,7 +62,7 @@ public class CompilerWorkflowRobotSpecificIT {
private static final Logger LOG = LoggerFactory.getLogger(CompilerWorkflowRobotSpecificIT.class);
private static final List<String> EMPTY_STRING_LIST = Collections.emptyList();
- private static final boolean CROSSCOMPILER_CALL = false;
+ private static final boolean CROSSCOMPILER_CALL = true;
private static final boolean SHOW_SUCCESS = true;
private static final String ORA_CC_RSC_ENVVAR = ServerProperties.CROSSCOMPILER_RESOURCE_BASE.replace('.', '_');
| 12 |
diff --git a/assets/js/modules/analytics/datastore/setup-flow.test.js b/assets/js/modules/analytics/datastore/setup-flow.test.js @@ -118,9 +118,7 @@ describe( 'modules/analytics setup-flow', () => {
// just for this test create new registry with only this module
const newRegistry = createRegistry();
- [
- modulesAnalytics,
- ].forEach( ( { registerStore } ) => registerStore?.( newRegistry ) );
+ modulesAnalytics.registerStore( newRegistry );
registry = newRegistry;
// Receive empty settings to prevent unexpected fetch by resolver.
| 2 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js @@ -107,8 +107,8 @@ RED.workspaces = (function() {
changed = true;
workspace.info = info;
}
- $("#red-ui-tab-"+(workspace.id.replace(".","-"))).toggleClass('workspace-disabled',workspace.disabled);
- $("#workspace").toggleClass("workspace-disabled",workspace.disabled);
+ $("#red-ui-tab-"+(workspace.id.replace(".","-"))).toggleClass('workspace-disabled',!!workspace.disabled);
+ $("#workspace").toggleClass("workspace-disabled",!!workspace.disabled);
if (changed) {
var historyEvent = {
@@ -254,10 +254,9 @@ RED.workspaces = (function() {
}
activeWorkspace = tab.id;
event.workspace = activeWorkspace;
- // $("#workspace").toggleClass("workspace-disabled",tab.disabled);
RED.events.emit("workspace:change",event);
window.location.hash = 'flow/'+tab.id;
- $("#workspace").toggleClass("workspace-disabled",tab.disabled);
+ $("#workspace").toggleClass("workspace-disabled",!!tab.disabled);
RED.sidebar.config.refresh();
RED.view.focus();
},
| 9 |
diff --git a/lib/determine-basal/determine-basal.js b/lib/determine-basal/determine-basal.js @@ -244,7 +244,8 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
acid = meal_data.mealCOB * ( sens / profile.carb_ratio ) / aci;
console.error("Carb Impact:",ci,"mg/dL per 5m; CI Duration:",round(cid/6,1),"hours");
console.error("Accel. Carb Impact:",aci,"mg/dL per 5m; ACI Duration:",round(acid/6,1),"hours");
- var minPredBG = 999;
+ var minCOBPredBG = 999;
+ var minUAMPredBG = 999;
var maxPredBG = bg;
var eventualPredBG = bg;
var lastIOBpredBG;
@@ -284,9 +285,9 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
aCOBpredBGs.push(aCOBpredBG);
UAMpredBGs.push(UAMpredBG);
// wait 45m before setting minPredBG
- if ( cid && COBpredBGs.length > 9 && (COBpredBG < minPredBG) ) { minPredBG = COBpredBG; }
+ if ( cid && COBpredBGs.length > 9 && (COBpredBG < minCOBPredBG) ) { minCOBPredBG = COBpredBG; }
if ( cid && COBpredBG > maxPredBG ) { maxPredBG = COBpredBG; }
- if ( enableUAM && UAMpredBGs.length > 9 && (UAMpredBG < minPredBG) ) { minPredBG = UAMpredBG; }
+ if ( enableUAM && UAMpredBGs.length > 9 && (UAMpredBG < minUAMPredBG) ) { minUAMPredBG = UAMpredBG; }
if ( enableUAM && UAMpredBG > maxPredBG ) { maxPredBG = UAMpredBG; }
//console.error(minPredBG,COBpredBG,UAMpredBG);
});
@@ -344,8 +345,11 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
// set eventualBG and snoozeBG based on COB or UAM predBGs
rT.eventualBG = eventualBG;
//console.error(snoozeBG,minPredBG);
+ // use the higher of minCOBPredBG or minUAMPredBG
+ minPredBG = Math.max(minCOBPredBG, minUAMPredBG);
+ // but use eventualBG if it's lower than minPredBG
minPredBG = Math.min(minPredBG, eventualBG);
- // set snoozeBG to minPredBG
+ // set snoozeBG to minPredBG if it's higher
snoozeBG = round(Math.max(snoozeBG,minPredBG));
rT.snoozeBG = snoozeBG;
}
@@ -524,6 +528,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
} else { // otherwise, calculate 30m high-temp required to get projected BG down to target
// insulinReq is the additional insulin required to get minPredBG down to target_bg
+ console.error(minPredBG,snoozeBG,eventualBG);
var insulinReq = round( (Math.min(minPredBG,snoozeBG,eventualBG) - target_bg) / sens, 2);
// when dropping, but not as fast as expected, reduce insulinReq proportionally
// to the what fraction of expectedDelta we're dropping at
| 4 |
diff --git a/package.json b/package.json "name": "find-and-replace",
"main": "./lib/find",
"description": "Find and replace within buffers and across the project.",
- "version": "0.209.5",
+ "version": "0.210.0",
"license": "MIT",
"activationCommands": {
"atom-workspace": [
| 6 |
diff --git a/client/src/containers/AssetInfo/view.jsx b/client/src/containers/AssetInfo/view.jsx @@ -27,6 +27,7 @@ class AssetInfo extends React.Component {
shortId: channelShortId,
};
channelCanonicalUrl = `${createCanonicalLink({channel})}`;
+ console.log(channelName)
}
return (
<div className='asset-info'>
@@ -120,7 +121,7 @@ class AssetInfo extends React.Component {
}
content={
<ClickToCopy
- id={'short-link'}
+ id={'lbry-permanent-url'}
value={`${channelName}#${certificateId}/${name}`}
/>
}
| 1 |
diff --git a/src/components/Modeler.vue b/src/components/Modeler.vue @@ -65,7 +65,6 @@ import controls from './controls';
import { highlightPadding } from '@/mixins/crownConfig';
import uniqueId from 'lodash/uniqueId';
import pull from 'lodash/pull';
-import debounce from 'lodash/debounce';
import { startEvent } from '@/components/nodes';
import store from '@/store';
import InspectorPanel from '@/components/inspectors/InspectorPanel';
@@ -585,8 +584,6 @@ export default {
},
},
created() {
- this.loadXML = debounce(this.loadXML.bind(this), 0, { leading: false });
-
/* Initialize the BpmnModdle and its extensions */
window.ProcessMaker.EventBus.$emit('modeler-init', {
registerInspectorExtension: this.registerInspectorExtension,
| 2 |
diff --git a/README.md b/README.md @@ -27,7 +27,7 @@ The login is so simple. You only need to create a google client id and configure
## The rooms Inside of #matrix
-The inside of #matrix there are some rooms. In this rooms is possible to see others colleagues and if they are talking or in a meeting in the avatar will apear a head set icon. (eg. In the image the guys in the Platform-Email romm are in a meeting)
+The inside of #matrix there are some rooms. In this rooms is possible to see others colleagues and if they are talking or in a meeting in the avatar will appear a head set icon. (eg. In the image the guys in the Platform-Email room are in a meeting)
| Office Page | With Sidebar |
| :--------------------------------------------------------------------: | :----------------------------------------------------------------------------------: |
@@ -35,7 +35,7 @@ The inside of #matrix there are some rooms. In this rooms is possible to see oth
## The meeting room
-You can only enter in a room to show for the other that you are avaliable there through the `ENTER ROOM` button or enter in a meeting through the button `ENTER MEETING`.
+You can only enter in a room to show for the other that you are available there through the `ENTER ROOM` button or enter in a meeting through the button `ENTER MEETING`.
| Meeting Room | With Sidebar |
| :------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------: |
@@ -47,11 +47,11 @@ If you want run the Matrix, you need follow steps:
1. We are using Google to authorizations, you need create a credential [here](/docs/GOOGLE-CREDENTIAL-STEP-BY-STEP.md) you can follow step by step
-2. Run appplication with docker compose:
+2. Run application with docker compose:
$ docker-compose up
-3. Open your brownser and access:
+3. Open your browser and access:
http://localhost:8080/
| 1 |
diff --git a/includes/Modules/Tag_Manager.php b/includes/Modules/Tag_Manager.php @@ -569,7 +569,7 @@ final class Tag_Manager extends Module implements Module_With_Scopes, Module_Wit
* @param string $account_id The account ID.
* @param string|array $usage_context The container usage context(s).
*
- * @return mixed Container ID on success, or WP_Error on failure.
+ * @return string Container public ID.
*/
protected function create_container( $account_id, $usage_context = self::USAGE_CONTEXT_WEB ) {
$restore_defer = $this->with_client_defer( false );
@@ -582,22 +582,11 @@ final class Tag_Manager extends Module implements Module_With_Scopes, Module_Wit
$container->setName( $container_name );
$container->setUsageContext( (array) $usage_context );
- try {
- $container = $this->get_tagmanager_service()->accounts_containers->create( "accounts/{$account_id}", $container );
- } catch ( Google_Service_Exception $e ) {
- $restore_defer();
- $message = $e->getErrors();
- if ( isset( $message[0]['message'] ) ) {
- $message = $message[0]['message'];
- }
- return new WP_Error( $e->getCode(), $message );
- } catch ( Exception $e ) {
- $restore_defer();
- return new WP_Error( $e->getCode(), $e->getMessage() );
- }
+ $new_container = $this->get_tagmanager_service()->accounts_containers->create( "accounts/{$account_id}", $container );
$restore_defer();
- return $container->getPublicId();
+
+ return $new_container->getPublicId();
}
/**
| 2 |
diff --git a/aura-impl/src/main/java/test/org/auraframework/impl/adapter/ConfigAdapterImpl.java b/aura-impl/src/main/java/test/org/auraframework/impl/adapter/ConfigAdapterImpl.java @@ -175,7 +175,7 @@ public class ConfigAdapterImpl implements ConfigAdapter {
private InstanceService instanceService;
@Inject
- private ContextService contextService;
+ protected ContextService contextService;
@Inject
private FileMonitor fileMonitor;
| 11 |
diff --git a/userscript.user.js b/userscript.user.js @@ -37494,13 +37494,28 @@ var $$IMU_EXPORT$$;
});
};
- if (options.element.parentElement && options.element.parentElement.classList.contains("b-avatar")) {
- var link = options.element.parentElement.parentElement;
- if (link.tagName === "A") {
- var match = link.href.match(/^https?:\/\/[^/]+\/+([^/]+)\/*(?:[?#].*)?$/);
+ var get_avatar_from_a = function(el, cb) {
+ var match = el.href.match(/^https?:\/\/[^/]+\/+([^/]+)\/*(?:[?#].*)?$/);
if (match) {
- get_avatar(match[1], options.cb);
+ get_avatar(match[1], cb);
+ return true;
+ }
+
+ return false;
+ };
+ if (options.element.parentElement && options.element.parentElement.classList.contains("b-avatar")) {
+ var dparent = options.element.parentElement.parentElement;
+ if (dparent.tagName === "A") {
+ if (get_avatar_from_a(dparent, options.cb)) {
+ return {
+ waiting: true
+ };
+ }
+ } else if (dparent.tagName === "DIV" && dparent.classList.contains("b-profile__user")) {
+ // avatar at the top of a user's profile
+ var link = dparent.querySelector("a.g-user-realname__wrapper");
+ if (link && get_avatar_from_a(link, options.cb)) {
return {
waiting: true
};
| 7 |
diff --git a/src/components/common/dialogs/CustomDialog.js b/src/components/common/dialogs/CustomDialog.js @@ -106,27 +106,7 @@ const CustomDialog = ({
{showButtons ? (
<View style={buttonsContainerStyle || styles.buttonsContainer}>
{buttons ? (
- buttons.map(
- ({ onPress = dismiss => dismiss(), style, disabled, mode, Component, ...buttonProps }, index) => {
- if (mode === 'custom') {
- return <Component />
- }
-
- return (
- <CustomButton
- {...buttonProps}
- mode={mode}
- onPress={() => onPress(onDismiss)}
- style={[{ marginLeft: 10 }, style]}
- disabled={disabled || loading}
- loading={loading}
- key={index}
- >
- {buttonProps.text}
- </CustomButton>
- )
- },
- )
+ buttons.map((options, index) => <DialogButton key={index} options={options} loading={loading} />)
) : (
<CustomButton disabled={loading} loading={loading} onPress={_onPressOk} style={[styles.buttonOK]}>
Ok
@@ -165,6 +145,36 @@ const SimpleStoreDialog = () => {
)
}
+const DialogButton = ({ options = {}, loading, dismiss }) => {
+ const { onPress, style, disabled, mode, Component, ...buttonProps } = options
+
+ const pressHandler = useOnPress(() => {
+ if (onPress) {
+ onPress(dismiss)
+ return
+ }
+
+ dismiss()
+ }, [dismiss, onPress])
+
+ if (mode === 'custom') {
+ return <Component />
+ }
+
+ return (
+ <CustomButton
+ {...buttonProps}
+ mode={mode}
+ onPress={pressHandler}
+ style={[{ marginLeft: 10 }, style]}
+ disabled={disabled || loading}
+ loading={loading}
+ >
+ {buttonProps.text}
+ </CustomButton>
+ )
+}
+
const styles = StyleSheet.create({
title: {
marginBottom: theme.sizes.defaultDouble,
| 0 |
diff --git a/src/structs/ClientManager.js b/src/structs/ClientManager.js @@ -50,7 +50,8 @@ class ClientManager extends EventEmitter {
this.handleNewArticle(article)
})
this.shardingManager = new Discord.ShardingManager(path.join(__dirname, '..', '..', 'shard.js'), {
- respawn: false
+ respawn: false,
+ token: this.config.bot.token
})
this.shardingManager.on('shardCreate', shard => {
shard.on('message', message => this.messageHandler(shard, message))
@@ -140,10 +141,8 @@ class ClientManager extends EventEmitter {
}
}
- async start (shardCount = 1) {
- if (!shardCount) {
- shardCount = this.config.advanced.shards
- }
+ async start () {
+ const shardCount = this.config.advanced.shards
try {
if (Supporter.isMongoDatabase) {
this.mongo = await this.connectToDatabase()
@@ -152,9 +151,10 @@ class ClientManager extends EventEmitter {
await initialize.populateKeyValues()
const schedules = await initialize.populateSchedules(this.customSchedules)
this.scheduleManager.addSchedules(schedules)
- this.shardingManager.spawn(shardCount, 5500, -1)
+ this.shardingManager.spawn(shardCount || undefined)
} catch (err) {
this.log.error(err, `ClientManager failed to start`)
+ process.exit(1)
}
}
| 11 |
diff --git a/src/components/SettingsWindow.jsx b/src/components/SettingsWindow.jsx @@ -761,7 +761,7 @@ export default class SettingsWindow extends PureComponent {
<br />Order: <b>{(monitor.order ? monitor.order : "0")}</b>
<br />Key: <b>{monitor.key}</b>
<br />ID: <b>{"\\\\?\\" + monitor.id}</b>
- <br />Serial Number: <b>{monitor.serial}</b></p>
+ <br />Connection Type: <b>{monitor.connector}</b></p>
</div>
)
| 14 |
diff --git a/test/tests-misc.js b/test/tests-misc.js @@ -318,12 +318,12 @@ asyncTest ("#1079 mapToClass", function(){
});
-asyncTest("#??? ", async ()=>{
+asyncTest("PR #1108", async ()=>{
const origConsoleWarn = console.warn;
const warnings = [];
console.warn = function(msg){warnings.push(msg); return origConsoleWarn.apply(this, arguments)};
try {
- const DBNAME = "IssueXXX";
+ const DBNAME = "PR1108";
let db = new Dexie(DBNAME);
db.version(1).stores({
foo: "id"
| 10 |
diff --git a/articles/libraries/lock/v11/migration-guide.md b/articles/libraries/lock/v11/migration-guide.md @@ -52,5 +52,5 @@ If Lock takes a lot of time to display the login options, it could be because th
To verify that this is a problem check your logs at [Dadhboard > Logs](${manage_url}/#/logs). If you see an entry with the following error description, set the [Allowed Web Origins](/libraries/lock/v11/migration-v10-v11#configure-auth0-for-embedded-login) property and try again.
```text
-The specified redirect_uri 'https://lock.userpools.com' does not have a registered domain.
+The specified redirect_uri 'https://YOUR_APP_URL' does not have a registered domain.
```
| 12 |
diff --git a/app/models/label/LabelValidationTable.scala b/app/models/label/LabelValidationTable.scala @@ -130,11 +130,11 @@ object LabelValidationTable {
val oldValidation: Option[LabelValidation] =
validationLabels.filter(x => x.labelId === label.labelId && x.userId === label.userId).firstOption
- val (userThatAppliedLabel, excludedUser): (String, Boolean) =
+ val excludedUser: Boolean = UserStatTable.userStats.filter(_.userId === label.userId).map(_.excludeManual).first
+ val userThatAppliedLabel: String =
labels.filter(_.labelId === label.labelId)
.innerJoin(MissionTable.missions).on(_.missionId === _.missionId)
- .innerJoin(UserStatTable.userStats).on(_._2.userId === _.userId)
- .map(x => (x._2.userId, x._2.excludeManual))
+ .map(_._2.userId)
.list.head
// If there was already a validation, update all the columns that might have changed. O/w just make a new entry.
| 1 |
diff --git a/app/components/Migration/CreateLedgerMigrationWallet/CreateLedgerMigrationWallet.jsx b/app/components/Migration/CreateLedgerMigrationWallet/CreateLedgerMigrationWallet.jsx @@ -31,7 +31,7 @@ export default class CreateMigrationWallet extends React.Component<
<a
onClick={() => {
electron.shell.openExternal(
- 'https://support.ledger.com/hc/en-us/articles/4404382258961-Install-uninstall-and-update-apps?docs=true',
+ 'https://medium.com/proof-of-working/ledger-migration-instructions-44b3b7c410e0',
)
}}
>
| 3 |
diff --git a/packages/component-library/src/CivicCard/cardMetaTypes.js b/packages/component-library/src/CivicCard/cardMetaTypes.js import PropTypes from "prop-types";
-import { getKeyNames } from "../../stories/shared";
const cardMetaObjectProperties = {
title: PropTypes.string,
@@ -36,6 +35,14 @@ export const optionalCardMetaKeys = {
selector: true
};
+const getKeyNames = obj => {
+ const keyNames = {};
+ Object.keys(obj).forEach(key => {
+ keyNames[key] = key;
+ });
+ return keyNames;
+};
+
export const cardMetaKeys = getKeyNames(cardMetaObjectProperties);
const cardMetaTypes = PropTypes.shape(cardMetaObjectProperties);
| 2 |
diff --git a/app/views/turkerIdExists.scala.html b/app/views/turkerIdExists.scala.html <div class="container">
<h2>This HIT cannot be started</h2>
<p>
- A potential reason for this is that you already have an existing account on our website.
- If not please contact us at ...
+ The reason is that you have already created an account on our website using your
+ worker id. If you'd like to work on this HIT, please contact us at
+ <a href="mailto:sidewalk@@umiacs.umd.edu">sidewalk@@umiacs.umd.edu</a>. Alternatively, you could continue
+ using your account on our website: <a href='@routes.AuditController.audit()'>projectsidewalk.io</a> and
+ keep mapping! :)
</p>
</div>
</div>
| 3 |
diff --git a/docs/transports.md b/docs/transports.md @@ -51,6 +51,7 @@ there are additional transports written by
* [Pusher](#pusher-transport)
* [SimpleDB](#simpledb-transport)
* [Slack](#slack-transport)
+ * [SQLite3](#sqlite3-transport)
* [SSE with KOA 2](#sse-transport-with-koa-2)
* [Sumo Logic](#sumo-logic-transport)
* [Winlog2 Transport](#winlog2-transport)
@@ -693,6 +694,22 @@ This transport takes the following options:
* __unfurlMedia__ - Enables or disables [media unfurling.](https://api.slack.com/docs/message-link-unfurling) (Default: false)
* __mrkdwn__ - Enables or disables [`mrkdwn` formatting](https://api.slack.com/messaging/composing/formatting#basics) within attachments or layout blocks (Default: false)
+### SQLite3 Transport
+
+The [winston-better-sqlite3][40] transport uses [better-sqlite3](https://github.com/JoshuaWise/better-sqlite3).
+
+```js
+const wbs = require('winston-better-sqlite3');
+logger.add(new wbs({
+
+ // path to the sqlite3 database file on the disk
+ db: '<name of sqlite3 database file>',
+
+ // A list of params to log
+ params: ['level', 'message']
+});
+```
+
### Sumo Logic Transport
[winston-sumologic-transport][32] is a transport for Sumo Logic
@@ -864,3 +881,4 @@ That's why we say it's a logger for just about everything
[37]: https://github.com/logdna/logdna-winston
[38]: https://github.com/itsfadnis/datadog-winston
[39]: https://github.com/TheAppleFreak/winston-slack-webhook-transport
+[40]: https://github.com/punkish/winston-better-sqlite3
| 3 |
diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc @@ -1244,7 +1244,7 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList
vm->get_requirements(cpu, mem, disk, pci);
- if ((pci.size() > 0) && !poffmgr)
+ if ((pci.size() > 0) && (!poffmgr && vm->get_state() != VirtualMachine::POWEROFF))
{
ostringstream oss;
| 11 |
diff --git a/site/tutorials/tutorial-one-python.md b/site/tutorials/tutorial-one-python.md @@ -96,14 +96,14 @@ machine we'd simply specify its name or IP address here.
Next, before sending we need to make sure the recipient queue
exists. If we send a message to non-existing location, RabbitMQ will
-just trash the message. Let's create a queue to which the message will
-be delivered, let's name it _hello_:
+just drop the message. Let's create a _hello_ queue to which the message will
+be delivered:
<pre class="sourcecode python">
channel.queue_declare(queue='hello')
</pre>
-At that point we're ready to send a message. Our first message will
+At this point we're ready to send a message. Our first message will
just contain a string _Hello World!_ and we want to send it to our
_hello_ queue.
| 7 |
diff --git a/src/plugins/Dashboard/index.js b/src/plugins/Dashboard/index.js @@ -75,6 +75,7 @@ module.exports = class Dashboard extends Plugin {
defaultTabIcon: defaultTabIcon,
showProgressDetails: false,
hideUploadButton: false,
+ hideProgressAfterFinish: false,
note: null,
closeModalOnClickOutside: false,
locale: defaultLocale,
@@ -497,7 +498,8 @@ module.exports = class Dashboard extends Plugin {
if (!this.opts.disableStatusBar) {
this.uppy.use(StatusBar, {
target: this,
- hideUploadButton: this.opts.hideUploadButton
+ hideUploadButton: this.opts.hideUploadButton,
+ hideAfterFinish: this.opts.hideProgressAfterFinish
})
}
| 0 |
diff --git a/core/api-server/api/graphql/queries/dataSource-querier.js b/core/api-server/api/graphql/queries/dataSource-querier.js @@ -44,12 +44,17 @@ class DataSourceQuerier {
}
async _getRequest(url, options) {
+ let allowedFailures = 3;
+ while (allowedFailures > 0) {
try {
+ // eslint-disable-next-line no-await-in-loop
const { data } = await axios.get(url, { params: options });
return data;
}
catch (error) {
- log.error(error.message, { component });
+ allowedFailures -= 1;
+ log.info(error.message, { component });
+ }
}
return null;
}
| 11 |
diff --git a/source/core/String.js b/source/core/String.js @@ -2,6 +2,56 @@ const splitter =
/%(\+)?(?:'(.))?(-)?(\d+)?(?:\.(\d+))?(?:\$(\d+))?([%sn@])/g;
Object.assign( String.prototype, {
+ /**
+ Method: String#runeAt
+
+ Like charAt, but if the index points to an octet that is part of a
+ surrogate pair, the whole pair is returned (as a string).
+
+ Parameters:
+ index - {Number} The index (in bytes) into the string
+
+ Returns:
+ {String} The rune at this index.
+ */
+ runeAt ( index ) {
+ let code = this.charCodeAt( index );
+
+ // Outside bounds
+ if ( Number.isNaN( code ) ) {
+ return ''; // Position not found
+ }
+
+ // Normal char
+ if ( code < 0xD800 || code > 0xDFFF ) {
+ return this.charAt( index );
+ }
+
+ // High surrogate (could change last hex to 0xDB7F to treat high
+ // private surrogates as single characters)
+ if ( 0xD800 <= code && code <= 0xDBFF ) {
+ if ( this.length <= ( index + 1 ) ) {
+ // High surrogate without following low surrogate
+ return '';
+ }
+ // Low surrogate (0xDC00 <= code && code <= 0xDFFF)
+ } else {
+ if ( index === 0 ) {
+ // Low surrogate without preceding high surrogate
+ return '';
+ }
+ index -= 1;
+ }
+
+ code = this.charCodeAt( index + 1 );
+ if ( 0xDC00 > code || code > 0xDFFF ) {
+ // Not a valid surrogate pair
+ return '';
+ }
+
+ return this.charAt( index ) + this.charAt( index + 1 );
+ },
+
/**
Method: String#format
| 0 |
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js @@ -38,13 +38,12 @@ module.exports = {
}
const errorMessage = [
- 'Rest API could not be resolved. ',
- 'This might be casued by a custom API Gateway setup. ',
- 'With you current setup stage specific configurations such as ',
- '`tracing`, `logs` and `tags` are not supported',
- '',
- 'Please update your configuration or open up an issue if you feel ',
- 'that there\'s a way to support your setup.',
+ 'Rest API id could not be resolved.\n',
+ 'This might be caused by a custom API Gateway configuration.\n\n',
+ 'In given setup stage specific options such as ',
+ '`tracing`, `logs` and `tags` are not supported.\n\n',
+ 'Please update your configuration (or open up an issue if you feel ',
+ 'that there\'s a way to support your setup).',
].join('');
throw new Error(errorMessage);
| 7 |
diff --git a/token-metadata/0x035bfe6057E15Ea692c0DfdcaB3BB41a64Dd2aD4/metadata.json b/token-metadata/0x035bfe6057E15Ea692c0DfdcaB3BB41a64Dd2aD4/metadata.json "symbol": "ULU",
"address": "0x035bfe6057E15Ea692c0DfdcaB3BB41a64Dd2aD4",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/ReduceClutter.user.js b/ReduceClutter.user.js // @description Revert recent changes that makes the page more cluttered
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.7
+// @version 1.8
//
// @include https://*stackoverflow.com/*
// @include https://*serverfault.com/*
@@ -69,6 +69,14 @@ ul.comments-list .comment-up-on {
color: inherit !important;
}
+/*
+ Remove Products menu in the top bar
+ https://meta.stackoverflow.com/q/386393
+*/
+.top-bar .-marketing-link {
+ display: none !important;
+}
+
`);
| 2 |
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb @@ -32,7 +32,7 @@ class Users::RegistrationsController < Devise::RegistrationsController
# If for some reason a user is already signed in, don't allow them to make
# another user
- if current_user
+ if current_user && current_user.id != Devise::Strategies::ApplicationJsonWebToken::ANONYMOUS_USER_ID
errors ||= []
errors << I18n.t( :user_already_authenticated )
end
| 11 |
diff --git a/lib/Stats.js b/lib/Stats.js @@ -8,7 +8,7 @@ const RequestShortener = require("./RequestShortener");
const SizeFormatHelpers = require("./SizeFormatHelpers");
const formatLocation = require("./formatLocation");
-const d = (v, def) => v === undefined ? def : v;
+const optionOrFallback = (optionValue, fallbackValue) => optionValue !== undefined ? optionValue : fallbackValue;
class Stats {
constructor(compilation) {
@@ -39,37 +39,37 @@ class Stats {
}
const compilation = this.compilation;
- const requestShortener = new RequestShortener(d(options.context, process.cwd()));
- const showPerformance = d(options.performance, true);
- const showHash = d(options.hash, true);
- const showVersion = d(options.version, true);
- const showTimings = d(options.timings, true);
- const showAssets = d(options.assets, true);
- const showEntrypoints = d(options.entrypoints, !forToString);
- const showChunks = d(options.chunks, true);
- const showChunkModules = d(options.chunkModules, !!forToString);
- const showChunkOrigins = d(options.chunkOrigins, !forToString);
- const showModules = d(options.modules, !forToString);
- const showDepth = d(options.depth, !forToString);
- const showCachedModules = d(options.cached, true);
- const showCachedAssets = d(options.cachedAssets, true);
- const showReasons = d(options.reasons, !forToString);
- const showUsedExports = d(options.usedExports, !forToString);
- const showProvidedExports = d(options.providedExports, !forToString);
- const showChildren = d(options.children, true);
- const showSource = d(options.source, !forToString);
- const showErrors = d(options.errors, true);
- const showErrorDetails = d(options.errorDetails, !forToString);
- const showWarnings = d(options.warnings, true);
- const showPublicPath = d(options.publicPath, !forToString);
- const excludeModules = [].concat(d(options.exclude, [])).map(str => {
+ const requestShortener = new RequestShortener(optionOrFallback(options.context, process.cwd()));
+ const showPerformance = optionOrFallback(options.performance, true);
+ const showHash = optionOrFallback(options.hash, true);
+ const showVersion = optionOrFallback(options.version, true);
+ const showTimings = optionOrFallback(options.timings, true);
+ const showAssets = optionOrFallback(options.assets, true);
+ const showEntrypoints = optionOrFallback(options.entrypoints, !forToString);
+ const showChunks = optionOrFallback(options.chunks, true);
+ const showChunkModules = optionOrFallback(options.chunkModules, !!forToString);
+ const showChunkOrigins = optionOrFallback(options.chunkOrigins, !forToString);
+ const showModules = optionOrFallback(options.modules, !forToString);
+ const showDepth = optionOrFallback(options.depth, !forToString);
+ const showCachedModules = optionOrFallback(options.cached, true);
+ const showCachedAssets = optionOrFallback(options.cachedAssets, true);
+ const showReasons = optionOrFallback(options.reasons, !forToString);
+ const showUsedExports = optionOrFallback(options.usedExports, !forToString);
+ const showProvidedExports = optionOrFallback(options.providedExports, !forToString);
+ const showChildren = optionOrFallback(options.children, true);
+ const showSource = optionOrFallback(options.source, !forToString);
+ const showErrors = optionOrFallback(options.errors, true);
+ const showErrorDetails = optionOrFallback(options.errorDetails, !forToString);
+ const showWarnings = optionOrFallback(options.warnings, true);
+ const showPublicPath = optionOrFallback(options.publicPath, !forToString);
+ const excludeModules = [].concat(optionOrFallback(options.exclude, [])).map(str => {
if(typeof str !== "string") return str;
return new RegExp(`[\\\\/]${str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&")}([\\\\/]|$|!|\\?)`);
});
- const maxModules = d(options.maxModules, forToString ? 15 : Infinity);
- const sortModules = d(options.modulesSort, "id");
- const sortChunks = d(options.chunksSort, "id");
- const sortAssets = d(options.assetsSort, "");
+ const maxModules = optionOrFallback(options.maxModules, forToString ? 15 : Infinity);
+ const sortModules = optionOrFallback(options.modulesSort, "id");
+ const sortChunks = optionOrFallback(options.chunksSort, "id");
+ const sortAssets = optionOrFallback(options.assetsSort, "");
const createModuleFilter = () => {
let i = 0;
@@ -344,7 +344,7 @@ class Stats {
options = {};
}
- const useColors = d(options.colors, false);
+ const useColors = optionOrFallback(options.colors, false);
const obj = this.toJson(options, true);
| 10 |
diff --git a/src/constants/leaderboards.js b/src/constants/leaderboards.js @@ -38,7 +38,7 @@ module.exports = {
const options = Object.assign({}, defaultOptions);
- options['name'] = helper.titleCase(lbName);
+ options['name'] = helper.titleCase(lbName.split("_").join(" "));
if(overrides.hasOwnProperty(lbName))
for(const key in overrides[lbName])
| 14 |
diff --git a/src/utils/commonfunctions.js b/src/utils/commonfunctions.js @@ -34,7 +34,7 @@ export const formatDate = (unformattedDate, formatString) => {
typeof unformattedDate === 'string' &&
unformattedDate.match(/^\d{4}-([0]\d|1[0-2])-([0-2]\d|3[01])$/g)
)
- unformattedDate += 'T00:00:00+0530';
+ unformattedDate += 'T00:00:00+05:30';
const date = utcToZonedTime(new Date(unformattedDate), 'Asia/Kolkata');
return format(date, formatString, {
locale: LOCALE_SHORTHANDS[i18n.language],
| 1 |
diff --git a/package.json b/package.json "name": "redux-form",
"version": "8.0.1",
"description": "A higher order component decorator for forms using Redux and React",
- "main": "./index.js",
+ "main": "./lib/index.js",
"module": "./es/index.js",
"modules.root": "./es",
"jsnext:main": "./es/index.js",
"scripts": {
"analyze": "webpack src/index.js dist/redux-form.js -p --bail --profile --json > stats.json && webpack-bundle-analyzer stats.json",
"build": "npm run clean && npm run build:lib && npm run build:es && npm run build:umd && npm run build:umd:min && npm run build:flow",
- "build:lib": "babel src --out-dir . --ignore __tests__",
+ "build:lib": "babel src --out-dir lib --ignore __tests__",
"build:es": "cross-env BABEL_ENV=es babel src --out-dir es --ignore __tests__",
- "build:flow": "cp src/*.js.flow . && cp src/selectors/*.js.flow selectors && cp src/*.js.flow es && cp src/selectors/*.js.flow es/selectors",
+ "build:flow": "cp src/*.js.flow lib && cp src/selectors/*.js.flow lib/selectors && cp src/*.js.flow es && cp src/selectors/*.js.flow es/selectors",
"build:umd": "cross-env NODE_ENV=development webpack src/index.js -o dist/redux-form.js",
"build:umd:min": "cross-env NODE_ENV=production webpack src/index.js -o dist/redux-form.min.js",
"clean": "rimraf $(cd src; ls) dist lib es",
| 1 |
diff --git a/rocket/bot.js b/rocket/bot.js -import { driver, api } from "@rocket.chat/sdk";
+import { driver } from "@rocket.chat/sdk";
import interactionController from "../controllers/interaction";
// import fs from "fs";
// import path from "path";
// import mime from "mime-types";
-
// const emojiDir = './emoji';
var myuserid;
@@ -23,17 +22,27 @@ const runBot = async () => {
};
const processMessages = async (err, message, messageOptions) => {
- const re = /!importemoji/g;
+ // const re = /!importemoji/g;
+ const ranking = /!ranking/g;
if (!err) {
message.origin = "rocket";
- console.log(message, messageOptions);
- // const url_user = `users.info`;
- // const user_info = await api.post(url_user, { userId: message.u._id });
- //
+ console.log("MESSAGE: ", message, messageOptions);
if (message.u._id === myuserid) return;
interactionController.save(message);
- if (re.test(message.msg)) {
- console.log("sending ranking to user?");
+
+ if (ranking.test(message.msg)) {
+ await driver.sendDirectToUser(
+ "Em breve enviar o ranking",
+ message.u.username
+ );
+ }
+ } else {
+ console.log(err, messageOptions);
+ }
+};
+
+runBot();
+
/*
const files = fs.readdirSync(emojiDir);
@@ -65,16 +74,3 @@ const processMessages = async (err, message, messageOptions) => {
}
}
*/
- }
- // const romname = await driver.getRoomName(message.rid);
- // await driver.sendToRoom("criou emoji?", romname);
- } else {
- console.log(err, messageOptions);
- }
-};
-
-export const sendToUser = async (message, user) => {
- await driver.sendDirectToUser(message, user);
-}
-
-runBot();
| 3 |
diff --git a/src/actions/general.js b/src/actions/general.js @@ -94,6 +94,8 @@ export function setServerVersion(serverVersion) {
export function setStoreFromLocalData(data) {
return async (dispatch, getState) => {
+ Client.setToken(data.token);
+ Client.setUrl(data.url);
Client4.setToken(data.token);
Client4.setUrl(data.url);
| 12 |
diff --git a/src/encoded/audit/experiment.py b/src/encoded/audit/experiment.py @@ -836,7 +836,7 @@ def check_experiment_dnase_seq_standards(experiment,
"ENCODE processed hotspots files {} ".format(file_names_string) + \
"produced by {} ".format(pipelines[0]['title']) + \
"( {} ) ".format(pipelines[0]['@id']) + \
- assemblies_detail(get_assemblies(hotspot_assemblies, file_names)) + \
+ assemblies_detail(extract_assemblies(hotspot_assemblies, file_names)) + \
"have a SPOT score of {0:.2f}. ".format(metric["SPOT score"]) + \
"According to ENCODE standards, " + \
"SPOT score of 0.4 or higher is considered a product of high quality " + \
@@ -877,7 +877,7 @@ def check_experiment_dnase_seq_standards(experiment,
'ENCODE processed signal files {} '.format(file_names_string) + \
'produced by {} '.format(pipelines[0]['title']) + \
'( {} ) '.format(pipelines[0]['@id']) + \
- assemblies_detail(get_assemblies(signal_assemblies, file_names)) + \
+ assemblies_detail(extract_assemblies(signal_assemblies, file_names)) + \
'have a Pearson correlation of {0:.2f}. '.format(metric['Pearson correlation']) + \
'According to ENCODE standards, in an {} '.format(experiment['replication_type']) + \
'assay a Pearson correlation value > {} '.format(threshold) + \
@@ -889,6 +889,14 @@ def check_experiment_dnase_seq_standards(experiment,
detail, level='NOT_COMPLIANT')
+def extract_assemblies(assemblies, file_names):
+ to_return = set()
+ for f_name in file_names:
+ if f_name in assemblies:
+ to_return.add(assemblies[f_name])
+ return sorted(list(to_return))
+
+
def assemblies_detail(assemblies):
assemblies_detail = ''
if assemblies:
| 1 |
diff --git a/src/template.njk b/src/template.njk {% from "./components/skip-link/macro.njk" import govukSkipLink %}
{% from "./components/header/macro.njk" import govukHeader %}
{% from "./components/footer/macro.njk" import govukFooter %}
+{# specify absolute url for the static assets folder e.g. http://wwww.domain.com/assets #}
+{% set assetUrl = assetUrl | default(assetPath) %}
<!DOCTYPE html>
<html lang="{{ htmlLang | default('en') }}" class="govuk-template {{ htmlClasses }}">
<head>
{% endblock %}
{% block head %}{% endblock %}
-
{# The default og:image is added below head so that scrapers see any custom metatags first, and this is just a fallback #}
- <meta property="og:image" content="{{ assetPath | default('/assets') }}/images/govuk-opengraph-image.png">
+ {# image url needs to be absolute e.g. http://wwww.domain.com/.../govuk-opengraph-image.png #}
+ <meta property="og:image" content="{{ assetUrl | default('/assets') }}/images/govuk-opengraph-image.png">
</head>
<body class="govuk-template__body {{ bodyClasses }}">
<script>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
| 11 |
diff --git a/resources/functions/handler.js b/resources/functions/handler.js @@ -327,10 +327,6 @@ const handler = {
else if (currentChanges.includes('visual.removeUpsell') || currentChanges.includes('visual.removeAppleLogo') || currentChanges.includes('visual.removeFooter') || currentChanges.includes('visual.useOperatingSystemAccent')) {
app.ame.load.LoadFiles();
}
- // closeButtonMinimize
- else if (currentChanges.includes('window.closeButtonMinimize')) {
- app.isQuiting = !app.preferences.value('window.closeButtonMinimize').includes(true);
- }
// IncognitoMode Changes
else if (currentChanges.includes('general.incognitoMode')) {
if (app.preferences.value('general.incognitoMode').includes(true)) {
| 2 |
diff --git a/network.js b/network.js @@ -2389,7 +2389,8 @@ function handleJustsaying(ws, subject, body){
return;
var arrParts = body.exception.toString().split("Breadcrumbs", 2);
var text = body.message + ' ' + arrParts[0];
- var hash = crypto.createHash("sha256").update(text, "utf8").digest("base64");
+ var matches = body.message.match(/message encrypted to unknown key, device (0\w{32})/);
+ var hash = matches ? matches[1] : crypto.createHash("sha256").update(text, "utf8").digest("base64");
if (hash === prev_bugreport_hash)
return console.log("ignoring known bug report");
prev_bugreport_hash = hash;
| 8 |
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -703,10 +703,6 @@ articles:
url: "/protocols/oauth2/oauth-state"
hidden: true
- - title: "Web App Integration"
- url: "/protocols/oauth2/oauth-web-protocol"
- hidden: true
-
- title: "OpenID Connect"
url: "/protocols/oidc"
| 2 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.