diff --git a/.gitignore b/.gitignore
index a42c9820e..e02e885ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ apps/presentationeditor/embed/resources/less/node_modules
apps/spreadsheeteditor/embed/resources/less/node_modules
apps/documenteditor/mobile/resources/sass/.sass-cache
apps/spreadsheeteditor/mobile/resources/sass/.sass-cache
+apps/presentationeditor/mobile/resources/sass/.sass-cache
# test documents
diff --git a/Readme.md b/Readme.md
index edc7515a2..d6ba7016a 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,4 +1,4 @@
-[](http://www.gnu.org/licenses/agpl-3.0.ru.html) 
+[](http://www.gnu.org/licenses/agpl-3.0.ru.html) 
## web-apps
diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js
index 2efcf0de6..d0a9b4c2c 100644
--- a/apps/common/main/lib/controller/ReviewChanges.js
+++ b/apps/common/main/lib/controller/ReviewChanges.js
@@ -201,7 +201,7 @@ define([
if (typeof value == 'object') {
_.each(value, function(obj) {
if (typeof obj === 'string')
- changetext += (' ' + obj);
+ changetext += (' ' + Common.Utils.String.htmlEncode(obj));
else {
switch (obj) {
case 0:
@@ -220,7 +220,7 @@ define([
}
})
} else if (typeof value === 'string') {
- changetext += (' ' + value);
+ changetext += (' ' + Common.Utils.String.htmlEncode(value));
}
break;
case Asc.c_oAscRevisionsChangeType.TextRem:
@@ -228,7 +228,7 @@ define([
if (typeof value == 'object') {
_.each(value, function(obj) {
if (typeof obj === 'string')
- changetext += (' ' + obj);
+ changetext += (' ' + Common.Utils.String.htmlEncode(obj));
else {
switch (obj) {
case 0:
@@ -247,7 +247,7 @@ define([
}
})
} else if (typeof value === 'string') {
- changetext += (' ' + value);
+ changetext += (' ' + Common.Utils.String.htmlEncode(value));
}
break;
case Asc.c_oAscRevisionsChangeType.ParaAdd:
diff --git a/apps/common/main/lib/template/Header.template b/apps/common/main/lib/template/Header.template
index 330bb5364..9bb4bd030 100644
--- a/apps/common/main/lib/template/Header.template
+++ b/apps/common/main/lib/template/Header.template
@@ -1,6 +1,7 @@
\ No newline at end of file
diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js
index 676738275..126fe7c3f 100644
--- a/apps/common/main/lib/view/Header.js
+++ b/apps/common/main/lib/view/Header.js
@@ -53,6 +53,7 @@ define([
options : {
branding: {},
headerCaption: 'Default Caption',
+ headerDeveloper: 'DEVELOPER MODE',
documentCaption: '',
canBack: false
},
@@ -77,6 +78,7 @@ define([
this.options = this.options ? _({}).extend(this.options, options) : options;
this.headerCaption = this.options.headerCaption;
+ this.headerDeveloper = this.txtHeaderDeveloper;
this.documentCaption = this.options.documentCaption;
this.canBack = this.options.canBack;
this.branding = this.options.customization;
@@ -85,6 +87,7 @@ define([
render: function () {
$(this.el).html(this.template({
headerCaption : this.headerCaption,
+ headerDeveloper : this.headerDeveloper,
documentCaption : Common.Utils.String.htmlEncode(this.documentCaption),
canBack : this.canBack,
textBack : this.textBack
@@ -219,7 +222,12 @@ define([
}
},
+ setDeveloperMode: function(mode) {
+ $('#header-developer').toggleClass('hidden', !mode);
+ },
+
textBack: 'Go to Documents',
- openNewTabText: 'Open in New Tab'
+ openNewTabText: 'Open in New Tab',
+ txtHeaderDeveloper: 'DEVELOPER MODE'
}, Common.Views.Header || {}))
});
diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js
index a3cdb84de..5aedde16e 100644
--- a/apps/common/main/lib/view/OpenDialog.js
+++ b/apps/common/main/lib/view/OpenDialog.js
@@ -104,15 +104,21 @@ define([
this.$window.find('.tool').hide();
this.$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
if (this.type == Asc.c_oAscAdvancedOptionsID.DRM) {
- var me = this;
- me.inputPwd = new Common.UI.InputField({
+ this.inputPwd = new Common.UI.InputField({
el: $('#id-password-txt'),
type: 'password',
allowBlank: false,
validateOnBlur: false
});
- } else
+ this.$window.find('input').on('keypress', _.bind(this.onKeyPress, this));
+ } else {
+ var me = this;
this.initCodePages();
+ this.onPrimary = function() {
+ me.onBtnClick();
+ return false;
+ };
+ }
}
},
@@ -138,9 +144,9 @@ define([
this.close();
},
- onPrimary: function() {
- this.onBtnClick();
- return false;
+ onKeyPress: function(event) {
+ if (event.keyCode == Common.UI.Keys.RETURN)
+ this.onBtnClick();
},
initCodePages: function () {
diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less
index 1c35ad434..aa98f5068 100644
--- a/apps/common/main/resources/less/header.less
+++ b/apps/common/main/resources/less/header.less
@@ -46,6 +46,34 @@
}
}
+#header-developer {
+ background-color: #ffb400;
+ padding-left: 15px + @app-header-height / 3;
+ & > div {
+ position: relative;
+ background-color: #ffb400;
+ color: #6e4e00 !important;
+ padding-right: 15px;
+ cursor: default;
+ z-index: 1;
+ white-space: nowrap;
+ height: @app-header-height;
+ line-height: @app-header-height;
+
+ &:after {
+ content: '';
+ position: absolute;
+ top: 0;
+ right: -@app-header-height / 2;
+ width: @app-header-height / 2;
+ height: @app-header-height;
+ border-top: @app-header-height / 2 solid transparent;
+ border-left: @app-header-height / 3 solid #ffb400;
+ border-bottom: @app-header-height / 2 solid transparent;
+ }
+ }
+}
+
#header-documentcaption {
width: 100%;
max-width: 100px;
diff --git a/apps/common/mobile/lib/component/SettingsList.js b/apps/common/mobile/lib/component/SettingsList.js
index 6560131bd..8b1eea396 100644
--- a/apps/common/mobile/lib/component/SettingsList.js
+++ b/apps/common/mobile/lib/component/SettingsList.js
@@ -63,39 +63,5 @@ Ext.define('Common.component.SettingsList', {
}
}
)
- },
-
- //
- // Workaround Sencha Touch bug
- // See https://sencha.jira.com/browse/TOUCH-3718
- //
-
- findGroupHeaderIndices: function() {
- var me = this,
- store = me.getStore(),
- storeLn = store.getCount(),
- groups = store.getGroups(),
- groupLn = groups.length,
- headerIndices = me.headerIndices = {},
- footerIndices = me.footerIndices = {},
- i, previousIndex, firstGroupedRecord, storeIndex;
-
-
- me.groups = groups;
-
- for (i = 0; i < groupLn; i++) {
- firstGroupedRecord = groups[i].children[0];
- storeIndex = store.indexOf(firstGroupedRecord);
- headerIndices[storeIndex] = true;
-
- previousIndex = storeIndex - 1;
- if (previousIndex >= 0) {
- footerIndices[previousIndex] = true;
- }
- }
-
- footerIndices[storeLn - 1] = true;
-
- return headerIndices;
}
});
\ No newline at end of file
diff --git a/apps/common/mobile/resources/fonts/ios7/ios7.eot b/apps/common/mobile/resources/fonts/ios7/ios7.eot
new file mode 100644
index 000000000..6306b6734
Binary files /dev/null and b/apps/common/mobile/resources/fonts/ios7/ios7.eot differ
diff --git a/apps/common/mobile/resources/fonts/ios7/ios7.svg b/apps/common/mobile/resources/fonts/ios7/ios7.svg
new file mode 100644
index 000000000..be9446f2f
--- /dev/null
+++ b/apps/common/mobile/resources/fonts/ios7/ios7.svg
@@ -0,0 +1,16 @@
+
+
+
+
+This is a custom SVG font generated by IcoMoon.
+
+
+
+
\ No newline at end of file
diff --git a/apps/common/mobile/resources/fonts/ios7/ios7.ttf b/apps/common/mobile/resources/fonts/ios7/ios7.ttf
new file mode 100644
index 000000000..6aaa050a6
Binary files /dev/null and b/apps/common/mobile/resources/fonts/ios7/ios7.ttf differ
diff --git a/apps/common/mobile/resources/fonts/ios7/ios7.woff b/apps/common/mobile/resources/fonts/ios7/ios7.woff
new file mode 100644
index 000000000..84858750a
Binary files /dev/null and b/apps/common/mobile/resources/fonts/ios7/ios7.woff differ
diff --git a/apps/common/mobile/resources/fonts/pictos/pictos-web.eot b/apps/common/mobile/resources/fonts/pictos/pictos-web.eot
new file mode 100644
index 000000000..f34d23f56
Binary files /dev/null and b/apps/common/mobile/resources/fonts/pictos/pictos-web.eot differ
diff --git a/apps/common/mobile/resources/fonts/pictos/pictos-web.svg b/apps/common/mobile/resources/fonts/pictos/pictos-web.svg
new file mode 100644
index 000000000..2d1683147
--- /dev/null
+++ b/apps/common/mobile/resources/fonts/pictos/pictos-web.svg
@@ -0,0 +1,114 @@
+
+
+
+
+This is a custom SVG webfont generated by Font Squirrel.
+Designer : Drew Wilson
+Foundry : Drew Wilson
+Foundry URL : httppictosdrewwilsoncom
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/common/mobile/resources/fonts/pictos/pictos-web.ttf b/apps/common/mobile/resources/fonts/pictos/pictos-web.ttf
new file mode 100644
index 000000000..3ad12d5e9
Binary files /dev/null and b/apps/common/mobile/resources/fonts/pictos/pictos-web.ttf differ
diff --git a/apps/common/mobile/resources/fonts/pictos/pictos-web.woff b/apps/common/mobile/resources/fonts/pictos/pictos-web.woff
new file mode 100644
index 000000000..90e536281
Binary files /dev/null and b/apps/common/mobile/resources/fonts/pictos/pictos-web.woff differ
diff --git a/apps/common/mobile/resources/fonts/tizen/TizenSansMedium.ttf b/apps/common/mobile/resources/fonts/tizen/TizenSansMedium.ttf
new file mode 100644
index 000000000..76ba2c121
Binary files /dev/null and b/apps/common/mobile/resources/fonts/tizen/TizenSansMedium.ttf differ
diff --git a/apps/common/mobile/resources/fonts/tizen/TizenSansRegular.ttf b/apps/common/mobile/resources/fonts/tizen/TizenSansRegular.ttf
new file mode 100644
index 000000000..7e98c9619
Binary files /dev/null and b/apps/common/mobile/resources/fonts/tizen/TizenSansRegular.ttf differ
diff --git a/apps/common/mobile/resources/fonts/tizen/tizen-icon.eot b/apps/common/mobile/resources/fonts/tizen/tizen-icon.eot
new file mode 100644
index 000000000..d08871ba7
Binary files /dev/null and b/apps/common/mobile/resources/fonts/tizen/tizen-icon.eot differ
diff --git a/apps/common/mobile/resources/fonts/tizen/tizen-icon.svg b/apps/common/mobile/resources/fonts/tizen/tizen-icon.svg
new file mode 100644
index 000000000..a77923cdd
--- /dev/null
+++ b/apps/common/mobile/resources/fonts/tizen/tizen-icon.svg
@@ -0,0 +1,13 @@
+
+
+
+Generated by IcoMoon
+
+
+
\ No newline at end of file
diff --git a/apps/common/mobile/resources/fonts/tizen/tizen-icon.ttf b/apps/common/mobile/resources/fonts/tizen/tizen-icon.ttf
new file mode 100644
index 000000000..e06206390
Binary files /dev/null and b/apps/common/mobile/resources/fonts/tizen/tizen-icon.ttf differ
diff --git a/apps/common/mobile/resources/fonts/tizen/tizen-icon.woff b/apps/common/mobile/resources/fonts/tizen/tizen-icon.woff
new file mode 100644
index 000000000..5fb4d55de
Binary files /dev/null and b/apps/common/mobile/resources/fonts/tizen/tizen-icon.woff differ
diff --git a/apps/common/mobile/resources/sass/_common-settingslist.scss b/apps/common/mobile/resources/sass/_common-settingslist.scss
index 47849202f..9046fba59 100644
--- a/apps/common/mobile/resources/sass/_common-settingslist.scss
+++ b/apps/common/mobile/resources/sass/_common-settingslist.scss
@@ -7,6 +7,10 @@
}
&.x-list-round.x-list-grouped {
+ .x-list-footer-wrap.x-list-item-tpl {
+ padding-bottom: 0;
+ }
+
.x-list-header-wrap {
.x-dock-horizontal {
padding-top: 0;
diff --git a/apps/common/mobile/resources/sass/_common-settingspanel.scss b/apps/common/mobile/resources/sass/_common-settingspanel.scss
index 528038103..026966e4d 100644
--- a/apps/common/mobile/resources/sass/_common-settingspanel.scss
+++ b/apps/common/mobile/resources/sass/_common-settingspanel.scss
@@ -17,7 +17,7 @@
position: absolute;
width: $anchor-width;
height: $anchor-height;
- -webkit-mask: 0 0 theme_image($theme-name, "tip_top.png") no-repeat;
+ //-webkit-mask: 0 0 theme_image($theme-name, "tip_top.png") no-repeat;
-webkit-mask-size: $anchor-width $anchor-height;
@include background-gradient($base-color, color_stops(lighten($base-color, 15%), lighten($base-color, 13%)));
top: 1px !important;
@@ -38,7 +38,7 @@
position: absolute;
width: $anchor-width;
height: $anchor-height + .1em;
- -webkit-mask: 0 0 theme_image($theme-name, "tip_bottom.png") no-repeat;
+ //-webkit-mask: 0 0 theme_image($theme-name, "tip_bottom.png") no-repeat;
-webkit-mask-size: $anchor-width $anchor-height;
@include background-gradient($base-color, color_stops($base-color, darken($base-color, 5%)));
top: -1px !important;
@@ -104,6 +104,19 @@
}
.round {
- @include border-radius($panel-border-radius);
+ @include border-radius($form-fieldset-radius);
+ }
+
+ // Hide group header
+ .x-list-header-wrap {
+ @include border-top-radius($form-fieldset-radius !important);
+
+ .x-innerhtml {
+ @include border-top-radius($form-fieldset-radius !important);
+ }
+ }
+
+ .x-list-header {
+ display: none;
}
}
\ No newline at end of file
diff --git a/apps/common/mobile/resources/sass/_common-toolbar.scss b/apps/common/mobile/resources/sass/_common-toolbar.scss
index 93c5531cf..ccb7fab8b 100644
--- a/apps/common/mobile/resources/sass/_common-toolbar.scss
+++ b/apps/common/mobile/resources/sass/_common-toolbar.scss
@@ -9,6 +9,10 @@ $shadow-width: .065em; // Space between tip and its shadow
$toolbar-border-color: darken($color, 50%);
$toolbar-button-color: darken($color, 5%);
+ .x-toolbar {
+ background-color: transparent;
+ }
+
.x-toolbar-#{$ui-label} {
@if $ui-label == search {
@include background-gradient($color, color_stops($color, lighten($color, 11%) 20%, lighten($color, 11%)));
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index c3e5f62f4..c591b3b68 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -963,13 +963,11 @@ define([
this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) && this.appOptions.canEdit && this.editorConfig.mode !== 'view';
this.appOptions.canBranding = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object');
- if (this.appOptions.canBranding) {
- this.getApplication()
- .getController('Viewport')
- .getView('Common.Views.Header')
- .setBranding(this.editorConfig.customization);
- }
+ if (this.appOptions.canBranding)
+ this.getApplication().getController('Viewport').getView('Common.Views.Header').setBranding(this.editorConfig.customization);
+ params.asc_getTrial() && this.getApplication().getController('Viewport').getView('Common.Views.Header').setDeveloperMode(true);
+
this.applyModeCommonElements();
this.applyModeEditorElements();
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index fff5239b5..7e49aea01 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -442,14 +442,21 @@ define([
this.paragraphControls.push(this.btnMultilevels);
this.textOnlyControls.push(this.btnMultilevels);
+ var clone = function(source) {
+ var obj = {};
+ for (var prop in source)
+ obj[prop] = (typeof(source[prop])=='object') ? clone(source[prop]) : source[prop];
+ return obj;
+ };
+
this.mnuMarkersPicker = {
conf: {index:0},
selectByIndex: function (idx) {
this.conf.index = idx;
}
};
- this.mnuNumbersPicker = _.clone(this.mnuMarkersPicker);
- this.mnuMultilevelPicker = _.clone(this.mnuMarkersPicker);
+ this.mnuNumbersPicker = clone(this.mnuMarkersPicker);
+ this.mnuMultilevelPicker = clone(this.mnuMarkersPicker);
this.btnInsertTable = new Common.UI.Button({
id : 'id-toolbar-btn-inserttable',
@@ -546,8 +553,8 @@ define([
this.conf.disabled = val;
}
};
- this.mnuPageNumCurrentPos = _.clone(this.mnuPageNumberPosPicker);
- this.mnuInsertPageNum = _.clone(this.mnuPageNumberPosPicker);
+ this.mnuPageNumCurrentPos = clone(this.mnuPageNumberPosPicker);
+ this.mnuInsertPageNum = clone(this.mnuPageNumberPosPicker);
this.paragraphControls.push(this.mnuPageNumCurrentPos);
this.toolbarControls.push(this.btnEditHeader);
@@ -747,7 +754,7 @@ define([
setChecked: function(val) { this.conf.checked = val;},
isChecked: function () { return this.conf.checked; }
};
- this.btnFitWidth = _.clone(this.btnFitPage);
+ this.btnFitWidth = clone(this.btnFitPage);
this.mnuZoom = {options: {value: 100}};
this.btnAdvSettings = new Common.UI.Button({
diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json
index 08acb2bea..9f54529ef 100644
--- a/apps/documenteditor/main/locale/de.json
+++ b/apps/documenteditor/main/locale/de.json
@@ -86,6 +86,8 @@
"Common.UI.SearchDialog.txtBtnReplaceAll": "Alle ersetzen",
"Common.UI.SynchronizeTip.textDontShow": "Diese Meldung nicht mehr anzeigen",
"Common.UI.SynchronizeTip.textSynchronize": "Das Dokument wurde von einem anderen Benutzer geändert.Sencha Touch Setup Guide
+Topics:
+
+Introduction
+Sencha Touch, a high-performance HTML5 mobile application framework, is the cornerstone
+ of the Sencha HTML5 platform. Built for enabling world-class user experiences,
+ Sencha Touch is the only framework that enables developers to build powerful apps
+ that work on iOS, Android, BlackBerry, Windows Phone, and Internet Explorer 10.
+ What's New .
+ API page .
+
+Installing Sencha Touch
+To install Sencha Touch:
+
+ Download Sencha Cmd .
+ Sencha Cmd enables you to publish, package, and simulate an application, as well as to upgrade Sencha software.
+ Sencha Cmd also installs Apache Ant, Compass, and Sass.
+ Download Ruby
+
+ Mac OS : Ruby is pre-installed. You can verify
+ it with the ruby -v command.Windows Download the open source 7-Zip archiver.
+ Download Ruby (any version) from rubyinstaller.org .
+ Set the Path environment variable to point to the directory in which you unzip the installer file.Ubuntu : Use sudo apt-get install ruby2.0.0 to download and install Ruby.
+
+ Start your web server.
+ If using the Sencha Cmd web server, change directory to where you want to serve
+ your application, open a new command line window and start the server with the
+ sencha web start command. You can stop the server by typing
+ CTRL+c or opening another command line and typing the sencha web stop command.
+ You can access the Sencha Cmd web server using
+ the http://localhost:1841/<app_name> URL.
+ If you are using Windows and running the IIS web server, add "application/x-json"
+ as a MIME type; otherwise, IIS returns the JSON file with an error when you preview
+ your project. In Windows, enable IIS from the add/remove programs or programs and features dialog
+ (add/remove windows features), you can also add extra functionality by downloading the web platform
+ toolkit to make config of IIS features extra simple.
+ For information on adding this MIME type, see this
+ Stackoverflow article .
+ Use a modern web browser such as
+ Chrome
+ or Safari .
+
+
+Sencha Touch Information
+
+
+ 