diff --git a/karma.conf.js b/karma.conf.js index 4f89615..e325cca 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -17,6 +17,7 @@ module.exports = function(config, preConfig) { 'node_modules/big.js/big.js', 'node_modules/es6-promise/dist/es6-promise.auto.min.js', 'node_modules/pikaday/pikaday.js', + 'node_modules/dialog-promise/lib/dialog-promise.js', 'node_modules/require-bro/lib/polyfills-bro.js', 'node_modules/require-bro/lib/require-bro.js', 'node_modules/like-ar/like-ar.js', @@ -82,7 +83,7 @@ module.exports = function(config, preConfig) { // start these browsers // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: ['Firefox', 'PhantomJS'].concat((process.env.TRAVIS?[]:['Chrome','Safari','IE'])), + browsers: ['Firefox', 'PhantomJS'].concat((process.env.TRAVIS?[]:['Chrome'/*,'Safari'*/,'IE'])), /* NO CAMBIAR MÁS BROWSERS DIRECTO DESDE ACÁ, INVOCAR DESDE LA LÍNEA DE PARÁMETROS ASÍ: npm run infinito -- --browsers Chrome,PhantomJS npm run infinito -- --browsers Chrome diff --git a/lib/typed-controls.js b/lib/typed-controls.js index 90b9657..1068d0c 100644 --- a/lib/typed-controls.js +++ b/lib/typed-controls.js @@ -827,10 +827,16 @@ TypedControls.adaptElement = function adaptElement(domElement, typerOrTypeInfo){ } domElement.setTypedValue = function setTypedValue(typedValue, fromUserInteraction){ var self = this - var isSameValue = bestGlobals.sameValue(self.previousValue, typedValue); + var isSameValue; + if(setup){ + isSameValue = bestGlobals.sameValue(self.previousValue, typedValue); + } var setTypedValueFun = function setTypedValueFun(){ var typer=self.controledType; typer.validateTypedData(typedValue); + if(!setup){ + isSameValue = bestGlobals.sameValue(self.previousValue, typedValue); + } self.setValidatedTypedValue(typedValue); if(fromUserInteraction){ if(!isSameValue){ diff --git a/package.json b/package.json index 0e74ccb..5ccc51b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "typed-controls", "description": "typed controls, widgets and others", - "version": "0.8.2", + "version": "0.8.3", "author": "Codenautas ", "license": "MIT", "repository": "codenautas/typed-controls", @@ -25,7 +25,7 @@ "best-globals": "~0.10.5", "js-to-html": "~1.0.3", "like-ar": "~0.2.7", - "type-store": "~0.2.25", + "type-store": "~0.2.27", "dialog-promise": "~0.9.4" }, "devDependencies": { @@ -33,7 +33,7 @@ "body-parser": "~1.18.3", "casperjs": "~1.1.4", "cookie-parser": "~1.4.3", - "es6-promise": "~4.2.4", + "es6-promise": "~4.2.5", "esprima": "~4.0.1", "expect.js": "~0.3.1", "express": "~4.16.3", @@ -41,7 +41,7 @@ "express-useragent": "~1.0.12", "fs-extra": "~7.0.0", "istanbul": "~0.4.5", - "karma": "~2.0.5", + "karma": "~3.0.0", "karma-chrome-launcher": "~2.2.0", "karma-coverage": "~1.1.2", "karma-coverage-html-index-reporter": "~1.0.2", @@ -58,15 +58,15 @@ "pug": "~2.0.3", "read-yaml-promise": "~1.0.2", "slimerjs": "~1.0.0", - "ajax-best-promise": "~0.3.4", + "ajax-best-promise": "~0.3.5", "discrepances": "~0.2.3", "extension-serve-static": "~0.1.6", "json4all": "~0.3.10", - "require-bro": "~0.1.11", + "require-bro": "~0.1.12", "self-explain": "~0.10.18" }, "optionalDependencies": { - "dialog-promise": "~0.9.1", + "dialog-promise": "~0.9.5", "castellano": "~0.1.3" }, "engines": { diff --git a/server/pdemo-server.js b/server/pdemo-server.js index 203a3c0..c1edbbd 100644 --- a/server/pdemo-server.js +++ b/server/pdemo-server.js @@ -88,6 +88,7 @@ app.get('/demo', function(req,res){ html.div({style:"width:100px", "typed-controls-direct-input":true, id:'textDiv'},"with nl\n"), html.script({src:'lib10/pikaday.js'}), html.script({src:'lib6/big.js'}), + html.script({src:'lib11/dialog-promise.js'}), html.script({src:'lib4/require-bro.js'}), html.script({src:'lib8/like-ar.js'}), html.script({src:'lib3/best-globals.js'}), @@ -102,6 +103,7 @@ app.get('/demo', function(req,res){ ]).toHtmlDoc({title:'typed-controls demo'})); }); +app.use('/lib11',extensionServeStatic('./node_modules/dialog-promise/lib', {staticExtensions: ['js']})); app.use('/lib10',extensionServeStatic('./node_modules/pikaday', {staticExtensions: ['js']})); app.use('/lib9',extensionServeStatic('./node_modules/discrepances/lib', {staticExtensions: ['js']})); app.use('/lib8',extensionServeStatic('./node_modules/like-ar', {staticExtensions: ['js']})); diff --git a/test/test-adapter.js b/test/test-adapter.js index 7183a00..bf7c4a7 100644 --- a/test/test-adapter.js +++ b/test/test-adapter.js @@ -104,7 +104,8 @@ var toTest = { {value:null , display:'' }, // ATENCIÓN IE 11.0 ordena los atributos alfabéticamente, los otros ponen class después. {value:bestGlobals.date.iso('2015-12-31') , display:'31/12/2015' , htmlDisplay: - ''+ + (agentInfo.browser=='IE'?'': + '')+ '31'+ '/'+ '12'+