Merge branch 'dev'

This commit is contained in:
Mikael Svenson 2019-10-13 11:45:48 +02:00
commit e57793153c
5 changed files with 26 additions and 27 deletions

View File

@ -108,6 +108,7 @@ Version|Date|Comments
1.0.0.11|March 18th, 2019|Fix for re-loading of script on smart navigation 1.0.0.11|March 18th, 2019|Fix for re-loading of script on smart navigation
1.0.0.12|April 15th, 2019|Re-fix for pad removal of web part 1.0.0.12|April 15th, 2019|Re-fix for pad removal of web part
1.0.0.13|July 1th, 2019|Downgrade to SPFx v1.4.1 to support SP2019 1.0.0.13|July 1th, 2019|Downgrade to SPFx v1.4.1 to support SP2019
1.0.0.14|Oct 13th, 2019|Added resolve to fix pnpm issue. Updated author info.
## Disclaimer ## Disclaimer
**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.** **THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**

View File

@ -1,9 +1,9 @@
{ {
"$schema": "https://developer.microsoft.com/json-schemas/spfx-build/package-solution.schema.json", "$schema": "https://developer.microsoft.com/json-schemas/spfx-build/package-solution.schema.json",
"solution": { "solution": {
"name": "Modern Script Editor web part by Puzzlepart", "name": "Modern Script Editor web part by @mikaelsvenson",
"id": "1425175f-3ed8-44d2-8fc4-dd1497191294", "id": "1425175f-3ed8-44d2-8fc4-dd1497191294",
"version": "1.0.0.13", "version": "1.0.0.14",
"includeClientSideAssets": true, "includeClientSideAssets": true,
"skipFeatureDeployment": false "skipFeatureDeployment": false
}, },

View File

@ -6,7 +6,8 @@
"node": ">=0.10.0" "node": ">=0.10.0"
}, },
"resolutions": { "resolutions": {
"natives": "1.1.3" "natives": "1.1.3",
"@types/react": "15.6.6"
}, },
"dependencies": { "dependencies": {
"@microsoft/load-themed-styles": "^1.4.1", "@microsoft/load-themed-styles": "^1.4.1",
@ -27,7 +28,7 @@
"@microsoft/sp-webpart-workbench": "1.4.1", "@microsoft/sp-webpart-workbench": "1.4.1",
"@types/chai": "3.4.34", "@types/chai": "3.4.34",
"@types/mocha": "2.2.38", "@types/mocha": "2.2.38",
"@types/prop-types": "^15.5.3", "@types/prop-types": "ts2.4",
"ajv": "~5.2.2", "ajv": "~5.2.2",
"gulp": "~3.9.1", "gulp": "~3.9.1",
"webpack-bundle-analyzer": "^2.13.1" "webpack-bundle-analyzer": "^2.13.1"

View File

@ -19,8 +19,7 @@ export class PropertyPaneLogo implements IPropertyPaneField<IPropertyPaneCustomF
private onRender(elem: HTMLElement): void { private onRender(elem: HTMLElement): void {
elem.innerHTML = ` elem.innerHTML = `
<div style="margin-top: 30px"> <div style="margin-top: 30px">
<div style="float:right">Author: <a href="mailto:mikael.svenson@puzzlepart.com" tabindex="-1">Mikael Svenson</a></div> <div style="float:right">Author: <a href="https://twitter.com/mikaelsvenson" tabindex="-1">Mikael Svenson</a></div>
<div style="float:right"><a href="https://www.puzzlepart.com/" target="_blank"><img src="//www.puzzlepart.com/wp-content/uploads/2017/08/Pzl-LogoType-200.png" onerror="this.style.display = \'none\'";"></a></div>
</div>`; </div>`;
} }
} }

View File

@ -7,11 +7,10 @@
"supportsFullBleed": true, "supportsFullBleed": true,
"manifestVersion": 2, "manifestVersion": 2,
"requiresCustomScript": true, "requiresCustomScript": true,
"preconfiguredEntries": [ "preconfiguredEntries": [{
{
"groupId": "3a328f0a-99c4-4b28-95ab-fe0847f657a3", "groupId": "3a328f0a-99c4-4b28-95ab-fe0847f657a3",
"group": { "group": {
"default": "Puzzlepart" "default": "mAdcOW deZign"
}, },
"title": { "title": {
"default": "Modern Script Editor" "default": "Modern Script Editor"
@ -26,6 +25,5 @@
"removePadding": false, "removePadding": false,
"spPageContextInfo": false "spPageContextInfo": false
} }
} }]
]
} }