@bbn/bbn 1.0.24 → 1.0.26

package/dist/fn/_addLoader.js

@@ -28,7 +28,7 @@ const _addLoader = function (requestId, prom, source) {
     while (idx && (bbn.env.loadersHistory.length > bbn.env.maxLoadersHistory)) {
         idx--;
         // Not removing the ones still loading
-        if (!bbn.env.loadersHistory.loading) {
+        if (!bbn.env.loading) {
             bbn.env.loadersHistory.splice(idx, 1);
         }
     }

package/dist/fn/_deleteLoader.d.ts

@@ -1,2 +1,2 @@
-declare const _deleteLoader: (requestId: any, res: any, isAbort: any) => boolean;
+declare const _deleteLoader: (requestId: string, res?: any, isAbort?: boolean) => boolean;
 export { _deleteLoader };

package/dist/fn/_deleteLoader.js

@@ -1,14 +1,14 @@
 import { search } from './search';
 import { getRow } from './getRow';
 import { isObject } from './isObject';
-const _deleteLoader = function (requestId, res, isAbort) {
+const _deleteLoader = function (requestId, res = null, isAbort = false) {
     let idx = search(bbn.env.loaders, { key: requestId });
     if (idx > -1) {
         let loader = bbn.env.loaders.splice(idx, 1)[0];
         let history = getRow(bbn.env.loadersHistory, { key: requestId, start: loader.start });
         if (history) {
             history.loading = false;
-            history.duration = (new Date()).getTime() - loader.start;
+            history.duration = new Date().getTime() - loader.start;
             if (typeof res === 'string') {
                 history.errorMessage = res;
                 history.error = !isAbort;

package/dist/fn/abort.js

@@ -6,9 +6,9 @@ const abort = function (requestId) {
         loader.source.cancel('Operation canceled by the user.');
     }
     /*
-    else {
-      throw new Error("Impossible to find the loader " + requestId);
-    }
-    */
+      else {
+        throw new Error("Impossible to find the loader " + requestId);
+      }
+      */
 };
 export { abort };

package/dist/fn/abortURL.js

@@ -1,12 +1,12 @@
 import { each } from './each';
 import { filter } from './filter';
 const abortURL = function (url) {
-    each(filter(bbn.env.loaders, { url: url }), a => {
+    each(filter(bbn.env.loaders, { url: url }), (a) => {
         if (a && a.source) {
             a.source.cancel('Operation canceled by the user.');
         }
         else {
-            throw new Error("Impossible to find the loader with URL " + url);
+            throw new Error('Impossible to find the loader with URL ' + url);
         }
     });
 };

package/dist/fn/addColors.d.ts

@@ -1,2 +1,2 @@
-declare const addColors: (colors: any) => void;
+declare const addColors: (colors: object) => void;
 export { addColors };

package/dist/fn/addColors.js

@@ -1,10 +1,9 @@
 import { numProperties } from './numProperties';
 import { iterate } from './iterate';
 const addColors = function (colors) {
-    let st = '';
     if (numProperties(colors)) {
-        if (!bbn.var.colors) {
-            bbn.var.colors = {};
+        if (!bbn.vars.colors) {
+            bbn.vars.colors = {};
         }
         let element = document.createElement('style');
         document.head.appendChild(element);
@@ -12,10 +11,28 @@ const addColors = function (colors) {
         // Append style element to head
         let i = 0;
         iterate(colors, (v, n) => {
-            bbn.var.colors[n] = v;
+            bbn.vars.colors[n] = v;
             sheet.insertRule('.bbn-' + n + ', .bbn-color-text-' + n + ' {color: ' + v + ' !important;}', i);
-            sheet.insertRule('svg.bbn-' + n + ', .bbn-' + n + ' svg, svg.bbn-color-text-' + n + ', .bbn-color-text-' + n + ' svg {fill: ' + v + ';}', i);
-            sheet.insertRule('.bbn-bg-' + n + ', .bbn-color-bg-' + n + ', .bbn-color-background-' + n + ' {background-color: ' + v + ' !important;}', i);
+            sheet.insertRule('svg.bbn-' +
+                n +
+                ', .bbn-' +
+                n +
+                ' svg, svg.bbn-color-text-' +
+                n +
+                ', .bbn-color-text-' +
+                n +
+                ' svg {fill: ' +
+                v +
+                ';}', i);
+            sheet.insertRule('.bbn-bg-' +
+                n +
+                ', .bbn-color-bg-' +
+                n +
+                ', .bbn-color-background-' +
+                n +
+                ' {background-color: ' +
+                v +
+                ' !important;}', i);
             sheet.insertRule('.bbn-border-' + n + ', .bbn-color-border-' + n + ' {border-color: ' + v + ' !important;}', i);
             sheet.insertRule('.bbn-color-' + n + ' {border-color: ' + v + '; background-color: ' + v + '; color: ' + v + ';}', i);
         });

package/dist/fn/addInputs.d.ts

@@ -1,3 +1,2 @@
-import { addInputs } from './addInputs';
-declare const addInputs: (form: any, params: any, prefix: any) => void;
+declare const addInputs: (form: HTMLFormElement, params?: object, prefix?: string) => void;
 export { addInputs };

package/dist/fn/addInputs.js

@@ -1,6 +1,6 @@
 import { iterate } from './iterate';
-const addInputs = function (form, params, prefix) {
-    if (form && (form.tagName === 'FORM')) {
+const addInputs = function (form, params = null, prefix = '') {
+    if (form && form.tagName === 'FORM') {
         let appendToForm = (name, val) => {
             let input = document.createElement('input');
             input.setAttribute('type', 'hidden');
@@ -14,7 +14,7 @@ const addInputs = function (form, params, prefix) {
             iterate(params, (param, key) => {
                 let name = prefix ? `${prefix}[${key}]` : key;
                 if (param instanceof Date) {
-                    appendToForm(form, name, param.toISOString());
+                    appendToForm(name, param.toISOString());
                 }
                 else if (param instanceof Array) {
                     param.forEach((e, i) => {
@@ -27,8 +27,7 @@ const addInputs = function (form, params, prefix) {
                         }
                     });
                 }
-                else if ((typeof param === 'object') &&
-                    !(param instanceof File)) {
+                else if (typeof param === 'object' && !(param instanceof File)) {
                     addInputs(form, param, name);
                 }
                 else {

package/dist/fn/adjustHeight.js

@@ -2,7 +2,7 @@ import { isIterable } from './isIterable';
 import { adjustSize } from './adjustSize';
 const adjustHeight = function () {
     let args = arguments;
-    if ((args.length === 1) && isIterable(args[0])) {
+    if (args.length === 1 && isIterable(args[0])) {
         args = args[0];
     }
     return adjustSize('height', args);

package/dist/fn/adjustSize.js

@@ -5,7 +5,7 @@ const adjustSize = function (type, eles) {
         el.style[type] = 'auto';
     });
     each(eles, (el, i) => {
-        let rect = el.getBoundingClientRect(), s = rect[type] % 1 ? (rect[type] - (rect[type] % 1) + 1) : rect[type];
+        let rect = el.getBoundingClientRect(), s = rect[type] % 1 ? rect[type] - (rect[type] % 1) + 1 : rect[type];
         //s = rect[type];
         if (s > max) {
             max = s;

package/dist/fn/adjustWidth.js

@@ -2,7 +2,7 @@ import { isIterable } from './isIterable';
 import { adjustSize } from './adjustSize';
 const adjustWidth = function () {
     let args = arguments;
-    if ((args.length === 1) && isIterable(args[0])) {
+    if (args.length === 1 && isIterable(args[0])) {
         args = args[0];
     }
     return adjustSize('width', args);

package/dist/fn/ajax.d.ts

@@ -1,2 +1,2 @@
-declare const ajax: (url: any, datatype: any, data: any, success: any, failure: any, abort: any) => any;
+declare const ajax: (url: any, datatype: string, data: any, success?: (data: object, headers?: object) => any, failure?: (url: string, o?: object) => any, abort?: (message: string, url: string) => any) => any;
 export { ajax };

package/dist/fn/ajax.js

@@ -12,7 +12,7 @@ import { defaultAjaxAbortFunction } from './defaultAjaxAbortFunction';
 import { _addLoader } from './_addLoader';
 import { defaultStartLoadingFunction } from './defaultStartLoadingFunction';
 const ajax = function (url, datatype, data, success, failure, abort) {
-    if ((arguments.length === 1) && isObject(url) && url.url) {
+    if (arguments.length === 1 && url && typeof url === 'object' && url.url) {
         if (url.abort) {
             abort = url.abort;
         }
@@ -33,10 +33,10 @@ const ajax = function (url, datatype, data, success, failure, abort) {
     if (!url) {
         return;
     }
-    if (url) {
+    if (url && typeof url === 'string') {
         if (url.indexOf('://') === -1) {
             // Prevent protocol mismatch by Axios
-            url = replaceAll("//", "/", url);
+            url = replaceAll('//', '/', url);
         }
         if (!datatype) {
             datatype = 'json';
@@ -54,20 +54,21 @@ const ajax = function (url, datatype, data, success, failure, abort) {
         let source = cancelToken.source();
         let options = {
             responseType: datatype,
-            cancelToken: source.token
+            cancelToken: source.token,
         };
         if (datatype === 'text') {
             options.headers = {
                 accept: 'text/javascript',
-                'Content-Type': 'text/javascript'
+                'Content-Type': 'text/javascript',
             };
         }
         let args = [url];
-        if (isObject(data) && (numProperties(data) > 0)) {
+        if (isObject(data) && numProperties(data) > 0) {
             args.push(data);
         }
         args.push(options);
-        let loader = axios[args.length === 2 ? 'get' : 'post'].apply(axios, args)
+        let loader = axios[args.length === 2 ? 'get' : 'post']
+            .apply(axios, args)
             .then((res) => {
             _deleteLoader(requestId, res);
             defaultEndLoadingFunction(url, tst, data, res);

package/dist/fn/analyzeFunction.js

@@ -17,7 +17,7 @@ const analyzeFunction = function (fn) {
     let isEscaped = false;
     let settingDefault = false;
     for (let i = 0; i < all.length; i++) {
-        if ((all[i] === currentQuote) && !isEscaped && currentQuote) {
+        if (all[i] === currentQuote && !isEscaped && currentQuote) {
             currentQuote = '';
             exp += all[i];
         }
@@ -59,7 +59,7 @@ const analyzeFunction = function (fn) {
         }
         else if (all[i] === '=') {
             if (functionString.substr(i, 2) === '=>') {
-                if (exp.trim() !== "" && parOpened === parClosed) {
+                if (exp.trim() !== '' && parOpened === parClosed) {
                     currentArg.name = exp.trim();
                     args.push(currentArg);
                     currentArg = {};
@@ -122,10 +122,10 @@ const analyzeFunction = function (fn) {
             body = exp;
         }
         else {
-            throw Error("Unexpected end of function while parsing function");
+            throw Error('Unexpected end of function while parsing function');
         }
     }
-    const argString = args.map(arg => arg.name + (arg.default ? ' = ' + arg.default : '')).join(', ');
+    const argString = args.map((arg) => arg.name + (arg.default ? ' = ' + arg.default : '')).join(', ');
     const hash = md5(body + (name ? '-' + name : '') + (argString ? '-' + argString : ''));
     return {
         body,
@@ -135,7 +135,7 @@ const analyzeFunction = function (fn) {
         hasFunction,
         name,
         isAsync,
-        hash
+        hash,
     };
 };
 export { analyzeFunction };

package/dist/fn/animateCss.js

@@ -1,19 +1,20 @@
 const animateCss = function (ele, animationName, callback) {
     let animationEnd = 'webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend';
     /*$(ele).addClass('animated ' + animationName).one(animationEnd, function(){
-      if ( typeof callback == 'function' ){ // make sure the callback is a function
-        callback.call(this); // brings the scope to the callback
-      }
-      $(this).removeClass('animated ' + animationName);
-    })*/
+        if ( typeof callback == 'function' ){ // make sure the callback is a function
+          callback.call(this); // brings the scope to the callback
+        }
+        $(this).removeClass('animated ' + animationName);
+      })*/
     ele.classList.add('animated');
     ele.classList.add(animationName);
     ele.addEventListener(animationEnd, (e) => {
         e.target.removeEventListener(e.type, arguments.callee);
-        if (typeof callback == 'function') { // make sure the callback is a function          
+        if (typeof callback == 'function') {
+            // make sure the callback is a function
             callback.call(this); // brings the scope to the callback
         }
-        this.classList.remove(animation);
+        this.classList.remove(animationName);
     });
 };
 export { animateCss };

package/dist/fn/baseName.d.ts

@@ -1,2 +1,2 @@
-declare const baseName: (path: any, suffix: any) => any;
+declare const baseName: (path: string, suffix?: string) => string;
 export { baseName };

package/dist/fn/baseName.js

@@ -2,7 +2,7 @@ import { isString } from './isString';
 import { substr } from './substr';
 const baseName = function (path, suffix) {
     if (path && isString(path)) {
-        let bits = path.split("/");
+        let bits = path.split('/');
         let res = bits.pop();
         if (!suffix) {
             return res;

package/dist/fn/br2nl.d.ts

@@ -1,2 +1,2 @@
-declare const br2nl: (st: any) => any;
+declare const br2nl: (st: any) => string;
 export { br2nl };

package/dist/fn/br2nl.js

@@ -1,5 +1,5 @@
 import { replaceAll } from './replaceAll';
 const br2nl = function (st) {
-    return replaceAll("<br />", "\n", replaceAll("<br/>", "\n", replaceAll("<br>", "\n", st)));
+    return replaceAll('<br />', '\n', replaceAll('<br/>', '\n', replaceAll('<br>', '\n', st)));
 };
 export { br2nl };

package/dist/fn/calendar.js

@@ -16,7 +16,7 @@ const calendar = function (d, wrong_result) {
         nextWeek: 'ddd D',
         lastDay: '[' + bbn._('Yesterday') + ']',
         lastWeek: 'ddd D',
-        sameElse: 'L'
+        sameElse: 'L',
     });
 };
 export { calendar };

package/dist/fn/callback.d.ts

@@ -1,2 +1,2 @@
-declare const callback: (url: any, res: any, fn: any, fn2: any, ele: any) => boolean;
+declare const callback: (url: string, res?: BbnAjaxResult, fn?: (a: BbnAjaxResult, b?: HTMLElement) => any, fn2?: (a: BbnAjaxResult) => any, ele?: HTMLElement | HTMLInputElement | HTMLTextAreaElement) => boolean;
 export { callback };

package/dist/fn/callback.js

@@ -4,7 +4,7 @@ import { isFunction } from './isFunction';
 import { log } from './log';
 import { defaultPostLinkFunction } from './defaultPostLinkFunction';
 import { defaultAlertFunction } from './defaultAlertFunction';
-const callback = function (url, res, fn, fn2, ele) {
+const callback = function (url, res = null, fn = null, fn2 = null, ele = null) {
     let tmp = false;
     if (res) {
         tmp = true;
@@ -31,16 +31,16 @@ const callback = function (url, res, fn, fn2, ele) {
             tmp = defaultLinkFunction(res, ele);
         }
         if (ele && isObj && (res.content !== undefined)) {
-            if (ele.is("input,textarea")) {
-                ele.val(res.content);
+            if ('value' in ele) {
+                ele.value = res.content;
             }
             else {
                 ele.innerHTML = res.content;
             }
         }
         if (tmp && isObj && res.script) {
-            if (isFunction(res.script)) {
-                tmp = res.script(res.data ? res.data : {}, ele ? ele : false);
+            if (typeof (res.script) === 'function') {
+                tmp = res.script(res.data ? res.data : {}, ele || null);
             }
             else {
                 tmp = ((data, ele) => {

package/dist/fn/camelToCss.js

@@ -1,7 +1,9 @@
 const camelToCss = function (str) {
-    return str.replace(/([A-Z])/g, function (st) {
+    return str
+        .replace(/([A-Z])/g, function (st) {
         return '-' + st.toLowerCase();
-    }).replace('/^./', function (st) {
+    })
+        .replace('/^./', function (st) {
         return st.toLowerCase();
     });
 };

package/dist/fn/canvasToImage.js

@@ -1,6 +1,6 @@
 const canvasToImage = function (canvas) {
     let img = new Image();
-    img.src = canvas.toDataURL("image/png");
+    img.src = canvas.toDataURL('image/png');
     return img;
 };
 export { canvasToImage };

package/dist/fn/center.js

@@ -1,4 +1,3 @@
-import { log } from './log';
 const center = function (ele) {
     //ele = $(ele);
     let parent = ele.parentNode, 
@@ -14,13 +13,12 @@ const center = function (ele) {
         w = parent.clientWidth;
         h = parent.clientHeight;
     }
-    log("BBN_CENTER", w, h);
     //ele.css("position","absolute");
-    ele.style.position = "absolute";
+    ele.style.position = 'absolute';
     //ele.css("top", Math.max(0, ((h - ele.outerHeight()) / 2) + parent.scrollTop()) + "px");
-    ele.style.top = Math.max(0, ((h - ele.offsetHeight) / 2) + parent.scrollTop) + "px";
+    ele.style.top = Math.max(0, (h - ele.offsetHeight) / 2 + parent.scrollTop) + 'px';
     //ele.css("left", Math.max(0, ((w - ele.outerWidth()) / 2) + parent.scrollLeft()) + "px");
-    ele.style.left = Math.max(0, ((h - ele.offsetWidth) / 2) + parent.scrollLeft) + "px";
+    ele.style.left = Math.max(0, (h - ele.offsetWidth) / 2 + parent.scrollLeft) + 'px';
     return ele;
 };
 export { center };

package/dist/fn/checkProps.d.ts

@@ -1,2 +1,2 @@
-declare const checkProps: (obj: any, props: any, checkEmpty: any) => boolean;
+declare const checkProps: (obj: object, props: string | string[], checkEmpty?: boolean) => boolean;
 export { checkProps };

package/dist/fn/checkProps.js

@@ -1,5 +1,5 @@
 import { checkPropsDetails } from './checkPropsDetails';
-const checkProps = function (obj, props, checkEmpty) {
+const checkProps = function (obj, props, checkEmpty = false) {
     return checkPropsDetails(obj, props, checkEmpty).result;
 };
 export { checkProps };

package/dist/fn/checkPropsDetails.d.ts

@@ -1,5 +1,2 @@
-declare const checkPropsDetails: (obj: any, props: any, checkEmpty: any) => {
-    error: boolean;
-    result: boolean;
-};
+declare const checkPropsDetails: (obj: object, props: string | string[], checkEmpty?: boolean) => BbnResError;
 export { checkPropsDetails };

package/dist/fn/checkPropsDetails.js

@@ -1,42 +1,41 @@
-import { isString } from './isString';
 import { isArray } from './isArray';
 import { isObject } from './isObject';
 import { each } from './each';
 import { substr } from './substr';
-const checkPropsDetails = function (obj, props, checkEmpty) {
+const checkPropsDetails = function (obj, props, checkEmpty = false) {
     let res = {
         error: false,
-        result: true
+        result: true,
     };
-    if (isString(props)) {
+    if (typeof (props) === 'string') {
         props = [props];
     }
     if (!isArray(props)) {
-        res.error = bbn._("checkProps must receive a string or an array as props argument");
+        res.error = bbn._('checkProps must receive a string or an array as props argument');
     }
     if (!isObject(obj)) {
-        res.error = bbn._("checkProps must receive an object as obj argument");
+        res.error = bbn._('checkProps must receive an object as obj argument');
     }
     if (!res.error) {
         let check;
-        each(props, varName => {
+        each(props, (varName) => {
             varName = varName.trim().split(':');
             let type = varName[1] || false;
             varName = varName[0];
             if (obj[varName] === undefined) {
-                res.error = varName + ' ' + bbn._("is not defined");
+                res.error = varName + ' ' + bbn._('is not defined');
             }
             else if (type) {
                 check = 'is' + substr(type, 0, 1).toUpperCase() + substr(type, 1).toLowerCase();
                 if (bbn.fn[check] === undefined) {
-                    res.error = type + ' ' + bbn._("is not a valid type");
+                    res.error = type + ' ' + bbn._('is not a valid type');
                 }
                 else if (!bbn.fn[check](obj[varName])) {
-                    res.error = varName + ' ' + bbn._("is not a") + ' ' + type;
+                    res.error = varName + ' ' + bbn._('is not a') + ' ' + type;
                 }
             }
             else if (checkEmpty && !obj[varName]) {
-                res.error = varName + ' ' + bbn._("is empty");
+                res.error = varName + ' ' + bbn._('is empty');
             }
             if (res.error) {
                 return false;

package/dist/fn/checkPropsOrDie.d.ts

@@ -1,2 +1,2 @@
-declare const checkPropsOrDie: (obj: any, props: any, checkEmpty: any) => boolean;
+declare const checkPropsOrDie: (obj: object, props: string | string[], checkEmpty?: boolean) => boolean;
 export { checkPropsOrDie };

package/dist/fn/checkPropsOrDie.js

@@ -1,5 +1,5 @@
 import { checkPropsDetails } from './checkPropsDetails';
-const checkPropsOrDie = function (obj, props, checkEmpty) {
+const checkPropsOrDie = function (obj, props, checkEmpty = false) {
     let res = checkPropsDetails(obj, props, checkEmpty);
     if (res.error) {
         throw new Error(res.error);

package/dist/fn/checkType.d.ts

@@ -1,2 +1,2 @@
-declare const checkType: (value: any, type: any, msg: any, ...logs: any[]) => void;
+declare const checkType: (value: any, type: object | string, msg?: string, ...logs: any[]) => void;
 export { checkType };

package/dist/fn/checkType.js

@@ -11,7 +11,7 @@ const checkType = function (value, type, msg, ...logs) {
         type = [type];
     }
     const typesList = [];
-    each(type, t => {
+    each(type, (t) => {
         var _a;
         if (t === String) {
             t = 'string';
@@ -50,11 +50,11 @@ const checkType = function (value, type, msg, ...logs) {
         }
     });
     if (!ok) {
-        log(["Value given", value, "type", typeof value, "expected", typesList.join(' or ')]);
+        log(['Value given', value, 'type', typeof value, 'expected', typesList.join(' or ')]);
         if (logs.length) {
             log(logs);
         }
-        throw new Error((msg ? msg + ' - ' : '') + bbn._("The value should be a %s", typesList.join(' ' + bbn._("or a") + ' ')));
+        throw new Error((msg ? msg + ' - ' : '') + bbn._('The value should be a %s', typesList.join(' ' + bbn._('or a') + ' ')));
     }
 };
 export { checkType };

package/dist/fn/chrono.d.ts

@@ -0,0 +1,3 @@
+declare const startChrono: (name: any) => void;
+declare const stopChrono: (name: any) => number;
+export { startChrono, stopChrono };

package/dist/fn/chrono.js

@@ -0,0 +1,23 @@
+import { each } from './each';
+const _private = [];
+const startChrono = function (name) {
+    let now = new Date().getTime();
+    let h1 = 3600 * 1000;
+    if (_private.length) {
+        each(_private, (t, n) => {
+            if (now - t > h1) {
+                delete _private[n];
+            }
+        });
+        now = new Date().getTime();
+    }
+    _private[name] = now;
+};
+const stopChrono = function (name) {
+    if (_private[name]) {
+        let now = new Date().getTime();
+        let diff = now - _private[name];
+        return diff;
+    }
+};
+export { startChrono, stopChrono };

package/dist/fn/circularReplacer.js

@@ -4,7 +4,7 @@ import { log } from './log';
 const circularReplacer = function () {
     const visited = new WeakSet();
     return (key, value) => {
-        if ((typeof value === "object") && (value !== null)) {
+        if (typeof value === 'object' && value !== null) {
             if (visited.has(value)) {
                 return;
             }
@@ -19,7 +19,7 @@ const circularReplacer = function () {
                     }
                 }
                 else if (isCp(value)) {
-                    log("IS CP");
+                    log('IS CP');
                     value = '__BBN_CP__' + value.$options.name + '/' + value.$cid;
                 }
                 else {

package/dist/fn/clone.d.ts

@@ -1,3 +1,2 @@
-import { clone } from './clone';
 declare const clone: (obj: any) => any;
 export { clone };

package/dist/fn/clone.js

@@ -4,7 +4,7 @@ import { extend } from './extend';
 const clone = function (obj) {
     if (isArray(obj)) {
         return obj.slice().map((a) => {
-            return typeof (a) === 'object' ? clone(a) : a;
+            return typeof a === 'object' ? clone(a) : a;
         });
     }
     if (isObject(obj)) {

package/dist/fn/colorToHex.js

@@ -1,5 +1,5 @@
 const colorToHex = function (color) {
-    let canvas = document.createElement("canvas").getContext("2d");
+    let canvas = document.createElement('canvas').getContext('2d');
     canvas.fillStyle = color;
     return canvas.fillStyle;
 };