code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/plots/mapbox/layout_attributes.js b/src/plots/mapbox/layout_attributes.js @@ -48,10 +48,16 @@ var attrs = module.exports = overrideAll({
dflt: constants.styleValueDflt,
role: 'style',
description: [
- 'Sets the Mapbox map style.',
- 'Either input one of the default Mapbox style names or the URL to a custom style',
- 'or a valid Mapbox style JSON.',
- 'From OpenStreetMap raster tiles, use *open-street-map*.'
+ 'Sets the Mapbox base map style.',
+ 'Base map styles are rendered below all traces and layout layers.',
+ 'Either input one of the default Mapbox style names:', constants.styleValuesMapbox, '.',
+ 'Note that to use these, a Mapbox access token must be set either in the `accesstoken` attribute',
+ 'or in the `mapboxAccessToken` config option.',
+ 'From OpenStreetMap raster tiles, use:', constants.styleValueOSM, '.',
+ 'No access token is required to render the', constants.styleValueOSM, 'style.',
+ 'One can also set `style` as a URL to a Mapbox custom style, e.g. created in Mapbox Studio.',
+ 'Finally, one can set `style` as a Mapbox style JSON, see',
+ 'https://docs.mapbox.com/mapbox-gl-js/style-spec for more info.'
].join(' ')
},
| 7 |
diff --git a/js/core/bis_bidsutils.js b/js/core/bis_bidsutils.js @@ -464,14 +464,21 @@ let getSettingsFile = (filename = '') => {
});
};
-//TODO: implement function
+/**
+ * Schedules a disk write for a time after this function is called. Note that this function may not save the file passed to the function by 'settings' initially.
+ * It will save the latest copy passed to the function before the write is triggered.
+ *
+ * @param {String} filename - Name of the settings file to save.
+ * @param {Object} settings - New settings file to write over transientDicomJobInfo.
+ */
let scheduleWriteback = (filename, settings) => {
transientDicomJobInfo = settings;
if (!scheduledWriteback) {
- setTimeout( () => {
- console.log('scheduled writeback firing');
- let writebackFile = JSON.stringify(transientDicomJobInfo);
+ scheduledWriteback = setTimeout( () => {
+ let currentInfo = getJobInfo();
+ console.log('scheduled writeback firing', currentInfo);
+ let writebackFile = JSON.stringify(currentInfo, null, 2);
bis_genericio.write(filename, writebackFile, false);
scheduledWriteback = null;
}, 60000);
@@ -590,6 +597,13 @@ let readSizeRecursive = (filepath) => {
});
};
+/**
+ * Returns transientDicomJobInfo. Necessary because otherwise scheduleWriteback will bind the most recent version of transientDicomJobInfo at the first time it's called and won't check for the most recent version.
+ */
+let getJobInfo = () => {
+ return transientDicomJobInfo;
+};
+
module.exports = {
dicom2BIDS: dicom2BIDS,
| 1 |
diff --git a/src/mapping.js b/src/mapping.js @@ -35,6 +35,7 @@ export function mapping<T>(decoder: Decoder<T>): Decoder<Map<string, T>> {
errors.push([key, ((e: any): DecodeError)]);
} else {
// Otherwise, simply rethrow it
+ /* istanbul ignore next */
throw e;
}
}
| 8 |
diff --git a/src/sections/target/Safety/SafetyTable.js b/src/sections/target/Safety/SafetyTable.js @@ -65,19 +65,21 @@ function getColumns(classes) {
return 'biosamples';
},
renderCell: ({ biosample }) => {
- const entries = biosample.map(sample => {
+ const entries = biosample.map(
+ ({ cellFormat, cellLabel, tissueLabel, tissueId }) => {
return {
- name: sample.cellFormat
- ? `${sample.cellFormat}${
- sample.cellLabel ? ` (${sample.cellLabel})` : ''
- }`
- : sample.tissueLabel,
- url: sample.cellFormat
+ name: cellFormat
+ ? `${cellFormat}${cellLabel ? ` (${cellLabel})` : ''}`
+ : tissueLabel,
+ url: cellFormat
? null
- : `https://identifiers.org/${sample.tissueId.replace('_', ':')}`,
- group: sample.cellFormat ? 'Assay' : 'Organ system',
+ : tissueId
+ ? `https://identifiers.org/${tissueId.replace('_', ':')}`
+ : null,
+ group: cellFormat ? 'Assay' : 'Organ system',
};
- });
+ }
+ );
return (
<TableDrawer
| 9 |
diff --git a/Source/DataSources/GpxDataSource.js b/Source/DataSources/GpxDataSource.js @@ -752,22 +752,6 @@ define([
return result;
}
- //TODO check for points inside other complexTypes?
- function processPt(dataSource, geometryNode, entityCollection, sourceUri, uriResolver) {
- var coordinatesString = getCoordinatesString(geometryNode);
- var position = readCoordinate(coordinatesString);
- if (!defined(position)) {
- throw new DeveloperError('Position Coordinates are required.');
- }
-
- var entity = getOrCreateEntity(geometryNode, entityCollection);
- entity.position = position;
- entity.point = createDefaultPoint();
- }
-
- //TODO
- //processPtSeg, polygons/polylines?
-
/**
* Processes a metadaType node and returns a metadata object
* {@link http://www.topografix.com/gpx/1/1/#type_metadataType|GPX Schema}
@@ -864,7 +848,6 @@ define([
}
var complexTypes = {
- pt : processPt,
wpt : processWpt,
rte : processRte,
trk : processTrk
| 8 |
diff --git a/app/modules/Settings/WalletList/WalletListScreen.js b/app/modules/Settings/WalletList/WalletListScreen.js @@ -74,12 +74,6 @@ class WalletListScreen extends PureComponent {
}
</View>
<View style={[styles.buttons, { marginBottom: GRID_SIZE }]}>
- <BorderedButton
- icon='plus'
- text={strings('settings.walletList.addWallet')}
- onPress={this.handleAddWallet}
- containerStyles={{ marginHorizontal: GRID_SIZE / 2 }}
- />
<BorderedButton
text={strings('settings.walletList.showBalance')}
onPressIn={() => this.triggerBalanceVisibility(true)}
@@ -88,6 +82,12 @@ class WalletListScreen extends PureComponent {
activeOpacity={0.7}
hitSlop={HIT_SLOP}
/>
+ <BorderedButton
+ icon='plus'
+ text={strings('settings.walletList.addWallet')}
+ onPress={this.handleAddWallet}
+ containerStyles={{ marginHorizontal: GRID_SIZE / 2 }}
+ />
</View>
</View>
)
| 14 |
diff --git a/lib/api/core/models/repositories/tokenRepository.js b/lib/api/core/models/repositories/tokenRepository.js @@ -247,7 +247,13 @@ class TokenRepository extends Repository {
.map(key => key.indexOf('#', userKey.length - 1) === -1 ? key.slice(userKey.length - 1) : null)
.filter(key => key !== null);
- const promises = jwts.map(token => this.load(token).then(cacheToken => this.expire(cacheToken)));
+ const promises = jwts.map(token => this.load(token).then(cacheToken => {
+ if (cacheToken !== null) {
+ return this.expire(cacheToken);
+ }
+
+ return null;
+ }));
return Bluebird.all(promises);
});
| 9 |
diff --git a/articles/libraries/auth0js/v8/index.md b/articles/libraries/auth0js/v8/index.md @@ -86,7 +86,7 @@ You can choose a method for login based on the type of auth you need in your app
### webAuth.authorize()
-The `authorize()` method can be used for logging in users via the [Hosted Login Page](/libraries/auth0js#hosted-login-page), or via social connections, as exhibited in the examples below. This method invokes the [/authorize endpoint](/api/authentication?javascript#social) of the Authentication API, and can take a variety of parameters via the `options` object.
+The `authorize()` method can be used for logging in users via the [Hosted Login Page](/hosted-pages/login), or via social connections, as exhibited in the examples below. This method invokes the [/authorize endpoint](/api/authentication?javascript#social) of the Authentication API, and can take a variety of parameters via the `options` object.
| **Parameter** | **Required** | **Description** |
| --- | --- | --- |
@@ -97,6 +97,10 @@ The `authorize()` method can be used for logging in users via the [Hosted Login
| `redirectUri` | optional | (String) The URL to which Auth0 will redirect the browser after authorization has been granted for the user. |
| `leeway` | optional | (Integer) Add leeway for clock skew to JWT expiration times. |
+::: note
+Because of clock skew issues, you may occasionally encounter the error `The token was issued in the future`. The `leeway` parameter can be used to allow a few seconds of leeway to JWT expiration times, to prevent that from occuring.
+:::
+
For hosted login, one must call the `authorize()` method.
```js
| 0 |
diff --git a/src/index.d.ts b/src/index.d.ts @@ -445,7 +445,7 @@ declare module 'discord-akairo' {
public static CommandRetry: typeof CommandRetry;
public static cancel(): CommandCancel;
- public static retry(message: Message): CommandMessage;
+ public static retry(message: Message): CommandRetry;
}
class CommandCancel extends ParsingFlag {}
@@ -672,6 +672,8 @@ declare module 'discord-akairo' {
export type ExecutionPredicate = (message: Message) => boolean;
+ export type IgnoreCheckPredicate = (message: Message, command: Command) => boolean;
+
export type LoadPredicate = (filepath: string) => boolean;
export type MentionPrefixPredicate = (message: Message) => boolean;
| 1 |
diff --git a/src/Widgets/FormContainerWidget/FormContainerWidgetEditingConfig.js b/src/Widgets/FormContainerWidget/FormContainerWidgetEditingConfig.js @@ -36,7 +36,8 @@ Scrivito.provideEditingConfig("FormContainerWidget", {
submittingMessage: "Submitting...",
submittedMessage:
"Your message has been successfully sent. Thank you for your request. We will get back to you as soon as possible.",
- failedMessage: "Form submission failed",
+ failedMessage:
+ "We are sorry, your request could not be completed. Please try again later.",
content: () => [
new FormTextInputWidget({ required: true }),
new TextWidget({
| 7 |
diff --git a/assets/js/googlesitekit/modules/create-info-store.test.js b/assets/js/googlesitekit/modules/create-info-store.test.js @@ -44,12 +44,6 @@ describe( 'createInfoStore store', () => {
} );
describe( 'storeName', () => {
- it( 'returns the correct default store name', () => {
- const { storeName } = createInfoStore( MODULE_SLUG, { storeName: TEST_STORE_NAME } );
-
- expect( storeName ).toEqual( TEST_STORE_NAME );
- } );
-
it( 'throws an error if storeName is not passed', async () => {
expect( () => {
createInfoStore( MODULE_SLUG );
| 2 |
diff --git a/index.js b/index.js @@ -582,7 +582,7 @@ class Command extends EventEmitter {
* @api public
*/
allowUnknownOption(arg) {
- this._allowUnknownOption = arguments.length === 0 || arg;
+ this._allowUnknownOption = (arg === undefined) || arg;
return this;
};
@@ -1182,7 +1182,7 @@ class Command extends EventEmitter {
*/
version(str, flags, description) {
- if (arguments.length === 0) return this._version;
+ if (str === undefined) return this._version;
this._version = str;
flags = flags || '-V, --version';
description = description || 'output the version number';
@@ -1206,7 +1206,7 @@ class Command extends EventEmitter {
*/
description(str, argsDescription) {
- if (arguments.length === 0) return this._description;
+ if (str === undefined && argsDescription === undefined) return this._description;
this._description = str;
this._argsDescription = argsDescription;
return this;
@@ -1221,13 +1221,14 @@ class Command extends EventEmitter {
*/
alias(alias) {
+ if (alias === undefined) return this._alias;
+
let command = this;
- if (this.commands.length !== 0) {
+ if (this.commands.length !== 0 && this.commands[this.commands.length - 1]._executableHandler) {
+ // assume adding alias for last added executable subcommand, rather than this
command = this.commands[this.commands.length - 1];
}
- if (arguments.length === 0) return command._alias;
-
if (alias === command._name) throw new Error('Command alias can\'t be the same as its name');
command._alias = alias;
@@ -1243,17 +1244,18 @@ class Command extends EventEmitter {
*/
usage(str) {
+ if (str === undefined) {
+ if (this._usage) return this._usage;
+
const args = this._args.map((arg) => {
return humanReadableArgName(arg);
});
-
- const usage = '[options]' +
+ return '[options]' +
(this.commands.length ? ' [command]' : '') +
(this._args.length ? ' ' + args.join(' ') : '');
+ }
- if (arguments.length === 0) return this._usage || usage;
this._usage = str;
-
return this;
};
@@ -1266,7 +1268,7 @@ class Command extends EventEmitter {
*/
name(str) {
- if (arguments.length === 0) return this._name;
+ if (str === undefined) return this._name;
this._name = str;
return this;
};
| 14 |
diff --git a/src/config/index.js b/src/config/index.js @@ -43,7 +43,7 @@ export default defaults(
{
host: 'localhost',
port: '4300',
- // apiPath: 'http://localhost:8080/Plone', // for Plone
- apiPath: 'http://localhost:8081/db/web', // for guillotina
+ apiPath: 'http://localhost:8080/Plone', // for Plone
+ // apiPath: 'http://localhost:8081/db/web', // for guillotina
},
);
| 12 |
diff --git a/web/settings.html b/web/settings.html </label>
<div class="col-sm-9">
<select class="form-control" id="frmGlobal-language" {{disableWrite}}>
- <!-- TODO: make this list dynamic -->
+ <option value="en" {{global.language=='en'|isSelected}}>English (default)</option>
+
+ <option value="ar" {{global.language=='ar'|isSelected}}>Arabic</option>
<option value="cs" {{global.language=='cs'|isSelected}}>Czech</option>
<option value="da" {{global.language=='da'|isSelected}}>Danish</option>
<option value="de" {{global.language=='de'|isSelected}}>German</option>
- <option value="en" {{global.language=='en'|isSelected}}>English</option>
<option value="es" {{global.language=='es'|isSelected}}>Spanish</option>
<option value="fi" {{global.language=='fi'|isSelected}}>Finnish</option>
<option value="fr" {{global.language=='fr'|isSelected}}>French</option>
| 0 |
diff --git a/token-metadata/0x73C9275c3a2Dd84b5741fD59AEbF102C91Eb033F/metadata.json b/token-metadata/0x73C9275c3a2Dd84b5741fD59AEbF102C91Eb033F/metadata.json "symbol": "BTRS",
"address": "0x73C9275c3a2Dd84b5741fD59AEbF102C91Eb033F",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/main/resources/public/templates/newModals/tpl-modal-defect-editor.html b/src/main/resources/public/templates/newModals/tpl-modal-defect-editor.html <div class="rp-defect-editor-bottom">
<% if(data.isMultipleEdit){ %>
<label class="rp-checkbox-wrap replace-comments">
- <input class="rp-input-checkbox" type="checkbox" data-js-replace-comment>
+ <input class="rp-input-checkbox" type="checkbox" checked="checked" data-js-replace-comment>
<span><%= data.text.launches.replaceComments %></span>
</label>
<% } %>
| 14 |
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js @@ -117,13 +117,16 @@ class SidebarLinks extends React.Component {
hasDraftHistory = lodashGet(this.props.reports, `${ONYXKEYS.COLLECTION.REPORT}${this.props.currentlyViewedReportID}.hasDraft`, false);
}
- const shouldReorder = this.shouldReorderReports(hasDraftHistory);
const switchingPriorityModes = this.props.priorityMode !== this.priorityMode;
// Build the report options we want to show
const recentReports = this.getRecentReportsOptionListItems();
- const orderedReports = shouldReorder || switchingPriorityModes
+ // If the order of the reports is different from the last render (or if priority mode is changing)
+ // then orderedReports is the same as the freshly calculated recentReports.
+ // If the order of the reports is the same as the last render
+ // then the data for each report is updated from the data in the new props (not sure why this is necessary)
+ const orderedReports = this.isReportOrderDifferentThanLastRender(hasDraftHistory) || switchingPriorityModes
? recentReports
: _.chain(this.orderedReports)
@@ -188,7 +191,7 @@ class SidebarLinks extends React.Component {
return sidebarOptions.recentReports;
}
- shouldReorderReports(hasDraftHistory) {
+ isReportOrderDifferentThanLastRender(hasDraftHistory) {
// Always update if LHN is empty.
// Because: TBD
// @TODO try and figure out why
| 10 |
diff --git a/src/components/Explorer/queryTemplate.js b/src/components/Explorer/queryTemplate.js @@ -14,12 +14,12 @@ const queryTemplate = ({
minDate,
maxDate,
}) => `SELECT
-${(group && select) ?
+${(group) ?
[`${group.value} ${group.alias || ''}`,
- `round(sum(${select.groupValue || select.value})::numeric/count(distinct matches.match_id), 2) avg`,
+ `round(sum(${(select || {}).groupValue || (select || {}).value || 1})::numeric/count(distinct matches.match_id), 2) avg`,
'count(distinct matches.match_id) count',
- `sum(${select.groupValue || select.value}) sum`,
- select.groupValue ? '' : 'sum(case when (player_matches.player_slot < 128) = radiant_win then 1 else 0 end)::float/count(1) winrate',
+ `sum(${(select || {}).groupValue || (select || {}).value || 1}) sum`,
+ (select || {}).groupValue ? '' : 'sum(case when (player_matches.player_slot < 128) = radiant_win then 1 else 0 end)::float/count(1) winrate',
].filter(Boolean).join(',\n')
:
[select ? `${select.value} ${select.alias || ''}` : '',
@@ -59,7 +59,11 @@ ${minDate ? `AND start_time >= ${Math.round(new Date(minDate.value) / 1000)}` :
${maxDate ? `AND start_time <= ${Math.round(new Date(maxDate.value) / 1000)}` : ''}
${group ? `GROUP BY ${group.value}` : ''}
${group ? 'HAVING count(distinct matches.match_id) > 1' : ''}
-ORDER BY ${group ? 'avg' : (select && select.value) || 'matches.match_id'} ${(select && select.order) || 'DESC'} NULLS LAST
+ORDER BY ${
+[`${group ? 'avg' : (select && select.value) || 'matches.match_id'} ${(select && select.order) || 'DESC'}`,
+group ? 'count DESC' : ''
+].filter(Boolean).join(',')}
+NULLS LAST
LIMIT 150`;
export default queryTemplate;
| 11 |
diff --git a/electron/offscreen.js b/electron/offscreen.js @@ -11,8 +11,11 @@ let mainWindow;
function createWindow () {
mainWindow = new BrowserWindow({ width: 1920, height: 1080,
+ show: false,
+ frame: false,
webPreferences: {
- offscreen: true
+ offscreen: true,
+ transparent: true,
}
});
| 3 |
diff --git a/src/server/util/swigFunctions.js b/src/server/util/swigFunctions.js @@ -136,8 +136,7 @@ module.exports = function(crowi, app, req, locals) {
};
locals.passportSamlLoginEnabled = function() {
- let config = crowi.getConfig();
- return locals.isEnabledPassport() && config.crowi['security:passport-saml:isEnabled'];
+ return locals.isEnabledPassport() && locals.getConfig('crowi', 'security:passport-saml:isEnabled');
};
locals.getSamlMissingMandatoryConfigKeys = function() {
| 4 |
diff --git a/test/data/validationData/detailedBlobValidationSpec.yaml b/test/data/validationData/detailedBlobValidationSpec.yaml @@ -70,8 +70,7 @@ components:
enum: ['Postman']
companyNumber:
type: number
- minimum: 10000
- exclusiveMinimum: true
+ exclusiveMinimum: 10000
website:
type: number
turnover:
| 13 |
diff --git a/electron-builder.json b/electron-builder.json },
"publish": ["github"],
"extraResources": ["build/**"],
+ "files": [
+ "**/*",
+ "!**/node_modules/*/{Makefile,CHANGELOG.md,CONTRIBUTING.md,HISTORY.md,History.md,README.md,README,readme.md,readme,LICENSE,license}",
+ "!**/node_modules/*/{test,__tests__,tests,powered-test,example,examples}",
+ "!**/node_modules/*.d.ts",
+ "!**/node_modules/.bin",
+ "!**/*.{iml,o,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,xproj}",
+ "!.editorconfig",
+ "!**/.*",
+ "!**/{.DS_Store,.git,.hg,.svn,CVS,RCS,SCCS,.gitignore,.gitattributes}",
+ "!**/{__pycache__,thumbs.db,.flowconfig,.idea,.vs,.nyc_output}",
+ "!**/{appveyor.yml,.travis.yml,circle.yml}",
+ "!**/{npm-debug.log,yarn.lock,.yarn-integrity,.yarn-metadata.json}",
+ "!**/{UI,docs,.github,bin,release,release_old}",
+ "!**/Dockerfile",
+ "!**/Dockerfile.standalone",
+ "!**/Procfile"
+ ],
"win": {
"target": [
"nsis"
"mac": {
"target": [
"dmg"
- ]
+ ],
+ "category": "public.app-category.video"
},
"linux": {
"target": [
"AppImage"
- ]
+ ],
+ "category": "AudioVideo"
}
}
\ No newline at end of file
| 8 |
diff --git a/src/module.d.ts b/src/module.d.ts @@ -13,7 +13,6 @@ export interface RowDefinitionProps {
//if this is not set it will make one up (not efficient)
rowKey?: string;
- // TODO: Unused?
//The column that will be known used to track child data
//By default this will be "children"
childColumnName?: string;
| 2 |
diff --git a/docker-compose.yml b/docker-compose.yml @@ -19,6 +19,9 @@ services:
- SIDEWALK_CITY_ID=washington-dc
- SIDEWALK_EMAIL_ADDRESS=DUMMY_EMAIL_ADDRESS
- SIDEWALK_EMAIL_PASSWORD=DUMMY_EMAIL_PASSWORD
+ - GOOGLE_MAPS_API_KEY=DUMMY_GOOGLE_API_KEY
+ - GOOGLE_MAPS_SECRET=DUMMY_GOOGLE_SECRET
+ - INTERNAL_API_KEY=DUMMY_INTERNAL_API_KEY
- ENV_TYPE=test
db:
| 3 |
diff --git a/components/Auth/TokenAuthorization.js b/components/Auth/TokenAuthorization.js @@ -78,7 +78,7 @@ class TokenAuthorization extends Component {
}, () => {
authorize({
consents: this.state.consents,
- fields: Object.keys(this.state.values).length > 0
+ requiredFields: Object.keys(this.state.values).length > 0
? this.state.values
: undefined
})
@@ -338,13 +338,13 @@ const authorizeSession = gql`
$email: String!
$tokens: [SignInToken!]!
$consents: [String!]
- $fields: RequiredUserFields
+ $requiredFields: RequiredUserFields
) {
authorizeSession(
email: $email
tokens: $tokens
consents: $consents
- fields: $fields
+ requiredFields: $requiredFields
)
}
`
@@ -383,14 +383,14 @@ export default compose(
withT,
graphql(authorizeSession, {
props: ({ ownProps: { email, token, tokenType }, mutate }) => ({
- authorize: ({ consents, fields } = {}) => mutate({
+ authorize: ({ consents, requiredFields } = {}) => mutate({
variables: {
email,
tokens: [
{type: tokenType, payload: token}
],
consents,
- fields
+ requiredFields
},
refetchQueries: [{query: meQuery}]
})
| 10 |
diff --git a/public/javascripts/Admin/src/Admin.Panorama.js b/public/javascripts/Admin/src/Admin.Panorama.js @@ -103,8 +103,8 @@ function AdminPanorama(svHolder) {
* @returns {renderLabel}
*/
function renderLabel (label) {
- var x = label.canvasX / label.originalCanvasWidth * self.drawingCanvas.width;
- var y = label.canvasY / label.originalCanvasHeight * self.drawingCanvas.height;
+ var x = (label.canvasX / label.originalCanvasWidth) * self.drawingCanvas.width;
+ var y = (label.canvasY / label.originalCanvasHeight) * self.drawingCanvas.height;
var colorScheme = util.misc.getLabelColors();
var fillColor = (label.label_type in colorScheme) ? colorScheme[label.label_type].fillStyle : "rgb(128, 128, 128)";
| 3 |
diff --git a/source/index/contracts/Index.sol b/source/index/contracts/Index.sol distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
- sizeations under the License.
+ limitations under the License.
*/
pragma solidity 0.5.12;
pragma experimental ABIEncoderV2;
| 13 |
diff --git a/demo/filtering.html b/demo/filtering.html this.loading = true;
- this.debounce('loading', function() {
+ var urlJob = Polymer.Debouncer.debounce(urlJob, Polymer.Async.timeOut.after(this.debounceDuration), () => {
this.loading = false;
this.lastResponse = elements.filter(function(el) {
return el.toLowerCase().indexOf(filter.toLowerCase()) > -1;
});
- }, this.debounceDuration);
+ });
}
});
</script>
| 14 |
diff --git a/webpack.config.js b/webpack.config.js @@ -46,6 +46,9 @@ module.exports = {
raw: true,
entryOnly: true
}),
+ new webpack.DefinePlugin({
+ "process.browser": "true"
+ }),
vendorCSS,
projectCSS
],
| 0 |
diff --git a/lime/_backend/html5/HTML5HTTPRequest.hx b/lime/_backend/html5/HTML5HTTPRequest.hx @@ -388,13 +388,17 @@ class HTML5HTTPRequest {
if (request.status != null && ((request.status >= 200 && request.status < 400) || (validStatus0 && request.status == 0))) {
- var bytes;
+ var bytes = null;
if (request.responseType == NONE) {
+ if (request.responseText != null) {
+
bytes = Bytes.ofString (request.responseText);
- } else {
+ }
+
+ } else if (request.response != null) {
bytes = Bytes.ofData (request.response);
| 7 |
diff --git a/src/module/config.js b/src/module/config.js @@ -374,6 +374,21 @@ SFRPG.weaponProperties = {
SFRPG.weaponPropertiesTooltips = {
"one": "SFRPG.WeaponPropertiesOneHandedTooltip",
"two": "SFRPG.WeaponPropertiesTwoHandedTooltip",
+ "aeon": "SFRPG.WeaponPropertiesAeonTooltip",
+ "analog": "SFRPG.WeaponPropertiesAnalogTooltip",
+ "antibiological": "SFRPG.WeaponPropertiesAntibiologicalTooltip",
+ "archaic": "SFRPG.WeaponPropertiesArchaicTooltip",
+ "aurora": "SFRPG.WeaponPropertiesAuroraTooltip",
+ "automatic": "SFRPG.WeaponPropertiesAutomaticTooltip",
+ "blast": "SFRPG.WeaponPropertiesBlastTooltip",
+ "block": "SFRPG.WeaponPropertiesBlockTooltip",
+ "boost": "SFRPG.WeaponPropertiesBoostTooltip",
+ "breach": "SFRPG.WeaponPropertiesBreachTooltip",
+ "breakdown": "SFRPG.WeaponPropertiesBreakdownTooltip",
+ "bright": "SFRPG.WeaponPropertiesBrightTooltip",
+ "conceal": "SFRPG.WeaponsPropertiesConcealTooltip",
+ "cluster": "SFRPG.WeaponPropertiesClusterTooltip",
+ "deconstruct": "SFRPG.WeaponPropertiesDeconstructTooltip",
"shatter": "SFRPG.WeaponPropertiesShatterTooltip"
};
| 0 |
diff --git a/config/redirects.js b/config/redirects.js @@ -1264,5 +1264,41 @@ module.exports = [
{
from: '/quickstart/backend/webapi-owin/00-getting-started',
to: '/quickstart/backend/webapi-owin'
+ },
+ {
+ from: '/quickstart/webapp/rails/00-introduction',
+ to: '/quickstart/webapp/rails'
+ },
+ {
+ from: '/quickstart/webapp/rails/02-custom-login',
+ to: '/quickstart/webapp/rails'
+ },
+ {
+ from: '/quickstart/webapp/rails/03-session-handling',
+ to: '/quickstart/webapp/rails/02-session-handling'
+ },
+ {
+ from: '/quickstart/webapp/rails/04-user-profile',
+ to: '/quickstart/webapp/rails/03-user-profile'
+ },
+ {
+ from: '/quickstart/webapp/rails/05-linking-accounts',
+ to: '/quickstart/webapp/rails'
+ },
+ {
+ from: '/quickstart/webapp/rails/06-rules',
+ to: '/quickstart/webapp/rails'
+ },
+ {
+ from: '/quickstart/webapp/rails/07-authorization',
+ to: '/quickstart/webapp/rails'
+ },
+ {
+ from: '/quickstart/webapp/rails/08-mfa',
+ to: '/quickstart/webapp/rails'
+ },
+ {
+ from: '/quickstart/webapp/rails/09-customizing-lock',
+ to: '/quickstart/webapp/rails'
}
];
\ No newline at end of file
| 0 |
diff --git a/README.md b/README.md @@ -14,7 +14,7 @@ Highly customizable with modular per-page fragments.
## Using Syna Theme
-Check out our [demo](https://syna-demo.okkur.io)
+Check out our [demo](https://syna-demo.okkur.io). To start using Syna please read the [installation guide](./docs/README.md#installation).
## Documentation
| 0 |
diff --git a/angular/projects/spark-angular/src/lib/interfaces/sprk-narrow-nav-link.interface.ts b/angular/projects/spark-angular/src/lib/interfaces/sprk-narrow-nav-link.interface.ts -import { ISprkLink } from './sprk-link.interface';
+import { TSprkIconTextLinkOptionalProps } from './sprk-icon-text-link.interface';
+
/**
* Structure of a link in
* the Narrow version of the Masthead.
+ * Narrow Nav Links can have an
+ * optional Leading Icon.
*/
-export interface ISprkNarrowNavLink extends ISprkLink {
+export interface ISprkNarrowNavLink extends TSprkIconTextLinkOptionalProps {
/**
- * If `true`, denotes that the link
- * represents the current page.
+ * If `true`, active styles will be applied.
*/
active?: boolean;
- /**
- * The icon name supplied will
- * be used to render
- * the specified icon to the
- * left of the link text.
- */
- leadingIcon?: string;
/**
* Optional sub-navigation for the link.
*/
- subNav?: Array<{
- /**
- * The text for the sub-navigation link.
- * Each sub-navigation Link must have a value for text.
- */
- text: string;
- /**
- * The `href` for the sub-navigation link.
- */
- href: string;
- /**
- * The icon name supplied will
- * be used to render
- * the specified icon to the
- * left of the sub-navigation link text.
- */
- leadingIcon?: string;
- }>;
+ subNav?: TSprkIconTextLinkOptionalProps[];
}
| 3 |
diff --git a/packages/kotlin-webpack-plugin/plugin.js b/packages/kotlin-webpack-plugin/plugin.js @@ -158,7 +158,14 @@ class KotlinWebpackPlugin {
absolute: true,
}).then(paths => {
const normalizedPaths = paths.map(it => path.normalize(it));
+ if (compilation.fileDependencies.add) {
+ for (const path of normalizedPaths) {
+ compilation.fileDependencies.add(path);
+ }
+ } else {
+ // Before Webpack 4 - fileDepenencies was an array
compilation.fileDependencies.push(...normalizedPaths);
+ }
done();
});
}
| 9 |
diff --git a/assets/js/googlesitekit/modules/datastore/modules.test.js b/assets/js/googlesitekit/modules/datastore/modules.test.js @@ -297,12 +297,6 @@ describe( 'core/modules modules', () => {
expect( modules[ moduleSlug ] ).toMatchObject( { active: false, connected: false } );
} );
- it( 'requires the module slug to be provided', () => {
- expect( () => {
- registry.dispatch( STORE_NAME ).registerModule();
- } ).toThrow( 'module slug is required' );
- } );
-
it( 'does not allow the same module to be registered more than once on the client', () => {
registry.dispatch( STORE_NAME ).receiveGetModules( [] );
@@ -368,10 +362,10 @@ describe( 'core/modules modules', () => {
it( 'receives and sets the error', () => {
const slug = 'slug1';
- const errorMessage = 'Error Message';
+ const error = { code: 'error_code', message: 'Error Message', data: null };
const state = { ... store.getState().checkRequirementsResults };
- registry.dispatch( STORE_NAME ).receiveCheckRequirementsError( slug, errorMessage );
- expect( store.getState().checkRequirementsResults ).toMatchObject( { ...state, [ slug ]: errorMessage } );
+ registry.dispatch( STORE_NAME ).receiveCheckRequirementsError( slug, error );
+ expect( store.getState().checkRequirementsResults ).toMatchObject( { ...state, [ slug ]: error } );
} );
} );
@@ -379,7 +373,7 @@ describe( 'core/modules modules', () => {
it( 'requires the slug param', () => {
expect( () => {
registry.dispatch( STORE_NAME ).receiveCheckRequirementsSuccess();
- } ).toThrow( 'module slug is required' );
+ } ).toThrow( 'slug is required' );
} );
it( 'receives and sets success', () => {
| 2 |
diff --git a/src/components/dashboard/Dashboard.js b/src/components/dashboard/Dashboard.js // @flow
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useRef, useState } from 'react'
+
import type { Store } from 'undux'
import normalize from '../../lib/utils/normalizeText'
import GDStore from '../../lib/undux/GDStore'
@@ -118,15 +119,25 @@ const Dashboard = props => {
const { balance, entitlement } = gdstore.get('account')
const { avatar, fullName } = gdstore.get('profile')
const feeds = gdstore.get('feeds')
- const [scrollPos, setScrollPos] = useState(0)
- log.info('LOGGER FEEDS', { props })
- log.info('scrollPos', { scrollPos })
+ const [headerLarge, setHeaderLarge] = useState(true)
+ const largeRef = useRef()
+ const baseRef = useRef()
+ const buttonsRef = useRef()
+
+ // const [dimensions, setDimensions] = useState({})
+
+ // useLayoutEffect(() => {
+ // if (buttonsRef.current && buttonsRef.current.getClientBoundingRect) {
+ // setDimensions(buttonsRef.current.getClientBoundingRect())
+ // }
+ // }, [buttonsRef.current])
+ // log.info('scrollPos', { dimensions, buttonsRef })
return (
<Wrapper style={styles.dashboardWrapper}>
<Section style={[styles.topInfo]}>
- {scrollPos <= 0 ? (
- <Section.Stack alignItems="center">
+ {headerLarge ? (
+ <Section.Stack ref={largeRef} alignItems="center">
<Avatar onPress={() => screenProps.push('Profile')} size={68} source={avatar} style={[styles.avatarBig]} />
<Section.Text style={[styles.userName]}>{fullName || ' '}</Section.Text>
<Section.Row style={styles.bigNumberWrapper}>
@@ -135,7 +146,7 @@ const Dashboard = props => {
</Section.Row>
</Section.Stack>
) : (
- <Section style={[styles.userInfo, styles.userInfoHorizontal]}>
+ <Section ref={baseRef} style={[styles.userInfo, styles.userInfoHorizontal]}>
<Avatar
onPress={() => screenProps.push('Profile')}
size={42}
@@ -145,7 +156,7 @@ const Dashboard = props => {
<BigGoodDollar bigNumberStyles={styles.bigNumberStyles} number={balance} />
</Section>
)}
- <Section.Row style={styles.buttonsRow}>
+ <Section.Row ref={buttonsRef} style={styles.buttonsRow}>
<PushButton
icon="send"
iconAlignment="left"
@@ -182,7 +193,26 @@ const Dashboard = props => {
onEndReached={getNextFeed.bind(null, store)}
updateData={() => {}}
onScroll={({ nativeEvent }) => {
- setScrollPos(nativeEvent.contentOffset.y)
+ // Replicating Header Height.
+ // TODO: Improve this when doing animation
+ const HEIGHT_FULL =
+ props.theme.sizes.defaultDouble +
+ 68 +
+ props.theme.sizes.default +
+ normalize(18) +
+ props.theme.sizes.defaultDouble * 2 +
+ normalize(42) +
+ normalize(70)
+ const HEIGHT_BASE = props.theme.sizes.defaultDouble + 68 + props.theme.sizes.default + normalize(70)
+
+ const HEIGHT_DIFF = HEIGHT_FULL - HEIGHT_BASE
+ const scrollPos = nativeEvent.contentOffset.y
+ const scrollPosAlt = headerLarge ? scrollPos - HEIGHT_DIFF : scrollPos + HEIGHT_DIFF
+ const newHeaderLarge = scrollPos <= HEIGHT_BASE || scrollPosAlt <= HEIGHT_BASE
+ log.info('scrollPos', { newHeaderLarge, scrollPos, scrollPosAlt, HEIGHT_DIFF, HEIGHT_BASE, HEIGHT_FULL })
+ if (newHeaderLarge !== headerLarge) {
+ setHeaderLarge(newHeaderLarge)
+ }
}}
/>
{currentFeed && (
| 0 |
diff --git a/index.js b/index.js @@ -541,7 +541,7 @@ Command.prototype.executeSubCommand = function(argv, args, unknown) {
// add executable arguments to spawn
args = (process.execArgv || []).concat(args);
- proc = spawn('node', args, { stdio: 'inherit', customFds: [0, 1, 2] });
+ proc = spawn(process.argv[0], args, { stdio: 'inherit', customFds: [0, 1, 2] });
} else {
proc = spawn(bin, args, { stdio: 'inherit', customFds: [0, 1, 2] });
}
| 4 |
diff --git a/generators/entity/index.js b/generators/entity/index.js @@ -748,6 +748,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
// Load in-memory data for fields
context.fields.forEach(field => {
+ const fieldOptions = field.options || {};
// Migration from JodaTime to Java Time
if (field.fieldType === 'DateTime' || field.fieldType === 'Date') {
field.fieldType = 'Instant';
@@ -807,7 +808,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
}
if (_.isUndefined(field.fieldNameHumanized)) {
- field.fieldNameHumanized = _.startCase(field.fieldName);
+ field.fieldNameHumanized = fieldOptions.fieldNameHumanized || _.startCase(field.fieldName);
}
if (_.isUndefined(field.fieldInJavaBeanMethod)) {
@@ -881,6 +882,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
let hasUserField = false;
// Load in-memory data for relationships
context.relationships.forEach(relationship => {
+ const relationshipOptions = relationship.options || {};
const otherEntityName = relationship.otherEntityName;
const otherEntityData = this.getEntityJson(otherEntityName);
if (otherEntityData) {
@@ -969,7 +971,8 @@ class EntityGenerator extends BaseBlueprintGenerator {
}
if (_.isUndefined(relationship.relationshipNameHumanized)) {
- relationship.relationshipNameHumanized = _.startCase(relationship.relationshipName);
+ relationship.relationshipNameHumanized =
+ relationshipOptions.relationshipNameHumanized || _.startCase(relationship.relationshipName);
}
if (_.isUndefined(relationship.relationshipNamePlural)) {
| 11 |
diff --git a/js/views/modals/orderDetail/summaryTab/Summary.js b/js/views/modals/orderDetail/summaryTab/Summary.js @@ -835,7 +835,8 @@ export default class extends BaseVw {
collection: this.paymentsCollection,
orderPrice: this.orderPriceBtc,
vendor: this.vendor,
- isOrderCancelable: () => this.model.get('state') === 'PENDING' &&
+ isOrderCancelable: () =>
+ ['PENDING', 'PROCESSING_ERROR'].includes(this.model.get('state')) &&
!this.moderator && this.buyer.id === app.profile.id,
isOrderConfirmable: () => this.model.get('state') === 'PENDING' &&
this.vendor.id === app.profile.id && !this.contract.get('vendorOrderConfirmation'),
| 11 |
diff --git a/camera-manager.js b/camera-manager.js @@ -132,6 +132,9 @@ const selectTool = newSelectedTool => {
}
}
};
+window.addEventListener('wheel', e => {
+ console.log('got delta', e.deltaY);
+});
const focusCamera = position => {
camera.lookAt(position);
camera.updateMatrixWorld();
| 0 |
diff --git a/packages/app/src/components/InAppNotification/InAppNotificationPage.tsx b/packages/app/src/components/InAppNotification/InAppNotificationPage.tsx @@ -20,15 +20,14 @@ const InAppNotificationPageBody: FC<Props> = (props) => {
const limit = appContainer.config.pageLimitationXL;
const [activePage, setActivePage] = useState(1);
const offset = (activePage - 1) * limit;
- const { data: inAppNotificationData } = useSWRxInAppNotifications(limit, offset);
+ const { data: allNotificationData } = useSWRxInAppNotifications(limit, offset);
-
- const [activeUnopenedNotificationPage, setActiveUnopenedPage] = useState(1);
+ const [activeUnopenedNotificationPage, setActiveUnopenedNotificationPage] = useState(1);
const unopenedNotificationOffset = (activeUnopenedNotificationPage - 1) * limit;
- const { data: unopendNotificationData } = useSWRxInAppNotifications(limit, unopenedNotificationOffset, InAppNotificationStatuses.STATUS_UNOPENED);
+
const { t } = useTranslation();
- if (inAppNotificationData == null || unopendNotificationData == null) {
+ if (allNotificationData == null) {
return (
<div className="wiki">
<div className="text-muted text-center">
@@ -44,19 +43,19 @@ const InAppNotificationPageBody: FC<Props> = (props) => {
};
const setUnopenedPageNumber = (selectedPageNumber): void => {
- setActiveUnopenedPage(selectedPageNumber);
+ setActiveUnopenedNotificationPage(selectedPageNumber);
};
// commonize notification lists by 81953
const AllInAppNotificationList = () => {
return (
<>
- <InAppNotificationList inAppNotificationData={inAppNotificationData} />
+ <InAppNotificationList inAppNotificationData={allNotificationData} />
<PaginationWrapper
activePage={activePage}
changePage={setPageNumber}
- totalItemsCount={inAppNotificationData.totalDocs}
- pagingLimit={inAppNotificationData.limit}
+ totalItemsCount={allNotificationData.totalDocs}
+ pagingLimit={allNotificationData.limit}
align="center"
size="sm"
/>
@@ -66,6 +65,18 @@ const InAppNotificationPageBody: FC<Props> = (props) => {
// commonize notification lists by 81953
const UnopenedInAppNotificationList = () => {
+ const { data: unopendNotificationData } = useSWRxInAppNotifications(limit, unopenedNotificationOffset, InAppNotificationStatuses.STATUS_UNOPENED);
+
+ if (unopendNotificationData == null) {
+ return (
+ <div className="wiki">
+ <div className="text-muted text-center">
+ <i className="fa fa-2x fa-spinner fa-pulse mr-1"></i>
+ </div>
+ </div>
+ );
+ }
+
return (
<>
<div className="mb-2 d-flex justify-content-end">
| 10 |
diff --git a/doc/server_config.md b/doc/server_config.md @@ -31,7 +31,7 @@ Make sure you have the following packages installed:
* xml2 **(Version 1.0 or higher)**
* jaod (Currently, a Github repository only: http://github.com/ropenscilabs/jaod. Install with devtools.)
* rbace (Currently, a Github repository only: http://github.com/ropenscilabs/rbace. Install with devtools.)
- * ropenaire (For VIPER. Currently, a Github repository only: https://github.com/njahn82/ropenaire. Install with devtools.)
+ * ropenaire (For VIPER. Currently, a Github repository only: https://github.com/sckott/ropenaire. Install with devtools.)
* readr (for ropenair/VIPER only)
* phantomjs 2.1+ (http://phantomjs.org/), if you want to use the snapshot feature
| 3 |
diff --git a/index.js b/index.js @@ -25,6 +25,15 @@ const certs = {
cert: _tryReadFile('./certs/fullchain.pem'),
};
+function makeId(length) {
+ let result = '';
+ const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+ for (let i = 0; i < length; i++) {
+ result += characters.charAt(Math.floor(Math.random() * characters.length));
+ }
+ return result;
+}
+
(async () => {
const app = express();
app.use('*', async (req, res, next) => {
@@ -80,7 +89,41 @@ const certs = {
return http.createServer();
}
})();
- wsrtc.bindServer(wsServer);
+ const initialRoomState = (() => {
+ const s = fs.readFileSync('./scenes/gunroom.scn', 'utf8');
+ const j = JSON.parse(s);
+ const {objects} = j;
+
+ const worldPrefix = 'world';
+ const result = {
+ [worldPrefix]: [],
+ };
+ for (const object of objects) {
+ let {start_url, type, content, position = [0, 0, 0], quaternion = [0, 0, 0, 1], scale = [1, 1, 1]} = object;
+ const instanceId = makeId(5);
+ if (!start_url && type && content) {
+ start_url = `data:${type},${encodeURI(JSON.stringify(content))}`;
+ }
+ const appObject = {
+ instanceId,
+ contentId: start_url,
+ position,
+ quaternion,
+ scale,
+ components: JSON.stringify([]),
+ };
+ result[worldPrefix].push(instanceId);
+ result[worldPrefix + '.' + instanceId] = appObject;
+ }
+ return result;
+ })();
+ const initialRoomNames = [
+ 'Erithor',
+ ];
+ wsrtc.bindServer(wsServer, {
+ initialRoomState,
+ initialRoomNames,
+ });
const port2 = port + 1;
await new Promise((accept, reject) => {
wsServer.listen(port2, '0.0.0.0', () => {
| 0 |
diff --git a/plugins/plugin-sass/README.md b/plugins/plugin-sass/README.md @@ -23,7 +23,7 @@ Then add the plugin to your Snowpack config:
module.exports = {
plugins: [
- ['@snowpack/plugin-sass', { /* see options below */ }
+ ['@snowpack/plugin-sass', { /* see options below */ } ]
],
};
```
| 0 |
diff --git a/views/bootswatch4.pug b/views/bootswatch4.pug @@ -2,6 +2,16 @@ extends layout
block content
h2 Bootswatch 4 Beta
+
+ .panel.panel-info
+ .panel-heading
+ h3.panel-title Info
+ .panel-body
+ | Bootstrap 4 is currently in Beta release and should be treated as such. For details check out
+ a(href='https://blog.getbootstrap.com/2017/08/10/bootstrap-4-beta/', target='_blank', rel='noopener').
+ the Bootstrap 4 Beta announcement
+ | .
+
.well
- for (var i = 0; i < config.bootswatch4.themes.length; i++) {
- var name = config.bootswatch4.themes[i].name.toLowerCase()
| 0 |
diff --git a/learn/getting_started/quick_start.md b/learn/getting_started/quick_start.md # Quick Start
This quick tour will help you get started with MeiliSearch in only a few steps. In order to make the most of it, you should be somewhat familiar with:
+
- [The command line](https://www.learnenough.com/command-line-tutorial#sec-running_a_terminal)
- [cURL](https://curl.se)
- [JavaScript syntax](https://developer.mozilla.org/en-US/docs/Learn/Getting_started_with_the_web/JavaScript_basics)
| 1 |
diff --git a/src/imba/index.imba b/src/imba/index.imba @@ -420,47 +420,44 @@ class KeyedTagFragment < TagFragment
@parent = parent
@slot = slot
@array = []
- @remove = Set.new
- @map = WeakMap.new
+ @changes = Map.new
+ @dirty = no
@$ = {}
def push item, idx
let toReplace = @array[idx]
- # do nothing
+
if toReplace === item
yes
else
- let prevIndex = @map.get(item)
+ @dirty = yes
+ # if this is a new item
+ let prevIndex = @array.indexOf(item)
+ let changed = @changes.get(item)
- if prevIndex === undefined
- # this is a new item
- @array.splice(idx,0,item)
- @appendChild(item,idx)
- elif true
- # console.log("moving item?!",idx,prevIndex,item)
- let prev = @array.indexOf(item)
- @array.splice(prev,1) if prev >= 0
+ if prevIndex === -1
+ # should we mark the one currently in slot as removed?
@array.splice(idx,0,item)
@appendChild(item,idx)
+ elif prevIndex === idx + 1
+ if toReplace
+ @changes.set(toReplace,-1)
+ @array.splice(idx,1)
- elif prevIndex < idx
- # this already existed earlier in the list
- # no need to do anything?
- @map.set(item,idx)
-
- elif prevIndex > idx
- # was further ahead
- @array.splice(prevIndex,1)
- @appendChild(item,idx)
+ else
+ @array.splice(prevIndex,1) if prevIndex >= 0
@array.splice(idx,0,item)
+ @appendChild(item,idx)
+ if changed == -1
+ @changes.delete(item)
return
def appendChild item, index
# we know that these items are dom elements
# console.log "append child",item,index
- @map.set(item,index)
+ # @map.set(item,index)
if index > 0
let other = @array[index - 1]
@@ -472,27 +469,28 @@ class KeyedTagFragment < TagFragment
return
def removeChild item, index
- @map.delete(item)
+ # @map.delete(item)
if item.parentNode == @parent
@parent.removeChild(item)
-
return
def open$
return self
def close$ index
- if @remove.size
- # console.log('remove items from keyed tag',@remove.entries())
- @remove.forEach do |item| @removeChild(item)
- @remove.clear()
+ if @dirty
+ @changes.forEach do |pos,item|
+ if pos == -1
+ @removeChild(item)
+ @changes.clear()
+ @dirty = no
# there are some items we should remove now
if @array.length > index
+
# remove the children below
while @array.length > index
let item = @array.pop()
- # console.log("remove child",item.data.id)
@removeChild(item)
# @array.length = index
return self
| 7 |
diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs @@ -113,7 +113,7 @@ export class AlertErrorComponent implements OnDestroy {
}
setClasses(alert: JhiAlert): { [key: string]: boolean } {
- const classes = { 'jhi-toast': !!alert.toast };
+ const classes = { 'jhi-toast': Boolean(alert.toast) };
if (alert.position) {
return { ...classes, [alert.position]: true };
}
| 4 |
diff --git a/mob-manager.js b/mob-manager.js @@ -403,6 +403,7 @@ class MobGenerator {
position: chunk.clone()
.multiplyScalar(chunkWorldSize)
.add(new THREE.Vector3(rng() * chunkWorldSize, 0, rng() * chunkWorldSize)),
+ quaternion: new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), r(Math.PI)),
});
app.name = chunk.name + '-' + i;
(async () => {
| 0 |
diff --git a/server/workers/base/renv.lock b/server/workers/base/renv.lock },
"rbace": {
"Package": "rbace",
- "Version": "0.0.6.9510",
+ "Version": "0.2.0",
"Source": "GitHub",
"RemoteType": "github",
"RemoteHost": "api.github.com",
"RemoteRepo": "rbace",
"RemoteUsername": "ropensci",
"RemoteRef": "master",
- "RemoteSha": "f3f565fd102a359f34e16aec9b60ea9e108a4547",
- "Hash": "8bc1241abc9cbb314f5ec2387cebe529"
+ "RemoteSha": "23b5a0a8e904f8f435032f6fcac2744532bc7b06",
+ "Hash": "967c7c73e168ba2677de0fba07ff2157"
},
"RColorBrewer": {
"Package": "RColorBrewer",
| 3 |
diff --git a/app/src/renderer/components/common/NiFieldSeed.vue b/app/src/renderer/components/common/NiFieldSeed.vue field.ni-field-seed(
type="textarea"
@input="update($event)"
- :value="value")
+ :value="value"
+ resize="none")
</template>
<script>
@@ -15,6 +16,9 @@ export default {
this.$emit("input", value)
}
},
+ mounted() {
+ this.$el.style.height = this.$el.scrollHeight + "px"
+ },
props: ["value"]
}
</script>
@@ -23,5 +27,5 @@ export default {
@require '~variables'
.ni-field.ni-field-seed
- height 7rem
+ resize none
</style>
| 12 |
diff --git a/src/components/TileLayer.vue b/src/components/TileLayer.vue @@ -20,9 +20,22 @@ export default {
if (this.token) this.params['token'] = this.token;
this.$tileLayer = L.tileLayer(this.url, this.params);
},
+ watch: {
+ url (val) {
+ this.$tileLayer.setUrl(val);
+ },
+ attribution (val, old) {
+ this.$attributionControl.removeAttribution(old);
+ this.$attributionControl.addAttribution(val);
+ },
+ token (val) {
+ this.params.token = val;
+ }
+ },
methods: {
deferredMountedTo(parent) {
this.$tileLayer.addTo(parent);
+ this.$attributionControl = parent.attributionControl;
var that = this.mapObject;
for (var i = 0; i < this.$children.length; i++) {
this.$children[i].deferredMountedTo(that);
| 11 |
diff --git a/sources/ca/on/north_glengarry.json b/sources/ca/on/north_glengarry.json "number": {
"function": "regexp",
"field": "LOCATION",
- "pattern": "^([0-9]+)( .*)",
- "replace": "$1"
+ "pattern": "^([0-9]+(?:\-[0-9]+)?)(?: .*)"
},
"street": "STREETNAME",
"type": "shapefile"
| 11 |
diff --git a/examples/cindyleap/08_FingerTracking_Gestures.html b/examples/cindyleap/08_FingerTracking_Gestures.html <meta charset="UTF-8">
<script type="text/javascript" src="../../build/js/Cindy.js"></script>
<script type="text/javascript" src="../../build/js/CindyLeap.js"></script>
+<link rel="stylesheet" href="../../css/cindy.css">
<script id="csinit" type="text/x-cindyscript">
use("CindyLeap");
initleapmotion(enablegestures->true, translationfactor->2);
</script>
<script id="csdraw" type="text/x-cindyscript">
- // Prints the gestures in the browser's developer console.
- leapdebugprintgestures();
+ // Prints the gestures in the console.
+ // Alternatively, this can be done with leapdebugprintgestures();
+ d = getleapgesturedata();
+ if(length(d)>0,
+ print(d);
+ );
</script>
<script type="text/javascript">
- CindyJS({canvasname:"CSCanvas",scripts:"cs*"});
+ CindyJS({canvasname:"CSCanvas",scripts:"cs*", csconsole:true});
</script>
</head>
| 14 |
diff --git a/src/angular/projects/spark-angular/package.json b/src/angular/projects/spark-angular/package.json "lerna-publish": "cd ../../dist/spark-angular && npm publish"
},
"peerDependencies": {
- "@angular/animations": "^7.0.0",
- "@angular/common": "^7.0.0",
- "@angular/compiler": "^7.0.0",
- "@angular/compiler-cli": "^7.0.0",
- "@angular/core": "^7.0.0",
- "@angular/forms": "^7.0.0",
- "@angular/http": "^7.0.0",
- "@angular/platform-browser": "^7.0.0",
- "@angular/platform-browser-dynamic": "^7.0.0",
- "@angular/router": "^7.0.0",
+ "@angular/animations": "^8.2.0",
+ "@angular/common": "^8.2.0",
+ "@angular/compiler": "^8.2.0",
+ "@angular/compiler-cli": "^8.2.0",
+ "@angular/core": "^8.2.0",
+ "@angular/forms": "^8.2.0",
+ "@angular/platform-browser": "^8.2.0",
+ "@angular/platform-browser-dynamic": "^8.2.0",
+ "@angular/router": "^8.2.0",
"@sparkdesignsystem/spark": "^12.0.0",
"lodash": "^4.17.10",
"tiny-date-picker": "^3.2.6"
| 3 |
diff --git a/buildinfo.sh b/buildinfo.sh #!/bin/bash -x
GIT_HASH=$(git rev-parse HEAD)
+DATE=`date`
cat > buildinfo.go <<- EOM
package sparta
// THIS FILE IS AUTOMATICALLY GENERATED
// DO NOT EDIT
+// CREATED: $(DATE)
// SpartaGitHash is the commit hash of this Sparta library
const SpartaGitHash = "$GIT_HASH"
| 0 |
diff --git a/src/components/lights/DirectionalLight.js b/src/components/lights/DirectionalLight.js @@ -2,11 +2,14 @@ import {DirectionalLight as DirectionalLightNative, DirectionalLightHelper} from
import {LightComponent} from '../../core/LightComponent';
class DirectionalLight extends LightComponent {
- // static helpers = {
- // default: [DirectionalLightHelper, {
- // size: 0
- // }, ['size']]
- // };
+ static defaults = {
+ ...LightComponent.defaults,
+
+ light: {
+ color: 0xffffff,
+ intensity: 1
+ }
+ };
constructor(params = {}) {
super(params);
| 3 |
diff --git a/.github/workflows/php-tests-wp-latest-multisite-php-7-4.yml b/.github/workflows/php-tests-wp-latest-multisite-php-7-4.yml @@ -34,12 +34,6 @@ jobs:
WP_MULTISITE: '1'
steps:
- uses: actions/checkout@v2
- - name: Grant database access
- env:
- MYSQL_TCP_PORT: ${{ env.DB_PORT }}
- run: |
- mysql -u root -h ${DB_HOST} -e "CREATE USER ${MYSQL_USER} IDENTIFIED BY '${MYSQL_PASSWORD}';"
- mysql -u root -h ${DB_HOST} -e "GRANT ALL PRIVILEGES ON *.* TO ${MYSQL_USER};"
- uses: shivammathur/setup-php@v2
with:
extensions: mysqli
| 2 |
diff --git a/test/vgl-font.spec.js b/test/vgl-font.spec.js @@ -115,14 +115,14 @@ describe("VglFont component", function() {
}).$mount();
vm.$refs.f.$watch("inst", (inst) => {
const req = new XMLHttpRequest();
- req.onload = () => {
+ req.addEventListener("load", () => {
try {
- assert.deepEqual(inst.data, JSON.parse(req.responseText));
+ assert.deepEqual(inst.data, JSON.parse(req.response));
done();
} catch(e) {
done(e);
}
- };
+ });
req.open("GET", "base/node_modules/three/examples/fonts/helvetiker_regular.typeface.json");
req.send();
});
| 4 |
diff --git a/test/jasmine/tests/parcoords_test.js b/test/jasmine/tests/parcoords_test.js @@ -856,6 +856,12 @@ describe('parcoords Lifecycle methods', function() {
}],
line: {color: 'blue'}
}], {
+ margin: {
+ t: 0,
+ b: 0,
+ l: 0,
+ r: 0
+ },
width: 300,
height: 200
})
@@ -888,6 +894,12 @@ describe('parcoords Lifecycle methods', function() {
}],
line: {color: 'blue'}
}], {
+ margin: {
+ t: 0,
+ b: 0,
+ l: 0,
+ r: 0
+ },
width: 300,
height: 200
})
@@ -910,6 +922,62 @@ describe('parcoords Lifecycle methods', function() {
.catch(failTest)
.then(done);
});
+
+ it('@gl unselected.line.color `Plotly.restyle` should change context layer line.color', function(done) {
+ var testLayer = '.gl-canvas-context';
+
+ var list1 = [];
+ var list2 = [];
+ for(var i = 0; i <= 100; i++) {
+ list1[i] = i;
+ list2[i] = 100 - i;
+ }
+
+ Plotly.plot(gd, [{
+ type: 'parcoords',
+ dimensions: [{
+ constraintrange: [1, 10],
+ values: list1
+ }, {
+ values: list2
+ }],
+ line: {color: '#0F0'},
+ unselected: {line: {color: '#F00'}}
+ }], {
+ margin: {
+ t: 0,
+ b: 0,
+ l: 0,
+ r: 0
+ },
+ width: 300,
+ height: 200
+ })
+ .then(function() {
+ var rgb = getAvgPixelByChannel(testLayer);
+ expect(rgb[0]).not.toBe(0, 'red');
+ expect(rgb[1]).toBe(0, 'no green');
+ expect(rgb[2]).toBe(0, 'no blue');
+
+ return Plotly.restyle(gd, 'unselected.line.color', '#00F');
+ })
+ .then(function() {
+ var rgb = getAvgPixelByChannel(testLayer);
+ expect(rgb[0]).toBe(0, 'no red');
+ expect(rgb[1]).toBe(0, 'no green');
+ expect(rgb[2]).not.toBe(0, 'blue');
+
+ return Plotly.restyle(gd, 'unselected.line.color', 'rgba(0,0,0,0)');
+ })
+ .then(function() {
+ var rgb = getAvgPixelByChannel(testLayer);
+ expect(rgb[0]).toBe(0, 'no red');
+ expect(rgb[1]).toBe(0, 'no green');
+ expect(rgb[2]).toBe(0, 'no blue');
+ })
+ .catch(failTest)
+ .then(done);
+ });
});
describe('parcoords basic use', function() {
| 0 |
diff --git a/contracts/ExternStateFeeToken.sol b/contracts/ExternStateFeeToken.sol @@ -234,7 +234,6 @@ contract ExternStateFeeToken is Owned, SafeDecimalMath {
state.setBalanceOf(address(this), safeAdd(state.balanceOf(address(this)), fee));
emit Transfer(msg.sender, to, value);
- emit TransferFeePaid(msg.sender, fee);
emit Transfer(msg.sender, address(this), fee);
return true;
@@ -261,7 +260,6 @@ contract ExternStateFeeToken is Owned, SafeDecimalMath {
state.setBalanceOf(address(this), safeAdd(state.balanceOf(address(this)), fee));
emit Transfer(from, to, value);
- emit TransferFeePaid(from, fee);
emit Transfer(from, address(this), fee);
return true;
@@ -331,8 +329,6 @@ contract ExternStateFeeToken is Owned, SafeDecimalMath {
event Transfer(address indexed from, address indexed to, uint value);
- event TransferFeePaid(address indexed account, uint value);
-
event Approval(address indexed owner, address indexed spender, uint value);
event TransferFeeRateUpdated(uint newFeeRate);
| 2 |
diff --git a/docs/guides/building-tests.md b/docs/guides/building-tests.md @@ -11,8 +11,6 @@ $ git clone https://github.com/SabakiHQ/Sabaki
$ cd Sabaki
```
-### Desktop version
-
Install the dependencies of Sabaki using npm:
```
@@ -54,23 +52,6 @@ adheres to the coding style standards:
$ npm run format
```
-### Web version
-
-Checkout the `web` branch and install the dependencies for the web version:
-
-```
-$ git checkout web
-$ npm install
-```
-
-To build Sabaki, use one of the following build instructions:
-
-- `$ npm run watch` creates a human-readable build and watches code for changes
-- `$ npm run build` creates a minified version
-
-This creates a `bundle.js` file. To run Sabaki, simply open `Sabaki/index.html`
-in a modern web browser, preferably Chrome.
-
## Tests
Make sure you have the master branch checked out since there are no test in the
| 2 |
diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js @@ -51,7 +51,7 @@ Module.register("calendar", {
// Define required scripts.
getStyles: function () {
- return ["calendar.css", "font-awesome5.css", "font-awesome5.v4shims.css"];
+ return ["calendar.css", "font-awesome.css"];
},
// Define required scripts.
| 13 |
diff --git a/src/kiri/init.js b/src/kiri/init.js @@ -2069,12 +2069,13 @@ gapp.register("kiri.init", [], (root, exports) => {
}
function dragit(el, delta) {
- el.onmousedown = (ev) => {
+ el.ontouchstart = el.onmousedown = (ev) => {
tracker.style.display = 'block';
ev.stopPropagation();
+ let obj = (ev.touches ? ev.touches[0] : ev);
drag.width = slider.clientWidth;
drag.maxval = drag.width - slbar2;
- drag.start = ev.screenX;
+ drag.start = obj.screenX;
drag.loat = drag.low = pxToInt(ui.sliderHold.style.marginLeft);
drag.mdat = drag.mid = ui.sliderMid.clientWidth;
drag.hiat = pxToInt(ui.sliderHold.style.marginRight);
@@ -2088,13 +2089,16 @@ gapp.register("kiri.init", [], (root, exports) => {
slider.onmousemove = undefined;
tracker.style.display = 'none';
};
- tracker.onmousemove = (ev) => {
+ tracker.ontouchmove = tracker.onmousemove = (ev) => {
ev.stopPropagation();
ev.preventDefault();
if (ev.buttons === 0) {
return cancel_drag();
}
- if (delta) delta(ev.screenX - drag.start);
+ if (delta) {
+ let obj = (ev.touches ? ev.touches[0] : ev);
+ delta(obj.screenX - drag.start);
+ }
};
};
}
| 11 |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml @@ -79,6 +79,7 @@ jobs:
firstCommitHash="$(git log master.."${{ env.release_branch_name }}" --pretty=format:"%H" | tail -1)"
git checkout $firstCommitHash
git commit -m "Automatically updated @semcore/ui changelog" --amend --no-edit
+ git checkout "${{ env.release_branch_name }}"
git pull --rebase
if: env.release_branch_already_exists == 'true'
- name: push updated changelog
| 0 |
diff --git a/app/controllers/carto/api/api_keys_controller.rb b/app/controllers/carto/api/api_keys_controller.rb @@ -12,6 +12,8 @@ class Carto::Api::ApiKeysController < ::Api::ApplicationController
)
api_key.save!
render_jsonp(Carto::Api::ApiKeyPresenter.new(api_key).to_poro)
+ rescue ActiveRecord::RecordInvalid => e
+ render_jsonp({error: true, message: e.message}, 400 )
end
private
| 9 |
diff --git a/src/main/resources/public/js/src/analytics/AnalyticsGA.js b/src/main/resources/public/js/src/analytics/AnalyticsGA.js @@ -27,9 +27,9 @@ define(function (require) {
var AnalyticsGA = AnalyticsObject.extend({
initialize: function () {
- if ('DEBUG_STATE') {
- return;
- }
+ // if ('DEBUG_STATE') {
+ // return;
+ // }
window.ga = window.ga || function () {
(ga.q = ga.q || []).push(arguments);
};
@@ -49,19 +49,19 @@ define(function (require) {
if (services && services.API && services.API.extensions && services.API.extensions.instanceId) {
instanceId = services.API.extensions.instanceId;
}
- ga('set', 'campaignMedium', instanceId);
+ ga('set', 'dimension1', instanceId);
});
},
send: function (data) {
- if ('DEBUG_STATE') {
- return;
- }
+ // if ('DEBUG_STATE') {
+ // return;
+ // }
ga('send', 'event', data[0], data[1], data[2]);
},
pageView: function (data) {
- if ('DEBUG_STATE') {
- return;
- }
+ // if ('DEBUG_STATE') {
+ // return;
+ // }
ga('send', 'pageview', data[0]);
}
});
| 12 |
diff --git a/packages/openneuro-app/src/scripts/datalad/download/download-native.js b/packages/openneuro-app/src/scripts/datalad/download/download-native.js @@ -86,7 +86,9 @@ export const downloadNative = (datasetId, snapshotTag) => async () => {
}
downloadCompleteToast(dirHandle.name)
} catch (err) {
- if (err.name === 'DownloadAbortError') {
+ if (err.name === 'AbortError') {
+ return
+ } else if (err.name === 'DownloadAbortError') {
downloadAbortToast()
} else if (err.name === 'NotAllowedError') {
permissionsToast()
| 9 |
diff --git a/readme.md b/readme.md @@ -67,6 +67,7 @@ To use the samples clone this GitHub repository using Git.
|22.conversation-history| Demonstrates the use of SendConversationHistoryAsync API to upload conversation history stored in the conversation Transcript.|[View][cs#22]|:runner:| | | |
|23.facebook-events | Integrate and consume Facebook specific payloads, such as post-backs, quick replies and opt-in events.|[View][cs#23] |[View][js#23] | | | |
|24.bot-auth-msgraph | Demonstrates bot authentication capabilities of Azure Bot Service. Demonstrates utilizing the Microsoft Graph API to retrieve data about the user.|[View][cs#24] |[View][js#24] | | | |
+|25.bot-logging | Demonstrates bot authentication capabilities of Azure Bot Service. Demonstrates utilizing the Microsoft Graph API to retrieve data about the user.|[View][cs#25] |[View][js#25] | | | |
|50.diceroller-skill | This sample demonstrates how to implement a Cortana Skill that properly handles EndOfConversation events.|:runner: |[View][js#50] | | | |
|51.cafe-bot | A complete E2E Cafe bot that has all capabilities and includes best practices|[View][cs#51]|[View][js#51]| | | |
|52.enterprise-bot | Enterprise bot that demonstrates use of Dialogs, Template Manager, Dispatch across different services and implementing custom middleware.| [View][cs#52] | | | | [View][ts#52] |
| 0 |
diff --git a/modules/RTC/RTCBrowserType.js b/modules/RTC/RTCBrowserType.js @@ -319,6 +319,11 @@ function detectIE() {
version = parseInt(ua.substring(rv + 3, ua.indexOf('.', rv)), 10);
}
+ if (version) {
+ currentBrowser = RTCBrowserType.RTC_BROWSER_IEXPLORER;
+ logger.info(`This appears to be IExplorer, ver: ${version}`);
+ }
+
return version;
}
| 12 |
diff --git a/includes/Modules/AdSense.php b/includes/Modules/AdSense.php @@ -494,7 +494,6 @@ tag_partner: "site_kit"
array(
'id' => 'adsense-notification',
'title' => __( 'Alert found!', 'google-site-kit' ),
- /* translators: %d: number of notifications */
'description' => $alert->getMessage(),
'isDismissible' => true,
'winImage' => 'sun-small.png',
| 2 |
diff --git a/articles/custom-domains/additional-configuration.md b/articles/custom-domains/additional-configuration.md @@ -47,8 +47,7 @@ var lock = new Auth0Lock(config.clientID, config.auth0Domain, {
configurationBaseUrl: config.clientConfigurationBaseUrl,
overrides: {
__tenant: config.auth0Tenant,
- __token_issuer: config.authorizationServer.issuer,
- __jwks_uri: 'https://your-custom-domain/.well-known/jwks.json'
+ __token_issuer: config.authorizationServer.issuer
},
//code omitted for brevity
});
@@ -63,8 +62,7 @@ var webAuth = new auth0.WebAuth({
//code omitted for brevity
overrides: {
__tenant: config.auth0Tenant,
- __token_issuer: config.authorizationServer.issuer,
- __jwks_uri: 'https://your-custom-domain/.well-known/jwks.json'
+ __token_issuer: config.authorizationServer.issuer
},
//code omitted for brevity
});
| 2 |
diff --git a/src/scripts/content/feedly.js b/src/scripts/content/feedly.js @@ -12,6 +12,6 @@ togglbutton.render('.entryHeader:not(.toggl)', {observe: true}, function (elem)
description: description
});
- $('.entryHeader > .metadata').appendChild(textnode);
- $('.entryHeader > .metadata').appendChild(link);
+ elem.querySelector('.entryHeader > .metadata').appendChild(textnode);
+ elem.querySelector('.entryHeader > .metadata').appendChild(link);
});
| 1 |
diff --git a/server/src/imports/missions/export/playSound.js b/server/src/imports/missions/export/playSound.js @@ -3,6 +3,8 @@ import addAsset from "../../addAsset";
export default function buildExport(zip, i, type) {
if (i.event === "playSound") {
const args = JSON.parse(i.args);
+ console.log({ i, args });
+ if (!args.sound) return;
const asset = args.sound.asset;
if (asset) {
addAsset(asset, zip, type);
| 1 |
diff --git a/tests/e2e/mu-plugins/e2e-rest-feature-flag.php b/tests/e2e/mu-plugins/e2e-rest-feature-flag.php @@ -50,11 +50,10 @@ add_action(
// Enforce feature activation as defined by the E2E feature flags option.
add_filter(
'googlesitekit_is_feature_enabled',
- function( $feature_name, $feature_enabled, $mode ) {
+ function ( $feature_name ) {
$features = get_option( 'googlesitekit_e2e_feature_flags', array() );
return ! empty( $features[ $feature_name ] );
},
- 999,
- 3
+ 999
);
| 2 |
diff --git a/articles/users/index.md b/articles/users/index.md @@ -27,6 +27,7 @@ description: Learn about working with users in Auth0
'/extensions/delegated-admin',
'/extensions/authorization-extension/v2',
'/user-profile/progressive-profiling',
- '/user-profile/user-data-storage'
+ '/user-profile/user-data-storage',
+ '/connections/database/migrating-okta'
] }) %>
| 0 |
diff --git a/package.json b/package.json "@fortawesome/react-fontawesome": "^0.1.9",
"@gatsby-contrib/gatsby-plugin-elasticlunr-search": "^2.3.0",
"dotenv": "^8.2.0",
- "gatsby": "^2.21.33",
+ "gatsby": "^2.25.0",
"gatsby-image": "^2.4.3",
"gatsby-plugin-feed": "^2.5.5",
"gatsby-plugin-google-analytics": "^2.3.1",
| 13 |
diff --git a/.solhint.json b/.solhint.json "quotes": "error",
"max-line-length": "error",
"no-unused-vars": "error",
- "function-max-lines": "error",
"no-complex-fallback": "warn",
"check-send-result": "warn",
"reentrancy": "warn",
| 2 |
diff --git a/package.json b/package.json ],
"dependencies": {
"lodash": "^4.17.2",
- "classnames": "^2.2.5"
+ "classnames": "^2.2.5",
+ "react-css-themr": "^2.0.0"
},
"devDependencies": {
"@kadira/storybook": "^2.35.3",
"babel-preset-react-optimize": "^1.0.1",
"babel-preset-stage-0": "^6.16.0",
"babel-preset-stage-1": "^6.16.0",
+ "cpx": "^1.5.0",
+ "cross-env": "^3.1.4",
"css-loader": "^0.26.1",
"eslint": "^3.12.2",
"eslint-config-airbnb": "^13.0.0",
"react": "^15.4.0",
"react-addons-css-transition-group": "^15.4.0",
"react-dom": "^15.4.0",
+ "rimraf": "^2.6.1",
"sass-loader": "^4.1.0",
"style-loader": "^0.13.1",
"url-loader": "^0.5.7",
- "webpack": "^1.13.0",
- "react-css-themr": "^2.0.0"
+ "webpack": "^1.13.0"
},
"scripts": {
"components": "babel ./source/components --out-dir ./lib/components",
"skins": "babel ./source/skins --out-dir ./lib/skins",
"babel": "npm run components && npm run skins",
- "build": "NODE_ENV=production npm run babel && npm run sass",
- "clean": "rm -rf ./lib",
+ "build": "cross-env NODE_ENV=production npm run babel && npm run sass",
+ "clean": "rimraf ./lib",
"prebuild": "npm run clean",
- "preinstall": "npm run prepublish",
"prepublish": "npm run build",
- "sass": "cp -R ./source/themes/ ./lib/themes",
+ "sass": "cpx \"./source/themes/**/*\" ./lib/themes",
"storybook": "start-storybook -p 6543 -c storybook"
},
"license": "Apache-2.0",
"classnames": "^2.2.5",
"react": "^0.14 || ~15.4.0",
"react-addons-css-transition-group": "^0.14.0 || ~15.4.0",
- "react-dom": "^0.14.0 || ~15.4.0",
- "react-css-themr": "^2.0.0"
+ "react-dom": "^0.14.0 || ~15.4.0"
}
}
| 13 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/actions.js b/packages/node_modules/@node-red/editor-client/src/js/ui/actions.js @@ -4,6 +4,12 @@ RED.actions = (function() {
}
function addAction(name,handler) {
+ if (typeof handler !== 'function') {
+ throw new Error("Action handler not a function");
+ }
+ if (actions[name]) {
+ throw new Error("Cannot override existing action");
+ }
actions[name] = handler;
}
function removeAction(name) {
@@ -12,9 +18,11 @@ RED.actions = (function() {
function getAction(name) {
return actions[name];
}
- function invokeAction(name,args) {
+ function invokeAction() {
+ var args = Array.prototype.slice.call(arguments);
+ var name = args.shift();
if (actions.hasOwnProperty(name)) {
- actions[name](args);
+ actions[name].apply(null, args);
}
}
function listActions() {
| 7 |
diff --git a/runtime.js b/runtime.js @@ -894,6 +894,7 @@ const _loadScript = async (file, {files = null, parentUrl = null, contentId = nu
};
mesh.getPhysicsIds = () => app.physicsIds;
mesh.getComponents = () => components;
+ mesh.getApp = () => app;
// mesh.used = false;
const app = appManager.createApp(appId);
| 0 |
diff --git a/publish/src/commands/import-fee-periods.js b/publish/src/commands/import-fee-periods.js @@ -148,7 +148,9 @@ const importFeePeriods = async ({
if (!yes) {
try {
await confirmAction(
- yellow(`Do you want to continue importing this fee period in index position ${index}?`)
+ yellow(
+ `Do you want to continue importing this fee period in index position ${index} (y/n) ?`
+ )
);
} catch (err) {
console.log(gray('Operation cancelled'));
| 3 |
diff --git a/ISSUE_TEMPLATE b/ISSUE_TEMPLATE @@ -5,7 +5,7 @@ issue.
*****YOUR ISSUE WILL BE CLOSED IF IT DOES NOT USE THIS TEMPLATE OR IT IS INCOMPLETE!*****
-Feature requetes can be done without this template.
+Feature requests can be done without this template.
If you have multiple things to report please create one issue per item.
Please use english when reporting issues.
| 1 |
diff --git a/token-metadata/0x5d60d8d7eF6d37E16EBABc324de3bE57f135e0BC/metadata.json b/token-metadata/0x5d60d8d7eF6d37E16EBABc324de3bE57f135e0BC/metadata.json "symbol": "MYB",
"address": "0x5d60d8d7eF6d37E16EBABc324de3bE57f135e0BC",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/test/jasmine/tests/isosurface_test.js b/test/jasmine/tests/isosurface_test.js @@ -265,7 +265,7 @@ describe('Test isosurface', function() {
});
});
- describe('hover', function() {
+ describe('@noCI hover', function() {
var gd;
@@ -352,9 +352,6 @@ describe('Test isosurface', function() {
})
.catch(failTest)
.then(done);
-
});
-
});
-
});
| 0 |
diff --git a/util.js b/util.js @@ -1178,16 +1178,3 @@ export const splitLinesToWidth = (() => {
return lines;
};
})();
\ No newline at end of file
-
-export function uploadGeometry(g) {
- const renderer = getRenderer();
- const gl = renderer.getContext();
-
- for (const name in g.attributes) {
- const attribute = g.attributes[name];
- renderer.attributes.update(attribute, gl.ARRAY_BUFFER);
- }
- if (g.index) {
- renderer.attributes.update(g.index, gl.ELEMENT_ARRAY_BUFFER);
- }
-}
\ No newline at end of file
| 2 |
diff --git a/blocks/init/src/Blocks/wrapper/components/wrapper-options.js b/blocks/init/src/Blocks/wrapper/components/wrapper-options.js @@ -117,7 +117,7 @@ export const WrapperOptions = ({ attributes, setAttributes }) => {
return (
<>
{!wrapperDisable &&
- <PanelBody title={__('Block Layout', 'eightshift-frontend-libs')} initialOpen={false} className="custom-highlighted-panel">
+ <PanelBody title={<span>{__('Block Layout', 'eightshift-frontend-libs')}</span>} initialOpen={false} icon={icons.wrapper} className={'es-panel-title'}>
<HelpModal />
| 4 |
diff --git a/lib/internal/bundle.js b/lib/internal/bundle.js @@ -149,9 +149,9 @@ async function loadConfigFile(options) {
}
if (!htmlConfig.basePath) {
- if (isHtml(options.output)) {
htmlConfig.basePath = "/";
- } else {
+
+ if (!isHtml(options.output) && !path.isAbsolute(options.output)) {
const basePath = stripFirst(options.output);
if (basePath.includes("/")) {
| 7 |
diff --git a/token-metadata/0x79c71D3436F39Ce382D0f58F1B011D88100B9D91/metadata.json b/token-metadata/0x79c71D3436F39Ce382D0f58F1B011D88100B9D91/metadata.json "symbol": "XNS",
"address": "0x79c71D3436F39Ce382D0f58F1B011D88100B9D91",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/data/kitchen-sink.xml b/data/kitchen-sink.xml and laboratory examinations</source>
<publisher-loc>Stoneham (MA)</publisher-loc>
<publisher-name>Butterworth Publishers</publisher-name>
- <date-in-citation content-type="copyright-year"
- iso-8601-date="1990">1990</date-in-citation>
+ <year iso-8601-date="2009">1990</year>
<fpage>214</fpage>
<lpage>216</lpage>
</element-citation>
| 14 |
diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php <table id="stock-overview-table" class="table table-striped">
<thead>
<tr>
+ <th>#</th>
<th>{{ $L('Product') }}</th>
<th>{{ $L('Amount') }}</th>
<th>{{ $L('Next best before date') }}</th>
</thead>
<tbody>
@foreach($currentStock as $currentStockEntry)
- <tr class="@if($currentStockEntry->best_before_date < date('Y-m-d', strtotime('-1 days'))) error-bg @elseif($currentStockEntry->best_before_date < date('Y-m-d', strtotime('+5 days'))) warning-bg @elseif (FindObjectInArrayByPropertyValue($missingProducts, 'id', $currentStockEntry->product_id) !== null) info-bg @endif">
+ <tr id="product-{{ $currentStockEntry->product_id }}-row" class="@if($currentStockEntry->best_before_date < date('Y-m-d', strtotime('-1 days'))) error-bg @elseif($currentStockEntry->best_before_date < date('Y-m-d', strtotime('+5 days'))) warning-bg @elseif (FindObjectInArrayByPropertyValue($missingProducts, 'id', $currentStockEntry->product_id) !== null) info-bg @endif">
+ <td class="fit-content">
+ <a class="btn btn-danger btn-xs product-consume-button" href="#" title="{{ $L('Consume 1 #1 of #2', FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->qu_id_stock)->name, FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name) }}"
+ data-product-id="{{ $currentStockEntry->product_id }}"
+ data-product-name="{{ FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name }}"
+ data-product-qu-name="{{ FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->qu_id_stock)->name }}">
+ <i class="fa fa-cutlery"></i>
+ </a>
+ </td>
<td>
{{ FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name }}
</td>
<td>
- {{ $currentStockEntry->amount . ' ' . FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->qu_id_stock)->name }}
+ <span id="product-{{ $currentStockEntry->product_id }}-amount">{{ $currentStockEntry->amount }}</span> {{ FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->qu_id_stock)->name }}
</td>
<td>
{{ $currentStockEntry->best_before_date }}
| 0 |
diff --git a/src/pages/workspace/WorkspaceSettingsPage.js b/src/pages/workspace/WorkspaceSettingsPage.js @@ -64,8 +64,8 @@ class WorkspaceSettingsPage extends React.Component {
};
this.submit = this.submit.bind(this);
- this.onImageSelected = this.onImageSelected.bind(this);
- this.onImageRemoved = this.onImageRemoved.bind(this);
+ this.uploadAvatar = this.uploadAvatar.bind(this);
+ this.removeAvatar = this.removeAvatar.bind(this);
this.getCurrencyItems = this.getCurrencyItems.bind(this);
this.uploadAvatarPromise = Promise.resolve();
}
@@ -74,6 +74,21 @@ class WorkspaceSettingsPage extends React.Component {
getCurrencyList();
}
+ /**
+ * @returns {Object[]}
+ */
+ getCurrencyItems() {
+ const currencyListKeys = _.keys(this.props.currencyList);
+ return _.map(currencyListKeys, currencyCode => ({
+ value: currencyCode,
+ label: `${currencyCode} - ${this.props.currencyList[currencyCode].symbol}`,
+ }));
+ }
+
+ removeAvatar() {
+ this.setState({previewAvatarURL: '', avatarURL: ''});
+ }
+
/**
* @param {Object} image
* @param {String} image.uri
@@ -90,21 +105,6 @@ class WorkspaceSettingsPage extends React.Component {
}).finally(() => updateLocalPolicyValues(this.props.policy.id, {isAvatarUploading: false}));
}
- onImageRemoved() {
- this.setState({previewAvatarURL: '', avatarURL: ''});
- }
-
- /**
- * @returns {Object[]}
- */
- getCurrencyItems() {
- const currencyListKeys = _.keys(this.props.currencyList);
- return _.map(currencyListKeys, currencyCode => ({
- value: currencyCode,
- label: `${currencyCode} - ${this.props.currencyList[currencyCode].symbol}`,
- }));
- }
-
submit() {
updateLocalPolicyValues(this.props.policy.id, {isPolicyUpdating: true});
@@ -157,8 +157,8 @@ class WorkspaceSettingsPage extends React.Component {
style={[styles.mb3]}
anchorPosition={{top: 172, right: 18}}
isUsingDefaultAvatar={!this.state.previewAvatarURL}
- onImageSelected={this.onImageSelected}
- onImageRemoved={this.onImageRemoved}
+ uploadAvatar={this.uploadAvatar}
+ onImageRemoved={this.removeAvatar}
/>
<ExpensiTextInput
| 10 |
diff --git a/src/app/Library/CrudPanel/Traits/Validation.php b/src/app/Library/CrudPanel/Traits/Validation.php @@ -6,6 +6,17 @@ use Illuminate\Foundation\Http\FormRequest;
trait Validation
{
+ /**
+ * Adds the required rules from an array and allows validation of that array.
+ *
+ * @param array $requiredFields
+ */
+ public function setValidationFromArray(array $requiredFields)
+ {
+ $this->setOperationSetting('requiredFields', array_keys($requiredFields));
+ $this->setOperationSetting('validationRules', $requiredFields);
+ }
+
/**
* Mark a FormRequest file as required for the current operation, in Settings.
* Adds the required rules to an array for easy access.
@@ -71,6 +82,11 @@ trait Validation
$request = app($formRequest);
} else {
$request = $this->getRequest();
+
+ if ($this->hasOperationSetting('validationRules')) {
+ $rules = $this->getOperationSetting('validationRules');
+ $request->validate($rules);
+ }
}
return $request;
| 11 |
diff --git a/services/ils/app/api/controllers/chunk.js b/services/ils/app/api/controllers/chunk.js @@ -160,7 +160,12 @@ router.post('/', jsonParser, async (req, res) => {
);
}
+ try {
payloadValidator = ajv.compile(domainSchema.body.data.value);
+ } catch (e) {
+ log.error('ERROR: ', e);
+ return res.status(400).send(e);
+ }
}
if (!domainId && !schemaUri && invalidInputSchema) {
@@ -168,8 +173,12 @@ router.post('/', jsonParser, async (req, res) => {
}
if (schema) {
+ try {
payloadValidator = ajv.compile(schema);
- }
+ } catch (e) {
+ log.error('ERROR: ', e);
+ return res.status(400).send(e);
+ } }
// const valid = chunkValidator(req.body);
// if (!valid) {
@@ -297,7 +306,17 @@ router.post('/validate', jsonParser, async (req, res) => {
);
}
- const payloadValidator = ajv.compile(domainSchema.body.data.value);
+ let payloadValidator;
+
+ try {
+ const obj = domainSchema.body.data.value;
+ // payloadValidator = ajv.compile(domainSchema.body.data.value);
+ payloadValidator = await ajv.compileAsync(obj);
+ } catch (e) {
+ log.error('ERROR: ', e);
+ return res.status(400).send(e);
+ }
+
const validChunk = payloadValidator(payload);
res.status(200).send({ data: { valid: validChunk }, meta: {} });
});
| 7 |
diff --git a/packages/bitcore-lib-doge/lib/transaction/transaction.js b/packages/bitcore-lib-doge/lib/transaction/transaction.js @@ -63,13 +63,13 @@ var DEFAULT_NLOCKTIME = 0;
var MAX_BLOCK_SIZE = 1000000;
// Minimum amount for an output for it not to be considered a dust output
-Transaction.DUST_AMOUNT = 546;
+Transaction.DUST_AMOUNT = 100000001;
// Margin of error to allow fees in the vecinity of the expected value but doesn't allow a big difference
Transaction.FEE_SECURITY_MARGIN = 15;
// max amount of satoshis in circulation
-Transaction.MAX_MONEY = 84000000 * 1e8; // Litecoin has 84M coins
+Transaction.MAX_MONEY = 10000000000 * 1e8; // Litecoin has 84M coins
// nlocktime limit to be considered block height rather than a timestamp
Transaction.NLOCKTIME_BLOCKHEIGHT_LIMIT = 5e8;
@@ -78,7 +78,7 @@ Transaction.NLOCKTIME_BLOCKHEIGHT_LIMIT = 5e8;
Transaction.NLOCKTIME_MAX_VALUE = 4294967295;
// Value used for fee estimation (satoshis per kilobyte)
-Transaction.FEE_PER_KB = 100000; // Litecoin default fees is 0.001 LTC
+Transaction.FEE_PER_KB = 100000000; // Litecoin default fees is 0.001 LTC
// Safe upper bound for change address script size in bytes
Transaction.CHANGE_OUTPUT_MAX_SIZE = 20 + 4 + 34 + 4;
| 3 |
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.212.1",
+ "version": "0.212.2",
"license": "MIT",
"activationCommands": {
"atom-workspace": [
| 6 |
diff --git a/src/components/AddPaymentMethodMenu.js b/src/components/AddPaymentMethodMenu.js import React from 'react';
import PropTypes from 'prop-types';
-import {View} from 'react-native';
import {withOnyx} from 'react-native-onyx';
-import Popover from './Popover';
-import MenuItem from './MenuItem';
import * as Expensicons from './Icon/Expensicons';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
import compose from '../libs/compose';
import ONYXKEYS from '../ONYXKEYS';
import CONST from '../CONST';
-import * as StyleUtils from '../styles/StyleUtils';
import withWindowDimensions from './withWindowDimensions';
import Permissions from '../libs/Permissions';
-import styles from '../styles/styles';
+import PopoverMenu from './PopoverMenu';
const propTypes = {
isVisible: PropTypes.bool.isRequired,
@@ -42,36 +38,31 @@ const defaultProps = {
};
const AddPaymentMethodMenu = props => (
- <Popover
+ <PopoverMenu
isVisible={props.isVisible}
onClose={props.onClose}
anchorPosition={props.anchorPosition}
- >
- <View style={StyleUtils.getPaymentMethodMenuWidth(props.isSmallScreenSize)}>
- <MenuItem
- title={props.translate('common.bankAccount')}
- icon={Expensicons.Bank}
- onPress={() => props.onItemSelected(CONST.PAYMENT_METHODS.BANK_ACCOUNT)}
- wrapperStyle={styles.pr15}
- />
- {Permissions.canUseWallet(props.betas) && (
- <MenuItem
- title={props.translate('common.debitCard')}
- icon={Expensicons.CreditCard}
- onPress={() => props.onItemSelected(CONST.PAYMENT_METHODS.DEBIT_CARD)}
- wrapperStyle={styles.pr15}
- />
- )}
- {props.shouldShowPaypal && !props.payPalMeUsername && (
- <MenuItem
- title={props.translate('common.payPalMe')}
- icon={Expensicons.PayPal}
- onPress={() => props.onItemSelected(CONST.PAYMENT_METHODS.PAYPAL)}
- wrapperStyle={styles.pr15}
+ onItemSelected={() => props.onClose()}
+ menuItems={[
+ {
+ text: props.translate('common.bankAccount'),
+ icon: Expensicons.Bank,
+ onSelected: () => props.onItemSelected(CONST.PAYMENT_METHODS.BANK_ACCOUNT),
+ },
+ ...(Permissions.canUseWallet(props.betas) ? [{
+ text: props.translate('common.debitCard'),
+ icon: Expensicons.CreditCard,
+ onSelected: () => props.onItemSelected(CONST.PAYMENT_METHODS.DEBIT_CARD),
+ },
+ ] : []),
+ ...(props.shouldShowPaypal && !props.payPalMeUsername ? [{
+ text: props.translate('common.payPalMe'),
+ icon: Expensicons.PayPal,
+ onSelected: () => props.onItemSelected(CONST.PAYMENT_METHODS.PAYPAL),
+ },
+ ] : []),
+ ]}
/>
- )}
- </View>
- </Popover>
);
AddPaymentMethodMenu.propTypes = propTypes;
| 4 |
diff --git a/components/Profile/Page.js b/components/Profile/Page.js @@ -243,30 +243,43 @@ class Profile extends Component {
this.onScroll = () => {
const y = window.pageYOffset
const mobile = window.innerWidth < mediaQueries.mBreakPoint
- if (!mobile && y + HEADER_HEIGHT > this.y + this.innerHeight) {
- if (!this.state.sticky) {
- this.setState({ sticky: true })
+ let sticky = (
+ !mobile &&
+ y + HEADER_HEIGHT > this.y + this.innerHeight &&
+ this.mainHeight > this.sidebarHeight &&
+ this.sidebarHeight < (window.innerHeight - HEADER_HEIGHT - SIDEBAR_TOP)
+ )
+
+ if (sticky !== this.state.sticky) {
+ this.setState({ sticky })
}
- } else {
- if (this.state.sticky) {
- this.setState({ sticky: false })
}
+ this.setInnerRef = ref => {
+ this.innerRef = ref
}
+ this.setSidebarInnerRef = ref => {
+ this.sidebarInnerRef = ref
}
- this.innerRef = ref => {
- this.inner = ref
+ this.setMainRef = ref => {
+ this.mainRef = ref
}
this.measure = () => {
const isMobile = window.innerWidth < mediaQueries.mBreakPoint
if (isMobile !== this.state.isMobile) {
this.setState({ isMobile })
}
- if (this.inner) {
- const rect = this.inner.getBoundingClientRect()
+ if (this.innerRef) {
+ const rect = this.innerRef.getBoundingClientRect()
this.y = window.pageYOffset + rect.top
this.innerHeight = rect.height
this.x = window.pageXOffset + rect.left
}
+ if (this.sidebarInnerRef) {
+ this.sidebarHeight = this.sidebarInnerRef.getBoundingClientRect().height
+ }
+ if (this.mainRef) {
+ this.mainHeight = this.mainRef.getBoundingClientRect().height
+ }
this.onScroll()
}
this.isMe = () => {
@@ -374,7 +387,7 @@ class Profile extends Component {
</Box>
)}
<MainContainer>
- <div ref={this.innerRef} {...styles.head}>
+ <div ref={this.setInnerRef} {...styles.head}>
<p {...styles.statement}>
<Statement
user={user}
@@ -424,6 +437,7 @@ class Profile extends Component {
width: PORTRAIT_SIZE_M
}
: {}}>
+ <div ref={this.setSidebarInnerRef}>
<Interaction.H3>{user.name}</Interaction.H3>
<Credentials
user={user}
@@ -461,7 +475,8 @@ class Profile extends Component {
dirty={dirty} />
</div>
</div>
- <div {...styles.mainColumn}>
+ </div>
+ <div {...styles.mainColumn} ref={this.setMainRef}>
<Biography
user={user}
isEditing={isEditing}
| 7 |
diff --git a/conf/evolutions/default/50.sql b/conf/evolutions/default/50.sql # --- !Ups
CREATE TABLE user_stat
(
- user_stats_id INT NOT NULL,
+ user_stat_id SERIAL NOT NULL,
user_id TEXT NOT NULL,
meters_audited DOUBLE PRECISION NOT NULL,
labels_per_meter DOUBLE PRECISION,
high_quality BOOLEAN NOT NULL,
high_quality_manual BOOLEAN,
- PRIMARY KEY (user_stats_id),
+ PRIMARY KEY (user_stat_id),
FOREIGN KEY (user_id) REFERENCES sidewalk_user(user_id)
);
| 1 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.