From 9ec0b49716cf79879e02118d513a997e895691f0 Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Wed, 2 Dec 2015 15:32:58 +0100 Subject: [PATCH] refactored some functin names within obs module --- index.js | 8 ++++---- test.js | 10 +++++----- ts/smartenv.environment.ts | 2 +- ts/smartenv.objectstorage.ts | 6 +++--- ts/test.js | 10 +++++----- ts/test.js.map | 2 +- ts/test.ts | 10 +++++----- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/index.js b/index.js index 102ee57..06fc198 100644 --- a/index.js +++ b/index.js @@ -60,7 +60,7 @@ var SmartenvEnvironment; plugins.beautylog.log("browser is " + this.getEnv().userAgent); } plugins.beautylog.log("the smartenv registration store currently holds the following properties:"); - console.log(Object.getOwnPropertyNames(smartenv.obs.getComplete())); + console.log(Object.getOwnPropertyNames(smartenv.obs.getAll())); }; SmartenvEnvironment.init = function (objectArg) { objectArg.getEnv = getEnv; @@ -73,7 +73,7 @@ var SmartenvObjectStorage; function init() { var obs = {}; var obsItems = {}; - obs.addItem = function (objectArg, paramName) { + obs.add = function (objectArg, paramName) { if (paramName === void 0) { paramName = "undefined"; } if (paramName == "undefined") { plugins.beautylog.error("paramName is undefined"); @@ -81,10 +81,10 @@ var SmartenvObjectStorage; } obsItems[paramName] = objectArg; }; - obs.getItem = function (keyName) { + obs.get = function (keyName) { return obsItems[keyName]; }; - obs.getComplete = function () { + obs.getAll = function () { return obsItems; }; obs.addComplete = function (itemsArg) { diff --git a/test.js b/test.js index 0579eb9..f51ecca 100644 --- a/test.js +++ b/test.js @@ -4,11 +4,11 @@ var beautylog = require("beautylog")("os"); beautylog.info("Now testing the smartenv module"); smartenv.printEnv(); beautylog.info("Now testing the smartenv module"); -smartenv.obs.addItem({ key1: "Peter" }, "docit"); +smartenv.obs.add({ key1: "Peter" }, "docit"); smartenv.printEnv(); -beautylog.log(smartenv.obs.getItem("docit").key1); -beautylog.log(smartenv.obs.getItem("docit").key1); +beautylog.log(smartenv.obs.get("docit").key1); +beautylog.log(smartenv.obs.get("docit").key1); var key2 = "hello"; -smartenv.obs.getItem("docit").key2 = key2; -beautylog.log(smartenv.obs.getItem("docit").key2); +smartenv.obs.get("docit").key2 = key2; +beautylog.log(smartenv.obs.get("docit").key2); beautylog.success("Success!"); diff --git a/ts/smartenv.environment.ts b/ts/smartenv.environment.ts index 9fb0a10..3de336f 100644 --- a/ts/smartenv.environment.ts +++ b/ts/smartenv.environment.ts @@ -39,7 +39,7 @@ module SmartenvEnvironment { plugins.beautylog.log("browser is " + this.getEnv().userAgent) } plugins.beautylog.log("the smartenv registration store currently holds the following properties:"); - console.log(Object.getOwnPropertyNames(smartenv.obs.getComplete())); + console.log(Object.getOwnPropertyNames(smartenv.obs.getAll())); } export var init = function(objectArg) { diff --git a/ts/smartenv.objectstorage.ts b/ts/smartenv.objectstorage.ts index 56940cf..3831b8b 100644 --- a/ts/smartenv.objectstorage.ts +++ b/ts/smartenv.objectstorage.ts @@ -3,17 +3,17 @@ module SmartenvObjectStorage { export function init() { var obs:any = {}; var obsItems:any = {}; - obs.addItem = function(objectArg,paramName = "undefined") { + obs.add = function(objectArg,paramName = "undefined") { if (paramName == "undefined"){ plugins.beautylog.error("paramName is undefined"); return; } obsItems[paramName] = objectArg; }; - obs.getItem = function(keyName) { + obs.get = function(keyName) { return obsItems[keyName]; }; - obs.getComplete = function () { + obs.getAll = function () { return obsItems; } diff --git a/ts/test.js b/ts/test.js index 6c4a54c..aa1eae1 100644 --- a/ts/test.js +++ b/ts/test.js @@ -4,12 +4,12 @@ var beautylog = require("beautylog")("os"); beautylog.info("Now testing the smartenv module"); smartenv.printEnv(); beautylog.info("Now testing the smartenv module"); -smartenv.obs.addItem({ key1: "Peter" }, "docit"); +smartenv.obs.add({ key1: "Peter" }, "docit"); smartenv.printEnv(); -beautylog.log(smartenv.obs.getItem("docit").key1); -beautylog.log(smartenv.obs.getItem("docit").key1); +beautylog.log(smartenv.obs.get("docit").key1); +beautylog.log(smartenv.obs.get("docit").key1); var key2 = "hello"; -smartenv.obs.getItem("docit").key2 = key2; -beautylog.log(smartenv.obs.getItem("docit").key2); +smartenv.obs.get("docit").key2 = key2; +beautylog.log(smartenv.obs.get("docit").key2); beautylog.success("Success!"); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/ts/test.js.map b/ts/test.js.map index 1fe94ee..d1ea3a2 100644 --- a/ts/test.js.map +++ b/ts/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,yCAAyC;AACzC,IAAI,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AACrC,IAAI,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC;AAC3C,SAAS,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;AAClD,QAAQ,CAAC,QAAQ,EAAE,CAAC;AACpB,SAAS,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;AAClD,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAC,IAAI,EAAC,OAAO,EAAC,EAAC,OAAO,CAAC,CAAC;AAC7C,QAAQ,CAAC,QAAQ,EAAE,CAAC;AACpB,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;AAClD,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;AAElD,IAAI,IAAI,GAAG,OAAO,CAAC;AACnB,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC;AAC1C,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;AAElD,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,yCAAyC;AACzC,IAAI,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AACrC,IAAI,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC;AAC3C,SAAS,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;AAClD,QAAQ,CAAC,QAAQ,EAAE,CAAC;AACpB,SAAS,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;AAClD,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAC,IAAI,EAAC,OAAO,EAAC,EAAC,OAAO,CAAC,CAAC;AACzC,QAAQ,CAAC,QAAQ,EAAE,CAAC;AACpB,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;AAC9C,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;AAE9C,IAAI,IAAI,GAAG,OAAO,CAAC;AACnB,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC;AACtC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;AAE9C,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC"} \ No newline at end of file diff --git a/ts/test.ts b/ts/test.ts index fa209bd..72e5de6 100644 --- a/ts/test.ts +++ b/ts/test.ts @@ -4,13 +4,13 @@ var beautylog = require("beautylog")("os"); beautylog.info("Now testing the smartenv module"); smartenv.printEnv(); beautylog.info("Now testing the smartenv module"); -smartenv.obs.addItem({key1:"Peter"},"docit"); +smartenv.obs.add({key1:"Peter"},"docit"); smartenv.printEnv(); -beautylog.log(smartenv.obs.getItem("docit").key1); -beautylog.log(smartenv.obs.getItem("docit").key1); +beautylog.log(smartenv.obs.get("docit").key1); +beautylog.log(smartenv.obs.get("docit").key1); var key2 = "hello"; -smartenv.obs.getItem("docit").key2 = key2; -beautylog.log(smartenv.obs.getItem("docit").key2); +smartenv.obs.get("docit").key2 = key2; +beautylog.log(smartenv.obs.get("docit").key2); beautylog.success("Success!"); \ No newline at end of file