15 Commits

4 changed files with 29 additions and 19 deletions

View File

@@ -1,2 +1,9 @@
e2250a7fd29052ea767f18e1459cabea4cd7efd3 release-1.0.0
b8975b9e75648a7c2a5003c67db92cf2216e01c0 release-1.0.1
c7b699105bd166e7a01aa0e678d34624680bf81e release-1.1.0
c7b699105bd166e7a01aa0e678d34624680bf81e release-1.1.0
0000000000000000000000000000000000000000 release-1.1.0
0000000000000000000000000000000000000000 release-1.1.0
cfb1e028fd0627614aa01184893f9f29f20a347e release-1.1.0
cfb1e028fd0627614aa01184893f9f29f20a347e release-1.1.0
0000000000000000000000000000000000000000 release-1.1.0

View File

@@ -88,21 +88,19 @@ var contented = (function() {
};
var loadScripts = function(urls, onLoad) {
if (urls.length === 0) {
// load sequentially
var i = 0;
var loadNext = function() {
if (i === urls.length) {
onLoad();
return;
}
var totalLoaded = 0;
var cb = function() {
totalLoaded += 1;
if (totalLoaded == urls.length) {
onLoad();
}
var url = urls[i];
i += 1;
loadScript(url, loadNext);
};
for (var i = 0; i < urls.length; ++i) {
loadScript(urls[i], cb);
}
loadNext();
};
var formatBytes = function(bytes) {
@@ -294,6 +292,10 @@ var contented = (function() {
var setupDrawingBoard = function() {
$("head").append(
'<link rel="stylesheet" type="text/css" href="' + contented.baseURL + 'drawingboard-0.4.6.min.css">'
);
var db_id = "contented-drawing-area-" + guid();
var $db = $("<div>").attr('id', db_id);
@@ -437,10 +439,10 @@ var contented = (function() {
// Load scripts
var needScripts = [];
if (typeof jQuery === "undefined") {
needScripts.push("jquery-1.12.4.min.js");
needScripts.push(contented.baseURL + "jquery-1.12.4.min.js");
}
if (typeof DrawingBoard === "undefined") {
needScripts.push("drawingboard-0.4.6.min.js");
needScripts.push(contented.baseURL + "drawingboard-0.4.6.min.js");
}
loadScripts(needScripts, afterScriptsLoaded);

View File

@@ -88,12 +88,14 @@
border-radius:8px;
background:lightgrey;
position:relative;
overflow:hidden;
}
.contented-progress-element {
position:absolute;
background:darkgreen;
left:0;
width:0%;
height:100%;
}
</style>
<div class="contented">
@@ -148,7 +150,6 @@
</div>
<div class="contented-upload-if contented-if-drawing">
<link rel="stylesheet" type="text/css" href="/drawingboard-0.4.6.min.css">
<div class="contented-drawing-area"></div>
</div>

File diff suppressed because one or more lines are too long