Merge pull request #7 from janantala/canary

v0.1.1
janantala · Nov 6, 2013 · c10e04d · c10e04d
2 parents 4fe3b51 + d728b23
commit c10e04d
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 16 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -21,7 +21,7 @@ module.exports = function (grunt) {
       uglify: {
         options: {
           preserveComments: 'some'
-      },
+        },
         dist: {
           src: '<%= pkg.name %>.js',
           dest: '<%= pkg.name %>.min.js'

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# angular-qr v0.1.0 [![Build Status](https://travis-ci.org/janantala/angular-qr.png?branch=master)](https://travis-ci.org/janantala/angular-qr)
+# angular-qr v0.1.1 [![Build Status](https://travis-ci.org/janantala/angular-qr.png?branch=master)](https://travis-ci.org/janantala/angular-qr)
 
 QR code generator for AngularJS
 
@@ -52,13 +52,13 @@ Your text to encode
 
 #### type-number
 - 1-40
-- default value: minimal required version
+- default value: `0` = minimal required version
 
 #### correction-level
-- L
-- M (default)
-- Q
-- H
+- `L` - Low
+- `M` - Medium (default)
+- `Q` - Quartile
+- `H` - High
 
 #### size
 Size in pixels

diff --git a/angular-qr.js b/angular-qr.js
@@ -1,3 +1,9 @@
+/*!
+ * angular-qr v0.1.1
+ * (c) 2013 Jan Antala http://janantala.com
+ * License: MIT
+ */
+
 (function (QRCode) {
   'use strict';
   angular.module('ja.qr', []).controller('QrCtrl', [
@@ -23,11 +29,11 @@
         return $scope.size || 250;
       };
       $scope.isNUMBER = function (text) {
-        var ALLOWEDCHARS = /^[0123456789]*$/;
+        var ALLOWEDCHARS = /^[0-9]*$/;
         return ALLOWEDCHARS.test(text);
       };
       $scope.isALPHA_NUM = function (text) {
-        var ALLOWEDCHARS = /^[0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:]*$/;
+        var ALLOWEDCHARS = /^[0-9A-Z $%*+\-./:]*$/;
         return ALLOWEDCHARS.test(text);
       };
       $scope.is8bit = function (text) {

diff --git a/angular-qr.min.js b/angular-qr.min.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-qr",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "QR code generator for AngularJS",
   "author": "https://github.com/janantala/angular-qr/graphs/contributors",
   "license": "MIT",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-qr",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "QR code generator for AngularJS",
   "author": "https://github.com/janantala/angular-qr/graphs/contributors",
   "license": "MIT",

diff --git a/src/angular-qr.js b/src/angular-qr.js
@@ -1,5 +1,5 @@
-/*
- * angular-qr v0.1.0
+/*!
+ * angular-qr v0.1.1
  * (c) 2013 Jan Antala http://janantala.com
  * License: MIT
  */
@@ -34,12 +34,12 @@
     };
 
     $scope.isNUMBER = function(text){
-      var ALLOWEDCHARS = /^[0123456789]*$/;
+      var ALLOWEDCHARS = /^[0-9]*$/;
       return ALLOWEDCHARS.test(text);
     };
 
     $scope.isALPHA_NUM = function(text){
-      var ALLOWEDCHARS = /^[0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:]*$/;
+      var ALLOWEDCHARS = /^[0-9A-Z $%*+\-./:]*$/;
       return ALLOWEDCHARS.test(text);
     };
 

diff --git a/test/unit.spec.js b/test/unit.spec.js
@@ -67,6 +67,10 @@ describe('ja.qr', function() {
       expect(scope.getInputMode('aA123')).not.toBe('NUMBER');
       expect(scope.getInputMode('aA123')).not.toBe('ALPHA_NUM');
       expect(scope.getInputMode('aA123')).toBe('8bit');
+
+      expect(scope.getInputMode('A,123')).not.toBe('NUMBER');
+      expect(scope.getInputMode('A,123')).not.toBe('ALPHA_NUM');
+      expect(scope.getInputMode('A,123')).toBe('8bit');
     });
 
   });