@syncfusion/ej2-base - npm Package Compare versions

Comparing version 1.0.21 to 1.0.22

dist/es6/draggable.js

@@ -80,3 +80,3 @@ var __extends = (this && this.__extends) || (function () {
         this.target = evt.currentTarget;
-        if (!isUndefined(evt.changedTouches)) {
+        if (this.preventDefault && !isUndefined(evt.changedTouches)) {
             evt.preventDefault();
@@ -104,5 +104,9 @@ }
     Draggable.prototype.intDragStart = function (evt) {
-        if (!isUndefined(evt.changedTouches) && (evt.changedTouches.length !== 1)) {
+        var isChangeTouch = !isUndefined(evt.changedTouches);
+        if (isChangeTouch && (evt.changedTouches.length !== 1)) {
             return;
         }
+        if (isChangeTouch) {
+            evt.preventDefault();
+        }
         var intCordinate = this.getCoordinates(evt);
@@ -486,2 +490,5 @@ var pos;
 ], Draggable.prototype, "skipDistanceCheck", void 0);
+__decorate([
+    Property(true)
+], Draggable.prototype, "preventDefault", void 0);
 Draggable = Draggable_1 = __decorate([
@@ -488,0 +495,0 @@ NotifyPropertyChanges

e2e/index.d.ts

@@ -7,3 +7,3 @@ import { ProtractorBrowser, promise } from 'protractor';
 export interface ProtractorTypes extends ProtractorBrowser {
-    compareScreen: (element: any, fileName: string, options?: Object) => {};
+    compareScreen: (element: any, fileName: string, options?: any, done?: any) => {};
     waitForEvent: (id: string, moduleName: string, eventName: string) => promise.Promise<any>;
@@ -10,0 +10,0 @@ load: (path: string) => void;

e2e/protractor.config.js

@@ -1,26 +0,13 @@
-const os = require("os");
+var shell = require('shelljs');
+var os = require('os');
+var camelCase = require('pix-diff/lib/camelCase.js');
+var seleniumAddress = 'http://150.107.121.2:4444/wd/hub';
 
-var browserCapabilities = [{
-    'browserName': 'firefox'
-}, {
-    'browserName': 'chrome',
-    'chromeOptions': {
-        'args': ['no-sandbox']
-    }
-}]
+var config = require('../../../../config.json');
 
-if (os.platform() === 'win32') {
-    browserCapabilities.push({
-        'browserName': 'internet explorer'
-    });
-    if (Number(os.release().split('.')[0]) >= 10) {
-        browserCapabilities.push({
-            'browserName': 'MicrosoftEdge'
-        });
-    }
-}
-
 exports.config = {
-    allScriptsTimeout: 110000,
+    allScriptsTimeout: 600000,
 
+    getPageTimeout: 60000,
+
     framework: 'jasmine',
@@ -31,3 +18,8 @@
     },
-    multiCapabilities: browserCapabilities,
+    multiCapabilities: [{
+        'browserName': 'chrome',
+        'chromeOptions': {
+            'args': ['no-sandbox']
+        }
+    }],
 
@@ -43,101 +35,169 @@ specs: ['../../../../e2e/tests/**/*.spec.js'],
         browser.isDesktop = true;
+        browser.basePath = require('../../../../protractor.browser.json').basePath;
+
         browser.driver.manage().window().setSize(1600, 1200);
+
+        //move to out off user screen
+        browser.driver.manage().window().setPosition(2500, 0);
+
         browser.getCapabilities().then(function(cap) {
             browser.browserName = cap.get('browserName');
-        });
-        browser.pixResult = PixDiff;
-        browser.executeScript('return {' +
-                'height: screen.availHeight,' +
-                'width: screen.availWidth' +
-                '};'
-            )
-            .then(function(result) {
-                //make calculations
-                browser.screenHeight = result.height;
-                browser.screenWidth = result.width;
-                browser.pixDiff = new PixDiff({
-                    basePath: './e2e',
-                    diffPath: './e2e',
-                    formatImageOptions: { fHeight: result.height, fWidth: result.width },
-                    formatImageName: '{tag}'
-                });
+
+            browser.pixResult = PixDiff;
+
+            browser.pixDiff = new PixDiff({
+                basePath: './e2e',
+                diffPath: './e2e',
+                formatImageName: '{tag}'
             });
 
-        browser.basePath = require('../../../../protractor.browser.json').basePath;
-        browser.compareScreen = function(element, fileName, option) {
-            option = option || {
-                imageAPath: '/expected/' + browser.pixDiff.browserName + '/' + fileName, // Use file-path 
-                imageBPath: '/actual/' + browser.pixDiff.browserName + '/' + fileName,
-                threshold: 0.01,
-                diffPath: '/diff/' + browser.pixDiff.browserName + '/' + fileName,
-                filter: ['grayScale'],
-                debug: true,
-                hideShift: true,
+            //override difference path
+            browser.pixDiff.diffPath = path.normalize(camelCase('./e2e/Diff/' + browser.browserName));
+            //create folder if not present
+            createF(browser.pixDiff.diffPath);
+
+            browser.compareScreen = function(element, fileName, opt) {
+                createF(camelCase('e2e/expected/' + browser.pixDiff.browserName));
+                createF(camelCase('e2e/actual/' + browser.pixDiff.browserName));
+
+                // thresholdType: 'percent',
+                // threshold: 0.009,
+                var option = {
+                    imageAPath: '/expected/' + browser.pixDiff.browserName + '/' + fileName, // Use file-path 
+                    imageBPath: '/actual/' + browser.pixDiff.browserName + '/' + fileName,
+                    filter: ['grayScale'],
+                    debug: true,
+                    hideShift: true,
+                };
+                var doneFn = arguments[arguments.length - 1];
+                if (typeof opt === 'object' && Object.keys(opt).length) {
+                    Object.assign(option, opt);
+                }
+                if (!fs.existsSync(path.resolve(__dirname, '../../../../' + camelCase('e2e/Expected/' + browser.pixDiff.browserName + '/' + fileName) + '.png'))) {
+                    browser.pixDiff.saveRegion(element, '/Expected/' + browser.pixDiff.browserName + '/' + fileName, option).then(
+                        function() {
+                            console.log('Expect Image Created');
+                            browser.saveCheckImage(element, fileName, option, doneFn);
+                        }
+                    );
+                } else {
+                    browser.saveCheckImage(element, fileName, option, doneFn);
+                }
+
             }
-            if (!fs.existsSync(path.resolve(__dirname, '../../../../e2e/expected/' + browser.pixDiff.browserName + '/' + fileName + '.png'))) {
-                browser.pixDiff.saveRegion(element, '/expected/' + browser.pixDiff.browserName + '/' + fileName, option);
+            browser.saveCheckImage = function(element, fileName, option, doneFn) {
+                browser.pixDiff.saveRegion(element, '/Actual/' + browser.pixDiff.browserName + '/' + fileName, option).then(() => {
+                    browser.pixDiff.checkRegion(element, '/Expected/' + browser.pixDiff.browserName + '/' + fileName, option).then((result) => {
+                        //
+                        // *  - `RESULT_UNKNOWN`: 0
+                        // *  - `RESULT_DIFFERENT`: 1
+                        // *  - `RESULT_SIMILAR`: 7
+                        // *  - `RESULT_IDENTICAL`: 5
+                        expect(result.code).toEqual(browser.pixResult.RESULT_IDENTICAL);
+                        if (typeof doneFn === 'function') {
+                            doneFn();
+                        }
+                    });
+                });
             }
-            browser.pixDiff.saveRegion(element, '/actual/' + browser.pixDiff.browserName + '/' + fileName, option);
-            browser.pixDiff.checkRegion(element, '/expected/' + browser.pixDiff.browserName + '/' + fileName, option).then((result) => {
-                expect(result.code).toBe(browser.pixResult.RESULT_IDENTICAL);
-            });
-        }
 
-        browser.waitForEvent = function(id, moduleName, eventName) {
-            return browser.executeAsyncScript(function(id, moduleName, eventName, callback) {
-                var instances = document.getElementById(id).ej2_instances;
-                var instanceObj;
-                for (var i = 0; instances && i < instances.length; i++) {
-                    if (instances[i].getModuleName() == moduleName) {
-                        instanceObj = instances[i]
+            browser.waitForEvent = function(id, moduleName, eventName) {
+                return browser.executeAsyncScript(function(id, moduleName, eventName, callback) {
+                    var instances = document.getElementById(id).ej2_instances;
+                    var instanceObj;
+                    for (var i = 0; instances && i < instances.length; i++) {
+                        if (instances[i].getModuleName() == moduleName) {
+                            instanceObj = instances[i]
+                        }
                     }
-                }
-                if (instanceObj) {
-                    var handler;
-                    handler = function(e) {
-                        instanceObj.removeEventListener(eventName, handler);
+                    if (instanceObj) {
+                        var handler;
+                        handler = function(e) {
+                            instanceObj.removeEventListener(eventName, handler);
+                            callback();
+                        };
+                        instanceObj.addEventListener(eventName, handler);
+                    } else {
                         callback();
-                    };
-                    instanceObj.addEventListener(eventName, handler);
-                } else {
-                    callback();
-                }
-            }, id, moduleName, eventName);
-        }
+                    }
+                }, id, moduleName, eventName);
+            }
 
-        browser.injectScript = function(path) {
-            return browser.executeAsyncScript(function(path) {
-                var head = document.getElementsByTagName('head')[0];
-                var script = document.createElement('script');
-                script.type = 'text/javascript';
-                script.onload = function() {
-                    callback();
-                }
-                script.src = path;
-                head.appendChild(script);
-            }, browser.basePath + path);
+            browser.injectScript = function(path) {
+                return browser.executeAsyncScript(function(path) {
+                    var head = document.getElementsByTagName('head')[0];
+                    var script = document.createElement('script');
+                    script.type = 'text/javascript';
+                    script.onload = function() {
+                        callback();
+                    }
+                    script.src = path;
+                    head.appendChild(script);
+                }, browser.basePath + path);
 
-        }
+            }
 
-        browser.injectCss = function(content) {
-            return browser.wait(browser.executeScript(`
-                var style = document.createElement('style');
-                style.id = 'browsercss';
-                if (style.styleSheet) {style.styleSheet.cssText = '` + content + `';}
-                else{style.appendChild(document.createTextNode('` + content + `'));}
-                document.head.appendChild(style);
-                `));
-        }
+            browser.injectCss = function(content) {
+                return browser.wait(browser.executeScript(`
+                        var style = document.createElement('style');
+                        style.id = 'browsercss';
+                        if (style.styleSheet) {style.styleSheet.cssText = '` + content + `';}
+                        else{style.appendChild(document.createTextNode('` + content + `'));}
+                        document.head.appendChild(style);
+                        `));
+            }
 
-        browser.load = function(path) {
-            browser.get(browser.basePath + path);
-            if (browser.css) {
-                browser.injectCss(browser.css);
+            browser.load = function(path) {
+                browser.get(browser.basePath + path);
+                if (browser.css) {
+                    browser.injectCss(browser.css);
+                }
             }
-        }
+        });
+
     },
 };
 
-if (os.hostname().indexOf('jenkins') !== -1) {
-    exports.config.seleniumAddress = 'http://localhost:4444/wd/hub'
+//Server Configuration 
+if (/jenkins/.test(os.hostname())) {
+    exports.config.multiCapabilities.push({
+        'browserName': 'internet explorer'
+    });
+    exports.config.multiCapabilities.push({
+        'browserName': 'MicrosoftEdge'
+    });
+    exports.config.multiCapabilities.push({
+        'browserName': 'firefox'
+    });
+    exports.config.seleniumAddress = seleniumAddress;
+} else {
+    // Local Testing Purpose
+    if (config.browsers && config.browsers.length) {
+        for (var i = 0; i < config.browsers.length; i++) {
+            var browserName = config.browsers[i];
+            exports.config.multiCapabilities.push({
+                'browserName': browserName
+            });
+        }
+    } else {
+        if (os.platform() === 'win32') {
+            exports.config.multiCapabilities.push({
+                'browserName': 'internet explorer'
+            });
+            if (Number(os.release().split('.')[0]) >= 10) {
+                exports.config.multiCapabilities.push({
+                    'browserName': 'MicrosoftEdge'
+                });
+            }
+        }
+        exports.config.multiCapabilities.push({
+            'browserName': 'firefox'
+        });
+    }
+
+    exports.config.seleniumAddress = config.seleniumAddress || 'http://localhost:4444/wd/hub/';
+}
+
+function createF(path) {
+    shell.mkdir('-p', path);
 }

package.json

 {
   "name": "@syncfusion/ej2-base",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "description": "Essential JS 2 Base Library",
@@ -5,0 +5,0 @@ "author": "Syncfusion Inc.",

src/draggable-model.d.ts

@@ -118,2 +118,7 @@ import { Base } from './base';import { Browser } from './browser';import { isVisible } from './dom';import { Property, Complex, NotifyPropertyChanges, INotifyPropertyChanged, Event } from './notify-property-change';import { EventHandler } from './event-handler';import { ChildProperty } from './child-property';import { select, closest, setStyleAttribute, addClass, createElement } from './dom';import { extend, isUndefined, isNullOrUndefined, compareElementParent } from './util';
 
+    /**
+     * @private
+     */
+    preventDefault?: boolean;
+
 }

src/draggable.d.ts

@@ -221,2 +221,6 @@ import { Base } from './base';
     skipDistanceCheck: boolean;
+    /**
+     * @private
+     */
+    preventDefault: boolean;
     private target;
@@ -223,0 +227,0 @@ private initialPosition;

src/draggable.js

@@ -75,3 +75,3 @@ var __extends = (this && this.__extends) || (function () {
             this.target = evt.currentTarget;
-            if (!util_1.isUndefined(evt.changedTouches)) {
+            if (this.preventDefault && !util_1.isUndefined(evt.changedTouches)) {
                 evt.preventDefault();
@@ -99,5 +99,9 @@ }
         Draggable.prototype.intDragStart = function (evt) {
-            if (!util_1.isUndefined(evt.changedTouches) && (evt.changedTouches.length !== 1)) {
+            var isChangeTouch = !util_1.isUndefined(evt.changedTouches);
+            if (isChangeTouch && (evt.changedTouches.length !== 1)) {
                 return;
             }
+            if (isChangeTouch) {
+                evt.preventDefault();
+            }
             var intCordinate = this.getCoordinates(evt);
@@ -481,2 +485,5 @@ var pos;
     ], Draggable.prototype, "skipDistanceCheck", void 0);
+    __decorate([
+        notify_property_change_1.Property(true)
+    ], Draggable.prototype, "preventDefault", void 0);
     Draggable = Draggable_1 = __decorate([
@@ -483,0 +490,0 @@ notify_property_change_1.NotifyPropertyChanges

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

2583291

increased by0.38%

Lines of code

25072

increased by0.37%

No dependency changes