Skip to content

Commit

Permalink
Merge pull request #176 from axisj-com/dev
Browse files Browse the repository at this point in the history
remove font-awesome files

AXValidator …
add String '_' for av-engonly format
  • Loading branch information
thomasJang committed Jun 19, 2014
2 parents f6c514b + b25d9dd commit 2df637f
Show file tree
Hide file tree
Showing 42 changed files with 8 additions and 10,379 deletions.
6 changes: 3 additions & 3 deletions dist/AXJ.all.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
AXJ - v1.0.6 - 2014-06-17
AXJ - v1.0.6 - 2014-06-18
*/
/*!
AXJ - v1.0.6 - 2014-06-17
AXJ - v1.0.6 - 2014-06-18
*/

if(!window.AXConfig){
Expand Down Expand Up @@ -33148,7 +33148,7 @@ var AXValidator = Class.create(AXJ, {
var pattern = /^[가-힣0-9]+$/;
result = pattern.test(ElemValue);
} else if (ElemValue != "" && validateKey == "engonly") {
var pattern = /^[a-zA-Z0-9]+$/;
var pattern = /^[a-zA-Z0-9_]+$/;
result = pattern.test(ElemValue);
} else if (ElemValue != "" && validateKey == "residentno") {
var pattern = /^(\d{6})-?(\d{5}(\d{1})\d{1})$/;
Expand Down
2 changes: 1 addition & 1 deletion dist/AXJ.min.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="ui/AXJ.png" />
<link rel="apple-touch-icon-precomposed" href="ui/AXJ.png" />


<link rel="stylesheet" type="text/css" href="ui/arongi/page.css">
<link rel="stylesheet" type="text/css" href="ui/arongi/AXJ.min.css">

Expand Down
2 changes: 1 addition & 1 deletion lib/AXJ.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
AXJ - v1.0.6 - 2014-06-17
AXJ - v1.0.6 - 2014-06-18
*/

if(!window.AXConfig){
Expand Down
2 changes: 1 addition & 1 deletion lib/AXValidator.js
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ var AXValidator = Class.create(AXJ, {
var pattern = /^[-0-9]+$/;
result = pattern.test(ElemValue);
} else if (ElemValue != "" && validateKey == "engonly") {
var pattern = /^[a-zA-Z0-9]+$/;
var pattern = /^[a-zA-Z0-9_]+$/;
result = pattern.test(ElemValue);
} else if (ElemValue != "" && validateKey == "residentno") {
var pattern = /^(\d{6})-?(\d{5}(\d{1})\d{1})$/;
Expand Down
2 changes: 1 addition & 1 deletion samples/AXButton/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<meta property="og:description" id="meta_description" content="Javascript UI Library based on JQuery" />

<!-- css block -->
<link rel="stylesheet" type="text/css" href="../../ui/arongi/font-awesome.css">
<link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">

<link rel="stylesheet" type="text/css" href="../../ui/arongi/page.css">
<link rel="stylesheet" type="text/css" href="../../ui/arongi/AXJ.min.css" />
Expand Down
2 changes: 1 addition & 1 deletion samples/AXSelect/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<meta property="og:description" id="meta_description" content="Javascript UI Library based on JQuery" />

<!-- css block -->
<link rel="stylesheet" type="text/css" href="../../ui/arongi/font-awesome.css">
<link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">

<link rel="stylesheet" type="text/css" href="../../ui/arongi/page.css">
<link rel="stylesheet" type="text/css" href="../../ui/arongi/AXJ.min.css">
Expand Down
Loading

0 comments on commit 2df637f

Please sign in to comment.