Browse Source

7.8.6 release

Former-commit-id: e1fbd48b7b5c99d62d7e886b2e57bda43fca41d4
David Benson 7 years ago
parent
commit
d82ca316f1

+ 4 - 0
ChangeLog

@@ -1,3 +1,7 @@
+15-DEC-2017: 7.8.6
+
+- Internal translation update
+
 14-DEC-2017: 7.8.5
 
 - Uses mxGraph 3.8.1 beta 3

+ 1 - 1
VERSION

@@ -1 +1 @@
-7.8.5
+7.8.6

+ 1 - 1
war/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 12/14/2017 11:54 AM
+# 12/15/2017 02:38 PM
 
 app.html
 index.html?offline=1

+ 4 - 55
war/electron.js

@@ -7,12 +7,7 @@ const ipcMain = electron.ipcMain
 const dialog = electron.dialog
 const app = electron.app
 const BrowserWindow = electron.BrowserWindow
-
-const autoUpdater = require('electron-updater').autoUpdater
 const log = require('electron-log')
-autoUpdater.logger = log
-autoUpdater.logger.transports.file.level = 'info'
-autoUpdater.autoDownload = false
 
 const __DEV__ = process.env.NODE_ENV === 'development'
 		
@@ -37,8 +32,8 @@ function createWindow (opt = {})
 
 	let wurl = url.format(
 	{
-		pathname: `${__dirname}/index.html`,
-		protocol: 'file:',
+		pathname: `www.draw.io`,
+		protocol: 'https:',
 		query:
 		{
 			'dev': __DEV__ ? 1 : 0,
@@ -53,6 +48,7 @@ function createWindow (opt = {})
 			'mode': 'device',
 			'browser': 0,
 			'p': 'electron',
+			'appcache': 1
 		},
 		slashes: true,
 	})
@@ -143,8 +139,6 @@ app.on('ready', e =>
 	})
 	
 	createWindow()
-	autoUpdater.checkForUpdates()
-	
 	
 	let template = [{
 	    label: app.getName(),
@@ -232,49 +226,4 @@ app.on('activate', function ()
 	{
 		createWindow()
 	}
-})
-
-autoUpdater.on('error', e => log.error('@error@\n', e))
-
-autoUpdater.on('update-available', (a, b) =>
-{
-	log.info('@update-available@\n', a, b)
-	
-	dialog.showMessageBox(
-	{
-		type: 'question',
-		buttons: ['Ok', 'Cancel'],
-		title: 'Confirm Update',
-		message: 'Update available.\n\nWould you like to download and install new version?',
-		detail: 'Application will automatically restart to apply update after download',
-	}, response =>
-	{
-		if (response === 0)
-		{
-			return autoUpdater.downloadUpdate()
-		}
-	})
-})
-
-
-/**/
-autoUpdater.on('update-downloaded', (event, info) =>
-{
-	log.info('@update-downloaded@\n', info, event)
-	// Ask user to update the app
-	dialog.showMessageBox(
-	{
-		type: 'question',
-		buttons: ['Install and Relaunch', 'Later'],
-		defaultId: 0,
-		message: 'A new version of ' + app.getName() + ' has been downloaded',
-		detail: 'It will be installed the next time you restart the application',
-	}, response =>
-	{
-		if (response === 0)
-		{
-			setTimeout(() => autoUpdater.quitAndInstall(), 1)
-		}
-	})
-})
-/**/
+})

+ 26 - 31
war/index.html

