Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nodeca/js-yaml
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.12.1
Choose a base ref
...
head repository: nodeca/js-yaml
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3.12.2
Choose a head ref
  • 3 commits
  • 6 files changed
  • 2 contributors

Commits on Feb 26, 2019

  1. Fix for issue #468 includes passing test (#469)

    @diberry
    diberry authored and Vitaly Puzrin committed Feb 26, 2019
    Copy the full SHA
    99c0bf9 View commit details

  2. Browser files rebuild

    Vitaly Puzrin committed Feb 26, 2019
    Copy the full SHA
    7231a49 View commit details

  3. 3.12.2 released

    Vitaly Puzrin committed Feb 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e4267fc View commit details
Showing with 40 additions and 5 deletions.
  1. +6 −0 CHANGELOG.md
  2. +2 −2 dist/js-yaml.js
  3. +1 −1 dist/js-yaml.min.js
  4. +1 −1 lib/js-yaml/dumper.js
  5. +1 −1 package.json
  6. +29 −0 test/issues/0468.js
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
3.12.2 / 2019-02-26
-------------------

- Fix `noArrayIndent` option for root level, #468.


3.12.1 / 2019-01-05
-------------------

4 changes: 2 additions & 2 deletions dist/js-yaml.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* js-yaml 3.12.1 https://github.com/nodeca/js-yaml */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.jsyaml = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
/* js-yaml 3.12.2 https://github.com/nodeca/js-yaml */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.jsyaml = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
'use strict';


@@ -838,7 +838,7 @@ function writeNode(state, level, object, block, compact, iskey) {
}
}
} else if (type === '[object Array]') {
var arrayLevel = (state.noArrayIndent) ? level - 1 : level;
var arrayLevel = (state.noArrayIndent && (level > 0)) ? level - 1 : level;
if (block && (state.dump.length !== 0)) {
writeBlockSequence(state, arrayLevel, state.dump, compact);
if (duplicate) {
Loading