Merge pull request #165 from cytsunny/master

fatlinesofcode · fatlinesofcode · commit 31bb08bd2d18 · 2015-06-19T21:23:57.000+10:00
Making 3 examples work again. The cancel function is still not working?
diff --git a/example-cancel.html b/example-cancel.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>ngDraggable</title>
-  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootswatch/2.3.1/spruce/bootstrap.min.css">
+  <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootswatch/2.3.1/spruce/bootstrap.min.css">
   <style>
 
     *{
@@ -120,7 +120,7 @@ <h2>Cancel drag from child element.</h2>
   </div>
   <footer style="margin-top:2000px;">footer</footer>
 
-  <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js"></script>
+  <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js"></script>
   <script src="ngDraggable.js"></script>
   <script>
     angular.module('ExampleApp', ['ngDraggable']).
@@ -160,4 +160,4 @@ <h2>Cancel drag from child element.</h2>
       });
   </script>
 </body>
-</html>
+</html>
diff --git a/example-clone.html b/example-clone.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>ngDraggable</title>
-  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootswatch/2.3.1/spruce/bootstrap.min.css">
+  <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootswatch/2.3.1/spruce/bootstrap.min.css">
   <style>
 
     *{
@@ -110,7 +110,7 @@ <h1>ngDraggable Clone Example</h1>
 
   <footer style="margin-top:2000px;">footer</footer>
 
-  <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js"></script>
+  <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js"></script>
   <script src="ngDraggable.js"></script>
   <script>
     angular.module('ExampleApp', ['ngDraggable']).
diff --git a/example-reorder.html b/example-reorder.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>ngDraggable</title>
-    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootswatch/2.3.1/spruce/bootstrap.min.css">
+    <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootswatch/2.3.1/spruce/bootstrap.min.css">
     <style>
 
         * {
@@ -109,7 +109,7 @@ <h1>ngDraggable Ordering Example</h1>
 
 <hr/>
 
-<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js"></script>
+<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js"></script>
 <script src="ngDraggable.js"></script>
 <script>
     angular.module('ExampleApp', ['ngDraggable']).
@@ -128,4 +128,4 @@ <h1>ngDraggable Ordering Example</h1>
             });
 </script>
 </body>
-</html>
+</html>
diff --git a/example.html b/example.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>ngDraggable</title>
-  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootswatch/2.3.1/spruce/bootstrap.min.css">
+  <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootswatch/2.3.1/spruce/bootstrap.min.css">
   <style>
 
     *{
@@ -113,7 +113,7 @@ <h1>ngDraggable Example</h1>
   </div>
   <footer style="margin-top:2000px;">footer</footer>
 
-  <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js"></script>
+  <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js"></script>
   <script src="ngDraggable.js"></script>
   <script>
     angular.module('ExampleApp', ['ngDraggable']).
@@ -153,4 +153,4 @@ <h1>ngDraggable Example</h1>
       });
   </script>
 </body>
-</html>
+</html>
diff --git a/ngDraggable.js b/ngDraggable.js
@@ -11,7 +11,8 @@ angular.module("ngDraggable", [])
                 if (angular.isDefined(event.touches)) {
                     return event.touches[0];
                 }
-                else if (angular.isDefined(event.originalEvent.touches)) {
+                //Checking both is not redundent. If only check if touches isDefined, angularjs isDefnied will return error and stop the remaining scripty if event.originalEvent is not defined.
+                else if (angular.isDefined(event.originalEvent) && angular.isDefined(event.originalEvent.touches)) {
                     return event.originalEvent.touches[0];
                 }
                 return event;

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ angular.module("ngDraggable", [])`
`11`	`11`	`if (angular.isDefined(event.touches)) {`
`12`	`12`	`return event.touches[0];`
`13`	`13`	`}`
`14`		`- else if (angular.isDefined(event.originalEvent.touches)) {`
	`14`	`+ //Checking both is not redundent. If only check if touches isDefined, angularjs isDefnied will return error and stop the remaining scripty if event.originalEvent is not defined.`
	`15`	`+ else if (angular.isDefined(event.originalEvent) && angular.isDefined(event.originalEvent.touches)) {`
`15`	`16`	`return event.originalEvent.touches[0];`
`16`	`17`	`}`
`17`	`18`	`return event;`