From 55ea68f8e78dcda0770b67239792b677502c0d60 Mon Sep 17 00:00:00 2001
From: Roger Meier <roger@apache.org>
Date: Wed, 16 Feb 2011 19:29:50 +0000
Subject: [PATCH] THRIFT-1044 Fix JavaScript Inheritance

Patch: Henrique Mendonca


git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1071370 13f79535-47bb-0310-9956-ffa450edef68
---
 lib/js/thrift.js | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/lib/js/thrift.js b/lib/js/thrift.js
index c06e27a0..3ce1f74c 100644
--- a/lib/js/thrift.js
+++ b/lib/js/thrift.js
@@ -42,9 +42,24 @@ var Thrift = {
         "CALL"      : 1,
         "REPLY"     : 2,
         "EXCEPTION" : 3
+    },
+    
+    objectLength : function(obj) {
+        var length = 0
+        for (k in obj)
+            if (obj.hasOwnProperty(k))
+              length++
+        return length
+    },
+
+    inherits : function(constructor, superConstructor) {
+      function F(){} //Prototypal Inheritance http://javascript.crockford.com/prototypal.html
+      F.prototype = superConstructor.prototype
+      constructor.prototype = new F()
     }
 }
 
+
 Thrift.TException = {}
 Thrift.TException.prototype = { 
     initialize: function( message, code ) {
@@ -712,21 +727,3 @@ Thrift.Protocol.prototype = {
     }
    
 }
-
-Thrift.objectLength = function(obj) {
-  var length = 0;
-  for (k in obj) {
-    if (obj.hasOwnProperty(k)) {
-      length++;
-    }
-  }
-  return length;
-}
-
-Thirft.inherits = function(constructor, superConstructor) {
-  // Prototypal Inheritance
-  // http://javascript.crockford.com/prototypal.html
-  function F() {}
-  F.prototype = superConstructor.prototype;
-  constructor.prototype = new F();
-}
-- 
2.17.1