From 08103d5a026a02dc9b96dbff116fd832e1590423 Mon Sep 17 00:00:00 2001 From: j900155 Date: Fri, 15 Apr 2016 22:10:46 +0800 Subject: [PATCH 1/4] add Basic/object --- Basic/If/README.md | 1 + Basic/If/REAFME.md | 1 - Basic/Object/Object-prototype.js | 33 +++++++++++++++++++++++ Basic/Object/Object-this.js | 46 ++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 1 deletion(-) delete mode 100644 Basic/If/REAFME.md create mode 100644 Basic/Object/Object-prototype.js create mode 100644 Basic/Object/Object-this.js diff --git a/Basic/If/README.md b/Basic/If/README.md index e69de29..598781d 100644 --- a/Basic/If/README.md +++ b/Basic/If/README.md @@ -0,0 +1 @@ +#if diff --git a/Basic/If/REAFME.md b/Basic/If/REAFME.md deleted file mode 100644 index 598781d..0000000 --- a/Basic/If/REAFME.md +++ /dev/null @@ -1 +0,0 @@ -#if diff --git a/Basic/Object/Object-prototype.js b/Basic/Object/Object-prototype.js new file mode 100644 index 0000000..9a4b84e --- /dev/null +++ b/Basic/Object/Object-prototype.js @@ -0,0 +1,33 @@ +function People() +{ + this.name = ""; + this.year = 0; +}; + +People.prototype.setName = function(name) +{ + this.name = name; +}; +People.prototype.getName = function() +{ + return this.name; +}; + +People.prototype.setYear = function(year) +{ + this.year = year; +}; +People.prototype.getYear = function() +{ + return this.year; +}; + +var people = new People; +people.setName("kiss"); +people.setYear(5891); +console.log("use function getName " + people.getName() ); +console.log("use function getYear " + people.getYear() ); +console.log("call name " + people.name); +people.name = "chm"; +console.log("call name " + people.name); + diff --git a/Basic/Object/Object-this.js b/Basic/Object/Object-this.js new file mode 100644 index 0000000..7e589e0 --- /dev/null +++ b/Basic/Object/Object-this.js @@ -0,0 +1,46 @@ +function object() +{ + this.name = "chm"; + this.year = "87"; + this.rname = function() + { + return this.name; + }; + this.ryear = function() + { + return this.year; + }; + this.setName = function( name ) + { + this.name = name + }; + this.setYear = function( year ) + { + this.year = year + } + +}; + +var o1 = new object; +var o2 = new object; +var o11 = o1; +console.log("o1 " + o1.rname() ); +console.log("o1 " + o1.ryear() ); + +console.log("o2 " + o2.rname() ); +console.log("o2 " + o2.ryear() ); + +o2.setName("kiss"); +o2.setYear(5981); +console.log("o2 " + o2.rname() ); +console.log("o2 " + o2.ryear() ); + +o1.setName("qwer"); +console.log("o1 "+ o1.rname() ); +console.log("o1 "+ o1.ryear() ); + +console.log("o11 " + o11.rname() ); +console.log("o11 " + o11.ryear() ); + + + From fe0c9ae6fe23604cdc184d1a79ce18a5874249d5 Mon Sep 17 00:00:00 2001 From: "JHANG,JIA-HONG" Date: Fri, 15 Apr 2016 22:12:13 +0800 Subject: [PATCH 2/4] Create README.md --- Basic/Object/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Basic/Object/README.md diff --git a/Basic/Object/README.md b/Basic/Object/README.md new file mode 100644 index 0000000..623f689 --- /dev/null +++ b/Basic/Object/README.md @@ -0,0 +1 @@ +#Object From 559db5b78f2750c4c1cb6c26432359e6c0112178 Mon Sep 17 00:00:00 2001 From: "JHANG,JIA-HONG" Date: Mon, 18 Apr 2016 16:15:49 +0800 Subject: [PATCH 3/4] Update Object-prototype.js --- Basic/Object/Object-prototype.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Basic/Object/Object-prototype.js b/Basic/Object/Object-prototype.js index 9a4b84e..c5dde5a 100644 --- a/Basic/Object/Object-prototype.js +++ b/Basic/Object/Object-prototype.js @@ -1,29 +1,29 @@ -function People() +function People() //創造一個People的物件 { - this.name = ""; - this.year = 0; + this.name = ""; //物件的name = "" + this.year = 0; //物件的year = 0 }; -People.prototype.setName = function(name) +People.prototype.setName = function(name) //在People的物件增加 setName 的function { - this.name = name; + this.name = name; //物件的name = name }; -People.prototype.getName = function() +People.prototype.getName = function() //在People的物件增加 getName 的function { - return this.name; + return this.name; //回傳物件的name }; -People.prototype.setYear = function(year) +People.prototype.setYear = function(year) //在People的物件增加 setYear 的function { - this.year = year; + this.year = year; //物件的year = year }; -People.prototype.getYear = function() +People.prototype.getYear = function() //在People的物件增加 getYear 的function { - return this.year; + return this.year; //回傳物件的year }; -var people = new People; -people.setName("kiss"); +var people = new People; //用people繼承People的物件 +people.setName("kiss"); people.setYear(5891); console.log("use function getName " + people.getName() ); console.log("use function getYear " + people.getYear() ); From ef8d6b7d9a5251c9e6d42451271afa34fcae3a60 Mon Sep 17 00:00:00 2001 From: "JHANG,JIA-HONG" Date: Mon, 18 Apr 2016 17:19:47 +0800 Subject: [PATCH 4/4] Update Object-this.js --- Basic/Object/Object-this.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Basic/Object/Object-this.js b/Basic/Object/Object-this.js index 7e589e0..a31d994 100644 --- a/Basic/Object/Object-this.js +++ b/Basic/Object/Object-this.js @@ -21,10 +21,10 @@ function object() }; -var o1 = new object; -var o2 = new object; -var o11 = o1; -console.log("o1 " + o1.rname() ); +var o1 = new object; //o1繼承 object +var o2 = new object; //o2繼承 object +var o11 = o1; //o11 等於 01 +console.log("o1 " + o1.rname() ); console.log("o1 " + o1.ryear() ); console.log("o2 " + o2.rname() );