From 5c72276b5ef2254d279c43d35642648d276544b9 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 25 Feb 2016 18:06:41 +0300 Subject: [PATCH] cotacts now in client config --- src/client/config.js | 12 ++++++++++++ src/client/controllers/ContactsController.js | 10 ++++++---- src/client/data.js | 10 ---------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/client/config.js b/src/client/config.js index f7857f9a..73463d7a 100644 --- a/src/client/config.js +++ b/src/client/config.js @@ -1,3 +1,15 @@ +import {stringReplace} from '../utils/string'; + +const nbsp = 0xA0; + +export let contacts = { + telephone: '+7 (81362) 76-312', + email: 'hudozka@gmail.com', + address: ['г. Шлиссельбург', 'ул. 18 января', 'д. 3'] + .map(stringReplace(' ', String.fromCharCode(nbsp))) + .join(' ') +}; + export let collectiveSortPattern = [ 'mg-timasheva', 'va-sarzhin', diff --git a/src/client/controllers/ContactsController.js b/src/client/controllers/ContactsController.js index bd2351ad..98b57dc8 100644 --- a/src/client/controllers/ContactsController.js +++ b/src/client/controllers/ContactsController.js @@ -1,7 +1,9 @@ +import {contacts} from '../config'; + export default function (app) { - app.controller('ContactsController', ($scope, config) => { - $scope.address = config.address; - $scope.telephone = config.telephone; - $scope.email = config.email; + app.controller('ContactsController', $scope => { + $scope.address = contacts.address; + $scope.telephone = contacts.telephone; + $scope.email = contacts.email; }); }; diff --git a/src/client/data.js b/src/client/data.js index 78038c7c..8ee3adc6 100644 --- a/src/client/data.js +++ b/src/client/data.js @@ -8,14 +8,4 @@ angular.module("hudozhka.data", []) }) .service("docs", function () { return require("../models/document"); - }) - .service("config", function(){ - return { - telephone: "+7 (81362) 76-312", - email: "hudozka@gmail.com", - address: ["г. Шлиссельбург", "ул. 18 января", "д. 3"] - .reduce(function(address, item){ - return address + (address == '' ? '' : ' ') + item.replace(' ', String.fromCharCode(0xA0)); - }, '') - }; }); \ No newline at end of file