Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE mobile] separate 'add hyperlink' option

Browse source
This commit is contained in:
Maxim Kadushkin 2017-01-11 13:53:59 +03:00
parent 64c1b76f2c
commit bf10598c25
2 changed files with 42 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
View file

@ -131,8 +131,9 @@ define([
break; break;
case 'addlink': case 'addlink':
me.view.hideMenu(); me.view.hideMenu();
SSE.getController('AddContainer').showModal(); SSE.getController('AddContainer').showModal({
SSE.getController('AddOther').getView('AddOther').showInsertLink(); panel: 'hyperlink'
});
break; break;
case 'openlink': case 'openlink':
var linkinfo = info.asc_getHyperlink(); var linkinfo = info.asc_getHyperlink();

67
apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js
View file

@ -104,7 +104,7 @@ define([
} }
options = opts; options = opts;
parentButton = !opts ? '#toolbar-add' : opts.button; parentButton = !opts || !opts.button ? '#toolbar-add' : opts.button;
me._showByStack(Common.SharedSettings.get('phone')); me._showByStack(Common.SharedSettings.get('phone'));
this.api.asc_closeCellEditor(); this.api.asc_closeCellEditor();
@ -151,6 +151,15 @@ define([
layout: SSE.getController('AddOther').getView('AddOther').rootLayout() layout: SSE.getController('AddOther').getView('AddOther').rootLayout()
}); });
if ( options && options.panel == 'hyperlink' ) {
var view = SSE.getController('AddLink').getView();
addViews.push({
caption: view.getTitle(),
id: 'add-link',
layout: view.rootLayout()
});
}
return addViews; return addViews;
}, },
@ -174,11 +183,15 @@ define([
); );
if (layoutAdds.length < 2) { if (layoutAdds.length == 1) {
$layoutNavbar $layoutNavbar
.find('.center') .find('.center')
.removeClass('categories') .removeClass('categories')
.html(layoutAdds[0].caption); .html(layoutAdds[0].caption);
$layoutPages = $('<div class="pages">' +
layoutAdds[0].layout +
'</div>');
} else { } else {
if (isAndroid) { if (isAndroid) {
$layoutNavbar $layoutNavbar
@ -208,36 +221,34 @@ define([
); );
}); });
} }
}
// Content
// Content var _arrangePages = _.template(
'<% _.each(pages, function(view, index) { %>' +
var $layoutPages = $( '<div id="<%= view.id %>" class="tab view<% if (index < 1) print(" active"); %>">' +
'<div class="pages">' + '<div class="pages">' +
'<div class="page" data-page="index">' + '<div class="page no-navbar">' +
'<div class="page-content">' + '<div class="page-content">' +
'<div class="tabs-animated-wrap">' + '<%= view.layout %>' +
'<div class="tabs"></div>' + '</div>' +
'</div>' +
'</div>' +
'</div>' +
'</div>'
);
_.each(layoutAdds, function (addView, index) {
$layoutPages.find('.tabs').append(
'<div id="' + addView.id + '" class="tab view ' + (index < 1 ? 'active' : '') + '">' +
'<div class="pages">' +
'<div class="page no-navbar">' +
'<div class="page-content">' +
addView.layout +
'</div>' + '</div>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'</div>' '<% }); %>');
);
}); var $layoutPages = $('<div class="pages">' +
'<div class="page" data-page="index">' +
'<div class="page-content">' +
'<div class="tabs-animated-wrap">' +
'<div class="tabs">' +
_arrangePages({pages: layoutAdds}) +
'</div>' +
'</div>' +
'</div>' +
'</div>' +
'</div>');
}
if (isPhone) { if (isPhone) {
me.picker = $$(uiApp.popup( me.picker = $$(uiApp.popup(
@ -288,7 +299,7 @@ define([
domCache: true domCache: true
}); });
Common.NotificationCenter.trigger('addcontainer:show'); Common.NotificationCenter.trigger('addcontainer:show', options);
}, },
textChart: 'Chart', textChart: 'Chart',