fomantic-ui 2.9.0-beta.264 → 2.9.0-beta.267

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fomantic-ui",
-  "version": "2.9.0-beta.264",
+  "version": "2.9.0-beta.267+acc903b",
   "description": "Fomantic empowers designers and developers by creating a shared vocabulary for UI.",
   "keywords": [
     "fomantic-ui",

package/scripts/nightly-version.js

@@ -1,6 +1,7 @@
 // node
 const fs = require('fs')
 const path = require('path')
+const childProcess = require('child_process')
 
 // npm
 const fetch = require('node-fetch')
@@ -8,65 +9,64 @@ const semver = require('semver')
 
 // pkg
 const pkg = require('../package.json')
+const process = require('process')
 
 const ghBase = 'https://api.github.com'
 const repoUrlPath = 'fomantic/Fomantic-UI'
 const npmBase = 'https://registry.npmjs.org'
 const npmPackage = 'fomantic-ui'
+const currentRev = childProcess // get the current rev from the repo
+  .execSync('git rev-parse HEAD')
+  .toString()
+  .trim()
+  .substr(0, 7)
 
-
-const getGitHubVersion = async function () {
-  return fetch(`${ghBase}/repos/${repoUrlPath}/milestones`)
-    .then(r => r.json())
-    .then(milestones => milestones.filter(m => m.title.indexOf('x') === -1).map(m => m.title).sort()[0])
-}
-
-const getCurrentNpmVersion = async function () {
-  return fetch(`${npmBase}/${npmPackage}`)
+const getNextVersion = async function () {
+  const versions = await fetch(`${ghBase}/repos/${repoUrlPath}/milestones`)
     .then(r => r.json())
-    .then(p => p['dist-tags'].nightly)
-}
+    .then(milestones => milestones.filter(m => m.title.indexOf('x') === -1)) // remove all versions with `x` in it
+    .then(versions => versions.map(m => m.title)) // create array of versions
+    .then(versions => semver.sort(versions))
 
-const getNpmPreRelease = async function () {
-  return fetch(`${npmBase}/${npmPackage}`)
-    .then(r => r.json())
-    .then(p => p['dist-tags'].nightly)
-    .then(v => semver.prerelease(v))
-    .then(pr => pr === null ? ['beta', 0] : pr)
+  // Return first entry aka the smallest version in milestones which would therefore
+  // be the next version
+  return semver.parse(versions[0])
 }
 
-const getAllNpmVersions = async function () {
-  // The versions property sometimes does not include versions which are in "time"!
-  // That's why "time" is used here
-  return fetch(`${npmBase}/${npmPackage}`)
+const getPublishedVersion = async function () {
+  // get the latest published nightly tagged version
+  return semver.parse(
+    await fetch(`${npmBase}/${npmPackage}`)
       .then(r => r.json())
-      .then(p => Object.keys(p['time']))
+      .then(p => p['dist-tags'].nightly)
+  )
 }
 
 const getNightlyVersion = async function () {
-  const nextVersion = await getGitHubVersion()
-  const currentNightlyWithPre = semver.parse(await getCurrentNpmVersion())
-  const currentNightly = `${currentNightlyWithPre.major}.${currentNightlyWithPre.minor}.${currentNightlyWithPre.patch}`
-  const allNpmVersions = await getAllNpmVersions()
-  let nightlyVersion = `${nextVersion}-beta.0`
+  const next = semver.parse(await getNextVersion())
+  const current = semver.parse(await getPublishedVersion())
 
-  if (semver.eq(nextVersion, currentNightly)) {
-    const preRelease = await getNpmPreRelease()
-
-    nightlyVersion = semver.inc(
-      `${nextVersion}-${preRelease[0]}.${preRelease[1]}`,
-      'prerelease'
-    )
+  if (current.build[0] === currentRev) {
+    console.log('No new commits since last publish. Exiting.')
+    process.exit(1)
+    return
   }
-  //check if version was already uploaded to npm previously
-   while (allNpmVersions.indexOf(nightlyVersion) !== -1) {
+
+  let nightlyVersion = `${next.version}-beta.0`
+
+  // Check if published version is the same version as next version.
+  // Only check major, minor and patch as previously published nightly
+  // versions would include prerelease tag and build metadata
+  if (semver.eq(`${next.major}.${next.minor}.${next.patch}`, `${current.major}.${current.minor}.${current.patch}`)) {
+    // If they match then a nightly version has already been published, so we need to increment
+    // the prerelease and add the new rev as build metadata
     nightlyVersion = semver.inc(
-        nightlyVersion,
-        'prerelease'
+    `${next.version}-beta.${current.prerelease[1]}`,
+    'prerelease'
     )
   }
 
-  return nightlyVersion
+  return `${nightlyVersion}+${currentRev}`
 }
 
 getNightlyVersion()

package/src/definitions/behaviors/api.js

@@ -428,28 +428,76 @@ $.api = $.fn.api = function(parameters) {
           formData: function(data) {
             var
               formData = {},
-              hasOtherData
+              hasOtherData,
+              useFormDataApi = settings.serializeForm === 'formdata'
             ;
             data         = data || originalData || settings.data;
             hasOtherData = $.isPlainObject(data);
 
-            $.each($form.serializeArray(), function (i, element) {
-              var node = formData[element.name];
-
-              if ('undefined' !== typeof node && node !== null) {
-                if (Array.isArray(node)) {
-                  node.push(element.value);
+            if (useFormDataApi) {
+              formData = new FormData($form[0]);
+              settings.processData = typeof settings.processData !== 'undefined' ? settings.processData : false;
+              settings.contentType = typeof settings.contentType !== 'undefined' ? settings.contentType : false;
+            } else {
+              var formArray = $form.serializeArray(),
+                  pushes = {},
+                  pushValues= {},
+                  build = function(base, key, value) {
+                    base[key] = value;
+                    return base;
+                  }
+              ;
+              // add files
+              $.each($('input[type="file"]',$form), function(i, tag) {
+                $.each($(tag)[0].files, function(j, file) {
+                  formArray.push({name:tag.name, value: file});
+                });
+              });
+              $.each(formArray, function(i, el) {
+                if (!settings.regExp.validate.test(el.name)) return;
+                var isCheckbox = $('[name="' + el.name + '"]', $form).attr('type') === 'checkbox',
+                    floatValue = parseFloat(el.value),
+                    value = (isCheckbox && el.value === 'on') || el.value === 'true' || (String(floatValue) === el.value ? floatValue : (el.value === 'false' ? false : el.value)),
+                    nameKeys = el.name.match(settings.regExp.key) || [], k, pushKey= el.name.replace(/\[\]$/,'')
+                ;
+                if(!(pushKey in pushes)) {
+                  pushes[pushKey] = 0;
+                  pushValues[pushKey] = value;
+                } else if (Array.isArray(pushValues[pushKey])) {
+                  pushValues[pushKey].push(value);
                 } else {
-                  formData[element.name] = [node, element.value];
+                  pushValues[pushKey] = [pushValues[pushKey] , value];
                 }
-              } else {
-                formData[element.name] = element.value;
-              }
-            });
+                value = pushValues[pushKey];
+
+                while ((k = nameKeys.pop()) !== undefined) {
+                  // foo[]
+                  if (k == '' && !Array.isArray(value)){
+                    value = build([], pushes[pushKey]++, value);
+                  }
+                  // foo[n]
+                  else if (settings.regExp.fixed.test(k)) {
+                    value = build([], k, value);
+                  }
+                  // foo; foo[bar]
+                  else if (settings.regExp.named.test(k)) {
+                    value = build({}, k, value);
+                  }
+                }
+                formData = $.extend(true, formData, value);
+              });
+            }
 
             if(hasOtherData) {
               module.debug('Extending existing data with form data', data, formData);
-              data = $.extend(true, {}, data, formData);
+              if(useFormDataApi) {
+                $.each(Object.keys(data),function(i, el){
+                  formData.append(el, data[el]);
+                });
+                data = formData;
+              } else {
+                data = $.extend(true, {}, data, formData);
+              }
             }
             else {
               module.debug('Adding form data', formData);
@@ -1088,6 +1136,8 @@ $.api.settings = {
   defaultData          : true,
 
   // whether to serialize closest form
+  // use true to convert complex named keys like a[b][1][c][] into a nested object
+  // use 'formdata' for formdata web api
   serializeForm        : false,
 
   // how long to wait before request should occur
@@ -1158,6 +1208,11 @@ $.api.settings = {
   regExp  : {
     required : /\{\$*[A-z0-9]+\}/g,
     optional : /\{\/\$*[A-z0-9]+\}/g,
+    validate: /^[a-z_][a-z0-9_-]*(?:\[(?:\d*|[a-z0-9_-]+)\])*$/i,
+    key:      /[a-z0-9_-]+|(?=\[\])/gi,
+    push:     /^$/,
+    fixed:    /^\d+$/,
+    named:    /^[a-z0-9_-]+$/i
   },
 
   className: {

package/src/definitions/modules/calendar.js

@@ -1560,7 +1560,7 @@ $.fn.calendar.settings = {
       if (!text) {
         return null;
       }
-      text = String(text).replace(/\s/g,'');
+      text = String(text).trim().replace(/([.:\/\-])\s+/g,'$1').replace(/\s+([.:\/-])/g,'$1').replace(/\s+/g,' ');
       if (text.length === 0) {
         return null;
       }