Skip to content

Commit 8244eda

Browse files
committed
1. add html
1 parent 3a698f5 commit 8244eda

File tree

4 files changed

+55
-49
lines changed

4 files changed

+55
-49
lines changed

Diff for: common/test.html

+3-18
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,12 @@
2222
<script type="text/javascript" src="../js/pop.js"></script>
2323
<!--<script type="text/javascript" src="http://lib.sinaapp.com/js/jquery/1.9.1/jquery-1.9.1.js"></script>-->
2424
<script type="text/javascript">
25-
var a = $.merge([1,2,3], ['a','b','c']);
26-
// console.log(a);
27-
/*
28-
var a = $.map([1,2,3], function(n){
29-
return n + 3;
25+
var p = new $.pop({
26+
3027
});
31-
console.log(a);
32-
*/
33-
// var b = $('.a').after('<div>我是一个兵</div>');
34-
// console.log(b);
35-
// $('.a').removeClass('b');
36-
// console.log($.browser);
3728

38-
var p = new $.pop();
39-
console.log(p);
4029

41-
// var test = $('#test').clone();
42-
// $('#test2').append(test);
43-
// var d = $('#test').appendTo('#test2');
44-
// console.log(d);
45-
// console.log(test);
30+
4631

4732
</script>
4833
</body>

Diff for: js/jing.js

+50-3
Original file line numberDiff line numberDiff line change
@@ -429,9 +429,23 @@
429429
return this;
430430
},
431431
html : function(value){
432-
return _.access(this, function(value){
432+
if(value === undefined){
433+
return this[0] && this[0].nodeType === 1 ? $.trim(this[0].innerHTML) : null;
434+
} else if(typeof value === 'string') {
435+
try{
436+
for(var i = 0, l = this.length; i < l; i++){
437+
if(this[i].nodeType === 1){
438+
this[i].innerHTML = value;
439+
}
440+
}
441+
} catch(e) {
442+
this.empty().append(value);
443+
}
444+
} else {
445+
this.empty().append(value);
446+
}
433447

434-
}, null, value, arguments.length);
448+
return this;
435449
}
436450
});
437451

@@ -587,11 +601,44 @@
587601
}
588602
$.browser = browser;
589603

604+
// css相关静态方法
605+
$.extend({
606+
cssHooks : function(){
607+
608+
},
609+
cssNumber : function(){
610+
611+
},
612+
cssProps : {
613+
'float' : support.cssFloat ? 'cssFloat' : 'styleFloat'
614+
},
615+
setStyle : function(){
616+
617+
},
618+
css : function(){
619+
620+
}
621+
});
622+
623+
// 检测相关
624+
(function(){
625+
var a = null,
626+
div = document.createElement('div');
627+
628+
div.innerHTML = '<a href="a">a</a>';
629+
a = div.getElementsByTagName('a')[0];
630+
631+
a.style.cssText = 'float:left;opacity:.5;';
632+
support.cssFloat = !!a.style.cssFloat;
633+
634+
a = div = null;
635+
}());
636+
590637
}(window));
591638

592639
// 2014-04-21 : 准备开发第一版
593640
// 2014-04-30 : 完成$.type, $.each等方法
594641
// 2014-05-04 : 增加$.get方法
595642
// 2014-05-05 : 以精减的方式添加:append,prepend,before,after方法,但存在tbody问题未处理;添加addClass,removeClass
596643
// 2014-05-06 : 增加$.browser方法
597-
// 2014-05-07 : 增加$().appendTo,$().prependTo等方法
644+
// 2014-05-07 : 增加$().appendTo,$().prependTo等方法,增加$().html();

Diff for: js/pop.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
pop = null,
2929
wrap = null;
3030

31-
pop = $('<div class="pop" />').appendTo('body');
31+
pop = $('<div class="pop" />').appendTo('body').html('<p>春来江水鸭先知</p>');
3232
console.log(pop);
3333
/*
3434
wrap = handler.wrap = $.html('section', { class : 'pop-wrap' });

Diff for: test.html

+1-27
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,7 @@
1212
<div class="a">aa</div>
1313
<div class="a">bbb</div>
1414
<script type="text/javascript">
15-
var test2 = $('#test');
16-
// var test = Jing('.a');
17-
// var test = $(document.body);
18-
// var test = $('<p><span>test</span></p>');
19-
// var test = $('<p>test</p>');
20-
// var test = $(document);
21-
// console.log(test);
22-
$.each([1,2,3], function(i, n){
23-
console.log(i + ' : ' + n);
24-
});
25-
26-
/*
27-
Jing.extend({
28-
say : function(){
29-
console.log('say method');
30-
},
31-
hello : function(){
32-
console.log('hello');
33-
}
34-
});
35-
// Jing.say()
36-
// console.log();
37-
38-
var obj = {name : 'jikey', age : 30};
39-
$.extend(obj, { school : 'shanghai', age : 25});
40-
console.log(obj);
41-
*/
15+
var a = $.merge([1,2,3], ['a','b','c']);
4216

4317

4418
</script>

0 commit comments

Comments
 (0)