Skip to content

Commit

Permalink
7.5.5 release
Browse files Browse the repository at this point in the history
Former-commit-id: 392b3f0
  • Loading branch information
alderg committed Oct 10, 2017
1 parent 1428e67 commit 60d7b26
Show file tree
Hide file tree
Showing 42 changed files with 3,787 additions and 3,695 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
10-OCT-2017: 7.5.5

- Hides tooltips for page links
- Fixes scrollwheel zooming with no scrollbars in chromeless mode
- Uses mxGraph 3.7.6 beta 3

09-OCT-2017: 7.5.4

- Adds missing page option in insert link dialog
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.5.4
7.5.5
4 changes: 2 additions & 2 deletions etc/mxgraph/mxClient.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

153 changes: 76 additions & 77 deletions src/com/mxgraph/io/gliffy/importer/gliffyTranslation.properties

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion war/cache.manifest
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CACHE MANIFEST

# THIS FILE WAS GENERATED. DO NOT MODIFY!
# 10/09/2017 11:05 AM
# 10/10/2017 11:23 AM

app.html
index.html?offline=1
Expand Down
Binary file modified war/images/sidebar-atlassian.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified war/images/sidebar-webIcons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,374 changes: 688 additions & 686 deletions war/js/app.min.js

Large diffs are not rendered by default.

1,523 changes: 762 additions & 761 deletions war/js/atlas-viewer.min.js

Large diffs are not rendered by default.

1,470 changes: 736 additions & 734 deletions war/js/atlas.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions war/js/diagramly/Devel.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ mxscript(drawDevUrl + 'js/jszip/jszip.min.js');
mxscript(drawDevUrl + 'js/diagramly/ruler/mxRuler.js');

//EquiSpaced Guides
if (urlParams['equiGuides'] == '1')
if (urlParams['distanceGuides'] == '1')
{
mxscript(drawDevUrl + 'js/diagramly/mxEquiSpacedGuides.js');
mxscript(drawDevUrl + 'js/diagramly/DistanceGuides.js');
}
11 changes: 8 additions & 3 deletions war/js/diagramly/Dialogs.js
Original file line number Diff line number Diff line change
Expand Up @@ -2508,7 +2508,7 @@ var ParseDialog = function(editorUi, title)
/**
* Constructs a new dialog for creating files from templates.
*/
var NewDialog = function(editorUi, compact, showName, callback, createOnly)
var NewDialog = function(editorUi, compact, showName, callback, createOnly, cancelCallback)
{
showName = (showName != null) ? showName : true;
createOnly = (createOnly != null) ? createOnly : false;
Expand Down Expand Up @@ -2926,12 +2926,17 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly)

var cancelBtn = mxUtils.button(mxResources.get('cancel'), function()
{
if (cancelCallback != null)
{
cancelCallback();
}

editorUi.hideDialog(true);
});

cancelBtn.className = 'geBtn';

if (editorUi.editor.cancelFirst && !createOnly)
if (editorUi.editor.cancelFirst && (!createOnly || cancelCallback != null))
{
btns.appendChild(cancelBtn);
}
Expand Down Expand Up @@ -2978,7 +2983,7 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly)

btns.appendChild(createButton);

if (!editorUi.editor.cancelFirst && callback == null && !createOnly)
if (!editorUi.editor.cancelFirst && callback == null && (!createOnly || cancelCallback != null))
{
btns.appendChild(cancelBtn);
}
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion war/js/diagramly/DrawioFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ DrawioFile.prototype.getId = function()
*/
DrawioFile.prototype.isEditable = function()
{
return !this.ui.editor.chromeless;
return !this.ui.editor.chromeless || this.ui.editor.editable;
};

/**
Expand Down
3 changes: 2 additions & 1 deletion war/js/diagramly/Editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@
ColorDialog.prototype.presetColors = config.presetColors || ColorDialog.prototype.presetColors;
ColorDialog.prototype.defaultColors = config.defaultColors || ColorDialog.prototype.defaultColors;
StyleFormatPanel.prototype.defaultColorSchemes = config.defaultColorSchemes || StyleFormatPanel.prototype.defaultColorSchemes;

Graph.prototype.defaultEdgeLength = config.defaultEdgeLength || Graph.prototype.defaultEdgeLength;

// Custom CSS injected directly into the page
if (config.css != null)
{
Expand Down
30 changes: 24 additions & 6 deletions war/js/diagramly/EditorUi.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,11 @@
}
})();

/**
* Hook for subclassers.
*/
EditorUi.prototype.showSplash = function(force) { };

/**
* Abstraction for local storage access.
*/
Expand Down Expand Up @@ -1419,12 +1424,20 @@
// hook for subclassers
};

/**
*
*/
EditorUi.prototype.isScratchpadEnabled = function()
{
return isLocalStorage || mxClient.IS_CHROMEAPP;
};

/**
* Shows or hides the scratchpad library.
*/
EditorUi.prototype.toggleScratchpad = function()
{
if (isLocalStorage || mxClient.IS_CHROMEAPP)
if (this.isScratchpadEnabled())
{
if (this.scratchpad == null)
{
Expand Down Expand Up @@ -7207,18 +7220,23 @@
this.initializeEmbedMode();
}

if (typeof window.mxSettings !== 'undefined')
{
this.installSettings();
}
this.installSettings();
};

/**
*
*/
EditorUi.prototype.isSettingsEnabled = function()
{
return typeof window.mxSettings !== 'undefined' && (isLocalStorage || mxClient.IS_CHROMEAPP);
};

/**
* Creates the format panel and adds overrides.
*/
EditorUi.prototype.installSettings = function()
{
if (isLocalStorage || mxClient.IS_CHROMEAPP)
if (this.isSettingsEnabled())
{
// Gets recent colors from settings
ColorDialog.recentColors = mxSettings.getRecentColors();
Expand Down
Loading

0 comments on commit 60d7b26

Please sign in to comment.