diff --git a/build.js b/build.js index e7ba3455c..79529345f 100755 --- a/build.js +++ b/build.js @@ -608,7 +608,6 @@ ' Commands:', '', ' lodash backbone Build with only methods required by Backbone', - ' lodash csp Build supporting default Content Security Policy restrictions', ' lodash legacy Build tailored for older environments without ES5 support', ' lodash modern Build tailored for newer environments with ES5 support', ' lodash mobile Build without method compilation and most bug fixes for old browsers', @@ -630,7 +629,7 @@ ' (e.g. `lodash settings="{interpolate:/{{([\\s\\S]+?)}}/g}"`)', ' lodash moduleId=... The AMD module ID of Lo-Dash, which defaults to “lodash”, used by precompiled templates', '', - ' All arguments, except `legacy` with `csp`, `mobile`, `modern`, or `underscore`, may be combined.', + ' All arguments, except `legacy` with `mobile`, `modern`, or `underscore`, may be combined.', ' Unless specified by `-o` or `--output`, all files created are saved to the current working directory.', '', ' Options:', @@ -1599,10 +1598,10 @@ var isMinify = _.contains(options, '-m') || _.contains(options, '--minify'); // flag to specify a mobile build - var isMobile = isCSP || _.contains(options, 'mobile'); + var isMobile = _.contains(options, 'mobile'); // flag to specify a modern build - var isModern = isMobile || _.contains(options, 'modern'); + var isModern = isCSP || isMobile || _.contains(options, 'modern'); // flag to specify a modularize build var isModularize = _.contains(options, 'modularize'); diff --git a/dist/lodash.compat.js b/dist/lodash.compat.js index afbc6a053..254c86b6d 100644 --- a/dist/lodash.compat.js +++ b/dist/lodash.compat.js @@ -4943,9 +4943,6 @@ * Note: In the development build, `_.template` utilizes sourceURLs for easier * debugging. See http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl * - * Note: Lo-Dash may be used in Chrome extensions by either creating a `lodash csp` - * build and using precompiled templates, or loading Lo-Dash in a sandbox. - * * For more information on precompiling templates see: * http://lodash.com/#custom-builds * diff --git a/dist/lodash.js b/dist/lodash.js index eb8e8a60b..5256d5b93 100644 --- a/dist/lodash.js +++ b/dist/lodash.js @@ -4685,9 +4685,6 @@ * Note: In the development build, `_.template` utilizes sourceURLs for easier * debugging. See http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl * - * Note: Lo-Dash may be used in Chrome extensions by either creating a `lodash csp` - * build and using precompiled templates, or loading Lo-Dash in a sandbox. - * * For more information on precompiling templates see: * http://lodash.com/#custom-builds * diff --git a/dist/lodash.underscore.js b/dist/lodash.underscore.js index c321bbe31..f356df166 100644 --- a/dist/lodash.underscore.js +++ b/dist/lodash.underscore.js @@ -3907,9 +3907,6 @@ * Note: In the development build, `_.template` utilizes sourceURLs for easier * debugging. See http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl * - * Note: Lo-Dash may be used in Chrome extensions by either creating a `lodash csp` - * build and using precompiled templates, or loading Lo-Dash in a sandbox. - * * For more information on precompiling templates see: * http://lodash.com/#custom-builds * diff --git a/doc/README.md b/doc/README.md index aaa58e5eb..24fcc1585 100644 --- a/doc/README.md +++ b/doc/README.md @@ -972,7 +972,7 @@ _.isArray(squares.value()); ### `_.tap(value, interceptor)` -# [Ⓢ](https://github.com/bestiejs/lodash/blob/master/lodash.js#L5231 "View in source") [Ⓣ][1] +# [Ⓢ](https://github.com/bestiejs/lodash/blob/master/lodash.js#L5228 "View in source") [Ⓣ][1] Invokes `interceptor` with the `value` as the first argument, and then returns `value`. The purpose of this method is to "tap into" a method chain, in order to perform operations on intermediate results within the chain. @@ -1002,7 +1002,7 @@ _([1, 2, 3, 4]) ### `_.prototype.toString()` -# [Ⓢ](https://github.com/bestiejs/lodash/blob/master/lodash.js#L5248 "View in source") [Ⓣ][1] +# [Ⓢ](https://github.com/bestiejs/lodash/blob/master/lodash.js#L5245 "View in source") [Ⓣ][1] Produces the `toString` result of the wrapped value. @@ -1023,7 +1023,7 @@ _([1, 2, 3]).toString(); ### `_.prototype.valueOf()` -# [Ⓢ](https://github.com/bestiejs/lodash/blob/master/lodash.js#L5265 "View in source") [Ⓣ][1] +# [Ⓢ](https://github.com/bestiejs/lodash/blob/master/lodash.js#L5262 "View in source") [Ⓣ][1] Extracts the wrapped value. @@ -3546,14 +3546,12 @@ Create a new `lodash` function using the given `context` object. ### `_.template(text, data, options)` -# [Ⓢ](https://github.com/bestiejs/lodash/blob/master/lodash.js#L5031 "View in source") [Ⓣ][1] +# [Ⓢ](https://github.com/bestiejs/lodash/blob/master/lodash.js#L5028 "View in source") [Ⓣ][1] A micro-templating method that handles arbitrary delimiters, preserves whitespace, and correctly escapes quotes within interpolated code. Note: In the development build, `_.template` utilizes sourceURLs for easier debugging. See http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl -Note: Lo-Dash may be used in Chrome extensions by either creating a `lodash csp` build and using precompiled templates, or loading Lo-Dash in a sandbox. - For more information on precompiling templates see:
http://lodash.com/#custom-builds @@ -3630,7 +3628,7 @@ fs.writeFileSync(path.join(cwd, 'jst.js'), '\ ### `_.times(n, callback [, thisArg])` -# [Ⓢ](https://github.com/bestiejs/lodash/blob/master/lodash.js#L5156 "View in source") [Ⓣ][1] +# [Ⓢ](https://github.com/bestiejs/lodash/blob/master/lodash.js#L5153 "View in source") [Ⓣ][1] Executes the `callback` function `n` times, returning an array of the results of each `callback` execution. The `callback` is bound to `thisArg` and invoked with one argument; *(index)*. @@ -3662,7 +3660,7 @@ _.times(3, function(n) { this.cast(n); }, mage); ### `_.unescape(string)` -# [Ⓢ](https://github.com/bestiejs/lodash/blob/master/lodash.js#L5183 "View in source") [Ⓣ][1] +# [Ⓢ](https://github.com/bestiejs/lodash/blob/master/lodash.js#L5180 "View in source") [Ⓣ][1] The inverse of `_.escape`, this method converts the HTML entities `&`, `<`, `>`, `"`, and `'` in `string` to their corresponding characters. @@ -3686,7 +3684,7 @@ _.unescape('Moe, Larry & Curly'); ### `_.uniqueId([prefix])` -# [Ⓢ](https://github.com/bestiejs/lodash/blob/master/lodash.js#L5203 "View in source") [Ⓣ][1] +# [Ⓢ](https://github.com/bestiejs/lodash/blob/master/lodash.js#L5200 "View in source") [Ⓣ][1] Generates a unique ID. If `prefix` is passed, the ID will be appended to it. @@ -3739,7 +3737,7 @@ A reference to the `lodash` function. ### `_.VERSION` -# [Ⓢ](https://github.com/bestiejs/lodash/blob/master/lodash.js#L5440 "View in source") [Ⓣ][1] +# [Ⓢ](https://github.com/bestiejs/lodash/blob/master/lodash.js#L5437 "View in source") [Ⓣ][1] *(String)*: The semantic version number. diff --git a/lodash.js b/lodash.js index 591f97e82..6a98a1804 100644 --- a/lodash.js +++ b/lodash.js @@ -4953,9 +4953,6 @@ * Note: In the development build, `_.template` utilizes sourceURLs for easier * debugging. See http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl * - * Note: Lo-Dash may be used in Chrome extensions by either creating a `lodash csp` - * build and using precompiled templates, or loading Lo-Dash in a sandbox. - * * For more information on precompiling templates see: * http://lodash.com/#custom-builds * diff --git a/test/test-build.js b/test/test-build.js index da6d93fa2..f358505d1 100644 --- a/test/test-build.js +++ b/test/test-build.js @@ -1330,7 +1330,7 @@ }; build(['-s', '-d', 'csp'], callback); - build(['-s', '-d', 'mobile'], callback); + build(['-s', '-d', 'modern'], callback); }); }());