mirror of
https://bitbucket.org/wisemapping/wisemapping-frontend.git
synced 2024-11-11 01:43:23 +01:00
Merge branch 'develop' of https://bitbucket.org/wisemapping/wisemapping-frontend into feature/import-freemind-to-wisemapping
This commit is contained in:
commit
10ede976a8
@ -9,18 +9,6 @@ html {
|
|||||||
font-size: initial;
|
font-size: initial;
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
|
||||||
-webkit-touch-callout: none;
|
|
||||||
-webkit-user-select: none;
|
|
||||||
-khtml-user-select: none;
|
|
||||||
-moz-user-select: none;
|
|
||||||
-ms-user-select: none;
|
|
||||||
user-select: none;
|
|
||||||
overflow: hidden;
|
|
||||||
margin: 0;
|
|
||||||
font-family: Arial, Helvetica, sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
div#mindplot {
|
div#mindplot {
|
||||||
position: relative;
|
position: relative;
|
||||||
top: 50px;
|
top: 50px;
|
||||||
|
@ -73,7 +73,7 @@ class ImageIcon extends Icon {
|
|||||||
|
|
||||||
static _getNextFamilyIconId(iconId) {
|
static _getNextFamilyIconId(iconId) {
|
||||||
const familyIcons = ImageIcon._getFamilyIcons(iconId);
|
const familyIcons = ImageIcon._getFamilyIcons(iconId);
|
||||||
$assert(familyIcons != null, 'Family Icon not found!');
|
$assert(familyIcons != null, `Family Icon not found: ${iconId}`);
|
||||||
|
|
||||||
let result = null;
|
let result = null;
|
||||||
for (let i = 0; i < familyIcons.length && result == null; i++) {
|
for (let i = 0; i < familyIcons.length && result == null; i++) {
|
||||||
|
@ -35,7 +35,11 @@ class EditorOptionsBuilder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static loadMapId(): number {
|
static loadMapId(): number {
|
||||||
return !AppConfig.isDevelopEnv() ? global.mapId : 11;
|
const result = !AppConfig.isDevelopEnv() ? global.mapId : 11;
|
||||||
|
if (result === undefined) {
|
||||||
|
throw Error(`Could not resolve mapId. Map Id: global.mapId: ${result} , global.mapTitle: ${global.mapTitle}, global.lockSession: ${global.lockSession}`);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export default EditorOptionsBuilder;
|
export default EditorOptionsBuilder;
|
||||||
|
Loading…
Reference in New Issue
Block a user