Merge pull request #385 from mcasimir/fix-prevent-default

mcasimir · web-flow · commit 7b4f4cd9e145 · 2016-09-04T20:58:08.000+02:00
Fix prevent default
diff --git a/bower.json b/bower.json
@@ -14,7 +14,8 @@
     "dist/fonts/fontawesome-webfont.eot",
     "dist/fonts/fontawesome-webfont.svg",
     "dist/fonts/fontawesome-webfont.ttf",
-    "dist/fonts/fontawesome-webfont.woff"
+    "dist/fonts/fontawesome-webfont.woff",
+    "dist/fonts/fontawesome-webfont.woff2"
   ],
   "keywords": [
     "mobile-angular-ui",
diff --git a/demo/demo.js b/demo/demo.js
@@ -6,7 +6,7 @@
 // Here is how to define your module
 // has dependent on mobile-angular-ui
 //
-let app = angular.module('MobileAngularUiExamples', [
+var app = angular.module('MobileAngularUiExamples', [
   'ngRoute',
   'mobile-angular-ui',
 
@@ -86,9 +86,9 @@ app.directive('dragToDismiss', function($drag, $parse, $timeout) {
   return {
     restrict: 'A',
     compile: function(elem, attrs) {
-      let dismissFn = $parse(attrs.dragToDismiss);
+      var dismissFn = $parse(attrs.dragToDismiss);
       return function(scope, elem) {
-        let dismiss = false;
+        var dismiss = false;
 
         $drag.bind(elem, {
           transform: $drag.TRANSLATE_RIGHT,
@@ -135,7 +135,7 @@ app.directive('carousel', function() {
       this.activeItem = null;
 
       this.addItem = function() {
-        let newId = this.itemCount++;
+        var newId = this.itemCount++;
         this.activeItem = this.itemCount === 1 ? newId : this.activeItem;
         return newId;
       };
@@ -162,10 +162,10 @@ app.directive('carouselItem', function($drag) {
     template: '<div class="item"><div ng-transclude></div></div>',
     link: function(scope, elem, attrs, carousel) {
       scope.carousel = carousel;
-      let id = carousel.addItem();
+      var id = carousel.addItem();
 
-      let zIndex = function() {
-        let res = 0;
+      var zIndex = function() {
+        var res = 0;
         if (id === carousel.activeItem) {
           res = 2000;
         } else if (carousel.activeItem < id) {
@@ -190,15 +190,15 @@ app.directive('carouselItem', function($drag) {
           //
           // use translate both as basis for the new transform:
           //
-          let t = $drag.TRANSLATE_BOTH(element, transform, touch);
+          var t = $drag.TRANSLATE_BOTH(element, transform, touch);
 
           //
           // Add rotation:
           //
-          let Dx = touch.distanceX;
-          let t0 = touch.startTransform;
-          let sign = Dx < 0 ? -1 : 1;
-          let angle = sign * Math.min((Math.abs(Dx) / 700) * 30, 30);
+          var Dx = touch.distanceX;
+          var t0 = touch.startTransform;
+          var sign = Dx < 0 ? -1 : 1;
+          var angle = sign * Math.min((Math.abs(Dx) / 700) * 30, 30);
 
           t.rotateZ = angle + (Math.round(t0.rotateZ));
 
@@ -281,9 +281,9 @@ app.controller('MainController', function($rootScope, $scope) {
   //
   // 'Scroll' screen
   //
-  let scrollItems = [];
+  var scrollItems = [];
 
-  for (let i = 1; i <= 100; i++) {
+  for (var i = 1; i <= 100; i++) {
     scrollItems.push('Item ' + i);
   }
 
@@ -339,12 +339,12 @@ app.controller('MainController', function($rootScope, $scope) {
   //
   $scope.notices = [];
 
-  for (let j = 0; j < 10; j++) {
+  for (var j = 0; j < 10; j++) {
     $scope.notices.push({icon: 'envelope', message: 'Notice ' + (j + 1)});
   }
 
   $scope.deleteNotice = function(notice) {
-    let index = $scope.notices.indexOf(notice);
+    var index = $scope.notices.indexOf(notice);
     if (index > -1) {
       $scope.notices.splice(index, 1);
     }
diff --git a/demo/home.html b/demo/home.html
@@ -1,10 +1,10 @@
-<div class="scrollable">  
+<div class="scrollable">
   <div class="scrollable-content">
 
     <div class="list-group text-center">
       <div class="list-group-item list-group-item-home">
         <h1>Mobile Angular UI
-        Demo <small>1.2</small>
+        Demo <small>1.3</small>
         </h1>
       </div>
       <div class="list-group-item list-group-item-home">
diff --git a/demo/index.html b/demo/index.html
@@ -24,6 +24,7 @@
   <body
     ng-app="MobileAngularUiExamples"
     ng-controller="MainController"
+    ui-prevent-touchmove-defaults
     >
 
     <!-- Sidebars -->
diff --git a/demo/sidebar.html b/demo/sidebar.html
@@ -1,5 +1,5 @@
 <div class="scrollable">
-  <h1 class="scrollable-header app-name">Mobile Angular UI <small>1.2</small></h1>  
+  <h1 class="scrollable-header app-name">Mobile Angular UI <small>1.3</small></h1>
   <div class="scrollable-content">
     <div class="list-group" ui-turn-off="uiSidebarLeft">
       <a class="list-group-item" href="#/">Home <i class="fa fa-chevron-right pull-right"></i></a>
diff --git a/dist/css/mobile-angular-ui-base.css b/dist/css/mobile-angular-ui-base.css
@@ -8434,7 +8434,7 @@ body {
   height: 100%;
   width: 100%;
   overflow: hidden;
-  font-weight: 300;
+  font-weight: 400;
 }
 
 a {
diff --git a/dist/css/mobile-angular-ui-base.min.css b/dist/css/mobile-angular-ui-base.min.css
diff --git a/dist/js/mobile-angular-ui.core.js b/dist/js/mobile-angular-ui.core.js
@@ -883,7 +883,7 @@
             var links = $document[0].links;
 
             for (var i = 0; i < links.length; i++) {
-              var link = angular.element(links[0]);
+              var link = angular.element(links[i]);
               var href = link.attr('href');
 
               if (!href) {
diff --git a/dist/js/mobile-angular-ui.core.min.js b/dist/js/mobile-angular-ui.core.min.js
diff --git a/dist/js/mobile-angular-ui.core.min.js.map b/dist/js/mobile-angular-ui.core.min.js.map
diff --git a/dist/js/mobile-angular-ui.js b/dist/js/mobile-angular-ui.js
@@ -883,7 +883,7 @@
             var links = $document[0].links;
 
             for (var i = 0; i < links.length; i++) {
-              var link = angular.element(links[0]);
+              var link = angular.element(links[i]);
               var href = link.attr('href');
 
               if (!href) {
@@ -3249,7 +3249,7 @@
         var scrollable = $element.parent()[0];
 
         // Handle nobounce behaviour
-        if ('ontouchmove' in $document) {
+        if ('ontouchmove' in $document[0]) {
           var allowUp;
           var allowDown;
           var lastY;
diff --git a/dist/js/mobile-angular-ui.min.js b/dist/js/mobile-angular-ui.min.js
diff --git a/dist/js/mobile-angular-ui.min.js.map b/dist/js/mobile-angular-ui.min.js.map
diff --git a/src/js/components/scrollable.js b/src/js/components/scrollable.js
@@ -98,7 +98,7 @@
         var scrollable = $element.parent()[0];
 
         // Handle nobounce behaviour
-        if ('ontouchmove' in $document) {
+        if ('ontouchmove' in $document[0]) {
           var allowUp;
           var allowDown;
           var lastY;
diff --git a/src/js/core/activeLinks.js b/src/js/core/activeLinks.js
@@ -41,7 +41,7 @@
             var links = $document[0].links;
 
             for (var i = 0; i < links.length; i++) {
-              var link = angular.element(links[0]);
+              var link = angular.element(links[i]);
               var href = link.attr('href');
 
               if (!href) {
diff --git a/src/less/variables.less b/src/less/variables.less
@@ -30,7 +30,7 @@
 @border-radius-small:       3px;
 
 // Globals
-@font-weight: 300;
+@font-weight: 400;
 @active-link-opacity: .6;
 @page-header-margin-top: 10px;
 
diff --git a/test/e2e/demo/FormsPage.js b/test/e2e/demo/FormsPage.js
@@ -0,0 +1,24 @@
+import DemoPage from './DemoPage';
+
+export default class FormsPage extends DemoPage {
+  static async get() {
+    await browser.get('/demo/#/forms');
+    return new FormsPage();
+  }
+
+  get uiSwitchHandle() {
+    return element(by.css('.switch-handle'));
+  }
+
+  get uiSwitch() {
+    return element(by.css('ui-switch'));
+  }
+
+  get emailInput() {
+    return element(by.css('input[type="email"]'));
+  }
+
+  get passwordInput() {
+    return element(by.css('input[type="password"]'));
+  }
+}
diff --git a/test/e2e/demo/forms.spec.js b/test/e2e/demo/forms.spec.js
@@ -0,0 +1,49 @@
+import FormsPage from './FormsPage';
+
+describe('demo', function() {
+  describe('forms page', function() {
+    it('should show "Forms" as title', async function() {
+      let formsPage = await FormsPage.get();
+      expect(await formsPage.heading.getText()).toBe('Forms');
+    });
+
+    it('should display me@example.com in email field', async function() {
+      let formsPage = await FormsPage.get();
+      expect(await formsPage.emailInput.getAttribute('value')).toBe('me@example.com');
+    });
+
+    it('should allow to enter value in email field', async function() {
+      let formsPage = await FormsPage.get();
+      await formsPage.emailInput.sendKeys(' something');
+      expect(await formsPage.emailInput.getAttribute('value')).toBe('me@example.com something');
+    });
+
+    it('should display empty password field', async function() {
+      let formsPage = await FormsPage.get();
+      expect(await formsPage.passwordInput.getAttribute('value')).toBe('');
+    });
+
+    it('should allow to enter value in password field', async function() {
+      let formsPage = await FormsPage.get();
+      await formsPage.passwordInput.sendKeys('something');
+      expect(await formsPage.passwordInput.getAttribute('value')).toBe('something');
+    });
+
+    it('should have active switch', async function() {
+      let formsPage = await FormsPage.get();
+      expect(await formsPage.uiSwitch.getAttribute('class')).toContain('active');
+    });
+
+    it('should switch off by tapping on switch element', async function() {
+      let formsPage = await FormsPage.get();
+      await browser.actions().mouseMove(formsPage.uiSwitch).click().perform();
+      expect(await formsPage.uiSwitch.getAttribute('class')).not.toContain('active');
+    });
+
+    it('should switch off by tapping on switch handle', async function() {
+      let formsPage = await FormsPage.get();
+      await browser.actions().mouseMove(formsPage.uiSwitchHandle).click().perform();
+      expect(await formsPage.uiSwitch.getAttribute('class')).not.toContain('active');
+    });
+  });
+});

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`<body`
`25`	`25`	`ng-app="MobileAngularUiExamples"`
`26`	`26`	`ng-controller="MainController"`
	`27`	`+ ui-prevent-touchmove-defaults`
`27`	`28`	`>`
`28`	`29`
`29`	`30`	`<!-- Sidebars -->`
Original file line number	Diff line number	Diff line change
`@@ -8434,7 +8434,7 @@ body {`
`8434`	`8434`	`height: 100%;`
`8435`	`8435`	`width: 100%;`
`8436`	`8436`	`overflow: hidden;`
`8437`		`- font-weight: 300;`
	`8437`	`+ font-weight: 400;`
`8438`	`8438`	`}`
`8439`	`8439`
`8440`	`8440`	`a {`