Merge branch 'master' of git://github.com/akre54/jquery-ujs into akre54-master

JangoSteve · JangoSteve · commit cfe2ccd44e24 · 2013-05-28T23:41:18.000-04:00
diff --git a/src/rails.js b/src/rails.js
@@ -10,7 +10,7 @@
  *
  */
 
-  // Cut down on the number if issues from people inadvertently including jquery_ujs twice
+  // Cut down on the number of issues from people inadvertently including jquery_ujs twice
   // by detecting and raising an error when it happens.
   if ( $.rails !== undefined ) {
     $.error('jquery-ujs has already been loaded!');

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*/`
`12`	`12`
`13`		`- // Cut down on the number if issues from people inadvertently including jquery_ujs twice`
	`13`	`+ // Cut down on the number of issues from people inadvertently including jquery_ujs twice`
`14`	`14`	`// by detecting and raising an error when it happens.`
`15`	`15`	`if ( $.rails !== undefined ) {`
`16`	`16`	`$.error('jquery-ujs has already been loaded!');`