diff --git a/.gitattributes b/.gitattributes index 3a50adc36..32660fefc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,7 @@ # Linguist Normalizer +*.yaml linguistic-language=PHP *.twig linguistic-language=PHP -**/js/main.js linguist-vendored=true -**/css-compiled/*.css linguist-vendored=true +**/gulpfile.js linguist-vendored +**/js/*.js linguist-vendored +**/js/*.json linguist-vendored +**/css-compiled/*.css linguist-vendored diff --git a/.gitignore b/.gitignore index 9e7e43077..97cc49dcc 100644 --- a/.gitignore +++ b/.gitignore @@ -13,13 +13,16 @@ src/composer.lock src/vendor/** # Symbolic links in admin -platforms/joomla/com_gantry5/*/common +platforms/joomla/com_gantry5/admin/common +platforms/wordpress/gantry5/admin/common platforms/*/*/common platforms/*/*/src +platforms/*/*/assets +platforms/*/*/engines # Symbolic links in themes themes/*/*/common -themes/*/*/skeleton + themes/*/*/src themes/*/*/cache themes/*/*/custom diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..387fc7540 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,121 @@ +language: php +php: + - '5.6' +branches: + except: + - master + - /^feature\// +notifications: + email: + on_success: never + on_failure: always +env: + global: + # GH_TOKEN + - secure: "kY4hfKlKczsizZVxHMA1THnh3w2kmMOPnaadpnAwbpYcCQOlCgwgz7tbGEB5gPAbsKJfQMEgdlEAWnRiUUQdQE5vKhiwS14Jo3pry/i10iWCys/M+zLn6uclXCuTQUjNm4L0ReLQu5nkCPRyDL/F9vOp6v3h+vd4gfTEw+9TntfOg1g5RIW8tG1iBm12IhFgoQjP+wKUXluGTqZIlJyV5Jx1ef51Da3nSxd8lPHrsxElzZEebTRd2CvVM5vY+wZY4xjl0GjZo2v8ps3HI7IOZYygzYGLkH+Hbir+SHNTLZX6IMWQWuq56iiRb5CZm64GNULnrXAEaP2EZyiEHkA7gQgddtCzhMlGq5qyrYBfrPRukjRGEhRHEMvntUQloGlPYsETzO6ulvYBRlkS26s4C1uw6RBSgv58vWjhoXHyt7cDzv9yjKsboRE+2KCogkbbBDt7DxFRuUsQ9SnslzPuAFzBKZXik8Ea5Fl2Q/3tXOMt3fXp5CTQ5fT3X0p82orln5o1yQ1GZ3xWBtprMoWz5GyRq67G+gZql/BTI834JeQQ/TBhOszWV2a0zcw2SyjVFf9SeZTfNSOmpJz60aJcZSegEuTuxEfm+P3x34WAP/AFIt3vAFxRGad6A8ceP0rbY7R3WzaJcRWpuLCVzcmMukKNOltbzL0We3fF267Z7d4=" +before_install: + - composer self-update + - if [ ! -z "$TRAVIS_TAG" ]; then + gem install sass; + npm install -g gulp &>/dev/null; + fi +install: + - if [ ! -z "$TRAVIS_TAG" ]; then + npm install &>/dev/null; + cd $TRAVIS_BUILD_DIR/platforms/common && npm install &>/dev/null; + cd $TRAVIS_BUILD_DIR/assets/common && npm install &>/dev/null; + cd $TRAVIS_BUILD_DIR/engines/common/nucleus && npm install &>/dev/null; + fi + - cd $TRAVIS_BUILD_DIR/src && composer install --no-dev; + - cd $TRAVIS_BUILD_DIR/bin/build && composer install --no-dev +script: + - export SHORT_COMMIT=$(echo $TRAVIS_COMMIT | cut -c1-9) + - echo "Branch ($TRAVIS_BRANCH)" + - cd $TRAVIS_BUILD_DIR/bin/build + - if [ "$TRAVIS_BRANCH" == "develop" ]; then + cd $TRAVIS_BUILD_DIR/platforms/joomla; + sed -i -e "s/.*<\/version>/dev-$SHORT_COMMIT<\/version>/g" pkg_gantry5.xml; + cd $TRAVIS_BUILD_DIR/bin/build; + php build.php dev -propertyfile release.ini -Dpackage_dir=$TRAVIS_BUILD_DIR/repo_pkgs -Dstr.fileversion=_develop; + elif [ ! -z "$TRAVIS_TAG" ]; then + php build.php prod -propertyfile release.ini -Dpackage_dir=$TRAVIS_BUILD_DIR/repo_pkgs -Dxml.version=$TRAVIS_TAG; + else + echo "($TRAVIS_BRANCH) is not a supported branch for builds"; + fi +before_deploy: + - export PROJ_PKGS_PATH=$TRAVIS_BUILD_DIR/repo_pkgs + - export PROJ_PKGS=$HOME/build/$TRAVIS_REPO_SLUG/repo_pkgs/*.zip + - if [ "$TRAVIS_BRANCH" == 'develop' ]; then + FILES_PATH=$PROJ_PKGS_PATH; + JSON="{"; + FILES=$FILES_PATH/*.zip; + COUNT=`ls $FILES 2>/dev/null | wc -l | awk '{print $1}'`; + COMMIT=$TRAVIS_COMMIT; + SHORT_COMMIT=$(echo $COMMIT | cut -c1-9) + CURRENT_DATE=`date +%s` + + JSON+="\"count\":$COUNT,"; + JSON+="\"commit\":\"$COMMIT\","; + JSON+="\"commit_short\":\"$SHORT_COMMIT\","; + JSON+="\"date\":\"$CURRENT_DATE\","; + JSON+="\"files\":["; + + i=0; + for file in ${FILES[@]}; do + i=$(($i + 1)); + SIZE=`wc -c < $file | awk '{print $1}'`; + DATE=`stat --format=\"%m\" $file`; + JSON+="{"; + JSON+="\"file\":\"${file##*/}\","; + JSON+="\"size\":$SIZE,"; + JSON+="\"date\":$DATE"; + JSON+="}"; + + if [ $i != $COUNT ]; then + JSON+=","; + fi + done; + JSON+="]}"; + + echo $JSON > "$FILES_PATH/map.json"; + fi +deploy: + - provider: releases + api_key: + secure: "KgEZx0dHoPLOYj9T087flZKgaf4ggasJcd/DOjHjsXKhjyLYuWZNLOdJaT0MQ+UJ2RwzW+7ESR1lquwEqUN8uPFaA05SZwrCyJU1pOgTYqunM+Sz+lRWANMjgwtGNAQvPfTTAoaKZxrOVSMxv0U2OBAHE2lEsDvz7kwCuHbsoU3/xY144ecUG2lWItHjxQr2X7GmApBgCZ63OPaHK/NP1a8xtkQT+kTfKRHIZwPCyRplSRhqaa8ftQoi5SynaHtECi9/RYCRp3wgclbCPHRH3Eez4li+AdE8Q/X+LK/jmIYqOUWvq8IpS0ePg67fuE4cBNLYBrbPWgSPfUka3/61KyGRTw+2ofdf9eMOtJQa7JZUSWWUEeeyeBFIomNvY40nWSmC+T/l5EixIwBFF7CzVatnDPCz3w4gPYxAVwQjTtKqqFu6ZfeQNp0asj9OqukF3nJbN42iuIh6vxHxIQ6U3WMo+0t507i0rYf3Esl3YGlMVUuN7mNlWNv5eKrfD2CLHeBiDvo6SRCdYpgLu6FMBnwM2Fadlm51nAN/tpSxXEA1gUoVT3rJ8e6vnFcdy1ZHq1DPMtiZ8oMLBtdq8lcDs8DzKqCwImfmsDtM7M040JG/MuB5kVUXLcA5ycRCh1piDUAqITmvPucYHO8hT63cMZHwcxlqw1Ta3ckB4Ng3Eqg=" + skip_cleanup: true + file_glob: true + file: "${PROJ_PKGS}" + on: + repo: gantry/gantry5 + tags: true + - provider: s3 + access_key_id: AKIAIGEIWVFNBMVSH2UA + secret_access_key: + secure: "DP32BDS3fk7/tLsZxj5CjiAT5GLHQFNOFte9Rds7eird+xqOSqUXHVplkOSVPKCt6V3CIO3wtxe97T4cuxtoobwVlwF8WRmrS4x98u2sLIS9lSZZzDg/W8tkLjOmW9QOKFtBEykj1z1i9nYDlhKFDtGNIkN7juZUz5UZ2S3Unwsm94vcm8ATghXGclwfib329I+7GVIA24PMUv2ETl0PGs+s+D1KmhXeU5UwharxnM+X4kyIsCBPrxXX+2QfAiSrjqKwHfzGQjRJIAQ6m4UdzuZWbxSAiJ4TrWrwRYDCKn8Va72g9UcUdiOyLd6Eg54iSCKdbQ+zELYjhcuwO7g4kpc6V/wgcHYVG4stPyuiXc2G+ZAGXDtW0H7QobeXEUTAsad2AshmCA+lFCmecywBdpsDSYp9ZBY0Qfevncmx0CIWlaPPVjUQ3FMn+oniamJlmbwpmHLiZuCyDE9sSxeQrPSI/7N+zSD03EM6AxIBswaF6XzIhcP3aPz9BzJ2v/YHpPzxtqLaLhEswxWkghmRYASaJn6Ut9xwuWkfhO2UIzkBW6RA3HV6CjZ5opQBe4IyxiVsB2qPzQfxGXz4pN2BoTbuLyf4jS0CA1h6g/7vpCz6VnOuTzBg/c7nQjk8Y69hUYHL91lSlZ/a7tNHe3z9DtaxVg24MG56e+mevYpUgLk=" + bucket: gantry5 + local-dir: "$PROJ_PKGS_PATH" + upload-dir: nightly + skip_cleanup: true + acl: public_read + on: + repo: gantry/gantry5 + branch: develop +after_deploy: + - echo "Branch ($TRAVIS_BRANCH) - Tag ($TRAVIS_TAG)" + - if [ ! -z "$TRAVIS_TAG" ]; then + git config user.email "bot@travis-ci.org"; + git config user.name "Travis CI"; + rm -rf $PROJ_PKGS_PATH; + git checkout -b master; + git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"; + git fetch --quiet; + cd $TRAVIS_BUILD_DIR/bin/build; + php build.php prod-versions -propertyfile release.ini -Dupdate_versions=true -Dxml.version=$TRAVIS_TAG; + cd $TRAVIS_BUILD_DIR; + git commit -am "Release [$TRAVIS_TAG] - Automatic Version Number Updates"; + git push --force --quiet --set-upstream https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git master:master &>/dev/null; + fi + - if [ "$TRAVIS_BRANCH" == 'develop' ]; then + curl -L http://gantry.org/cibuilds >/dev/null 2>&1; + fi \ No newline at end of file diff --git a/README.md b/README.md index cd6ecbc4f..740076034 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Gantry Framework +Gantry Framework [![Build Status](https://travis-ci.org/gantry/gantry5.svg)](https://travis-ci.org/gantry/gantry5) ================ [![Join the chat at https://gitter.im/gantry/gantry5](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/gantry/gantry5?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) @@ -25,10 +25,8 @@ Gantry 5 is a framework by which Gantry-powered themes are made. In order for a The first thing you need to do is download the latest build of Gantry 5 and Hydrogen. You can do so by clicking the links below, or via [GitHub](http://github.com/gantry/gantry5/). -* [Download Gantry 5](https://github.com/gantry/gantry5/releases/download/5.0.0-rc.2/joomla-pkg_gantry5_v5.0.0-rc.2.zip) -* [Download Hydrogen Theme](https://github.com/gantry/gantry5/releases/download/5.0.0-rc.2/joomla-tpl_g5_hydrogen_v5.0.0-rc.2.zip) - ->>> During the initial beta, the **Framework** and **Template** are being distributed in different installable packages. A bundled package is planned, but will likely be available after the initial beta launch. +| [Download Stable](http://www.gantry.org/downloads#gantry5) | [Download CI Builds](http://gantry.org/downloads#ci-builds) | +|:---------------------------------------------------:|:---------------------------------------------------------:| Once you have the latest packages, installation is simple. We have provided a step-by-step guide in the **Installation** portion of this documentation. @@ -55,9 +53,9 @@ You will notice the following menu items in the Gantry 5 Administrator: 4. **Clear Cache**: This button clears the cache files related to Gantry. This includes all of the temporary files outside of CSS and configuration information. -5. **Configuration Dropdown**: This dropdown makes it easy to quickly switch between Configurations without having to leave the Gantry Administrator. +5. **Outlines Dropdown**: This dropdown makes it easy to quickly switch between Outlines without having to leave the Gantry Administrator. -6. **Styles**: This administrative panel gives you access to style related configuration settings. This includes things like theme colors, fonts, style presets, and more. +6. **Styles**: This administrative panel gives you access to style related outline settings. This includes things like theme colors, fonts, style presets, and more. 7. **Settings**: This administrative panel offers you the ability to configure the functional settings of the theme. This includes setting defaults for Particles, as well as enabling/disabling individual Particles. @@ -65,13 +63,13 @@ You will notice the following menu items in the Gantry 5 Administrator: [**Learn More**](http://docs.gantry.org/gantry5/configure/gantry-admin) -## What are Configurations, Particles, Atoms, etc.? +## What are Outlines, Particles, Atoms, etc.? Because Gantry 5 is so different from any version of Gantry before it, we came up with some terms to help make sense of the relationships Gantry's new features have with one-another. Here is a quick breakdown of commonly used terms related to Gantry 5. | Term | Definition | | :----- | :----- | -| Configuration | A configurable style used in one or more areas of your site. It serves as the container on which a page's style, settings, and layout are set. | +| Outline | A configurable style used in one or more areas of your site. It serves as the container on which a page's style, settings, and layout are set. | | Particle | A typically small block of data used on the front end. It acts a lot like a widget/module, but can be easily configured in the Gantry 5 Administrator. | | Atom | A type of Particle that contains non-rendered data, such as custom scripting (JS, CSS, etc.) or analytics scripts for traffic tracking. | diff --git a/VERSION b/VERSION index 84ab516e1..14d2ff637 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.0.0-rc.3-dev +@version@ diff --git a/assets/common/js/main.js b/assets/common/js/main.js index 7e0ecfea5..c76011806 100644 --- a/assets/common/js/main.js +++ b/assets/common/js/main.js @@ -4138,7 +4138,7 @@ process.nextTick = function (fun) { } } queue.push(new Item(fun, args)); - if (!draining) { + if (queue.length === 1 && !draining) { setTimeout(drainQueue, 0); } }; diff --git a/bin/build/build.xml b/bin/build/build.xml index 84499198a..580470071 100644 --- a/bin/build/build.xml +++ b/bin/build/build.xml @@ -15,8 +15,9 @@ -Dpackage_dir=../../../builds/gantry5 (= builds/gantry5) -Dtmp_dir=tmp (= git/gantry5/build/tmp) -Dbuild_dir=package (= git/gantry5/build/package) + -Dupdate_versions=false (= true / for CI and automated push) --> - + @@ -34,6 +35,9 @@ + + + @@ -72,7 +76,8 @@ - + + @@ -97,7 +102,7 @@ - + @@ -123,7 +128,6 @@ - @@ -212,6 +216,7 @@ + @@ -352,6 +357,21 @@ + + + + + + + + + + + + + + + @@ -387,7 +407,9 @@ - + + + @@ -433,9 +455,39 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/engines/common/nucleus/particles/menu.html.twig b/engines/common/nucleus/particles/menu.html.twig index e32fd970e..cb99820bb 100644 --- a/engines/common/nucleus/particles/menu.html.twig +++ b/engines/common/nucleus/particles/menu.html.twig @@ -97,7 +97,7 @@ {% if hasCustomWidth and not (root.getDropdown() == 'fullwidth' and item.level > 1) %} {% set customWidth = ' style="width: ' ~ item.width|raw ~ '" data-g-item-width="' ~ item.width|raw ~ '"' %} {% endif %} -
    +
    • {{ _self.displayContainers(item, root, menu, gantry) }}
      • diff --git a/engines/joomla/nucleus/css-compiled/joomla.css b/engines/joomla/nucleus/css-compiled/joomla.css index d1536f5bd..2accc9d8d 100644 --- a/engines/joomla/nucleus/css-compiled/joomla.css +++ b/engines/joomla/nucleus/css-compiled/joomla.css @@ -1,4 +1,4 @@ -/* line 8, ../../../../../../Users/w00fz/Projects/git/gantry/gantry5/engines/common/nucleus/scss/nucleus/mixins/_sizes.scss */ +/* line 8, ../../../../../../Users/newkind/Firmy/RocketTheme/Gantry5/engines/common/nucleus/scss/nucleus/mixins/_sizes.scss */ .size-100 { width: 100%; } diff --git a/engines/joomla/nucleus/particles/module.yaml b/engines/joomla/nucleus/particles/module.yaml index 7bc43a48e..a4a525735 100644 --- a/engines/joomla/nucleus/particles/module.yaml +++ b/engines/joomla/nucleus/particles/module.yaml @@ -17,10 +17,12 @@ form: content: To edit the Module please use the Joomla's Module Manager module_id: - type: input.text + type: gantry.module label: Module Id - class: g-urltemplate + class: g-urltemplate input-small + picker_label: Pick a Module description: Enter module Id. + pattern: '\d+' overridable: false chrome: diff --git a/gulpfile.js b/gulpfile.js index 1f0fe888c..53f15b923 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -68,6 +68,11 @@ paths = { out: './platforms/joomla/com_gantry5/admin/css-compiled/joomla-admin.css', load: './engines/common/nucleus/scss' }, + { // admin - wordpress + in: './platforms/wordpress/gantry5/admin/scss/wordpress-admin.scss', + out: './platforms/wordpress/gantry5/admin/css-compiled/wordpress-admin.css', + load: './engines/common/nucleus/scss' + }, { // nucleus in: './engines/common/nucleus/scss/nucleus.scss', out: './engines/common/nucleus/css-compiled/nucleus.css' @@ -76,6 +81,11 @@ paths = { in: './engines/joomla/nucleus/scss/joomla.scss', out: './engines/joomla/nucleus/css-compiled/joomla.css', load: './engines/common/nucleus/scss' + }, + { // nucleus - wordpress + in: './engines/wordpress/nucleus/scss/wordpress.scss', + out: './engines/wordpress/nucleus/css-compiled/wordpress.css', + load: './engines/common/nucleus/scss' } ], minify: [ diff --git a/hebe.json b/hebe.json index dace2fac9..b21867080 100644 --- a/hebe.json +++ b/hebe.json @@ -41,6 +41,10 @@ "source":"/src/classes", "destination":"/libraries/gantry5/classes" }, + { + "source":"/src/platforms", + "destination":"/libraries/gantry5/platforms" + }, { "source":"/platforms/joomla/lib_gantry5/language", "destination":"/libraries/gantry5/language" @@ -49,9 +53,17 @@ "source":"/src/vendor", "destination":"/libraries/gantry5/vendor" }, + { + "source":"/src/bootstrap.php", + "destination":"/libraries/gantry5/bootstrap.php" + }, { "source":"/src/Loader.php", "destination":"/libraries/gantry5/Loader.php" + }, + { + "source":"/src/RealLoader.php", + "destination":"/libraries/gantry5/RealLoader.php" } ], "plugins":[ @@ -96,6 +108,46 @@ ] } }, + "wordpress":{ + "nodes":{ + "plugin":[ + { + "source":"/platforms/wordpress/gantry5", + "destination":"/wp-content/plugins/gantry5" + }, + { + "source":"/platforms/common", + "destination":"/wp-content/plugins/gantry5/admin/common" + } + ], + "library":[ + { + "source":"/src", + "destination":"/wp-content/plugins/gantry5/src" + } + ], + "media":[ + { + "source":"/assets", + "destination":"/wp-content/plugins/gantry5/assets" + }, + { + "source":"/engines", + "destination":"/wp-content/plugins/gantry5/engines" + } + ], + "themes":[ + { + "source":"/themes/hydrogen/wordpress", + "destination":"/wp-content/themes/hydrogen" + }, + { + "source":"/themes/hydrogen/common", + "destination":"/wp-content/themes/hydrogen/common" + } + ] + } + }, "prime":{ "nodes":{ "admin":[ diff --git a/platforms/common/application/configurations/index.js b/platforms/common/application/configurations/index.js index eb30d761c..710e7f0b8 100644 --- a/platforms/common/application/configurations/index.js +++ b/platforms/common/application/configurations/index.js @@ -8,10 +8,11 @@ var $ = require('elements'), toastr = require('../ui').toastr, request = require('agent'), getAjaxSuffix = require('../utils/get-ajax-suffix'), + parseAjaxURI = require('../utils/get-ajax-url').parse, getAjaxURL = require('../utils/get-ajax-url').global, flags = require('../utils/flags-state'), - warningURL = getAjaxURL('confirmdeletion') + getAjaxSuffix(); + warningURL = parseAjaxURI(getAjaxURL('confirmdeletion') + getAjaxSuffix()); var Configurations = {}; @@ -67,7 +68,7 @@ ready(function() { element.hideIndicator(); element.showIndicator(); - request(method, href + getAjaxSuffix(), {}, function(error, response) { + request(method, parseAjaxURI(href + getAjaxSuffix()), {}, function(error, response) { if (!response.body.success) { modal.open({ content: response.body.html || response.body, @@ -117,7 +118,7 @@ ready(function() { parent.showIndicator(); parent.find('[data-title-edit]').addClass('disabled'); - request(method, href + getAjaxSuffix(), { title: trim(title) }, function(error, response) { + request(method, parseAjaxURI(href + getAjaxSuffix()), { title: trim(title) }, function(error, response) { if (!response.body.success) { modal.open({ content: response.body.html || response.body, diff --git a/platforms/common/application/fields/index.js b/platforms/common/application/fields/index.js index cef079035..fe2a8a59f 100644 --- a/platforms/common/application/fields/index.js +++ b/platforms/common/application/fields/index.js @@ -18,7 +18,7 @@ var originals, keys.forEach(function(key) { field = $('[name="' + key + '"]'); if (field) { - map.set(key, field.value().toLowerCase()); + map.set(key, field.value()); } }); @@ -39,7 +39,7 @@ var originals, var map = new storage(); forEach(data, function(value, key) { - map.set(key, value.toLowerCase()); + map.set(key, value); }); return map; @@ -127,7 +127,7 @@ ready(function() { body.delegate('change', '.settings-block input[name][type="hidden"], .settings-block input[name][type="checkbox"], .settings-block select[name]', compare.single); body.delegate('input', '.g-urltemplate', function(event, element) { - var previous = element.parent('.settings-param').previousSibling(); + var previous = element.parent('.settings-param').siblings(); if (!previous) { return; } previous = previous.find('[data-g-urltemplate]'); diff --git a/platforms/common/application/lm/index.js b/platforms/common/application/lm/index.js index a440bb19e..764604fa2 100644 --- a/platforms/common/application/lm/index.js +++ b/platforms/common/application/lm/index.js @@ -1,6 +1,5 @@ "use strict"; var ready = require('elements/domready'), - //json = require('./json_test'), // debug $ = require('elements/attributes'), modal = require('../ui').modal, toastr = require('../ui').toastr, @@ -11,6 +10,7 @@ var ready = require('elements/domready'), trim = require('mout/string/trim'), forEach = require('mout/collection/forEach'), + parseAjaxURI = require('../utils/get-ajax-url').parse, getAjaxSuffix = require('../utils/get-ajax-suffix'), Builder = require('./builder'), @@ -251,7 +251,7 @@ ready(function() { if (!element.PopoverDefined) { element.getPopover({ type: 'async', - url: element.data('lm-switcher') + getAjaxSuffix(), + url: parseAjaxURI(element.data('lm-switcher') + getAjaxSuffix()), allowElementsClick: '.g-tabs a' }); } @@ -283,7 +283,7 @@ ready(function() { data.layout = JSON.stringify(lm.builder.serialize()); } - request(method, element.data('switch') + getAjaxSuffix(), data, function(error, response) { + request(method, parseAjaxURI(element.data('switch') + getAjaxSuffix()), data, function(error, response) { element.hideIndicator(); if (!response.body.success) { @@ -357,13 +357,14 @@ ready(function() { content: 'Loading', method: 'post', data: data, - remote: settingsURL + getAjaxSuffix(), + remote: parseAjaxURI(settingsURL + getAjaxSuffix()), remoteLoaded: function(response, content) { var form = content.elements.content.find('form'), + fakeDOM = zen('div').html(response.body.html).find('form'), submit = content.elements.content.search('input[type="submit"], button[type="submit"], [data-apply-and-save]'), dataString = [], invalid = []; - if (!form || !submit) { return true; } + if ((!form && !fakeDOM) || !submit) { return true; } // Particle Settings apply submit.on('click', function(e) { @@ -377,14 +378,17 @@ ready(function() { target.hideIndicator(); target.showIndicator(); - $(form[0].elements).forEach(function(input) { + $(fakeDOM[0].elements).forEach(function(input) { input = $(input); - var name = input.attribute('name'), - value = input.type() == 'checkbox' ? Number(input.checked()) : input.value(), + var name = input.attribute('name'); + if (!name || input.disabled()) { return; } + + input = content.elements.content.find('[name="' + name + '"]'); + var value = input.type() == 'checkbox' ? Number(input.checked()) : input.value(), parent = input.parent('.settings-param'), override = parent ? parent.find('> input[type="checkbox"]') : null; - if (!name || input.disabled() || (override && !override.checked())) { return; } + if (override && !override.checked()) { return; } if (!validateField(input)) { invalid.push(input); } dataString.push(name + '=' + encodeURIComponent(value)); }); @@ -401,7 +405,7 @@ ready(function() { return; } - request(form.attribute('method'), form.attribute('action') + getAjaxSuffix(), dataString.join('&') || {}, function(error, response) { + request(fakeDOM.attribute('method'), parseAjaxURI(fakeDOM.attribute('action') + getAjaxSuffix()), dataString.join('&') || {}, function(error, response) { if (!response.body.success) { modal.open({ content: response.body.html || response.body, diff --git a/platforms/common/application/lm/json_test.js b/platforms/common/application/lm/json_test.js deleted file mode 100644 index cef917a4d..000000000 --- a/platforms/common/application/lm/json_test.js +++ /dev/null @@ -1,512 +0,0 @@ -module.exports = [ - { - "id": "2330cbf9-25f2-4416-a0de-446fdce1ad0c", - "type": "section", - "attributes": { - "name": "Header", - "key": "section-header", - "type": "header", - "id": "header" - }, - "children": [ - { - "id": "ac1962c1-5587-4a24-8983-be8bfd9b1d2f", - "type": "grid", - "attributes": {}, - "children": [ - { - "id": "359b6022-55ce-45b9-880c-8974876a873d", - "type": "block", - "attributes": { - "size": 20 - }, - "children": [ - { - "id": "fb585b76-4db5-4611-a96c-08c09bd8d90f", - "type": "position", - "attributes": { - "name": "Position 1", - "key": "Position 1" - }, - "children": [] - } - ] - }, - { - - "id": "388f9ef2-68ad-40bb-ba5e-8d534b24bdfc", - "type": "block", - "attributes": { - "size": 80 - }, - "children": [ - { - "id": "6e85d292-e08b-448c-a46a-f5b2693db83e", - "type": "particle", - "attributes": { - "name": "Menu", - "key": "menu" - }, - "children": [] - } - ] - } - ] - } - ] - }, - { - "id": "43b618ab-5066-410f-9a9d-0601adeeea02", - "type": "grid", - "attributes": {}, - "children": [ - { - "id": "0cc9d063-1447-4335-963b-aee05fa28398", - "type": "block", - "attributes": { - "size": 75 - }, - "children": [ - { - "id": "f29bf0b7-7348-48de-b979-e10008de799e", - "type": "section", - "attributes": { - "name": "Showcase", - "key": "section-showcase", - "type": "section", - "id": "showcase" - }, - "children": [ - { - "id": "e5f91d76-81c8-4e46-bb24-86164ca6f52c", - "type": "grid", - "attributes": {}, - "children": [ - { - "id": "2f2622ca-01ba-44fb-845f-6028285a0176", - "type": "block", - "attributes": { - "size": 50 - }, - "children": [ - { - "id": "8462e204-f196-498f-a71b-c1c8799e2e80", - "type": "position", - "attributes": { - "name": "Position Showcase 1", - "key": "showcase-1" - }, - "children": [] - } - ] - }, - { - "id": "dbcafc00-a3c9-42ea-bac0-8d9a85d3284d", - "type": "block", - "attributes": { - "size": 50 - }, - "children": [ - { - "id": "f568d0bb-0964-4091-9971-b49cb8fd01e3", - "type": "position", - "attributes": { - "name": "Position Showcase 2", - "key": "showcase-2" - }, - "children": [] - } - ] - } - ] - - } - ] - }, - { - "id": "5672f5b7-01c3-4f6a-a826-f2537e881b6d", - "type": "section", - "attributes": { - "name": "Feature", - "key": "section-feature", - "type": "section", - "id": "feature" - }, - "children": [ - { - "id": "5df8ef8d-8dfa-46a8-b8c1-b4520f8d1ebc", - "type": "grid", - "attributes": {}, - "children": [ - { - "id": "837e1ebe-c18e-49e3-ada6-1efbeb62c76f", - "type": "block", - "attributes": { - "size": 50 - }, - "children": [ - { - "id": "1875d46e-639f-4a36-b553-ef6b561bccdc", - "type": "position", - "attributes": { - "name": "Position Feature 1", - "key": "feature-1" - }, - "children": [] - } - ] - }, - { - "id": "d872554e-da74-4452-87f0-b8d96fe6b711", - "type": "block", - "attributes": { - "size": 50 - }, - "children": [ - { - "id": "51d44206-6a78-45b6-9da0-ffee380a1d16", - "type": "position", - "attributes": { - "name": "Position Feature 2", - "key": "feature-2" - }, - "children": [] - } - ] - } - ] - } - ] - }, - - { - "id": "b40f50f7-1950-461e-8307-d277d30fc54f", - "type": "section", - "attributes": { - "name": "Main", - "key": "section-main", - "type": "main", - "id": "main" - }, - "children": [ - { - "id": "6d51de8b-e954-4135-8ce3-7665bb6b5d07", - "type": "grid", - "attributes": {}, - "children": [ - { - "id": "51673446-865a-4999-b789-6a864d64e115", - "type": "block", - "attributes": { - "size": 100 - }, - "children": [ - { - "id": "f03448da-fb1b-49ec-8d33-b58152ac8b0d", - "type": "pagecontent", - "attributes": { - "name": "Page Content", - "key": "pagecontent" - }, - "children": [] - } - ] - - } - ] - } - ] - - }, - { - "id": "c8315bcd-37c2-4691-8c14-32d44980a173", - "type": "section", - "attributes": { - "name": "Bottom", - "key": "section-bottom", - "type": "section", - "id": "bottom" - }, - "children": [ - { - "id": "d59c63b3-6bce-4912-a30a-3b777e3c3bc7", - "type": "grid", - "attributes": {}, - "children": [ - { - "id": "a76cfe58-e9f3-4ab0-a741-489084e347be", - "type": "block", - "attributes": { - "size": 100 - }, - "children": [ - { - "id": "ec9e89e5-5043-4e3e-a853-fe470247a875", - "type": "position", - "attributes": { - "name": "Position Bottom", - "key": "bottom" - }, - "children": [] - } - ] - } - ] - - } - ] - } - ] - - }, - { - "id": "6b28344b-7ce3-431c-907f-204b851f7218", - "type": "block", - "attributes": { - "size": 25 - }, - "children": [ - { - "id": "303ea0a4-5279-436f-b808-b37d99c5de90", - "type": "section", - "attributes": { - "name": "Sidebar", - "key": "section-sidebar", - "type": "section", - "id": "sidebar" - }, - "children": [ - { - "id": "89230c44-26a3-4f4f-b135-a2194f05b3b6", - "type": "grid", - "attributes": {}, - "children": [ - { - "id": "5f71de41-07a8-4cca-837c-16b81a29361e", - "type": "block", - "attributes": { - "size": 100 - }, - "children": [ - { - "id": "9d45007f-78eb-4e1b-b9ee-f52a72fed80a", - "type": "position", - "attributes": { - "name": "Position Sidebar", - "key": "sidebar" - }, - "children": [] - } - ] - } - ] - }, - { - "id": "3f44b134-1552-4f49-86b8-670d1add1000", - "type": "grid", - "attributes": {}, - "children": [ - { - "id": "6002f826-16c6-4920-b550-abdb93a9398b", - "type": "block", - "attributes": { - "size": 100 - }, - "children": [ - { - "id": "fb585b76-4db5-4611-a96c-08c09bd8d90f", - "type": "particle", - "attributes": { - "name": "Social Buttons", - "key": "social-buttons" - }, - "children": [] - } - ] - } - ] - } - ] - - } - ] - } - ] - }, - { - "id": "ddeb26e3-caeb-4a5c-82c4-9f72a556f107", - "type": "section", - "attributes": { - "name": "Section Footer", - "key": "section-footer", - "type": "footer", - "id": "footer" - }, - "children": [ - { - "id": "9550d178-71b5-4e04-a566-137e6350ea70", - "type": "grid", - "attributes": {}, - "children": [ - { - "id": "54bb2fd9-fc27-462b-ada8-de41912bd8fa", - "type": "block", - "attributes": { - "size": 16.6667 - }, - "children": [ - { - "id": "825a6498-c19b-42df-bffc-86dae90b64d8", - "type": "spacer", - "attributes": {}, - "children": [] - } - ] - } , - { - "id": "c3390225-81c8-4403-91d4-14a2b01fb1bd", - "type": "block", - "attributes": { - "size": 66.6667 - }, - "children": [ - { - "id": "0f7653c0-909b-4430-afdd-75bc5df8105a", - "type": "position", - "attributes": { - "name": "Position Footer", - "key": "footer" - }, - "children": [] - } - ] - }, - { - "id": "b853fa65-3ccb-4994-b266-01b398961063", - "type": "block", - "attributes": { - "size": 16.6667 - }, - "children": [ - { - "id": "491e8d6c-c762-401f-9ebf-018d83d4a0fe", - "type": "spacer", - "attributes": {}, - "children": [] - } - ] - } - ] - - } - ] - - }, - { - "id": "a845861d-03fd-4ce2-8a05-48ecc458a768", - "type": "atoms", - "attributes": {}, - "children": [] - } -]; - -/*module.exports = [{ - "id": "2330cbf9-25f2-4416-a0de-446fdce1ad0c", - "type": "section", - "attributes": { - "name": "Section 1", - "key": "section-1" - }, - "children": [{ - "id": "ac1962c1-5587-4a24-8983-be8bfd9b1d2f", - "type": "grid", - "attributes": {}, - "children": [{ - "id": "359b6022-55ce-45b9-880c-8974876a873d", - "type": "block", - "attributes": { - "size": 20 - }, - "children": [{ - "id": "fb585b76-4db5-4611-a96c-08c09bd8d90f", - "type": "position", - "attributes": { - "name": "Position 1", - "key": "1" - }, - "children": [] - }] - }, { - "id": "388f9ef2-68ad-40bb-ba5e-8d534b24bdfc", - "type": "block", - "attributes": { - "size": 60 - }, - "children": [ - { - "id": "zzza", - "type": "position", - "attributes": { - "name": "Position Test", - "key": "test" - }, - "children": [] - }, { - "id": "6e85d292-e08b-448c-a46a-f5b2693db83e", - "type": "position", - "attributes": { - "name": "Position 2", - "key": "2" - }, - "children": [] - }, { - "id": "486fbfa4-b2a2-419e-972e-9386ec5f9448", - "type": "grid", - "attributes": {}, - "children": [{ - "id": "f410832c-9a40-4af1-ad1e-89bdf5614455", - "type": "block", - "attributes": { - "size": 50 - }, - "children": [{ - "id": "a3079234-4d28-4a81-a87d-f6a13655f3b8", - "type": "position", - "attributes": { - "name": "Position 3", - "key": "3" - }, - "children": [] - }] - }, { - "id": "b0b1352e-8be7-46fb-bf00-fa2e8a9032b4", - "type": "block", - "attributes": { - "size": 50 - }, - "children": [{ - "id": "d35a7f80-0e4b-4ec8-b087-6da430159242", - "type": "spacer", - "attributes": {}, - "children": [] - }] - }] - }] - }, { - "id": "2a4ae382-246a-44c3-82db-be004cb4ce53", - "type": "block", - "attributes": { - "size": 20 - }, - "children": [{ - "id": "5ca41743-4e5a-4528-8df9-b11d03706aee", - "type": "position", - "attributes": { - "name": "Position A", - "key": "a" - }, - "children": [] - }] - }] - }] -}];*/ diff --git a/platforms/common/application/main.js b/platforms/common/application/main.js index 6842b8b11..00b516570 100644 --- a/platforms/common/application/main.js +++ b/platforms/common/application/main.js @@ -10,6 +10,7 @@ var $ = require('elements'), modal = ui.modal, toastr = ui.toastr, + parseAjaxURI = require('./utils/get-ajax-url').parse, getAjaxSuffix = require('./utils/get-ajax-suffix'), flags = require('./utils/flags-state'), @@ -138,7 +139,7 @@ ready(function() { type = element.data('save'), extras = '', page = $('[data-lm-root]') ? 'layout' : ($('[data-mm-id]') ? 'menu' : 'other'), - saveURL = trim(window.location.href, '#') + getAjaxSuffix(); + saveURL = parseAjaxURI(trim(window.location.href, '#') + getAjaxSuffix()); switch (page) { case 'layout': @@ -156,7 +157,7 @@ ready(function() { data.ordering = JSON.stringify(mm.menumanager.ordering); data.items = JSON.stringify(mm.menumanager.items); - saveURL = element.parent('form').attribute('action') + getAjaxSuffix(); + saveURL = parseAjaxURI(element.parent('form').attribute('action') + getAjaxSuffix()); break; case 'other': @@ -288,7 +289,7 @@ ready(function() { if (!href) { return false; } indicator.showIndicator(); - request(method, href + getAjaxSuffix(), function(error, response) { + request(method, parseAjaxURI(href + getAjaxSuffix()), function(error, response) { if (!response.body.success) { modal.open({ content: response.body.html || response.body, diff --git a/platforms/common/application/menu/extra-items.js b/platforms/common/application/menu/extra-items.js index 97e4348c9..e2ce0c053 100644 --- a/platforms/common/application/menu/extra-items.js +++ b/platforms/common/application/menu/extra-items.js @@ -7,6 +7,8 @@ var $ = require('elements'), request = require('agent'), indexOf = require('mout/array/indexOf'), trim = require('mout/string/trim'), + parseAjaxURI = require('../utils/get-ajax-url').parse, + getAjaxURL = require('../utils/get-ajax-url').global, getAjaxSuffix = require('../utils/get-ajax-suffix'), flags = require('../utils/flags-state'), deepEquals = require('mout/lang/deepEquals'); @@ -55,7 +57,7 @@ var StepOne = function(map, mode) { // mode [reorder, resize, evenResize] content: 'Loading', method: 'post', //data: data, - remote: $(this.block).find('.config-cog').attribute('href') + getAjaxSuffix(), + remote: parseAjaxURI($(this.block).find('.config-cog').attribute('href') + getAjaxSuffix()), remoteLoaded: function(response, modal) { var search = modal.elements.content.find('.search input'), blocks = modal.elements.content.search('[data-mm-type]'), @@ -91,9 +93,17 @@ var StepOne = function(map, mode) { // mode [reorder, resize, evenResize] }; var StepTwo = function(data, content, button) { - var uri = content.find('[data-mm-particle-stepone]').data('mm-particle-stepone'); + var uri = content.find('[data-mm-particle-stepone]').data('mm-particle-stepone'), + picker = data.instancepicker; + + if (picker) { + var item = JSON.parse(data.item); + picker = JSON.parse(picker); + delete(data.instancepicker); + uri = getAjaxURL(item.type + '/' + item.particle); + } - request('post', uri + getAjaxSuffix(), data, function(error, response) { + request('post', parseAjaxURI(uri + getAjaxSuffix()), data, function(error, response) { if (!response.body.success) { modal.open({ content: response.body.html || response.body, @@ -117,9 +127,10 @@ var StepTwo = function(data, content, button) { var form = content.find('form'), submit = content.find('input[type="submit"], button[type="submit"]'), + fakeDOM = zen('div').html(response.body.html).find('form'), dataString = []; - if (!form || !submit) { return true; } + if ((!form && !fakeDOM) || !submit) { return true; } var applyAndSave = content.search('[data-apply-and-save]'); if (applyAndSave) { applyAndSave.remove(); } @@ -131,14 +142,17 @@ var StepTwo = function(data, content, button) { submit.showIndicator(); - $(form[0].elements).forEach(function(input) { + $(fakeDOM[0].elements).forEach(function(input) { input = $(input); - var name = input.attribute('name'), - value = input.value(), + var name = input.attribute('name'); + if (!name || input.disabled()) { return; } + + input = content.find('[name="' + name + '"]'); + var value = input.value(), parent = input.parent('.settings-param'), override = parent ? parent.find('> input[type="checkbox"]') : null; - if (!name || input.disabled() || (override && !override.checked())) { return; } + if (override && !override.checked()) { return; } dataString.push(name + '=' + encodeURIComponent(value)); }); @@ -147,7 +161,7 @@ var StepTwo = function(data, content, button) { dataString.push('title=' + encodeURIComponent(title.data('title-editable'))); } - request(form.attribute('method'), form.attribute('action') + getAjaxSuffix(), dataString.join('&') || {}, function(error, response) { + request(fakeDOM.attribute('method'), parseAjaxURI(fakeDOM.attribute('action') + getAjaxSuffix()), dataString.join('&') || {}, function(error, response) { if (!response.body.success) { modal.open({ content: response.body.html || response.body, @@ -156,29 +170,46 @@ var StepTwo = function(data, content, button) { } }); } else { - var element = menumanager.element, - path = element.data('mm-id') + '-', - id = randomID(5), - base = element.parent('[data-mm-base]').data('mm-base'), - col = (element.parent('[data-mm-id]').data('mm-id').match(/\d+$/) || [0])[0], - index = indexOf(element.parent().children('[data-mm-id]'), element[0]); - - while (menumanager.items[path + id]) { id = randomID(5); } + // it's menu + if (!picker) { + var element = menumanager.element, + path = element.data('mm-id') + '-', + id = randomID(5), + base = element.parent('[data-mm-base]').data('mm-base'), + col = (element.parent('[data-mm-id]').data('mm-id').match(/\d+$/) || [0])[0], + index = indexOf(element.parent().children('[data-mm-id]'), element[0]); + + while (menumanager.items[path + id]) { id = randomID(5); } + + menumanager.items[path + id] = response.body.item; + menumanager.ordering[base][col].splice(index, 1, path + id); + element.data('mm-id', path + id); + + if (response.body.html) { + element.html(response.body.html); + } - menumanager.items[path + id] = response.body.item; - menumanager.ordering[base][col].splice(index, 1, path + id); - element.data('mm-id', path + id); + menumanager.isNewParticle = false; + menumanager.emit('dragEnd', menumanager.map); + toastr.success('The Menu Item settings have been applied to the Main Menu.
      Remember to click the Save button to store them.', 'Settings Applied'); + } else { // it's field picker + var field = $('[name="' + picker.field + '"]'), + btnPicker = field.siblings('[data-g-instancepicker]'), + label = field.siblings('.g-instancepicker-title'); + + if (field) { + field.value(JSON.stringify(response.body.item)); + $('body').emit('change', { target: field }); + } + if (label) { label.text(response.body.item.title); } - if (response.body.html) { - element.html(response.body.html); + if (item.type == 'particle') { + btnPicker.text(btnPicker.data('g-instancepicker-alttext')); + } } - - menumanager.isNewParticle = false; - menumanager.emit('dragEnd', menumanager.map); - modal.close(); - toastr.success('The Menu Item settings have been applied to the Main Menu.
      Remember to click the Save button to store them.', 'Settings Applied'); } + modal.close(); submit.hideIndicator(); }); }); @@ -208,8 +239,9 @@ ready(function() { var container = element.parent('.menu-editor-extras'), selected = container.find('[data-lm-blocktype].selected, [data-mm-module].selected'), - type = selected.data('mm-type'), - data = { type: 'particle' }; + type = selected.data('mm-type'); + + data = { type: 'particle' }; switch (type) { case 'particle': @@ -225,7 +257,29 @@ ready(function() { element.showIndicator(); - StepTwo({ item: JSON.stringify(data) }, element.parent('.g5-content'), element); + + var data, instancepicker = element.data('g-instancepicker'); + + if (instancepicker && type == 'module') { + data = JSON.parse(instancepicker); + var field = $('[name="' + data.field + '"]'); + if (field) { + field.value(selected.data('mm-module')); + body.emit('input', { target: field }); + } + + element.hideIndicator(); + modal.close(); + + return false; + } else { + var ip = instancepicker; + element.data('g-instancepicker', null); + StepTwo({ + item: JSON.stringify(data), + instancepicker: ip ? ip : null + }, element.parent('.g5-content'), element); + } }); }); diff --git a/platforms/common/application/menu/index.js b/platforms/common/application/menu/index.js index 4d8c82654..415e15d79 100644 --- a/platforms/common/application/menu/index.js +++ b/platforms/common/application/menu/index.js @@ -10,6 +10,7 @@ var ready = require('elements/domready'), trim = require('mout/string/trim'), clamp = require('mout/math/clamp'), contains = require('mout/array/contains'), + parseAjaxURI = require('../utils/get-ajax-url').parse, getAjaxSuffix = require('../utils/get-ajax-suffix'), validateField = require('../utils/field-validation'); @@ -189,11 +190,12 @@ ready(function() { remote: $(element).attribute('href') + getAjaxSuffix(), remoteLoaded: function(response, content) { var form = content.elements.content.find('form'), + fakeDOM = zen('div').html(response.body.html).find('form'), submit = content.elements.content.search('input[type="submit"], button[type="submit"], [data-apply-and-save]'), dataString = [], invalid = [], path; - if (!form || !submit) { return true; } + if ((!form && !fakeDOM) || !submit) { return true; } // Menuitems Settings apply submit.on('click', function(e) { @@ -207,14 +209,15 @@ ready(function() { target.hideIndicator(); target.showIndicator(); - $(form[0].elements).forEach(function(input) { + $(fakeDOM[0].elements).forEach(function(input) { input = $(input); - var name = input.attribute('name'), - value = input.value(); - + var name = input.attribute('name'); if (!name) { return; } + + input = content.elements.content.find('[name="' + name + '"]'); + if (!validateField(input)) { invalid.push(input); } - dataString.push(name + '=' + encodeURIComponent(value)); + dataString.push(name + '=' + encodeURIComponent(input.value())); }); var title = content.elements.content.find('[data-title-editable]'); @@ -229,7 +232,7 @@ ready(function() { return; } - request(form.attribute('method'), form.attribute('action') + getAjaxSuffix(), dataString.join('&'), function(error, response) { + request(fakeDOM.attribute('method'), parseAjaxURI(fakeDOM.attribute('action') + getAjaxSuffix()), dataString.join('&'), function(error, response) { if (!response.body.success) { modal.open({ content: response.body.html || response.body, diff --git a/platforms/common/application/particles/collections/index.js b/platforms/common/application/particles/collections/index.js index f0832c588..b9de372f7 100644 --- a/platforms/common/application/particles/collections/index.js +++ b/platforms/common/application/particles/collections/index.js @@ -12,6 +12,7 @@ var ready = require('elements/domready'), trim = require('mout/string/trim'), + parseAjaxURI = require('../../utils/get-ajax-url').parse, getAjaxSuffix = require('../../utils/get-ajax-suffix'), validateField = require('../../utils/field-validation'); @@ -52,7 +53,7 @@ ready(function() { if (evt.oldIndex === evt.newIndex) { return; } var dataField = element.parent('.settings-param').find('[data-collection-data]'), - data = dataField.value(); + data = dataField.value(); data = JSON.parse(data); @@ -73,13 +74,13 @@ ready(function() { // Add new item body.delegate('click', '[data-collection-addnew]', function(event, element) { - var param = element.parent('.settings-param'), - list = param.find('ul'), - editall = list.parent().find('[data-collection-editall]'), + var param = element.parent('.settings-param'), + list = param.find('ul'), + editall = list.parent().find('[data-collection-editall]'), dataField = param.find('[data-collection-data]'), - tmpl = param.find('[data-collection-template]'), - items = list.search('> [data-collection-item]') || [], - last = $(lastItem(items)); + tmpl = param.find('[data-collection-template]'), + items = list.search('> [data-collection-item]') || [], + last = $(lastItem(items)); var clone = $(tmpl[0].cloneNode(true)), title, editable; @@ -106,13 +107,13 @@ ready(function() { // Edit Title body.delegate('blur', '[data-collection-item] [data-title-editable]', function(event, element) { - var text = trim(element.text()), - item = element.parent('[data-collection-item]'), - key = item.data('collection-item'), - items = element.parent('ul').search('> [data-collection-item]'), + var text = trim(element.text()), + item = element.parent('[data-collection-item]'), + key = item.data('collection-item'), + items = element.parent('ul').search('> [data-collection-item]'), dataField = element.parent('.settings-param').find('[data-collection-data]'), - data = dataField.value(), - index = indexOf(items, item[0]); + data = dataField.value(), + index = indexOf(items, item[0]); if (index == -1) { return; } @@ -126,12 +127,12 @@ ready(function() { // Remove item body.delegate('click', '[data-collection-remove]', function(event, element) { if (event && event.preventDefault) { event.preventDefault(); } - var item = element.parent('[data-collection-item]'), - list = element.parent('ul'), - items = list.search('> [data-collection-item]'), - index = indexOf(items, item[0]), + var item = element.parent('[data-collection-item]'), + list = element.parent('ul'), + items = list.search('> [data-collection-item]'), + index = indexOf(items, item[0]), dataField = element.parent('.settings-param').find('[data-collection-data]'), - data = dataField.value(); + data = dataField.value(); data = JSON.parse(data); data.splice(index, 1); @@ -160,11 +161,11 @@ ready(function() { } var isEditAll = element.data('collection-editall') !== null, - parent = element.parent('.settings-param'), + parent = element.parent('.settings-param'), dataField = parent.find('[data-collection-data]'), - data = dataField.value(), - item = element.parent('[data-collection-item]'), - items = parent.search('ul > [data-collection-item]'); + data = dataField.value(), + item = element.parent('[data-collection-item]'), + items = parent.search('ul > [data-collection-item]'); var dataPost = { data: isEditAll ? data : JSON.stringify(JSON.parse(data)[indexOf(items, item[0])]) }; modal.open({ @@ -174,11 +175,12 @@ ready(function() { data: dataPost, remote: element.attribute('href') + getAjaxSuffix(), remoteLoaded: function(response, content) { - var form = content.elements.content.find('form'), - submit = content.elements.content.search('input[type="submit"], button[type="submit"], [data-apply-and-save]'), + var form = content.elements.content.find('form'), + fakeDOM = zen('div').html(response.body.html).find('form'), + submit = content.elements.content.search('input[type="submit"], button[type="submit"], [data-apply-and-save]'), dataString = [], invalid = [], - dataValue = JSON.parse(data); + dataValue = JSON.parse(data); if (modal.getAll().length > 1) { var applyAndSave = content.elements.content.search('[data-apply-and-save]'); @@ -190,7 +192,7 @@ ready(function() { //content.elements.content.style({ width: 450 }); } - if (!form || !submit) { + if ((!form && !fakeDOM) || !submit) { return true; } @@ -206,14 +208,17 @@ ready(function() { target.hideIndicator(); target.showIndicator(); - $(form[0].elements).forEach(function(input) { + $(fakeDOM[0].elements).forEach(function(input) { input = $(input); - var name = input.attribute('name'), - value = input.value(), - parent = input.parent('.settings-param'), + var name = input.attribute('name'); + if (!name || input.disabled()) { return; } + + input = content.elements.content.find('[name="' + name + '"]'); + var value = input.value(), + parent = input.parent('.settings-param'), override = parent ? parent.find('> input[type="checkbox"]') : null; - if (!name || input.disabled() || (override && !override.checked())) { return; } + if (override && !override.checked()) { return; } if (!validateField(input)) { invalid.push(input); } dataString.push(name + '=' + encodeURIComponent(value)); }); @@ -234,7 +239,7 @@ ready(function() { return; } - request(form.attribute('method'), form.attribute('action') + getAjaxSuffix(), dataString.join('&') || {}, function(error, response) { + request(fakeDOM.attribute('method'), parseAjaxURI(fakeDOM.attribute('action') + getAjaxSuffix()), dataString.join('&') || {}, function(error, response) { if (!response.body.success) { modal.open({ content: response.body.html || response.body, @@ -252,7 +257,7 @@ ready(function() { dataField.value(JSON.stringify(dataValue)); body.emit('change', { target: dataField }); - element.parent('.settings-param-field').search('ul > [data-collection-item]').forEach(function(item, index){ + element.parent('.settings-param-field').search('ul > [data-collection-item]').forEach(function(item, index) { item = $(item); var label = item.find('[data-title-editable]'), text = dataValue[index][item.data('collection-item')]; diff --git a/platforms/common/application/particles/filepicker/index.js b/platforms/common/application/particles/filepicker/index.js index da3845028..0e905eef2 100644 --- a/platforms/common/application/particles/filepicker/index.js +++ b/platforms/common/application/particles/filepicker/index.js @@ -11,6 +11,7 @@ var $ = require('../../utils/elements.utils'), deepFillIn = require('mout/object/deepFillIn'), modal = require('../../ui').modal, getAjaxSuffix = require('../../utils/get-ajax-suffix'), + parseAjaxURI = require('../../utils/get-ajax-url').parse, getAjaxURL = require('../../utils/get-ajax-url').global, dropzone = require('dropzone'); @@ -60,6 +61,7 @@ var FilePicker = new prime({ mtime = zen('span.g-file-mtime[data-dz-mtime]').bottom(li); zen('span.g-file-progress[data-file-uploadprogress]').html('').bottom(li); + zen('div').bottom(thumb); li.bottom('body'); var html = li[0].outerHTML; @@ -84,13 +86,15 @@ var FilePicker = new prime({ thumbnailWidth: 100, thumbnailHeight: 100, url: bind(function(file) { - return getAjaxURL('filepicker/upload/' + this.getPath() + file[0].name) + getAjaxSuffix(); + return parseAjaxURI(getAjaxURL('filepicker/upload/' + this.getPath() + file[0].name) + getAjaxSuffix()); }, this) }); this.dropzone.on('thumbnail', function(file, dataUrl) { - $(file.previewElement).find('[data-dz-thumbnail]').attribute('style', 'background-image: url(' + dataUrl + ');'); + var ext = file.name.split('.'); + ext = (!ext.length || ext.length == 1) ? '-' : ext.reverse()[0]; + $(file.previewElement).addClass('g-image g-image-' + ext.toLowerCase()).find('[data-dz-thumbnail] > div').attribute('style', 'background-image: url(' + dataUrl + ');'); }); this.dropzone.on('addedfile', function(file) { @@ -103,10 +107,13 @@ var FilePicker = new prime({ insertLocation: 'bottom' }; + var ext = file.name.split('.'); + ext = (!ext.length || ext.length == 1) ? '-' : ext.reverse()[0]; + if (!file.type.match(/image.*/)) { - var ext = file.name.split('.'); - ext = (!ext.length || ext.length == 1) ? '-' : ext.reverse()[0]; element.find('.g-thumb').text(ext); + } else { + element.find('.g-thumb').addClass('g-image g-image-' + ext.toLowerCase()); } progressConf = deepFillIn((isList ? { @@ -225,7 +232,7 @@ var FilePicker = new prime({ fieldData.subfolder = true; element.showIndicator('fa fa-li fa-fw fa-spin-fast fa-spinner'); - request(getAjaxURL('filepicker') + getAjaxSuffix(), fieldData).send(bind(function(error, response) { + request(parseAjaxURI(getAjaxURL('filepicker') + getAjaxSuffix()), fieldData).send(bind(function(error, response) { element.hideIndicator(); this.addActiveState(element); diff --git a/platforms/common/application/particles/fonts/index.js b/platforms/common/application/particles/fonts/index.js index cd9ff1acd..fea43c13b 100644 --- a/platforms/common/application/particles/fonts/index.js +++ b/platforms/common/application/particles/fonts/index.js @@ -29,6 +29,7 @@ var prime = require('prime'), properCase = require('mout/string/properCase'), trim = require('mout/string/trim'), getAjaxSuffix = require('../../utils/get-ajax-suffix'), + parseAjaxURI = require('../../utils/get-ajax-url').parse, getAjaxURL = require('../../utils/get-ajax-url').global, modal = require('../../ui').modal, @@ -92,7 +93,7 @@ var Fonts = new prime({ modal.open({ content: 'Loading...', className: 'g5-dialog-theme-default g5-modal-fonts', - remote: getAjaxURL('fontpicker') + getAjaxSuffix(), + remote: parseAjaxURI(getAjaxURL('fontpicker') + getAjaxSuffix()), remoteLoaded: bind(function(response, content) { var container = content.elements.content; diff --git a/platforms/common/application/particles/icons/index.js b/platforms/common/application/particles/icons/index.js index d19f653ab..c261bb098 100644 --- a/platforms/common/application/particles/icons/index.js +++ b/platforms/common/application/particles/icons/index.js @@ -3,6 +3,7 @@ var $ = require('../../utils/elements.utils'), domready = require('elements/domready'), modal = require('../../ui').modal, getAjaxSuffix = require('../../utils/get-ajax-suffix'), + parseAjaxURI = require('../../utils/get-ajax-url').parse, getAjaxURL = require('../../utils/get-ajax-url').global, trim = require('mout/string/trim'), @@ -33,7 +34,7 @@ domready(function() { modal.open({ content: 'Loading', className: 'g5-dialog-theme-default g5-modal-icons', - remote: getAjaxURL('icons') + getAjaxSuffix(), + remote: parseAjaxURI(getAjaxURL('icons') + getAjaxSuffix()), afterClose: function() { var popovers = $('.g5-popover'); if (popovers) { popovers.remove(); } diff --git a/platforms/common/application/particles/index.js b/platforms/common/application/particles/index.js index 4301b728c..4bb813cb3 100644 --- a/platforms/common/application/particles/index.js +++ b/platforms/common/application/particles/index.js @@ -7,5 +7,6 @@ module.exports = { icons: require('./icons'), filepicker: require('./filepicker'), collections: require('./collections'), - keyvalue: require('./keyvalue') + keyvalue: require('./keyvalue'), + instancepicker: require('./instancepicker') }; \ No newline at end of file diff --git a/platforms/common/application/particles/instancepicker/index.js b/platforms/common/application/particles/instancepicker/index.js new file mode 100644 index 000000000..5395ff41c --- /dev/null +++ b/platforms/common/application/particles/instancepicker/index.js @@ -0,0 +1,112 @@ +"use strict"; + +var $ = require('elements'), + zen = require('elements/zen'), + ready = require('elements/domready'), + modal = require('../../ui').modal, + request = require('agent'), + trim = require('mout/string/trim'), + parseAjaxURI = require('../../utils/get-ajax-url').parse, + getAjaxURL = require('../../utils/get-ajax-url').global, + getAjaxSuffix = require('../../utils/get-ajax-suffix'); + + +ready(function() { + var body = $('body'); + + body.delegate('click', '[data-g-instancepicker]', function(event, element) { + if (event) { event.preventDefault(); } + + var data = JSON.parse(element.data('g-instancepicker')), + field = $('[name="' + data.field + '"]'), + uri = 'particle' + ((data.type == 'module') ? '/module' : ''), + value; + + if (!field) { return false; } + + value = field.value(); + + if (data.type == 'particle' && value) { + value = JSON.parse(value || {}); + uri = value.type + '/' + value[data.type]; + } + + + modal.open({ + content: 'Loading', + method: !value || data.type == 'module' ? 'get' : 'post', + data: !value || data.type == 'module' ? {} : value, + remote: getAjaxURL(uri) + getAjaxSuffix(), + remoteLoaded: function(response, modalInstance) { + var content = modalInstance.elements.content, + select = content.find('[data-mm-select]'); + + if (select) { select.data('g-instancepicker', element.data('g-instancepicker')); } + else { + var form = content.find('form'), + fakeDOM = zen('div').html(response.body.html).find('form'), + submit = content.find('input[type="submit"], button[type="submit"]'), + dataString = []; + + if ((!form && !fakeDOM) || !submit) { return true; } + + var applyAndSave = content.search('[data-apply-and-save]'); + if (applyAndSave) { applyAndSave.remove(); } + + submit.on('click', function(e) { + e.preventDefault(); + dataString = []; + + submit.showIndicator(); + + $(fakeDOM[0].elements).forEach(function(input) { + input = $(input); + var name = input.attribute('name'); + if (!name || input.disabled()) { return; } + + input = content.find('[name="' + name + '"]'); + var value = input.value(), + parent = input.parent('.settings-param'), + override = parent ? parent.find('> input[type="checkbox"]') : null; + + if (override && !override.checked()) { return; } + dataString.push(name + '=' + encodeURIComponent(value)); + }); + + var title = content.find('[data-title-editable]'); + if (title) { + dataString.push('title=' + encodeURIComponent(title.data('title-editable'))); + } + + request(parseAjaxURI(fakeDOM.attribute('method'), fakeDOM.attribute('action') + getAjaxSuffix()), dataString.join('&') || {}, function(error, response) { + if (!response.body.success) { + modal.open({ + content: response.body.html || response.body, + afterOpen: function(container) { + if (!response.body.html) { container.style({ width: '90%' }); } + } + }); + } else { + + var label = field.siblings('.g-instancepicker-title'); + + if (field) { + field.value(JSON.stringify(response.body.item)); + $('body').emit('change', { target: field }); + } + + if (label) { label.text(response.body.item.title); } + } + + modal.close(); + submit.hideIndicator(); + }); + }); + + } + } + }); + }); +}); + +module.exports = {}; \ No newline at end of file diff --git a/platforms/common/application/ui/collapse.js b/platforms/common/application/ui/collapse.js new file mode 100644 index 000000000..c94b02a97 --- /dev/null +++ b/platforms/common/application/ui/collapse.js @@ -0,0 +1,72 @@ +"use strict"; +var ready = require('elements/domready'), + $ = require('elements'); + +var refreshCards = function() { + var collapsers = $('[data-g-collapse]'), data, handle; + if (!collapsers) { return false; } + + collapsers.forEach(function(collapser) { + collapser = $(collapser); + data = JSON.parse(collapser.data('g-collapse')); + handle = data.handle ? collapser.find(data.handle) : collapser.find('.g-collapse'); + collapser.gFastCollapse = true; + $('body').emit('click', { target: handle, element: collapser }); + }); +}; + +ready(function() { + var data, target, storage; + $('body').delegate('click', '[data-g-collapse]', function(event, element) { + element = event.element || element; + + data = JSON.parse(element.data('g-collapse')); + target = $(event.target); + storage = JSON.parse(localStorage.getItem('g5-collapsed') || '{}'); + if (!data.handle) { data.handle = element.find('.g-collapse'); } + + if (!target.matches(data.handle) && !target.parent(data.handle)) { return false; } + + if (storage[data.id] === undefined) { + storage[data.id] = data.collapsed; + localStorage.setItem('g5-collapsed', JSON.stringify(storage)); + } + + var collapsed = storage[data.id], + panel = data.target ? element.find(data.target) : element, + card = panel.parent('.card'); + + if (card && card.hasClass('g-collapsed')) { + card.removeClass('g-collapsed'); + panel.style({ + overflow: 'hidden', + height: 0 + }); + } + + var slide = function(override) { + collapsed = typeof override != 'number' ? override : collapsed; + if (!collapsed) { + card.addClass('g-collapsed'); + element.attribute('style', null); + } + + data.handle.data('title', !collapsed ? data.expand : data.collapse); + storage[data.id] = !collapsed; + localStorage.setItem('g5-collapsed', JSON.stringify(storage)); + }; + + if (element.gFastCollapse) { + panel[collapsed ? 'removeClass' : 'addClass']('g-collapsed'); + slide(!collapsed); + } else { + panel.removeClass('g-collapsed')[collapsed ? 'slideDown' : 'slideUp'](slide); + } + + element.gFastCollapse = false; + }); + + refreshCards(); +}); + +module.exports = refreshCards; \ No newline at end of file diff --git a/platforms/common/application/ui/index.js b/platforms/common/application/ui/index.js index 47e0e87b3..d8cf2bdc9 100644 --- a/platforms/common/application/ui/index.js +++ b/platforms/common/application/ui/index.js @@ -6,6 +6,7 @@ var Modal = require('./modal'), module.exports = { modal: new Modal(), togglers: require('./togglers'), + collapse: require('./collapse'), selectize: Selectize, toastr: require('./toastr') }; diff --git a/platforms/common/application/utils/ajaxify-links.js b/platforms/common/application/utils/ajaxify-links.js index 165e5f3cd..04ef8d432 100644 --- a/platforms/common/application/utils/ajaxify-links.js +++ b/platforms/common/application/utils/ajaxify-links.js @@ -6,6 +6,7 @@ var prime = require('prime'), domready = require('elements/domready'), storage = require('prime/map')(), modal = require('../ui').modal, + collapsers = require('../ui/collapse'), size = require('mout/collection/size'), indexOf = require('mout/array/indexOf'), @@ -18,6 +19,7 @@ var prime = require('prime'), request = require('agent')(), History = require('./history'), flags = require('./flags-state'), + parseAjaxURI = require('./get-ajax-url').parse, getAjaxSuffix = require('./get-ajax-suffix'), mm = require('../menu'); @@ -53,7 +55,7 @@ History.Adapter.bind(window, 'statechange', function() { Data.element = $('[href="' + url + '"]'); } - URI = URI + getAjaxSuffix(); + URI = parseAjaxURI(URI + getAjaxSuffix()); var lis; if (sidebar && Data.element) { @@ -83,21 +85,26 @@ History.Adapter.bind(window, 'statechange', function() { if (!ERROR) { modal.closeAll(); } request.url(URI + params).data(Data.extras || {}).method(Data.extras ? 'post' : 'get').send(function(error, response) { if (!response.body.success) { - ERROR = true; - modal.open({ - content: response.body.html || response.body, - afterOpen: function(container) { - if (!response.body.html) { container.style({ width: '90%' }); } - } - }); + if (!ERROR) { + ERROR = true; + modal.open({ + content: response.body.html || response.body, + afterOpen: function(container) { + if (!response.body.html) { container.style({ width: '90%' }); } + } + }); - History.back(); + History.back(); + } else { + ERROR = false; + } if (Data.element) { Data.element.hideIndicator(); } return false; + } var target = Data.parent ? Data.element.parent(Data.parent) : $(Data.target), @@ -130,6 +137,7 @@ History.Adapter.bind(window, 'statechange', function() { var selects = $('[data-selectize]'); if (selects) { selects.selectize(); } selectorChangeEvent(); + collapsers(); body.emit('statechangeEnd'); }); diff --git a/platforms/common/application/utils/flags-state.js b/platforms/common/application/utils/flags-state.js index bc38b5f01..5eca0665d 100644 --- a/platforms/common/application/utils/flags-state.js +++ b/platforms/common/application/utils/flags-state.js @@ -6,6 +6,7 @@ var prime = require('prime'), modal = require('../ui').modal, getAjaxURL = require('./get-ajax-url').global, + parseAjaxURI = require('./get-ajax-url').parse, getAjaxSuffix = require('./get-ajax-suffix'); var FlagsState = new prime({ @@ -36,7 +37,7 @@ var FlagsState = new prime({ warning: function(options){ var callback = options.callback || function() {}, afterclose = options.afterclose || function() {}, - warningURL = options.url || getAjaxURL('unsaved') + getAjaxSuffix(); + warningURL = parseAjaxURI(options.url || getAjaxURL('unsaved') + getAjaxSuffix()); modal.open({ content: 'Loading...', diff --git a/platforms/common/application/utils/get-ajax-url.js b/platforms/common/application/utils/get-ajax-url.js index 9510445df..d81fc9c88 100644 --- a/platforms/common/application/utils/get-ajax-url.js +++ b/platforms/common/application/utils/get-ajax-url.js @@ -17,7 +17,20 @@ var getConfAjaxURL = function(view, search) { return unescapeHtml(url.replace(re, view)); }; +var parseAjaxURI = function(uri) { + var platform = typeof GANTRY_PLATFORM == 'undefined' ? '' : GANTRY_PLATFORM + switch(platform){ + case 'wordpress': + uri = uri.replace(/themes\.php/ig, 'admin-ajax.php'); + break; + default: + } + + return uri; +}; + module.exports = { global: getAjaxURL, - config: getConfAjaxURL + config: getConfAjaxURL, + parse: parseAjaxURI }; \ No newline at end of file diff --git a/platforms/common/css-compiled/admin.css b/platforms/common/css-compiled/admin.css index 70dce256a..ccd2e4dd7 100644 --- a/platforms/common/css-compiled/admin.css +++ b/platforms/common/css-compiled/admin.css @@ -1,16 +1,16 @@ -/* line 8, ../../../../../../Users/w00fz/Projects/git/gantry/gantry5/engines/common/nucleus/scss/nucleus/mixins/_sizes.scss */ +/* line 8, ../../../../../../Users/newkind/Firmy/RocketTheme/Gantry5/engines/common/nucleus/scss/nucleus/mixins/_sizes.scss */ .size-100 { width: 100%; } -/* line 2, ../../../../../../Users/w00fz/Projects/git/gantry/gantry5/engines/common/nucleus/scss/nucleus/mixins/_utilities.scss */ +/* line 2, ../../../../../../Users/newkind/Firmy/RocketTheme/Gantry5/engines/common/nucleus/scss/nucleus/mixins/_utilities.scss */ #g5-container .settings-block .settings-param.input-hidden, #g5-container .collection-list .settings-param-field ul, #g5-container .collection-keyvalue .settings-param-field .g-keyvalue-field ul, #g5-container #configurations ul, #g5-container #main-header ul, #g5-container #navbar ul, #g5-container .g5-dialog .g-tabs ul, .g5-dialog #g5-container .g-tabs ul, #g5-container .g5-popover-content .g-tabs ul, .g5-popover-content #g5-container .g-tabs ul, .g5-popover-content .g-pane ul, .g5-lm-particles-picker ul, .g5-lm-particles-picker li, .g5-mm-particles-picker ul, .g5-mm-particles-picker li, .g5-mm-modules-picker ul, .g5-mm-modules-picker li, .g5-popover.g5-popover-font-preview ul, .g5-popover.g5-popover-font-preview li, .g5-popover-extras ul, .g5-dialog.g5-dialog-theme-default.g5-modal-icons .g5-content .icons-wrapper ul, .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-bookmarks, .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content [data-file] { margin: 0; padding: 0; list-style: none; } -/* line 9, ../../../../../../Users/w00fz/Projects/git/gantry/gantry5/engines/common/nucleus/scss/nucleus/mixins/_utilities.scss */ +/* line 9, ../../../../../../Users/newkind/Firmy/RocketTheme/Gantry5/engines/common/nucleus/scss/nucleus/mixins/_utilities.scss */ #g5-container .submenu-ratio i { position: relative; top: 50%; @@ -21,6 +21,11 @@ transform: translateY(-50%); } +/* line 7, platforms/common/scss/admin/mixins/_background.scss */ +.colorpicker, .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li .g-thumb.g-image { + background-image: url(data:image/jpeg;base64,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); +} + /* line 1, platforms/common/scss/admin/modules/_toggle-ui.scss */ #g5-container .card .enabler [type="hidden"] + .toggle, #g5-container .card .enabler [type="radio"] + .toggle { display: inline-block; @@ -70,30 +75,37 @@ html { /* line 6, platforms/common/scss/admin/_core.scss */ body { + margin: 0; +} + +/* line 10, platforms/common/scss/admin/_core.scss */ +body.g5-prime { color: #fff; - background-color: #354D59 !important; + background-color: #354D59; font-family: "roboto", "Helvetica", "Tahoma", "Geneva", "Arial", sans-serif; - margin: 0; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } -/* line 15, platforms/common/scss/admin/_core.scss */ +/* line 18, platforms/common/scss/admin/_core.scss */ a { color: #439A86; } -/* line 19, platforms/common/scss/admin/_core.scss */ +/* line 22, platforms/common/scss/admin/_core.scss */ #g5-container { font-size: 1rem; line-height: 1.5; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + font-family: "roboto", "Helvetica", "Tahoma", "Geneva", "Arial", sans-serif; } -/* line 23, platforms/common/scss/admin/_core.scss */ +/* line 29, platforms/common/scss/admin/_core.scss */ #g5-container .g-block { position: relative; } @media only all and (max-width: 47.938rem) { - /* line 23, platforms/common/scss/admin/_core.scss */ + /* line 29, platforms/common/scss/admin/_core.scss */ #g5-container .g-block { -webkit-box-flex: 0; -moz-box-flex: 0; @@ -104,37 +116,50 @@ a { flex: 0 100%; } } -/* line 30, platforms/common/scss/admin/_core.scss */ +/* line 36, platforms/common/scss/admin/_core.scss */ #g5-container .g-content { margin: 0.625rem; padding: 0.938rem; } -/* line 35, platforms/common/scss/admin/_core.scss */ +/* line 41, platforms/common/scss/admin/_core.scss */ #g5-container .inner-container { margin: 1.5rem; box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2); color: #666; } @media only all and (max-width: 47.938rem) { - /* line 35, platforms/common/scss/admin/_core.scss */ + /* line 41, platforms/common/scss/admin/_core.scss */ #g5-container .inner-container { margin: 0; } } -/* line 46, platforms/common/scss/admin/_core.scss */ +/* line 52, platforms/common/scss/admin/_core.scss */ #g5-container .fa-spin-fast { -webkit-animation: fa-spin 1s infinite linear; -moz-animation: fa-spin 1s infinite linear; animation: fa-spin 1s infinite linear; } -/* line 51, platforms/common/scss/admin/_core.scss */ +/* line 57, platforms/common/scss/admin/_core.scss */ #g5-container .changes-indicator { opacity: 0; -webkit-animation: pulsate 1s ease-out infinite; -moz-animation: pulsate 1s ease-out infinite; animation: pulsate 1s ease-out infinite; } -/* line 57, platforms/common/scss/admin/_core.scss */ +/* line 65, platforms/common/scss/admin/_core.scss */ +#g5-container .g-collapsed .g-collapse i { + -webkit-transform: rotate(180deg); + -moz-transform: rotate(180deg); + -ms-transform: rotate(180deg); + -o-transform: rotate(180deg); + transform: rotate(180deg); +} +/* line 70, platforms/common/scss/admin/_core.scss */ +#g5-container .g-collapsed .inner-params { + overflow: hidden; + height: 0; +} +/* line 77, platforms/common/scss/admin/_core.scss */ #g5-container .badge, #g5-container .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li.selected span, .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li.selected #g5-container span { border-radius: 100px; background-color: #eee; @@ -142,11 +167,24 @@ a { padding: 3px 6px; text-shadow: none; } -/* line 66, platforms/common/scss/admin/_core.scss */ +/* line 86, platforms/common/scss/admin/_core.scss */ #g5-container .cards-wrapper { - margin: -10px -1%; + margin: -10px 0; + display: block; + width: 100%; + -webkit-column-count: 2; + -moz-column-count: 2; + column-count: 2; } -/* line 70, platforms/common/scss/admin/_core.scss */ +@media only all and (max-width: 47.938rem) { + /* line 86, platforms/common/scss/admin/_core.scss */ + #g5-container .cards-wrapper { + -webkit-column-count: 1; + -moz-column-count: 1; + column-count: 1; + } +} +/* line 97, platforms/common/scss/admin/_core.scss */ #g5-container .card { display: inline-block; background: #fff; @@ -155,18 +193,43 @@ a { padding: 10px; min-width: 250px; vertical-align: top; - margin: 10px 1%; + margin: 10px 0; } -/* line 80, platforms/common/scss/admin/_core.scss */ +/* line 108, platforms/common/scss/admin/_core.scss */ #g5-container .card.full-width { margin: 0; display: block; } -/* line 85, platforms/common/scss/admin/_core.scss */ +/* line 113, platforms/common/scss/admin/_core.scss */ #g5-container .card h4 { margin: 0; } -/* line 88, platforms/common/scss/admin/_core.scss */ +/* line 116, platforms/common/scss/admin/_core.scss */ +#g5-container .card h4 > * { + vertical-align: middle; +} +/* line 121, platforms/common/scss/admin/_core.scss */ +#g5-container .card h4[data-g-collapse] .g-collapse { + cursor: pointer; + display: inline-block; + border: 1px solid #ddd; + color: #bbb; + border-radius: 3px; + line-height: 1rem; + padding: 2px; + margin-right: 5px; +} +/* line 132, platforms/common/scss/admin/_core.scss */ +#g5-container .card h4[data-g-collapse] .g-collapse:hover:before { + bottom: 1.65rem; + left: 0.25rem; +} +/* line 137, platforms/common/scss/admin/_core.scss */ +#g5-container .card h4[data-g-collapse] .g-collapse:hover:after { + left: -0.5rem; + bottom: 2rem; +} +/* line 144, platforms/common/scss/admin/_core.scss */ #g5-container .card h4 .enabler { float: right; } @@ -229,59 +292,72 @@ a { #g5-container .card .enabler [type="radio"]:checked + .toggle .knob { opacity: 1; } -/* line 97, platforms/common/scss/admin/_core.scss */ -#g5-container .card .inner-params { +/* line 153, platforms/common/scss/admin/_core.scss */ +#g5-container .card .inner-params > :first-child:not(.alert) { margin: 0.625rem 0 0; - padding-top: 0.625rem; + padding-top: 1.25rem; border-top: 1px solid #eee; } -/* line 103, platforms/common/scss/admin/_core.scss */ +/* line 159, platforms/common/scss/admin/_core.scss */ #g5-container .card .theme-id { text-align: center; margin-bottom: 10px; font-weight: 500; } -/* line 109, platforms/common/scss/admin/_core.scss */ +/* line 165, platforms/common/scss/admin/_core.scss */ #g5-container .card .theme-name { text-align: center; } -/* line 114, platforms/common/scss/admin/_core.scss */ +/* line 170, platforms/common/scss/admin/_core.scss */ #g5-container .card .theme-screenshot img { margin: 0 auto 10px auto; display: block; } -/* line 119, platforms/common/scss/admin/_core.scss */ +/* line 175, platforms/common/scss/admin/_core.scss */ #g5-container .card .theme-screenshot a { display: block; } -/* line 125, platforms/common/scss/admin/_core.scss */ +/* line 181, platforms/common/scss/admin/_core.scss */ #g5-container .themes .card { max-width: 300px; } -/* line 130, platforms/common/scss/admin/_core.scss */ +/* line 186, platforms/common/scss/admin/_core.scss */ #g5-container .g-footer-actions { padding: 1rem 0; margin-top: 1rem; border-top: 1px solid #ddd; } -/* line 139, platforms/common/scss/admin/_core.scss */ +/* line 195, platforms/common/scss/admin/_core.scss */ #footer { - margin-bottom: 3.5rem; + background-color: #e7e7e7; + padding: 1em 0 3rem; + margin-bottom: 0; + color: #aaa; text-align: center; font-weight: 500; + border-top: 1px solid #dedede; + font-family: "roboto", "Helvetica", "Tahoma", "Geneva", "Arial", sans-serif; + font-size: 1rem; + line-height: 1.5; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } -/* line 143, platforms/common/scss/admin/_core.scss */ +/* line 209, platforms/common/scss/admin/_core.scss */ +#footer .g-version, #footer .g-version-date { + color: #8F4DAE; +} +/* line 213, platforms/common/scss/admin/_core.scss */ #footer a { - color: #a0d6c9; + color: #439A86 !important; text-decoration: none; } -/* line 146, platforms/common/scss/admin/_core.scss */ +/* line 216, platforms/common/scss/admin/_core.scss */ #footer a:hover { - color: #fff; + color: #245348 !important; } -/* line 153, platforms/common/scss/admin/_core.scss */ +/* line 223, platforms/common/scss/admin/_core.scss */ .Whoops.container { position: inherit; } @@ -349,24 +425,24 @@ a { opacity: 0; } } -/* line 175, platforms/common/scss/admin/_core.scss */ +/* line 245, platforms/common/scss/admin/_core.scss */ .g-tooltip { display: inline; position: relative; } -/* line 179, platforms/common/scss/admin/_core.scss */ +/* line 249, platforms/common/scss/admin/_core.scss */ .g-tooltip:before, .g-tooltip:after { font-size: 1rem; line-height: 1.5rem; } -/* line 185, platforms/common/scss/admin/_core.scss */ +/* line 255, platforms/common/scss/admin/_core.scss */ .g-tooltip:hover, .g-tooltip.g-tooltip-force { color: #439A86; text-decoration: none; } -/* line 190, platforms/common/scss/admin/_core.scss */ +/* line 260, platforms/common/scss/admin/_core.scss */ .g-tooltip:hover:after, .g-tooltip.g-tooltip-force:after { background: rgba(0, 0, 0, 0.8); border-radius: 0.1875rem; @@ -382,7 +458,7 @@ a { font-size: 0.8rem; } -/* line 205, platforms/common/scss/admin/_core.scss */ +/* line 275, platforms/common/scss/admin/_core.scss */ .g-tooltip:hover:before, .g-tooltip.g-tooltip-force:before { border: solid; border-color: rgba(0, 0, 0, 0.8) transparent; @@ -395,46 +471,46 @@ a { z-index: 100; } -/* line 217, platforms/common/scss/admin/_core.scss */ +/* line 287, platforms/common/scss/admin/_core.scss */ .g-tooltip.g-tooltip-right:hover:after, .g-tooltip.g-tooltip-right.g-tooltip-force:after { left: inherit; right: 0; } -/* line 222, platforms/common/scss/admin/_core.scss */ +/* line 292, platforms/common/scss/admin/_core.scss */ .g-tooltip.g-tooltip-right:hover:before, .g-tooltip.g-tooltip-right.g-tooltip-force:before { left: inherit; right: 1rem; } -/* line 227, platforms/common/scss/admin/_core.scss */ +/* line 297, platforms/common/scss/admin/_core.scss */ .g-tooltip.g-tooltip-bottom:hover:after, .g-tooltip.g-tooltip-bottom.g-tooltip-force:after { bottom: auto; } -/* line 231, platforms/common/scss/admin/_core.scss */ +/* line 301, platforms/common/scss/admin/_core.scss */ .g-tooltip.g-tooltip-bottom:hover:before, .g-tooltip.g-tooltip-bottom.g-tooltip-force:before { border-width: 0 .4rem .4rem .4rem; bottom: -0.1rem; } -/* line 238, platforms/common/scss/admin/_core.scss */ +/* line 308, platforms/common/scss/admin/_core.scss */ .button-save.g-tooltip:hover:after { bottom: 3rem; } -/* line 242, platforms/common/scss/admin/_core.scss */ +/* line 312, platforms/common/scss/admin/_core.scss */ .button-save.g-tooltip:hover:before { bottom: 2.6rem; } -/* line 247, platforms/common/scss/admin/_core.scss */ +/* line 317, platforms/common/scss/admin/_core.scss */ .section-actions .g-tooltip:hover:before { right: 7px; bottom: 1.5rem; } -/* line 251, platforms/common/scss/admin/_core.scss */ +/* line 321, platforms/common/scss/admin/_core.scss */ .section-actions .g-tooltip:hover:after { bottom: 1.9rem; } @@ -461,7 +537,7 @@ a { src: url("../fonts/roboto_bold_macroman/Roboto-Bold-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/roboto_bold_macroman/Roboto-Bold-webfont.woff") format("woff"), url("../fonts/roboto_bold_macroman/Roboto-Bold-webfont.ttf") format("truetype"), url("../fonts/roboto_bold_macroman/Roboto-Bold-webfont.svg#roboto") format("svg"); } /* line 5, platforms/common/scss/admin/_fonts.scss */ -.font-small, .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files li, .fa.font-small, .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files li.fa { +.font-small, #g5-container .card h4[data-g-collapse] .g-collapse, .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files li, .fa.font-small, #g5-container .card h4[data-g-collapse] .fa.g-collapse, .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files li.fa { font-size: 0.8rem; vertical-align: middle; } @@ -856,55 +932,65 @@ a { } /* line 13, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block { - width: 48%; + width: 100%; min-width: inherit; } -@media only all and (max-width: 47.938rem) { - /* line 13, platforms/common/scss/admin/_settings.scss */ - #g5-container .settings-block { - margin: 1% 0; - width: 100%; - } -} -/* line 22, platforms/common/scss/admin/_settings.scss */ +/* line 19, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block.card .badge, #g5-container .settings-block.card .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li.selected span, .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li.selected #g5-container .settings-block.card span { margin-left: 4px; } -/* line 27, platforms/common/scss/admin/_settings.scss */ +/* line 24, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block.disabled { opacity: 0.6; } -/* line 31, platforms/common/scss/admin/_settings.scss */ +/* line 28, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .advanced { color: #fc6e51; } -/* line 35, platforms/common/scss/admin/_settings.scss */ +/* line 32, platforms/common/scss/admin/_settings.scss */ +#g5-container .settings-block .alert { + margin: 0.625rem 0; +} +/* line 36, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .settings-param { padding: 10px 5px; clear: both; position: relative; border-bottom: 1px solid #f4f4f4; } -/* line 41, platforms/common/scss/admin/_settings.scss */ +/* line 42, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .settings-param.input-hidden { display: none; } -/* line 46, platforms/common/scss/admin/_settings.scss */ +/* line 47, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .settings-param:last-child { border-bottom: 0; } -/* line 50, platforms/common/scss/admin/_settings.scss */ +/* line 51, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .settings-param .button.button-simple { background-color: #eee; color: #a2a2a2; padding: 6px 8px; } -/* line 55, platforms/common/scss/admin/_settings.scss */ +/* line 56, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .settings-param .button.button-simple:hover { background-color: #d4d4d4; color: #6e6e6e; } -/* line 62, platforms/common/scss/admin/_settings.scss */ +/* line 63, platforms/common/scss/admin/_settings.scss */ +#g5-container .settings-block .g-instancepicker-title { + margin-right: 0.5rem; + font-style: italic; +} +/* line 66, platforms/common/scss/admin/_settings.scss */ +#g5-container .settings-block .g-instancepicker-title:empty { + margin: 0; +} +/* line 71, platforms/common/scss/admin/_settings.scss */ +#g5-container .settings-block .input-small { + width: 120px !important; +} +/* line 75, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block input.settings-param-toggle { position: absolute; top: 50%; @@ -912,12 +998,12 @@ a { margin: -7px 15px 0 0; z-index: 5; } -/* line 70, platforms/common/scss/admin/_settings.scss */ +/* line 83, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block input.settings-param-toggle:checked + .settings-param-override { opacity: 0; z-index: -1; } -/* line 77, platforms/common/scss/admin/_settings.scss */ +/* line 90, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .settings-param-override { position: absolute; top: 0; @@ -934,11 +1020,11 @@ a { transition: opacity 0.3s ease-in-out, z-index 0.3s ease-in-out; /*@include linear-gradient(90deg, transparentize($white, 0.7) 0%, transparentize($white, 0.7) 150px, transparentize($white, 0.4) 150px, transparentize($white, 0.4) 100%);*/ } -/* line 92, platforms/common/scss/admin/_settings.scss */ +/* line 105, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .settings-param-field { margin-left: 150px; } -/* line 96, platforms/common/scss/admin/_settings.scss */ +/* line 109, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .settings-param-field .g-reset-field { display: inline-block; opacity: 0; @@ -947,39 +1033,39 @@ a { -moz-transition: opacity 0.2s ease-in-out; transition: opacity 0.2s ease-in-out; } -/* line 104, platforms/common/scss/admin/_settings.scss */ +/* line 117, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .settings-param-field .input-group .g-reset-field { display: table-cell; vertical-align: middle; padding-left: 4px; } -/* line 111, platforms/common/scss/admin/_settings.scss */ +/* line 124, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .settings-param-field:hover .g-reset-field { opacity: 1; -webkit-transition: opacity 0.2s ease-in-out; -moz-transition: opacity 0.2s ease-in-out; transition: opacity 0.2s ease-in-out; } -/* line 119, platforms/common/scss/admin/_settings.scss */ +/* line 132, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .settings-param-title { max-width: 150px; margin: 5px; } -/* line 125, platforms/common/scss/admin/_settings.scss */ +/* line 138, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block i { line-height: inherit; } -/* line 129, platforms/common/scss/admin/_settings.scss */ +/* line 142, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .fa { width: 1rem; text-align: center; } -/* line 134, platforms/common/scss/admin/_settings.scss */ +/* line 147, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .fa-lg { font-size: inherit; vertical-align: inherit; } -/* line 139, platforms/common/scss/admin/_settings.scss */ +/* line 152, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block input, #g5-container .settings-block textarea { padding: 6px 12px; border: 1px solid #ddd; @@ -990,95 +1076,95 @@ a { line-height: 1.5; border-radius: 0.1875rem; } -/* line 150, platforms/common/scss/admin/_settings.scss */ +/* line 163, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block select { margin: 0 0 10px; display: inline-block; } -/* line 155, platforms/common/scss/admin/_settings.scss */ +/* line 168, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block input:not(.settings-param-toggle), #g5-container .settings-block select, #g5-container .settings-block .collection-list ul, #g5-container .settings-block .colorpicker, #g5-container .settings-block .multi.selectize-control { width: 250px; } @media only all and (max-width: 59.938rem) { - /* line 155, platforms/common/scss/admin/_settings.scss */ + /* line 168, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block input:not(.settings-param-toggle), #g5-container .settings-block select, #g5-container .settings-block .collection-list ul, #g5-container .settings-block .colorpicker, #g5-container .settings-block .multi.selectize-control { width: 100%; } } -/* line 162, platforms/common/scss/admin/_settings.scss */ +/* line 175, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block textarea { width: 90%; min-height: 150px; } -/* line 169, platforms/common/scss/admin/_settings.scss */ +/* line 182, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .input-group.append input, #g5-container .settings-block .input-group.prepend input { width: 209px; } @media only all and (max-width: 59.938rem) { - /* line 169, platforms/common/scss/admin/_settings.scss */ + /* line 182, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .input-group.append input, #g5-container .settings-block .input-group.prepend input { width: 100%; } } -/* line 178, platforms/common/scss/admin/_settings.scss */ +/* line 191, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .selectize-control.single { width: 250px !important; } @media only all and (min-width: 48rem) and (max-width: 59.938rem) { - /* line 178, platforms/common/scss/admin/_settings.scss */ + /* line 191, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .selectize-control.single { width: 100% !important; } } @media only all and (max-width: 47.938rem) { - /* line 178, platforms/common/scss/admin/_settings.scss */ + /* line 191, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block .selectize-control.single { width: 92% !important; } } -/* line 188, platforms/common/scss/admin/_settings.scss */ +/* line 201, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block img { display: block; } -/* line 192, platforms/common/scss/admin/_settings.scss */ +/* line 205, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block.search { position: relative; margin-bottom: 10px; } -/* line 196, platforms/common/scss/admin/_settings.scss */ +/* line 209, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-block.search i { position: absolute; right: 10px; top: 50%; margin-top: -12px; } -/* line 208, platforms/common/scss/admin/_settings.scss */ +/* line 221, platforms/common/scss/admin/_settings.scss */ #g5-container .g5-dialog .settings-block { width: 100%; margin: 0 0 15px; } -/* line 213, platforms/common/scss/admin/_settings.scss */ +/* line 226, platforms/common/scss/admin/_settings.scss */ #g5-container .g5-dialog .g-modal-body { overflow-x: hidden; overflow-y: scroll; max-height: 650px; } -/* line 219, platforms/common/scss/admin/_settings.scss */ +/* line 232, platforms/common/scss/admin/_settings.scss */ #g5-container .g5-dialog .settings-param { padding: 5px; } @media only all and (max-width: 59.938rem) { - /* line 219, platforms/common/scss/admin/_settings.scss */ + /* line 232, platforms/common/scss/admin/_settings.scss */ #g5-container .g5-dialog .settings-param { padding: 2px 5px; border: 0; } } -/* line 229, platforms/common/scss/admin/_settings.scss */ +/* line 242, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-param-field-colorpicker { position: relative; } -/* line 232, platforms/common/scss/admin/_settings.scss */ +/* line 245, platforms/common/scss/admin/_settings.scss */ #g5-container .settings-param-field-colorpicker .settings-param-field-colorpicker-preview { position: absolute; top: 2px; @@ -1087,44 +1173,44 @@ a { width: 1.5625em; border-radius: 3px; } -/* line 244, platforms/common/scss/admin/_settings.scss */ +/* line 257, platforms/common/scss/admin/_settings.scss */ #g5-container .collection-list .settings-param-field ul, #g5-container .collection-keyvalue .settings-param-field .g-keyvalue-field ul { margin: 5px 0; } -/* line 248, platforms/common/scss/admin/_settings.scss */ +/* line 261, platforms/common/scss/admin/_settings.scss */ #g5-container .collection-list .settings-param-field ul li, #g5-container .collection-keyvalue .settings-param-field .g-keyvalue-field ul li { padding: 0.1rem 0; position: relative; } -/* line 253, platforms/common/scss/admin/_settings.scss */ +/* line 266, platforms/common/scss/admin/_settings.scss */ #g5-container .collection-list .settings-param-field ul li:only-child .fa-reorder, #g5-container .collection-keyvalue .settings-param-field .g-keyvalue-field ul li:only-child .fa-reorder { display: none; } -/* line 257, platforms/common/scss/admin/_settings.scss */ +/* line 270, platforms/common/scss/admin/_settings.scss */ #g5-container .collection-list .settings-param-field ul li:only-child a, #g5-container .collection-keyvalue .settings-param-field .g-keyvalue-field ul li:only-child a { margin-left: 0; } -/* line 264, platforms/common/scss/admin/_settings.scss */ +/* line 277, platforms/common/scss/admin/_settings.scss */ #g5-container .collection-list .settings-param-field .item-reorder, #g5-container .collection-keyvalue .settings-param-field .g-keyvalue-field .item-reorder { cursor: row-resize; color: #999999; } -/* line 272, platforms/common/scss/admin/_settings.scss */ +/* line 285, platforms/common/scss/admin/_settings.scss */ #g5-container .collection-list .settings-param-field ul:not(.collection-sorting) li:hover [data-title-edit], #g5-container .collection-list .settings-param-field ul:not(.collection-sorting) li:hover [data-collection-remove] { color: #666; opacity: 1; } -/* line 277, platforms/common/scss/admin/_settings.scss */ +/* line 290, platforms/common/scss/admin/_settings.scss */ #g5-container .collection-list .settings-param-field ul:not(.collection-sorting) li[data-collection-item]:hover a { color: #439A86; } -/* line 282, platforms/common/scss/admin/_settings.scss */ +/* line 295, platforms/common/scss/admin/_settings.scss */ #g5-container .collection-list .settings-param-field [data-collection-item] a { color: #666; margin-left: 5px; vertical-align: middle; } -/* line 288, platforms/common/scss/admin/_settings.scss */ +/* line 301, platforms/common/scss/admin/_settings.scss */ #g5-container .collection-list .settings-param-field [data-title-edit], #g5-container .collection-list .settings-param-field [data-collection-remove] { cursor: pointer; color: #cccccc; @@ -1231,47 +1317,43 @@ a { } /* line 3, platforms/common/scss/admin/_assignments.scss */ -#g5-container #assignments .card { - float: left; -} -/* line 6, platforms/common/scss/admin/_assignments.scss */ #g5-container #assignments .enabler { float: right; } -/* line 10, platforms/common/scss/admin/_assignments.scss */ +/* line 7, platforms/common/scss/admin/_assignments.scss */ #g5-container #assignments .settings-param { display: block; border-bottom: 0; border-top: 1px solid #f4f4f4; margin: 5px 0; } -/* line 16, platforms/common/scss/admin/_assignments.scss */ +/* line 13, platforms/common/scss/admin/_assignments.scss */ #g5-container #assignments .settings-param .settings-param-title { line-height: 1em; vertical-align: middle; } -/* line 20, platforms/common/scss/admin/_assignments.scss */ +/* line 17, platforms/common/scss/admin/_assignments.scss */ #g5-container #assignments .settings-param .settings-param-title .changes-indicator { margin-left: -1em; } -/* line 26, platforms/common/scss/admin/_assignments.scss */ +/* line 23, platforms/common/scss/admin/_assignments.scss */ #g5-container #assignments .g-assignments-filters { position: relative; margin-bottom: 1rem; display: inline-block; } -/* line 31, platforms/common/scss/admin/_assignments.scss */ +/* line 28, platforms/common/scss/admin/_assignments.scss */ #g5-container #assignments .g-assignments-filters .search.settings-block { width: 90%; display: inline-block; margin-bottom: 0; margin-right: 25px; } -/* line 37, platforms/common/scss/admin/_assignments.scss */ +/* line 34, platforms/common/scss/admin/_assignments.scss */ #g5-container #assignments .g-assignments-filters .search.settings-block, #g5-container #assignments .g-assignments-filters .search.settings-block input { font-size: 0.85rem; } -/* line 42, platforms/common/scss/admin/_assignments.scss */ +/* line 39, platforms/common/scss/admin/_assignments.scss */ #g5-container #assignments .g-assignments-filters [data-g-assignments-check], #g5-container #assignments .g-assignments-filters [data-g-assignments-uncheck] { background-color: transparent; padding: 0; @@ -1281,37 +1363,45 @@ a { line-height: 1; right: 0; } -/* line 52, platforms/common/scss/admin/_assignments.scss */ +/* line 49, platforms/common/scss/admin/_assignments.scss */ #g5-container #assignments .g-assignments-filters [data-g-assignments-check] { top: 4px; } -/* line 56, platforms/common/scss/admin/_assignments.scss */ +/* line 53, platforms/common/scss/admin/_assignments.scss */ #g5-container #assignments .g-assignments-filters [data-g-assignments-uncheck] { bottom: 0; } -/* line 60, platforms/common/scss/admin/_assignments.scss */ +/* line 57, platforms/common/scss/admin/_assignments.scss */ #g5-container #assignments .g-assignments-filters .g-tooltip:hover:before { left: 2px; } -/* line 65, platforms/common/scss/admin/_assignments.scss */ +/* line 62, platforms/common/scss/admin/_assignments.scss */ #g5-container #assignments .card .g-assignments-filters .search { width: 65%; } -/* line 68, platforms/common/scss/admin/_assignments.scss */ +/* line 65, platforms/common/scss/admin/_assignments.scss */ #g5-container #assignments .card .g-assignments-filters .search i { margin-top: -15px; } -/* line 73, platforms/common/scss/admin/_assignments.scss */ +/* line 70, platforms/common/scss/admin/_assignments.scss */ #g5-container #assignments h4 { padding: 12px 6px; line-height: 2; } -/* line 5, platforms/common/scss/admin/_configurations.scss */ +/* line 3, platforms/common/scss/admin/_configurations.scss */ +#g5-container #configurations { + margin: -10px -1%; +} +/* line 6, platforms/common/scss/admin/_configurations.scss */ +#g5-container #configurations .card { + margin: 10px 1%; +} +/* line 10, platforms/common/scss/admin/_configurations.scss */ #g5-container #configurations h4 > * { vertical-align: middle; } -/* line 11, platforms/common/scss/admin/_configurations.scss */ +/* line 16, platforms/common/scss/admin/_configurations.scss */ #g5-container #configurations ul .size-1-4 { -webkit-box-flex: 0; -moz-box-flex: 0; @@ -1322,7 +1412,7 @@ a { flex: 0 23%; } @media only all and (max-width: 30rem) { - /* line 11, platforms/common/scss/admin/_configurations.scss */ + /* line 16, platforms/common/scss/admin/_configurations.scss */ #g5-container #configurations ul .size-1-4 { -webkit-box-flex: 0; -moz-box-flex: 0; @@ -1333,16 +1423,16 @@ a { flex: 0 100%; } } -/* line 20, platforms/common/scss/admin/_configurations.scss */ +/* line 25, platforms/common/scss/admin/_configurations.scss */ #g5-container #configurations img { display: block; margin: 0 auto; } -/* line 25, platforms/common/scss/admin/_configurations.scss */ +/* line 30, platforms/common/scss/admin/_configurations.scss */ #g5-container #configurations .add-new { cursor: pointer; } -/* line 27, platforms/common/scss/admin/_configurations.scss */ +/* line 32, platforms/common/scss/admin/_configurations.scss */ #g5-container #configurations .add-new a { display: block; position: absolute; @@ -1351,7 +1441,7 @@ a { left: 0; bottom: 0; } -/* line 36, platforms/common/scss/admin/_configurations.scss */ +/* line 41, platforms/common/scss/admin/_configurations.scss */ #g5-container #configurations .add-new i { -webkit-transform: translate(-50%, -50%); -moz-transform: translate(-50%, -50%); @@ -1365,12 +1455,12 @@ a { color: #ddd; display: block; } -/* line 45, platforms/common/scss/admin/_configurations.scss */ +/* line 50, platforms/common/scss/admin/_configurations.scss */ #g5-container #configurations .add-new i.fa-spinner { margin-left: -0.642857145em; margin-top: -0.642857145em; } -/* line 51, platforms/common/scss/admin/_configurations.scss */ +/* line 56, platforms/common/scss/admin/_configurations.scss */ #g5-container #configurations .add-new .page { vertical-align: middle; height: 357px; @@ -1378,11 +1468,23 @@ a { text-align: center; position: relative; } -/* line 61, platforms/common/scss/admin/_configurations.scss */ +/* line 65, platforms/common/scss/admin/_configurations.scss */ +#g5-container #configurations .card .inner-params { + margin: 0.625rem 0 0; + padding-top: 0.625rem; + border-top: 1px solid #eee; +} +/* line 70, platforms/common/scss/admin/_configurations.scss */ +#g5-container #configurations .card .inner-params > :first-child { + border-top: 0; + padding-top: 0; + margin: 0 auto; +} +/* line 78, platforms/common/scss/admin/_configurations.scss */ #g5-container #configurations .g-tooltip:before { bottom: 2.6rem; } -/* line 65, platforms/common/scss/admin/_configurations.scss */ +/* line 82, platforms/common/scss/admin/_configurations.scss */ #g5-container #configurations .g-tooltip:after { bottom: 3rem; } @@ -2390,7 +2492,7 @@ samp { top: 12px; } /* line 470, platforms/common/scss/admin/_layout-manager.scss */ -#g5-container .lm-blocks .block-has-changes > span .title, #g5-container .lm-blocks .block-has-changes > span .font-small, #g5-container .lm-blocks .block-has-changes > span .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files li, .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files #g5-container .lm-blocks .block-has-changes > span li { +#g5-container .lm-blocks .block-has-changes > span .title, #g5-container .lm-blocks .block-has-changes > span .font-small, #g5-container .lm-blocks .block-has-changes > span .card h4[data-g-collapse] .g-collapse, #g5-container .card h4[data-g-collapse] .lm-blocks .block-has-changes > span .g-collapse, #g5-container .lm-blocks .block-has-changes > span .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files li, .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files #g5-container .lm-blocks .block-has-changes > span li { margin-left: 15px; } /* line 476, platforms/common/scss/admin/_layout-manager.scss */ @@ -3964,7 +4066,6 @@ html.g5-dialog-open { /* line 1, platforms/common/scss/admin/particles/_colorpicker.scss */ .colorpicker { position: relative; - background-image: url(data:image/jpeg;base64,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); border-radius: 0.1875rem; max-width: 100%; } @@ -4633,11 +4734,25 @@ html.g5-dialog-open { float: left; width: 100px; height: 100px; + background-position: 50% 50%; + /*&.g-image-png, &.g-image-gif, &.g-image-ico, &.g-image-svg { + background-size: inherit; + background-repeat: repeat; + }*/ +} +/* line 181, platforms/common/scss/admin/particles/_filepicker.scss */ +.g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li .g-thumb.g-image > div { background-position: 50% 50%; background-repeat: no-repeat; background-size: cover; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border-radius: 0.1875rem; } -/* line 177, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 195, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li .g-file-name { font-size: 0.7rem; margin: 0.5em -6px 0; @@ -4646,16 +4761,16 @@ html.g5-dialog-open { max-width: 100px; white-space: nowrap; } -/* line 186, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 204, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li .g-file-size, .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li .g-file-mtime { display: none; } -/* line 189, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 207, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li .g-file-size strong, .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li .g-file-size b, .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li .g-file-mtime strong, .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li .g-file-mtime b { color: inherit !important; font-weight: inherit !important; } -/* line 195, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 213, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li .g-file-progress { display: none; position: absolute; @@ -4667,7 +4782,7 @@ html.g5-dialog-open { background-color: rgba(255, 255, 255, 0.5); border-radius: 50px; } -/* line 206, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 224, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li .g-file-progress .g-file-progress-text { position: absolute; line-height: 50px; @@ -4676,87 +4791,87 @@ html.g5-dialog-open { width: 100%; left: 0; } -/* line 214, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 232, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li .g-file-progress .g-file-progress-text i { line-height: 50px; color: #fff; } -/* line 222, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 240, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li.g-file-uploading .g-thumb { opacity: 0.1; } -/* line 225, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 243, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li.g-file-uploading .g-file-progress { display: block; } -/* line 230, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 248, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-thumbnails li.selected span { background-color: #439A86 !important; color: #fff !important; padding: 0 6px !important; } -/* line 239, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 257, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list { margin-top: 0; } -/* line 241, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 259, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list li { display: block; - padding: 6px 4px; + padding: 4px; } -/* line 245, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 263, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list li > span:not(.g-file-name) { color: #aaa; text-align: center; } -/* line 250, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 268, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list li .g-thumb { display: none; } -/* line 254, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 272, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list li .g-file-name { - width: 60%; + width: 50%; } -/* line 258, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 276, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list li .g-file-size { width: 20%; } -/* line 261, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 279, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list li .g-file-size strong, .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list li .g-file-size b { color: inherit !important; font-weight: inherit !important; } -/* line 267, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 285, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list li:nth-child(odd) { background-color: #f5f5f5; } -/* line 271, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 289, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list li.selected { background-color: #439A86 !important; color: #fff !important; } -/* line 275, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 293, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list li.selected > span:not(.g-file-name) { color: #6bbfab; } -/* line 281, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 299, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list li.g-file-uploading .g-file-mtime, .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list li.g-file-uploading .g-file-progress-text { display: none; } -/* line 285, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 303, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list li.g-file-uploading .g-file-mtime.g-file-progress { display: block; } -/* line 289, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 307, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list li.g-file-uploading .g-file-progress { width: 20%; } -/* line 295, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 313, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list li.g-file-error .g-file-progress-text { display: block !important; position: relative; } -/* line 299, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 317, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list li.g-file-error .g-file-progress-text i { position: absolute; text-align: center; @@ -4766,16 +4881,16 @@ html.g5-dialog-open { color: white; font-size: 0.8rem; } -/* line 313, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 331, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list .g-list-labels { margin: 0 0 -6px; display: block; } -/* line 317, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 335, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list .g-list-labels li { background-color: #e9e9e9; } -/* line 319, platforms/common/scss/admin/particles/_filepicker.scss */ +/* line 337, platforms/common/scss/admin/particles/_filepicker.scss */ .g5-dialog.g5-dialog-theme-default.g5-modal-filepicker .g5-content .g-files.g-filemode-list .g-list-labels li > span { color: #888; } diff --git a/platforms/common/js/main.js b/platforms/common/js/main.js index 2fdafa8f2..55508d27b 100644 --- a/platforms/common/js/main.js +++ b/platforms/common/js/main.js @@ -11,6 +11,7 @@ var $ = require('elements'), modal = ui.modal, toastr = ui.toastr, + parseAjaxURI = require('./utils/get-ajax-url').parse, getAjaxSuffix = require('./utils/get-ajax-suffix'), flags = require('./utils/flags-state'), @@ -139,7 +140,7 @@ ready(function() { type = element.data('save'), extras = '', page = $('[data-lm-root]') ? 'layout' : ($('[data-mm-id]') ? 'menu' : 'other'), - saveURL = trim(window.location.href, '#') + getAjaxSuffix(); + saveURL = parseAjaxURI(trim(window.location.href, '#') + getAjaxSuffix()); switch (page) { case 'layout': @@ -157,7 +158,7 @@ ready(function() { data.ordering = JSON.stringify(mm.menumanager.ordering); data.items = JSON.stringify(mm.menumanager.items); - saveURL = element.parent('form').attribute('action') + getAjaxSuffix(); + saveURL = parseAjaxURI(element.parent('form').attribute('action') + getAjaxSuffix()); break; case 'other': @@ -289,7 +290,7 @@ ready(function() { if (!href) { return false; } indicator.showIndicator(); - request(method, href + getAjaxSuffix(), function(error, response) { + request(method, parseAjaxURI(href + getAjaxSuffix()), function(error, response) { if (!response.body.success) { modal.open({ content: response.body.html || response.body, @@ -332,7 +333,7 @@ var modules = { window.G5 = modules; module.exports = modules; -},{"./assignments":3,"./configurations":4,"./fields":5,"./lm":23,"./menu":27,"./particles":35,"./styles":38,"./ui":42,"./ui/popover":44,"./utils/ajaxify-links":49,"./utils/field-validation":53,"./utils/flags-state":54,"./utils/get-ajax-suffix":55,"./utils/rAF-polyfill":59,"agent":61,"elements":88,"elements/attributes":83,"elements/delegation":85,"elements/domready":86,"elements/events":87,"elements/insertion":89,"elements/traversal":111,"elements/zen":112,"moofx":113,"mout/queryString/setParam":217,"mout/string/interpolate":228,"mout/string/trim":235}],2:[function(require,module,exports){ +},{"./assignments":3,"./configurations":4,"./fields":5,"./lm":23,"./menu":27,"./particles":35,"./styles":39,"./ui":44,"./ui/popover":46,"./utils/ajaxify-links":51,"./utils/field-validation":55,"./utils/flags-state":56,"./utils/get-ajax-suffix":57,"./utils/get-ajax-url":58,"./utils/rAF-polyfill":61,"agent":63,"elements":90,"elements/attributes":85,"elements/delegation":87,"elements/domready":88,"elements/events":89,"elements/insertion":91,"elements/traversal":113,"elements/zen":114,"moofx":115,"mout/queryString/setParam":219,"mout/string/interpolate":230,"mout/string/trim":237}],2:[function(require,module,exports){ // shim for using process in browser var process = module.exports = {}; @@ -383,7 +384,7 @@ process.nextTick = function (fun) { } } queue.push(new Item(fun, args)); - if (!draining) { + if (queue.length === 1 && !draining) { setTimeout(drainQueue, 0); } }; @@ -553,7 +554,7 @@ ready(function() { }); module.exports = {}; -},{"../utils/elements.utils":51,"elements/domready":86,"mout/array/forEach":150,"mout/object/merge":207,"mout/string/trim":235,"prime/map":257}],4:[function(require,module,exports){ +},{"../utils/elements.utils":53,"elements/domready":88,"mout/array/forEach":152,"mout/object/merge":209,"mout/string/trim":237,"prime/map":259}],4:[function(require,module,exports){ "use strict"; var $ = require('elements'), @@ -564,10 +565,11 @@ var $ = require('elements'), toastr = require('../ui').toastr, request = require('agent'), getAjaxSuffix = require('../utils/get-ajax-suffix'), + parseAjaxURI = require('../utils/get-ajax-url').parse, getAjaxURL = require('../utils/get-ajax-url').global, flags = require('../utils/flags-state'), - warningURL = getAjaxURL('confirmdeletion') + getAjaxSuffix(); + warningURL = parseAjaxURI(getAjaxURL('confirmdeletion') + getAjaxSuffix()); var Configurations = {}; @@ -623,7 +625,7 @@ ready(function() { element.hideIndicator(); element.showIndicator(); - request(method, href + getAjaxSuffix(), {}, function(error, response) { + request(method, parseAjaxURI(href + getAjaxSuffix()), {}, function(error, response) { if (!response.body.success) { modal.open({ content: response.body.html || response.body, @@ -673,7 +675,7 @@ ready(function() { parent.showIndicator(); parent.find('[data-title-edit]').addClass('disabled'); - request(method, href + getAjaxSuffix(), { title: trim(title) }, function(error, response) { + request(method, parseAjaxURI(href + getAjaxSuffix()), { title: trim(title) }, function(error, response) { if (!response.body.success) { modal.open({ content: response.body.html || response.body, @@ -717,7 +719,7 @@ ready(function() { module.exports = Configurations; -},{"../ui":42,"../utils/flags-state":54,"../utils/get-ajax-suffix":55,"../utils/get-ajax-url":56,"agent":61,"elements":88,"elements/domready":86,"mout/object/keys":206,"mout/string/trim":235}],5:[function(require,module,exports){ +},{"../ui":44,"../utils/flags-state":56,"../utils/get-ajax-suffix":57,"../utils/get-ajax-url":58,"agent":63,"elements":90,"elements/domready":88,"mout/object/keys":208,"mout/string/trim":237}],5:[function(require,module,exports){ "use strict"; var ready = require('elements/domready'), $ = require('elements/attributes'), @@ -738,7 +740,7 @@ var originals, keys.forEach(function(key) { field = $('[name="' + key + '"]'); if (field) { - map.set(key, field.value().toLowerCase()); + map.set(key, field.value()); } }); @@ -759,7 +761,7 @@ var originals, var map = new storage(); forEach(data, function(value, key) { - map.set(key, value.toLowerCase()); + map.set(key, value); }); return map; @@ -847,7 +849,7 @@ ready(function() { body.delegate('change', '.settings-block input[name][type="hidden"], .settings-block input[name][type="checkbox"], .settings-block select[name]', compare.single); body.delegate('input', '.g-urltemplate', function(event, element) { - var previous = element.parent('.settings-param').previousSibling(); + var previous = element.parent('.settings-param').siblings(); if (!previous) { return; } previous = previous.find('[data-g-urltemplate]'); @@ -893,7 +895,7 @@ module.exports = { collect: collectFieldsValues }; -},{"../utils/flags-state":54,"../utils/history":58,"elements/attributes":83,"elements/domready":86,"mout/array/invoke":154,"mout/collection/forEach":163,"mout/lang/deepEquals":174,"prime/map":257}],6:[function(require,module,exports){ +},{"../utils/flags-state":56,"../utils/history":60,"elements/attributes":85,"elements/domready":88,"mout/array/invoke":156,"mout/collection/forEach":165,"mout/lang/deepEquals":176,"prime/map":259}],6:[function(require,module,exports){ "use strict"; var prime = require('prime'), $ = require('elements'), @@ -946,7 +948,7 @@ var Atom = new prime({ module.exports = Atom; -},{"../../utils/get-ajax-url":56,"./base":8,"elements":88,"elements/zen":112,"prime":256}],7:[function(require,module,exports){ +},{"../../utils/get-ajax-url":58,"./base":8,"elements":90,"elements/zen":114,"prime":258}],7:[function(require,module,exports){ "use strict"; var prime = require('prime'), Section = require('./section'); @@ -978,7 +980,7 @@ var Atoms = new prime({ module.exports = Atoms; -},{"./section":17,"prime":256}],8:[function(require,module,exports){ +},{"./section":17,"prime":258}],8:[function(require,module,exports){ "use strict"; var prime = require('prime'), Options = require('prime-util/prime/options'), @@ -1130,7 +1132,7 @@ var Base = new prime({ module.exports = Base; -},{"elements":88,"elements/traversal":111,"elements/zen":112,"mout/object/get":203,"mout/object/has":204,"mout/object/set":211,"mout/random/guid":219,"mout/string/trim":235,"prime":256,"prime-util/prime/bound":252,"prime-util/prime/options":253,"prime/emitter":255}],9:[function(require,module,exports){ +},{"elements":90,"elements/traversal":113,"elements/zen":114,"mout/object/get":205,"mout/object/has":206,"mout/object/set":213,"mout/random/guid":221,"mout/string/trim":237,"prime":258,"prime-util/prime/bound":254,"prime-util/prime/options":255,"prime/emitter":257}],9:[function(require,module,exports){ "use strict"; var prime = require('prime'), Base = require('./base'), @@ -1242,7 +1244,7 @@ var Block = new prime({ module.exports = Block; -},{"../../utils/elements.utils":51,"./base":8,"elements/zen":112,"mout/function/bind":166,"mout/number/enforcePrecision":194,"prime":256}],10:[function(require,module,exports){ +},{"../../utils/elements.utils":53,"./base":8,"elements/zen":114,"mout/function/bind":168,"mout/number/enforcePrecision":196,"prime":258}],10:[function(require,module,exports){ "use strict"; var prime = require('prime'), Base = require('./base'), @@ -1265,7 +1267,7 @@ var Container = new prime({ module.exports = Container; -},{"./base":8,"elements":88,"prime":256}],11:[function(require,module,exports){ +},{"./base":8,"elements":90,"prime":258}],11:[function(require,module,exports){ "use strict"; var prime = require('prime'), Base = require('./base'), @@ -1310,7 +1312,7 @@ var Grid = new prime({ module.exports = Grid; -},{"../../utils/get-ajax-url":56,"./base":8,"elements":88,"prime":256}],12:[function(require,module,exports){ +},{"../../utils/get-ajax-url":58,"./base":8,"elements":90,"prime":258}],12:[function(require,module,exports){ module.exports = { base: require('./base'), atom: require('./atom'), @@ -1355,7 +1357,7 @@ var Offcanvas = new prime({ module.exports = Offcanvas; -},{"../../utils/get-ajax-url":56,"./section":17,"prime":256}],14:[function(require,module,exports){ +},{"../../utils/get-ajax-url":58,"./section":17,"prime":258}],14:[function(require,module,exports){ "use strict"; var prime = require('prime'), Particle = require('./particle'); @@ -1371,7 +1373,7 @@ var Pagecontent = new prime({ module.exports = Pagecontent; -},{"./particle":15,"prime":256}],15:[function(require,module,exports){ +},{"./particle":15,"prime":258}],15:[function(require,module,exports){ "use strict"; var prime = require('prime'), $ = require('elements'), @@ -1424,7 +1426,7 @@ var Particle = new prime({ module.exports = Particle; -},{"../../utils/get-ajax-url":56,"./atom":6,"elements":88,"mout/function/bind":166,"mout/number/enforcePrecision":194,"prime":256}],16:[function(require,module,exports){ +},{"../../utils/get-ajax-url":58,"./atom":6,"elements":90,"mout/function/bind":168,"mout/number/enforcePrecision":196,"prime":258}],16:[function(require,module,exports){ "use strict"; var prime = require('prime'), trim = require('mout/string/trim'), @@ -1464,7 +1466,7 @@ var Position = new prime({ module.exports = Position; -},{"./particle":15,"mout/string/trim":235,"prime":256}],17:[function(require,module,exports){ +},{"./particle":15,"mout/string/trim":237,"prime":258}],17:[function(require,module,exports){ "use strict"; var prime = require('prime'), Base = require('./base'), @@ -1538,7 +1540,7 @@ var Section = new prime({ module.exports = Section; -},{"../../utils/get-ajax-url":56,"./base":8,"./grid":11,"elements":88,"elements/insertion":89,"elements/zen":112,"mout/function/bind":166,"prime":256,"prime-util/prime/bound":252}],18:[function(require,module,exports){ +},{"../../utils/get-ajax-url":58,"./base":8,"./grid":11,"elements":90,"elements/insertion":91,"elements/zen":114,"mout/function/bind":168,"prime":258,"prime-util/prime/bound":254}],18:[function(require,module,exports){ "use strict"; var prime = require('prime'), Particle = require('./particle'); @@ -1556,7 +1558,7 @@ var Spacer = new prime({ module.exports = Spacer; -},{"./particle":15,"prime":256}],19:[function(require,module,exports){ +},{"./particle":15,"prime":258}],19:[function(require,module,exports){ "use strict"; var prime = require('prime'), Pagecontent = require('./pagecontent'); @@ -1571,7 +1573,7 @@ var SystemMessages = new prime({ module.exports = SystemMessages; -},{"./pagecontent":14,"prime":256}],20:[function(require,module,exports){ +},{"./pagecontent":14,"prime":258}],20:[function(require,module,exports){ "use strict"; var prime = require('prime'), $ = require('elements'), @@ -1808,7 +1810,7 @@ var Builder = new prime({ module.exports = Builder; -},{"./blocks/":12,"elements":88,"elements/attributes":83,"elements/traversal":111,"mout/array/flatten":149,"mout/collection/forEach":163,"mout/collection/size":165,"mout/lang/isArray":176,"mout/object/deepFillIn":196,"mout/object/forOwn":202,"mout/object/get":203,"mout/object/omit":210,"mout/object/set":211,"mout/object/unset":214,"mout/random/guid":219,"mout/string/repeat":232,"mout/string/rpad":233,"prime":256,"prime/emitter":255}],21:[function(require,module,exports){ +},{"./blocks/":12,"elements":90,"elements/attributes":85,"elements/traversal":113,"mout/array/flatten":151,"mout/collection/forEach":165,"mout/collection/size":167,"mout/lang/isArray":178,"mout/object/deepFillIn":198,"mout/object/forOwn":204,"mout/object/get":205,"mout/object/omit":212,"mout/object/set":213,"mout/object/unset":216,"mout/random/guid":221,"mout/string/repeat":234,"mout/string/rpad":235,"prime":258,"prime/emitter":257}],21:[function(require,module,exports){ "use strict"; var DragEvents = require('../ui/drag.events'), prime = require('prime'), @@ -2016,7 +2018,7 @@ var Resizer = new prime({ module.exports = Resizer; -},{"../ui/drag.events":40,"../utils/elements.utils":51,"elements/delegation":85,"elements/events":87,"mout/function/bind":166,"mout/lang/isString":184,"mout/math/clamp":188,"mout/math/map":190,"mout/number/enforcePrecision":194,"mout/object/get":203,"prime":256,"prime-util/prime/bound":252,"prime-util/prime/options":253,"prime/emitter":255}],22:[function(require,module,exports){ +},{"../ui/drag.events":42,"../utils/elements.utils":53,"elements/delegation":87,"elements/events":89,"mout/function/bind":168,"mout/lang/isString":186,"mout/math/clamp":190,"mout/math/map":192,"mout/number/enforcePrecision":196,"mout/object/get":205,"prime":258,"prime-util/prime/bound":254,"prime-util/prime/options":255,"prime/emitter":257}],22:[function(require,module,exports){ var prime = require('prime'), Emitter = require('prime/emitter'), slice = require('mout/array/slice'), @@ -2105,10 +2107,9 @@ var History = new prime({ module.exports = History; -},{"mout/array/slice":158,"mout/lang/deepEquals":174,"mout/object/merge":207,"prime":256,"prime/emitter":255}],23:[function(require,module,exports){ +},{"mout/array/slice":160,"mout/lang/deepEquals":176,"mout/object/merge":209,"prime":258,"prime/emitter":257}],23:[function(require,module,exports){ "use strict"; var ready = require('elements/domready'), - //json = require('./json_test'), // debug $ = require('elements/attributes'), modal = require('../ui').modal, toastr = require('../ui').toastr, @@ -2119,6 +2120,7 @@ var ready = require('elements/domready'), trim = require('mout/string/trim'), forEach = require('mout/collection/forEach'), + parseAjaxURI = require('../utils/get-ajax-url').parse, getAjaxSuffix = require('../utils/get-ajax-suffix'), Builder = require('./builder'), @@ -2359,7 +2361,7 @@ ready(function() { if (!element.PopoverDefined) { element.getPopover({ type: 'async', - url: element.data('lm-switcher') + getAjaxSuffix(), + url: parseAjaxURI(element.data('lm-switcher') + getAjaxSuffix()), allowElementsClick: '.g-tabs a' }); } @@ -2391,7 +2393,7 @@ ready(function() { data.layout = JSON.stringify(lm.builder.serialize()); } - request(method, element.data('switch') + getAjaxSuffix(), data, function(error, response) { + request(method, parseAjaxURI(element.data('switch') + getAjaxSuffix()), data, function(error, response) { element.hideIndicator(); if (!response.body.success) { @@ -2465,13 +2467,14 @@ ready(function() { content: 'Loading', method: 'post', data: data, - remote: settingsURL + getAjaxSuffix(), + remote: parseAjaxURI(settingsURL + getAjaxSuffix()), remoteLoaded: function(response, content) { var form = content.elements.content.find('form'), + fakeDOM = zen('div').html(response.body.html).find('form'), submit = content.elements.content.search('input[type="submit"], button[type="submit"], [data-apply-and-save]'), dataString = [], invalid = []; - if (!form || !submit) { return true; } + if ((!form && !fakeDOM) || !submit) { return true; } // Particle Settings apply submit.on('click', function(e) { @@ -2485,14 +2488,17 @@ ready(function() { target.hideIndicator(); target.showIndicator(); - $(form[0].elements).forEach(function(input) { + $(fakeDOM[0].elements).forEach(function(input) { input = $(input); - var name = input.attribute('name'), - value = input.type() == 'checkbox' ? Number(input.checked()) : input.value(), + var name = input.attribute('name'); + if (!name || input.disabled()) { return; } + + input = content.elements.content.find('[name="' + name + '"]'); + var value = input.type() == 'checkbox' ? Number(input.checked()) : input.value(), parent = input.parent('.settings-param'), override = parent ? parent.find('> input[type="checkbox"]') : null; - if (!name || input.disabled() || (override && !override.checked())) { return; } + if (override && !override.checked()) { return; } if (!validateField(input)) { invalid.push(input); } dataString.push(name + '=' + encodeURIComponent(value)); }); @@ -2509,7 +2515,7 @@ ready(function() { return; } - request(form.attribute('method'), form.attribute('action') + getAjaxSuffix(), dataString.join('&') || {}, function(error, response) { + request(fakeDOM.attribute('method'), parseAjaxURI(fakeDOM.attribute('action') + getAjaxSuffix()), dataString.join('&') || {}, function(error, response) { if (!response.body.success) { modal.open({ content: response.body.html || response.body, @@ -2585,7 +2591,7 @@ module.exports = { history: lmhistory, savestate: savestate }; -},{"../ui":42,"../ui/popover":44,"../utils/field-validation":53,"../utils/get-ajax-suffix":55,"../utils/history":58,"../utils/save-state":60,"./builder":20,"./history":22,"./layoutmanager":24,"agent":61,"elements/attributes":83,"elements/domready":86,"elements/zen":112,"mout/array/contains":142,"mout/collection/forEach":163,"mout/collection/size":165,"mout/string/trim":235}],24:[function(require,module,exports){ +},{"../ui":44,"../ui/popover":46,"../utils/field-validation":55,"../utils/get-ajax-suffix":57,"../utils/get-ajax-url":58,"../utils/history":60,"../utils/save-state":62,"./builder":20,"./history":22,"./layoutmanager":24,"agent":63,"elements/attributes":85,"elements/domready":88,"elements/zen":114,"mout/array/contains":144,"mout/collection/forEach":165,"mout/collection/size":167,"mout/string/trim":237}],24:[function(require,module,exports){ "use strict"; var prime = require('prime'), $ = require('../utils/elements.utils'), @@ -3120,7 +3126,7 @@ var LayoutManager = new prime({ module.exports = LayoutManager; -},{"../ui/drag.drop":39,"../ui/eraser":41,"../utils/elements.utils":51,"../utils/flags-state":54,"./blocks":12,"./drag.resizer":21,"elements/zen":112,"mout/array/every":145,"mout/collection/find":162,"mout/function/bind":166,"mout/lang/deepEquals":174,"mout/lang/isArray":176,"mout/lang/isObject":181,"mout/number/enforcePrecision":194,"mout/object/get":203,"mout/object/keys":206,"prime":256,"prime-util/prime/bound":252,"prime-util/prime/options":253,"prime/emitter":255}],25:[function(require,module,exports){ +},{"../ui/drag.drop":41,"../ui/eraser":43,"../utils/elements.utils":53,"../utils/flags-state":56,"./blocks":12,"./drag.resizer":21,"elements/zen":114,"mout/array/every":147,"mout/collection/find":164,"mout/function/bind":168,"mout/lang/deepEquals":176,"mout/lang/isArray":178,"mout/lang/isObject":183,"mout/number/enforcePrecision":196,"mout/object/get":205,"mout/object/keys":208,"prime":258,"prime-util/prime/bound":254,"prime-util/prime/options":255,"prime/emitter":257}],25:[function(require,module,exports){ "use strict"; var DragEvents = require('../ui/drag.events'), prime = require('prime'), @@ -3393,7 +3399,7 @@ var Resizer = new prime({ module.exports = Resizer; -},{"../ui/drag.events":40,"../utils/elements.utils":51,"elements/delegation":85,"elements/events":87,"mout/function/bind":166,"mout/lang/isString":184,"mout/math/clamp":188,"mout/math/map":190,"mout/number/enforcePrecision":194,"mout/object/get":203,"prime":256,"prime-util/prime/bound":252,"prime-util/prime/options":253,"prime/emitter":255}],26:[function(require,module,exports){ +},{"../ui/drag.events":42,"../utils/elements.utils":53,"elements/delegation":87,"elements/events":89,"mout/function/bind":168,"mout/lang/isString":186,"mout/math/clamp":190,"mout/math/map":192,"mout/number/enforcePrecision":196,"mout/object/get":205,"prime":258,"prime-util/prime/bound":254,"prime-util/prime/options":255,"prime/emitter":257}],26:[function(require,module,exports){ "use strict"; var $ = require('elements'), zen = require('elements/zen'), @@ -3403,6 +3409,8 @@ var $ = require('elements'), request = require('agent'), indexOf = require('mout/array/indexOf'), trim = require('mout/string/trim'), + parseAjaxURI = require('../utils/get-ajax-url').parse, + getAjaxURL = require('../utils/get-ajax-url').global, getAjaxSuffix = require('../utils/get-ajax-suffix'), flags = require('../utils/flags-state'), deepEquals = require('mout/lang/deepEquals'); @@ -3451,7 +3459,7 @@ var StepOne = function(map, mode) { // mode [reorder, resize, evenResize] content: 'Loading', method: 'post', //data: data, - remote: $(this.block).find('.config-cog').attribute('href') + getAjaxSuffix(), + remote: parseAjaxURI($(this.block).find('.config-cog').attribute('href') + getAjaxSuffix()), remoteLoaded: function(response, modal) { var search = modal.elements.content.find('.search input'), blocks = modal.elements.content.search('[data-mm-type]'), @@ -3487,9 +3495,17 @@ var StepOne = function(map, mode) { // mode [reorder, resize, evenResize] }; var StepTwo = function(data, content, button) { - var uri = content.find('[data-mm-particle-stepone]').data('mm-particle-stepone'); + var uri = content.find('[data-mm-particle-stepone]').data('mm-particle-stepone'), + picker = data.instancepicker; - request('post', uri + getAjaxSuffix(), data, function(error, response) { + if (picker) { + var item = JSON.parse(data.item); + picker = JSON.parse(picker); + delete(data.instancepicker); + uri = getAjaxURL(item.type + '/' + item.particle); + } + + request('post', parseAjaxURI(uri + getAjaxSuffix()), data, function(error, response) { if (!response.body.success) { modal.open({ content: response.body.html || response.body, @@ -3513,9 +3529,10 @@ var StepTwo = function(data, content, button) { var form = content.find('form'), submit = content.find('input[type="submit"], button[type="submit"]'), + fakeDOM = zen('div').html(response.body.html).find('form'), dataString = []; - if (!form || !submit) { return true; } + if ((!form && !fakeDOM) || !submit) { return true; } var applyAndSave = content.search('[data-apply-and-save]'); if (applyAndSave) { applyAndSave.remove(); } @@ -3527,14 +3544,17 @@ var StepTwo = function(data, content, button) { submit.showIndicator(); - $(form[0].elements).forEach(function(input) { + $(fakeDOM[0].elements).forEach(function(input) { input = $(input); - var name = input.attribute('name'), - value = input.value(), + var name = input.attribute('name'); + if (!name || input.disabled()) { return; } + + input = content.find('[name="' + name + '"]'); + var value = input.value(), parent = input.parent('.settings-param'), override = parent ? parent.find('> input[type="checkbox"]') : null; - if (!name || input.disabled() || (override && !override.checked())) { return; } + if (override && !override.checked()) { return; } dataString.push(name + '=' + encodeURIComponent(value)); }); @@ -3543,7 +3563,7 @@ var StepTwo = function(data, content, button) { dataString.push('title=' + encodeURIComponent(title.data('title-editable'))); } - request(form.attribute('method'), form.attribute('action') + getAjaxSuffix(), dataString.join('&') || {}, function(error, response) { + request(fakeDOM.attribute('method'), parseAjaxURI(fakeDOM.attribute('action') + getAjaxSuffix()), dataString.join('&') || {}, function(error, response) { if (!response.body.success) { modal.open({ content: response.body.html || response.body, @@ -3552,29 +3572,46 @@ var StepTwo = function(data, content, button) { } }); } else { - var element = menumanager.element, - path = element.data('mm-id') + '-', - id = randomID(5), - base = element.parent('[data-mm-base]').data('mm-base'), - col = (element.parent('[data-mm-id]').data('mm-id').match(/\d+$/) || [0])[0], - index = indexOf(element.parent().children('[data-mm-id]'), element[0]); - - while (menumanager.items[path + id]) { id = randomID(5); } + // it's menu + if (!picker) { + var element = menumanager.element, + path = element.data('mm-id') + '-', + id = randomID(5), + base = element.parent('[data-mm-base]').data('mm-base'), + col = (element.parent('[data-mm-id]').data('mm-id').match(/\d+$/) || [0])[0], + index = indexOf(element.parent().children('[data-mm-id]'), element[0]); + + while (menumanager.items[path + id]) { id = randomID(5); } + + menumanager.items[path + id] = response.body.item; + menumanager.ordering[base][col].splice(index, 1, path + id); + element.data('mm-id', path + id); + + if (response.body.html) { + element.html(response.body.html); + } - menumanager.items[path + id] = response.body.item; - menumanager.ordering[base][col].splice(index, 1, path + id); - element.data('mm-id', path + id); + menumanager.isNewParticle = false; + menumanager.emit('dragEnd', menumanager.map); + toastr.success('The Menu Item settings have been applied to the Main Menu.
      Remember to click the Save button to store them.', 'Settings Applied'); + } else { // it's field picker + var field = $('[name="' + picker.field + '"]'), + btnPicker = field.siblings('[data-g-instancepicker]'), + label = field.siblings('.g-instancepicker-title'); + + if (field) { + field.value(JSON.stringify(response.body.item)); + $('body').emit('change', { target: field }); + } + if (label) { label.text(response.body.item.title); } - if (response.body.html) { - element.html(response.body.html); + if (item.type == 'particle') { + btnPicker.text(btnPicker.data('g-instancepicker-alttext')); + } } - - menumanager.isNewParticle = false; - menumanager.emit('dragEnd', menumanager.map); - modal.close(); - toastr.success('The Menu Item settings have been applied to the Main Menu.
      Remember to click the Save button to store them.', 'Settings Applied'); } + modal.close(); submit.hideIndicator(); }); }); @@ -3604,8 +3641,9 @@ ready(function() { var container = element.parent('.menu-editor-extras'), selected = container.find('[data-lm-blocktype].selected, [data-mm-module].selected'), - type = selected.data('mm-type'), - data = { type: 'particle' }; + type = selected.data('mm-type'); + + data = { type: 'particle' }; switch (type) { case 'particle': @@ -3621,12 +3659,34 @@ ready(function() { element.showIndicator(); - StepTwo({ item: JSON.stringify(data) }, element.parent('.g5-content'), element); + + var data, instancepicker = element.data('g-instancepicker'); + + if (instancepicker && type == 'module') { + data = JSON.parse(instancepicker); + var field = $('[name="' + data.field + '"]'); + if (field) { + field.value(selected.data('mm-module')); + body.emit('input', { target: field }); + } + + element.hideIndicator(); + modal.close(); + + return false; + } else { + var ip = instancepicker; + element.data('g-instancepicker', null); + StepTwo({ + item: JSON.stringify(data), + instancepicker: ip ? ip : null + }, element.parent('.g5-content'), element); + } }); }); module.exports = StepOne; -},{"../ui":42,"../utils/flags-state":54,"../utils/get-ajax-suffix":55,"agent":61,"elements":88,"elements/domready":86,"elements/zen":112,"mout/array/indexOf":151,"mout/lang/deepEquals":174,"mout/string/trim":235}],27:[function(require,module,exports){ +},{"../ui":44,"../utils/flags-state":56,"../utils/get-ajax-suffix":57,"../utils/get-ajax-url":58,"agent":63,"elements":90,"elements/domready":88,"elements/zen":114,"mout/array/indexOf":153,"mout/lang/deepEquals":176,"mout/string/trim":237}],27:[function(require,module,exports){ "use strict"; var ready = require('elements/domready'), MenuManager = require('./menumanager'), @@ -3639,6 +3699,7 @@ var ready = require('elements/domready'), trim = require('mout/string/trim'), clamp = require('mout/math/clamp'), contains = require('mout/array/contains'), + parseAjaxURI = require('../utils/get-ajax-url').parse, getAjaxSuffix = require('../utils/get-ajax-suffix'), validateField = require('../utils/field-validation'); @@ -3818,11 +3879,12 @@ ready(function() { remote: $(element).attribute('href') + getAjaxSuffix(), remoteLoaded: function(response, content) { var form = content.elements.content.find('form'), + fakeDOM = zen('div').html(response.body.html).find('form'), submit = content.elements.content.search('input[type="submit"], button[type="submit"], [data-apply-and-save]'), dataString = [], invalid = [], path; - if (!form || !submit) { return true; } + if ((!form && !fakeDOM) || !submit) { return true; } // Menuitems Settings apply submit.on('click', function(e) { @@ -3836,14 +3898,15 @@ ready(function() { target.hideIndicator(); target.showIndicator(); - $(form[0].elements).forEach(function(input) { + $(fakeDOM[0].elements).forEach(function(input) { input = $(input); - var name = input.attribute('name'), - value = input.value(); - + var name = input.attribute('name'); if (!name) { return; } + + input = content.elements.content.find('[name="' + name + '"]'); + if (!validateField(input)) { invalid.push(input); } - dataString.push(name + '=' + encodeURIComponent(value)); + dataString.push(name + '=' + encodeURIComponent(input.value())); }); var title = content.elements.content.find('[data-title-editable]'); @@ -3858,7 +3921,7 @@ ready(function() { return; } - request(form.attribute('method'), form.attribute('action') + getAjaxSuffix(), dataString.join('&'), function(error, response) { + request(fakeDOM.attribute('method'), parseAjaxURI(fakeDOM.attribute('action') + getAjaxSuffix()), dataString.join('&'), function(error, response) { if (!response.body.success) { modal.open({ content: response.body.html || response.body, @@ -3904,7 +3967,7 @@ ready(function() { module.exports = { menumanager: menumanager }; -},{"../ui":42,"../utils/field-validation":53,"../utils/get-ajax-suffix":55,"./extra-items":26,"./menumanager":28,"agent":61,"elements":88,"elements/domready":86,"elements/zen":112,"mout/array/contains":142,"mout/math/clamp":188,"mout/string/trim":235}],28:[function(require,module,exports){ +},{"../ui":44,"../utils/field-validation":55,"../utils/get-ajax-suffix":57,"../utils/get-ajax-url":58,"./extra-items":26,"./menumanager":28,"agent":63,"elements":90,"elements/domready":88,"elements/zen":114,"mout/array/contains":144,"mout/math/clamp":190,"mout/string/trim":237}],28:[function(require,module,exports){ "use strict"; var prime = require('prime'), $ = require('../utils/elements.utils'), @@ -4379,7 +4442,7 @@ var MenuManager = new prime({ module.exports = MenuManager; -},{"../ui/drag.drop":39,"../ui/eraser":41,"../utils/elements.utils":51,"./drag.resizer":25,"elements/zen":112,"mout/array/every":145,"mout/array/indexOf":151,"mout/array/last":155,"mout/function/bind":166,"mout/lang/deepClone":173,"mout/lang/isArray":176,"mout/lang/isObject":181,"mout/object/equals":198,"mout/object/get":203,"prime":256,"prime-util/prime/bound":252,"prime-util/prime/options":253,"prime/emitter":255}],29:[function(require,module,exports){ +},{"../ui/drag.drop":41,"../ui/eraser":43,"../utils/elements.utils":53,"./drag.resizer":25,"elements/zen":114,"mout/array/every":147,"mout/array/indexOf":153,"mout/array/last":157,"mout/function/bind":168,"mout/lang/deepClone":175,"mout/lang/isArray":178,"mout/lang/isObject":183,"mout/object/equals":200,"mout/object/get":205,"prime":258,"prime-util/prime/bound":254,"prime-util/prime/options":255,"prime/emitter":257}],29:[function(require,module,exports){ "use strict"; var ready = require('elements/domready'), @@ -4394,6 +4457,7 @@ var ready = require('elements/domready'), trim = require('mout/string/trim'), + parseAjaxURI = require('../../utils/get-ajax-url').parse, getAjaxSuffix = require('../../utils/get-ajax-suffix'), validateField = require('../../utils/field-validation'); @@ -4434,7 +4498,7 @@ ready(function() { if (evt.oldIndex === evt.newIndex) { return; } var dataField = element.parent('.settings-param').find('[data-collection-data]'), - data = dataField.value(); + data = dataField.value(); data = JSON.parse(data); @@ -4455,13 +4519,13 @@ ready(function() { // Add new item body.delegate('click', '[data-collection-addnew]', function(event, element) { - var param = element.parent('.settings-param'), - list = param.find('ul'), - editall = list.parent().find('[data-collection-editall]'), + var param = element.parent('.settings-param'), + list = param.find('ul'), + editall = list.parent().find('[data-collection-editall]'), dataField = param.find('[data-collection-data]'), - tmpl = param.find('[data-collection-template]'), - items = list.search('> [data-collection-item]') || [], - last = $(lastItem(items)); + tmpl = param.find('[data-collection-template]'), + items = list.search('> [data-collection-item]') || [], + last = $(lastItem(items)); var clone = $(tmpl[0].cloneNode(true)), title, editable; @@ -4488,13 +4552,13 @@ ready(function() { // Edit Title body.delegate('blur', '[data-collection-item] [data-title-editable]', function(event, element) { - var text = trim(element.text()), - item = element.parent('[data-collection-item]'), - key = item.data('collection-item'), - items = element.parent('ul').search('> [data-collection-item]'), + var text = trim(element.text()), + item = element.parent('[data-collection-item]'), + key = item.data('collection-item'), + items = element.parent('ul').search('> [data-collection-item]'), dataField = element.parent('.settings-param').find('[data-collection-data]'), - data = dataField.value(), - index = indexOf(items, item[0]); + data = dataField.value(), + index = indexOf(items, item[0]); if (index == -1) { return; } @@ -4508,12 +4572,12 @@ ready(function() { // Remove item body.delegate('click', '[data-collection-remove]', function(event, element) { if (event && event.preventDefault) { event.preventDefault(); } - var item = element.parent('[data-collection-item]'), - list = element.parent('ul'), - items = list.search('> [data-collection-item]'), - index = indexOf(items, item[0]), + var item = element.parent('[data-collection-item]'), + list = element.parent('ul'), + items = list.search('> [data-collection-item]'), + index = indexOf(items, item[0]), dataField = element.parent('.settings-param').find('[data-collection-data]'), - data = dataField.value(); + data = dataField.value(); data = JSON.parse(data); data.splice(index, 1); @@ -4542,11 +4606,11 @@ ready(function() { } var isEditAll = element.data('collection-editall') !== null, - parent = element.parent('.settings-param'), + parent = element.parent('.settings-param'), dataField = parent.find('[data-collection-data]'), - data = dataField.value(), - item = element.parent('[data-collection-item]'), - items = parent.search('ul > [data-collection-item]'); + data = dataField.value(), + item = element.parent('[data-collection-item]'), + items = parent.search('ul > [data-collection-item]'); var dataPost = { data: isEditAll ? data : JSON.stringify(JSON.parse(data)[indexOf(items, item[0])]) }; modal.open({ @@ -4556,11 +4620,12 @@ ready(function() { data: dataPost, remote: element.attribute('href') + getAjaxSuffix(), remoteLoaded: function(response, content) { - var form = content.elements.content.find('form'), - submit = content.elements.content.search('input[type="submit"], button[type="submit"], [data-apply-and-save]'), + var form = content.elements.content.find('form'), + fakeDOM = zen('div').html(response.body.html).find('form'), + submit = content.elements.content.search('input[type="submit"], button[type="submit"], [data-apply-and-save]'), dataString = [], invalid = [], - dataValue = JSON.parse(data); + dataValue = JSON.parse(data); if (modal.getAll().length > 1) { var applyAndSave = content.elements.content.search('[data-apply-and-save]'); @@ -4572,7 +4637,7 @@ ready(function() { //content.elements.content.style({ width: 450 }); } - if (!form || !submit) { + if ((!form && !fakeDOM) || !submit) { return true; } @@ -4588,14 +4653,17 @@ ready(function() { target.hideIndicator(); target.showIndicator(); - $(form[0].elements).forEach(function(input) { + $(fakeDOM[0].elements).forEach(function(input) { input = $(input); - var name = input.attribute('name'), - value = input.value(), - parent = input.parent('.settings-param'), + var name = input.attribute('name'); + if (!name || input.disabled()) { return; } + + input = content.elements.content.find('[name="' + name + '"]'); + var value = input.value(), + parent = input.parent('.settings-param'), override = parent ? parent.find('> input[type="checkbox"]') : null; - if (!name || input.disabled() || (override && !override.checked())) { return; } + if (override && !override.checked()) { return; } if (!validateField(input)) { invalid.push(input); } dataString.push(name + '=' + encodeURIComponent(value)); }); @@ -4616,7 +4684,7 @@ ready(function() { return; } - request(form.attribute('method'), form.attribute('action') + getAjaxSuffix(), dataString.join('&') || {}, function(error, response) { + request(fakeDOM.attribute('method'), parseAjaxURI(fakeDOM.attribute('action') + getAjaxSuffix()), dataString.join('&') || {}, function(error, response) { if (!response.body.success) { modal.open({ content: response.body.html || response.body, @@ -4634,7 +4702,7 @@ ready(function() { dataField.value(JSON.stringify(dataValue)); body.emit('change', { target: dataField }); - element.parent('.settings-param-field').search('ul > [data-collection-item]').forEach(function(item, index){ + element.parent('.settings-param-field').search('ul > [data-collection-item]').forEach(function(item, index) { item = $(item); var label = item.find('[data-title-editable]'), text = dataValue[index][item.data('collection-item')]; @@ -4662,7 +4730,7 @@ ready(function() { module.exports = {}; -},{"../../ui":42,"../../utils/field-validation":53,"../../utils/get-ajax-suffix":55,"agent":61,"elements":88,"elements/domready":86,"elements/insertion":89,"elements/zen":112,"mout/array/indexOf":151,"mout/array/last":155,"mout/string/trim":235,"sortablejs":271}],30:[function(require,module,exports){ +},{"../../ui":44,"../../utils/field-validation":55,"../../utils/get-ajax-suffix":57,"../../utils/get-ajax-url":58,"agent":63,"elements":90,"elements/domready":88,"elements/insertion":91,"elements/zen":114,"mout/array/indexOf":153,"mout/array/last":157,"mout/string/trim":237,"sortablejs":273}],30:[function(require,module,exports){ "use strict"; var prime = require('prime'), @@ -5385,7 +5453,7 @@ ready(function() { module.exports = ColorPicker; -},{"../../ui/drag.events":40,"elements":88,"elements/domready":86,"elements/zen":112,"mout/collection/forEach":163,"mout/function/bind":166,"mout/math/clamp":188,"prime":256,"prime-util/prime/bound":252,"prime-util/prime/options":253,"prime/emitter":255}],31:[function(require,module,exports){ +},{"../../ui/drag.events":42,"elements":90,"elements/domready":88,"elements/zen":114,"mout/collection/forEach":165,"mout/function/bind":168,"mout/math/clamp":190,"prime":258,"prime-util/prime/bound":254,"prime-util/prime/options":255,"prime/emitter":257}],31:[function(require,module,exports){ "use strict"; var $ = require('../../utils/elements.utils'), @@ -5399,6 +5467,7 @@ var $ = require('../../utils/elements.utils'), deepFillIn = require('mout/object/deepFillIn'), modal = require('../../ui').modal, getAjaxSuffix = require('../../utils/get-ajax-suffix'), + parseAjaxURI = require('../../utils/get-ajax-url').parse, getAjaxURL = require('../../utils/get-ajax-url').global, dropzone = require('dropzone'); @@ -5448,6 +5517,7 @@ var FilePicker = new prime({ mtime = zen('span.g-file-mtime[data-dz-mtime]').bottom(li); zen('span.g-file-progress[data-file-uploadprogress]').html('').bottom(li); + zen('div').bottom(thumb); li.bottom('body'); var html = li[0].outerHTML; @@ -5472,13 +5542,15 @@ var FilePicker = new prime({ thumbnailWidth: 100, thumbnailHeight: 100, url: bind(function(file) { - return getAjaxURL('filepicker/upload/' + this.getPath() + file[0].name) + getAjaxSuffix(); + return parseAjaxURI(getAjaxURL('filepicker/upload/' + this.getPath() + file[0].name) + getAjaxSuffix()); }, this) }); this.dropzone.on('thumbnail', function(file, dataUrl) { - $(file.previewElement).find('[data-dz-thumbnail]').attribute('style', 'background-image: url(' + dataUrl + ');'); + var ext = file.name.split('.'); + ext = (!ext.length || ext.length == 1) ? '-' : ext.reverse()[0]; + $(file.previewElement).addClass('g-image g-image-' + ext.toLowerCase()).find('[data-dz-thumbnail] > div').attribute('style', 'background-image: url(' + dataUrl + ');'); }); this.dropzone.on('addedfile', function(file) { @@ -5491,10 +5563,13 @@ var FilePicker = new prime({ insertLocation: 'bottom' }; + var ext = file.name.split('.'); + ext = (!ext.length || ext.length == 1) ? '-' : ext.reverse()[0]; + if (!file.type.match(/image.*/)) { - var ext = file.name.split('.'); - ext = (!ext.length || ext.length == 1) ? '-' : ext.reverse()[0]; element.find('.g-thumb').text(ext); + } else { + element.find('.g-thumb').addClass('g-image g-image-' + ext.toLowerCase()); } progressConf = deepFillIn((isList ? { @@ -5613,7 +5688,7 @@ var FilePicker = new prime({ fieldData.subfolder = true; element.showIndicator('fa fa-li fa-fw fa-spin-fast fa-spinner'); - request(getAjaxURL('filepicker') + getAjaxSuffix(), fieldData).send(bind(function(error, response) { + request(parseAjaxURI(getAjaxURL('filepicker') + getAjaxSuffix()), fieldData).send(bind(function(error, response) { element.hideIndicator(); this.addActiveState(element); @@ -5745,7 +5820,7 @@ domready(function() { module.exports = FilePicker; -},{"../../ui":42,"../../utils/elements.utils":51,"../../utils/get-ajax-suffix":55,"../../utils/get-ajax-url":56,"agent":61,"dropzone":82,"elements/domready":86,"elements/zen":112,"mout/function/bind":166,"mout/lang/deepClone":173,"mout/object/deepFillIn":196,"mout/string/rtrim":234,"prime":256}],32:[function(require,module,exports){ +},{"../../ui":44,"../../utils/elements.utils":53,"../../utils/get-ajax-suffix":57,"../../utils/get-ajax-url":58,"agent":63,"dropzone":84,"elements/domready":88,"elements/zen":114,"mout/function/bind":168,"mout/lang/deepClone":175,"mout/object/deepFillIn":198,"mout/string/rtrim":236,"prime":258}],32:[function(require,module,exports){ "use strict"; // fonts list: https://www.googleapis.com/webfonts/v1/webfonts?key=AIzaSyB2yJM8DBwt66u2MVRgb6M4t9CqkW7_IRY var prime = require('prime'), @@ -5777,6 +5852,7 @@ var prime = require('prime'), properCase = require('mout/string/properCase'), trim = require('mout/string/trim'), getAjaxSuffix = require('../../utils/get-ajax-suffix'), + parseAjaxURI = require('../../utils/get-ajax-url').parse, getAjaxURL = require('../../utils/get-ajax-url').global, modal = require('../../ui').modal, @@ -5840,7 +5916,7 @@ var Fonts = new prime({ modal.open({ content: 'Loading...', className: 'g5-dialog-theme-default g5-modal-fonts', - remote: getAjaxURL('fontpicker') + getAjaxSuffix(), + remote: parseAjaxURI(getAjaxURL('fontpicker') + getAjaxSuffix()), remoteLoaded: bind(function(response, content) { var container = content.elements.content; @@ -6481,7 +6557,7 @@ domready(function() { }); module.exports = Fonts; -},{"../../ui":42,"../../utils/decouple":50,"../../utils/elements.utils":51,"../../utils/elements.viewport":52,"../../utils/get-ajax-suffix":55,"../../utils/get-ajax-url":56,"./webfont":33,"agent":61,"async":81,"elements/domready":86,"elements/zen":112,"mout/array/append":140,"mout/array/combine":141,"mout/array/contains":142,"mout/array/find":147,"mout/array/forEach":150,"mout/array/insert":152,"mout/array/intersection":153,"mout/array/last":155,"mout/array/map":156,"mout/array/removeAll":157,"mout/array/split":160,"mout/function/bind":166,"mout/object/merge":207,"mout/string/properCase":231,"mout/string/trim":235,"mout/string/unhyphenate":237,"prime":256,"prime-util/prime/bound":252,"prime-util/prime/options":253,"prime/emitter":255,"prime/map":257}],33:[function(require,module,exports){ +},{"../../ui":44,"../../utils/decouple":52,"../../utils/elements.utils":53,"../../utils/elements.viewport":54,"../../utils/get-ajax-suffix":57,"../../utils/get-ajax-url":58,"./webfont":33,"agent":63,"async":83,"elements/domready":88,"elements/zen":114,"mout/array/append":142,"mout/array/combine":143,"mout/array/contains":144,"mout/array/find":149,"mout/array/forEach":152,"mout/array/insert":154,"mout/array/intersection":155,"mout/array/last":157,"mout/array/map":158,"mout/array/removeAll":159,"mout/array/split":162,"mout/function/bind":168,"mout/object/merge":209,"mout/string/properCase":233,"mout/string/trim":237,"mout/string/unhyphenate":239,"prime":258,"prime-util/prime/bound":254,"prime-util/prime/options":255,"prime/emitter":257,"prime/map":259}],33:[function(require,module,exports){ /* Web Font Loader v1.5.18 - (c) Adobe Systems, Google. License: Apache 2.0 */ ;(function(window,document,undefined){function aa(a,b,c){return a.call.apply(a.bind,arguments)}function ba(a,b,c){if(!a)throw Error();if(2 input[type="checkbox"]') : null; + + if (override && !override.checked()) { return; } + dataString.push(name + '=' + encodeURIComponent(value)); + }); + + var title = content.find('[data-title-editable]'); + if (title) { + dataString.push('title=' + encodeURIComponent(title.data('title-editable'))); + } + + request(parseAjaxURI(fakeDOM.attribute('method'), fakeDOM.attribute('action') + getAjaxSuffix()), dataString.join('&') || {}, function(error, response) { + if (!response.body.success) { + modal.open({ + content: response.body.html || response.body, + afterOpen: function(container) { + if (!response.body.html) { container.style({ width: '90%' }); } + } + }); + } else { + + var label = field.siblings('.g-instancepicker-title'); + + if (field) { + field.value(JSON.stringify(response.body.item)); + $('body').emit('change', { target: field }); + } + + if (label) { label.text(response.body.item.title); } + } + + modal.close(); + submit.hideIndicator(); + }); + }); + + } + } + }); + }); +}); + +module.exports = {}; +},{"../../ui":44,"../../utils/get-ajax-suffix":57,"../../utils/get-ajax-url":58,"agent":63,"elements":90,"elements/domready":88,"elements/zen":114,"mout/string/trim":237}],37:[function(require,module,exports){ "use strict"; var ready = require('elements/domready'), @@ -6851,7 +7042,7 @@ ready(function() { module.exports = {}; -},{"../../ui":42,"../../utils/get-ajax-suffix":55,"agent":61,"elements":88,"elements/domready":86,"elements/insertion":89,"elements/zen":112,"mout/array/contains":142,"mout/array/indexOf":151,"mout/array/last":155,"mout/array/some":159,"mout/object/has":204,"mout/string/escapeUnicode":227,"mout/string/trim":235,"sortablejs":271}],37:[function(require,module,exports){ +},{"../../ui":44,"../../utils/get-ajax-suffix":57,"agent":63,"elements":90,"elements/domready":88,"elements/insertion":91,"elements/zen":114,"mout/array/contains":144,"mout/array/indexOf":153,"mout/array/last":157,"mout/array/some":161,"mout/object/has":206,"mout/string/escapeUnicode":229,"mout/string/trim":237,"sortablejs":273}],38:[function(require,module,exports){ "use strict"; var $ = require('../../utils/elements.utils'), domready = require('elements/domready'); @@ -6867,7 +7058,7 @@ domready(function() { }); module.exports = {}; -},{"../../utils/elements.utils":51,"elements/domready":86}],38:[function(require,module,exports){ +},{"../../utils/elements.utils":53,"elements/domready":88}],39:[function(require,module,exports){ "use strict"; var ready = require('elements/domready'), $ = require('elements/attributes'), @@ -6929,7 +7120,80 @@ ready(function() { module.exports = {}; -},{"../ui":42,"../ui/popover":44,"elements/attributes":83,"elements/domready":86,"mout/array/contains":142,"mout/collection/forEach":163}],39:[function(require,module,exports){ +},{"../ui":44,"../ui/popover":46,"elements/attributes":85,"elements/domready":88,"mout/array/contains":144,"mout/collection/forEach":165}],40:[function(require,module,exports){ +"use strict"; +var ready = require('elements/domready'), + $ = require('elements'); + +var refreshCards = function() { + var collapsers = $('[data-g-collapse]'), data, handle; + if (!collapsers) { return false; } + + collapsers.forEach(function(collapser) { + collapser = $(collapser); + data = JSON.parse(collapser.data('g-collapse')); + handle = data.handle ? collapser.find(data.handle) : collapser.find('.g-collapse'); + collapser.gFastCollapse = true; + $('body').emit('click', { target: handle, element: collapser }); + }); +}; + +ready(function() { + var data, target, storage; + $('body').delegate('click', '[data-g-collapse]', function(event, element) { + element = event.element || element; + + data = JSON.parse(element.data('g-collapse')); + target = $(event.target); + storage = JSON.parse(localStorage.getItem('g5-collapsed') || '{}'); + if (!data.handle) { data.handle = element.find('.g-collapse'); } + + if (!target.matches(data.handle) && !target.parent(data.handle)) { return false; } + + if (storage[data.id] === undefined) { + storage[data.id] = data.collapsed; + localStorage.setItem('g5-collapsed', JSON.stringify(storage)); + } + + var collapsed = storage[data.id], + panel = data.target ? element.find(data.target) : element, + card = panel.parent('.card'); + + if (card && card.hasClass('g-collapsed')) { + card.removeClass('g-collapsed'); + panel.style({ + overflow: 'hidden', + height: 0 + }); + } + + var slide = function(override) { + collapsed = typeof override != 'number' ? override : collapsed; + if (!collapsed) { + card.addClass('g-collapsed'); + element.attribute('style', null); + } + + data.handle.data('title', !collapsed ? data.expand : data.collapse); + storage[data.id] = !collapsed; + localStorage.setItem('g5-collapsed', JSON.stringify(storage)); + }; + + if (element.gFastCollapse) { + panel[collapsed ? 'removeClass' : 'addClass']('g-collapsed'); + slide(!collapsed); + } else { + panel.removeClass('g-collapsed')[collapsed ? 'slideDown' : 'slideUp'](slide); + } + + element.gFastCollapse = false; + }); + + refreshCards(); +}); + +module.exports = refreshCards; +},{"elements":90,"elements/domready":88}],41:[function(require,module,exports){ "use strict"; var prime = require('prime'), @@ -7307,7 +7571,7 @@ var DragDrop = new prime({ module.exports = DragDrop; -},{"../utils/elements.utils":51,"./drag.events":40,"elements/delegation":85,"elements/events":87,"mout/array/contains":142,"mout/function/bind":166,"prime":256,"prime-util/prime/bound":252,"prime-util/prime/options":253,"prime/emitter":255}],40:[function(require,module,exports){ +},{"../utils/elements.utils":53,"./drag.events":42,"elements/delegation":87,"elements/events":89,"mout/array/contains":144,"mout/function/bind":168,"prime":258,"prime-util/prime/bound":254,"prime-util/prime/options":255,"prime/emitter":257}],42:[function(require,module,exports){ "use strict"; var getSupportedEvent = function(events) { events = events.split(' '); @@ -7363,7 +7627,7 @@ module.exports = { EVENTS: EVENTS }; -},{}],41:[function(require,module,exports){ +},{}],43:[function(require,module,exports){ "use strict"; var prime = require('prime'), $ = require('../utils/elements.utils'), @@ -7410,7 +7674,7 @@ var Eraser = new prime({ module.exports = Eraser; -},{"../utils/elements.utils":51,"prime":256,"prime-util/prime/bound":252,"prime-util/prime/options":253,"prime/emitter":255}],42:[function(require,module,exports){ +},{"../utils/elements.utils":53,"prime":258,"prime-util/prime/bound":254,"prime-util/prime/options":255,"prime/emitter":257}],44:[function(require,module,exports){ "use strict"; var Modal = require('./modal'), @@ -7419,11 +7683,12 @@ var Modal = require('./modal'), module.exports = { modal: new Modal(), togglers: require('./togglers'), + collapse: require('./collapse'), selectize: Selectize, toastr: require('./toastr') }; -},{"./modal":43,"./selectize":46,"./toastr":47,"./togglers":48}],43:[function(require,module,exports){ +},{"./collapse":40,"./modal":45,"./selectize":48,"./toastr":49,"./togglers":50}],45:[function(require,module,exports){ "use strict"; // Based on Vex (https://github.com/hubspot/vex) @@ -7776,7 +8041,7 @@ var Modal = new prime({ }); module.exports = Modal; -},{"../utils/elements.utils":51,"agent":61,"elements/domready":86,"elements/zen":112,"mout/array/forEach":150,"mout/array/last":155,"mout/array/map":156,"mout/function/bind":166,"mout/object/merge":207,"prime":256,"prime-util/prime/bound":252,"prime-util/prime/options":253,"prime/emitter":255,"prime/map":257}],44:[function(require,module,exports){ +},{"../utils/elements.utils":53,"agent":63,"elements/domready":88,"elements/zen":114,"mout/array/forEach":152,"mout/array/last":157,"mout/array/map":158,"mout/function/bind":168,"mout/object/merge":209,"prime":258,"prime-util/prime/bound":254,"prime-util/prime/options":255,"prime/emitter":257,"prime/map":259}],46:[function(require,module,exports){ "use strict"; var prime = require('prime'), @@ -8345,7 +8610,7 @@ $.implement({ }); module.exports = $; -},{"../utils/elements.utils":51,"agent":61,"elements/domready":86,"elements/zen":112,"mout/array/forEach":150,"mout/array/last":155,"mout/array/map":156,"mout/function/bind":166,"mout/lang/isFunction":178,"mout/object/merge":207,"prime":256,"prime-util/prime/bound":252,"prime-util/prime/options":253,"prime/emitter":255,"prime/map":257}],45:[function(require,module,exports){ +},{"../utils/elements.utils":53,"agent":63,"elements/domready":88,"elements/zen":114,"mout/array/forEach":152,"mout/array/last":157,"mout/array/map":158,"mout/function/bind":168,"mout/lang/isFunction":180,"mout/object/merge":209,"prime":258,"prime-util/prime/bound":254,"prime-util/prime/options":255,"prime/emitter":257,"prime/map":259}],47:[function(require,module,exports){ "use strict"; var $ = require('elements'), @@ -8529,7 +8794,7 @@ var Progresser = new prime({ module.exports = Progresser; -},{"elements":88,"elements/zen":112,"moofx":113,"mout/function/bind":166,"mout/lang/isArray":176,"mout/lang/isNumber":180,"prime":256,"prime-util/prime/bound":252,"prime-util/prime/options":253,"prime/emitter":255}],46:[function(require,module,exports){ +},{"elements":90,"elements/zen":114,"moofx":115,"mout/function/bind":168,"mout/lang/isArray":178,"mout/lang/isNumber":182,"prime":258,"prime-util/prime/bound":254,"prime-util/prime/options":255,"prime/emitter":257}],48:[function(require,module,exports){ "use strict"; // selectize (v0.12.1) @@ -10738,7 +11003,7 @@ ready(function() { module.exports = Selectize; -},{"../utils/elements.utils":51,"elements/domready":86,"elements/zen":112,"moofx":113,"mout/array/indexOf":151,"mout/array/last":155,"mout/collection/forEach":163,"mout/function/bind":166,"mout/function/debounce":167,"mout/lang/isArray":176,"mout/lang/isBoolean":177,"mout/object/merge":207,"mout/object/size":212,"mout/object/unset":214,"mout/object/values":215,"mout/string/escapeHtml":226,"mout/string/trim":235,"prime":256,"prime-util/prime/bound":252,"prime-util/prime/options":253,"prime/emitter":255,"sifter":267}],47:[function(require,module,exports){ +},{"../utils/elements.utils":53,"elements/domready":88,"elements/zen":114,"moofx":115,"mout/array/indexOf":153,"mout/array/last":157,"mout/collection/forEach":165,"mout/function/bind":168,"mout/function/debounce":169,"mout/lang/isArray":178,"mout/lang/isBoolean":179,"mout/object/merge":209,"mout/object/size":214,"mout/object/unset":216,"mout/object/values":217,"mout/string/escapeHtml":228,"mout/string/trim":237,"prime":258,"prime-util/prime/bound":254,"prime-util/prime/options":255,"prime/emitter":257,"sifter":269}],49:[function(require,module,exports){ "use strict"; var prime = require('prime'), @@ -11062,7 +11327,7 @@ var Toaster = new prime({ var toaster = new Toaster(); module.exports = toaster; -},{"../utils/elements.utils.js":51,"elements/zen":112,"mout/function/bind":166,"mout/object/merge":207,"prime":256,"prime-util/prime/bound":252,"prime-util/prime/options":253,"prime/emitter":255,"prime/map":257}],48:[function(require,module,exports){ +},{"../utils/elements.utils.js":53,"elements/zen":114,"mout/function/bind":168,"mout/object/merge":209,"prime":258,"prime-util/prime/bound":254,"prime-util/prime/options":255,"prime/emitter":257,"prime/map":259}],50:[function(require,module,exports){ "use strict"; var ready = require('elements/domready'), $ = require('elements'); @@ -11087,7 +11352,7 @@ ready(function() { }); module.exports = {}; -},{"elements":88,"elements/domready":86}],49:[function(require,module,exports){ +},{"elements":90,"elements/domready":88}],51:[function(require,module,exports){ "use strict"; var prime = require('prime'), @@ -11096,6 +11361,7 @@ var prime = require('prime'), domready = require('elements/domready'), storage = require('prime/map')(), modal = require('../ui').modal, + collapsers = require('../ui/collapse'), size = require('mout/collection/size'), indexOf = require('mout/array/indexOf'), @@ -11108,6 +11374,7 @@ var prime = require('prime'), request = require('agent')(), History = require('./history'), flags = require('./flags-state'), + parseAjaxURI = require('./get-ajax-url').parse, getAjaxSuffix = require('./get-ajax-suffix'), mm = require('../menu'); @@ -11143,7 +11410,7 @@ History.Adapter.bind(window, 'statechange', function() { Data.element = $('[href="' + url + '"]'); } - URI = URI + getAjaxSuffix(); + URI = parseAjaxURI(URI + getAjaxSuffix()); var lis; if (sidebar && Data.element) { @@ -11173,21 +11440,26 @@ History.Adapter.bind(window, 'statechange', function() { if (!ERROR) { modal.closeAll(); } request.url(URI + params).data(Data.extras || {}).method(Data.extras ? 'post' : 'get').send(function(error, response) { if (!response.body.success) { - ERROR = true; - modal.open({ - content: response.body.html || response.body, - afterOpen: function(container) { - if (!response.body.html) { container.style({ width: '90%' }); } - } - }); + if (!ERROR) { + ERROR = true; + modal.open({ + content: response.body.html || response.body, + afterOpen: function(container) { + if (!response.body.html) { container.style({ width: '90%' }); } + } + }); - History.back(); + History.back(); + } else { + ERROR = false; + } if (Data.element) { Data.element.hideIndicator(); } return false; + } var target = Data.parent ? Data.element.parent(Data.parent) : $(Data.target), @@ -11220,6 +11492,7 @@ History.Adapter.bind(window, 'statechange', function() { var selects = $('[data-selectize]'); if (selects) { selects.selectize(); } selectorChangeEvent(); + collapsers(); body.emit('statechangeEnd'); }); @@ -11476,7 +11749,7 @@ domready(function() { module.exports = {}; -},{"../menu":27,"../ui":42,"../ui/popover":44,"../utils/elements.utils":51,"./flags-state":54,"./get-ajax-suffix":55,"./history":58,"agent":61,"elements/domready":86,"elements/zen":112,"mout/array/indexOf":151,"mout/collection/size":165,"mout/object/keys":206,"mout/object/merge":207,"mout/queryString/encode":216,"mout/random/guid":219,"mout/string/contains":225,"prime":256,"prime/map":257}],50:[function(require,module,exports){ +},{"../menu":27,"../ui":44,"../ui/collapse":40,"../ui/popover":46,"../utils/elements.utils":53,"./flags-state":56,"./get-ajax-suffix":57,"./get-ajax-url":58,"./history":60,"agent":63,"elements/domready":88,"elements/zen":114,"mout/array/indexOf":153,"mout/collection/size":167,"mout/object/keys":208,"mout/object/merge":209,"mout/queryString/encode":218,"mout/random/guid":221,"mout/string/contains":227,"prime":258,"prime/map":259}],52:[function(require,module,exports){ 'use strict'; var rAF = (function() { @@ -11510,7 +11783,7 @@ var decouple = function(element, event, callback) { }; module.exports = decouple; -},{}],51:[function(require,module,exports){ +},{}],53:[function(require,module,exports){ "use strict"; var $ = require('elements'), moofx = require('moofx'), @@ -11680,7 +11953,7 @@ $.implement({ module.exports = $; -},{"../ui/progresser":45,"elements":88,"elements/zen":112,"moofx":113,"mout/array/map":156,"mout/function/series":171,"slick":269}],52:[function(require,module,exports){ +},{"../ui/progresser":47,"elements":90,"elements/zen":114,"moofx":115,"mout/array/map":158,"mout/function/series":173,"slick":271}],54:[function(require,module,exports){ "use strict"; var $ = require('elements'); @@ -11745,7 +12018,7 @@ $.implement({ module.exports = $; -},{"elements":88}],53:[function(require,module,exports){ +},{"elements":90}],55:[function(require,module,exports){ "use strict"; var $ = require('elements'); @@ -11812,7 +12085,7 @@ var validate = function(field) { }; module.exports = fieldValidation; -},{"elements":88}],54:[function(require,module,exports){ +},{"elements":90}],56:[function(require,module,exports){ "use strict"; var prime = require('prime'), @@ -11821,6 +12094,7 @@ var prime = require('prime'), modal = require('../ui').modal, getAjaxURL = require('./get-ajax-url').global, + parseAjaxURI = require('./get-ajax-url').parse, getAjaxSuffix = require('./get-ajax-suffix'); var FlagsState = new prime({ @@ -11851,7 +12125,7 @@ var FlagsState = new prime({ warning: function(options){ var callback = options.callback || function() {}, afterclose = options.afterclose || function() {}, - warningURL = options.url || getAjaxURL('unsaved') + getAjaxSuffix(); + warningURL = parseAjaxURI(options.url || getAjaxURL('unsaved') + getAjaxSuffix()); modal.open({ content: 'Loading...', @@ -11869,14 +12143,14 @@ var FlagsState = new prime({ }); module.exports = new FlagsState(); -},{"../ui":42,"./get-ajax-suffix":55,"./get-ajax-url":56,"prime":256,"prime/emitter":255,"prime/map":257}],55:[function(require,module,exports){ +},{"../ui":44,"./get-ajax-suffix":57,"./get-ajax-url":58,"prime":258,"prime/emitter":257,"prime/map":259}],57:[function(require,module,exports){ "use strict"; var getAjaxSuffix = function() { return typeof GANTRY_AJAX_SUFFIX == 'undefined' ? '' : GANTRY_AJAX_SUFFIX; }; module.exports = getAjaxSuffix; -},{}],56:[function(require,module,exports){ +},{}],58:[function(require,module,exports){ "use strict"; var unescapeHtml = require('mout/string/unescapeHtml'); @@ -11896,11 +12170,24 @@ var getConfAjaxURL = function(view, search) { return unescapeHtml(url.replace(re, view)); }; +var parseAjaxURI = function(uri) { + var platform = typeof GANTRY_PLATFORM == 'undefined' ? '' : GANTRY_PLATFORM + switch(platform){ + case 'wordpress': + uri = uri.replace(/themes\.php/ig, 'admin-ajax.php'); + break; + default: + } + + return uri; +}; + module.exports = { global: getAjaxURL, - config: getConfAjaxURL + config: getConfAjaxURL, + parse: parseAjaxURI }; -},{"mout/string/unescapeHtml":236}],57:[function(require,module,exports){ +},{"mout/string/unescapeHtml":238}],59:[function(require,module,exports){ "use strict"; var $ = require('elements'), @@ -11964,7 +12251,7 @@ if (typeof History.init !== 'undefined') { } module.exports = History; -},{"elements":88,"elements/domready":86}],58:[function(require,module,exports){ +},{"elements":90,"elements/domready":88}],60:[function(require,module,exports){ "use strict"; // ======================================================================== @@ -14005,7 +14292,7 @@ if (typeof History.init === 'undefined') { } module.exports = History; -},{"./history-adapter":57}],59:[function(require,module,exports){ +},{"./history-adapter":59}],61:[function(require,module,exports){ (function() { var lastTime = 0; var vendors = ['ms', 'moz', 'webkit', 'o']; @@ -14032,7 +14319,7 @@ module.exports = History; }()); module.exports = {}; -},{}],60:[function(require,module,exports){ +},{}],62:[function(require,module,exports){ var prime = require('prime'), deepClone = require('mout/lang/deepClone'); @@ -14083,7 +14370,7 @@ var SaveState = new prime({ module.exports = SaveState; -},{"mout/lang/deepClone":173,"prime":256}],61:[function(require,module,exports){ +},{"mout/lang/deepClone":175,"prime":258}],63:[function(require,module,exports){ /* Agent - heavily inspired by superagent by visionmedia https://github.com/visionmedia/superagent, released under the MIT license @@ -14490,7 +14777,7 @@ agent.Response = Response module.exports = agent -},{"mout/array/forEach":62,"mout/array/remove":64,"mout/lang/isArray":65,"mout/lang/isFunction":66,"mout/lang/isObject":68,"mout/lang/isString":69,"mout/object/forIn":72,"mout/object/mixIn":75,"mout/string/trim":79,"mout/string/upperCase":80,"prime":256,"prime/emitter":255}],62:[function(require,module,exports){ +},{"mout/array/forEach":64,"mout/array/remove":66,"mout/lang/isArray":67,"mout/lang/isFunction":68,"mout/lang/isObject":70,"mout/lang/isString":71,"mout/object/forIn":74,"mout/object/mixIn":77,"mout/string/trim":81,"mout/string/upperCase":82,"prime":258,"prime/emitter":257}],64:[function(require,module,exports){ /** @@ -14515,7 +14802,7 @@ module.exports = agent -},{}],63:[function(require,module,exports){ +},{}],65:[function(require,module,exports){ /** @@ -14545,7 +14832,7 @@ module.exports = agent module.exports = indexOf; -},{}],64:[function(require,module,exports){ +},{}],66:[function(require,module,exports){ var indexOf = require('./indexOf'); /** @@ -14560,7 +14847,7 @@ var indexOf = require('./indexOf'); module.exports = remove; -},{"./indexOf":63}],65:[function(require,module,exports){ +},{"./indexOf":65}],67:[function(require,module,exports){ var isKind = require('./isKind'); /** */ @@ -14570,7 +14857,7 @@ var isKind = require('./isKind'); module.exports = isArray; -},{"./isKind":67}],66:[function(require,module,exports){ +},{"./isKind":69}],68:[function(require,module,exports){ var isKind = require('./isKind'); /** */ @@ -14580,7 +14867,7 @@ var isKind = require('./isKind'); module.exports = isFunction; -},{"./isKind":67}],67:[function(require,module,exports){ +},{"./isKind":69}],69:[function(require,module,exports){ var kindOf = require('./kindOf'); /** * Check if value is from a specific "kind". @@ -14591,7 +14878,7 @@ var kindOf = require('./kindOf'); module.exports = isKind; -},{"./kindOf":70}],68:[function(require,module,exports){ +},{"./kindOf":72}],70:[function(require,module,exports){ var isKind = require('./isKind'); /** */ @@ -14601,7 +14888,7 @@ var isKind = require('./isKind'); module.exports = isObject; -},{"./isKind":67}],69:[function(require,module,exports){ +},{"./isKind":69}],71:[function(require,module,exports){ var isKind = require('./isKind'); /** */ @@ -14611,7 +14898,7 @@ var isKind = require('./isKind'); module.exports = isString; -},{"./isKind":67}],70:[function(require,module,exports){ +},{"./isKind":69}],72:[function(require,module,exports){ var _rKind = /^\[object (.*)\]$/, @@ -14633,7 +14920,7 @@ var isKind = require('./isKind'); module.exports = kindOf; -},{}],71:[function(require,module,exports){ +},{}],73:[function(require,module,exports){ /** @@ -14648,7 +14935,7 @@ var isKind = require('./isKind'); -},{}],72:[function(require,module,exports){ +},{}],74:[function(require,module,exports){ var hasOwn = require('./hasOwn'); var _hasDontEnumBug, @@ -14726,7 +15013,7 @@ var hasOwn = require('./hasOwn'); -},{"./hasOwn":74}],73:[function(require,module,exports){ +},{"./hasOwn":76}],75:[function(require,module,exports){ var hasOwn = require('./hasOwn'); var forIn = require('./forIn'); @@ -14747,7 +15034,7 @@ var forIn = require('./forIn'); -},{"./forIn":72,"./hasOwn":74}],74:[function(require,module,exports){ +},{"./forIn":74,"./hasOwn":76}],76:[function(require,module,exports){ /** @@ -14761,7 +15048,7 @@ var forIn = require('./forIn'); -},{}],75:[function(require,module,exports){ +},{}],77:[function(require,module,exports){ var forOwn = require('./forOwn'); /** @@ -14791,7 +15078,7 @@ var forOwn = require('./forOwn'); module.exports = mixIn; -},{"./forOwn":73}],76:[function(require,module,exports){ +},{"./forOwn":75}],78:[function(require,module,exports){ /** * Contains all Unicode white-spaces. Taken from @@ -14805,7 +15092,7 @@ var forOwn = require('./forOwn'); ]; -},{}],77:[function(require,module,exports){ +},{}],79:[function(require,module,exports){ var toString = require('../lang/toString'); var WHITE_SPACES = require('./WHITE_SPACES'); /** @@ -14841,7 +15128,7 @@ var WHITE_SPACES = require('./WHITE_SPACES'); module.exports = ltrim; -},{"../lang/toString":71,"./WHITE_SPACES":76}],78:[function(require,module,exports){ +},{"../lang/toString":73,"./WHITE_SPACES":78}],80:[function(require,module,exports){ var toString = require('../lang/toString'); var WHITE_SPACES = require('./WHITE_SPACES'); /** @@ -14876,7 +15163,7 @@ var WHITE_SPACES = require('./WHITE_SPACES'); module.exports = rtrim; -},{"../lang/toString":71,"./WHITE_SPACES":76}],79:[function(require,module,exports){ +},{"../lang/toString":73,"./WHITE_SPACES":78}],81:[function(require,module,exports){ var toString = require('../lang/toString'); var WHITE_SPACES = require('./WHITE_SPACES'); var ltrim = require('./ltrim'); @@ -14893,7 +15180,7 @@ var rtrim = require('./rtrim'); module.exports = trim; -},{"../lang/toString":71,"./WHITE_SPACES":76,"./ltrim":77,"./rtrim":78}],80:[function(require,module,exports){ +},{"../lang/toString":73,"./WHITE_SPACES":78,"./ltrim":79,"./rtrim":80}],82:[function(require,module,exports){ var toString = require('../lang/toString'); /** * "Safer" String.toUpperCase() @@ -14905,7 +15192,7 @@ var toString = require('../lang/toString'); module.exports = upperCase; -},{"../lang/toString":71}],81:[function(require,module,exports){ +},{"../lang/toString":73}],83:[function(require,module,exports){ (function (process){ /*! * async @@ -14951,9 +15238,6 @@ var toString = require('../lang/toString'); }; var _each = function (arr, iterator) { - if (arr.forEach) { - return arr.forEach(iterator); - } for (var i = 0; i < arr.length; i += 1) { iterator(arr[i], i, arr); } @@ -15730,23 +16014,26 @@ var toString = require('../lang/toString'); pause: function () { if (q.paused === true) { return; } q.paused = true; - q.process(); }, resume: function () { if (q.paused === false) { return; } q.paused = false; - q.process(); + // Need to call q.process once per concurrent + // worker to preserve full concurrency after pause + for (var w = 1; w <= q.concurrency; w++) { + async.setImmediate(q.process); + } } }; return q; }; - + async.priorityQueue = function (worker, concurrency) { - + function _compareTasks(a, b){ return a.priority - b.priority; }; - + function _binarySearch(sequence, item, compare) { var beg = -1, end = sequence.length - 1; @@ -15760,7 +16047,7 @@ var toString = require('../lang/toString'); } return beg; } - + function _insert(q, data, priority, callback) { if (!q.started){ q.started = true; @@ -15782,7 +16069,7 @@ var toString = require('../lang/toString'); priority: priority, callback: typeof callback === 'function' ? callback : null }; - + q.tasks.splice(_binarySearch(q.tasks, item, _compareTasks) + 1, 0, item); if (q.saturated && q.tasks.length === q.concurrency) { @@ -15791,15 +16078,15 @@ var toString = require('../lang/toString'); async.setImmediate(q.process); }); } - + // Start with a normal queue var q = async.queue(worker, concurrency); - + // Override push to accept second parameter representing priority q.push = function (data, priority, callback) { _insert(q, data, priority, callback); }; - + // Remove unshift function delete q.unshift; @@ -16033,7 +16320,7 @@ var toString = require('../lang/toString'); }).call(this,require('_process')) -},{"_process":2}],82:[function(require,module,exports){ +},{"_process":2}],84:[function(require,module,exports){ /* * @@ -17763,7 +18050,7 @@ var toString = require('../lang/toString'); }).call(this); -},{}],83:[function(require,module,exports){ +},{}],85:[function(require,module,exports){ /* attributes */"use strict" @@ -17982,7 +18269,7 @@ $.implement({ module.exports = $ -},{"./base":84,"mout/array/filter":91,"mout/array/forEach":92,"mout/array/indexOf":93,"mout/string/trim":110}],84:[function(require,module,exports){ +},{"./base":86,"mout/array/filter":93,"mout/array/forEach":94,"mout/array/indexOf":95,"mout/string/trim":112}],86:[function(require,module,exports){ /* elements */"use strict" @@ -18113,7 +18400,7 @@ var Elements = prime({ module.exports = $ -},{"mout/array/every":90,"mout/array/filter":91,"mout/array/forEach":92,"mout/array/map":94,"mout/array/some":95,"prime":256}],85:[function(require,module,exports){ +},{"mout/array/every":92,"mout/array/filter":93,"mout/array/forEach":94,"mout/array/map":96,"mout/array/some":97,"prime":258}],87:[function(require,module,exports){ /* delegation */"use strict" @@ -18196,7 +18483,7 @@ $.implement({ module.exports = $ -},{"./events":87,"./traversal":111,"prime/map":257}],86:[function(require,module,exports){ +},{"./events":89,"./traversal":113,"prime/map":259}],88:[function(require,module,exports){ /* domready */"use strict" @@ -18296,7 +18583,7 @@ module.exports = function(ready){ return null } -},{"./events":87}],87:[function(require,module,exports){ +},{"./events":89}],89:[function(require,module,exports){ /* events */"use strict" @@ -18376,7 +18663,7 @@ $.implement({ module.exports = $ -},{"./base":84,"prime/emitter":255}],88:[function(require,module,exports){ +},{"./base":86,"prime/emitter":257}],90:[function(require,module,exports){ /* elements */"use strict" @@ -18390,7 +18677,7 @@ var $ = require("./base") module.exports = $ -},{"./attributes":83,"./base":84,"./delegation":85,"./events":87,"./insertion":89,"./traversal":111}],89:[function(require,module,exports){ +},{"./attributes":85,"./base":86,"./delegation":87,"./events":89,"./insertion":91,"./traversal":113}],91:[function(require,module,exports){ /* insertion */"use strict" @@ -18484,7 +18771,7 @@ $.implement({ module.exports = $ -},{"./base":84}],90:[function(require,module,exports){ +},{"./base":86}],92:[function(require,module,exports){ var makeIterator = require('../function/makeIterator_'); /** @@ -18513,7 +18800,7 @@ var makeIterator = require('../function/makeIterator_'); module.exports = every; -},{"../function/makeIterator_":97}],91:[function(require,module,exports){ +},{"../function/makeIterator_":99}],93:[function(require,module,exports){ var makeIterator = require('../function/makeIterator_'); /** @@ -18541,11 +18828,11 @@ var makeIterator = require('../function/makeIterator_'); -},{"../function/makeIterator_":97}],92:[function(require,module,exports){ -arguments[4][62][0].apply(exports,arguments) -},{"dup":62}],93:[function(require,module,exports){ -arguments[4][63][0].apply(exports,arguments) -},{"dup":63}],94:[function(require,module,exports){ +},{"../function/makeIterator_":99}],94:[function(require,module,exports){ +arguments[4][64][0].apply(exports,arguments) +},{"dup":64}],95:[function(require,module,exports){ +arguments[4][65][0].apply(exports,arguments) +},{"dup":65}],96:[function(require,module,exports){ var makeIterator = require('../function/makeIterator_'); /** @@ -18569,7 +18856,7 @@ var makeIterator = require('../function/makeIterator_'); module.exports = map; -},{"../function/makeIterator_":97}],95:[function(require,module,exports){ +},{"../function/makeIterator_":99}],97:[function(require,module,exports){ var makeIterator = require('../function/makeIterator_'); /** @@ -18598,7 +18885,7 @@ var makeIterator = require('../function/makeIterator_'); module.exports = some; -},{"../function/makeIterator_":97}],96:[function(require,module,exports){ +},{"../function/makeIterator_":99}],98:[function(require,module,exports){ /** @@ -18612,7 +18899,7 @@ var makeIterator = require('../function/makeIterator_'); -},{}],97:[function(require,module,exports){ +},{}],99:[function(require,module,exports){ var identity = require('./identity'); var prop = require('./prop'); var deepMatches = require('../object/deepMatches'); @@ -18648,7 +18935,7 @@ var deepMatches = require('../object/deepMatches'); -},{"../object/deepMatches":103,"./identity":96,"./prop":98}],98:[function(require,module,exports){ +},{"../object/deepMatches":105,"./identity":98,"./prop":100}],100:[function(require,module,exports){ /** @@ -18664,15 +18951,15 @@ var deepMatches = require('../object/deepMatches'); -},{}],99:[function(require,module,exports){ -arguments[4][65][0].apply(exports,arguments) -},{"./isKind":100,"dup":65}],100:[function(require,module,exports){ +},{}],101:[function(require,module,exports){ arguments[4][67][0].apply(exports,arguments) -},{"./kindOf":101,"dup":67}],101:[function(require,module,exports){ -arguments[4][70][0].apply(exports,arguments) -},{"dup":70}],102:[function(require,module,exports){ -arguments[4][71][0].apply(exports,arguments) -},{"dup":71}],103:[function(require,module,exports){ +},{"./isKind":102,"dup":67}],102:[function(require,module,exports){ +arguments[4][69][0].apply(exports,arguments) +},{"./kindOf":103,"dup":69}],103:[function(require,module,exports){ +arguments[4][72][0].apply(exports,arguments) +},{"dup":72}],104:[function(require,module,exports){ +arguments[4][73][0].apply(exports,arguments) +},{"dup":73}],105:[function(require,module,exports){ var forOwn = require('./forOwn'); var isArray = require('../lang/isArray'); @@ -18729,21 +19016,21 @@ var isArray = require('../lang/isArray'); -},{"../lang/isArray":99,"./forOwn":105}],104:[function(require,module,exports){ -arguments[4][72][0].apply(exports,arguments) -},{"./hasOwn":106,"dup":72}],105:[function(require,module,exports){ -arguments[4][73][0].apply(exports,arguments) -},{"./forIn":104,"./hasOwn":106,"dup":73}],106:[function(require,module,exports){ +},{"../lang/isArray":101,"./forOwn":107}],106:[function(require,module,exports){ arguments[4][74][0].apply(exports,arguments) -},{"dup":74}],107:[function(require,module,exports){ +},{"./hasOwn":108,"dup":74}],107:[function(require,module,exports){ +arguments[4][75][0].apply(exports,arguments) +},{"./forIn":106,"./hasOwn":108,"dup":75}],108:[function(require,module,exports){ arguments[4][76][0].apply(exports,arguments) -},{"dup":76}],108:[function(require,module,exports){ -arguments[4][77][0].apply(exports,arguments) -},{"../lang/toString":102,"./WHITE_SPACES":107,"dup":77}],109:[function(require,module,exports){ +},{"dup":76}],109:[function(require,module,exports){ arguments[4][78][0].apply(exports,arguments) -},{"../lang/toString":102,"./WHITE_SPACES":107,"dup":78}],110:[function(require,module,exports){ +},{"dup":78}],110:[function(require,module,exports){ arguments[4][79][0].apply(exports,arguments) -},{"../lang/toString":102,"./WHITE_SPACES":107,"./ltrim":108,"./rtrim":109,"dup":79}],111:[function(require,module,exports){ +},{"../lang/toString":104,"./WHITE_SPACES":109,"dup":79}],111:[function(require,module,exports){ +arguments[4][80][0].apply(exports,arguments) +},{"../lang/toString":104,"./WHITE_SPACES":109,"dup":80}],112:[function(require,module,exports){ +arguments[4][81][0].apply(exports,arguments) +},{"../lang/toString":104,"./WHITE_SPACES":109,"./ltrim":110,"./rtrim":111,"dup":81}],113:[function(require,module,exports){ /* traversal */"use strict" @@ -18848,7 +19135,7 @@ $.implement({ module.exports = $ -},{"./base":84,"mout/array/map":94,"slick":269}],112:[function(require,module,exports){ +},{"./base":86,"mout/array/map":96,"slick":271}],114:[function(require,module,exports){ /* zen */"use strict" @@ -18906,7 +19193,7 @@ module.exports = function(expression, doc){ } -},{"./base":84,"mout/array/forEach":92,"mout/array/map":94,"slick/parser":270}],113:[function(require,module,exports){ +},{"./base":86,"mout/array/forEach":94,"mout/array/map":96,"slick/parser":272}],115:[function(require,module,exports){ /* .- 3 .-.-..-..-.-|-._. ' ' '`-'`-' ' ' ' @@ -18935,7 +19222,7 @@ moofx.color = color module.exports = moofx -},{"./lib/browser":114,"./lib/color":115,"./lib/frame":116,"./lib/fx":117}],114:[function(require,module,exports){ +},{"./lib/browser":116,"./lib/color":117,"./lib/frame":118,"./lib/fx":119}],116:[function(require,module,exports){ (function (global){ /* MooFx @@ -19873,7 +20160,7 @@ module.exports = moofx }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) -},{"./color":115,"./frame":116,"./fx":117,"./unmatrix2d":118,"elements":120,"prime":127,"prime/array/forEach":123,"prime/array/indexOf":124,"prime/array/map":125,"prime/string/camelize":134,"prime/string/capitalize":135,"prime/string/clean":136,"prime/string/hyphenate":137}],115:[function(require,module,exports){ +},{"./color":117,"./frame":118,"./fx":119,"./unmatrix2d":120,"elements":122,"prime":129,"prime/array/forEach":125,"prime/array/indexOf":126,"prime/array/map":127,"prime/string/camelize":136,"prime/string/capitalize":137,"prime/string/clean":138,"prime/string/hyphenate":139}],117:[function(require,module,exports){ /* color */"use strict" @@ -20000,7 +20287,7 @@ color.x = RegExp([skeys, shex, srgb + slist, shsl + slist].join("|"), "gi") module.exports = color -},{}],116:[function(require,module,exports){ +},{}],118:[function(require,module,exports){ (function (global){ /* requestFrame / cancelFrame @@ -20044,7 +20331,7 @@ exports.cancel = cancel }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) -},{"prime/array/indexOf":124}],117:[function(require,module,exports){ +},{"prime/array/indexOf":126}],119:[function(require,module,exports){ /* fx */"use strict" @@ -20280,7 +20567,7 @@ fx.prototype = Fx.prototype module.exports = fx -},{"./frame":116,"cubic-bezier":119,"prime":127,"prime/array/map":125}],118:[function(require,module,exports){ +},{"./frame":118,"cubic-bezier":121,"prime":129,"prime/array/map":127}],120:[function(require,module,exports){ /* Unmatrix 2d - a crude implementation of the slightly bugged pseudo code in http://www.w3.org/TR/css3-2d-transforms/#matrix-decomposition @@ -20356,7 +20643,7 @@ module.exports = function(a, b, c, d, tx, ty){ } -},{}],119:[function(require,module,exports){ +},{}],121:[function(require,module,exports){ module.exports = function(x1, y1, x2, y2, epsilon){ @@ -20409,7 +20696,7 @@ module.exports = function(x1, y1, x2, y2, epsilon){ }; -},{}],120:[function(require,module,exports){ +},{}],122:[function(require,module,exports){ (function (global){ /* elements @@ -20534,7 +20821,7 @@ module.exports = $ }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) -},{"prime":127,"prime/array/every":121,"prime/array/filter":122,"prime/array/forEach":123,"prime/array/map":125,"prime/array/some":126}],121:[function(require,module,exports){ +},{"prime":129,"prime/array/every":123,"prime/array/filter":124,"prime/array/forEach":125,"prime/array/map":127,"prime/array/some":128}],123:[function(require,module,exports){ /* array:every */"use strict" @@ -20548,7 +20835,7 @@ var every = function(self, method, context){ module.exports = every -},{}],122:[function(require,module,exports){ +},{}],124:[function(require,module,exports){ /* array:filter */"use strict" @@ -20564,7 +20851,7 @@ var filter = function(self, method, context){ module.exports = filter -},{}],123:[function(require,module,exports){ +},{}],125:[function(require,module,exports){ /* array:forEach */"use strict" @@ -20578,7 +20865,7 @@ var forEach = function(self, method, context){ module.exports = forEach -},{}],124:[function(require,module,exports){ +},{}],126:[function(require,module,exports){ /* array:indexOf */"use strict" @@ -20592,7 +20879,7 @@ var indexOf = function(self, item, from){ module.exports = indexOf -},{}],125:[function(require,module,exports){ +},{}],127:[function(require,module,exports){ /* array:map */"use strict" @@ -20607,7 +20894,7 @@ var map = function(self, method, context){ module.exports = map -},{}],126:[function(require,module,exports){ +},{}],128:[function(require,module,exports){ /* array:some */"use strict" @@ -20621,7 +20908,7 @@ var some = function(self, method, context){ module.exports = some -},{}],127:[function(require,module,exports){ +},{}],129:[function(require,module,exports){ /* prime - prototypal inheritance @@ -20710,7 +20997,7 @@ var prime = function(proto){ module.exports = prime -},{"./object/create":128,"./object/filter":129,"./object/forIn":130,"./object/hasOwn":132,"./object/mixIn":133,"./type":139}],128:[function(require,module,exports){ +},{"./object/create":130,"./object/filter":131,"./object/forIn":132,"./object/hasOwn":134,"./object/mixIn":135,"./type":141}],130:[function(require,module,exports){ /* object:create */"use strict" @@ -20723,7 +21010,7 @@ var create = function(self){ module.exports = create -},{}],129:[function(require,module,exports){ +},{}],131:[function(require,module,exports){ /* object:filter */"use strict" @@ -20740,7 +21027,7 @@ var filter = function(self, method, context){ module.exports = filter -},{"./forIn":130}],130:[function(require,module,exports){ +},{"./forIn":132}],132:[function(require,module,exports){ /* object:forIn */"use strict" @@ -20770,7 +21057,7 @@ if (!({valueOf: 0}).propertyIsEnumerable("valueOf")){ // fix for stupid IE enume module.exports = forIn -},{"./hasOwn":132}],131:[function(require,module,exports){ +},{"./hasOwn":134}],133:[function(require,module,exports){ /* object:forOwn */"use strict" @@ -20787,7 +21074,7 @@ var forOwn = function(self, method, context){ module.exports = forOwn -},{"./forIn":130,"./hasOwn":132}],132:[function(require,module,exports){ +},{"./forIn":132,"./hasOwn":134}],134:[function(require,module,exports){ /* object:hasOwn */"use strict" @@ -20800,7 +21087,7 @@ var hasOwn = function(self, key){ module.exports = hasOwn -},{}],133:[function(require,module,exports){ +},{}],135:[function(require,module,exports){ /* object:mixIn */"use strict" @@ -20818,7 +21105,7 @@ var mixIn = function(self){ module.exports = mixIn -},{"./forOwn":131}],134:[function(require,module,exports){ +},{"./forOwn":133}],136:[function(require,module,exports){ /* string:camelize */"use strict" @@ -20831,7 +21118,7 @@ var camelize = function(self){ module.exports = camelize -},{}],135:[function(require,module,exports){ +},{}],137:[function(require,module,exports){ /* string:capitalize */"use strict" @@ -20844,7 +21131,7 @@ var capitalize = function(self){ module.exports = capitalize -},{}],136:[function(require,module,exports){ +},{}],138:[function(require,module,exports){ /* string:clean */"use strict" @@ -20857,7 +21144,7 @@ var clean = function(self){ module.exports = clean -},{"./trim":138}],137:[function(require,module,exports){ +},{"./trim":140}],139:[function(require,module,exports){ /* string:hyphenate */"use strict" @@ -20870,7 +21157,7 @@ var hyphenate = function(self){ module.exports = hyphenate -},{}],138:[function(require,module,exports){ +},{}],140:[function(require,module,exports){ /* string:trim */"use strict" @@ -20881,7 +21168,7 @@ var trim = function(self){ module.exports = trim -},{}],139:[function(require,module,exports){ +},{}],141:[function(require,module,exports){ /* type */"use strict" @@ -20899,7 +21186,7 @@ var type = function(object){ module.exports = type -},{}],140:[function(require,module,exports){ +},{}],142:[function(require,module,exports){ /** @@ -20922,7 +21209,7 @@ module.exports = type module.exports = append; -},{}],141:[function(require,module,exports){ +},{}],143:[function(require,module,exports){ var indexOf = require('./indexOf'); /** @@ -20946,7 +21233,7 @@ var indexOf = require('./indexOf'); module.exports = combine; -},{"./indexOf":151}],142:[function(require,module,exports){ +},{"./indexOf":153}],144:[function(require,module,exports){ var indexOf = require('./indexOf'); /** @@ -20958,7 +21245,7 @@ var indexOf = require('./indexOf'); module.exports = contains; -},{"./indexOf":151}],143:[function(require,module,exports){ +},{"./indexOf":153}],145:[function(require,module,exports){ var unique = require('./unique'); var filter = require('./filter'); var some = require('./some'); @@ -20983,7 +21270,7 @@ var slice = require('./slice'); -},{"./contains":142,"./filter":146,"./slice":158,"./some":159,"./unique":161}],144:[function(require,module,exports){ +},{"./contains":144,"./filter":148,"./slice":160,"./some":161,"./unique":163}],146:[function(require,module,exports){ var is = require('../lang/is'); var isArray = require('../lang/isArray'); var every = require('./every'); @@ -21015,11 +21302,11 @@ var every = require('./every'); -},{"../lang/is":175,"../lang/isArray":176,"./every":145}],145:[function(require,module,exports){ -arguments[4][90][0].apply(exports,arguments) -},{"../function/makeIterator_":169,"dup":90}],146:[function(require,module,exports){ -arguments[4][91][0].apply(exports,arguments) -},{"../function/makeIterator_":169,"dup":91}],147:[function(require,module,exports){ +},{"../lang/is":177,"../lang/isArray":178,"./every":147}],147:[function(require,module,exports){ +arguments[4][92][0].apply(exports,arguments) +},{"../function/makeIterator_":171,"dup":92}],148:[function(require,module,exports){ +arguments[4][93][0].apply(exports,arguments) +},{"../function/makeIterator_":171,"dup":93}],149:[function(require,module,exports){ var findIndex = require('./findIndex'); /** @@ -21034,7 +21321,7 @@ var findIndex = require('./findIndex'); -},{"./findIndex":148}],148:[function(require,module,exports){ +},{"./findIndex":150}],150:[function(require,module,exports){ var makeIterator = require('../function/makeIterator_'); /** @@ -21059,7 +21346,7 @@ var makeIterator = require('../function/makeIterator_'); module.exports = findIndex; -},{"../function/makeIterator_":169}],149:[function(require,module,exports){ +},{"../function/makeIterator_":171}],151:[function(require,module,exports){ var isArray = require('../lang/isArray'); var append = require('./append'); @@ -21104,11 +21391,11 @@ var append = require('./append'); -},{"../lang/isArray":176,"./append":140}],150:[function(require,module,exports){ -arguments[4][62][0].apply(exports,arguments) -},{"dup":62}],151:[function(require,module,exports){ -arguments[4][63][0].apply(exports,arguments) -},{"dup":63}],152:[function(require,module,exports){ +},{"../lang/isArray":178,"./append":142}],152:[function(require,module,exports){ +arguments[4][64][0].apply(exports,arguments) +},{"dup":64}],153:[function(require,module,exports){ +arguments[4][65][0].apply(exports,arguments) +},{"dup":65}],154:[function(require,module,exports){ var difference = require('./difference'); var slice = require('./slice'); @@ -21125,7 +21412,7 @@ var slice = require('./slice'); module.exports = insert; -},{"./difference":143,"./slice":158}],153:[function(require,module,exports){ +},{"./difference":145,"./slice":160}],155:[function(require,module,exports){ var unique = require('./unique'); var filter = require('./filter'); var every = require('./every'); @@ -21151,7 +21438,7 @@ var slice = require('./slice'); -},{"./contains":142,"./every":145,"./filter":146,"./slice":158,"./unique":161}],154:[function(require,module,exports){ +},{"./contains":144,"./every":147,"./filter":148,"./slice":160,"./unique":163}],156:[function(require,module,exports){ var slice = require('./slice'); /** @@ -21176,7 +21463,7 @@ var slice = require('./slice'); module.exports = invoke; -},{"./slice":158}],155:[function(require,module,exports){ +},{"./slice":160}],157:[function(require,module,exports){ /** @@ -21194,9 +21481,9 @@ var slice = require('./slice'); -},{}],156:[function(require,module,exports){ -arguments[4][94][0].apply(exports,arguments) -},{"../function/makeIterator_":169,"dup":94}],157:[function(require,module,exports){ +},{}],158:[function(require,module,exports){ +arguments[4][96][0].apply(exports,arguments) +},{"../function/makeIterator_":171,"dup":96}],159:[function(require,module,exports){ var indexOf = require('./indexOf'); /** @@ -21213,7 +21500,7 @@ var indexOf = require('./indexOf'); module.exports = removeAll; -},{"./indexOf":151}],158:[function(require,module,exports){ +},{"./indexOf":153}],160:[function(require,module,exports){ /** @@ -21250,9 +21537,9 @@ var indexOf = require('./indexOf'); -},{}],159:[function(require,module,exports){ -arguments[4][95][0].apply(exports,arguments) -},{"../function/makeIterator_":169,"dup":95}],160:[function(require,module,exports){ +},{}],161:[function(require,module,exports){ +arguments[4][97][0].apply(exports,arguments) +},{"../function/makeIterator_":171,"dup":97}],162:[function(require,module,exports){ /** @@ -21289,7 +21576,7 @@ arguments[4][95][0].apply(exports,arguments) module.exports = split; -},{}],161:[function(require,module,exports){ +},{}],163:[function(require,module,exports){ var filter = require('./filter'); /** @@ -21316,7 +21603,7 @@ var filter = require('./filter'); -},{"./filter":146}],162:[function(require,module,exports){ +},{"./filter":148}],164:[function(require,module,exports){ var make = require('./make_'); var arrFind = require('../array/find'); var objFind = require('../object/find'); @@ -21328,7 +21615,7 @@ var objFind = require('../object/find'); -},{"../array/find":147,"../object/find":200,"./make_":164}],163:[function(require,module,exports){ +},{"../array/find":149,"../object/find":202,"./make_":166}],165:[function(require,module,exports){ var make = require('./make_'); var arrForEach = require('../array/forEach'); var objForEach = require('../object/forOwn'); @@ -21339,7 +21626,7 @@ var objForEach = require('../object/forOwn'); -},{"../array/forEach":150,"../object/forOwn":202,"./make_":164}],164:[function(require,module,exports){ +},{"../array/forEach":152,"../object/forOwn":204,"./make_":166}],166:[function(require,module,exports){ var slice = require('../array/slice'); /** @@ -21360,7 +21647,7 @@ var slice = require('../array/slice'); -},{"../array/slice":158}],165:[function(require,module,exports){ +},{"../array/slice":160}],167:[function(require,module,exports){ var isArray = require('../lang/isArray'); var objSize = require('../object/size'); @@ -21381,7 +21668,7 @@ var objSize = require('../object/size'); -},{"../lang/isArray":176,"../object/size":212}],166:[function(require,module,exports){ +},{"../lang/isArray":178,"../object/size":214}],168:[function(require,module,exports){ var slice = require('../array/slice'); /** @@ -21402,7 +21689,7 @@ var slice = require('../array/slice'); -},{"../array/slice":158}],167:[function(require,module,exports){ +},{"../array/slice":160}],169:[function(require,module,exports){ /** @@ -21436,13 +21723,13 @@ var slice = require('../array/slice'); -},{}],168:[function(require,module,exports){ -arguments[4][96][0].apply(exports,arguments) -},{"dup":96}],169:[function(require,module,exports){ -arguments[4][97][0].apply(exports,arguments) -},{"../object/deepMatches":197,"./identity":168,"./prop":170,"dup":97}],170:[function(require,module,exports){ +},{}],170:[function(require,module,exports){ arguments[4][98][0].apply(exports,arguments) },{"dup":98}],171:[function(require,module,exports){ +arguments[4][99][0].apply(exports,arguments) +},{"../object/deepMatches":199,"./identity":170,"./prop":172,"dup":99}],172:[function(require,module,exports){ +arguments[4][100][0].apply(exports,arguments) +},{"dup":100}],173:[function(require,module,exports){ /** @@ -21466,7 +21753,7 @@ arguments[4][98][0].apply(exports,arguments) -},{}],172:[function(require,module,exports){ +},{}],174:[function(require,module,exports){ var kindOf = require('./kindOf'); var isPlainObject = require('./isPlainObject'); var mixIn = require('../object/mixIn'); @@ -21517,7 +21804,7 @@ var mixIn = require('../object/mixIn'); -},{"../object/mixIn":208,"./isPlainObject":182,"./kindOf":185}],173:[function(require,module,exports){ +},{"../object/mixIn":210,"./isPlainObject":184,"./kindOf":187}],175:[function(require,module,exports){ var clone = require('./clone'); var forOwn = require('../object/forOwn'); var kindOf = require('./kindOf'); @@ -21567,7 +21854,7 @@ var isPlainObject = require('./isPlainObject'); -},{"../object/forOwn":202,"./clone":172,"./isPlainObject":182,"./kindOf":185}],174:[function(require,module,exports){ +},{"../object/forOwn":204,"./clone":174,"./isPlainObject":184,"./kindOf":187}],176:[function(require,module,exports){ var is = require('./is'); var isObject = require('./isObject'); var isArray = require('./isArray'); @@ -21599,7 +21886,7 @@ var arrEquals = require('../array/equals'); -},{"../array/equals":144,"../object/equals":198,"./is":175,"./isArray":176,"./isObject":181}],175:[function(require,module,exports){ +},{"../array/equals":146,"../object/equals":200,"./is":177,"./isArray":178,"./isObject":183}],177:[function(require,module,exports){ /** @@ -21624,9 +21911,9 @@ var arrEquals = require('../array/equals'); -},{}],176:[function(require,module,exports){ -arguments[4][65][0].apply(exports,arguments) -},{"./isKind":179,"dup":65}],177:[function(require,module,exports){ +},{}],178:[function(require,module,exports){ +arguments[4][67][0].apply(exports,arguments) +},{"./isKind":181,"dup":67}],179:[function(require,module,exports){ var isKind = require('./isKind'); /** */ @@ -21636,11 +21923,11 @@ var isKind = require('./isKind'); module.exports = isBoolean; -},{"./isKind":179}],178:[function(require,module,exports){ -arguments[4][66][0].apply(exports,arguments) -},{"./isKind":179,"dup":66}],179:[function(require,module,exports){ -arguments[4][67][0].apply(exports,arguments) -},{"./kindOf":185,"dup":67}],180:[function(require,module,exports){ +},{"./isKind":181}],180:[function(require,module,exports){ +arguments[4][68][0].apply(exports,arguments) +},{"./isKind":181,"dup":68}],181:[function(require,module,exports){ +arguments[4][69][0].apply(exports,arguments) +},{"./kindOf":187,"dup":69}],182:[function(require,module,exports){ var isKind = require('./isKind'); /** */ @@ -21650,9 +21937,9 @@ var isKind = require('./isKind'); module.exports = isNumber; -},{"./isKind":179}],181:[function(require,module,exports){ -arguments[4][68][0].apply(exports,arguments) -},{"./isKind":179,"dup":68}],182:[function(require,module,exports){ +},{"./isKind":181}],183:[function(require,module,exports){ +arguments[4][70][0].apply(exports,arguments) +},{"./isKind":181,"dup":70}],184:[function(require,module,exports){ /** @@ -21667,7 +21954,7 @@ arguments[4][68][0].apply(exports,arguments) -},{}],183:[function(require,module,exports){ +},{}],185:[function(require,module,exports){ /** @@ -21690,11 +21977,11 @@ arguments[4][68][0].apply(exports,arguments) -},{}],184:[function(require,module,exports){ -arguments[4][69][0].apply(exports,arguments) -},{"./isKind":179,"dup":69}],185:[function(require,module,exports){ -arguments[4][70][0].apply(exports,arguments) -},{"dup":70}],186:[function(require,module,exports){ +},{}],186:[function(require,module,exports){ +arguments[4][71][0].apply(exports,arguments) +},{"./isKind":181,"dup":71}],187:[function(require,module,exports){ +arguments[4][72][0].apply(exports,arguments) +},{"dup":72}],188:[function(require,module,exports){ var isArray = require('./isArray'); /** @@ -21716,9 +22003,9 @@ var isArray = require('./isArray'); -},{"./isArray":176}],187:[function(require,module,exports){ -arguments[4][71][0].apply(exports,arguments) -},{"dup":71}],188:[function(require,module,exports){ +},{"./isArray":178}],189:[function(require,module,exports){ +arguments[4][73][0].apply(exports,arguments) +},{"dup":73}],190:[function(require,module,exports){ /** * Clamps value inside range. @@ -21729,7 +22016,7 @@ arguments[4][71][0].apply(exports,arguments) module.exports = clamp; -},{}],189:[function(require,module,exports){ +},{}],191:[function(require,module,exports){ /** * Linear interpolation. @@ -21742,7 +22029,7 @@ arguments[4][71][0].apply(exports,arguments) module.exports = lerp; -},{}],190:[function(require,module,exports){ +},{}],192:[function(require,module,exports){ var lerp = require('./lerp'); var norm = require('./norm'); /** @@ -21755,7 +22042,7 @@ var norm = require('./norm'); module.exports = map; -},{"./lerp":189,"./norm":191}],191:[function(require,module,exports){ +},{"./lerp":191,"./norm":193}],193:[function(require,module,exports){ /** * Gets normalized ratio of value inside range. @@ -21770,7 +22057,7 @@ var norm = require('./norm'); module.exports = norm; -},{}],192:[function(require,module,exports){ +},{}],194:[function(require,module,exports){ /** * @constant Maximum 32-bit signed integer value. (2^31 - 1) */ @@ -21778,7 +22065,7 @@ var norm = require('./norm'); module.exports = 2147483647; -},{}],193:[function(require,module,exports){ +},{}],195:[function(require,module,exports){ /** * @constant Minimum 32-bit signed integer value (-2^31). */ @@ -21786,7 +22073,7 @@ var norm = require('./norm'); module.exports = -2147483648; -},{}],194:[function(require,module,exports){ +},{}],196:[function(require,module,exports){ var toNumber = require('../lang/toNumber'); /** * Enforce a specific amount of decimal digits and also fix floating @@ -21800,7 +22087,7 @@ var toNumber = require('../lang/toNumber'); module.exports = enforcePrecision; -},{"../lang/toNumber":186}],195:[function(require,module,exports){ +},{"../lang/toNumber":188}],197:[function(require,module,exports){ /** @@ -21819,7 +22106,7 @@ var toNumber = require('../lang/toNumber'); -},{}],196:[function(require,module,exports){ +},{}],198:[function(require,module,exports){ var forOwn = require('./forOwn'); var isPlainObject = require('../lang/isPlainObject'); @@ -21854,9 +22141,9 @@ var isPlainObject = require('../lang/isPlainObject'); -},{"../lang/isPlainObject":182,"./forOwn":202}],197:[function(require,module,exports){ -arguments[4][103][0].apply(exports,arguments) -},{"../lang/isArray":176,"./forOwn":202,"dup":103}],198:[function(require,module,exports){ +},{"../lang/isPlainObject":184,"./forOwn":204}],199:[function(require,module,exports){ +arguments[4][105][0].apply(exports,arguments) +},{"../lang/isArray":178,"./forOwn":204,"dup":105}],200:[function(require,module,exports){ var hasOwn = require('./hasOwn'); var every = require('./every'); var isObject = require('../lang/isObject'); @@ -21891,7 +22178,7 @@ var is = require('../lang/is'); module.exports = equals; -},{"../lang/is":175,"../lang/isObject":181,"./every":199,"./hasOwn":205}],199:[function(require,module,exports){ +},{"../lang/is":177,"../lang/isObject":183,"./every":201,"./hasOwn":207}],201:[function(require,module,exports){ var forOwn = require('./forOwn'); var makeIterator = require('../function/makeIterator_'); @@ -21916,7 +22203,7 @@ var makeIterator = require('../function/makeIterator_'); -},{"../function/makeIterator_":169,"./forOwn":202}],200:[function(require,module,exports){ +},{"../function/makeIterator_":171,"./forOwn":204}],202:[function(require,module,exports){ var some = require('./some'); var makeIterator = require('../function/makeIterator_'); @@ -21939,11 +22226,11 @@ var makeIterator = require('../function/makeIterator_'); -},{"../function/makeIterator_":169,"./some":213}],201:[function(require,module,exports){ -arguments[4][72][0].apply(exports,arguments) -},{"./hasOwn":205,"dup":72}],202:[function(require,module,exports){ -arguments[4][73][0].apply(exports,arguments) -},{"./forIn":201,"./hasOwn":205,"dup":73}],203:[function(require,module,exports){ +},{"../function/makeIterator_":171,"./some":215}],203:[function(require,module,exports){ +arguments[4][74][0].apply(exports,arguments) +},{"./hasOwn":207,"dup":74}],204:[function(require,module,exports){ +arguments[4][75][0].apply(exports,arguments) +},{"./forIn":203,"./hasOwn":207,"dup":75}],205:[function(require,module,exports){ var isPrimitive = require('../lang/isPrimitive'); /** @@ -21965,7 +22252,7 @@ var isPrimitive = require('../lang/isPrimitive'); -},{"../lang/isPrimitive":183}],204:[function(require,module,exports){ +},{"../lang/isPrimitive":185}],206:[function(require,module,exports){ var get = require('./get'); var UNDEF; @@ -21982,9 +22269,9 @@ var get = require('./get'); -},{"./get":203}],205:[function(require,module,exports){ -arguments[4][74][0].apply(exports,arguments) -},{"dup":74}],206:[function(require,module,exports){ +},{"./get":205}],207:[function(require,module,exports){ +arguments[4][76][0].apply(exports,arguments) +},{"dup":76}],208:[function(require,module,exports){ var forOwn = require('./forOwn'); /** @@ -22002,7 +22289,7 @@ var forOwn = require('./forOwn'); -},{"./forOwn":202}],207:[function(require,module,exports){ +},{"./forOwn":204}],209:[function(require,module,exports){ var hasOwn = require('./hasOwn'); var deepClone = require('../lang/deepClone'); var isObject = require('../lang/isObject'); @@ -22044,9 +22331,9 @@ var isObject = require('../lang/isObject'); -},{"../lang/deepClone":173,"../lang/isObject":181,"./hasOwn":205}],208:[function(require,module,exports){ -arguments[4][75][0].apply(exports,arguments) -},{"./forOwn":202,"dup":75}],209:[function(require,module,exports){ +},{"../lang/deepClone":175,"../lang/isObject":183,"./hasOwn":207}],210:[function(require,module,exports){ +arguments[4][77][0].apply(exports,arguments) +},{"./forOwn":204,"dup":77}],211:[function(require,module,exports){ var forEach = require('../array/forEach'); /** @@ -22067,7 +22354,7 @@ var forEach = require('../array/forEach'); -},{"../array/forEach":150}],210:[function(require,module,exports){ +},{"../array/forEach":152}],212:[function(require,module,exports){ var slice = require('../array/slice'); var contains = require('../array/contains'); @@ -22090,7 +22377,7 @@ var contains = require('../array/contains'); -},{"../array/contains":142,"../array/slice":158}],211:[function(require,module,exports){ +},{"../array/contains":144,"../array/slice":160}],213:[function(require,module,exports){ var namespace = require('./namespace'); /** @@ -22109,7 +22396,7 @@ var namespace = require('./namespace'); -},{"./namespace":209}],212:[function(require,module,exports){ +},{"./namespace":211}],214:[function(require,module,exports){ var forOwn = require('./forOwn'); /** @@ -22127,7 +22414,7 @@ var forOwn = require('./forOwn'); -},{"./forOwn":202}],213:[function(require,module,exports){ +},{"./forOwn":204}],215:[function(require,module,exports){ var forOwn = require('./forOwn'); var makeIterator = require('../function/makeIterator_'); @@ -22150,7 +22437,7 @@ var makeIterator = require('../function/makeIterator_'); -},{"../function/makeIterator_":169,"./forOwn":202}],214:[function(require,module,exports){ +},{"../function/makeIterator_":171,"./forOwn":204}],216:[function(require,module,exports){ var has = require('./has'); /** @@ -22175,7 +22462,7 @@ var has = require('./has'); -},{"./has":204}],215:[function(require,module,exports){ +},{"./has":206}],217:[function(require,module,exports){ var forOwn = require('./forOwn'); /** @@ -22193,7 +22480,7 @@ var forOwn = require('./forOwn'); -},{"./forOwn":202}],216:[function(require,module,exports){ +},{"./forOwn":204}],218:[function(require,module,exports){ var forOwn = require('../object/forOwn'); var isArray = require('../lang/isArray'); var forEach = require('../array/forEach'); @@ -22222,7 +22509,7 @@ var forEach = require('../array/forEach'); module.exports = encode; -},{"../array/forEach":150,"../lang/isArray":176,"../object/forOwn":202}],217:[function(require,module,exports){ +},{"../array/forEach":152,"../lang/isArray":178,"../object/forOwn":204}],219:[function(require,module,exports){ /** @@ -22252,7 +22539,7 @@ var forEach = require('../array/forEach'); -},{}],218:[function(require,module,exports){ +},{}],220:[function(require,module,exports){ var randInt = require('./randInt'); var isArray = require('../lang/isArray'); @@ -22269,7 +22556,7 @@ var isArray = require('../lang/isArray'); -},{"../lang/isArray":176,"./randInt":222}],219:[function(require,module,exports){ +},{"../lang/isArray":178,"./randInt":224}],221:[function(require,module,exports){ var randHex = require('./randHex'); var choice = require('./choice'); @@ -22295,7 +22582,7 @@ var choice = require('./choice'); module.exports = guid; -},{"./choice":218,"./randHex":221}],220:[function(require,module,exports){ +},{"./choice":220,"./randHex":223}],222:[function(require,module,exports){ var random = require('./random'); var MIN_INT = require('../number/MIN_INT'); var MAX_INT = require('../number/MAX_INT'); @@ -22312,7 +22599,7 @@ var MAX_INT = require('../number/MAX_INT'); module.exports = rand; -},{"../number/MAX_INT":192,"../number/MIN_INT":193,"./random":223}],221:[function(require,module,exports){ +},{"../number/MAX_INT":194,"../number/MIN_INT":195,"./random":225}],223:[function(require,module,exports){ var choice = require('./choice'); var _chars = '0123456789abcdef'.split(''); @@ -22333,7 +22620,7 @@ var choice = require('./choice'); -},{"./choice":218}],222:[function(require,module,exports){ +},{"./choice":220}],224:[function(require,module,exports){ var MIN_INT = require('../number/MIN_INT'); var MAX_INT = require('../number/MAX_INT'); var rand = require('./rand'); @@ -22353,7 +22640,7 @@ var rand = require('./rand'); module.exports = randInt; -},{"../number/MAX_INT":192,"../number/MIN_INT":193,"./rand":220}],223:[function(require,module,exports){ +},{"../number/MAX_INT":194,"../number/MIN_INT":195,"./rand":222}],225:[function(require,module,exports){ /** @@ -22373,9 +22660,9 @@ var rand = require('./rand'); -},{}],224:[function(require,module,exports){ -arguments[4][76][0].apply(exports,arguments) -},{"dup":76}],225:[function(require,module,exports){ +},{}],226:[function(require,module,exports){ +arguments[4][78][0].apply(exports,arguments) +},{"dup":78}],227:[function(require,module,exports){ var toString = require('../lang/toString'); /** @@ -22391,7 +22678,7 @@ var toString = require('../lang/toString'); -},{"../lang/toString":187}],226:[function(require,module,exports){ +},{"../lang/toString":189}],228:[function(require,module,exports){ var toString = require('../lang/toString'); /** @@ -22411,7 +22698,7 @@ var toString = require('../lang/toString'); -},{"../lang/toString":187}],227:[function(require,module,exports){ +},{"../lang/toString":189}],229:[function(require,module,exports){ var toString = require('../lang/toString'); /** @@ -22434,7 +22721,7 @@ var toString = require('../lang/toString'); -},{"../lang/toString":187}],228:[function(require,module,exports){ +},{"../lang/toString":189}],230:[function(require,module,exports){ var toString = require('../lang/toString'); var get = require('../object/get'); @@ -22455,7 +22742,7 @@ var get = require('../object/get'); -},{"../lang/toString":187,"../object/get":203}],229:[function(require,module,exports){ +},{"../lang/toString":189,"../object/get":205}],231:[function(require,module,exports){ var toString = require('../lang/toString'); /** * "Safer" String.toLowerCase() @@ -22468,9 +22755,9 @@ var toString = require('../lang/toString'); module.exports = lowerCase; -},{"../lang/toString":187}],230:[function(require,module,exports){ -arguments[4][77][0].apply(exports,arguments) -},{"../lang/toString":187,"./WHITE_SPACES":224,"dup":77}],231:[function(require,module,exports){ +},{"../lang/toString":189}],232:[function(require,module,exports){ +arguments[4][79][0].apply(exports,arguments) +},{"../lang/toString":189,"./WHITE_SPACES":226,"dup":79}],233:[function(require,module,exports){ var toString = require('../lang/toString'); var lowerCase = require('./lowerCase'); var upperCase = require('./upperCase'); @@ -22485,7 +22772,7 @@ var upperCase = require('./upperCase'); module.exports = properCase; -},{"../lang/toString":187,"./lowerCase":229,"./upperCase":238}],232:[function(require,module,exports){ +},{"../lang/toString":189,"./lowerCase":231,"./upperCase":240}],234:[function(require,module,exports){ var toString = require('../lang/toString'); var toInt = require('../number/toInt'); @@ -22513,7 +22800,7 @@ var toInt = require('../number/toInt'); -},{"../lang/toString":187,"../number/toInt":195}],233:[function(require,module,exports){ +},{"../lang/toString":189,"../number/toInt":197}],235:[function(require,module,exports){ var toString = require('../lang/toString'); var repeat = require('./repeat'); @@ -22530,11 +22817,11 @@ var repeat = require('./repeat'); -},{"../lang/toString":187,"./repeat":232}],234:[function(require,module,exports){ -arguments[4][78][0].apply(exports,arguments) -},{"../lang/toString":187,"./WHITE_SPACES":224,"dup":78}],235:[function(require,module,exports){ -arguments[4][79][0].apply(exports,arguments) -},{"../lang/toString":187,"./WHITE_SPACES":224,"./ltrim":230,"./rtrim":234,"dup":79}],236:[function(require,module,exports){ +},{"../lang/toString":189,"./repeat":234}],236:[function(require,module,exports){ +arguments[4][80][0].apply(exports,arguments) +},{"../lang/toString":189,"./WHITE_SPACES":226,"dup":80}],237:[function(require,module,exports){ +arguments[4][81][0].apply(exports,arguments) +},{"../lang/toString":189,"./WHITE_SPACES":226,"./ltrim":232,"./rtrim":236,"dup":81}],238:[function(require,module,exports){ var toString = require('../lang/toString'); /** @@ -22554,7 +22841,7 @@ var toString = require('../lang/toString'); -},{"../lang/toString":187}],237:[function(require,module,exports){ +},{"../lang/toString":189}],239:[function(require,module,exports){ var toString = require('../lang/toString'); /** * Replaces hyphens with spaces. (only hyphens between word chars) @@ -22566,13 +22853,13 @@ var toString = require('../lang/toString'); module.exports = unhyphenate; -},{"../lang/toString":187}],238:[function(require,module,exports){ -arguments[4][80][0].apply(exports,arguments) -},{"../lang/toString":187,"dup":80}],239:[function(require,module,exports){ -arguments[4][158][0].apply(exports,arguments) -},{"dup":158}],240:[function(require,module,exports){ -arguments[4][166][0].apply(exports,arguments) -},{"../array/slice":239,"dup":166}],241:[function(require,module,exports){ +},{"../lang/toString":189}],240:[function(require,module,exports){ +arguments[4][82][0].apply(exports,arguments) +},{"../lang/toString":189,"dup":82}],241:[function(require,module,exports){ +arguments[4][160][0].apply(exports,arguments) +},{"dup":160}],242:[function(require,module,exports){ +arguments[4][168][0].apply(exports,arguments) +},{"../array/slice":241,"dup":168}],243:[function(require,module,exports){ var kindOf = require('./kindOf'); var isPlainObject = require('./isPlainObject'); var mixIn = require('../object/mixIn'); @@ -22623,27 +22910,27 @@ var mixIn = require('../object/mixIn'); -},{"../object/mixIn":251,"./isPlainObject":245,"./kindOf":246}],242:[function(require,module,exports){ -arguments[4][173][0].apply(exports,arguments) -},{"../object/forOwn":248,"./clone":241,"./isPlainObject":245,"./kindOf":246,"dup":173}],243:[function(require,module,exports){ -arguments[4][67][0].apply(exports,arguments) -},{"./kindOf":246,"dup":67}],244:[function(require,module,exports){ -arguments[4][68][0].apply(exports,arguments) -},{"./isKind":243,"dup":68}],245:[function(require,module,exports){ -arguments[4][182][0].apply(exports,arguments) -},{"dup":182}],246:[function(require,module,exports){ +},{"../object/mixIn":253,"./isPlainObject":247,"./kindOf":248}],244:[function(require,module,exports){ +arguments[4][175][0].apply(exports,arguments) +},{"../object/forOwn":250,"./clone":243,"./isPlainObject":247,"./kindOf":248,"dup":175}],245:[function(require,module,exports){ +arguments[4][69][0].apply(exports,arguments) +},{"./kindOf":248,"dup":69}],246:[function(require,module,exports){ arguments[4][70][0].apply(exports,arguments) -},{"dup":70}],247:[function(require,module,exports){ +},{"./isKind":245,"dup":70}],247:[function(require,module,exports){ +arguments[4][184][0].apply(exports,arguments) +},{"dup":184}],248:[function(require,module,exports){ arguments[4][72][0].apply(exports,arguments) -},{"./hasOwn":249,"dup":72}],248:[function(require,module,exports){ -arguments[4][73][0].apply(exports,arguments) -},{"./forIn":247,"./hasOwn":249,"dup":73}],249:[function(require,module,exports){ +},{"dup":72}],249:[function(require,module,exports){ arguments[4][74][0].apply(exports,arguments) -},{"dup":74}],250:[function(require,module,exports){ -arguments[4][207][0].apply(exports,arguments) -},{"../lang/deepClone":242,"../lang/isObject":244,"./hasOwn":249,"dup":207}],251:[function(require,module,exports){ +},{"./hasOwn":251,"dup":74}],250:[function(require,module,exports){ arguments[4][75][0].apply(exports,arguments) -},{"./forOwn":248,"dup":75}],252:[function(require,module,exports){ +},{"./forIn":249,"./hasOwn":251,"dup":75}],251:[function(require,module,exports){ +arguments[4][76][0].apply(exports,arguments) +},{"dup":76}],252:[function(require,module,exports){ +arguments[4][209][0].apply(exports,arguments) +},{"../lang/deepClone":244,"../lang/isObject":246,"./hasOwn":251,"dup":209}],253:[function(require,module,exports){ +arguments[4][77][0].apply(exports,arguments) +},{"./forOwn":250,"dup":77}],254:[function(require,module,exports){ "use strict"; // credits to @cpojer's Class.Binds, released under the MIT license @@ -22663,7 +22950,7 @@ var bound = prime({ module.exports = bound -},{"mout/function/bind":240,"prime":256}],253:[function(require,module,exports){ +},{"mout/function/bind":242,"prime":258}],255:[function(require,module,exports){ "use strict"; var prime = require("prime") @@ -22682,7 +22969,7 @@ var Options = prime({ module.exports = Options -},{"mout/object/merge":250,"prime":256}],254:[function(require,module,exports){ +},{"mout/object/merge":252,"prime":258}],256:[function(require,module,exports){ (function (process,global){ /* defer @@ -22801,7 +23088,7 @@ module.exports = defer }).call(this,require('_process'),typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) -},{"_process":2,"mout/array/forEach":258,"mout/array/indexOf":259,"mout/lang/kindOf":261,"mout/time/now":266}],255:[function(require,module,exports){ +},{"_process":2,"mout/array/forEach":260,"mout/array/indexOf":261,"mout/lang/kindOf":263,"mout/time/now":268}],257:[function(require,module,exports){ /* Emitter */"use strict" @@ -22867,7 +23154,7 @@ Emitter.EMIT_SYNC = {} module.exports = Emitter -},{"./defer":254,"./index":256,"mout/array/forEach":258,"mout/array/indexOf":259}],256:[function(require,module,exports){ +},{"./defer":256,"./index":258,"mout/array/forEach":260,"mout/array/indexOf":261}],258:[function(require,module,exports){ /* prime - prototypal inheritance @@ -22959,7 +23246,7 @@ var prime = function(proto){ module.exports = prime -},{"mout/lang/createObject":260,"mout/lang/kindOf":261,"mout/object/hasOwn":264,"mout/object/mixIn":265}],257:[function(require,module,exports){ +},{"mout/lang/createObject":262,"mout/lang/kindOf":263,"mout/object/hasOwn":266,"mout/object/mixIn":267}],259:[function(require,module,exports){ /* Map */"use strict" @@ -23085,11 +23372,11 @@ map.prototype = Map.prototype module.exports = map -},{"./index":256,"mout/array/indexOf":259}],258:[function(require,module,exports){ -arguments[4][62][0].apply(exports,arguments) -},{"dup":62}],259:[function(require,module,exports){ -arguments[4][63][0].apply(exports,arguments) -},{"dup":63}],260:[function(require,module,exports){ +},{"./index":258,"mout/array/indexOf":261}],260:[function(require,module,exports){ +arguments[4][64][0].apply(exports,arguments) +},{"dup":64}],261:[function(require,module,exports){ +arguments[4][65][0].apply(exports,arguments) +},{"dup":65}],262:[function(require,module,exports){ var mixIn = require('../object/mixIn'); /** @@ -23109,17 +23396,17 @@ var mixIn = require('../object/mixIn'); -},{"../object/mixIn":265}],261:[function(require,module,exports){ -arguments[4][70][0].apply(exports,arguments) -},{"dup":70}],262:[function(require,module,exports){ +},{"../object/mixIn":267}],263:[function(require,module,exports){ arguments[4][72][0].apply(exports,arguments) -},{"./hasOwn":264,"dup":72}],263:[function(require,module,exports){ -arguments[4][73][0].apply(exports,arguments) -},{"./forIn":262,"./hasOwn":264,"dup":73}],264:[function(require,module,exports){ +},{"dup":72}],264:[function(require,module,exports){ arguments[4][74][0].apply(exports,arguments) -},{"dup":74}],265:[function(require,module,exports){ +},{"./hasOwn":266,"dup":74}],265:[function(require,module,exports){ arguments[4][75][0].apply(exports,arguments) -},{"./forOwn":263,"dup":75}],266:[function(require,module,exports){ +},{"./forIn":264,"./hasOwn":266,"dup":75}],266:[function(require,module,exports){ +arguments[4][76][0].apply(exports,arguments) +},{"dup":76}],267:[function(require,module,exports){ +arguments[4][77][0].apply(exports,arguments) +},{"./forOwn":265,"dup":77}],268:[function(require,module,exports){ /** @@ -23139,7 +23426,7 @@ arguments[4][75][0].apply(exports,arguments) -},{}],267:[function(require,module,exports){ +},{}],269:[function(require,module,exports){ /** * sifter.js * Copyright (c) 2013 Brian Reavis & contributors @@ -23612,7 +23899,7 @@ arguments[4][75][0].apply(exports,arguments) })); -},{}],268:[function(require,module,exports){ +},{}],270:[function(require,module,exports){ /* Slick Finder */"use strict" @@ -24443,7 +24730,7 @@ slick.parse = parse; module.exports = slick -},{"./parser":270}],269:[function(require,module,exports){ +},{"./parser":272}],271:[function(require,module,exports){ (function (global){ /* slick @@ -24453,7 +24740,7 @@ module.exports = "document" in global ? require("./finder") : { parse: require(" }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) -},{"./finder":268,"./parser":270}],270:[function(require,module,exports){ +},{"./finder":270,"./parser":272}],272:[function(require,module,exports){ /* Slick Parser - originally created by the almighty Thomas Aylott <@subtlegradient> (http://subtlegradient.com) @@ -24705,7 +24992,7 @@ var parse = function(expression){ module.exports = parse -},{}],271:[function(require,module,exports){ +},{}],273:[function(require,module,exports){ /**! * Sortable * @author RubaXa diff --git a/platforms/common/scss/admin/_assignments.scss b/platforms/common/scss/admin/_assignments.scss index 57b00a3c4..88338863a 100644 --- a/platforms/common/scss/admin/_assignments.scss +++ b/platforms/common/scss/admin/_assignments.scss @@ -1,8 +1,5 @@ #g5-container { #assignments { - .card { - float: left; - } .enabler { float: right; } diff --git a/platforms/common/scss/admin/_configurations.scss b/platforms/common/scss/admin/_configurations.scss index daa9a0e93..4a3892fd5 100644 --- a/platforms/common/scss/admin/_configurations.scss +++ b/platforms/common/scss/admin/_configurations.scss @@ -1,6 +1,11 @@ #g5-container {//wrapper #configurations { + margin: -10px -1%; + + .card { + margin: 10px 1%; + } h4 > * { vertical-align: middle; @@ -57,6 +62,18 @@ } } + .card .inner-params { + margin: $content-margin 0 0; + padding-top: $content-margin; + border-top: 1px solid $light-gray; + + & > :first-child { + border-top: 0; + padding-top: 0; + margin: 0 auto; + } + } + .g-tooltip { &:before { bottom: 2.6rem; diff --git a/platforms/common/scss/admin/_core.scss b/platforms/common/scss/admin/_core.scss index 8002f7e2c..5f2709043 100644 --- a/platforms/common/scss/admin/_core.scss +++ b/platforms/common/scss/admin/_core.scss @@ -4,10 +4,13 @@ html { } body { + margin: 0; +} + +body.g5-prime { color: $white; - background-color: $body-bg !important; + background-color: $body-bg; font-family: $font-family-default; - margin: 0; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } @@ -19,6 +22,9 @@ a { #g5-container { // wrapper font-size: $core-font-size; line-height: $core-line-height; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + font-family: $font-family-default; .g-block { position: relative; @@ -53,6 +59,20 @@ a { @include animation(pulsate 1s ease-out infinite); } + // collapse + .g-collapsed { + .g-collapse { + i { + @include transform(rotate(180deg)); + } + } + + .inner-params { + overflow: hidden; + height: 0; + } + } + // badges .badge { border-radius: 100px; @@ -64,7 +84,14 @@ a { // cards .cards-wrapper { - margin: -10px -1%; + margin: -10px 0; + display: block; + width: 100%; + @include column-count(2); + + @include breakpoint(mobile-only) { + @include column-count(1); + } } .card { @@ -75,7 +102,8 @@ a { padding: 10px; min-width: 250px; vertical-align: top; - margin: 10px 1%; + margin: 10px 0; + //@include transform(translateZ(0)); // FIXME : Causes z-index issue in selectize but fixes WebKit rendering issues with Columns &.full-width { margin: 0; @@ -85,6 +113,34 @@ a { h4 { margin: 0; + > * { + vertical-align: middle; + } + + &[data-g-collapse] { + .g-collapse { + @extend .font-small; + cursor: pointer; + display: inline-block; + border: 1px solid #ddd; + color: #bbb; + border-radius: 3px; + line-height: 1rem; + padding: 2px; + margin-right: 5px; + + &:hover:before { + bottom: 1.65rem; + left: 0.25rem; + } + + &:hover:after { + left: -0.5rem; + bottom: 2rem; + } + } + } + .enabler { float: right; } @@ -94,9 +150,9 @@ a { @include enabler($green, $red); } - .inner-params { + .inner-params > :first-child:not(.alert) { margin: $content-margin 0 0; - padding-top: $content-margin; + padding-top: $content-margin * 2; border-top: 1px solid $light-gray; } @@ -137,14 +193,28 @@ a { // Footer #footer { - margin-bottom: 3.5rem; + background-color: #e7e7e7; + padding: 1em 0 3rem; + margin-bottom: 0; + color: #aaa; text-align: center; font-weight: $font-weight-medium; + border-top: 1px solid #dedede; + font-family: $font-family-default; + font-size: $core-font-size; + line-height: $core-line-height; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + + .g-version, .g-version-date { + color: $update-header-bg; + } + a { - color: lighten($core-accent, 30%); + color: $core-accent !important; text-decoration: none; &:hover { - color: $white; + color: darken($core-accent, 20%) !important; } } } diff --git a/platforms/common/scss/admin/_settings.scss b/platforms/common/scss/admin/_settings.scss index 5b7767793..110c1d43d 100644 --- a/platforms/common/scss/admin/_settings.scss +++ b/platforms/common/scss/admin/_settings.scss @@ -11,12 +11,9 @@ } .settings-block { - width: 48%; + width: 100%; + min-width: inherit; - @include breakpoint(mobile-only) { - margin: 1% 0; - width: 100%; - } &.card { .badge { @@ -32,6 +29,10 @@ color: $orange; } + .alert { + margin: $content-margin 0; + } + .settings-param { padding: 10px 5px; clear: both; @@ -59,6 +60,18 @@ } } + .g-instancepicker-title { + margin-right: 0.5rem; + font-style: italic; + &:empty { + margin: 0; + } + } + + .input-small { + width: 120px !important; + } + input.settings-param-toggle { position: absolute; top: 50%; diff --git a/platforms/common/scss/admin/mixins/_background.scss b/platforms/common/scss/admin/mixins/_background.scss index e917783ef..0f4aebe19 100644 --- a/platforms/common/scss/admin/mixins/_background.scss +++ b/platforms/common/scss/admin/mixins/_background.scss @@ -3,3 +3,7 @@ @include background-image(linear-gradient($deg, rgba(255, 255, 255, .2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .2) 50%, rgba(255, 255, 255, .2) 75%, transparent 75%, transparent)); background-size: $size $size; } + +%g-transparent-bg { + background-image: url(data:image/jpeg;base64,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); +} \ No newline at end of file diff --git a/platforms/common/scss/admin/particles/_colorpicker.scss b/platforms/common/scss/admin/particles/_colorpicker.scss index e8ae0e669..20eebdd7d 100644 --- a/platforms/common/scss/admin/particles/_colorpicker.scss +++ b/platforms/common/scss/admin/particles/_colorpicker.scss @@ -1,6 +1,6 @@ .colorpicker { + @extend %g-transparent-bg; position: relative; - background-image: url(data:image/jpeg;base64,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); border-radius: $core-border-radius; max-width: 100%; diff --git a/platforms/common/scss/admin/particles/_filepicker.scss b/platforms/common/scss/admin/particles/_filepicker.scss index d80abd05e..c8c249ca3 100644 --- a/platforms/common/scss/admin/particles/_filepicker.scss +++ b/platforms/common/scss/admin/particles/_filepicker.scss @@ -164,13 +164,31 @@ border-radius: $core-border-radius; &.g-image { + @extend %g-transparent-bg; position: relative; float: left; width: $max-width; height: $max-width; background-position: 50% 50%; - background-repeat: no-repeat; - background-size: cover; + //background-repeat: no-repeat; + //background-size: cover; + + /*&.g-image-png, &.g-image-gif, &.g-image-ico, &.g-image-svg { + background-size: inherit; + background-repeat: repeat; + }*/ + + > div { + background-position: 50% 50%; + background-repeat: no-repeat; + background-size: cover; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border-radius: $core-border-radius; + } } } @@ -240,7 +258,7 @@ margin-top: 0; li { display: block; - padding: 6px 4px; + padding: 4px; > span:not(.g-file-name) { color: #aaa; @@ -252,7 +270,7 @@ } .g-file-name { - width: 60%; + width: 50%; } .g-file-size { diff --git a/platforms/common/scss/configuration/admin/_colors.scss b/platforms/common/scss/configuration/admin/_colors.scss index 2a6448f27..d6125bf73 100644 --- a/platforms/common/scss/configuration/admin/_colors.scss +++ b/platforms/common/scss/configuration/admin/_colors.scss @@ -1,46 +1,46 @@ // Core -$core-text: #666; -$secondary-text: #314C59; -$core-accent: #439A86; -$secondary-accent: #729DAE; -$tertiary-accent: #48B0D7; -$white: #fff; -$black: #000; -$light-gray: #eee; -$medium-gray: #ddd; -$dark-gray: #666; +$core-text: #666 !default; +$secondary-text: #314C59 !default; +$core-accent: #439A86 !default; +$secondary-accent: #729DAE !default; +$tertiary-accent: #48B0D7 !default; +$white: #fff !default; +$black: #000 !default; +$light-gray: #eee !default; +$medium-gray: #ddd !default; +$dark-gray: #666 !default; -$blue-gray: #54606e; -$aqua: #4fc1e9; -$yellow: #ffce54; -$green: #a0d468; -$orange: #fc6e51; -$red: #ed5565; -$lavender: #ac92ec; -$pink: #ec87c0; -$blue: #3288e6; +$blue-gray: #54606e !default; +$aqua: #4fc1e9 !default; +$yellow: #ffce54 !default; +$green: #a0d468 !default; +$orange: #fc6e51 !default; +$red: #ed5565 !default; +$lavender: #ac92ec !default; +$pink: #ec87c0 !default; +$blue: #3288e6 !default; // Buttons -$button-bg: #999999; +$button-bg: #999999 !default; // Body -$body-bg: #354D59; +$body-bg: #354D59 !default; // Headers -$main-header-text: $white; -$inner-header-bg: #253A47; -$inner-header-text: $core-accent; -$update-header-bg: #8F4DAE; +$main-header-text: $white !default; +$inner-header-bg: #253A47 !default; +$inner-header-text: $core-accent !default; +$update-header-bg: #8F4DAE !default; // Main -$main-bg: #f0f0f0; +$main-bg: #f0f0f0 !default; // NavBar -$navbar-bg: #DADADA; -$navbar-border: #C6C6C6; -$navbar-color: #666; -$navbar-active: $main-bg; -$navbar-active-color: $secondary-text; +$navbar-bg: #DADADA !default; +$navbar-border: #C6C6C6 !default; +$navbar-color: #666 !default; +$navbar-active: $main-bg !default; +$navbar-active-color: $secondary-text !default; // Menu Editor -$menu-editor-bg: #b3b3b3; +$menu-editor-bg: #b3b3b3 !default; diff --git a/platforms/common/templates/ajax/filepicker/files.html.twig b/platforms/common/templates/ajax/filepicker/files.html.twig index 527733615..246d09030 100644 --- a/platforms/common/templates/ajax/filepicker/files.html.twig +++ b/platforms/common/templates/ajax/filepicker/files.html.twig @@ -30,7 +30,9 @@ {% for index,file in files %}
    • {% if file.isImage %} -
      +
      +
      +
      {% else %}
      {{ file.extension }}
      {% endif %} diff --git a/platforms/common/templates/forms/fields/gantry/module.html.twig b/platforms/common/templates/forms/fields/gantry/module.html.twig new file mode 100644 index 000000000..d4d8cf6b8 --- /dev/null +++ b/platforms/common/templates/forms/fields/gantry/module.html.twig @@ -0,0 +1,16 @@ +{% extends default ? "partials/field.html.twig" : "forms/field.html.twig" %} + +{% block input %} + + +{% endblock %} diff --git a/platforms/common/templates/forms/fields/gantry/particle.html.twig b/platforms/common/templates/forms/fields/gantry/particle.html.twig new file mode 100644 index 000000000..1af7f96a7 --- /dev/null +++ b/platforms/common/templates/forms/fields/gantry/particle.html.twig @@ -0,0 +1,17 @@ +{% extends default ? "partials/field.html.twig" : "forms/field.html.twig" %} + +{% block input %} + {% set label = field.picker_label|default('Pick a Particle') %} + {% set alt_label = field.picker_label_alt|default('Edit Particle') %} + {{ value.title|default('') }} + +{% endblock %} diff --git a/platforms/common/templates/layouts/particles.html.twig b/platforms/common/templates/layouts/particles.html.twig deleted file mode 100644 index dfbda14de..000000000 --- a/platforms/common/templates/layouts/particles.html.twig +++ /dev/null @@ -1,13 +0,0 @@ -
      -
      - - -
      -
        - {% for key,list in particles %} - {% for type,particle in list %} -
      • {{ particle | e }}
        • - {% endfor %} - {% endfor %} -
      -
      \ No newline at end of file diff --git a/platforms/common/templates/modals/module-picker.html.twig b/platforms/common/templates/modals/module-picker.html.twig index 48ff06b4b..fc155cbfc 100644 --- a/platforms/common/templates/modals/module-picker.html.twig +++ b/platforms/common/templates/modals/module-picker.html.twig @@ -36,7 +36,7 @@ module.[id | title | position | enabled | access]
      {#Defaults#} - + Cancel
      diff --git a/platforms/common/templates/pages/configurations/configurations.html.twig b/platforms/common/templates/pages/configurations/configurations.html.twig index f1809aa82..2229a22f3 100644 --- a/platforms/common/templates/pages/configurations/configurations.html.twig +++ b/platforms/common/templates/pages/configurations/configurations.html.twig @@ -15,11 +15,11 @@ -
      +
        {# TODO: Need to inject the Base Outline at the top of the list #} {% for name, title in gantry.configurations.user %} - {# set preset = gantry.configurations.layoutPreset(name) #} + {% set preset = gantry.configurations.layoutPreset(name) %}

      • @@ -59,7 +59,7 @@

        System Outlines

          {% for name, title in gantry.configurations.system %} - {# set preset = gantry.configurations.layoutPreset(name) #} + {% set preset = gantry.configurations.layoutPreset(name) %}

        • {{ title }}

          diff --git a/platforms/common/templates/pages/configurations/settings/settings.html.twig b/platforms/common/templates/pages/configurations/settings/settings.html.twig index 60048a4c1..b8956a2ba 100644 --- a/platforms/common/templates/pages/configurations/settings/settings.html.twig +++ b/platforms/common/templates/pages/configurations/settings/settings.html.twig @@ -17,9 +17,12 @@ {% for id, particle in list %} {% if not particle.hidden %} {% set prefix = 'particles.' ~ id ~ '.' %} -
          -

          - {{ particle.name }} + {% set collapsed = particle.form.collapsed %} + {% set labels = {collapse: 'Collapse', expand: 'Expand'} %} +