Fixed Requirejs usage

niceue · niceue · commit b22eb62550f2 · 2016-08-28T21:13:01.000+08:00
diff --git a/demo/load-by-requirejs.html b/demo/load-by-requirejs.html
@@ -8,7 +8,7 @@
 
 <body>
 
-<form id="form1" class="form" data-validator-option="{timely:2}">
+<form id="form1" class="form">
     <div class="form-item">
         <input type="text" name="user[email]" data-rule="required;email" placeholder="Email">
     </div>
@@ -27,29 +27,32 @@
     baseUrl: '../',
     paths: {
         jquery: 'http://cdn.jsdelivr.net/jquery/1.12.3/jquery.min',
-        validator: 'dist/jquery.validator.js?local=en'
+        validator: 'dist/local/zh-CN'
+    },
+    shim: {
+        validator: ['../dist/jquery.validator.js?css']
     }
 });
 
-// Just include nice-validator
-require(['validator']);
 
-
-/*
-// Use plugin methods
+// Way 1: Use plugin methods
 require(['jquery', 'validator'], function($){
-    $('#form1').validator();
+    $('#form1').validator({
+        timely: 2,
+        stopOnError: true,
+        theme: 'yellow_right'
+    });
 });
-*/
 
 
-/*
-// Define a module dependency nice-validator
-define('some-module', ['jquery', 'validator'], function($){
-    // some code
-});
-*/
+// Way 2: Just include nice-validator
+// require(['validator']);
+
 
+// Way 3: Define a module dependency nice-validator
+// define('some-module', ['jquery', 'validator'], function($){
+//     // some code
+// });
 </script>
 </body>
-</html>
+</html>
diff --git a/src/jquery.validator.js b/src/jquery.validator.js
@@ -1,6 +1,6 @@
 ;(function(factory) {
     typeof module === "object" && module.exports ? module.exports = factory( require( "jquery" ) ) :
-    typeof define === 'function' && define.amd ? require(['jquery'], factory) :
+    typeof define === 'function' && define.amd ? define(['jquery'], factory) :
     factory(jQuery);
 }(function($, undefined) {
     "use strict";
@@ -2105,7 +2105,7 @@
             el.href = Validator.css = dir + 'jquery.validator.css';
             node.parentNode.insertBefore(el, node);
         }
-        if (!Validator.local && params.local !== '') {
+        if (!Validator.local && ~str.indexOf('local') && params.local !== '') {
             Validator.local = (params.local || doc.documentElement.lang || 'en').replace('_','-');
             Validator.pending = 1;
             el = doc.createElement('script');
diff --git a/src/local/_config.tpl b/src/local/_config.tpl
@@ -4,7 +4,7 @@
  *********************************/
 (function(factory) {
     typeof module === "object" && module.exports ? module.exports = factory( require( "jquery" ) ) :
-    typeof define === 'function' && define.amd ? require(['jquery'], factory) :
+    typeof define === 'function' && define.amd ? define(['jquery'], factory) :
     factory(jQuery);
 }(function($) {
 
