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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
yflory
2017-06-28 17:15:42 +02:00
parent 19ff8a345d c53ebe3598
commit 877c5a8d0e
10 changed files with 19 additions and 1512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
www/common/cryptpad-common.js
View File

@@ -1622,7 +1622,10 @@ define([
common.arePinsSynced(function (err, yes) {
if (!yes) {
common.resetPins(function (err) {
if (err) { console.error(err); }
if (err) {
console.error("Pin Reset Error");
return console.error(err);
}
console.log('RESET DONE');
});
}

18
www/common/toolbar2.js
View File

@@ -48,19 +48,6 @@ define([
return 'cryptpad-uid-' + String(Math.random()).substring(2);
};
var styleToolbar = function ($container, href, version, force) {
if (!force) { return; }
href = href || '/customize/toolbar.css' + (version?('?' + version): '');
$.ajax({
url: href,
dataType: 'text',
success: function (data) {
$container.append($('<style>').text(data));
},
});
};
var createRealtimeToolbar = function (config) {
if (!config.$container) { return; }
var $container = config.$container;
@@ -108,11 +95,6 @@ define([
$container.prepend($toolbar);
if (ApiConfig && ApiConfig.requireConf && ApiConfig.requireConf.urlArgs) {
styleToolbar($container, undefined, ApiConfig.requireConf.urlArgs, config.legacyStyle);
} else {
styleToolbar($container, void 0, void 0, config.legacyStyle);
}
$container.on('drop dragover', function (e) {
e.preventDefault();
e.stopPropagation();

23
www/pad/index.html
View File

@@ -24,29 +24,6 @@
padding:0;
overflow:hidden;
}
#feedback {
display: none;
position: fixed;
top: 0px;
right: 0px;
border: 0px;
height: 100vh;
width: 30vw;
background-color: #222;
color: #ccc;
}
#debug {
height: 20px;
position: absolute;
right: 0px;
top: 70px;
}
#debug button {
visibility: hidden;
}
#debug:hover button {
visibility: visible;
}
</style>
</head>
<body>

2
www/pad/inner.js
View File

@@ -1,3 +1,3 @@
define([
//'less!/customize/src/less/toolbar.less',
'less!/customize/src/less/toolbar.less',
], function () {});

11
www/pad/main.js
View File

@@ -472,10 +472,19 @@ define([
network: info.network,
$container: $bar,
$contentContainer: $iframe.find('#cke_1_contents'),
legacyStyle: true,
};
toolbar = info.realtime.toolbar = Toolbar.create(configTb);
var src = 'less!/customize/src/less/toolbar.less';
require([
src
], function () {
var $html = $bar.closest('html');
$html
.find('head style[data-original-src="' + src.replace(/less!/, '') + '"]')
.appendTo($html.find('head'));
});
Title.setToolbar(toolbar);
var $rightside = toolbar.$rightside;

4
www/slide/index.html
View File

@@ -31,10 +31,6 @@
top: 0px;
height: 100%;
}
body #iframe-container.fullscreen {
top: 0px;
height: 100%;
}
</style>
</head>
<body>