From 73a5d2204172f2111fa444b11834834eb072c6c5 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Thu, 23 Feb 2017 11:10:33 +0200 Subject: [PATCH] feature(bower) smalltalk v2.1.4 --- .dockerignore | 2 ++ .gitignore | 2 ++ .npmignore | 12 ++++++++++++ bower.json | 4 ++-- modules/smalltalk/.bower.json | 13 +++++++------ modules/smalltalk/ChangeLog | 15 +++++++++++++++ modules/smalltalk/README.md | 8 ++++++++ modules/smalltalk/dist/smalltalk.min.js | 2 +- modules/smalltalk/dist/smalltalk.poly.min.js | 2 +- modules/smalltalk/lib/smalltalk.js | 6 +++--- modules/smalltalk/package.json | 12 ++++++------ 11 files changed, 59 insertions(+), 19 deletions(-) diff --git a/.dockerignore b/.dockerignore index 2006abe9..430fc4eb 100644 --- a/.dockerignore +++ b/.dockerignore @@ -12,6 +12,8 @@ modules/fancybox/lib/ modules/fancybox/demo modules/fancybox/sprite.psd +modules/execon + client legacy server_ diff --git a/.gitignore b/.gitignore index f7204070..37a6e10f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ modules/fancybox/lib/ modules/fancybox/demo modules/fancybox/sprite.psd +modules/execon + legacy server_ diff --git a/.npmignore b/.npmignore index 228a2de9..54bbf487 100644 --- a/.npmignore +++ b/.npmignore @@ -6,6 +6,18 @@ shell test coverage +modules/jquery/dist +modules/jquery/external +modules/jquery/src + +!modules/jquery/dist/jquery.min.js + +modules/fancybox/lib/ +modules/fancybox/demo +modules/fancybox/sprite.psd + +modules/execon + app.json circle.yml diff --git a/bower.json b/bower.json index e27ab744..dda52f46 100644 --- a/bower.json +++ b/bower.json @@ -35,7 +35,7 @@ "menu": "~1.0.2", "olark": "^1.0.0", "philip": "^1.3.3", - "smalltalk": "2.1.3", - "jquery": "3.1.1" + "jquery": "3.1.1", + "smalltalk": "2.1.4" } } diff --git a/modules/smalltalk/.bower.json b/modules/smalltalk/.bower.json index 7b9d784c..a0ea7667 100644 --- a/modules/smalltalk/.bower.json +++ b/modules/smalltalk/.bower.json @@ -24,14 +24,15 @@ "test" ], "dependencies": {}, - "version": "2.1.3", - "_release": "2.1.3", + "version": "2.1.4", + "_release": "2.1.4", "_resolution": { "type": "version", - "tag": "v2.1.3", - "commit": "9914a8d9d581af0594e140c2d1af92892a626c94" + "tag": "v2.1.4", + "commit": "e543b688db2bb971195812138c3cd7b4dde2109d" }, "_source": "https://github.com/coderaiser/smalltalk.git", - "_target": "2.1.3", - "_originalSource": "smalltalk" + "_target": "^2.1.4", + "_originalSource": "smalltalk", + "_direct": true } \ No newline at end of file diff --git a/modules/smalltalk/ChangeLog b/modules/smalltalk/ChangeLog index f848459a..5eb65675 100644 --- a/modules/smalltalk/ChangeLog +++ b/modules/smalltalk/ChangeLog @@ -1,3 +1,18 @@ +2017.02.23, v2.1.4 + +fix: +- (smalltalk) double quotes (#2) + +feature: +- (package) stylelint-config-standard v16.0.0 +- (package) browserify v14.0.0 +- (package) systemjs v0.20.2 +- (package) nyc v10.0.0 +- (package) stylelint-config-standard v15.0.0 +- (package) nyc v9.0.1 +- (package) stylelint-config-standard v14.0.0 + + 2016.10.04, v2.1.3 feature: diff --git a/modules/smalltalk/README.md b/modules/smalltalk/README.md index ad17b7d8..8337b246 100644 --- a/modules/smalltalk/README.md +++ b/modules/smalltalk/README.md @@ -61,6 +61,14 @@ smalltalk.prompt('Question', 'How old are you?', '10').then(function(value) { }); ``` +## Bundlers + +When `webpack` `rollup` or `browserify` used, you can import `es5` version with: + +```js +import smalltalk from 'smalltalk/legacy'; +``` + #License MIT diff --git a/modules/smalltalk/dist/smalltalk.min.js b/modules/smalltalk/dist/smalltalk.min.js index 99c89074..7e0c654f 100644 --- a/modules/smalltalk/dist/smalltalk.min.js +++ b/modules/smalltalk/dist/smalltalk.min.js @@ -1 +1 @@ -!function(n){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=n();else if("function"==typeof define&&define.amd)define([],n);else{var e;e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,e.smalltalk=n()}}(function(){return function n(e,t,r){function o(u,i){if(!t[u]){if(!e[u]){var c="function"==typeof require&&require;if(!i&&c)return c(u,!0);if(a)return a(u,!0);var f=new Error("Cannot find module '"+u+"'");throw f.code="MODULE_NOT_FOUND",f}var l=t[u]={exports:{}};e[u][0].call(l.exports,function(n){var t=e[u][1][n];return o(t?t:n)},l,l.exports,n,e,t,r)}return t[u].exports}for(var a="function"==typeof require&&require,u=0;u\n
\n
'+n+'
\n
\n '+e+"\n "+t+'\n
\n
\n
'+r.map(function(n,e){return""}).join("")+"\n
\n
\n "}function o(n,e,t,o,u){var i=void 0,c=void 0,s=document.createElement("div"),p=["cancel","close","ok"],v=new Promise(function(n,e){var t=u&&!u.cancel,r=function(){};i=n,c=t?r:e}),m=r(n,e,t,o);return s.innerHTML=m,s.className="smalltalk",document.body.appendChild(s),l(s,["ok","input"]).forEach(function(n){return n.focus()}),l(s,["input"]).forEach(function(n){n.setSelectionRange(0,t.length)}),d("click",s,p,function(n){return f(n.target,s,i,c)}),["click","contextmenu"].forEach(function(n){return s.addEventListener(n,function(){return l(s,["ok","input"]).forEach(function(n){return n.focus()})})}),s.addEventListener("keydown",a(s,i,c)),v}function a(n,e,t){return function(r){var o={ENTER:13,ESC:27,TAB:9,LEFT:37,UP:38,RIGHT:39,DOWN:40},a=r.keyCode,d=r.target,s=["ok","cancel","input"],p=l(n,s).map(function(n){return u(n)}),m=void 0;switch(a){case o.ENTER:f(d,n,e,t),r.preventDefault();break;case o.ESC:v(),t();break;case o.TAB:r.shiftKey&&c(n,p),c(n,p),r.preventDefault();break;default:m=["left","right","up","down"].some(function(n){return a===o[n.toUpperCase()]}),m&&i(n,p)}r.stopPropagation()}}function u(n){return n.getAttribute("data-name").replace("js-","")}function i(n,e){var t="",r=document.activeElement,o=u(r),a=/ok|cancel/.test(o),i=e.length-1;"input"!==o&&i&&a&&(t="cancel"===o?"ok":"cancel",l(n,[t]).forEach(function(n){n.focus()}))}function c(n,e){var t=document.activeElement,r=u(t),o=e.length-1,a=e.indexOf(r);a===o?a=0:a1?e-1:0),r=1;r';return o(n,e,u,E,r)},t.confirm=function(n,e,t){return o(n,e,"",E,t)}},{}]},{},["smalltalk"])("smalltalk")}); +!function(n){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=n();else if("function"==typeof define&&define.amd)define([],n);else{var e;e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,e.smalltalk=n()}}(function(){return function n(e,t,r){function o(u,i){if(!t[u]){if(!e[u]){var c="function"==typeof require&&require;if(!i&&c)return c(u,!0);if(a)return a(u,!0);var f=new Error("Cannot find module '"+u+"'");throw f.code="MODULE_NOT_FOUND",f}var l=t[u]={exports:{}};e[u][0].call(l.exports,function(n){var t=e[u][1][n];return o(t?t:n)},l,l.exports,n,e,t,r)}return t[u].exports}for(var a="function"==typeof require&&require,u=0;u\n
\n
'+n+'
\n
\n '+e+"\n "+t+'\n
\n
\n
'+r.map(function(n,e){return""}).join("")+"\n
\n
\n "}function o(n,e,t,o,u){var i=void 0,c=void 0,s=document.createElement("div"),p=["cancel","close","ok"],v=new Promise(function(n,e){var t=u&&!u.cancel,r=function(){};i=n,c=t?r:e}),m=r(n,e,t,o);return s.innerHTML=m,s.className="smalltalk",document.body.appendChild(s),l(s,["ok","input"]).forEach(function(n){return n.focus()}),l(s,["input"]).forEach(function(n){n.setSelectionRange(0,t.length)}),d("click",s,p,function(n){return f(n.target,s,i,c)}),["click","contextmenu"].forEach(function(n){return s.addEventListener(n,function(){return l(s,["ok","input"]).forEach(function(n){return n.focus()})})}),s.addEventListener("keydown",a(s,i,c)),v}function a(n,e,t){return function(r){var o={ENTER:13,ESC:27,TAB:9,LEFT:37,UP:38,RIGHT:39,DOWN:40},a=r.keyCode,d=r.target,s=["ok","cancel","input"],p=l(n,s).map(function(n){return u(n)}),m=void 0;switch(a){case o.ENTER:f(d,n,e,t),r.preventDefault();break;case o.ESC:v(),t();break;case o.TAB:r.shiftKey&&c(n,p),c(n,p),r.preventDefault();break;default:m=["left","right","up","down"].some(function(n){return a===o[n.toUpperCase()]}),m&&i(n,p)}r.stopPropagation()}}function u(n){return n.getAttribute("data-name").replace("js-","")}function i(n,e){var t="",r=document.activeElement,o=u(r),a=/ok|cancel/.test(o),i=e.length-1;"input"!==o&&i&&a&&(t="cancel"===o?"ok":"cancel",l(n,[t]).forEach(function(n){n.focus()}))}function c(n,e){var t=document.activeElement,r=u(t),o=e.length-1,a=e.indexOf(r);a===o?a=0:a1?e-1:0),r=1;r2&&void 0!==arguments[2]?arguments[2]:"",r=arguments[3],a=t.replace(/\"/g,"""),u='';return o(n,e,u,h,r)},t.confirm=function(n,e,t){return o(n,e,"",h,t)}},{}]},{},["smalltalk"])("smalltalk")}); diff --git a/modules/smalltalk/dist/smalltalk.poly.min.js b/modules/smalltalk/dist/smalltalk.poly.min.js index c154ceb5..cf8408b8 100644 --- a/modules/smalltalk/dist/smalltalk.poly.min.js +++ b/modules/smalltalk/dist/smalltalk.poly.min.js @@ -1 +1 @@ -!function(e){function n(){}function t(e,n){return function(){e.apply(n,arguments)}}function o(e){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof e)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=void 0,this._deferreds=[],s(e,this)}function i(e,n){for(;3===e._state;)e=e._value;return 0===e._state?void e._deferreds.push(n):(e._handled=!0,void o._immediateFn(function(){var t=1===e._state?n.onFulfilled:n.onRejected;if(null===t)return void(1===e._state?r:u)(n.promise,e._value);var o;try{o=t(e._value)}catch(i){return void u(n.promise,i)}r(n.promise,o)}))}function r(e,n){try{if(n===e)throw new TypeError("A promise cannot be resolved with itself.");if(n&&("object"==typeof n||"function"==typeof n)){var i=n.then;if(n instanceof o)return e._state=3,e._value=n,void f(e);if("function"==typeof i)return void s(t(i,n),e)}e._state=1,e._value=n,f(e)}catch(r){u(e,r)}}function u(e,n){e._state=2,e._value=n,f(e)}function f(e){2===e._state&&0===e._deferreds.length&&o._immediateFn(function(){e._handled||o._unhandledRejectionFn(e._value)});for(var n=0,t=e._deferreds.length;n\n
\n
'+n+'
\n
\n '+e+"\n "+t+'\n
\n
\n
'+r.map(function(n,e){return""}).join("")+"\n
\n
\n "}function o(n,e,t,o,u){var i=void 0,c=void 0,s=document.createElement("div"),p=["cancel","close","ok"],v=new Promise(function(n,e){var t=u&&!u.cancel,r=function(){};i=n,c=t?r:e}),m=r(n,e,t,o);return s.innerHTML=m,s.className="smalltalk",document.body.appendChild(s),l(s,["ok","input"]).forEach(function(n){return n.focus()}),l(s,["input"]).forEach(function(n){n.setSelectionRange(0,t.length)}),d("click",s,p,function(n){return f(n.target,s,i,c)}),["click","contextmenu"].forEach(function(n){return s.addEventListener(n,function(){return l(s,["ok","input"]).forEach(function(n){return n.focus()})})}),s.addEventListener("keydown",a(s,i,c)),v}function a(n,e,t){return function(r){var o={ENTER:13,ESC:27,TAB:9,LEFT:37,UP:38,RIGHT:39,DOWN:40},a=r.keyCode,d=r.target,s=["ok","cancel","input"],p=l(n,s).map(function(n){return u(n)}),m=void 0;switch(a){case o.ENTER:f(d,n,e,t),r.preventDefault();break;case o.ESC:v(),t();break;case o.TAB:r.shiftKey&&c(n,p),c(n,p),r.preventDefault();break;default:m=["left","right","up","down"].some(function(n){return a===o[n.toUpperCase()]}),m&&i(n,p)}r.stopPropagation()}}function u(n){return n.getAttribute("data-name").replace("js-","")}function i(n,e){var t="",r=document.activeElement,o=u(r),a=/ok|cancel/.test(o),i=e.length-1;"input"!==o&&i&&a&&(t="cancel"===o?"ok":"cancel",l(n,[t]).forEach(function(n){n.focus()}))}function c(n,e){var t=document.activeElement,r=u(t),o=e.length-1,a=e.indexOf(r);a===o?a=0:a1?e-1:0),r=1;r';return o(n,e,u,E,r)},t.confirm=function(n,e,t){return o(n,e,"",E,t)}},{}]},{},["smalltalk"])("smalltalk")}); +!function(e){function n(){}function t(e,n){return function(){e.apply(n,arguments)}}function o(e){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof e)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=void 0,this._deferreds=[],s(e,this)}function i(e,n){for(;3===e._state;)e=e._value;return 0===e._state?void e._deferreds.push(n):(e._handled=!0,void o._immediateFn(function(){var t=1===e._state?n.onFulfilled:n.onRejected;if(null===t)return void(1===e._state?r:u)(n.promise,e._value);var o;try{o=t(e._value)}catch(i){return void u(n.promise,i)}r(n.promise,o)}))}function r(e,n){try{if(n===e)throw new TypeError("A promise cannot be resolved with itself.");if(n&&("object"==typeof n||"function"==typeof n)){var i=n.then;if(n instanceof o)return e._state=3,e._value=n,void f(e);if("function"==typeof i)return void s(t(i,n),e)}e._state=1,e._value=n,f(e)}catch(r){u(e,r)}}function u(e,n){e._state=2,e._value=n,f(e)}function f(e){2===e._state&&0===e._deferreds.length&&o._immediateFn(function(){e._handled||o._unhandledRejectionFn(e._value)});for(var n=0,t=e._deferreds.length;n\n
\n
'+n+'
\n
\n '+e+"\n "+t+'\n
\n
\n
'+r.map(function(n,e){return""}).join("")+"\n
\n
\n "}function o(n,e,t,o,u){var i=void 0,c=void 0,s=document.createElement("div"),p=["cancel","close","ok"],v=new Promise(function(n,e){var t=u&&!u.cancel,r=function(){};i=n,c=t?r:e}),m=r(n,e,t,o);return s.innerHTML=m,s.className="smalltalk",document.body.appendChild(s),l(s,["ok","input"]).forEach(function(n){return n.focus()}),l(s,["input"]).forEach(function(n){n.setSelectionRange(0,t.length)}),d("click",s,p,function(n){return f(n.target,s,i,c)}),["click","contextmenu"].forEach(function(n){return s.addEventListener(n,function(){return l(s,["ok","input"]).forEach(function(n){return n.focus()})})}),s.addEventListener("keydown",a(s,i,c)),v}function a(n,e,t){return function(r){var o={ENTER:13,ESC:27,TAB:9,LEFT:37,UP:38,RIGHT:39,DOWN:40},a=r.keyCode,d=r.target,s=["ok","cancel","input"],p=l(n,s).map(function(n){return u(n)}),m=void 0;switch(a){case o.ENTER:f(d,n,e,t),r.preventDefault();break;case o.ESC:v(),t();break;case o.TAB:r.shiftKey&&c(n,p),c(n,p),r.preventDefault();break;default:m=["left","right","up","down"].some(function(n){return a===o[n.toUpperCase()]}),m&&i(n,p)}r.stopPropagation()}}function u(n){return n.getAttribute("data-name").replace("js-","")}function i(n,e){var t="",r=document.activeElement,o=u(r),a=/ok|cancel/.test(o),i=e.length-1;"input"!==o&&i&&a&&(t="cancel"===o?"ok":"cancel",l(n,[t]).forEach(function(n){n.focus()}))}function c(n,e){var t=document.activeElement,r=u(t),o=e.length-1,a=e.indexOf(r);a===o?a=0:a1?e-1:0),r=1;r2&&void 0!==arguments[2]?arguments[2]:"",r=arguments[3],a=t.replace(/\"/g,"""),u='';return o(n,e,u,h,r)},t.confirm=function(n,e,t){return o(n,e,"",h,t)}},{}]},{},["smalltalk"])("smalltalk")}); diff --git a/modules/smalltalk/lib/smalltalk.js b/modules/smalltalk/lib/smalltalk.js index ec9fa937..a441b1c2 100644 --- a/modules/smalltalk/lib/smalltalk.js +++ b/modules/smalltalk/lib/smalltalk.js @@ -9,9 +9,9 @@ exports.alert = (title, msg) => { return showDialog(title, msg, '', BUTTON_OK, {cancel: false}); }; -exports.prompt = (title, msg, value, options) => { - const val = value || ''; - const valueStr = ``; +exports.prompt = (title, msg, value = '', options) => { + const val = value.replace(/\"/g, '"'); + const valueStr = ``; return showDialog(title, msg, valueStr, BUTTON_OK_CANCEL, options); }; diff --git a/modules/smalltalk/package.json b/modules/smalltalk/package.json index 1b282916..4f2ab56d 100644 --- a/modules/smalltalk/package.json +++ b/modules/smalltalk/package.json @@ -1,6 +1,6 @@ { "name": "smalltalk", - "version": "2.1.3", + "version": "2.1.4", "description": "Promise-based Alert, Confirm and Prompt replacement", "homepage": "http://github.com/coderaiser/smalltalk", "repository": { @@ -23,7 +23,7 @@ "coverage": "nyc npm test", "report": "nyc report --reporter=text-lcov | coveralls", "compile:js": "babel -d legacy lib", - "compile:css": "postcss --use autoprefixer css/*.css -d dist", + "compile:css": "postcss css/*.css -d dist --use autoprefixer", "minify:css": "minify dist/smalltalk.css > dist/smalltalk.min.css", "minify:js": "minify dist/smalltalk.js > dist/smalltalk.min.js", "minify:js-native": "minify dist/smalltalk.native.js > dist/smalltalk.native.min.js", @@ -64,22 +64,22 @@ "autoprefixer": "^6.3.7", "babel-cli": "^6.1.1", "babel-preset-es2015": "^6.0.15", - "browserify": "^13.0.1", + "browserify": "^14.0.0", "coveralls": "^2.11.11", "eslint": "^3.0.1", "jscs": "^3.0.3", "jshint": "^2.8.0", "minify": "^2.0.0", "nodemon": "^1.9.2", - "nyc": "^8.1.0", + "nyc": "^10.0.0", "postcss-cli": "^2.5.2", "promise-polyfill": "^6.0.0", "redrun": "^5.0.1", "rimraf": "^2.5.3", "sinon": "^1.17.4", "stylelint": "^7.0.2", - "stylelint-config-standard": "^13.0.0", - "systemjs": "^0.19.31", + "stylelint-config-standard": "^16.0.0", + "systemjs": "^0.20.2", "tape": "^4.6.0" } }