diff --git a/js/libs/provoda/FastEventor/requesting.js b/js/libs/provoda/FastEventor/requesting.js index 24b243f3a..1ba3f6f5f 100644 --- a/js/libs/provoda/FastEventor/requesting.js +++ b/js/libs/provoda/FastEventor/requesting.js @@ -1,6 +1,5 @@ define(function (require) { 'use strict'; -var morph_helpers = require('js/libs/morph_helpers'); var Promise = require('Promise'); var hex_md5 = require('hex_md5'); var hp = require('../helpers'); @@ -237,6 +236,7 @@ return { self.sputnik.nextTick(function() { var has_error = network_api.errors_fields ? findErrorByList(r, network_api.errors_fields) : network_api.checkResponse(r); if (!has_error) { + var morph_helpers = self.sputnik.morph_helpers; var result = parse.call(self.sputnik, r, null, morph_helpers); if (result) { return resolve(result) @@ -607,6 +607,7 @@ return { many_states[nesting_name + "$error"] = null; many_states[nesting_name + "$has_any"] = true; + var morph_helpers = sputnik.app.morph_helpers; var items = parse_items.call(sputnik, r, clean_obj, morph_helpers, network_api); var serv_data = typeof parse_serv == 'function' && parse_serv.call(sputnik, r, paging_opts, morph_helpers); diff --git a/js/libs/provoda/fetchData.js b/js/libs/provoda/fetchData.js index 6bf4f4b00..779ebda80 100644 --- a/js/libs/provoda/fetchData.js +++ b/js/libs/provoda/fetchData.js @@ -1,8 +1,8 @@ define(function (require) { 'use strict'; var pv = require('pv'); -var BrowseMap = require('js/libs/BrowseMap'); -var flatStruc = require('js/libs/provoda/structure/flatStruc'); +var BrowseMap = require('./provoda/BrowseMap'); +var flatStruc = require('./structure/flatStruc'); function fetchData(db, App, schema, url) { var proxies = new pv.views_proxies.Proxies(); diff --git a/js/libs/provoda/provoda/LoadableList.js b/js/libs/provoda/provoda/LoadableList.js index bdf4d6614..7c7493211 100644 --- a/js/libs/provoda/provoda/LoadableList.js +++ b/js/libs/provoda/provoda/LoadableList.js @@ -5,7 +5,7 @@ var spv = require('spv'); var pv = require('../provoda'); var cloneObj = spv.cloneObj -var initDeclaredNestings = require('js/libs/provoda/initDeclaredNestings'); +var initDeclaredNestings = require('../initDeclaredNestings'); var getSPByPathTemplateAndData = initDeclaredNestings.getSPByPathTemplateAndData; var pvUpdate = pv.update; diff --git a/js/libs/provoda/routePathByModels.js b/js/libs/provoda/routePathByModels.js index 8a353ec56..cb1bc417d 100644 --- a/js/libs/provoda/routePathByModels.js +++ b/js/libs/provoda/routePathByModels.js @@ -2,7 +2,6 @@ define(function (require) { 'use strict'; var spv = require('spv'); var cloneObj = spv.cloneObj; -var morph_helpers = require('js/libs/morph_helpers'); var getSPI = getterSPI(); var getSPIConstr = getterSPIConstr(); @@ -165,6 +164,8 @@ function getterSPI(){ var states = common_opts[0] || {}; var hbu_declr = item.getHead; + var morph_helpers = self.app.morph_helpers + var head_by_urlname = hbu_declr && hbu_declr(common_opts[1], null, morph_helpers); if (Constr.prototype.handling_v2_init) { diff --git a/js/seesu.js b/js/seesu.js index 672e2da07..3e96c4420 100644 --- a/js/seesu.js +++ b/js/seesu.js @@ -20,6 +20,8 @@ var initAPIs = require('./initAPIs'); var prepare = require('js/libs/provoda/structure/prepare'); var effects = require('./app/effects') var RootBwlevSeesu = require('./models/RootBwlevSeesu'); +var morph_helpers = require('js/libs/morph_helpers'); + var pvUpdate = pv.update; var updateNesting = require('pv/updateNesting'); @@ -705,6 +707,7 @@ var SeesuApp = spv.inh(AppModel, { } }, + morph_helpers: morph_helpers, }); return prepare(SeesuApp);