web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add tags from drive

Browse Source
This commit is contained in:
ansuz
2017-10-05 16:58:34 +02:00
parent 1f35798194
commit d85db64939
6 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
www/common/sframe-common-interface.js
View File

@@ -28,6 +28,20 @@ define([
* - createDropdown
*/
UI.updateTags = function (common, href) {
var sframeChan = common.getSframeChannel();
sframeChan.query('Q_TAGS_GET', href || null, function (err, res) {
if (err || res.error) { return void console.error(err || res.error); }
Cryptpad.dialog.tagPrompt(res.data, function (tags) {
if (!Array.isArray(tags)) { return; }
sframeChan.event('EV_TAGS_SET', {
tags: tags,
href: href,
});
});
});
};
UI.createButton = function (common, type, rightside, data, callback) {
var AppConfig = common.getAppConfig();
var button;
@@ -202,16 +216,7 @@ define([
title: Messages.tags_title,
})
.click(common.prepareFeedback(type))
.click(function () {
sframeChan.query('Q_TAGS_GET', null, function (err, res) {
if (err || res.error) { return void console.error(err || res.error); }
Cryptpad.dialog.tagPrompt(res.data, function (tags) {
if (!Array.isArray(tags)) { return; }
console.error(tags);
sframeChan.event('EV_TAGS_SET', tags);
});
});
});
.click(function () { UI.updateTags(null); });
break;
default:
button = $('<button>', {

5
www/common/sframe-common-outer.js
View File

@@ -401,7 +401,7 @@ define([
});
sframeChan.on('Q_TAGS_GET', function (data, cb) {
Cryptpad.getPadTags(null, function (err, data) {
Cryptpad.getPadTags(data, function (err, data) {
cb({
error: err,
data: data
@@ -410,8 +410,7 @@ define([
});
sframeChan.on('EV_TAGS_SET', function (data) {
console.log(data);
Cryptpad.resetTags(null, data);
Cryptpad.resetTags(data.href, data.tags);
});
sframeChan.on('Q_PIN_GET_USAGE', function (data, cb) {

1
www/common/sframe-common.js
View File

@@ -78,6 +78,7 @@ define([
funcs.displayAvatar = callWithCommon(UI.displayAvatar);
funcs.createButton = callWithCommon(UI.createButton);
funcs.createUsageBar = callWithCommon(UI.createUsageBar);
funcs.updateTags = callWithCommon(UI.updateTags);
// History
funcs.getHistory = callWithCommon(History.create);