gina 0.1.6-alpha.89 → 0.1.6-alpha.90

package/framework/v0.1.6-alpha.90/VERSION

@@ -0,0 +1 @@
+0.1.6-alpha.90

package/framework/v0.1.6-alpha.90/core/asset/plugin/dist/vendor/gina/css/gina.min.css.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.90/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}

package/framework/{v0.1.6-alpha.89 → v0.1.6-alpha.90}/core/asset/plugin/dist/vendor/gina/js/gina.js

@@ -3109,7 +3109,7 @@ function handleXhr(xhr, $el, options, require) {
                         var url = window.URL.createObjectURL(blob);
                         a.href = url;
                         var contentDisposition = xhr.getResponseHeader('Content-Disposition');
-                        a.download = contentDisposition.match('\=(.*)')[0].substr(1);
+                        a.download = contentDisposition.match('\=(.*)')[0].substring(1);
                         //programatically click the link to trigger the download
                         a.click();
                         //release the reference to the file by revoking the Object URL
@@ -4796,7 +4796,7 @@ function Collection(content, options) {
 
                 field = arr[1];
                 if (/^\./.test(field) )
-                    field = field.substr(1);
+                    field = field.substring(1);
 
                 var subMatched = 0;
                 if (collection) {
@@ -6535,7 +6535,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             //instance: self.serverInstance,
             //template: (routeHasViews) ? conf.content.templates[templateName] : undefined,
             //isUsingTemplate: local.isUsingTemplate,
-            cacheless: conf.cacheless //,
+            isCacheless: conf.isCacheless //,
             //path: params.param.path || null, // user custom path : namespace should be ignored | left blank
             //assets: {}
         };
@@ -7990,13 +7990,13 @@ function Routing() {
                         ++score;
                         continue;
                     }
-                    let _key = uRo[p].substr(1);
+                    let _key = uRo[p].substring(1);
                     if ( typeof(params.requirements[_key]) == 'undefined' ) {
                         continue;
                     }
                     let condition = params.requirements[_key];
                     if ( /^\//.test(condition) ) {
-                        condition = condition.substr(1, condition.lastIndexOf('/')-1);
+                        condition = condition.substring(1, condition.lastIndexOf('/')-1);
                     } else if ( /^validator\:\:/.test(condition) && await fitsWithRequirements(uRo[p], uRe[p], params, request, response, next) ) {
                         ++score;
                         continue;
@@ -8007,7 +8007,7 @@ function Routing() {
                         && new RegExp(condition).test(uRe[p])
                     ) {
                         ++score;
-                        request[method][uRo[p].substr(1)] = uRe[p];
+                        request[method][uRo[p].substring(1)] = uRe[p];
                     }
                 }
                 hasAlreadyBeenScored = true;
@@ -8285,7 +8285,7 @@ function Routing() {
                 request[requestMethod] = {}
             }
 
-            key     = _param[matched].substr(1);
+            key     = _param[matched].substring(1);
             // escaping `\` characters
             // TODO - remove comment : all regex requirement must start with `/`
             //regex   = ( /\\/.test(params.requirements[key]) ) ? params.requirements[key].replace(/\\/, '') : params.requirements[key];
@@ -8387,7 +8387,7 @@ function Routing() {
                 } else if (c > (tplUrl.indexOf(keys[0]) + keys[0].length)) {
 
                     regex = params.requirements[keys[0]];
-                    urlVal = strVal.substr(0, strVal.length);
+                    urlVal = strVal.substring(0, strVal.length);
 
                     if (/^\//.test(regex)) {
                         re      = regex.match(/\/(.*)\//).pop();
@@ -8424,7 +8424,7 @@ function Routing() {
                     }
 
                     if (tested) {
-                        values[keys[0].substr(1)] = urlVal
+                        values[keys[0].substring(1)] = urlVal
                     } else {
                         return false
                     }
@@ -8443,7 +8443,7 @@ function Routing() {
                 if (c == posLen - 1) {
 
                     regex = params.requirements[keys[0]];
-                    urlVal = strVal.substr(0, strVal.length);
+                    urlVal = strVal.substring(0, strVal.length);
 
                     if (/^\//.test(regex)) {
                         re = regex.match(/\/(.*)\//).pop();
@@ -8456,7 +8456,7 @@ function Routing() {
                     }
 
                     if (tested) {
-                        values[keys[0].substr(1)] = urlVal
+                        values[keys[0].substring(1)] = urlVal
                     } else {
                         return false
                     }
@@ -8492,7 +8492,7 @@ function Routing() {
             if ( typeof(params) != 'undefined' && typeof(params[p]) == 'undefined' ) continue;
 
             if ( /^:/.test(route.param[p]) ) {
-                variable = route.param[p].substr(1);
+                variable = route.param[p].substring(1);
 
                 if ( typeof(params) != 'undefined' && typeof(params[variable]) != 'undefined' ) {
 
@@ -8547,7 +8547,7 @@ function Routing() {
                 p = 0;
                 pLen = rawUrlVars.length;
                 for (; p < pLen; p++) {
-                    pKey = rawUrlVars[p].substr(1);
+                    pKey = rawUrlVars[p].substring(1);
                     if ( typeof(params[ pKey ]) != 'undefined' && params[ pKey ] ) {
                         rawUrlScore++;
                     }
@@ -8665,7 +8665,7 @@ function Routing() {
         // to prevent having a folder.
         // eg.: {..., id: '/^\\s*$/'} => {..., id: ''} => /path/to/ becoming /path/to
         if ( /\/$/.test(route.url) && route.url != '/' )
-            route.url = route.url.substr(0, route.url.length-1);
+            route.url = route.url.substring(0, route.url.length-1);
 
         // Completeting url with extra params e.g.: ?param1=val1&param2=val2
         if ( /GET/i.test(route.method) && typeof(params) != 'undefined' ) {
@@ -8862,7 +8862,7 @@ function Routing() {
         // to prevent having a folder.
         // eg.: {..., id: '/^\\s*$/'} => {..., id: ''} => /path/to/ becoming /path/to
         if ( /\/$/.test(url) && url != '/' )
-            url = url.substr(0, url.length-1);
+            url = url.substring(0, url.length-1);
         // adding hash if found
         if (hash)
             url += hash;
@@ -9191,7 +9191,7 @@ function Routing() {
             // to prevent having a folder.
             // eg.: {..., id: '/^\\s*$/'} => {..., id: ''} => /path/to/ becoming /path/to
             if ( /\/$/.test(url) && url != '/' )
-                url = url.substr(0, url.length-1);
+                url = url.substring(0, url.length-1);
             // adding hash if found
             if (hash)
                 url += hash;
@@ -11144,7 +11144,7 @@ function ValidatorPlugin(rules, data, formId) {
                                 var url = window.URL.createObjectURL(blob);
                                 a.href = url;
                                 var contentDisposition = xhr.getResponseHeader("Content-Disposition");
-                                a.download = contentDisposition.match('\=(.*)')[0].substr(1);
+                                a.download = contentDisposition.match('\=(.*)')[0].substring(1);
                                 //programatically click the link to trigger the download
                                 a.click();
 
@@ -12048,7 +12048,7 @@ function ValidatorPlugin(rules, data, formId) {
                         filesToBeRemoved.push(childNodeFilePreview);
                     }
                 } else {
-                    let file = childNodes[i].src.substr(childNodes[i].src.lastIndexOf('/')+1);
+                    let file = childNodes[i].src.substring(childNodes[i].src.lastIndexOf('/')+1);
                     childNodeFile = file;
                     filesToBeRemoved.push(childNodeFile);
                 }
@@ -12484,7 +12484,7 @@ function ValidatorPlugin(rules, data, formId) {
                     for (let m = 0, mLen = mergingRules.length; m < mLen; m++) {
                         if ( re.test(mergingRules[m]) ) {
                             let tmpStr = JSON.stringify(rule);
-                            tmpStr = tmpStr.substr(1, tmpStr.length-1);// removing ->{ ... }<-
+                            tmpStr = tmpStr.substring(1, tmpStr.length-1);// removing ->{ ... }<-
                             // is last ?
                             if (m < mLen-1) {
                                 tmpStr += ','
@@ -13575,14 +13575,14 @@ function ValidatorPlugin(rules, data, formId) {
                         case 46: //Delete
                         case 8: //Backspace
                             if (posStart != posEnd) {
-                                $_el.value = str.substr(0, posStart) + str.substr(posEnd);
+                                $_el.value = str.substring(0, posStart) + str.substring(posEnd);
                                 if (posStart == 0) {
-                                    $_el.value = str.substr(posEnd);
+                                    $_el.value = str.substring(posEnd);
                                 }
                             } else if (posStart == 0) {
                                 $_el.value = str.substring(posStart+1);
                             } else {
-                                $_el.value = str.substr(0, posStart-1) + str.substr(posEnd);
+                                $_el.value = str.substring(0, posStart-1) + str.substring(posEnd);
                             }
 
                             e.currentTarget.setAttribute('readonly', 'readonly');
@@ -13670,14 +13670,14 @@ function ValidatorPlugin(rules, data, formId) {
                         default:
                             // Replace selection
                             if (posStart != posEnd) {
-                                $_el.value = str.substr(0, posStart) + e.key;
+                                $_el.value = str.substring(0, posStart) + e.key;
                                 if (posEnd-1 < str.length) {
                                     $_el.value += str.substring(posEnd)
                                 }
                             } else if (posStart == 0) {
                                 $_el.value = e.key + str.substring(posStart);
                             } else {
-                                $_el.value = str.substr(0, posStart) + e.key + str.substr(posEnd);
+                                $_el.value = str.substring(0, posStart) + e.key + str.substring(posEnd);
                             }
                             e.currentTarget.setAttribute('readonly', 'readonly');
                             // Force restore last caret position
@@ -14425,7 +14425,7 @@ function ValidatorPlugin(rules, data, formId) {
                         } else if ( /img/i.test($els[i].tagName) ) {
                             $img = $els[i];
                             deleteLinkId = uploadTriggerId + '-'+index+'-delete-trigger';
-                            let file = $img.src.substr($img.src.lastIndexOf('/')+1);
+                            let file = $img.src.substring($img.src.lastIndexOf('/')+1);
                             $uploadTrigger.customFiles.push({
                                 name: file,
                                 deleteLinkId: deleteLinkId
@@ -17197,7 +17197,7 @@ function ValidatorPlugin(rules, data, formId) {
                     }
 
                     if (isGFFCtx)
-                        $fields[field].setAttribute('data-gina-form-errors', fieldErrorsAttributes[field].substr(0, fieldErrorsAttributes[field].length-1))
+                        $fields[field].setAttribute('data-gina-form-errors', fieldErrorsAttributes[field].substring(0, fieldErrorsAttributes[field].length-1))
                 }
 
                 //calling back
@@ -18153,7 +18153,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'lib/merge'*/, 'l
 
                 foldingStateName += name
             } else {
-                foldingStateName = foldingStateName.substr(0, foldingStateName.length-1)
+                foldingStateName = foldingStateName.substring(0, foldingStateName.length-1)
             }
 
             return foldingStateName.trim()
@@ -18190,8 +18190,8 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'lib/merge'*/, 'l
                     html += '<ul class="gina-toolbar-object">' + parseObject(obj[i], ginaObj[i], id, elIsXHR, elSection) +'</ul>';
                     html += '</li>';
                     // clear one level
-                    //id = id.substr(0, id.length - i.length - 1);
-                    id = id.substr(0, id.length - i.length);
+                    //id = id.substring(0, id.length - i.length - 1);
+                    id = id.substring(0, id.length - i.length);
                 } else if ( Array.isArray(obj[i]) ) {
                     //id += i + '-';
                     id += '-' + i.replace(/[^A-Za-z0-9_-]/g, '_');
@@ -18202,8 +18202,8 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'lib/merge'*/, 'l
                     html += '<ul class="gina-toolbar-collection">' + parseCollection(obj[i], ginaObj[i], id, elIsXHR, elSection)  +'</ul>';
                     html += '</li>';
                     // clear one level
-                    //id = id.substr(0, id.length - i.length - 1);
-                    id = id.substr(0, id.length - i.length);
+                    //id = id.substring(0, id.length - i.length - 1);
+                    id = id.substring(0, id.length - i.length);
                 } else {
                     objType = (ginaObj[i] === null) ? 'null' : typeof(ginaObj[i]);
                     if ( objType == 'undefined' ) { // new key  declaration added by user
@@ -18260,7 +18260,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'lib/merge'*/, 'l
                     html += '<ul class="gina-toolbar-object">' + parseObject(arr[i], ginaArr[i], id, elIsXHR, elSection) +'</ul>';
                     html += '</li>';
                     // clear one level
-                    id = id.substr(0, id.length - i.toString().length - 1);
+                    id = id.substring(0, id.length - i.toString().length - 1);
 
                 } else if ( Array.isArray(arr[i]) ) {
                     //id   += i + '-';
@@ -18273,8 +18273,8 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'lib/merge'*/, 'l
                     html += '<ul class="gina-toolbar-collection">' + parseCollection(arr[i], ginaArr[i], id, elIsXHR, elSection)  +'</ul>';
                     html += '</li>';
                     // clear one level
-                    //id = id.substr(0, id.length - i.toString().length - 1);
-                    id = id.substr(0, id.length - i.toString().length);
+                    //id = id.substring(0, id.length - i.toString().length - 1);
+                    id = id.substring(0, id.length - i.toString().length);
                 } else {
                     html += '<li class="gina-toolbar-key-value"><span class="gina-toolbar-key">'+ i +':</span> <span class="gina-toolbar-value">'+ arr[i] +'</span></li>';
                 }
@@ -18303,16 +18303,16 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'lib/merge'*/, 'l
                 section = i;
                 if ( typeof(obj[i]) == 'object' && !Array.isArray(obj[i]) && obj[i] !== null ) { // parse
 
-                    $parent = $('#gina-toolbar-view-' + id.substr(0, id.length - 1));
+                    $parent = $('#gina-toolbar-view-' + id.substring(0, id.length - 1));
                     hasParent = ( $parent.length ) ? true : false;
 
                     if (!hasParent ) {
                         id += i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
 
                         if (i == 'params') { // force to top
-                            var htmlParams =    '<div id="gina-toolbar-view-'+ id.substr(0, id.length - 1) +'" class="gina-toolbar-section">' +
-                                                    '<h2 class="gina-toolbar-section-title">'+ id.substr(0, id.length - 1) +'</h2>' +
-                                                    '<ul class="'+ id.substr(0, id.length - 1) +'"></ul>' +
+                            var htmlParams =    '<div id="gina-toolbar-view-'+ id.substring(0, id.length - 1) +'" class="gina-toolbar-section">' +
+                                                    '<h2 class="gina-toolbar-section-title">'+ id.substring(0, id.length - 1) +'</h2>' +
+                                                    '<ul class="'+ id.substring(0, id.length - 1) +'"></ul>' +
                                                 '</div>';
 
                             $('#gina-toolbar-view-html-properties')
@@ -18321,9 +18321,9 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'lib/merge'*/, 'l
 
                             if ( !/^html/.test(id) ) {
 
-                                var htmlOther = '<div id="gina-toolbar-view-'+ id.substr(0, id.length - 1) +'" class="gina-toolbar-section">' +
-                                                '<h2 class="gina-toolbar-section-title">'+ id.substr(0, id.length - 1) +'</h2>' +
-                                                '<ul class="'+ id.substr(0, id.length - 1) +'"></ul>' +
+                                var htmlOther = '<div id="gina-toolbar-view-'+ id.substring(0, id.length - 1) +'" class="gina-toolbar-section">' +
+                                                '<h2 class="gina-toolbar-section-title">'+ id.substring(0, id.length - 1) +'</h2>' +
+                                                '<ul class="'+ id.substring(0, id.length - 1) +'"></ul>' +
                                             '</div>';
 
                                 $html
@@ -18331,36 +18331,36 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'lib/merge'*/, 'l
                             }/** else { // add to properties section
                                 $root
                                     .find('.gina-toolbar-properties')
-                                    .append('ul.' + id.substr(0, id.length - 1))
+                                    .append('ul.' + id.substring(0, id.length - 1))
                             }*/
 
                         }
 
-                        parseView(obj[i], ginaObj[i], id, elIsXHR, $html.find('ul.'+ id.substr(0, id.length - 1)), $root );
+                        parseView(obj[i], ginaObj[i], id, elIsXHR, $html.find('ul.'+ id.substring(0, id.length - 1)), $root );
 
                     } else {
 
                         parentId = id + i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
 
                         $parent
-                            .find('ul.'+ id.substr(0, id.length - 1))
-                            .append('<li class="gina-toolbar-object"><a href="#" class="gina-toolbar-key gina-toolbar'+ isXHR +'-folding-state-'+ normalizeFoldingStateName( i.replace(/[^A-Za-z0-9_-]/g, '_'), parentId.substr(0, parentId.length - 1) ) +'">'+ i +' <span>{ }</span></a><ul class="gina-toolbar-object '+ parentId.substr(0, parentId.length - 1) +'"></ul></li>');
+                            .find('ul.'+ id.substring(0, id.length - 1))
+                            .append('<li class="gina-toolbar-object"><a href="#" class="gina-toolbar-key gina-toolbar'+ isXHR +'-folding-state-'+ normalizeFoldingStateName( i.replace(/[^A-Za-z0-9_-]/g, '_'), parentId.substring(0, parentId.length - 1) ) +'">'+ i +' <span>{ }</span></a><ul class="gina-toolbar-object '+ parentId.substring(0, parentId.length - 1) +'"></ul></li>');
 
-                        parseView(obj[i], ginaObj[i], parentId, elIsXHR, $parent.find('ul.'+ id.substr(0, id.length - 1)), $root );
+                        parseView(obj[i], ginaObj[i], parentId, elIsXHR, $parent.find('ul.'+ id.substring(0, id.length - 1)), $root );
 
                         id += i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
                     }
 
 
                     // clear one level
-                    id = id.substr(0, id.length - i.length - 1);
+                    id = id.substring(0, id.length - i.length - 1);
 
 
                 } else if ( Array.isArray(obj[i]) ) { // parse collection
 
 
 
-                    $parent = $('#gina-toolbar-view-' + id.substr(0, id.length - 1));
+                    $parent = $('#gina-toolbar-view-' + id.substring(0, id.length - 1));
 
                     hasParent = ( $parent.length ) ? true : false;
 
@@ -18370,16 +18370,16 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'lib/merge'*/, 'l
                         parentId = id + i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
 
                         $parent
-                            //.find('ul.'+ id.substr(0, id.length - 1))
-                            .append('<li class="gina-toolbar-collection"><a href="#" class="gina-toolbar-key gina-toolbar'+ isXHR +'-folding-state-'+ normalizeFoldingStateName( i.replace(/[^A-Za-z0-9_-]/g, '_'), parentId.substr(0, parentId.length - 1) ) +'">'+ i +' <span>['+ obj[i].length +']</span></a><ul> '+ parseCollection(obj[i], ginaObj[i], parentId, $parent.find('li ul.'+ id.substr(0, id.length - 1)), section )+'</ul></li>');
+                            //.find('ul.'+ id.substring(0, id.length - 1))
+                            .append('<li class="gina-toolbar-collection"><a href="#" class="gina-toolbar-key gina-toolbar'+ isXHR +'-folding-state-'+ normalizeFoldingStateName( i.replace(/[^A-Za-z0-9_-]/g, '_'), parentId.substring(0, parentId.length - 1) ) +'">'+ i +' <span>['+ obj[i].length +']</span></a><ul> '+ parseCollection(obj[i], ginaObj[i], parentId, $parent.find('li ul.'+ id.substring(0, id.length - 1)), section )+'</ul></li>');
 
 
-                        //parentId = parentId.substr(0, parentId.length - 1)+ '-';
-                        //parentId = id.substr(0, id.length - i.length - 1);
-                        //parseView(obj[i], ginaObj[i], parentId, elIsXHR, $parent.find('ul.'+ parentId.substr(0, parentId.length - 1)), $root );
+                        //parentId = parentId.substring(0, parentId.length - 1)+ '-';
+                        //parentId = id.substring(0, id.length - i.length - 1);
+                        //parseView(obj[i], ginaObj[i], parentId, elIsXHR, $parent.find('ul.'+ parentId.substring(0, parentId.length - 1)), $root );
 
                         //id += i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
-                        //$parent = $('#gina-toolbar-view-' + id.substr(0, id.length - 1));
+                        //$parent = $('#gina-toolbar-view-' + id.substring(0, id.length - 1));
                         id += i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
                     } else {
 
@@ -18387,8 +18387,8 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'lib/merge'*/, 'l
                         parentId = id + i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
 
                         $parent
-                            .find('li.'+ id.substr(0, id.length - 1) +' ul')
-                            .append('<li class="gina-toolbar-collection"><a class="gina-toolbar-key gina-toolbar'+ isXHR +'-folding-state-'+ normalizeFoldingStateName( i.replace(/[^A-Za-z0-9_-]/g, '_'), parentId.substr(0, parentId.length - 1) ) +'">'+ i +' <span>['+ obj[i].length +']</span></a><ul>'+ parseCollection(obj[i], ginaObj[i], parentId, $parent.find('li ul.'+ id.substr(0, id.length - 1)), section ) +'</ul></li>');
+                            .find('li.'+ id.substring(0, id.length - 1) +' ul')
+                            .append('<li class="gina-toolbar-collection"><a class="gina-toolbar-key gina-toolbar'+ isXHR +'-folding-state-'+ normalizeFoldingStateName( i.replace(/[^A-Za-z0-9_-]/g, '_'), parentId.substring(0, parentId.length - 1) ) +'">'+ i +' <span>['+ obj[i].length +']</span></a><ul>'+ parseCollection(obj[i], ginaObj[i], parentId, $parent.find('li ul.'+ id.substring(0, id.length - 1)), section ) +'</ul></li>');
 
                         id += i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
 
@@ -18399,7 +18399,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'lib/merge'*/, 'l
                     //     id = id + i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
                     //     $root
                     //         .find('.gina-toolbar-properties')
-                    //         .append('<li class="gina-toolbar-collection"><a class="gina-toolbar-key gina-toolbar'+ isXHR +'-folding-state-'+ normalizeFoldingStateName( i.replace(/[^A-Za-z0-9_-]/g, '_'), id.substr(0, id.length - 1) ) +'">'+ i +' <span>['+ obj[i].length +']</span></a><ul>'+ parseCollection(obj[i], ginaObj[i], parentId, $root.find('.gina-toolbar-properties'), section) +'</ul></li>');
+                    //         .append('<li class="gina-toolbar-collection"><a class="gina-toolbar-key gina-toolbar'+ isXHR +'-folding-state-'+ normalizeFoldingStateName( i.replace(/[^A-Za-z0-9_-]/g, '_'), id.substring(0, id.length - 1) ) +'">'+ i +' <span>['+ obj[i].length +']</span></a><ul>'+ parseCollection(obj[i], ginaObj[i], parentId, $root.find('.gina-toolbar-properties'), section) +'</ul></li>');
 
 
                     // } else {
@@ -18408,14 +18408,14 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'lib/merge'*/, 'l
                     //     parentId = id + i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
 
                     //     $parent
-                    //         .find('li.'+ id.substr(0, id.length - 1) +' ul')
-                    //         .append('<li class="gina-toolbar-collection"><a class="gina-toolbar-key gina-toolbar'+ isXHR +'-folding-state-'+ normalizeFoldingStateName( i.replace(/[^A-Za-z0-9_-]/g, '_'), parentId.substr(0, parentId.length - 1) ) +'">'+ i +' <span>['+ obj[i].length +']</span></a><ul>'+ parseCollection(obj[i], ginaObj[i], parentId, $parent.find('li ul.'+ id.substr(0, id.length - 1)), section ) +'</ul></li>');
+                    //         .find('li.'+ id.substring(0, id.length - 1) +' ul')
+                    //         .append('<li class="gina-toolbar-collection"><a class="gina-toolbar-key gina-toolbar'+ isXHR +'-folding-state-'+ normalizeFoldingStateName( i.replace(/[^A-Za-z0-9_-]/g, '_'), parentId.substring(0, parentId.length - 1) ) +'">'+ i +' <span>['+ obj[i].length +']</span></a><ul>'+ parseCollection(obj[i], ginaObj[i], parentId, $parent.find('li ul.'+ id.substring(0, id.length - 1)), section ) +'</ul></li>');
 
                     //     id += i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
                     // }
 
                     // clear one level
-                    id = id.substr(0, id.length - i.length - 1);
+                    id = id.substring(0, id.length - i.length - 1);
                 } else {
 
 
@@ -18423,7 +18423,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'lib/merge'*/, 'l
                     objType = (ginaObj[i] === null) ? 'null' : typeof(ginaObj[i]);
                     if ( objType == 'undefined' ) { // new key  declaration added by user
                         if (/\-$/.test(id)) {
-                            id = id.substr(0, id.length - 1);
+                            id = id.substring(0, id.length - 1);
                         }
 
                         if (!id) continue;
@@ -18470,7 +18470,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'lib/merge'*/, 'l
                             } else {
 
                                 $root
-                                    .find('ul.' + id.substr(0, id.length - 1))
+                                    .find('ul.' + id.substring(0, id.length - 1))
                                     .append('<li class="gina-toolbar-key-value"><span class="gina-toolbar-key">'+ i +':</span> <span class="gina-toolbar-value gina-toolbar-value-type-is-'+ objType +'">'+ obj[i] +'</span></li>')
                             }
                         }