code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/scss/tippy.scss b/src/scss/tippy.scss &[data-inertia] {
&[data-state='visible'] {
- transition-timing-function: cubic-bezier(0.53, 2, 0.36, 0.85);
+ transition-timing-function: cubic-bezier(0.54, 1.5, 0.38, 1.11);
}
&[data-state='hidden'] {
transition-timing-function: ease;
| 7 |
diff --git a/README.md b/README.md @@ -61,7 +61,7 @@ Or you can use the hosted version on [jsDelivr](https://www.jsdelivr.com/project
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/siimple@VERSION/dist/siimple.min.css">
```
-Guides and reference are published in [https://www.siimple.xyz/documentation](https://wwww.siimple.xyz/documentation). Take a look and start creating your web page!
+Guides and reference are published in https://www.siimple.xyz/documentation. Take a look and start creating your web page!
## Using the SCSS/SASS mixins
| 1 |
diff --git a/src/encoded/schemas/library.json b/src/encoded/schemas/library.json "XXXenum": [
"gel",
"see document",
- "SPRI beads"
+ "SPRI beads",
+ "Agencourt AMPure XP"
],
"format": "semi-controlled"
},
| 0 |
diff --git a/generators/server/templates/build.gradle.ejs b/generators/server/templates/build.gradle.ejs @@ -576,14 +576,10 @@ task webapp_test(type: NpmTask, dependsOn: "npm_install") {
}
if (project.hasProperty("nodeInstall")) {
- // Workaround node grade plugin not working on apple silicon https://github.com/node-gradle/gradle-node-plugin/issues/154
- OperatingSystem os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurrentOperatingSystem();
- Architecture arch = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurrentArchitecture();
- Boolean downloadNode = !os.isMacOsX() || arch.isAmd64()
node {
version = "<%= NODE_VERSION %>"
npmVersion = "<%= NPM_VERSION %>"
- download = downloadNode
+ download = true
}
// Copy local node and npm to a fixed location for npmw
| 14 |
diff --git a/packages/component-library/src/LineChart/LineChart.js b/packages/component-library/src/LineChart/LineChart.js @@ -166,9 +166,9 @@ LineChart.propTypes = {
PropTypes.shape({ x: PropTypes.number, y: PropTypes.number })
),
dataKey: PropTypes.string,
- dataKeyLabel: PropTypes.arrayOf(PropTypes.string),
+ dataKeyLabel: PropTypes.string,
dataValue: PropTypes.string,
- dataValueLabel: PropTypes.arrayOf(PropTypes.string),
+ dataValueLabel: PropTypes.string,
dataSeries: PropTypes.string,
dataSeriesLabel: PropTypes.arrayOf(
PropTypes.shape({ category: PropTypes.string, label: PropTypes.string })
| 3 |
diff --git a/src/Powercord/plugins/pc-spotify/style.scss b/src/Powercord/plugins/pc-spotify/style.scss -.pc-channels .pc-flex + .pc-container {
- position: relative;
- bottom: -9px;
-}
-
-.pc-container .pc-container:last-of-type {
- bottom: 0;
-}
-
.pc-app .pc-listeningAlong {
- background-color: #2b2c31;
margin: 0;
padding-bottom: 0;
padding-top: 0;
- position: relative;
- z-index: 69;
- bottom: -9px;
.pc-subtitle {
display: none;
}
}
-.pc-app .powercord-spotify {
- background-color: #2b2c31;
+.pc-listeningAlong + .powercord-spotify {
+ height: 37px;
+ padding-bottom: 8px;
+
+ &.small:hover {
+ padding-bottom: 23px;
+ }
+
+ &:hover {
+ padding-bottom: 33px;
+ }
}
.powercord-spotify {
| 7 |
diff --git a/userscript.user.js b/userscript.user.js @@ -96020,7 +96020,12 @@ var $$IMU_EXPORT$$;
// https://zozo.jp/shop/zozomarket/goods/54947341/?did=91253776&rid=1523
// https://c.imgz.jp/341/55947341/55947341b_b_68_35.jpg
// https://c.imgz.jp/341/55947341/55947341b_b_68_500.jpg
- return src.replace(/_[1-4]?[0-9]{2}(\.[^/.]+)(?:[?#].*)?$/, "_500$1");
+ // https://o.imgz.jp/341/55947341/55947341b_b_68.jpg
+ newsrc = src.replace(/_[1-4]?[0-9]{2}(\.[^/.]+)(?:[?#].*)?$/, "_500$1");
+ if (newsrc !== src)
+ return newsrc;
+
+ return src.replace(/:\/\/[^/]+\/+([0-9]+\/+[0-9]+\/+[^/]+)_[0-9]+(\.[^/.]+)(?:[?#].*)?$/, "://o.imgz.jp/$1$2");
}
| 7 |
diff --git a/src/ApiGateway.js b/src/ApiGateway.js @@ -215,7 +215,13 @@ module.exports = class ApiGateway {
vision,
{
plugin: hapiSwagger,
- // options: swaggerOptions,
+ options: {
+ info: {
+ title: 'API Gateway documentation',
+ // TODO file bug, version information can't be omitted
+ version: '0.0.0', // TEMP
+ },
+ },
},
])
} catch (err) {
| 0 |
diff --git a/token-metadata/0xfc82bb4ba86045Af6F327323a46E80412b91b27d/metadata.json b/token-metadata/0xfc82bb4ba86045Af6F327323a46E80412b91b27d/metadata.json "symbol": "PROM",
"address": "0xfc82bb4ba86045Af6F327323a46E80412b91b27d",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/native/calendar/calendar.react.js b/native/calendar/calendar.react.js @@ -504,17 +504,6 @@ class InnerCalendar extends React.PureComponent {
return [curItemIndex, curSectionIndex, currentScrollPosition - curPosition];
}
- initialScrollIndex = () => {
- const data = this.state.sectionListDataWithHeights;
- invariant(data, "should be set");
- const todayIndex = _findIndex(['key', dateString(new Date())])(data);
- let flattenedIndex = 0;
- for (let sectionIndex = 0; sectionIndex < todayIndex; sectionIndex++) {
- flattenedIndex += data[sectionIndex].data.length + 1;
- }
- return flattenedIndex;
- }
-
static heightOfSections(data: $ReadOnlyArray<SectionWithHeights>): number {
let height = 0;
let curSectionIndex = 0;
| 2 |
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt @@ -61,9 +61,6 @@ SET (BISWEB_PYTHON_REQUIREMENTS ${BISWEBPYTHON_SOURCE_DIR}/config/requirements.t
SET (BISWEB_PYTHON_MANIFEST ${BISWEBPYTHON_SOURCE_DIR}/config/MANIFEST.in)
SET (BISWEBPYTHON_MODULE_LIST_FILENAME ${BISWEBPYTHON_SOURCE_DIR}/modules/PythonModuleList.txt)
-# Needed for everything
-FIND_PROGRAM(NodeInterp node)
-
# ---------------------------------------------------------------------------------------------
# C++ Sources Core
# ---------------------------------------------------------------------------------------------
@@ -352,7 +349,7 @@ IF (BIS_A_EMSCRIPTEN)
ADD_CUSTOM_COMMAND(OUTPUT ${WEBPACK_WASM_MODULE}
DEPENDS ${lib} ${TOOLS_DIR}/bis_create_wasm_module.js
COMMENT "\nCreating Webpack Wasm Module"
- COMMAND ${NodeInterp} ${TOOLS_DIR}/bis_create_wasm_module.js -i ${FVAR2} -o ${WEBPACK_WASM_MODULE} --gpl ${GPL})
+ COMMAND ${NODE_JS_EXECUTABLE} ${TOOLS_DIR}/bis_create_wasm_module.js -i ${FVAR2} -o ${WEBPACK_WASM_MODULE} --gpl ${GPL})
add_custom_target(wasm_${lib} ALL DEPENDS ${WEBPACK_WASM_MODULE})
endforeach(lib ${LIBLIST})
@@ -366,7 +363,7 @@ IF (BIS_A_EMSCRIPTEN)
add_custom_command(OUTPUT ${JS_WRAP_OUTPUT} ${JS_WRAP_OUTPUT2}
DEPENDS ${PARSE_HEADERS} ${WRAP_SCRIPT} CMakeLists.txt ${LIBNAME}
PRE_BUILD COMMENT "Creating JS Wrappers"
- COMMAND ${NodeInterp} ${WRAP_SCRIPT} -i ${PARSE_LIST} -o ${JS_WRAP_OUTPUT} --extra ${BIS_EXTRAPATH} --bisdate ${EXECUTABLE_OUTPUT_PATH}/biswasmdate.js)
+ COMMAND ${NODE_JS_EXECUTABLE} ${WRAP_SCRIPT} -i ${PARSE_LIST} -o ${JS_WRAP_OUTPUT} --extra ${BIS_EXTRAPATH} --bisdate ${EXECUTABLE_OUTPUT_PATH}/biswasmdate.js)
add_custom_target(wrappers ALL DEPENDS ${JS_WRAP_OUTPUT} ${JS_WRAP_OUTPUT2})
# ---- create library for command line -----------
@@ -436,7 +433,7 @@ IF (BIS_A_EMSCRIPTEN)
add_custom_command(OUTPUT ${MODULE_LIST_FILENAME}
DEPENDS ${JSFILES} ${MODULE_SCRIPTS_CREATOR} CMakeLists.txt ${LIBNAME}
PRE_BUILD COMMENT "Creating JS Wrappers Scripts (Unix)"
- COMMAND ${NodeInterp} ${MODULE_SCRIPTS_CREATOR} -o ${MODULE_DIR} -m 0)
+ COMMAND ${NODE_JS_EXECUTABLE} ${MODULE_SCRIPTS_CREATOR} -o ${MODULE_DIR} -m 0)
GET_FILENAME_COMPONENT(MODULE2_DIR ${LIBRARY_OUTPUT_PATH}/winbin ABSOLUTE)
SET(MODULE_LIST_FILENAME2 "${MODULE2_DIR}/ModuleList.txt")
@@ -444,7 +441,7 @@ IF (BIS_A_EMSCRIPTEN)
add_custom_command(OUTPUT ${MODULE_LIST_FILENAME2}
DEPENDS ${JSFILES} ${MODULE_SCRIPTS_CREATOR} CMakeLists.txt ${LIBNAME}
PRE_BUILD COMMENT "Creating JS Wrappers Scripts (Windows)"
- COMMAND ${NodeInterp} ${MODULE_SCRIPTS_CREATOR} -o ${MODULE2_DIR} -m 1)
+ COMMAND ${NODE_JS_EXECUTABLE} ${MODULE_SCRIPTS_CREATOR} -o ${MODULE2_DIR} -m 1)
add_custom_target(modulescripts ALL DEPENDS ${MODULE_LIST_FILENAME} ${MODULE_LIST_FILENAME2} ${LIBNAME})
@@ -602,7 +599,7 @@ ELSE(BIS_A_EMSCRIPTEN)
add_custom_command(OUTPUT ${PYTHON_WRAP_OUTPUT}
DEPENDS ${PARSE_HEADERS} ${WRAP_SCRIPT} CMakeLists.txt
PRE_BUILD COMMENT "Creating Python Header"
- COMMAND ${NodeInterp} ${WRAP_SCRIPT} --python -i ${PARSE_LIST} -o ${PYTHON_WRAP_OUTPUT}
+ COMMAND ${NODE_JS_EXECUTABLE} ${WRAP_SCRIPT} --python -i ${PARSE_LIST} -o ${PYTHON_WRAP_OUTPUT}
)
add_custom_target(wrappers_py ALL DEPENDS ${PYTHON_WRAP_OUTPUT})
install (FILES ${PYTHON_WRAP_OUTPUT} DESTINATION biswebpython/lib)
@@ -617,7 +614,7 @@ ELSE(BIS_A_EMSCRIPTEN)
add_custom_command(OUTPUT ${PYTHON_MODULE_DESC}
DEPENDS ${BISWEBPYTHON_MODULE_LIST_FILENAME} ${DESCRIPTION_SCRIPT} CMakeLists.txt ${JMODS}
PRE_BUILD COMMENT "Creating Python Module Descriptions"
- COMMAND ${NodeInterp} ${DESCRIPTION_SCRIPT} -i ${BISWEBPYTHON_MODULE_LIST_FILENAME} -o ${PYTHON_MODULE_DESC} }
+ COMMAND ${NODE_JS_EXECUTABLE} ${DESCRIPTION_SCRIPT} -i ${BISWEBPYTHON_MODULE_LIST_FILENAME} -o ${PYTHON_MODULE_DESC} }
)
add_custom_target(module_desc_py ALL DEPENDS ${PYTHON_MODULE_DESC})
add_custom_target(python_module_list_py ALL DEPENDS ${PYTHON_MODULE_DESC})
@@ -698,7 +695,7 @@ ELSE(BIS_A_EMSCRIPTEN)
add_custom_command(OUTPUT ${MATLAB_WRAP_OUTPUT}
DEPENDS ${PARSE_HEADERS} ${WRAP_SCRIPT}
PRE_BUILD COMMENT "Creating Matlab Header"
- COMMAND ${NodeInterp} ${WRAP_SCRIPT} -i ${PARSE_LIST} --matlab -o ${MATLAB_WRAP_OUTPUT})
+ COMMAND ${NODE_JS_EXECUTABLE} ${WRAP_SCRIPT} -i ${PARSE_LIST} --matlab -o ${MATLAB_WRAP_OUTPUT})
add_custom_target(wrappers_mat ALL DEPENDS ${MATLAB_WRAP_OUTPUT})
install (FILES ${MATLAB_WRAP_OUTPUT} DESTINATION biswebmatlab)
@@ -706,7 +703,7 @@ ELSE(BIS_A_EMSCRIPTEN)
add_custom_command(OUTPUT ${MATLAB_OUT_HEADER}
DEPENDS ${PARSE_HEADERS} ${HEADER_SCRIPT} CMakeLists.txt
PRE_BUILD COMMENT "Creating Matlab Header"
- COMMAND ${NodeInterp} ${HEADER_SCRIPT} -i ${PARSE_LIST} -o ${MATLAB_OUT_HEADER})
+ COMMAND ${NODE_JS_EXECUTABLE} ${HEADER_SCRIPT} -i ${PARSE_LIST} -o ${MATLAB_OUT_HEADER})
add_custom_target(header_mat ALL DEPENDS ${MATLAB_OUT_HEADER})
install (FILES ${MATLAB_OUT_HEADER} DESTINATION biswebmatlab)
| 2 |
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb @@ -8,4 +8,3 @@ Mime::Type.register "application/vnd.google-earth.kml+xml", :kmz
Mime::Type.register "application/octet-stream", :shp #sent as zip
Mime::Type.register "application/octet-stream", :sql #sent as zip
Mime::Type.register "image/svg+xml", :svg
-Mime::Type.register "application/zip", :zip
| 2 |
diff --git a/admin-base/ui.apps/src/main/js/stateActions/deleteAsset.js b/admin-base/ui.apps/src/main/js/stateActions/deleteAsset.js @@ -30,6 +30,7 @@ import {set} from '../utils'
export default function(me, target) {
log.fine('deleteAsset',target)
+ me.getNodeFromView('/state/tools').asset = null
var api = me.getApi()
return api.deleteAsset(target)
| 12 |
diff --git a/plugins/plugin-vue/plugin.js b/plugins/plugin-vue/plugin.js @@ -48,6 +48,7 @@ module.exports = function plugin(snowpackConfig, pluginOptions = {}) {
const {optionsApi = true, prodDevtools = false} = pluginOptions;
packageOptions.rollup.plugins.push(
replace({
+ preventAssignment: false,
values: {
__VUE_OPTIONS_API__: JSON.stringify(optionsApi),
__VUE_PROD_DEVTOOLS__: JSON.stringify(prodDevtools),
| 12 |
diff --git a/js/gateio.js b/js/gateio.js @@ -90,7 +90,6 @@ module.exports = class gateio extends Exchange {
'{settle}/insurance': 1.5,
'{settle}/contract_stats': 1.5,
'{settle}/liq_orders': 1.5,
- '{settle}/price_orders/{order_id}': 1.5,
},
},
'delivery': {
@@ -102,13 +101,6 @@ module.exports = class gateio extends Exchange {
'{settle}/candlesticks': 1.5,
'{settle}/tickers': 1.5,
'{settle}/insurance': 1.5,
- '{settle}/price_orders/{order_id}': 1.5,
- },
- 'delete': {
- '{settle}/orders': 1.5,
- '{settle}/orders/{order_id}': 1.5,
- '{settle}/price_orders': 1.5,
- '{settle}/price_orders/{order_id}': 1.5,
},
},
},
@@ -305,7 +297,7 @@ module.exports = class gateio extends Exchange {
'futures': 'futures',
'delivery': 'delivery',
},
- 'defaultType': 'swap',
+ 'defaultType': 'spot',
'swap': {
'fetchMarkets': {
'settlementCurrencies': [ 'usdt', 'btc' ],
@@ -2022,7 +2014,7 @@ module.exports = class gateio extends Exchange {
const market = this.market (symbol);
const defaultType = this.safeString2 (this.options, 'createOrder', 'defaultType', 'spot');
const marketType = this.safeString (params, 'type', defaultType);
- const future = market['future'];
+ const futures = market['futures'];
const swap = market['swap'];
const request = this.prepareRequest (market);
const reduceOnly = this.safeValue (params, 'reduceOnly');
@@ -2033,12 +2025,11 @@ module.exports = class gateio extends Exchange {
}
request['reduce_only'] = reduceOnly;
}
- if (future || swap) {
+ if (futures || swap) {
if (side === 'sell') {
amount = 0 - amount;
}
request['size'] = this.parseNumber (this.amountToPrecision (symbol, amount));
- request['settle'] = market['settleId'];
} else {
request['side'] = side;
request['type'] = type;
@@ -2057,7 +2048,8 @@ module.exports = class gateio extends Exchange {
throw new ArgumentsRequired ('Argument price is required for ' + this.id + '.createOrder for limit orders');
}
request['price'] = this.priceToPrecision (symbol, price);
- } else if (future || swap) {
+ } else if (type === 'market' && (swap || futures)) {
+ request['tif'] = 'ioc';
request['price'] = 0;
}
const method = this.getSupportedMapping (market['type'], {
| 1 |
diff --git a/www/Common.js b/www/Common.js @@ -219,7 +219,7 @@ function getAllChildren(root) {
}
var ignoreTags = ["pre", "textarea",
- "p", "form", "input", "table", "caption", "canvas",
+ "p", "form", "input", "table", "caption", "canvas", "svg",
"ion-content", "ion-app", "ion-nav"];
var list;
| 8 |
diff --git a/appveyor.yml b/appveyor.yml @@ -8,8 +8,9 @@ environment:
- nodejs_version: "8"
- nodejs_version: "10"
- nodejs_version: "11"
+ - nodejs_version: "12"
install:
- - ps: Install-Product node $env:nodejs_version x64
+ - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) x64
- npm install -g npm@6
- npm install
test_script:
| 0 |
diff --git a/server/game/cards/04.5-GoH/ThePrincesPass.js b/server/game/cards/04.5-GoH/ThePrincesPass.js @@ -22,6 +22,8 @@ class ThePrincesPass extends DrawCard {
this.game.addMessage('{0} kneels {1} to remove {2} {3} icon from {4}',
this.controller, this, icon === 'intrigue' ? 'an' : 'a', icon, this.targetCharacter);
+ //put the then part in a simple step after the effect above is fully applied
+ this.game.queueSimpleStep(() => {
if(this.targetCharacter.getNumberOfIcons() === 0) {
this.game.promptWithMenu(this.controller, this, {
activePrompt: {
@@ -35,6 +37,7 @@ class ThePrincesPass extends DrawCard {
});
}
});
+ });
}
});
}
| 1 |
diff --git a/test/service-broker.spec.js b/test/service-broker.spec.js @@ -653,7 +653,7 @@ describe("Test middleware system with SYNC break", () => {
});
let master = jest.fn(() => {
- return new Promise((resolve, reject) => {
+ return new Promise((resolve) => {
flow.push("MASTER");
resolve({ user: "icebob" });
});
@@ -714,7 +714,7 @@ describe("Test middleware system with ASYNC break", () => {
});
let master = jest.fn(() => {
- return new Promise((resolve, reject) => {
+ return new Promise((resolve) => {
flow.push("MASTER");
resolve({ user: "icebob" });
});
@@ -745,3 +745,40 @@ describe("Test middleware system with ASYNC break", () => {
});
});
});
+
+describe("Test middleware system Exception", () => {
+ let flow = [];
+ let mw1 = jest.fn((ctx, next) => {
+ flow.push("B1");
+ return next().then((res) => {
+ flow.push("A1");
+ return res;
+ });
+ });
+
+ let mw2 = jest.fn((ctx, next) => {
+ flow.push("B2");
+ throw new Error("Something happened in mw2");
+ });
+
+ let master = jest.fn(() => {
+ return new Promise((resolve) => {
+ flow.push("MASTER");
+ resolve({ user: "icebob" });
+ });
+ });
+
+ let broker = new ServiceBroker();
+ broker.loadService("./examples/math.service");
+ broker.use(mw1, mw2);
+
+ it("should throw mw2 an exception", () => {
+ let ctx = new Context();
+ let p = broker.callMiddlewares(ctx, master);
+ expect(utils.isPromise(p)).toBeTruthy();
+ return p.catch(err => {
+ expect(err.message).toEqual("Something happened in mw2");
+ expect(flow.join("-")).toBe("B1-B2");
+ });
+ });
+});
\ No newline at end of file
| 9 |
diff --git a/packages/sync-actions/src/utils/copy-empty-array-props.js b/packages/sync-actions/src/utils/copy-empty-array-props.js /**
* @function copyEmptyArrayProps
- * @description Takes two objects and if there is Array props in oldObj which doesnt exist in newObj then it Copy name with empty value
+ * @description Takes two objects and if there are Array props in oldObj which doesn't exist in newObj, then copy it with an empty value.
* @param {Object} oldObj
* @param {Object} newObj
- * @returns {Array} Inorder Array [oldObj, newObj]
+ * @returns {Array} Ordered Array [oldObj, newObj]
*/
export default function copyEmptyArrayProps(oldObj, newObj) {
| 1 |
diff --git a/src/js/core.js b/src/js/core.js @@ -2165,7 +2165,7 @@ Tabulator.prototype.helpers = {
},
deepClone: function(obj){
- var clone = Array.isArray(obj) ? [] : {};
+ var clone = Object.assign(Array.isArray(obj) ? [] : {}, obj);
for(var i in obj) {
if(obj[i] != null && typeof(obj[i]) === "object"){
@@ -2175,9 +2175,6 @@ Tabulator.prototype.helpers = {
clone[i] = this.deepClone(obj[i]);
}
}
- else{
- clone[i] = obj[i];
- }
}
return clone;
}
| 7 |
diff --git a/test-complete/nodejs-documents-metadata-values.js b/test-complete/nodejs-documents-metadata-values.js @@ -281,6 +281,58 @@ describe('Document Metadata values test', function() {
}, done);
});
+ it('TEST 17 - write and read xml formatted properties in json', function(done) {
+ var docuri = '/test/query/matchList/propertyInxmlOne.json';
+ this.timeout(10000);
+ db.documents.write({
+ uri: docuri,
+ contentType: 'application/json',
+ quality: 13,
+ properties: {'$ml.xml': '<prop:properties xmlns:prop="http://marklogic.com/xdmp/property"><myProps>Property 1</myProps></prop:properties>'},
+ content: {
+ title: 'The memex',
+ popularity: 5,
+ id: '0026',
+ date: '2009-05-05',
+ price: {
+ amt: 123.45
+ },
+ p: 'The Memex, unfortunately, had no automated search feature'
+ }
+ }).result(function(response){
+ dbReader.documents.read({uris: docuri, categories: ['metadata']}).
+ result(function(documents) {
+ var prop = JSON.stringify(documents[0].properties);
+ //console.log(prop, null, 4);
+ prop.should.containEql('<myProps>Property 1</myProps>');
+ done();
+ }, done);
+ }, done);
+ });
+
+ it('TEST 18 - appply xml formatted properties patch on metadata properties', function(done){
+ this.timeout(10000);
+ var docuri = '/test/query/matchList/propertyInxmlOne.json';
+ var p = marklogic.patchBuilder;
+ db.documents.patch({uri: docuri,
+ categories: ['metadata'],
+ operations: [
+ p.collections.add('metadataValuesColl/ADDED'),
+ p.properties.add('$ml.xml', '<prop:properties xmlns:prop="http://marklogic.com/xdmp/property"><myProps1>Property 2</myProps1></prop:properties>'),
+ p.quality.set(2)
+ ]
+ }).result(function(response){
+ dbReader.documents.read({uris: docuri, categories: ['metadata']}).
+ result(function(documents) {
+ var prop = JSON.stringify(documents[0].properties);
+ //console.log(prop, null, 4);
+ // Note we expect two properties, but in special case of $ml.xml, the patch just replaces an existing $ml.xml
+ prop.should.containEql('<myProps>Property 2</myProps>');
+ done();
+ }, done);
+ }, done);
+ });
+
it('should delete all documents', function(done){
dbAdmin.documents.removeAll({
collection: 'metadataValuesColl'
| 0 |
diff --git a/package.json b/package.json {
"name": "cytoscape",
- "version": "3.0.0",
+ "version": "3.2.0-unstable",
"license": "MIT",
"description": "Graph theory (a.k.a. network) library for analysis and visualisation",
"homepage": "http://js.cytoscape.org",
| 12 |
diff --git a/docs/docs.md b/docs/docs.md @@ -477,10 +477,10 @@ Any files stored in `/images` by the app inside the docker container will persis
### Private Docker Registry
-Mup uploads the app's bundle and builds a docker image (when prepare bundle is enabled) on each server, which is slow when there are many servers. When using a private docker registry, it is much faster:
+Normally, mup uploads the app's bundle and builds a docker image (when prepare bundle is enabled) on each server, which is slow when there are many servers. When using a private docker registry, it is much faster:
1. Mup uploads the bundle to a single server, and builds the image there.
-2. The image is stored in the private registry
+2. The image is pushed to the private registry
3. On the other servers, mup will use the image from the private registry
To use a private registry, add the `dockerPrivateRegistry` option to your config:
| 7 |
diff --git a/src/pages/strategy/tabs/expcalc/expcalc.js b/src/pages/strategy/tabs/expcalc/expcalc.js // figure out a list of possible goal levels in ascending order.
// a goal level might be remodel level or 99 (can be married) / 165 (full exp)
var possibleNextLevels = RemodelDb.nextLevels( masterId );
- setAdd(possibleNextLevels, 99);
- setAdd(possibleNextLevels, 165);
+ setAdd(possibleNextLevels, KC3Ship.getMarriedLevel() - 1);
+ setAdd(possibleNextLevels, KC3Ship.getMaxLevel());
while (possibleNextLevels.length > 0 && possibleNextLevels[0] <= currentLevel)
possibleNextLevels.shift();
| 14 |
diff --git a/Readme.md b/Readme.md # OONI Probe Desktop
-**Attention** This is under heavy development and should only be run and used
-by OONI developers. Use at your own risk and if you do use it, you may have to
-do some cleanup when we release the first public release of OONI Probe.
-
This is the desktop implementation of OONI Probe.
Our two primary target platforms are:
| 2 |
diff --git a/src/components/dashboard/Rewards.js b/src/components/dashboard/Rewards.js @@ -5,7 +5,7 @@ import { isNil } from 'lodash'
import { Iframe } from '../webView/iframe'
-import { useDialog } from '../../lib/undux/utils/dialog'
+import { useDialog, useErrorDialog } from '../../lib/undux/utils/dialog'
import useLoadingIndicator from '../../lib/hooks/useLoadingIndicator'
import useOnPress from '../../lib/hooks/useOnPress'
@@ -19,6 +19,7 @@ const log = logger.child({ from: 'RewardsTab' })
const RewardsTab = ({ navigation, openInNewTab = false /* TODO: isIOS */ }) => {
const [showDialog] = useDialog()
+ const [showErrorDialog] = useErrorDialog()
const { params = {} } = navigation.state
const [token, setToken] = useState(null)
const [showLoading, hideLoading] = useLoadingIndicator()
@@ -44,16 +45,26 @@ const RewardsTab = ({ navigation, openInNewTab = false /* TODO: isIOS */ }) => {
return url.toString()
}, [token, params, openInNewTab])
- const onPressOk = useOnPress(() => openLink(rewardsPath, '_blank'), [rewardsPath])
const onDismiss = useOnPress(() => navigation.navigate('Home'), [navigation])
+ const onPressOk = useOnPress(async () => {
+ try {
+ await openLink(rewardsPath, '_blank')
+ } catch (exception) {
+ const { message } = exception
+
+ log.error('Failed opening external link:', message, exception, { rewardsPath })
+ showErrorDialog(message, '', { onDismiss })
+ }
+ }, [rewardsPath, onDismiss])
+
useEffect(() => {
showLoading()
userStorage.getProfileFieldValue('loginToken').then(loginToken => {
const token = loginToken || ''
- log.debug('got rewards login token', token)
+ log.debug('Got rewards login token', token)
setToken(token)
})
@@ -66,9 +77,10 @@ const RewardsTab = ({ navigation, openInNewTab = false /* TODO: isIOS */ }) => {
}
hideLoading()
+
showDialog({
title: 'Press ok to go to Rewards dashboard',
- onDismiss: onDismiss,
+ onDismiss,
buttons: [
{
text: 'OK',
| 0 |
diff --git a/test/routes/v2-launchpad.test.js b/test/routes/v2-launchpad.test.js @@ -12,8 +12,8 @@ beforeAll((done) => {
// Launchpads V2
//------------------------------------------------------------
-test('It should return all launchpads', () => {
- return request(app).get('/v2/launchpads').then((response) => {
+test('It should return all launchpads', async () => {
+ const response = await request(app).get('/v2/launchpads');
expect(response.statusCode).toBe(200);
expect(response.body).toHaveLength(8);
response.body.forEach((item) => {
@@ -24,18 +24,15 @@ test('It should return all launchpads', () => {
expect(item).toHaveProperty('details');
});
});
-});
-test('It should return LC-39A info', () => {
- return request(app).get('/v2/launchpads/ksc_lc_39a').then((response) => {
+test('It should return LC-39A info', async () => {
+ const response = await request(app).get('/v2/launchpads/ksc_lc_39a');
expect(response.statusCode).toBe(200);
expect(response.text).toContain('ksc_lc_39a');
});
-});
-test('It should return no launchpad info', () => {
- return request(app).get('/v2/launchpads/ksc_lc_40a').then((response) => {
+test('It should return no launchpad info', async () => {
+ const response = await request(app).get('/v2/launchpads/ksc_lc_40a');
expect(response.statusCode).toBe(200);
expect(response.text).toContain('');
});
-});
| 3 |
diff --git a/src/reducers/account/index.js b/src/reducers/account/index.js @@ -7,13 +7,14 @@ import {
clearCode,
promptTwoFactor,
refreshUrl,
- refreshAccount,
+ refreshAccountOwner,
resetAccounts,
checkCanEnableTwoFactor,
get2faMethod,
getLedgerKey,
updateStakingAccount,
- updateStakingLockup
+ updateStakingLockup,
+ getBalance
} from '../../actions/account'
const initialState = {
@@ -134,7 +135,17 @@ const account = handleActions({
...state.balance,
lockupAccount: payload
}
- })
+ }),
+ [getBalance]: (state, { error, meta, payload, ready}) =>
+ (!ready || error)
+ ? state
+ : ({
+ ...state,
+ balance: {
+ ...state.balance,
+ ...payload
+ }
+ }),
}, initialState)
export default reduceReducers(
| 9 |
diff --git a/Source/Scene/Camera.js b/Source/Scene/Camera.js @@ -2985,10 +2985,12 @@ Camera.prototype.getPickRay = function (windowPosition, result) {
}
const canvas = this._scene.canvas;
- const frustum = this.frustum;
if (canvas.clientWidth <= 0 || canvas.clientHeight <= 0) {
return undefined;
- } else if (
+ }
+
+ const frustum = this.frustum;
+ if (
defined(frustum.aspectRatio) &&
defined(frustum.fov) &&
defined(frustum.near)
| 3 |
diff --git a/js/background.js b/js/background.js @@ -242,7 +242,7 @@ function blockTrackers(tabId, url) {
function get_json() {
var xobj = new XMLHttpRequest();
xobj.overrideMimeType("application/json");
- xobj.open('GET', 'trackers.json', true);
+ xobj.open('GET', 'js/trackers.json', true);
xobj.onreadystatechange = function () {
if (xobj.readyState == 4 && xobj.status == "200") {
return xobj.responseText;
| 3 |
diff --git a/src/pipeline.cc b/src/pipeline.cc #elif defined(__APPLE__)
#define STAT64_STRUCT stat
#define STAT64_FUNCTION stat
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+#define STAT64_STRUCT stat
+#define STAT64_FUNCTION stat
#else
#define STAT64_STRUCT stat64
#define STAT64_FUNCTION stat64
| 11 |
diff --git a/packages/cx/src/widgets/form/LookupField.js b/packages/cx/src/widgets/form/LookupField.js @@ -53,6 +53,7 @@ export class LookupField extends Field {
icon: undefined,
autoOpen: undefined,
readOnly: undefined,
+ filterParams: { structured: true },
},
additionalAttributes,
...arguments
@@ -130,6 +131,12 @@ export class LookupField extends Field {
readonly: data.readOnly,
};
+ data.visibleOptions = data.options;
+ if (this.onCreateVisibleOptionsFilter && isArray(data.options)) {
+ let filterCallback = instance.invoke("onCreateVisibleOptionsFilter", data.filterParams, instance);
+ data.visibleOptions = data.options.filter(filterCallback);
+ }
+
data.selectedKeys = [];
if (this.multiple) {
@@ -395,24 +402,10 @@ class LookupComponent extends VDOM.Component {
let { data, widget } = instance;
let { CSS, baseClass } = widget;
- let filteredOptionsLength = null;
- let filteredStateOptionsLength = this.state.options.length;
- let optionsIsArray = isArray(data.options);
- // TODO: check how to access list filterParams from within LookupField.
- // if (optionsIsArray) {
- // filteredOptionsLength = data.options.length;
- // if (widget.listOptions?.onCreateFilter) {
- // let filter = widget.listOptions.onCreateFilter(data.filterParams, instance);
-
- // filteredOptionsLength = data.options.filter(filter).length;
- // filteredStateOptionsLength = this.state.options.filter(filter).length;
- // }
- // }
-
let searchVisible =
!widget.hideSearchField &&
- (!optionsIsArray ||
- (widget.minOptionsForSearchField && filteredOptionsLength >= widget.minOptionsForSearchField));
+ (!isArray(data.visibleOptions) ||
+ (widget.minOptionsForSearchField && data.visibleOptions.length >= widget.minOptionsForSearchField));
if (this.state.status == "loading") {
content = (
@@ -432,7 +425,7 @@ class LookupComponent extends VDOM.Component {
{this.state.message}
</div>
);
- } else if (filteredStateOptionsLength == 0) {
+ } else if (this.state.options.length == 0) {
content = (
<div key="msg" className={CSS.element(baseClass, "message", "no-results")}>
{widget.noResultsText}
@@ -952,8 +945,8 @@ class LookupComponent extends VDOM.Component {
return;
}
- if (isArray(data.options)) {
- let results = widget.filterOptions(this.props.instance, data.options, q);
+ if (isArray(data.visibleOptions)) {
+ let results = widget.filterOptions(this.props.instance, data.visibleOptions, q);
this.setState({
options: results,
status: "loaded",
| 0 |
diff --git a/closure/goog/locale/locale.js b/closure/goog/locale/locale.js @@ -81,8 +81,8 @@ goog.locale.Resource = {
// e.g. en-Latn-GB
//
// NOTICE:
-// No special format checking is performed. If you pass a none valid
-// language code as parameter to the following functions,
+// No special format checking is performed. If you pass an invalid
+// language code as a parameter to the following functions,
// you might get an unexpected result.
| 1 |
diff --git a/src/react/projects/spark-core-react/src/index.js b/src/react/projects/spark-core-react/src/index.js export { default as SparkButton } from './SparkButton/SparkButton';
export { default as SprkLink } from './SprkLink/SprkLink';
+export { default as SprkDividers } from './SprkDividers/SprkDividers';
| 3 |
diff --git a/assets/js/components/wp-dashboard/WPDashboardPopularPages.js b/assets/js/components/wp-dashboard/WPDashboardPopularPages.js @@ -113,12 +113,8 @@ export default function WPDashboardPopularPages( props ) {
return <WidgetReportZero moduleSlug="analytics" />;
}
- // Skip rendering the table if there are no rows.
- if ( ! report[ 0 ].data?.rows?.length ) {
- return null;
- }
-
- const rows = cloneDeep( report[ 0 ].data.rows );
+ // data.rows is not guaranteed to be set so we need a fallback.
+ const rows = cloneDeep( report[ 0 ].data.rows ) || [];
// Combine the titles from the pageTitles with the rows from the metrics report.
rows.forEach( ( row ) => {
const url = row.dimensions[ 0 ];
| 14 |
diff --git a/src/pages/TargetPage/ClassicAssociationsTable.js b/src/pages/TargetPage/ClassicAssociationsTable.js @@ -11,13 +11,18 @@ const TARGET_ASSOCIATIONS_QUERY = gql`
query TargetAssociationsQuery($ensemblId: String!, $page: Pagination!) {
target(ensemblId: $ensemblId) {
associatedDiseases(page: $page) {
- score
- idPerDT
- scorePerDT
+ count
+ rows {
disease {
id
name
}
+ score
+ datatypeScores {
+ id
+ score
+ }
+ }
}
}
}
@@ -33,10 +38,7 @@ const dataTypes = [
{ id: 'animal_model', label: 'Animal models' },
];
-const color = d3
- .scaleQuantize()
- .domain([0, 1])
- .range([
+const colorRange = [
'#e8edf1',
'#d2dce4',
'#bbcbd6',
@@ -47,7 +49,12 @@ const color = d3
'#4b7493',
'#356386',
'#1f5279',
- ]);
+];
+
+const color = d3
+ .scaleQuantize()
+ .domain([0, 1])
+ .range(colorRange);
const useStyles = makeStyles({
root: {
@@ -326,24 +333,53 @@ function getColumns(ensemblId, classes) {
}
function getRows(data) {
- return data.map(d => {
+ const { rows = [] } = data;
+ return rows.map(d => {
const row = {
name: d.disease.name,
- overall: d.score,
efoId: d.disease.id,
+ overall: d.score,
};
dataTypes.forEach(dataType => {
- const index = d.idPerDT.indexOf(dataType.id);
+ const dataTypeScore = d.datatypeScores.find(
+ dataTypeScore => dataTypeScore.id === dataType.id
+ );
- if (index !== -1) {
- row[dataType.id] = d.scorePerDT[index];
+ if (dataTypeScore) {
+ row[dataType.id] = dataTypeScore.score;
}
});
return row;
});
}
-const ClassicAssociationsTable = ({ ensgId }) => {
+function Legend() {
+ return (
+ <div>
+ <div />
+ No data
+ <div style={{ display: 'flex' }}>
+ <div>0</div>
+ {colorRange.map(color => {
+ return (
+ <div
+ key={color}
+ style={{
+ backgroundColor: color,
+ height: '20px',
+ width: '20px',
+ }}
+ />
+ );
+ })}
+ <div>1</div>
+ </div>
+ Score
+ </div>
+ );
+}
+
+function ClassicAssociationsTable({ ensgId }) {
const classes = useStyles();
const [page, setPage] = useState(0);
const [pageSize, setPageSize] = useState(50);
@@ -368,9 +404,10 @@ const ClassicAssociationsTable = ({ ensgId }) => {
if (error) return null;
const columns = getColumns(ensgId, classes);
- const rows = getRows(data?.target.associatedDiseases ?? []);
+ const rows = getRows(data?.target.associatedDiseases ?? {});
return (
+ <>
<Table
loading={loading}
classes={{ root: classes.root, table: classes.table }}
@@ -383,7 +420,9 @@ const ClassicAssociationsTable = ({ ensgId }) => {
onPageChange={handlePageChange}
onRowsPerPageChange={handleRowsPerPageChange}
/>
+ <Legend />
+ </>
);
-};
+}
export default ClassicAssociationsTable;
| 4 |
diff --git a/source/setup/components/ArchiveTypeChooser.js b/source/setup/components/ArchiveTypeChooser.js @@ -19,16 +19,6 @@ export const ARCHIVE_TYPES = [
title: "Google Drive",
image: require("../../../resources/providers/googledrive-256.png")
},
- {
- type: "owncloud",
- title: "ownCloud",
- image: require("../../../resources/providers/owncloud-256.png")
- },
- {
- type: "nextcloud",
- title: "Nextcloud",
- image: require("../../../resources/providers/nextcloud-256.png")
- },
{
type: "webdav",
title: "WebDAV",
| 2 |
diff --git a/components/Search/index.js b/components/Search/index.js @@ -52,7 +52,10 @@ class Search extends Component {
this.loadFilters = debounce(() => {
this.setState({
- filters: DEFAULT_FILTERS,
+ filters:
+ this.state.filterQuery !== this.state.searchQuery
+ ? DEFAULT_FILTERS
+ : this.state.filters,
filterQuery: this.state.searchQuery,
loadingFilters: false
})
| 1 |
diff --git a/io-manager.js b/io-manager.js @@ -591,11 +591,21 @@ ioManager.bindInput = () => {
const result = geometryManager.geometryWorker.raycastPhysics(geometryManager.physics, position, quaternion);
+ let htmlHover;
if (result) {
const object = world.getObjectFromPhysicsId(result.objectId);
if (object.isHtml) {
- // console.log('update mouse hover', object.isHtml);
+ htmlHover = true;
+ } else {
+ htmlHover = false;
}
+ } else {
+ htmlHover = false;
+ }
+ if (htmlHover) {
+ renderer.domElement.classList.add('hover');
+ } else {
+ renderer.domElement.classList.remove('hover');
}
};
renderer.domElement.addEventListener('mousemove', e => {
@@ -614,6 +624,9 @@ ioManager.bindInput = () => {
ioManager.currentWeaponValue = 0;
ioManager.currentTeleport = false;
});
+ renderer.domElement.addEventListener('mouseout', e => {
+ renderer.domElement.classList.remove('hover');
+ });
renderer.domElement.addEventListener('click', e => {
if (document.pointerLockElement && e.buttons === 0) {
weaponsManager.menuClick();
| 0 |
diff --git a/js/bybit.js b/js/bybit.js @@ -6036,6 +6036,13 @@ module.exports = class bybit extends Exchange {
async fetchDerivativesPositions (symbols = undefined, params = {}) {
await this.loadMarkets ();
+ if (Array.isArray (symbols)) {
+ if (symbols.length > 1) {
+ throw new ArgumentsRequired (this.id + ' fetchPositions() does not accept an array with more than one symbol');
+ }
+ } else if (symbols !== undefined) {
+ symbols = [ symbols ];
+ }
symbols = this.marketSymbols (symbols);
const request = {
'dataFilter': 'valid',
| 7 |
diff --git a/_data/navigation.yml b/_data/navigation.yml @@ -10908,7 +10908,7 @@ op3:
url: /platform/op3/recovery/
children:
- title: "Manual Installation"
- url: /platform/op3/recovery/#manual-installation
+ url: /platform/op3/recovery/#op3-manual-installation
- title: "Recovery of ROBOTIS-OP3"
url: /platform/op3/recovery/#recovery-of-robotis-op3
| 1 |
diff --git a/token-list/tokenlist.json b/token-list/tokenlist.json "symbol": "ARI",
"address": "0x8A8b5318d3A59fa6D1d0A83A1B0506f2796b5670",
"decimals": 8,
- "logoURI": "ipfs://QmaZ2oLuukCaTt9JzkKJ4zy4KLXU84x6pwQ8k7p4ztDimS",
- "tags": {}
+ "logoURI": "ipfs://QmaZ2oLuukCaTt9JzkKJ4zy4KLXU84x6pwQ8k7p4ztDimS"
},
{
"chainId": 1,
| 2 |
diff --git a/source/Overture/views/controls/RichTextView.js b/source/Overture/views/controls/RichTextView.js @@ -51,6 +51,7 @@ var RichTextView = NS.Class({
Mixin: NS.DropTarget,
isFocussed: false,
+ isDisabled: false,
allowTextSelection: true,
@@ -160,8 +161,10 @@ var RichTextView = NS.Class({
className: function () {
return 'v-RichText' +
+ ( this.get( 'isFocussed' ) ? ' is-focussed' : '' ) +
+ ( this.get( 'isDisabled' ) ? ' is-disabled' : '' ) +
( this.get( 'showToolbar' ) ? '' : ' v-RichText--noToolbar' );
- }.property(),
+ }.property( 'isFocussed', 'isDisabled' ),
draw: function ( layer, Element, el ) {
var editorClassName = this.get( 'editorClassName' );
@@ -177,6 +180,7 @@ var RichTextView = NS.Class({
.setHTML( this._value )
.addEventListener( 'input', this )
.addEventListener( 'select', this )
+ .addEventListener( 'cursor', this )
.addEventListener( 'pathChange', this )
.addEventListener( 'undoStateChange', this )
.addEventListener( 'dragover', this )
@@ -184,6 +188,11 @@ var RichTextView = NS.Class({
.didError = NS.RunLoop.didError;
this.set( 'editor', editor )
.set( 'path', editor.getPath() );
+
+ if ( this.get( 'isDisabled' ) ) {
+ this.redrawIsDisabled();
+ }
+
return [
el( 'style', { type: 'text/css' }, [
this.get( 'styles' )
@@ -192,6 +201,16 @@ var RichTextView = NS.Class({
];
},
+ disabledNeedsRedraw: function ( self, property, oldValue ) {
+ this.propertyNeedsRedraw( self, property, oldValue );
+ }.observes( 'isDisabled' ),
+
+ redrawIsDisabled: function () {
+ this._editingLayer.setAttribute( 'contenteditable',
+ this.get( 'isDisabled' ) ? 'false' : 'true'
+ );
+ },
+
// ---
redrawIOSCursor: function () {
| 0 |
diff --git a/src/extensions/renderer/base/coord-ele-math.js b/src/extensions/renderer/base/coord-ele-math.js @@ -1459,6 +1459,9 @@ BRp.findEdgeControlPoints = function( edges ){
}
+ rs.srcIntn = srcOutside;
+ rs.tgtIntn = tgtOutside;
+
if( src === tgt ){
// Self-edge
@@ -2140,6 +2143,8 @@ BRp.findEndpoints = function( edge ){
intersect = [ tgtPos.x, tgtPos.y ];
} else if( tgtManEndpt.units ){
intersect = this.manualEndptToPx( target, tgtManEndpt );
+ } else if( tgtManEndpt.value === 'outside-to-line' ){
+ intersect = rs.tgtIntn; // use cached value from ctrlpt calc
} else {
if( tgtManEndpt.value === 'outside-to-node' ){
p1_i = p1;
@@ -2179,6 +2184,8 @@ BRp.findEndpoints = function( edge ){
intersect = [ srcPos.x, srcPos.y ];
} else if( srcManEndpt.units ){
intersect = this.manualEndptToPx( source, srcManEndpt );
+ } else if( srcManEndpt.value === 'outside-to-line' ){
+ intersect = rs.srcIntn; // use cached value from ctrlpt calc
} else {
if( srcManEndpt.value === 'outside-to-node' ){
p2_i = p2;
| 7 |
diff --git a/src/components/fx/hover.js b/src/components/fx/hover.js @@ -813,7 +813,10 @@ function hoverDataKey(d) {
var EXTRA_STRING_REGEX = /<extra>([\s\S]*)<\/extra>/;
-function createHoverText(hoverData, opts, gd) {
+function createHoverText(allHoverData, opts, gd) {
+ var hoverData = allHoverData.filter(function(d) {
+ return d.hoverinfo !== 'none';
+ });
var fullLayout = gd._fullLayout;
var hovermode = opts.hovermode;
var rotateLabels = opts.rotateLabels;
| 7 |
diff --git a/token-metadata/0x0d438F3b5175Bebc262bF23753C1E53d03432bDE/metadata.json b/token-metadata/0x0d438F3b5175Bebc262bF23753C1E53d03432bDE/metadata.json "symbol": "WNXM",
"address": "0x0d438F3b5175Bebc262bF23753C1E53d03432bDE",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/README.textile b/README.textile @@ -2,6 +2,6 @@ h2. iNaturalist "!https://travis-ci.org/inaturalist/inaturalist.png!":https://t
Open source Rails app behind "iNaturalist.org":https://www.inaturalist.org/
-Want to help out? Fork the project and check out the "Development Setup Guide":http://wiki.github.com/inaturalist/inaturalist/development-setup-guide (might be a bit out of date, contact "kueda":http://github.com/kueda if you hit problems getting set up).
+Want to help out? Fork the project and check out the "Development Setup Guide":https://github.com/inaturalist/inaturalist/wiki/Development-Setup-Guide (might be a bit out of date, contact "kueda":http://github.com/kueda if you hit problems getting set up).
Thinking about running your own version of iNaturalist? Consider joining the "iNaturalist Network":https://www.inaturalist.org/pages/network instead of forking the community.
| 1 |
diff --git a/src/docs/deployment.md b/src/docs/deployment.md @@ -36,7 +36,7 @@ hosts:
url: https://begin.com/
screenshotSize: medium
clis:
- - name: Netlify Command Line
+ - name: Netlify CLI
url: https://www.netlify.com/products/cli/
screenshotSize: medium
- name: Vercel CLI
| 4 |
diff --git a/src/logEvents.js b/src/logEvents.js @@ -20,7 +20,7 @@ export default function(enable) {
var string = '';
string += 'Event ';
string += format(' >2')(i) + ' ';
- string += (eventType + ' ').slice(0, maxEventTypeLength + 1) + ' ';
+ string += eventType + ' '.repeat(maxEventTypeLength - eventType.length);
string += format(' >5')(t - t0) + ' ';
if (eventType != 'initEnd') {
string += format(' >5')(t - times['start'][seqNo]);
| 9 |
diff --git a/Dockerfile b/Dockerfile @@ -55,7 +55,7 @@ LABEL maintainer="Reaction Commerce <[email protected]>" \
com.reactioncommerce.docker.license=$LICENSE
# Needed in build npm command.
-RUN apk add --no-cache rsync python build-base
+RUN apk add --no-cache rsync
WORKDIR $APP_SOURCE_DIR/..
COPY package.json yarn.lock $APP_SOURCE_DIR/../
| 2 |
diff --git a/src/botPage/view/TradeInfoPanel/TradeTable.js b/src/botPage/view/TradeInfoPanel/TradeTable.js @@ -175,7 +175,6 @@ export default class TradeTable extends Component {
}
const { accountID } = this.props;
- const { id } = this.state[accountID];
const rows = this.state[accountID].rows.slice();
const updatedRows = rows.map(row => {
@@ -192,7 +191,7 @@ export default class TradeTable extends Component {
return row;
});
- this.setState({ [accountID]: { id, rows: updatedRows } });
+ this.setState({ [accountID]: { rows: updatedRows } });
});
}
@@ -205,8 +204,13 @@ export default class TradeTable extends Component {
export() {
const { accountID } = this.props;
+ const rows = this.state[accountID].rows.map((item, index) => {
+ const row = item;
+ row.id = index + 1;
+ return row;
+ });
const data = json2csv({
- data : this.state[accountID].rows,
+ data : rows,
fields: [
'id',
'timestamp',
| 3 |
diff --git a/contribs/gmf/src/query/gridComponent.js b/contribs/gmf/src/query/gridComponent.js @@ -254,9 +254,9 @@ export function QueryGridController($injector, $scope, ngeoQueryResult, ngeoMapQ
this.removeEmptyColumns_ = false;
/**
- * @type {?number}
+ * @type {number}
*/
- this.maxRecenterZoom = null;
+ this.maxRecenterZoom;
/**
* @type {GridMergeTabs}
@@ -334,7 +334,7 @@ export function QueryGridController($injector, $scope, ngeoQueryResult, ngeoMapQ
/**
* @type {function():number}
*/
- this.maxRecenterZoomFn = () => null;
+ this.maxRecenterZoomFn = () => undefined;
/**
* @type {?() => olStyleStyle}
*/
@@ -970,9 +970,6 @@ QueryGridController.prototype.zoomToSelection = function() {
if (!size) {
throw new Error('Missing size');
}
- if (this.maxRecenterZoom === null) {
- throw new Error('Missing maxRecenterZoom');
- }
this.map_.getView().fit(extent, {size, maxZoom: this.maxRecenterZoom});
}
};
| 12 |
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js @@ -444,7 +444,7 @@ module.exports = class MetamaskController extends EventEmitter {
// create filter polyfill middleware
const filterMiddleware = createFilterMiddleware({
provider: this.provider,
- blockTracker: this.blockTracker,
+ blockTracker: this.provider._blockTracker,
})
engine.push(createOriginMiddleware({ origin }))
| 4 |
diff --git a/ui/component/channelStakedIndicator/view.jsx b/ui/component/channelStakedIndicator/view.jsx @@ -17,16 +17,16 @@ function getChannelLevel(amount: number): number {
let level = 1;
switch (true) {
- case amount >= 10 && amount < 1000:
+ case amount >= 1 && amount < 50:
level = 2;
break;
- case amount >= 1000 && amount < 10000:
+ case amount >= 50 && amount < 250:
level = 3;
break;
- case amount >= 10000 && amount < 500000:
+ case amount >= 100 && amount < 1000:
level = 4;
break;
- case amount > 500000:
+ case amount > 1000:
level = 5;
break;
}
| 12 |
diff --git a/Changelog.md b/Changelog.md and mysql_native_password as default plugins.
Added tests for mysql 8 and ssl. Mysql 8 server
now supported with default settings. #1021, #906, #991
- - MAJOR: LOCAL INFILE does not write to local
+ - MAJOR: LOCAL INFILE does read from to local #1034
fs now and requires `infileStreamFactory` option
- Update to 2019 CA Amazon RDS certificates #1032
- Update SSL Profile for AWS Serverless Aurora #1026
| 3 |
diff --git a/PostTimelineFilters.user.js b/PostTimelineFilters.user.js // @description Inserts several filter options for post timelines
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.17.3
+// @version 1.17.4
//
// @include https://*stackoverflow.com/*
// @include https://*serverfault.com/*
// Pre-trim certain elements once on page load to make filtering less complicated
$('span.event-type, td.event-verb span a').text((i, v) => '' + v.trim());
$('td.event-type, td.event-verb span').filter((i, el) => el.children.length === 0).text((i, v) => '' + v.trim());
- $('td.event-comment span').filter((i, el) => el.innerText.trim() == '').remove();
+ $('td.event-comment span').not('.badge-earned-check').filter((i, el) => el.innerText.trim() == '').remove();
$('td.event-comment span div.mt6').each(function(i, el) { $(this).appendTo(el.parentNode.parentNode); });
// Rename "CommentNoLongerNeeded" event-verb to take up less space
| 8 |
diff --git a/rig.js b/rig.js @@ -3,7 +3,7 @@ import {GLTFLoader} from './GLTFLoader.js';
import cameraManager from './camera-manager.js';
import {makeTextMesh, makeRigCapsule} from './vr-ui.js';
import {makePromise, /*WaitQueue, */downloadFile} from './util.js';
-import {renderer, scene, appManager} from './app-object.js';
+import {renderer, scene, dolly, appManager} from './app-object.js';
import runtime from './runtime.js';
import Avatar from './avatars/avatars.js';
import physicsMananager from './physics-manager.js';
@@ -355,11 +355,17 @@ class RigManager {
}
update() {
- const currentPosition = this.localRig.inputs.hmd.position;
- const currentQuaternion = this.localRig.inputs.hmd.quaternion;
- const positionDiff = localVector.copy(this.lastPosition)
+ let currentPosition, currentQuaternion;
+ if (!renderer.xr.getSession()) {
+ currentPosition = this.localRig.inputs.hmd.position;
+ currentQuaternion = this.localRig.inputs.hmd.quaternion;
+ } else {
+ currentPosition = localVector.copy(dolly.position).multiplyScalar(4);
+ currentQuaternion = dolly.quaternion;
+ }
+ const positionDiff = localVector2.copy(this.lastPosition)
.sub(currentPosition)
- .multiplyScalar(20);
+ .multiplyScalar(15);
this.smoothVelocity.lerp(positionDiff, 0.5);
localEuler.setFromQuaternion(currentQuaternion, 'YXZ');
localEuler.x = 0;
@@ -368,8 +374,8 @@ class RigManager {
this.smoothVelocity.applyEuler(localEuler2.set(-localEuler.x, -localEuler.y, -localEuler.z, localEuler.order));
this.lastPosition.copy(currentPosition);
- this.localRig.setTopEnabled(!!renderer.xr.getSession() || /^(?:firstperson|thirdperson)$/.test(cameraManager.getTool()));
- this.localRig.setBottomEnabled(!renderer.xr.getSession() && (this.localRig.getTopEnabled() && this.smoothVelocity.length() < 0.001));
+ this.localRig.setTopEnabled(/^(?:firstperson|thirdperson)$/.test(cameraManager.getTool()));
+ this.localRig.setBottomEnabled(this.localRig.getTopEnabled() && this.smoothVelocity.length() < 0.001);
this.localRig.direction.copy(positionDiff);
this.localRig.velocity.copy(this.smoothVelocity);
this.localRig.update();
| 0 |
diff --git a/content/components/direction-links/default.md b/content/components/direction-links/default.md @@ -10,7 +10,7 @@ code:
-->
<a class="au-direction-link" href="#">
- Back<span class="au-direction-link__arrow au-direction-link__arrow--left" aria-hidden="true"></span>
+ <span class="au-direction-link__arrow au-direction-link__arrow--left" aria-hidden="true"></span>Back
</a>
<a class="au-direction-link" href="#">
Next<span class="au-direction-link__arrow" aria-hidden="true"></span>
| 5 |
diff --git a/OurUmbraco.Site/config/YouTubePlaylists.json b/OurUmbraco.Site/config/YouTubePlaylists.json "title": "uHangout",
"members": [ 1175 ]
},
- {
- "id": "PL9uZoG6lhmR1ZZ7lKjINyYEAviZb40vLI",
- "title": "Kevin Giszewski",
- "members": [ 51046 ]
- },
{
"id": "PLBhJTkSetty35s_17snA-a5d6dHiW--2y",
"title": "Umbraco Festival Deutschland",
| 2 |
diff --git a/packages/table-core/src/features/Pinning.ts b/packages/table-core/src/features/Pinning.ts @@ -202,7 +202,7 @@ export const Pinning: TableFeature = {
columnId => allCells.find(cell => cell.column.id === columnId)!
)
.filter(Boolean)
- .map(d => ({ ...d, position: 'left' } as Cell<TData, unknown>))
+ .map(d => ({ ...d, position: 'right' } as Cell<TData, unknown>))
return cells
},
| 1 |
diff --git a/editor.js b/editor.js @@ -33,6 +33,38 @@ const ghDownload = ghDownloadDirectory.default;
// window.ghDownload = ghDownload;
const htmlRenderer = new HtmlRenderer();
+class GlobalState {
+ constructor() {
+ this.specs = {};
+ }
+ useState(key, initialValue) {
+ const result = useState(initialValue);
+ const [value, setter] = result;
+ this.specs[key] = {
+ value,
+ setter,
+ };
+ return result;
+ }
+ get(key) {
+ const spec = this.specs[key];
+ if (spec) {
+ return spec.value;
+ } else {
+ throw new Error('setting nonexistent state: ' + key);
+ }
+ }
+ set(key, value) {
+ const spec = this.specs[key];
+ if (spec) {
+ spec.setter(value);
+ } else {
+ throw new Error('setting nonexistent state: ' + key);
+ }
+ }
+}
+const globalState = new GlobalState();
+
const testImgUrl = window.location.protocol + '//' + window.location.host + '/assets/popup3.svg';
const testUserImgUrl = `https://preview.exokit.org/[https://app.webaverse.com/assets/type/robot.glb]/preview.png?width=128&height=128`;
| 0 |
diff --git a/src/core/Core.test.js b/src/core/Core.test.js @@ -21,11 +21,6 @@ describe('src/Core', () => {
jest.spyOn(utils, 'findDOMElement').mockImplementation(path => {
return 'some config...'
})
- jest.spyOn(utils, 'createThumbnail').mockImplementation(path => {
- return Promise.resolve(`data:image/jpeg;base64,${sampleImage.toString('base64')}`)
- })
- utils.createThumbnail.mockClear()
-
global.URL.createObjectURL = jest.fn().mockReturnValue('newUrl')
})
| 2 |
diff --git a/server/game/game.js b/server/game/game.js @@ -27,7 +27,7 @@ const EventWindow = require('./gamesteps/EventWindow.js');
const AtomicEventWindow = require('./gamesteps/atomiceventwindow.js');
const SimultaneousEventWindow = require('./gamesteps/simultaneouseventwindow.js');
const CardLeavesPlayEventWindow = require('./gamesteps/cardleavesplayeventwindow.js');
-const InitateAbilityEventWindow = require('./gamesteps/initiateabilityeventwindow.js');
+const InitateAbilityEventWindow = require('./gamesteps/InitiateAbilityEventWindow.js');
const AbilityResolver = require('./gamesteps/abilityresolver.js');
const ForcedTriggeredAbilityWindow = require('./gamesteps/forcedtriggeredabilitywindow.js');
const TriggeredAbilityWindow = require('./gamesteps/triggeredabilitywindow.js');
| 10 |
diff --git a/src/renderer/layer/CanvasRenderer.js b/src/renderer/layer/CanvasRenderer.js @@ -5,67 +5,6 @@ import Promise from 'core/Promise';
import Canvas2D from 'core/Canvas';
import Point from 'geo/Point';
-export class ResourceCache {
- constructor() {
- this.resources = {};
- this._errors = {};
- }
-
- addResource(url, img) {
- this.resources[url[0]] = {
- image: img,
- width: +url[1],
- height: +url[2]
- };
- }
-
- isResourceLoaded(url, checkSVG) {
- if (!url) {
- return false;
- }
- if (this._errors[this._getImgUrl(url)]) {
- return true;
- }
- var img = this.resources[this._getImgUrl(url)];
- if (!img) {
- return false;
- }
- if (checkSVG && isSVG(url[0]) && (+url[1] > img.width || +url[2] > img.height)) {
- return false;
- }
- return true;
- }
-
- getImage(url) {
- if (!this.isResourceLoaded(url) || this._errors[this._getImgUrl(url)]) {
- return null;
- }
- return this.resources[this._getImgUrl(url)].image;
- }
-
- markErrorResource(url) {
- this._errors[this._getImgUrl(url)] = 1;
- }
-
- merge(res) {
- if (!res) {
- return this;
- }
- for (var p in res.resources) {
- var img = res.resources[p];
- this.addResource([p, img.width, img.height], img.image);
- }
- return this;
- }
-
- _getImgUrl(url) {
- if (!Array.isArray(url)) {
- return url;
- }
- return url[0];
- }
-}
-
/**
* @classdesc
* Base Class to render layer on HTMLCanvasElement
@@ -106,7 +45,9 @@ class CanvasRenderer extends Class {
return;
}
if (!this.resources) {
+ /* eslint-disable no-use-before-define */
this.resources = new ResourceCache();
+ /* eslint-enable no-use-before-define */
}
if (this.checkResources && isCheckRes) {
var me = this,
@@ -308,14 +249,14 @@ class CanvasRenderer extends Class {
}
var map = this.getMap();
var size = map.getSize();
- var r = Browser.retina ? 2 : 1;
+ var r = Browser.retina ? Browser.pixelRatio : 1;
this.canvas = Canvas2D.createCanvas(r * size['width'], r * size['height'], map.CanvasClass);
this.context = this.canvas.getContext('2d');
if (this.layer.options['globalCompositeOperation']) {
this.context.globalCompositeOperation = this.layer.options['globalCompositeOperation'];
}
if (Browser.retina) {
- this.context.scale(2, 2);
+ this.context.scale(r, r);
}
Canvas2D.setDefaultCanvasSetting(this.context);
if (this.onCanvasCreate) {
@@ -338,7 +279,7 @@ class CanvasRenderer extends Class {
} else {
size = canvasSize;
}
- var r = Browser.retina ? 2 : 1;
+ var r = Browser.retina ? Browser.pixelRatio : 1;
//only make canvas bigger, never smaller
if (this.canvas.width >= r * size['width'] && this.canvas.height >= r * size['height']) {
return;
@@ -347,7 +288,7 @@ class CanvasRenderer extends Class {
this.canvas.height = r * size['height'];
this.canvas.width = r * size['width'];
if (Browser.retina) {
- this.context.scale(2, 2);
+ this.context.scale(r, r);
}
}
@@ -675,3 +616,66 @@ class CanvasRenderer extends Class {
}
export default CanvasRenderer;
+
+export class ResourceCache {
+ constructor() {
+ this.resources = {};
+ this._errors = {};
+ }
+
+ addResource(url, img) {
+ this.resources[url[0]] = {
+ image: img,
+ width: +url[1],
+ height: +url[2]
+ };
+ }
+
+ isResourceLoaded(url, checkSVG) {
+ if (!url) {
+ return false;
+ }
+ var imgUrl = this._getImgUrl(url);
+ if (this._errors[imgUrl]) {
+ return true;
+ }
+ var img = this.resources[imgUrl];
+ if (!img) {
+ return false;
+ }
+ if (checkSVG && isSVG(url[0]) && (+url[1] > img.width || +url[2] > img.height)) {
+ return false;
+ }
+ return true;
+ }
+
+ getImage(url) {
+ var imgUrl = this._getImgUrl(url);
+ if (!this.isResourceLoaded(url) || this._errors[imgUrl]) {
+ return null;
+ }
+ return this.resources[imgUrl].image;
+ }
+
+ markErrorResource(url) {
+ this._errors[this._getImgUrl(url)] = 1;
+ }
+
+ merge(res) {
+ if (!res) {
+ return this;
+ }
+ for (var p in res.resources) {
+ var img = res.resources[p];
+ this.addResource([p, img.width, img.height], img.image);
+ }
+ return this;
+ }
+
+ _getImgUrl(url) {
+ if (!Array.isArray(url)) {
+ return url;
+ }
+ return url[0];
+ }
+}
| 5 |
diff --git a/Specs/Scene/GltfBufferViewLoaderSpec.js b/Specs/Scene/GltfBufferViewLoaderSpec.js @@ -39,34 +39,34 @@ describe("Scene/GltfBufferViewLoader", function () {
};
var meshoptGltfEmbedded = {
- buffers: [{ byteLength: 108 }, { byteLength: 136 }],
+ buffers: [{ byteLength: 29 }, { byteLength: 360 }],
bufferViews: [
{
buffer: 1,
- byteOffset: 0,
- byteLength: 64,
+ byteOffset: 96,
+ byteLength: 192,
byteStride: 8,
target: 34962,
extensions: {
EXT_meshopt_compression: {
buffer: 0,
byteOffset: 0,
- byteLength: 76,
+ byteLength: 124,
byteStride: 8,
mode: "ATTRIBUTES",
- count: 8,
+ count: 24,
},
},
},
{
buffer: 1,
- byteOffset: 64,
+ byteOffset: 288,
byteLength: 72,
target: 34963,
extensions: {
EXT_meshopt_compression: {
buffer: 0,
- byteOffset: 76,
+ byteOffset: 0,
byteLength: 29,
byteStride: 2,
mode: "TRIANGLES",
@@ -76,15 +76,24 @@ describe("Scene/GltfBufferViewLoader", function () {
},
],
};
- var meshoptBufferBase64 =
- "oAEZhAAAAT/MAAB+fX59fgEGEAAAAQ8wAAB+fX4BAgYAAAEDDwAAfX59AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/z8AAOHwICABMAIwFSAWJBYAdodWZ3iphmWJaJgBaQAAAAAA";
- var meshoptDecodedPositionBase64 =
- "AAAAAP8/AAD/PwAA/z8AAAAA/z//PwAA/z8AAAAAAAAAAAAAAAAAAAAA/z8AAAAA/z//P/8/AAD/P/8/AAAAAA==";
- var meshoptTypedArray = Uint8Array.from(atob(meshoptBufferBase64), function (
- c
- ) {
+
+ function getBase64FromTypedArray(typedArray) {
+ return btoa(String.fromCharCode.apply(null, typedArray));
+ }
+
+ function getTypedArrayFromBase64(base64) {
+ return Uint8Array.from(atob(base64), function (c) {
return c.charCodeAt(0);
});
+ }
+
+ var fallbackPositionBufferBase64 =
+ "AAD/P/8/AAD/P/8//z8AAAAA/z8AAAAA/z//PwAAAAD/P/8//z8AAAAA/z//PwAA/z8AAP8/AAAAAAAA/z8AAP8//z8AAAAA/z//P/8/AAD/PwAAAAAAAP8/AAD/PwAAAAD/PwAAAAD/P/8/AAAAAAAAAAAAAAAA/z8AAAAAAAAAAP8//z8AAAAA/z8AAAAAAAAAAP8/AAAAAAAAAAAAAAAAAAD/PwAAAAAAAAAAAAD/PwAA/z8AAP8/AAAAAAAA";
+ var meshoptPositionBufferBase64 =
+ "oAUZJkCZgAQAAAU/P8D/fn1+fX59fn1+fX7ADAAAfX4FAAhISEgAAAAFAAzMzH1+fX59zAAAAH59BQhAmYBmZgAABQzA/8B9fn1+fX59//8AAH59fn1+fX59AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP8//z8AAA==";
+ var meshoptPositionTypedArray = getTypedArrayFromBase64(
+ meshoptPositionBufferBase64
+ );
var bufferTypedArray = new Uint8Array([1, 3, 7, 15, 31, 63, 127, 255]);
var bufferArrayBuffer = bufferTypedArray.buffer;
@@ -262,11 +271,11 @@ describe("Scene/GltfBufferViewLoader", function () {
});
});
- it("decodes bufferView with EXT_meshopt_compression", function () {
+ it("decodes positions with EXT_meshopt_compression", function () {
ResourceCache.loadEmbeddedBuffer({
parentResource: gltfResource,
bufferId: 0,
- typedArray: meshoptTypedArray,
+ typedArray: meshoptPositionTypedArray,
});
var bufferViewLoader = new GltfBufferViewLoader({
@@ -281,10 +290,10 @@ describe("Scene/GltfBufferViewLoader", function () {
bufferViewLoader.process({});
return bufferViewLoader.promise.then(function (bufferViewLoader) {
- var positionBase64 = btoa(
- String.fromCharCode.apply(null, bufferViewLoader.typedArray)
+ var decodedPositionBase64 = getBase64FromTypedArray(
+ bufferViewLoader.typedArray
);
- expect(positionBase64).toEqual(meshoptDecodedPositionBase64);
+ expect(decodedPositionBase64).toEqual(fallbackPositionBufferBase64);
});
});
| 1 |
diff --git a/accessibility-checker-engine/src/v2/checker/accessibility/util/legacy.ts b/accessibility-checker-engine/src/v2/checker/accessibility/util/legacy.ts @@ -2717,23 +2717,12 @@ export class RPTUtil {
const id = walkNode.getAttribute("id");
if (id) {
const aria_owns_elem = walkNode.ownerDocument.querySelector('[aria-owns="' + id + '"]');
- }
+ if (aria_owns_elem)
+ walkNode = aria_owns_elem;
+ else
+ walkNode = DOMUtil.parentElement(walkNode);
+ } else
walkNode = DOMUtil.parentElement(walkNode);
- }
- return false;
- }
-
- /**
- * check if the element is referred to by aria-wons
- * @param element
- * @returns
- */
- public static isElementAriaOwned(element : HTMLElement) : boolean {
- const id = element.getAttribute("id");
- if (id) {
- const aria_owns_elem = element.ownerDocument.querySelectorAll('[aria-owns="' + id + '"]');
- if (aria_owns_elem && aria_owns_elem.length > 0)
- return true;
}
return false;
}
| 3 |
diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/packageService.js @@ -207,7 +207,7 @@ module.exports = {
params.include.forEach((pattern) => {
patterns.push(pattern);
});
- return globby(params.include.concat(['**']), {
+ return globby(['**'].concat(params.include), {
cwd: path.join(this.serverless.config.servicePath, prefix || ''),
dot: true,
silent: true,
| 11 |
diff --git a/ui/js/lbry.js b/ui/js/lbry.js @@ -318,7 +318,7 @@ lbry._balanceSubscribeInterval = 5000;
lbry._balanceUpdateInterval = null;
lbry._updateBalanceSubscribers = function() {
- lbry.get_balance().then(function(balance) {
+ lbry.wallet_balance().then(function(balance) {
for (let callback of Object.values(lbry._balanceSubscribeCallbacks)) {
callback(balance);
}
| 10 |
diff --git a/src/components/ContentBody/Image.js b/src/components/ContentBody/Image.js @@ -9,19 +9,11 @@ const Image = ({ data }) => (
<Img
fluid={data.relationships.field_image.localFile.childImageSharp.fluid}
css={css`
- margin-bottom: 70px;
+ margin: 0 20px 70px;
${mediaQueries.phoneLarge} {
${container.min};
- margin-bottom: 70px;
- }
-
- img {
- padding: 0 20px;
-
- ${mediaQueries.phoneLarge} {
- padding: 0;
- }
+ margin: 0 auto 70px;
}
`}
/>
| 14 |
diff --git a/assets/lib/fuc.js.php b/assets/lib/fuc.js.php @@ -18,7 +18,18 @@ if (isset($_REQUEST['url'])) {
}
$url = $_REQUEST['url'];
- $content = '';
+ $content = null;
+
+ if (!filter_var($url, FILTER_VALIDATE_URL)) {
+ header('HTTP/1.0 400 Bad Request');
+ return;
+ }
+
+ // allow only http requests
+ if (!preg_match('#^http(|s)\://#', $url)) {
+ header('HTTP/1.0 403 Forbidden');
+ return;
+ }
if (function_exists('curl_exec')){
$conn = curl_init($url);
@@ -32,9 +43,11 @@ if (isset($_REQUEST['url'])) {
$content = curl_exec($conn);
curl_close($conn);
}
+
if (!$content && function_exists('file_get_contents')){
$content = @file_get_contents($url);
}
+
if (!$content && function_exists('fopen') && function_exists('stream_get_contents')){
$handle = @fopen ($url, "r");
$content = @stream_get_contents($handle);
| 1 |
diff --git a/src/js/player.js b/src/js/player.js @@ -574,7 +574,7 @@ class MediaElementPlayer {
t = this,
autoplayAttr = domNode.getAttribute('autoplay'),
autoplay = !(autoplayAttr === undefined || autoplayAttr === null || autoplayAttr === 'false'),
- isNative = media.rendererName !== null && /(native|html5)/i.test(t.media.rendererName)
+ isNative = media.rendererName !== null && /(native|html5)/i.test(media.rendererName)
;
if (t.getElement(t.controls)) {
| 4 |
diff --git a/packages/http-json-body-parser/index.js b/packages/http-json-body-parser/index.js @@ -10,7 +10,11 @@ module.exports = (opts) => ({
const { type } = contentType.parse(contentTypeHeader)
if (type === 'application/json') {
try {
- handler.event.body = JSON.parse(handler.event.body, opts.reviver)
+ const data = handler.event.isBase64Encoded
+ ? Buffer.from(handler.event.body, 'base64').toString()
+ : handler.event.body
+
+ handler.event.body = JSON.parse(data, opts.reviver)
} catch (err) {
throw new createError.UnprocessableEntity('Content type defined as JSON but an invalid JSON was provided')
}
| 9 |
diff --git a/js/base/Exchange.js b/js/base/Exchange.js @@ -2361,9 +2361,9 @@ module.exports = class Exchange {
}
checkOrderTypeAndPrice (type, price) {
- if (type === 'limit') {
if (price === undefined) {
- throw new ArgumentRequired (this.id + ' createOrder() requires a price argument for a limit order');
+ if (type === 'limit') {
+ throw new ArgumentsRequired (this.id + ' createOrder() requires a price argument for a limit order');
}
}
}
| 14 |
diff --git a/webpack.config.js b/webpack.config.js @@ -32,7 +32,6 @@ const WebpackBar = require( 'webpackbar' );
const { DefinePlugin, ProvidePlugin } = require( 'webpack' );
const CreateFileWebpack = require( 'create-file-webpack' );
const ManifestPlugin = require( 'webpack-manifest-plugin' );
-const ImageminPlugin = require( 'imagemin-webpack' );
const features = require( './feature-flags.json' );
const projectPath = ( relativePath ) => {
@@ -192,35 +191,6 @@ const webpackConfig = ( env, argv ) => {
performance: {
maxEntrypointSize: 175000,
},
- module: {
- rules: [
- ...rules,
- {
- test: /\.(png|jpg)$/i,
- use: [
- {
- loader: 'file-loader',
- options: {
- name: '[name].[ext]',
- publicPath: 'images/',
- outputPath: '../images',
- },
- },
- {
- loader: ImageminPlugin.loader,
- options: {
- imageminOptions: {
- plugins: [
- 'jpegtran',
- 'optipng',
- ],
- },
- },
- },
- ],
- },
- ],
- },
plugins: [
new ProvidePlugin( {
React: 'react',
| 2 |
diff --git a/node_common/link-utilities.js b/node_common/link-utilities.js @@ -11,7 +11,7 @@ import multihashing from "multihashing-async";
export const fetchLinkData = async (url) => {
try {
const { status, data, response } = await microlink(url, {
- screenshot: true,
+ // screenshot: true,
apiKey: Environment.MICROLINK_API_KEY,
});
if (status !== "success") {
| 2 |
diff --git a/src/components/core/update/updateSize.js b/src/components/core/update/updateSize.js @@ -10,7 +10,7 @@ export default function updateSize() {
} else {
width = $el[0].clientWidth;
}
- if (typeof swiper.params.height !== 'undefined' && swiper.params.width !== null) {
+ if (typeof swiper.params.height !== 'undefined' && swiper.params.height !== null) {
height = swiper.params.height;
} else {
height = $el[0].clientHeight;
| 1 |
diff --git a/articles/connector/install-other-platforms.md b/articles/connector/install-other-platforms.md @@ -27,7 +27,7 @@ For most platforms, you will need to run the required commands with root privile
> npm install
```
-3. Start your server:
+3. Start your server.
```text
> node server.js
@@ -67,6 +67,8 @@ For most platforms, you will need to run the required commands with root privile
})
</script>
+7. Run `node admin/server.js` to access the admin UI -- the admin UI will be running and available on `http://localhost:8357`.
+
#### Notes
* If you get an `Invalid Ticket` message when configuring the Connector for the first time, the most likely cause is a network issue (for example, you have the Connector running behind a proxy). Try troubleshooting by connecting to `https://your_tenant.auth0.com/testall` with a browser other than Internet Explorer.
| 0 |
diff --git a/README.md b/README.md @@ -10,6 +10,8 @@ View the app: :point_right: [https://quiz.typeofnan.dev](https://quiz.typeofnan.
[](https://github.com/nas5w/typeofnan-javascript-quizzes/issues) [](https://github.com/nas5w/typeofnan-javascript-quizzes/network) [](https://github.com/nas5w/typeofnan-javascript-quizzes/stargazers) [](https://github.com/nas5w/typeofnan-javascript-quizzes/blob/master/LICENSE)
+<hr />
+
# :rocket: How to run the app locally
In order to use this app locally, the package manager _yarn_ needs to be installed
| 0 |
diff --git a/components/head.js b/components/head.js @@ -4,9 +4,8 @@ import PropTypes from 'prop-types'
import theme from '../styles/theme'
import Container from './container'
-import BetaRibbon from './beta-ribbon'
-const Head = ({title, icon, isBeta}) => (
+const Head = ({title, icon}) => (
<div>
<div className='head'>
<Container>
@@ -15,10 +14,6 @@ const Head = ({title, icon, isBeta}) => (
<div className='icon'>{icon}</div>
<h1>{title}</h1>
</div>
-
- {isBeta && (
- <BetaRibbon />
- )}
</div>
</Container>
</div>
@@ -57,12 +52,7 @@ const Head = ({title, icon, isBeta}) => (
Head.propTypes = {
title: PropTypes.string.isRequired,
- icon: PropTypes.element.isRequired,
- isBeta: PropTypes.bool
-}
-
-Head.defaultProps = {
- isBeta: false
+ icon: PropTypes.element.isRequired
}
export default Head
| 2 |
diff --git a/app/components/layout/Navigation/index.js b/app/components/layout/Navigation/index.js @@ -212,7 +212,7 @@ class Navigation extends React.Component {
any: true,
render: () => {
return [
- <NavigationButton key={1} className="py0" href={`/organizations/${organization.slug}/users`}>Users</NavigationButton>,
+ <NavigationButton key={1} className="py0" href={`/organizations/${organization.slug}/users`} linkIf={Features.NewAccountMemberSettings}>Users</NavigationButton>,
<NavigationButton key={2} className="py0" href={`/organizations/${organization.slug}/settings`}>Settings</NavigationButton>
];
}
| 4 |
diff --git a/README.md b/README.md Agoric's Cosmic SwingSet enables developers to test smart contracts build with [ERTP](https://github.com/Agoric/ERTP) in various blockchain setup environments
This repository currently hosts various pieces:
-- Code to set up a "solo node" (a client program which purpose is to discuss with a blockchain on a testnet)
+- Code to set up a **solo node** (a local peer which can host objects for testing or interaction with a blockchain)
- Code and tools to set up a testnet on your machine
- Code that runs the server-side Pixel Demo on the solo node
- Code that runs in a web browser and interacts with the server-side of the Pixel Demo
| 7 |
diff --git a/src/pages/ReimbursementAccount/RequestorStep.js b/src/pages/ReimbursementAccount/RequestorStep.js @@ -154,7 +154,9 @@ class RequestorStep extends React.Component {
onCloseButtonPress={Navigation.dismissModal}
/>
{shouldShowOnfido ? (
- <RequestorOnfidoStep onComplete={this.setOnfidoAsComplete} />
+ <RequestorOnfidoStep
+ onComplete={this.setOnfidoAsComplete}
+ />
) : (
<Form
formID={ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM}
@@ -210,7 +212,9 @@ class RequestorStep extends React.Component {
defaultValue={this.getDefaultStateForField('isControllingOfficer', false)}
LabelComponent={() => (
<View style={[styles.flex1, styles.pr1]}>
- <Text>{this.props.translate('requestorStep.isControllingOfficer')}</Text>
+ <Text>
+ {this.props.translate('requestorStep.isControllingOfficer')}
+ </Text>
</View>
)}
style={[styles.mt4]}
@@ -226,11 +230,19 @@ class RequestorStep extends React.Component {
{`${this.props.translate('onfidoStep.facialScan')}`}
</Text>
{', '}
- <Text onPress={() => Link.openExternalLink('https://onfido.com/privacy/')} style={[styles.textMicro, styles.link]} accessibilityRole="link">
+ <Text
+ onPress={() => Link.openExternalLink('https://onfido.com/privacy/')}
+ style={[styles.textMicro, styles.link]}
+ accessibilityRole="link"
+ >
{`${this.props.translate('common.privacyPolicy')}`}
</Text>
{` ${this.props.translate('common.and')} `}
- <Text onPress={() => Link.openExternalLink('https://onfido.com/terms-of-service/')} style={[styles.textMicro, styles.link]} accessibilityRole="link">
+ <Text
+ onPress={() => Link.openExternalLink('https://onfido.com/terms-of-service/')}
+ style={[styles.textMicro, styles.link]}
+ accessibilityRole="link"
+ >
{`${this.props.translate('common.termsOfService')}`}
</Text>
</Text>
| 13 |
diff --git a/packages/turf-point-to-line-distance/index.d.ts b/packages/turf-point-to-line-distance/index.d.ts /// <reference types="geojson" />
-type Feature = GeoJSON.Feature<any> | GeoJSON.GeometryObject;
+import {Units} from '@turf/helpers'
+
+type Point = GeoJSON.Feature<GeoJSON.Point> | GeoJSON.Point | number[];
+type LineString = GeoJSON.LineString;
/**
* http://turfjs.org/docs/#pointto-line-distance
*/
-declare function pointToLineDistance(feature1: Feature, feature2: Feature): boolean;
+declare function pointToLineDistance(
+ point: Point,
+ line: LineString,
+ units?: Units,
+ mercator?: boolean): number;
+
declare namespace pointToLineDistance { }
export = pointToLineDistance;
| 12 |
diff --git a/userscript.user.js b/userscript.user.js @@ -58977,7 +58977,41 @@ var $$IMU_EXPORT$$;
return src.replace(/\/preview_(slide_[0-9]+\.[^/.]+)(?:[?#].*)?$/, "/$1");
}
- if (domain === "peertube.linuxrocks.online") {
+ if (domain === "peertube.linuxrocks.online" ||
+ // https://peertube.live/static/thumbnails/bcc1c74b-fefe-4092-aab7-17bb18cb09ab.jpg
+ // https://peertube.debian.social/static/webseed/bcc1c74b-fefe-4092-aab7-17bb18cb09ab-720.mp4
+ domain_nowww === "peertube.live" ||
+ // https://peertube.video/static/thumbnails/1cc6b4cd-ac16-4300-8adc-d9df3fb4f0af.jpg
+ domain_nowww === "peertube.video" || // contains links to other peertube instances, useful for finding new domains
+ // https://peertube.nocturlab.fr/static/webseed/1cc6b4cd-ac16-4300-8adc-d9df3fb4f0af-720.mp4
+ domain_nowww === "peertube.nocturlab.fr" ||
+ // https://peertube.debian.social/static/webseed/1f31fce7-f2b2-48fd-9b58-f1404df7c60c-576.mp4
+ domain === "peertube.debian.social" ||
+ // https://bittube.video/static/webseed/64546964-fe85-4505-957b-bea15628e53e-480.mp4
+ domain_nowww === "bittube.video" ||
+ // https://toobnix.org/static/webseed/1f997b3c-00dc-4f7d-b2ce-74538c194fa7-1080.mp4
+ domain_nowww === "toobnix.org" ||
+ domain === "pt.pube.tk" ||
+ // https://framatube.org/static/webseed/9c9de5e8-0a1e-484a-b099-e80766180a6d-1080.mp4
+ domain_nowww === "framatube.org" ||
+ // https://peertube.gegeweb.eu/static/webseed/755d0a1c-2fe8-4839-b802-912c9fd6fe83-360.mp4
+ domain === "peertube.gegeweb.eu" ||
+ // https://peer.hostux.social/static/webseed/7f0b04f7-1774-4597-95c3-47ad1e253027-1080.mp4
+ domain === "peer.hostux.social" ||
+ // https://banneddata.me/static/thumbnails/ab46d9b9-d9fd-4555-8d22-8d4b534867a8.jpg
+ // https://banneddata.me/static/webseed/ab46d9b9-d9fd-4555-8d22-8d4b534867a8-720.mp4
+ domain_nowww === "banneddata.me" ||
+ // https://tube.midov.pl/static/webseed/1bbc0138-209f-409e-92bd-bd832499e68e-480.mp4
+ domain === "tube.midov.pl" ||
+ // https://vault.mle.party/static/webseed/382a5983-9602-4249-a88d-65f8e0197535-720.mp4
+ domain === "vault.mle.party" ||
+ // https://skeptikon.fr/static/webseed/b49ddfaf-0ece-48ca-b41a-b0d798c76390-1080.mp4
+ domain_nowww === "skeptikon.fr" ||
+ // https://peertube.parleur.net/static/webseed/3cf3c055-61f1-4913-ad30-0e51ebe68d98-720.mp4
+ domain_nowww === "peertube.parleur.net" ||
+ // https://peertube.cpy.re/static/thumbnails/da2b08d4-a242-4170-b32a-4ec8cbdca701.jpg
+ // https://peertube.cpy.re/static/webseed/da2b08d4-a242-4170-b32a-4ec8cbdca701-1044.mp4
+ domain === "peertube.cpy.re") {
// https://peertube.linuxrocks.online/static/previews/caeb68e7-120c-4db5-a44e-5945e09ceb92.jpg
// https://peertube.linuxrocks.online/static/webseed/caeb68e7-120c-4db5-a44e-5945e09ceb92-1080.mp4
var query_peertube_api = function(api_url, referer_url, vidid, cb) {
@@ -59033,7 +59067,7 @@ var $$IMU_EXPORT$$;
};
var get_peertube_urlinfo = function(url) {
- var match = url.match(/(.*)\/static\/+previews\/+([-0-9a-f]{20,})\.[^/.]+(?:[/#].*)?$/);
+ var match = url.match(/(.*)\/static\/+(?:previews|thumbnails|webseed)\/+([0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12})(?:-[0-9]+)?\.[^/.]+(?:[/#].*)?$/);
if (!match)
return null;
| 7 |
diff --git a/src/plots/mapbox/mapbox.js b/src/plots/mapbox/mapbox.js @@ -600,7 +600,8 @@ proto.updateFx = function(fullLayout) {
map.dragPan.enable();
map.off('zoomstart', self.clearSelect);
self.div.onmousedown = null;
-
+ self.div.ontouchstart = null;
+ self.div.removeEventListener('touchstart', self.div._ontouchstart);
// TODO: this does not support right-click. If we want to support it, we
// would likely need to change mapbox to use dragElement instead of straight
// mapbox event binding. Or perhaps better, make a simple wrapper with the
| 2 |
diff --git a/stories/index.js b/stories/index.js @@ -204,6 +204,8 @@ storiesOf('Griddle main', module)
return (
<Griddle data={fakeData} plugins={[LocalPlugin, PositionPlugin({ tableHeight: 300 })]}>
<RowDefinition>
+ <ColumnDefinition id="name" order={2} customHeadingComponent={GreenLeftSortIconComponent} width={300} />
+ <ColumnDefinition id="state" order={1} width={400} />
</RowDefinition>
</Griddle>
)
| 0 |
diff --git a/app/src/components/Controls/ButtonControlBar.js b/app/src/components/Controls/ButtonControlBar.js @@ -54,6 +54,31 @@ const styles = (theme) =>
{
opacity : 0,
transition : 'opacity .5s'
+ },
+ move :
+ {
+ left : '30vw',
+ top : '50%',
+ transform : 'translate(0%, -50%)',
+ flexDirection : 'column',
+ justifyContent : 'center',
+ alignItems : 'center',
+ [theme.breakpoints.down('lg')] :
+ {
+ left : '40vw'
+ },
+ [theme.breakpoints.down('md')] :
+ {
+ left : '50vw'
+ },
+ [theme.breakpoints.down('sm')] :
+ {
+ left : '70vw'
+ },
+ [theme.breakpoints.down('xs')] :
+ {
+ left : '90vw'
+ }
}
});
@@ -65,6 +90,8 @@ const ButtonControlBar = (props) =>
roomClient,
toolbarsVisible,
hiddenControls,
+ drawerOverlayed,
+ toolAreaOpen,
me,
micProducer,
webcamProducer,
@@ -177,7 +204,11 @@ const ButtonControlBar = (props) =>
classes.root,
hiddenControls ?
(toolbarsVisible ? classes.show : classes.hide) :
- classes.show)
+ classes.show,
+ toolAreaOpen &&
+ (me.browser.platform !== 'mobile' && !drawerOverlayed) ?
+ classes.move : null
+ )
}
>
<Tooltip title={micTip} placement={smallScreen ? 'top' : 'right'}>
@@ -270,6 +301,8 @@ ButtonControlBar.propTypes =
roomClient : PropTypes.any.isRequired,
toolbarsVisible : PropTypes.bool.isRequired,
hiddenControls : PropTypes.bool.isRequired,
+ drawerOverlayed : PropTypes.bool.isRequired,
+ toolAreaOpen : PropTypes.bool.isRequired,
me : appPropTypes.Me.isRequired,
micProducer : appPropTypes.Producer,
webcamProducer : appPropTypes.Producer,
@@ -282,6 +315,8 @@ const mapStateToProps = (state) =>
({
toolbarsVisible : state.room.toolbarsVisible,
hiddenControls : state.settings.hiddenControls,
+ drawerOverlayed : state.settings.drawerOverlayed,
+ toolAreaOpen : state.toolarea.toolAreaOpen,
...meProducersSelector(state),
me : state.me
});
@@ -296,6 +331,8 @@ export default withRoomContext(connect(
return (
prev.room.toolbarsVisible === next.room.toolbarsVisible &&
prev.settings.hiddenControls === next.settings.hiddenControls &&
+ prev.settings.drawerOverlayed === next.settings.drawerOverlayed &&
+ prev.toolarea.toolAreaOpen === next.toolarea.toolAreaOpen &&
prev.producers === next.producers &&
prev.me === next.me
);
| 5 |
diff --git a/js/digifinex.js b/js/digifinex.js @@ -776,10 +776,13 @@ module.exports = class digifinex extends Exchange {
*/
await this.loadMarkets ();
symbols = this.marketSymbols (symbols);
- const defaultType = this.safeString (this.options, 'defaultType');
+ const first = this.safeString (symbols, 0);
+ const market = this.market (first);
+ let type = undefined;
+ [ type, params ] = this.handleMarketTypeAndParams ('fetchTickers', market, params);
let method = 'publicSpotGetTicker';
const request = {};
- if (defaultType === 'swap') {
+ if (type === 'swap') {
method = 'publicSwapGetPublicTickers';
}
const response = await this[method] (this.extend (request, params));
@@ -858,11 +861,9 @@ module.exports = class digifinex extends Exchange {
*/
await this.loadMarkets ();
const market = this.market (symbol);
- const type = (market['swap']) ? 'swap' : 'spot';
- const defaultType = this.safeString (this.options, 'defaultType', type);
let method = 'publicSpotGetTicker';
const request = {};
- if (defaultType === 'swap') {
+ if (market['swap']) {
method = 'publicSwapGetPublicTicker';
request['instrument_id'] = market['id'];
} else {
@@ -919,7 +920,7 @@ module.exports = class digifinex extends Exchange {
const data = this.safeValue (response, 'data', {});
const firstTicker = this.safeValue (tickers, 0, {});
let result = undefined;
- if (defaultType === 'swap') {
+ if (market['swap']) {
result = data;
} else {
result = this.extend ({ 'date': date }, firstTicker);
| 7 |
diff --git a/renderer/components/nettests/circumvention/Psiphon.js b/renderer/components/nettests/circumvention/Psiphon.js @@ -10,9 +10,6 @@ import colorMap from '../../colorMap'
const Psiphon = ({measurement, isAnomaly, render}) => {
const testKeys = JSON.parse(measurement.test_keys)
- // TODO Remove this when actual testKeys come in from newer probe-cli
- testKeys['bootstrap_time'] = 5.1123455
-
const heroTitle = isAnomaly ? (
<FormattedMessage id='TestResults.Details.Circumvention.Psiphon.Blocked.Hero.Title' />
) : (
@@ -37,7 +34,7 @@ const Psiphon = ({measurement, isAnomaly, render}) => {
<FormattedMessage id='TestResults.Details.Circumvention.Psiphon.BootstrapTime.Label.Title' />
</Box>
<Box>
- <Text is='span' color='blue5' fontSize={3}>{testKeys.bootstrap_time.toFixed(2)}</Text>
+ <Text is='span' color='blue5' fontSize={3}>{testKeys['bootstrap_time'].toFixed(2)}</Text>
{' '}
<FormattedMessage id='TestResults.Details.Circumvention.Psiphon.BootstrapTime.Unit' />
</Box>
| 2 |
diff --git a/node_common/managers/viewer.js b/node_common/managers/viewer.js @@ -502,7 +502,7 @@ export const getDealHistory = async ({ id }) => {
user,
message: e.message,
code: e.code,
- functionName: `power.listStorageDealRecords`,
+ functionName: `power.storageDealRecords`,
});
}
| 3 |
diff --git a/refs/biblio.json b/refs/biblio.json "CSS-EXCLUSIONS-1": {
"aliasOf": "css3-exclusions"
},
- "CSS-IMAGES-3": {
- "aliasOf": "css3-images"
- },
"CSS-MARQUEE-3": {
"aliasOf": "css3-marquee"
},
| 1 |
diff --git a/lib/messages/status.js b/lib/messages/status.js @@ -55,7 +55,7 @@ class Status extends Message {
author_name: summary,
author_icon: this.avatar_url,
author_link: this.target_url,
- color: this.constructor.getStatusColor(this.status),
+ color: this.constructor.getStatusColor(this.overallStatus),
mrkdwn_in: ['text'],
};
}
| 1 |
diff --git a/src/botPage/view/react-components/LimitsPanel.js b/src/botPage/view/react-components/LimitsPanel.js @@ -3,18 +3,25 @@ import ReactDOM from 'react-dom'
import { translate } from '../../../common/i18n'
import { Panel } from './Panel'
+const contentStyle = {
+ width: '18em',
+}
+
const errorStyle = {
color: 'red',
fontSize: '0.8em',
}
const saveButtonStyle = {
+ width: '4em',
display: 'block',
- float: 'right',
- marginTop: '1em',
+ float: 'left',
+ marginLeft: '7em',
+ marginBottom: '0.5em',
}
const limitsStyle = {
+ display: 'block',
width: '18em',
float: 'left',
}
@@ -22,6 +29,11 @@ const limitsStyle = {
const inputStyle = {
marginLeft: '0.5em',
width: '4em',
+ float: 'right',
+}
+
+const fieldStyle = {
+ width: '18em',
}
export class LimitsPanel extends PureComponent {
@@ -58,20 +70,23 @@ export class LimitsPanel extends PureComponent {
onClose={() => this.close()}
description={translate('Trade Limitations')}
content={
- <div>
- <div
- style={limitsStyle}
- >
- <label htmlFor="limitation-max-trades">{translate('Maximum number of trades')}</label>
+ <div style={contentStyle}>
+ <div style={limitsStyle}>
+ <label style={fieldStyle} htmlFor="limitation-max-trades">
<input style={inputStyle} ref={(el) => (this.maxTradesDiv = el)} type="number" id="limitation-max-trades" />
- <label htmlFor="limitation-max-loss">{translate('Maximum loss amount')}</label>
+ {translate('Maximum number of trades')}
+ </label>
+ <label style={fieldStyle} htmlFor="limitation-max-loss">
<input style={inputStyle} ref={(el) => (this.maxLossDiv = el)} type="number" id="limitation-max-loss" />
+ {translate('Maximum loss amount')}
+ </label>
{this.state.error ? <p style={errorStyle}>{this.state.error}</p> : null}
</div>
- <button
- style={saveButtonStyle}
- onClick={() => this.submit()}
- >{translate('Start')}</button>
+ <div style={saveButtonStyle}>
+ <button onClick={() => this.submit()}>
+ {translate('Start')}
+ </button>
+ </div>
</div>
}
/>
| 1 |
diff --git a/components/Questionnaire/Page.js b/components/Questionnaire/Page.js @@ -160,7 +160,11 @@ class Page extends Component {
<Headline>{t('questionnaire/title')}</Headline>
<div {...styles.thankyou}>
<P>
- {t('questionnaire/thankyou')}
+ {t.elements('questionnaire/thankyou', {
+ metaLink: <Link key='meta' route='/verlag' passHref>
+ <A>{t('questionnaire/thankyou/metaText')}</A>
+ </Link>
+ })}
</P>
<P>
<Link route='/verlag' passHref>
| 7 |
diff --git a/src/modules/import/wmsgetcap.js b/src/modules/import/wmsgetcap.js @@ -67,7 +67,7 @@ exports = function($window, gettext, gettextCatalog, ngeoWmsGetCapTemplateUrl) {
}
if (!layer['isInvalid']) {
- layer['wmsUrl'] = getCap['Service']['OnlineResource'];
+ layer['wmsUrl'] = getCap['Capability']['Request']['GetMap']['DCPType'][0]['HTTP']['Get']['OnlineResource'];
layer['wmsVersion'] = getCap['version'];
layer['id'] = `WMS||${layer['wmsUrl']}||${layer['Name']}`;
layer['extent'] = getLayerExtentFromGetCap(layer, proj);
| 4 |
diff --git a/server/preprocessing/other-scripts/linkedcat.R b/server/preprocessing/other-scripts/linkedcat.R @@ -196,8 +196,8 @@ build_authorfield_query <- function(field, query) {
build_queryfield_query <- function(field, query) {
if (length(unlist(strsplit(query, " "))) > 1) {
- query <- paste0(unlist(strsplit(query, " ")), collapse = " AND ")
- query <- paste0(field, ':', '(', query, ')', add_boost_factor(field))
+ query <- paste0(unlist(strsplit(query, " ")), collapse = '" AND "')
+ query <- paste0(field, ':', '("', query, '")', add_boost_factor(field))
} else {
query <- paste0(field, ':', '"', query, '"', add_boost_factor(field))
}
| 7 |
diff --git a/package.json b/package.json "proxy": "node ./tasks/local-testnet/proxy.js",
"release": "git checkout develop & git pull & git push origin develop:release",
"test:coverage": "live-server ./coverage/lcov-report",
- "test:coverage-branch": "npm run test:unit --coverage && git diff origin/develop | diff-test-coverage -c ./coverage/lcov.info -t lcov --",
+ "test:coverage-branch": "npm run test:unit -- --coverage && git diff origin/develop | diff-test-coverage -c ./coverage/lcov.info -t lcov --",
"test:e2e:browserstack": "node tests/e2e/browserstack.runner.js -c tests/e2e/browserstack.conf.js",
"test:e2e:local": "kill-port 9515 && nightwatch --config ./tests/e2e/local-chrome.conf.js",
"test:e2e:build": "cross-env VUE_APP_E2E=true STARGATE=http://localhost:9070 RPC=http://localhost:26657 vue-cli-service build --mode production",
| 1 |
diff --git a/js/tabManager.js b/js/tabManager.js @@ -46,3 +46,12 @@ chrome.tabs.onUpdated.addListener( (id, info) => {
}
});
+// update tab url after the request is finished. This makes
+// sure we have the correct url after any https rewrites
+chrome.webRequest.onCompleted.addListener( (request) => {
+ let tab = tabManager.get({tabId: request.tabId});
+ if (tab) {
+ tab.url = request.url
+ }
+}, {urls: ['<all_urls>'], types: ['main_frame']});
+
| 3 |
diff --git a/assets/js/modules/thank-with-google/index.js b/assets/js/modules/thank-with-google/index.js @@ -39,7 +39,6 @@ export const registerModule = ifTwgIsEnabled( ( modules ) => {
SettingsEditComponent: SettingsEdit,
SettingsViewComponent: SettingsView,
SetupComponent: SetupMain,
- // TODO: Replace with another icon later.
Icon: ThankWithGoogleIcon,
} );
} );
| 2 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.