[Mobile] FIx Bug 40561
This commit is contained in:
parent
f0c8bb7c0f
commit
7cda33b157
|
@ -1199,7 +1199,7 @@ define([
|
|||
if (!this.appOptions.canPrint) return;
|
||||
|
||||
if (this.api)
|
||||
this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
|
||||
this.api.asc_Print();
|
||||
Common.component.Analytics.trackEvent('Print');
|
||||
},
|
||||
|
||||
|
|
|
@ -201,6 +201,7 @@ define([
|
|||
$('#settings-spellcheck input:checkbox').single('change', _.bind(me.onSpellcheck, me));
|
||||
$('#settings-help').single('click', _.bind(me.onShowHelp, me));
|
||||
$('#settings-download').single('click', _.bind(me.onDownloadOrigin, me));
|
||||
$('#settings-print').single('click', _.bind(me.onPrint, me));
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -344,6 +345,15 @@ define([
|
|||
me.hideModal();
|
||||
},
|
||||
|
||||
onPrint: function(e) {
|
||||
var me = this;
|
||||
|
||||
_.defer(function () {
|
||||
me.api.asc_Print();
|
||||
});
|
||||
me.hideModal();
|
||||
},
|
||||
|
||||
onFormatChange: function (e) {
|
||||
var me = this,
|
||||
rawValue = $(e.currentTarget).val(),
|
||||
|
|
|
@ -93,6 +93,18 @@
|
|||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a id="settings-print" class="item-link no-indicator">
|
||||
<div class="item-content">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-print"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textPrint %></div>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a id="settings-document-info" class="item-link" data-page="#settings-info-view">
|
||||
<div class="item-content">
|
||||
|
|
|
@ -56,7 +56,8 @@ define([
|
|||
_canDownloadOrigin = false,
|
||||
_canReader = false,
|
||||
_canAbout = true,
|
||||
_canHelp = true;
|
||||
_canHelp = true,
|
||||
_canPrint = false;
|
||||
|
||||
return {
|
||||
// el: '.view-main',
|
||||
|
@ -97,6 +98,7 @@ define([
|
|||
_canDownload = mode.canDownload;
|
||||
_canDownloadOrigin = mode.canDownloadOrigin;
|
||||
_canReader = !mode.isEdit && mode.canReader;
|
||||
_canPrint = mode.canPrint;
|
||||
|
||||
if (mode.customization && mode.canBrandingExt) {
|
||||
_canAbout = (mode.customization.about!==false);
|
||||
|
@ -128,6 +130,7 @@ define([
|
|||
if (!_canDownloadOrigin) $layour.find('#settings-download').hide();
|
||||
if (!_canAbout) $layour.find('#settings-about').hide();
|
||||
if (!_canHelp) $layour.find('#settings-help').hide();
|
||||
if (!_canPrint) $layour.find('#settings-print').hide();
|
||||
|
||||
return $layour.html();
|
||||
}
|
||||
|
@ -257,7 +260,8 @@ define([
|
|||
textDocumentFormats: 'Document Formats',
|
||||
textOrientation: 'Orientation',
|
||||
textPoweredBy: 'Powered by',
|
||||
textSpellcheck: 'Spell Checking'
|
||||
textSpellcheck: 'Spell Checking',
|
||||
textPrint: 'Print'
|
||||
|
||||
}
|
||||
})(), DE.Views.Settings || {}))
|
||||
|
|
|
@ -386,5 +386,6 @@
|
|||
"DE.Views.Settings.textWords": "Words",
|
||||
"DE.Views.Settings.unknownText": "Unknown",
|
||||
"DE.Views.Settings.textSpellcheck": "Spell Checking",
|
||||
"DE.Views.Settings.textPrint": "Print",
|
||||
"DE.Views.Toolbar.textBack": "Back"
|
||||
}
|
|
@ -6351,6 +6351,11 @@ i.icon.icon-download {
|
|||
height: 28px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23446995%22%3E%3Cpath%20d%3D%22M12%200H11L11%2014L7.39999%2010.3L6.69999%2011.1L11.5%2016L16.3%2011.1L15.6%2010.3L12%2014L12%200Z%22%2F%3E%3Cpath%20d%3D%22M14%205V6H19V20H4V6H9V5H3V21H20V5H14Z%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-print {
|
||||
width: 22px;
|
||||
height: 28px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-0%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23446995%22%20%20stroke%3D%22%23446995%22%3E%3Cg%3E%3Cpath%20d%3D%22M5.5%2016.5H1.5V12.5M5.5%2016.5V20.5H16.5V16.5M5.5%2016.5V12.5M16.5%2016.5H20.5V12.5M16.5%2016.5V12.5M5.5%206.5H1.5V12.5M5.5%206.5V1.5H16.5V6.5M5.5%206.5H16.5M16.5%206.5H20.5V12.5M1.5%2012.5H5.5M20.5%2012.5H16.5M5.5%2012.5H16.5M8%2015.5H14M8%2017.5H14%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-spellcheck {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
|
|
|
@ -5940,6 +5940,11 @@ i.icon.icon-download {
|
|||
height: 28px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-0%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23446995%22%3E%3Cg%3E%3Cpath%20d%3D%22M12%200H11L11%2014L7.39999%2010.3L6.69999%2011.1L11.5%2016L16.3%2011.1L15.6%2010.3L12%2014L12%200Z%22%2F%3E%3Cpath%20d%3D%22M14%205V6H19V20H4V6H9V5H3V21H20V5H14Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-print {
|
||||
width: 22px;
|
||||
height: 28px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23446995%22%20%20stroke%3D%22%23446995%22%3E%3Cg%3E%3Cpath%20d%3D%22M5.5%2016.5H1.5V12.5M5.5%2016.5V20.5H16.5V16.5M5.5%2016.5V12.5M16.5%2016.5H20.5V12.5M16.5%2016.5V12.5M5.5%206.5H1.5V12.5M5.5%206.5V1.5H16.5V6.5M5.5%206.5H16.5M16.5%206.5H20.5V12.5M1.5%2012.5H5.5M20.5%2012.5H16.5M5.5%2012.5H16.5M8%2015.5H14M8%2017.5H14%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-spellcheck {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
|
|
|
@ -40,6 +40,11 @@ i.icon {
|
|||
height: 28px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" y="0px" x="0px" fill="@{themeColor}"><path d="M12 0H11L11 14L7.39999 10.3L6.69999 11.1L11.5 16L16.3 11.1L15.6 10.3L12 14L12 0Z"/><path d="M14 5V6H19V20H4V6H9V5H3V21H20V5H14Z"/></svg>');
|
||||
}
|
||||
&.icon-print {
|
||||
width: 22px;
|
||||
height: 28px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-0 0 22 22" y="0px" x="0px" fill="@{themeColor}" stroke="@{themeColor}"><g><path d="M5.5 16.5H1.5V12.5M5.5 16.5V20.5H16.5V16.5M5.5 16.5V12.5M16.5 16.5H20.5V12.5M16.5 16.5V12.5M5.5 6.5H1.5V12.5M5.5 6.5V1.5H16.5V6.5M5.5 6.5H16.5M16.5 6.5H20.5V12.5M1.5 12.5H5.5M20.5 12.5H16.5M5.5 12.5H16.5M8 15.5H14M8 17.5H14"/></g></svg>');
|
||||
}
|
||||
&.icon-spellcheck {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
|
|
|
@ -35,6 +35,11 @@ i.icon {
|
|||
height: 28px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-0 0 22 22" y="0px" x="0px" fill="@{themeColor}"><g><path d="M12 0H11L11 14L7.39999 10.3L6.69999 11.1L11.5 16L16.3 11.1L15.6 10.3L12 14L12 0Z"/><path d="M14 5V6H19V20H4V6H9V5H3V21H20V5H14Z"/></g></svg>');
|
||||
}
|
||||
&.icon-print {
|
||||
width: 22px;
|
||||
height: 28px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" y="0px" x="0px" fill="@{themeColor}" stroke="@{themeColor}"><g><path d="M5.5 16.5H1.5V12.5M5.5 16.5V20.5H16.5V16.5M5.5 16.5V12.5M16.5 16.5H20.5V12.5M16.5 16.5V12.5M5.5 6.5H1.5V12.5M5.5 6.5V1.5H16.5V6.5M5.5 6.5H16.5M16.5 6.5H20.5V12.5M1.5 12.5H5.5M20.5 12.5H16.5M5.5 12.5H16.5M8 15.5H14M8 17.5H14"/></g></svg>');
|
||||
}
|
||||
&.icon-spellcheck {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
|
|
|
@ -1144,7 +1144,7 @@ define([
|
|||
if (!this.appOptions.canPrint) return;
|
||||
|
||||
if (this.api)
|
||||
this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
|
||||
this.api.asc_Print();
|
||||
Common.component.Analytics.trackEvent('Print');
|
||||
},
|
||||
|
||||
|
|
|
@ -159,6 +159,7 @@ define([
|
|||
$('#settings-spellcheck input:checkbox').single('change', _.bind(me._onSpellcheck, me));
|
||||
$(modalView).find('.formats a').single('click', _.bind(me._onSaveFormat, me));
|
||||
$('#page-settings-setup-view li').single('click', _.bind(me._onSlideSize, me));
|
||||
$('#settings-print').single('click', _.bind(me._onPrint, me));
|
||||
|
||||
me.initSettings(pageId);
|
||||
},
|
||||
|
@ -235,6 +236,15 @@ define([
|
|||
this.hideModal();
|
||||
},
|
||||
|
||||
_onPrint: function(e) {
|
||||
var me = this;
|
||||
|
||||
_.defer(function () {
|
||||
me.api.asc_Print();
|
||||
});
|
||||
me.hideModal();
|
||||
},
|
||||
|
||||
_onSpellcheck: function (e) {
|
||||
var $checkbox = $(e.currentTarget),
|
||||
state = $checkbox.is(':checked');
|
||||
|
|
|
@ -65,6 +65,18 @@
|
|||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a id="settings-print" class="item-link no-indicator">
|
||||
<div class="item-content">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-print"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textPrint %></div>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a id="settings-document-info" class="item-link">
|
||||
<div class="item-content">
|
||||
|
|
|
@ -54,7 +54,8 @@ define([
|
|||
canEdit = false,
|
||||
canDownload = false,
|
||||
canAbout = true,
|
||||
canHelp = true;
|
||||
canHelp = true,
|
||||
canPrint = false;
|
||||
|
||||
return {
|
||||
// el: '.view-main',
|
||||
|
@ -98,6 +99,7 @@ define([
|
|||
isEdit = mode.isEdit;
|
||||
canEdit = !mode.isEdit && mode.canEdit && mode.canRequestEditRights;
|
||||
canDownload = mode.canDownload || mode.canDownloadOrigin;
|
||||
canPrint = mode.canPrint;
|
||||
|
||||
if (mode.customization && mode.canBrandingExt) {
|
||||
canAbout = (mode.customization.about!==false);
|
||||
|
@ -126,6 +128,7 @@ define([
|
|||
if (!canDownload) $layour.find('#settings-download').hide();
|
||||
if (!canAbout) $layour.find('#settings-about').hide();
|
||||
if (!canHelp) $layour.find('#settings-help').hide();
|
||||
if (!canPrint) $layour.find('#settings-print').hide();
|
||||
|
||||
return $layour.html();
|
||||
}
|
||||
|
@ -224,7 +227,8 @@ define([
|
|||
mniSlideWide: 'Widescreen (16:9)',
|
||||
textPoweredBy: 'Powered by',
|
||||
textFindAndReplace: 'Find and Replace',
|
||||
textSpellcheck: 'Spell Checking'
|
||||
textSpellcheck: 'Spell Checking',
|
||||
textPrint: 'Print'
|
||||
}
|
||||
})(), PE.Views.Settings || {}))
|
||||
});
|
|
@ -457,5 +457,6 @@
|
|||
"PE.Views.Settings.textVersion": "Version",
|
||||
"PE.Views.Settings.unknownText": "Unknown",
|
||||
"PE.Views.Settings.textSpellcheck": "Spell Checking",
|
||||
"PE.Views.Settings.textPrint": "Print",
|
||||
"PE.Views.Toolbar.textBack": "Back"
|
||||
}
|
|
@ -6352,6 +6352,11 @@ i.icon.icon-download {
|
|||
height: 28px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23aa5252%22%3E%3Cpath%20d%3D%22M12%200H11L11%2014L7.39999%2010.3L6.69999%2011.1L11.5%2016L16.3%2011.1L15.6%2010.3L12%2014L12%200Z%22%2F%3E%3Cpath%20d%3D%22M14%205V6H19V20H4V6H9V5H3V21H20V5H14Z%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-print {
|
||||
width: 22px;
|
||||
height: 28px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-0%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23aa5252%22%20%20stroke%3D%22%23aa5252%22%3E%3Cg%3E%3Cpath%20d%3D%22M5.5%2016.5H1.5V12.5M5.5%2016.5V20.5H16.5V16.5M5.5%2016.5V12.5M16.5%2016.5H20.5V12.5M16.5%2016.5V12.5M5.5%206.5H1.5V12.5M5.5%206.5V1.5H16.5V6.5M5.5%206.5H16.5M16.5%206.5H20.5V12.5M1.5%2012.5H5.5M20.5%2012.5H16.5M5.5%2012.5H16.5M8%2015.5H14M8%2017.5H14%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-spellcheck {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
|
|
|
@ -5945,6 +5945,11 @@ i.icon.icon-download {
|
|||
height: 28px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23aa5252%22%3E%3Cpath%20d%3D%22M12%200H11L11%2014L7.39999%2010.3L6.69999%2011.1L11.5%2016L16.3%2011.1L15.6%2010.3L12%2014L12%200Z%22%2F%3E%3Cpath%20d%3D%22M14%205V6H19V20H4V6H9V5H3V21H20V5H14Z%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-print {
|
||||
width: 22px;
|
||||
height: 28px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-0%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23aa5252%22%20%20stroke%3D%22%23aa5252%22%3E%3Cg%3E%3Cpath%20d%3D%22M5.5%2016.5H1.5V12.5M5.5%2016.5V20.5H16.5V16.5M5.5%2016.5V12.5M16.5%2016.5H20.5V12.5M16.5%2016.5V12.5M5.5%206.5H1.5V12.5M5.5%206.5V1.5H16.5V6.5M5.5%206.5H16.5M16.5%206.5H20.5V12.5M1.5%2012.5H5.5M20.5%2012.5H16.5M5.5%2012.5H16.5M8%2015.5H14M8%2017.5H14%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-spellcheck {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
|
|
|
@ -45,6 +45,11 @@ i.icon {
|
|||
height: 28px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" y="0px" x="0px" fill="@{themeColor}"><path d="M12 0H11L11 14L7.39999 10.3L6.69999 11.1L11.5 16L16.3 11.1L15.6 10.3L12 14L12 0Z"/><path d="M14 5V6H19V20H4V6H9V5H3V21H20V5H14Z"/></svg>');
|
||||
}
|
||||
&.icon-print {
|
||||
width: 22px;
|
||||
height: 28px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-0 0 22 22" y="0px" x="0px" fill="@{themeColor}" stroke="@{themeColor}"><g><path d="M5.5 16.5H1.5V12.5M5.5 16.5V20.5H16.5V16.5M5.5 16.5V12.5M16.5 16.5H20.5V12.5M16.5 16.5V12.5M5.5 6.5H1.5V12.5M5.5 6.5V1.5H16.5V6.5M5.5 6.5H16.5M16.5 6.5H20.5V12.5M1.5 12.5H5.5M20.5 12.5H16.5M5.5 12.5H16.5M8 15.5H14M8 17.5H14"/></g></svg>');
|
||||
}
|
||||
&.icon-spellcheck {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
|
|
|
@ -40,6 +40,11 @@ i.icon {
|
|||
height: 28px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" y="0px" x="0px" fill="@{themeColor}"><path d="M12 0H11L11 14L7.39999 10.3L6.69999 11.1L11.5 16L16.3 11.1L15.6 10.3L12 14L12 0Z"/><path d="M14 5V6H19V20H4V6H9V5H3V21H20V5H14Z"/></svg>');
|
||||
}
|
||||
&.icon-print {
|
||||
width: 22px;
|
||||
height: 28px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-0 0 22 22" y="0px" x="0px" fill="@{themeColor}" stroke="@{themeColor}"><g><path d="M5.5 16.5H1.5V12.5M5.5 16.5V20.5H16.5V16.5M5.5 16.5V12.5M16.5 16.5H20.5V12.5M16.5 16.5V12.5M5.5 6.5H1.5V12.5M5.5 6.5V1.5H16.5V6.5M5.5 6.5H16.5M16.5 6.5H20.5V12.5M1.5 12.5H5.5M20.5 12.5H16.5M5.5 12.5H16.5M8 15.5H14M8 17.5H14"/></g></svg>');
|
||||
}
|
||||
&.icon-spellcheck {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
|
|
|
@ -1319,7 +1319,7 @@ define([
|
|||
if (!this.appOptions.canPrint) return;
|
||||
|
||||
if (this.api)
|
||||
this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
|
||||
this.api.asc_Print();
|
||||
Common.component.Analytics.trackEvent('Print');
|
||||
},
|
||||
|
||||
|
|
|
@ -149,6 +149,7 @@ define([
|
|||
var me = this;
|
||||
$('#settings-search').single('click', _.bind(me._onSearch, me));
|
||||
$(modalView).find('.formats a').single('click', _.bind(me._onSaveFormat, me));
|
||||
$('#settings-print').single('click', _.bind(me._onPrint, me));
|
||||
me.initSettings(pageId);
|
||||
},
|
||||
|
||||
|
@ -209,6 +210,15 @@ define([
|
|||
this.hideModal();
|
||||
},
|
||||
|
||||
_onPrint: function(e) {
|
||||
var me = this;
|
||||
|
||||
_.defer(function () {
|
||||
me.api.asc_Print();
|
||||
});
|
||||
me.hideModal();
|
||||
},
|
||||
|
||||
_onSaveFormat: function(e) {
|
||||
var me = this,
|
||||
format = $(e.currentTarget).data('format');
|
||||
|
|
|
@ -37,6 +37,18 @@
|
|||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a id="settings-print" class="item-link no-indicator">
|
||||
<div class="item-content">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-print"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textPrint %></div>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a id="settings-document-info" class="item-link">
|
||||
<div class="item-content">
|
||||
|
|
|
@ -53,7 +53,8 @@ define([
|
|||
canEdit = false,
|
||||
canDownload = false,
|
||||
canAbout = true,
|
||||
canHelp = true;
|
||||
canHelp = true,
|
||||
canPrint = false;
|
||||
|
||||
return {
|
||||
// el: '.view-main',
|
||||
|
@ -103,6 +104,7 @@ define([
|
|||
isEdit = mode.isEdit;
|
||||
canEdit = !mode.isEdit && mode.canEdit && mode.canRequestEditRights;
|
||||
canDownload = mode.canDownload || mode.canDownloadOrigin;
|
||||
canPrint = mode.canPrint;
|
||||
|
||||
if (mode.customization && mode.canBrandingExt) {
|
||||
canAbout = (mode.customization.about!==false);
|
||||
|
@ -125,6 +127,7 @@ define([
|
|||
if (!canDownload) $layout.find('#settings-download').hide();
|
||||
if (!canAbout) $layout.find('#settings-about').hide();
|
||||
if (!canHelp) $layout.find('#settings-help').hide();
|
||||
if (!canPrint) $layout.find('#settings-print').hide();
|
||||
|
||||
return $layout.html();
|
||||
}
|
||||
|
@ -213,7 +216,8 @@ define([
|
|||
textAddress: 'address',
|
||||
textEmail: 'email',
|
||||
textTel: 'tel',
|
||||
textPoweredBy: 'Powered by'
|
||||
textPoweredBy: 'Powered by',
|
||||
textPrint: 'Print'
|
||||
}
|
||||
})(), SSE.Views.Settings || {}))
|
||||
});
|
|
@ -501,5 +501,6 @@
|
|||
"SSE.Views.Settings.textTel": "tel",
|
||||
"SSE.Views.Settings.textVersion": "Version",
|
||||
"SSE.Views.Settings.unknownText": "Unknown",
|
||||
"SSE.Views.Settings.textPrint": "Print",
|
||||
"SSE.Views.Toolbar.textBack": "Back"
|
||||
}
|
|
@ -6274,6 +6274,11 @@ i.icon.icon-download {
|
|||
height: 28px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%2340865c%22%3E%3Cpath%20d%3D%22M12%200H11L11%2014L7.39999%2010.3L6.69999%2011.1L11.5%2016L16.3%2011.1L15.6%2010.3L12%2014L12%200Z%22%2F%3E%3Cpath%20d%3D%22M14%205V6H19V20H4V6H9V5H3V21H20V5H14Z%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-print {
|
||||
width: 22px;
|
||||
height: 28px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-0%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%2340865c%22%20%20stroke%3D%22%2340865c%22%3E%3Cg%3E%3Cpath%20d%3D%22M5.5%2016.5H1.5V12.5M5.5%2016.5V20.5H16.5V16.5M5.5%2016.5V12.5M16.5%2016.5H20.5V12.5M16.5%2016.5V12.5M5.5%206.5H1.5V12.5M5.5%206.5V1.5H16.5V6.5M5.5%206.5H16.5M16.5%206.5H20.5V12.5M1.5%2012.5H5.5M20.5%2012.5H16.5M5.5%2012.5H16.5M8%2015.5H14M8%2017.5H14%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-info {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
|
|
|
@ -5950,6 +5950,11 @@ i.icon.icon-download {
|
|||
height: 28px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%2340865c%22%3E%3Cpath%20d%3D%22M12%200H11L11%2014L7.39999%2010.3L6.69999%2011.1L11.5%2016L16.3%2011.1L15.6%2010.3L12%2014L12%200Z%22%2F%3E%3Cpath%20d%3D%22M14%205V6H19V20H4V6H9V5H3V21H20V5H14Z%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-print {
|
||||
width: 22px;
|
||||
height: 28px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-0%200%2022%2022%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%2340865c%22%20%20stroke%3D%22%2340865c%22%3E%3Cg%3E%3Cpath%20d%3D%22M5.5%2016.5H1.5V12.5M5.5%2016.5V20.5H16.5V16.5M5.5%2016.5V12.5M16.5%2016.5H20.5V12.5M16.5%2016.5V12.5M5.5%206.5H1.5V12.5M5.5%206.5V1.5H16.5V6.5M5.5%206.5H16.5M16.5%206.5H20.5V12.5M1.5%2012.5H5.5M20.5%2012.5H16.5M5.5%2012.5H16.5M8%2015.5H14M8%2017.5H14%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-info {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
|
|
|
@ -35,6 +35,11 @@ i.icon {
|
|||
height: 28px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" y="0px" x="0px" fill="@{themeColor}"><path d="M12 0H11L11 14L7.39999 10.3L6.69999 11.1L11.5 16L16.3 11.1L15.6 10.3L12 14L12 0Z"/><path d="M14 5V6H19V20H4V6H9V5H3V21H20V5H14Z"/></svg>');
|
||||
}
|
||||
&.icon-print {
|
||||
width: 22px;
|
||||
height: 28px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-0 0 22 22" y="0px" x="0px" fill="@{themeColor}" stroke="@{themeColor}"><g><path d="M5.5 16.5H1.5V12.5M5.5 16.5V20.5H16.5V16.5M5.5 16.5V12.5M16.5 16.5H20.5V12.5M16.5 16.5V12.5M5.5 6.5H1.5V12.5M5.5 6.5V1.5H16.5V6.5M5.5 6.5H16.5M16.5 6.5H20.5V12.5M1.5 12.5H5.5M20.5 12.5H16.5M5.5 12.5H16.5M8 15.5H14M8 17.5H14"/></g></svg>');
|
||||
}
|
||||
&.icon-info {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
|
|
|
@ -35,6 +35,11 @@ i.icon {
|
|||
height: 28px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" y="0px" x="0px" fill="@{themeColor}"><path d="M12 0H11L11 14L7.39999 10.3L6.69999 11.1L11.5 16L16.3 11.1L15.6 10.3L12 14L12 0Z"/><path d="M14 5V6H19V20H4V6H9V5H3V21H20V5H14Z"/></svg>');
|
||||
}
|
||||
&.icon-print {
|
||||
width: 22px;
|
||||
height: 28px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-0 0 22 22" y="0px" x="0px" fill="@{themeColor}" stroke="@{themeColor}"><g><path d="M5.5 16.5H1.5V12.5M5.5 16.5V20.5H16.5V16.5M5.5 16.5V12.5M16.5 16.5H20.5V12.5M16.5 16.5V12.5M5.5 6.5H1.5V12.5M5.5 6.5V1.5H16.5V6.5M5.5 6.5H16.5M16.5 6.5H20.5V12.5M1.5 12.5H5.5M20.5 12.5H16.5M5.5 12.5H16.5M8 15.5H14M8 17.5H14"/></g></svg>');
|
||||
}
|
||||
&.icon-info {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
|
|
Loading…
Reference in a new issue