unified a pice of code between object.js and core.js + npm update

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2018-08-21 02:30:15 +03:00
parent 6bebc1a7a2
commit 2bf500f6e7
3 changed files with 6 additions and 27 deletions

View File

@ -231,30 +231,9 @@ if(typeof(window) != 'undefined'){
var doc = var doc =
module.doc = module.doc =
function(strings, ...values){ function(strings, ...values){
var lines = strings return object.normalizeIndent(strings
.map(function(s, i){ return s + (values[i] || '') }) .map(function(s, i){ return s + (values[i] || '') })
.join('') .join('')) }
.split(/\n/g)
// get the common whitespae offset...
var l = lines
.reduce(function(l, e, i){
var indent = e.length - e.trimLeft().length
return (
// ignore empty lines...
e.trim().length == 0
// ignore 0 indent of first line...
|| (i == 0 && indent == 0) ? l
: l < 0 ?
indent
: Math.min(l, indent))
}, -1)
return lines
.map(function(line, i){
return i == 0 ? line : line.slice(l) })
.join('\n')
}
// Indicate that an action is not intended for direct use... // Indicate that an action is not intended for direct use...

View File

@ -1158,9 +1158,9 @@
} }
}, },
"ig-object": { "ig-object": {
"version": "1.0.6", "version": "1.0.7",
"resolved": "https://registry.npmjs.org/ig-object/-/ig-object-1.0.6.tgz", "resolved": "https://registry.npmjs.org/ig-object/-/ig-object-1.0.7.tgz",
"integrity": "sha512-M6WkUMIhoPypsmgmMKl88vaHob7v3k9+tuEYuusYEWaRNVEeftZerFkj4Aby8vIiXCAilHup5FNepDPgfihNTw==" "integrity": "sha512-bBlxP0AE9oxjUEtIzgZN302nuUAYycAOeh2F2D/z3OSl4zUc+R0Cb9HMpwOO4gZfc6I4ZV9tr/Ax1lk4KkW/aQ=="
}, },
"image-size": { "image-size": {
"version": "0.5.5", "version": "0.5.5",

View File

@ -28,7 +28,7 @@
"guarantee-events": "^1.0.0", "guarantee-events": "^1.0.0",
"ig-actions": "^3.19.3", "ig-actions": "^3.19.3",
"ig-features": "^3.3.4", "ig-features": "^3.3.4",
"ig-object": "^1.0.6", "ig-object": "^1.0.7",
"moment": "^2.22.2", "moment": "^2.22.2",
"openseadragon": "^2.4.0", "openseadragon": "^2.4.0",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",