@@ -79,44 +79,39 @@
 			(function()
 			{
 				var proto = window.location.protocol;
+				var host = window.location.host;
+	
+				// Redirects apex and rt to www
+				if (host === 'draw.io' || host === 'rt.draw.io')
+				{
+					host = 'www.draw.io';
+				}
 				
-				// Electron protocol is file:
-				if (proto != 'file:')
+				// Redirects to SSL/non-SSL
+				if (urlParams['demo'] != '1')
 				{
-					var host = window.location.host;
-		
-					// Redirects apex and rt to www
-					if (host === 'draw.io' || host === 'rt.draw.io')
-					{
-						host = 'www.draw.io';
-					}
+					var ssl = (urlParams['https'] != null) ? urlParams['https'] == '1' :
+						navigator.userAgent.indexOf('MSIE') < 0 || document.documentMode >= 9;
 					
-					// Redirects to SSL/non-SSL
-					if (urlParams['demo'] != '1')
+					if (ssl && proto != 'https:')
 					{
-						var ssl = (urlParams['https'] != null) ? urlParams['https'] == '1' :
-							navigator.userAgent.indexOf('MSIE') < 0 || document.documentMode >= 9;
-						
-						if (ssl && proto != 'https:')
-						{
-							proto = 'https:';
-						}
-						else if (!ssl && proto != 'http:')
-						{
-							proto = 'http:';
-						}
+						proto = 'https:';
 					}
-					
-					var href = proto + '//' + host + window.location.href.substring(
-							window.location.protocol.length +
-							window.location.host.length + 2);
-		
-					// Redirects if href changes
-					if (href != window.location.href)
+					else if (!ssl && proto != 'http:')
 					{
-						window.location.href = href;
+						proto = 'http:';
 					}
 				}
+				
+				var href = proto + '//' + host + window.location.href.substring(
+						window.location.protocol.length +
+						window.location.host.length + 2);
+	
+				// Redirects if href changes
+				if (href != window.location.href)
+				{
+					window.location.href = href;
+				}
 			})();
 		}
 		
@@ -358,7 +353,7 @@
 		{
 			mxscript('js/app.min.js');
 			
-			if (urlParams['offline'] == '1')
+			if (urlParams['offline'] == '1' || urlParams['appcache'] == '1')
 			{
 				mxscript('js/stencils.min.js');
 			}

File diff suppressed because it is too large
+ 83 - 83
war/js/app.min.js


File diff suppressed because it is too large
+ 83 - 83
war/js/atlas-viewer.min.js


File diff suppressed because it is too large
+ 83 - 83
war/js/atlas.min.js


+ 11 - 6
war/js/diagramly/EditorUi.js

@@ -217,10 +217,15 @@
 	};
 	
 	/**
-	 * Translates this point by the given vector.
-	 * 
-	 * @param {number} dx X-coordinate of the translation.
-	 * @param {number} dy Y-coordinate of the translation.
+	 * Returns true if using application cache
+	 */
+	EditorUi.prototype.isAppCache = function()
+	{
+		return (urlParams['appcache'] == '1' || this.isOfflineApp());
+	};
+	
+	/**
+	 * Returns true if offline app, which isn't a defined thing
 	 */
 	EditorUi.prototype.isOfflineApp = function()
 	{
@@ -228,7 +233,7 @@
 	};
 
 	/**
-	 * Returns true if this offline app is offline.
+	 * Returns true if no external comms allowed or possible
 	 */
 	EditorUi.prototype.isOffline = function()
 	{
@@ -9613,7 +9618,7 @@
 			}
 		}
 		
