Skip to content

Commit 409db21

Browse files
javascript-2020javascript-2020
committed
save file
1 parent 1892e74 commit 409db21

1 file changed

Lines changed: 88 additions & 42 deletions

File tree

‎utils/editors/js-console/html/output-console/output-console.html‎

Lines changed: 88 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
#output-console
4343
{width:100%;height:100%;position:absolute;left:0;top:0}
4444

45+
web-console
46+
{flex:1;border:1px solid lightgray;box-sizing:border-box}
47+
4548
#slider
4649
{height:10px;cursor:ns-resize}
4750

@@ -91,20 +94,25 @@
9194
clear
9295
</span>
9396

94-
<output-settings component=page style='margin-right:10px'>
95-
</output-settings>
97+
<output-settings component=page style='margin-right:10px'></output-settings>
9698

9799
<button id=kill>kill</button>
98100

99101
</div hdr>
100102

103+
104+
<web-console component></web-console>
105+
106+
<!--
101107
<div id=output-hldr>
102108
<pre id=output>
103109
</pre>
104110
<div id=output-console style='display:none'>
105111
</div>
106112
</div>
107-
113+
-->
114+
115+
108116
<div id=slider></div>
109117

110118
</div root>
@@ -142,12 +150,12 @@
142150

143151

144152
var settings;
153+
var webconsole;
145154

146-
147-
var inspect;
148-
var jsconsolemod;
149-
var jsconsole;
150-
var style;
155+
//var inspect;
156+
//var jsconsolemod;
157+
//var jsconsole;
158+
//var style;
151159

152160

153161
var con = {};
@@ -206,6 +214,10 @@
206214
settings = mod['output-settings'];
207215
settings.initmod({output:obj});
208216

