Commit 33db3a3a authored by Juorder Gonzalez's avatar Juorder Gonzalez Committed by Juorder Antonio

enable again get config via parse rest api

parents 54886d17 dcbfebdd
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
"sass-loader": "3.2.0", "sass-loader": "3.2.0",
"style-loader": "0.13.1", "style-loader": "0.13.1",
"url-loader": "0.5.7", "url-loader": "0.5.7",
"webpack": "webpack/webpack#master" "webpack": "2.1.0-beta.6"
}, },
"scripts": { "scripts": {
"check": "eslint --ext \".jsx\" --ignore-pattern node_modules --quiet .", "check": "eslint --ext \".jsx\" --ignore-pattern node_modules --quiet .",
......
module.exports = {"main":{"js":"/451280bundle.js"}} module.exports = {"main":{"js":"/785572bundle.js"}}
\ No newline at end of file \ No newline at end of file
...@@ -46,14 +46,15 @@ const notFoundParams = { ...@@ -46,14 +46,15 @@ const notFoundParams = {
function preRenderSetup(callwhendone) { function preRenderSetup(callwhendone) {
const d1 = Client.getClientConfig( const d1 = Client.getClientConfig(
(data) => { (data) => {
const config = data.result || data;
if (!data) { if (!config) {
return; return;
} }
global.window.manager_config = data; global.window.manager_config = config;
if (data.debug) { if (config.debug) {
global.window.Client = Client; global.window.Client = Client;
global.window.Utils = Utils; global.window.Utils = Utils;
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
} }
.inmodal .color-line { .inmodal .color-line {
border-radius: 4px 4px 0 0; border-top-left-radius: 4px;
} }
.modal-content { .modal-content {
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
.new-fields-list { .new-fields-list {
.listed-field { .listed-field {
margin: 8px 0 0 10px; margin-left: 10px;
margin-top: 8px;
input { input {
margin-right: 5px; margin-right: 5px;
......
// eslint-disable // scss-lint:disable all
body { body {
&.stop-scrolling { &.stop-scrolling {
...@@ -698,3 +698,5 @@ body { ...@@ -698,3 +698,5 @@ body {
} }
@import 'loader_animation'; @import 'loader_animation';
// scss-lint:enable all
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
> li { > li {
> a { > a {
border-radius: 4px 0 0 4px; border-top-left-radius: 4px;
margin-right: -1px; margin-right: -1px;
} }
} }
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
> li { > li {
> a { > a {
border-radius: 0 4px 4px 0; border-bottom-right-radius: 4px;
margin-left: -1px; margin-left: -1px;
} }
} }
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
margin-top: -1px; margin-top: -1px;
> a { > a {
border-radius: 0 0 4px 4px; border-bottom-left-radius: 4px;
} }
} }
} }
...@@ -120,7 +120,8 @@ ...@@ -120,7 +120,8 @@
.tabs-left > .nav-tabs .active > a, .tabs-left > .nav-tabs .active > a,
.tabs-left > .nav-tabs .active > a:hover, .tabs-left > .nav-tabs .active > a:hover,
.tabs-left > .nav-tabs .active > a:focus { .tabs-left > .nav-tabs .active > a:focus {
border-color: $border-color transparent $border-color $border-color; border-color: $border-color;
border-right-color: transparent;
} }
.tabs-right > .nav-tabs > li > a:hover, .tabs-right > .nav-tabs > li > a:hover,
......
...@@ -75,8 +75,13 @@ function initZimbra() { ...@@ -75,8 +75,13 @@ function initZimbra() {
export function getClientConfig(success, error) { export function getClientConfig(success, error) {
return $.ajax({ return $.ajax({
url: '/config/config.json', url: 'https://manager-api.zboxapp.com/parse/functions/getConfigManager',
dataType: 'json', dataType: 'json',
method: 'POST',
headers: {
'X-Parse-Application-Id': 'salesZboxManagerApp'
},
data: {target: 'manager'},
success, success,
error: function onError(xhr, status, err) { error: function onError(xhr, status, err) {
var e = handleError('getClientConfig', err); var e = handleError('getClientConfig', err);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment