Rename Object.inherit to Base.inherit

andrewdavey · Aug 24, 2012 · 20cb35c · 20cb35c
1 parent 17ec094
commit 20cb35c
Show file tree

Hide file tree

Showing 23 changed files with 31 additions and 34 deletions.
diff --git a/App/Client/AppFrame/AppFrame.js b/App/Client/AppFrame/AppFrame.js
@@ -2,7 +2,7 @@
 /// <reference path="~/Client/Shared/EventHub.js"/>
 /// <reference path="~/Client/Shared/FlashMessage.js"/>
 
-var AppFrame = Object.inherit({
+var AppFrame = Base.inherit({
 
     init: function (viewData) {
         this.links = viewData.links;

diff --git a/App/Client/Dashboard/DashboardViewModel.js b/App/Client/Dashboard/DashboardViewModel.js
@@ -4,7 +4,7 @@
 /// <reference path="../Profile/ProfileForm.js" />
 /// <reference path="../Vehicles/List/VehicleSummaryList.js" />
 
-var DashboardViewModel = Object.inherit({
+var DashboardViewModel = Base.inherit({
 
     templateId: "Client/Dashboard/dashboard.htm",
 

diff --git a/App/Client/Profile/ProfileForm.js b/App/Client/Profile/ProfileForm.js
@@ -3,7 +3,7 @@
 /// <reference path="~/Client/Shared/http.js"/>
 /// <reference path="~/Client/Shared/validation/objectWithValidateableProperties.js" />
 
-var ProfileForm = Object.inherit({
+var ProfileForm = Base.inherit({
 
     init: function (data) {
         this.http = http;

diff --git a/App/Client/Shared/Application.js b/App/Client/Shared/Application.js
@@ -7,7 +7,7 @@
 /// <reference path="../Vendor/jquery.js" />
 /// <reference path="../Vendor/knockout.js" />
 
-var Application = Object.inherit({
+var Application = Base.inherit({
     init: function() {
         this.viewModelStack = ViewModelStack.create(this, http);
         this.content = ko.observable({ templateId: "loading" });

diff --git a/App/Client/Shared/Event.js b/App/Client/Shared/Event.js
@@ -1,6 +1,6 @@
 /// <reference path="Object.js" />
 
-var Event = Object.inherit({
+var Event = Base.inherit({
 
     init: function () {
         this.handlers = [];

diff --git a/App/Client/Shared/EventHub.js b/App/Client/Shared/EventHub.js
@@ -1,4 +1,4 @@
-var EventHub = Object.inherit({
+var EventHub = Base.inherit({
     init: function () {
         this.handlers = { };
     },

diff --git a/App/Client/Shared/FlashMessage.js b/App/Client/Shared/FlashMessage.js
@@ -1,7 +1,7 @@
 /// <reference path="../Vendor/knockout.js" />
 /// <reference path="Object.js" />
 
-var FlashMessage = Object.inherit({
+var FlashMessage = Base.inherit({
 
     init: function () {
         this.message = ko.observable();

diff --git a/App/Client/Shared/IframeSubmission.js b/App/Client/Shared/IframeSubmission.js
@@ -1,4 +1,4 @@
-var IframeSubmission = Object.inherit({
+var IframeSubmission = Base.inherit({
 
     init: function (method, url, data, files, context) {
         this.files = files;

diff --git a/App/Client/Shared/Modal.js b/App/Client/Shared/Modal.js
@@ -4,7 +4,7 @@
 
 // Creating a Modal displays a modal dialog UI.
 // The contents are rendered from a template, which is data bound to a view model.
-var Modal = Object.inherit({
+var Modal = Base.inherit({
 
     init: function (viewModel, templateId) {
         this.viewModel = viewModel;

diff --git a/App/Client/Shared/Navigation.js b/App/Client/Shared/Navigation.js
@@ -1,7 +1,7 @@
 /// <reference path="../Vendor/knockout.js" />
 /// <reference path="Object.js" />
 
-var Navigation = Object.inherit({
+var Navigation = Base.inherit({
 
     init: function (app) {
         this.app = app;

diff --git a/App/Client/Shared/Object.js b/App/Client/Shared/Object.js
@@ -1,4 +1,6 @@
-(function () {
+var Base;
+
+(function () {
     "use strict";
 
     var copyOwnProperties = function (from, to) {
@@ -9,25 +11,20 @@
         }
     };
 
-    var inherit = function (additionalProperties) {
-        var subclass = Object.create(this);
+    Base = {};
+    Base.inherit = function (additionalProperties) {
+        var prototype = Object.create(this);
 
-        subclass.create = function () {
-            // When calling `MyClass.create()` directly, `this` will be `MyClass` as expected.
-            // When passing `MyClass.create` to another function we lose the intended `this` (it's probably set to `window` or null)
-            // so explicitly use the `subclass` in that case.
-            var prototype = (this && this !== window) ? this : subclass;
+        prototype.create = function () {
             var instance = Object.create(prototype);
             if (typeof instance.init === "function") {
                 instance.init.apply(instance, arguments);
             }
             return instance;
         };
 
-        copyOwnProperties(additionalProperties, subclass);
+        copyOwnProperties(additionalProperties, prototype);
 
-        return subclass;
+        return prototype;
     };
-
-    Object.inherit = inherit;
 } ());
diff --git a/App/Client/Shared/UrlStack.js b/App/Client/Shared/UrlStack.js
@@ -14,7 +14,7 @@
 // and update the stack to be:
 //     [ "/application", "/vehicles/masterpage", "/vehicle/456/reminders" ]
 
-var UrlStack = Object.inherit({
+var UrlStack = Base.inherit({
 
     init: function (download) {
         /// <param name="download">Function that downloads a URL and returns a deferred object representing the download.</param>

diff --git a/App/Client/Vehicles/Details/EditVehicleForm.js b/App/Client/Vehicles/Details/EditVehicleForm.js
@@ -4,7 +4,7 @@
 /// <reference path="~/Client/Shared/validation/objectWithValidateableProperties.js"/>
 /// <reference path="~/Client/Vendor/knockout.js"/>
 
-var EditVehicleForm = Object.inherit({
+var EditVehicleForm = Base.inherit({
 
     templateId: "Client/Vehicles/Details/EditVehicleForm.htm",
 

diff --git a/App/Client/Vehicles/Details/Vehicle.js b/App/Client/Vehicles/Details/Vehicle.js
@@ -4,7 +4,7 @@
 /// <reference path="~/Client/Shared/knockout-helpers.js"/>
 /// <reference path="EditVehicleForm.js" />
 
-var Vehicle = Object.inherit({
+var Vehicle = Base.inherit({
 
     init: function (viewData, app, eventHub, flashMessage) {
         this.app = app;

diff --git a/App/Client/Vehicles/FillUps/AddFillUpForm.js b/App/Client/Vehicles/FillUps/AddFillUpForm.js
@@ -6,7 +6,7 @@
 /// <reference path="~/Client/Shared/Modal.js" />
 /// <reference path="~/Client/Shared/Object.js"/>
 
-var AddFillUpForm = Object.inherit({
+var AddFillUpForm = Base.inherit({
 
     templateId: "Client/Vehicles/FillUps/AddFillUpForm.htm",
 

diff --git a/App/Client/Vehicles/FillUps/FillUp.js b/App/Client/Vehicles/FillUps/FillUp.js
@@ -1,7 +1,7 @@
 /// <reference path="~/Client/Vendor/moment.js"/>
 /// <reference path="~/Client/Shared/Object.js"/>
 
-var FillUp = Object.inherit({
+var FillUp = Base.inherit({
     init: function (data) {
         var units = ["gallon", "litre"];
         var currency = "$";

diff --git a/App/Client/Vehicles/FillUps/FillUpsPage.js b/App/Client/Vehicles/FillUps/FillUpsPage.js
@@ -3,7 +3,7 @@
 /// <reference path="FillUp.js"/>
 /// <reference path="AddFillUpForm.js" />
 
-var FillUpsPage = Object.inherit({
+var FillUpsPage = Base.inherit({
 
     templateId: "Client/Vehicles/FillUps/FillUpsPage.htm",
 

diff --git a/App/Client/Vehicles/List/VehicleSummary.js b/App/Client/Vehicles/List/VehicleSummary.js
@@ -2,7 +2,7 @@
 /// <reference path="~/Client/Shared/Object.js"/>
 /// <reference path="~/Client/Shared/knockout-helpers.js"/>
 
-var VehicleSummary = Object.inherit({
+var VehicleSummary = Base.inherit({
     init: function(data) {
         this.name = ko.observable(data.name);
         this.photo = ko.observable(data.photo ? data.photo.url : "");

diff --git a/App/Client/Vehicles/List/VehicleSummaryList.js b/App/Client/Vehicles/List/VehicleSummaryList.js
@@ -3,7 +3,7 @@
 /// <reference path="~/Client/Vendor/knockout.js"/>
 /// <reference path="VehicleSummary.js" />
 
-var VehicleSummaryList = Object.inherit({
+var VehicleSummaryList = Base.inherit({
 
     init: function (vehiclesLink, eventHub) {
         this.http = http;

diff --git a/App/Client/Vehicles/MasterPage/MasterPage.js b/App/Client/Vehicles/MasterPage/MasterPage.js
@@ -1,7 +1,7 @@
 /// <reference path="~/Client/Vendor/knockout.js"/>
 /// <reference path="../List/VehicleSummaryList.js" />
 
-var MasterPage = Object.inherit({
+var MasterPage = Base.inherit({
 
     init: function (viewData, eventHub) {
         this.vehicles = VehicleSummaryList.create(viewData.vehicles, eventHub);

diff --git a/App/Client/Vehicles/Reminders/AddReminderForm.js b/App/Client/Vehicles/Reminders/AddReminderForm.js
@@ -4,7 +4,7 @@
 /// <reference path="~/Client/Shared/validation/objectWithValidateableProperties.js"/>
 /// <reference path="~/Client/Shared/Modal.js" />
 
-var AddReminderForm = Object.inherit({
+var AddReminderForm = Base.inherit({
     init: function (viewData) {
         this.http = http;
         this.addCommand = viewData.add;

diff --git a/App/Client/Vehicles/Reminders/Reminder.js b/App/Client/Vehicles/Reminders/Reminder.js
@@ -3,7 +3,7 @@
 /// <reference path="~/Client/Vendor/moment.js"/>
 /// <reference path="AddReminderForm.js"/>
 
-var Reminder = Object.inherit({
+var Reminder = Base.inherit({
     init: function (data) {
         this.http = http;
         this.title = data.Title;

diff --git a/App/Client/Vehicles/Reminders/RemindersPage.js b/App/Client/Vehicles/Reminders/RemindersPage.js
@@ -4,7 +4,7 @@
 /// <reference path="Reminder.js"/>
 /// <reference path="AddReminderForm.js"/>
 
-var RemindersPage = Object.inherit({
+var RemindersPage = Base.inherit({
     init: function (viewData, flashMessage) {
         this.flashMessage = flashMessage;
         this.reminders = ko.observableArray(viewData.reminders.map(this.createReminderViewModel, this));