217+
218+
webconsole = mod['web-console'];
219+
220+
209221
await Promise.all([
210222
mod.auto(),
211223
libs(),
@@ -228,13 +240,17 @@
228240

229241
var list = [];
230242

243+
/*
231244
var promise = ext.load.libs('js/string/inspect.js').then(result=>{
232245
233246
[inspect] = result;
234247
235248
});
236249
list.push(promise);
237-
250+
*/
251+
252+
253+
/*
238254
var promise = ext.load.libs('js/dom/web-console/web-console-2.js').then(result=>{
239255
240256
[jsconsolemod] = result;
@@ -252,8 +268,9 @@
252268
253269
});
254270
list.push(promise);
255-
256-
271+
*/
272+
273+
257274
await Promise.all(list);
258275
//console.log(inspect);
259276

@@ -269,7 +286,7 @@
269286

270287
var style2 = $(shadow,'style');
271288
$.stylesheet.copyrule('#page-inline','.icon',style2);
272-
$.editor.ace.import_style(shadow,()=>shadow.append(style));
289+
//$.editor.ace.import_style(shadow,()=>shadow.append(style));
273290

274291

275292
root = $(shadow,'#root');
@@ -298,10 +315,9 @@
298315

299316

300317
output_console = $(shadow,'#output-console');
301-
obj.set.type('console');
302-
jsconsole = jsconsolemod.create(output_console);
318+
//jsconsole = jsconsolemod.create(output_console);
303319

304-
shadow.append(style);
320+
//shadow.append(style);
305321

306322

307323
var src = sandbox_url[sandbox_type];
@@ -328,9 +344,9 @@
328344
btn.wrap = function(chk){
329345
//console.log('wrap',v);
330346
if(chk.checked){
331-
output.style.whiteSpace = 'pre-wrap';
347+
//output.style.whiteSpace = 'pre-wrap';
332348
}else{
333-
output.style.whiteSpace = '';
349+
//output.style.whiteSpace = '';
334350
}
335351

336352
}//wrap
@@ -351,7 +367,6 @@
351367
on.message = function(json){
352368
//console.log('output.message',json);
353369
var {name,args} = json;
354-
//webconsole[name].apply(null,args);
355370
fn[name].apply(null,args);
356371

357372
}//message
@@ -391,8 +406,8 @@
391406

392407
iframe.onload = onload;
393408

394-
settings.sandbox(iframe);
395-
settings.allow(iframe);
409+
settings.build.sandbox(iframe);
410+
settings.build.allow(iframe);
396411
debug(sandbox_allow);
397412
/*
398413
var src = sandbox_url;
@@ -721,12 +736,15 @@
721736
return;
722737
}
723738

739+
webconsole.clear();
740+
/*
724741
switch(mode){
725742
726743
case 'pretty' : cur.root.replaceChildren(); break;
727744
case 'console' : jsconsole.clear(); break;
728745
729746
}//switch
747+
*/
730748

731749
if(settings.chk['console-echo'].checked){
732750
console.clear();
@@ -738,8 +756,12 @@
738756
obj.log = function(){return log.apply(null,arguments)}
739757
fn.log = function(){return log.apply(null,arguments)}
740758

741-
function log(){
759+
function log(...args){
742760

761+
var node = webconsole.log(...args);
762+
return node;
763+
764+
/*
743765
var div;
744766
745767
switch(mode){
@@ -750,35 +772,21 @@
750772
}//switch
751773
752774
return div;
775+
*/
753776

754777
}//log
755778

756779

757-
obj.groupCollapsed = function(){return groupCollapsed.apply(null,arguments)}
758-
fn.groupCollapsed = function(){return groupCollapsed.apply(null,arguments)}
759-
760-
function groupCollapsed(...args){
761-
762-
switch(mode){
763-
764-
case 'pretty' :
765-
var out = format(arguments);
766-
var div = disp.apply(null,out);
767-
return div;
768-
769-
case 'console' : jsconsole.groupCollapsed.apply(jsconsole,arguments);
770-
break;
771-
772-
}//switch
773-
774-
}//groupCollapsed
775-
776-
777780
obj.error = function(){return error.apply(null,arguments)}
778781
fn.error = function(){return error.apply(null,arguments)}
779782

780783
function error(){
781784

785+
var node = webconsole.error(...arguments);
786+
return node;
787+
788+
789+
/*
782790
var node;
783791
784792
switch(mode){
@@ -794,10 +802,43 @@
794802
}//switch
795803
796804
return node;
805+
*/
806+
797807

798808
}//error
799809

800810

811+
obj.warn = warn;
812+
fn.warn = warn;
813+
814+
function warn(){
815+
816+
var node = webconsole.warn(...arguments);
817+
return node;
818+
819+
}//warn
820+
821+
822+
obj.groupCollapsed = function(){return groupCollapsed.apply(null,arguments)}
823+
fn.groupCollapsed = function(){return groupCollapsed.apply(null,arguments)}
824+
825+
function groupCollapsed(...args){
826+
827+
switch(mode){
828+
829+
case 'pretty' :
830+
var out = format(arguments);
831+
var div = disp.apply(null,out);
832+
return div;
833+
834+
case 'console' : jsconsole.groupCollapsed.apply(jsconsole,arguments);
835+
break;
836+
837+
}//switch
838+
839+
}//groupCollapsed
840+
841+
801842

802843

803844
obj.node = function(){return node.apply(null,arguments)}
@@ -845,7 +886,7 @@
845886

846887
function datatype(v){return Object.prototype.toString.call(v).slice(8,-1).toLowerCase()}
847888

848-
889+
/*
849890
function format(args){
850891
851892
if(typeof args[0]!=='string')return args;
@@ -1018,6 +1059,9 @@
10181059
}//build
10191060
10201061
1062+
*/
1063+
1064+
10211065
function create(node){
10221066

10231067
var type = datatype(node);
@@ -1039,6 +1083,8 @@
10391083
}//string
10401084

10411085

1086+
1087+
10421088
//:
10431089

10441090

0 commit comments

Comments
 (0)