-		if (this.isOfflineApp())
+		if (this.isAppCache())
 		{
 			var appCache = applicationCache;
 			

File diff suppressed because it is too large
+ 1 - 1
war/js/embed-static.min.js


File diff suppressed because it is too large
+ 1 - 1
war/js/reader.min.js


File diff suppressed because it is too large
+ 83 - 83
war/js/viewer.min.js


+ 1 - 1
war/resources/dia.txt

@@ -501,7 +501,7 @@ pasteHere=Paste here
 pasteStyle=Paste Style
 perimeter=Perimeter
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Public URL of the diagram

+ 1 - 1
war/resources/dia_am.txt

@@ -501,7 +501,7 @@ pasteHere=Paste here
 pasteStyle=Paste Style
 perimeter=Perimeter
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Public URL of the diagram

+ 1 - 1
war/resources/dia_ar.txt

@@ -501,7 +501,7 @@ pasteHere=‫لصق هنا‬
 pasteStyle=‫لصق النمط‬
 perimeter=‫المحيط‬
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=‫عنوان الويب العام للمخطط‬

+ 1 - 1
war/resources/dia_bn.txt

@@ -501,7 +501,7 @@ pasteHere=Paste here
 pasteStyle=Paste Style
 perimeter=Perimeter
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Public URL of the diagram

+ 1 - 1
war/resources/dia_bs.txt

@@ -501,7 +501,7 @@ pasteHere=Zalijepi ovdje
 pasteStyle=Stil zalijepljivanja
 perimeter=Perimetar
 permissionAnyone=Bilo tko može uređivati
-permissionAuthor=Samo ja mogu uređivati
+permissionAuthor=Vlasnik i admini mogu menjati
 pickFolder=Odabrite folder
 pickLibraryDialogTitle=Odaberite biblioteku
 publicDiagramUrl=Javni URL dijagrama

+ 1 - 1
war/resources/dia_de.txt

@@ -501,7 +501,7 @@ pasteHere=Hier einfügen
 pasteStyle=Style einfügen
 perimeter=Umfang
 permissionAnyone=Jeder darf bearbeiten
-permissionAuthor=Nur ich darf bearbeiten
+permissionAuthor=Besitzer und Admins dürfen bearbeiten
 pickFolder=Wählen Sie einen Ordner
 pickLibraryDialogTitle=Bibliothek auswählen
 publicDiagramUrl=Öffentliche URL des Diagramms

+ 1 - 1
war/resources/dia_eo.txt

@@ -501,7 +501,7 @@ pasteHere=Paste here
 pasteStyle=Paste Style
 perimeter=Perimeter
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Public URL of the diagram

+ 1 - 1
war/resources/dia_gu.txt

@@ -501,7 +501,7 @@ pasteHere=Paste here
 pasteStyle=Paste Style
 perimeter=Perimeter
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Public URL of the diagram

+ 1 - 1
war/resources/dia_hi.txt

@@ -501,7 +501,7 @@ pasteHere=Paste here
 pasteStyle=Paste Style
 perimeter=Perimeter
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Public URL of the diagram

+ 1 - 1
war/resources/dia_hr.txt

@@ -501,7 +501,7 @@ pasteHere=Paste here
 pasteStyle=Paste Style
 perimeter=Perimeter
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Public URL of the diagram

+ 1 - 1
war/resources/dia_kn.txt

@@ -501,7 +501,7 @@ pasteHere=Paste here
 pasteStyle=Paste Style
 perimeter=Perimeter
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Public URL of the diagram

+ 1 - 1
war/resources/dia_lt.txt

@@ -501,7 +501,7 @@ pasteHere=Paste here
 pasteStyle=Paste Style
 perimeter=Perimeter
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Public URL of the diagram

+ 1 - 1
war/resources/dia_lv.txt

@@ -501,7 +501,7 @@ pasteHere=Paste here
 pasteStyle=Paste Style
 perimeter=Perimeter
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Public URL of the diagram

+ 1 - 1
war/resources/dia_ml.txt

@@ -501,7 +501,7 @@ pasteHere=Paste here
 pasteStyle=Paste Style
 perimeter=Perimeter
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Public URL of the diagram

+ 1 - 1
war/resources/dia_mr.txt

@@ -501,7 +501,7 @@ pasteHere=Paste here
 pasteStyle=Paste Style
 perimeter=Perimeter
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Public URL of the diagram

+ 8 - 8
war/resources/dia_ru.txt

@@ -108,7 +108,7 @@ collapse=Свернуть
 collapseExpand=Свернуть/Развернуть
 collapse-expand=Кликните, чтобы свернуть/развернуть\nShift+клик – перемещение соседних элементов\nAlt+клик - сохранить размер группы
 collapsible=Сворачиваемый
-comic="От руки"
+comic=Рукописный
 comment=Комментарий
 commentsNotes=Комментарии/Заметки
 connect=Соединить
@@ -129,7 +129,7 @@ create=Создать
 createNewDiagram=Создать новую диаграмму
 createRevision=Создать ревизию
 createShape=Создать фигуру
-crop=Обрезать
+crop=Обрезать по содержимому
 curved=Кривая
 custom=Настроить
 current=Текущий
@@ -145,11 +145,11 @@ deleteLibrary500=Ошибка при удалении библиотеки
 deleteLibraryConfirm=Библиотека будет удалена без возможности восстановления. Вы точно хотите это сделать?
 deleteRow=Удалить строку
 description=Описание
-device=Устройство
+device=Это устройство
 diagram=Диаграмма
 diagramContent=Содержимое диаграммы
 diagramLocked=Диаграмма была заблокирована для предотвращения потери данных.
-diagramLockedBySince=The diagram is locked by {1} since {2} ago
+diagramLockedBySince=Диаграмма заблокирована {1} {2} назад
 diagramName=Название диаграммы
 diagramIsPublic=Диаграмма является публичной
 diagramIsNotPublic=Диаграмма не является публичной
@@ -223,7 +223,7 @@ errorSavingFileUnknown=Ошибка авторизации на сервере G
 errorSavingFileForbidden=Ошибка сохранения файла. Не хватает прав доступа.
 errorSavingFileNameConflict=Невозможно сохранить диаграмму. Страница уже содержит файл с названием '{1}'.
 errorSavingFileNotFound=Ошибка при сохранении файла. Файл не найден.
-errorSavingFileSessionTimeout=Ваша сессия истекла. Пожалуйста, <a target='_blank' href='{1}'>{2}</a> и вернитесь на эту закладку, чтобы снова попробовать сохранить.
+errorSavingFileSessionTimeout=Ваша сессия истекла. Для сохранения, пожалуйста, <a target='_blank' href='{1}'>{2}</a> и вернитесь на эту закладку.
 errorSendingFeedback=Ошибка при отправке сообщения обратной связи.
 errorUpdatingPreview=Ошибка при обновлении предпросмотра.
 exit=Выйти
@@ -397,7 +397,7 @@ left=Слева
 leftAlign=По левому краю
 leftToRight=Слева направо
 libraryTooltip=Для добавления фигуры перенесите ее сюда при помощи мыши или нажмите «+». Дважды щелкните для редактирования.
-lightbox=Осветитель
+lightbox=Галерея
 line=Линия
 lineend=Конец линии
 lineheight=Высота линии
@@ -426,10 +426,10 @@ moreShapes=Больше фигур
 move=Переместить
 moveToFolder=Переместить в папку
 moving=Перемещаю
-moveSelectionTo=Переместить выбранное в {1}
+moveSelectionTo=Переместить выбранное на {1}
 name=Название
 navigation=Навигация
-network=Network
+network=Сеть
 networking=Сети
 new=Создать
 newLibrary=Новая библиотека

+ 1 - 1
war/resources/dia_sk.txt

@@ -501,7 +501,7 @@ pasteHere=Paste here
 pasteStyle=Paste Style
 perimeter=Perimeter
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Public URL of the diagram

+ 1 - 1
war/resources/dia_sl.txt

@@ -501,7 +501,7 @@ pasteHere=Paste here
 pasteStyle=Paste Style
 perimeter=Perimeter
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Public URL of the diagram

+ 1 - 1
war/resources/dia_sr.txt

@@ -501,7 +501,7 @@ pasteHere=Zalepi ovde
 pasteStyle=Zalepi stil
 perimeter=Perimetar
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Vlasnik i admini mogu menjati
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Javni URL dijagrama

+ 1 - 1
war/resources/dia_sw.txt

@@ -501,7 +501,7 @@ pasteHere=Paste here
 pasteStyle=Paste Style
 perimeter=Perimeter
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Public URL of the diagram

+ 1 - 1
war/resources/dia_ta.txt

@@ -501,7 +501,7 @@ pasteHere=Paste here
 pasteStyle=Paste Style
 perimeter=Perimeter
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Public URL of the diagram

+ 1 - 1
war/resources/dia_te.txt

@@ -501,7 +501,7 @@ pasteHere=Paste here
 pasteStyle=Paste Style
 perimeter=Perimeter
 permissionAnyone=Anyone can edit
-permissionAuthor=Only I can edit
+permissionAuthor=Owner and admins can edit
 pickFolder=Pick a folder
 pickLibraryDialogTitle=Select Library
 publicDiagramUrl=Public URL of the diagram