Latest upstream commits

This commit is contained in:
Scott Lahteine
2015-04-06 21:46:18 -07:00
parent e502144eda
commit 967db181d0
13 changed files with 64 additions and 38 deletions

View File

@ -397,7 +397,7 @@ window.configuratorApp = (function(){
* .count number of items in the group
*/
refreshDefineGroups: function(cindex) {
var findDef = /^(|.*_)(([XYZE](MAX|MIN))|(E[0-3]|[XYZE01234])|MAX|MIN|(bed)?K[pid]|HOTEND|HPB|JAPAN|WESTERN|LEFT|RIGHT|BACK|FRONT|[XYZ]_POINT)(_.*|)$/i;
var findDef = /^(|.*_)(([XYZE](MAX|MIN))|(E[0-3]|[XYZE01234])|MAX|MIN|(bed)?K[pid]|HOTEND|HPB|JAPAN|WESTERN|CYRILLIC|LEFT|RIGHT|BACK|FRONT|[XYZ]_POINT)(_.*|)$/i;
var match_prev, patt, title, nameList, groups = {}, match_section;
$.each(define_list[cindex], function(i, name) {
if (match_prev) {
@ -458,7 +458,8 @@ window.configuratorApp = (function(){
break;
case 'JAPAN':
case 'WESTERN':
patt = '(JAPAN|WESTERN)';
case 'CYRILLIC':
patt = '(JAPAN|WESTERN|CYRILLIC)';
break;
case 'XMIN':
case 'XMAX':