Commit d3994dc5 by Krzysztof Kuźniar

Update module v1.0.3

parent ac5980a0
...@@ -107,24 +107,16 @@ class Modules extends \Magento\Config\Block\System\Config\Form\Fieldset ...@@ -107,24 +107,16 @@ class Modules extends \Magento\Config\Block\System\Config\Form\Fieldset
} }
/** /**
* @param $fieldset * @return \Magento\Framework\View\Element\BlockInterface
* @param $moduleKey
* @return string
*/ */
protected function _getFieldHtml($fieldset, $moduleName) protected function _getFieldRenderer()
{ {
$moduleInfo = $this->_getModuleInfo($moduleName); if (empty($this->_fieldRenderer)) {
$layout = $this->_layoutFactory->create();
$moduleDesc = '<h5 class="module-name">' . $moduleInfo['name'] . '</h5>' $this->_fieldRenderer = $layout->createBlock(\Magento\Config\Block\System\Config\Form\Field::class);
. '<span class="module-desc">' . $moduleInfo['description'] . '</span>'; }
$field = $fieldset->addField($moduleName, 'label', [
'name' => 'dummy',
'label' => $moduleDesc,
'value' => "ver.{$moduleInfo['version']}",
])->setRenderer($this->_getFieldRenderer());
return $field->toHtml(); return $this->_fieldRenderer;
} }
/** /**
...@@ -149,18 +141,23 @@ class Modules extends \Magento\Config\Block\System\Config\Form\Fieldset ...@@ -149,18 +141,23 @@ class Modules extends \Magento\Config\Block\System\Config\Form\Fieldset
} }
/** /**
* @return \Magento\Framework\View\Element\BlockInterface * @param $fieldset
* @param $moduleKey
* @return string
*/ */
protected function _getFieldRenderer() protected function _getFieldHtml($fieldset, $moduleName)
{ {
if (empty($this->_fieldRenderer)) { $moduleInfo = $this->_getModuleInfo($moduleName);
$layout = $this->_layoutFactory->create();
$this->_fieldRenderer = $layout->createBlock( $moduleDesc = '<h5 class="module-name">' . $moduleInfo['name'] . '</h5>'
\Magento\Config\Block\System\Config\Form\Field::class .'<span class="module-desc">' . $moduleInfo['description'] . '</span>';
);
}
return $this->_fieldRenderer; $field = $fieldset->addField($moduleName, 'label', [
'name' => 'dummy',
'label' => $moduleDesc,
'value' => "ver.{$moduleInfo['version']}",
])->setRenderer($this->_getFieldRenderer());
return $field->toHtml();
} }
} }
...@@ -6,13 +6,12 @@ ...@@ -6,13 +6,12 @@
namespace Ubertheme\Base\Block\Ajax; namespace Ubertheme\Base\Block\Ajax;
use Magento\Framework\View\Element\Template; use \Magento\Framework\View\Element\Template;
use Magento\Framework\View\Element\Template\Context; use \Magento\Framework\View\Element\Template\Context;
use Ubertheme\Base\Helper\Data as DataHelper; use \Ubertheme\Base\Helper\Data as DataHelper;
/** /**
* Class AddCart * Build options for ajax add cart function
* @package Ubertheme\Base\Block\Ajax
*/ */
class AddCart extends Template class AddCart extends Template
{ {
...@@ -21,15 +20,15 @@ class AddCart extends Template ...@@ -21,15 +20,15 @@ class AddCart extends Template
protected $helper; protected $helper;
/** /**
* Compare constructor. * AddCart constructor.
* @param Context $context * @param Context $context
* @param array $data
* @param DataHelper $helper * @param DataHelper $helper
* @param array $data
*/ */
public function __construct( public function __construct(
Context $context, Context $context,
array $data = [], DataHelper $helper,
DataHelper $helper array $data = []
) { ) {
parent::__construct($context, $data); parent::__construct($context, $data);
$this->helper = $helper; $this->helper = $helper;
......
...@@ -6,13 +6,12 @@ ...@@ -6,13 +6,12 @@
namespace Ubertheme\Base\Block\Ajax; namespace Ubertheme\Base\Block\Ajax;
use Magento\Framework\View\Element\Template; use \Magento\Framework\View\Element\Template;
use Magento\Framework\View\Element\Template\Context; use \Magento\Framework\View\Element\Template\Context;
use Ubertheme\Base\Helper\Data as DataHelper; use \Ubertheme\Base\Helper\Data as DataHelper;
/** /**
* Class Compare * Build options for ajax compare function
* @package Ubertheme\Base\Block\Ajax
*/ */
class Compare extends Template class Compare extends Template
{ {
...@@ -23,13 +22,13 @@ class Compare extends Template ...@@ -23,13 +22,13 @@ class Compare extends Template
/** /**
* Compare constructor. * Compare constructor.
* @param Context $context * @param Context $context
* @param array $data
* @param DataHelper $helper * @param DataHelper $helper
* @param array $data
*/ */
public function __construct( public function __construct(
Context $context, Context $context,
array $data = [], DataHelper $helper,
DataHelper $helper array $data = []
) { ) {
parent::__construct($context, $data); parent::__construct($context, $data);
$this->helper = $helper; $this->helper = $helper;
......
...@@ -6,13 +6,12 @@ ...@@ -6,13 +6,12 @@
namespace Ubertheme\Base\Block\Ajax; namespace Ubertheme\Base\Block\Ajax;
use Magento\Framework\View\Element\Template; use \Magento\Framework\View\Element\Template;
use Magento\Framework\View\Element\Template\Context; use \Magento\Framework\View\Element\Template\Context;
use Ubertheme\Base\Helper\Data as DataHelper; use \Ubertheme\Base\Helper\Data as DataHelper;
/** /**
* Class Wishlist * Build options for ajax add wishlist function
* @package Ubertheme\Base\Block\Ajax
*/ */
class Wishlist extends Template class Wishlist extends Template
{ {
...@@ -21,15 +20,15 @@ class Wishlist extends Template ...@@ -21,15 +20,15 @@ class Wishlist extends Template
protected $helper; protected $helper;
/** /**
* Compare constructor. * Wishlist constructor.
* @param Context $context * @param Context $context
* @param array $data
* @param DataHelper $helper * @param DataHelper $helper
* @param array $data
*/ */
public function __construct( public function __construct(
Context $context, Context $context,
array $data = [], DataHelper $helper,
DataHelper $helper array $data = []
) { ) {
parent::__construct($context, $data); parent::__construct($context, $data);
$this->helper = $helper; $this->helper = $helper;
......
...@@ -6,12 +6,11 @@ ...@@ -6,12 +6,11 @@
namespace Ubertheme\Base\Block; namespace Ubertheme\Base\Block;
use Magento\Framework\View\Element\Template; use \Magento\Framework\View\Element\Template;
use Magento\Framework\View\Element\Template\Context; use \Magento\Framework\View\Element\Template\Context;
/** /**
* Class InitOwl2 * Initial OWL2's assets files
* @package Ubertheme\Base\Block
*/ */
class InitOwl2 extends Template class InitOwl2 extends Template
{ {
......
1.0.3
=====
* Fix bugs and improvements
+ Upgraded Fontawesome library to version 5.14.0
+ Fine tuning and fixed to compatible with Magento CE 2.4.1
1.0.2 1.0.2
===== =====
* Fix bugs and improvements * Fix bugs and improvements
......
<?php <?php
/** /**
* Copyright © 2016 Ubertheme. All rights reserved. * Copyright © 2016 Ubertheme. All rights reserved.
*/ */
namespace Ubertheme\Base\Helper; namespace Ubertheme\Base\Helper;
use \Magento\Framework\App\Helper\Context;
use Magento\Framework\App\Helper\AbstractHelper; use Magento\Framework\App\Helper\AbstractHelper;
use Magento\Framework\App\Helper\Context;
use Magento\Framework\Json\DecoderInterface; use Magento\Framework\Json\DecoderInterface;
use Magento\Framework\Json\EncoderInterface; use Magento\Framework\Json\EncoderInterface;
use Magento\Framework\ObjectManagerInterface; use Magento\Framework\ObjectManagerInterface;
/** /**
* Class Data * Data helper
* @package Ubertheme\Checkout\Helper
*/ */
class Data extends AbstractHelper class Data extends AbstractHelper
{ {
...@@ -72,13 +72,6 @@ class Data extends AbstractHelper ...@@ -72,13 +72,6 @@ class Data extends AbstractHelper
return $this->_jsonEncoder->encode($options); return $this->_jsonEncoder->encode($options);
} }
public function getCustomerId()
{
/** @var \Magento\Customer\Model\Session $customerSession */
$customerSession = $this->_objectManager->create("Magento\Customer\Model\Session");
return $customerSession->getCustomer()->getId();
}
public function getAjaxCartOptions() public function getAjaxCartOptions()
{ {
$options = [ $options = [
...@@ -88,21 +81,10 @@ class Data extends AbstractHelper ...@@ -88,21 +81,10 @@ class Data extends AbstractHelper
return $this->_jsonEncoder->encode($options); return $this->_jsonEncoder->encode($options);
} }
public function getLatestVersion($moduleName) public function getCustomerId()
{
$version = '';
$modules = self::getUBModules();
if (isset($modules[$moduleName])) {
$version = $modules[$moduleName];
}
return $version;
}
public static function getUBModules()
{ {
return [ /** @var \Magento\Customer\Model\Session $customerSession */
//coming soon $customerSession = $this->_objectManager->create("Magento\Customer\Model\Session");
]; return $customerSession->getCustomer()->getId();
} }
} }
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
namespace Ubertheme\Base\Model; namespace Ubertheme\Base\Model;
use Magento\MediaStorage\Model\File\UploaderFactory;
use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\File\Uploader; use Magento\Framework\File\Uploader;
use Magento\MediaStorage\Model\File\UploaderFactory;
class Upload class Upload
{ {
...@@ -41,7 +41,7 @@ class Upload ...@@ -41,7 +41,7 @@ class Upload
{ {
$fileName = ''; $fileName = '';
try { try {
if (isset($data[$fileId]['delete']) and $data[$fileId]['delete']) { if (isset($data[$fileId]['delete']) && $data[$fileId]['delete']) {
//delete file //delete file
$imagePath = $destinationFolder . $data[$fileId]['value']; $imagePath = $destinationFolder . $data[$fileId]['value'];
if (file_exists($imagePath)) { if (file_exists($imagePath)) {
......
<?php <?php
/** /**
* Copyright © 2016 Ubertheme.com All rights reserved. * Copyright © 2016 Ubertheme.com All rights reserved.
*/ */
...@@ -6,16 +7,15 @@ ...@@ -6,16 +7,15 @@
namespace Ubertheme\Base\Plugin\Controller\Product\Compare; namespace Ubertheme\Base\Plugin\Controller\Product\Compare;
use Magento\Catalog\Api\ProductRepositoryInterface; use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
use Magento\Framework\Data\Form\FormKey\Validator; use Magento\Framework\Data\Form\FormKey\Validator;
use Magento\Framework\Exception\NoSuchEntityException; use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\Json\Helper\Data; use Magento\Framework\Json\Helper\Data;
use Magento\Framework\View\Result\PageFactory; use Magento\Framework\View\Result\PageFactory;
use Magento\Store\Model\StoreManagerInterface; use Magento\Store\Model\StoreManagerInterface;
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
/** /**
* Class Add * Ajax add product to compare function
* @package Ubertheme\Base\Plugin\Controller\Product\Compare
*/ */
class Add extends \Magento\Catalog\Controller\Product\Compare\Add implements HttpPostActionInterface class Add extends \Magento\Catalog\Controller\Product\Compare\Add implements HttpPostActionInterface
{ {
......
...@@ -5,14 +5,13 @@ ...@@ -5,14 +5,13 @@
namespace Ubertheme\Base\Plugin\Controller\Wishlist\Index; namespace Ubertheme\Base\Plugin\Controller\Wishlist\Index;
use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\Framework\App\Action; use Magento\Framework\App\Action;
use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\Framework\Data\Form\FormKey\Validator; use Magento\Framework\Data\Form\FormKey\Validator;
use Magento\Framework\Exception\NoSuchEntityException; use Magento\Framework\Exception\NoSuchEntityException;
/** /**
* Class Add * Ajax add product to wishlist function
* @package Ubertheme\Base\Plugin\Controller\Wishlist\Index
*/ */
class Add extends \Magento\Wishlist\Controller\Index\Add class Add extends \Magento\Wishlist\Controller\Index\Add
{ {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
}, },
"suggest": {}, "suggest": {},
"type": "magento2-module", "type": "magento2-module",
"version": "1.0.2", "version": "1.0.3",
"license": [ "license": [
"Proprietary" "Proprietary"
], ],
......
...@@ -4,16 +4,15 @@ ...@@ -4,16 +4,15 @@
* Copyright © 2016 UberTheme. All rights reserved. * Copyright © 2016 UberTheme. All rights reserved.
*/ */
--> -->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
<acl> <acl>
<resources> <resources>
<resource id="Magento_Backend::admin"> <resource id="Magento_Backend::admin">
<resource id="Ubertheme_Base::content" title="UberTheme Extensions" sortOrder="999"/> <resource id="Ubertheme_Base::content" title="UberTheme Extensions" sortOrder="999" />
<resource id="Magento_Backend::stores"> <resource id="Magento_Backend::stores">
<resource id="Magento_Backend::stores_settings"> <resource id="Magento_Backend::stores_settings">
<resource id="Magento_Config::config"> <resource id="Magento_Config::config">
<resource id="Ubertheme_Base::settings" title="UberTheme Extensions" sortOrder="999"/> <resource id="Ubertheme_Base::settings" title="UberTheme Extensions" sortOrder="999" />
</resource> </resource>
</resource> </resource>
</resource> </resource>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
sortOrder="9999" sortOrder="9999"
module="Ubertheme_Base" module="Ubertheme_Base"
title="Ubertheme's Extensions" title="Ubertheme's Extensions"
resource="Ubertheme_Base::settings"/> resource="Ubertheme_Base::settings" />
<add id="Ubertheme_Base::helpcenter" <add id="Ubertheme_Base::helpcenter"
sortOrder="1" sortOrder="1"
...@@ -24,24 +24,24 @@ ...@@ -24,24 +24,24 @@
title="Ubertheme Documentation" module="Ubertheme_Base" title="Ubertheme Documentation" module="Ubertheme_Base"
parent="Ubertheme_Base::helpcenter" parent="Ubertheme_Base::helpcenter"
resource="Ubertheme_Base::settings" resource="Ubertheme_Base::settings"
action="adminhtml/system_config/edit/section/ubertheme_base"/> action="adminhtml/system_config/edit/section/ubertheme_base" />
<add id="Ubertheme_Base::support" <add id="Ubertheme_Base::support"
sortOrder="2" sortOrder="2"
title="Ubertheme Help Center" module="Ubertheme_Base" title="Ubertheme Help Center" module="Ubertheme_Base"
parent="Ubertheme_Base::helpcenter" parent="Ubertheme_Base::helpcenter"
resource="Ubertheme_Base::settings" resource="Ubertheme_Base::settings"
action="adminhtml/system_config/edit/section/ubertheme_base"/> action="adminhtml/system_config/edit/section/ubertheme_base" />
<add id="Ubertheme_Base::settings" <add id="Ubertheme_Base::settings"
sortOrder="3" sortOrder="3"
title="Extensions Version" module="Ubertheme_Base" title="Extensions Version" module="Ubertheme_Base"
parent="Ubertheme_Base::helpcenter" parent="Ubertheme_Base::helpcenter"
resource="Ubertheme_Base::settings" resource="Ubertheme_Base::settings"
action="adminhtml/system_config/edit/section/ubertheme_base"/> action="adminhtml/system_config/edit/section/ubertheme_base" />
<add id="Ubertheme_Base::marketplace" <add id="Ubertheme_Base::marketplace"
sortOrder="4" sortOrder="4"
title="Ubertheme Marketplace" module="Ubertheme_Base" title="Ubertheme Marketplace" module="Ubertheme_Base"
parent="Ubertheme_Base::helpcenter" parent="Ubertheme_Base::helpcenter"
resource="Ubertheme_Base::settings" resource="Ubertheme_Base::settings"
action="adminhtml/system_config/edit/section/ubertheme_base"/> action="adminhtml/system_config/edit/section/ubertheme_base" />
</menu> </menu>
</config> </config>
<?xml version="1.0"?> <?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
<default> <default>
<csp> <csp>
<mode> <mode>
......
<?xml version="1.0"?> <?xml version="1.0"?>
<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp/etc/csp_whitelist.xsd">
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp/etc/csp_whitelist.xsd">
<policies> <policies>
<policy id="script-src"> <policy id="script-src">
<values> <values>
......
<?xml version="1.0"?> <?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
<type name="Magento\Catalog\Controller\Product\Compare\Add"> <type name="Magento\Catalog\Controller\Product\Compare\Add">
<plugin name="ub_ajax_add_to_compare_plugin" type="Ubertheme\Base\Plugin\Controller\Product\Compare\Add"/> <plugin name="ub_ajax_add_to_compare_plugin" type="Ubertheme\Base\Plugin\Controller\Product\Compare\Add"/>
</type> </type>
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
* Copyright © 2016 UberTheme. All rights reserved. * Copyright © 2016 UberTheme. All rights reserved.
*/ */
--> -->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd"> <module name="Ubertheme_Base" setup_version="1.0.3"/>
<module name="Ubertheme_Base" setup_version="1.0.2"/>
</config> </config>
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
* Copyright © 2016 Ubertheme. All rights reserved. * Copyright © 2016 Ubertheme. All rights reserved.
*/ */
--> -->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<head> <head>
<css src="jquery/colorpicker/css/colorpicker.css"/> <css src="jquery/colorpicker/css/colorpicker.css"/>
<css src="Ubertheme_Base::css/select2.min.css"/> <css src="Ubertheme_Base::css/select2.min.css"/>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</head> </head>
<body> <body>
<referenceContainer name="before.body.end"> <referenceContainer name="before.body.end">
<block class="Magento\Backend\Block\Template" template="Ubertheme_Base::init_menu.phtml"/> <block class="Magento\Backend\Block\Template" template="Ubertheme_Base::init_menu.phtml" />
</referenceContainer> </referenceContainer>
</body> </body>
</page> </page>
\ No newline at end of file
<?php
?>
<script type="text/javascript"> <script type="text/javascript">
requirejs(['jquery'], function ($) { requirejs([ 'jquery' ], function ($) {
$(document).ready(function () { $(document).ready(function() {
//update URLs for help center menu items //update URLs for help center menu items
$('.item-helpcenter .item-docs a').attr('href', 'https://www.ubertheme.com/docs').attr('target', '_blank'); $('.item-helpcenter .item-docs a').attr('href', 'https://www.ubertheme.com/docs').attr('target', '_blank');
$('.item-helpcenter .item-support a').attr('href', 'https://www.ubertheme.com/ask-question').attr('target', '_blank'); $('.item-helpcenter .item-support a').attr('href', 'https://www.ubertheme.com/ask-question').attr('target', '_blank');
......
...@@ -8,18 +8,15 @@ ...@@ -8,18 +8,15 @@
background: url(../images/ub_32x32.png) no-repeat; background: url(../images/ub_32x32.png) no-repeat;
opacity: .5; opacity: .5;
} }
.admin__menu #menu-ubertheme-base-menu.level-0._active._show a:before, .admin__menu #menu-ubertheme-base-menu.level-0._active._show a:before,
.admin__menu #menu-ubertheme-base-menu.level-0 > a:hover:before { .admin__menu #menu-ubertheme-base-menu.level-0 > a:hover:before {
opacity: 1; opacity: 1;
} }
.module-name { .module-name {
text-align: left; text-align: left;
font-size: 14px !important; font-size: 14px !important;
margin: 0px 0px 5px 0px; margin: 0px 0px 5px 0px;
} }
.module-desc { .module-desc {
font-weight: normal; font-weight: normal;
font-size: 11px; font-size: 11px;
...@@ -27,8 +24,7 @@ ...@@ -27,8 +24,7 @@
display: block; display: block;
float: left; float: left;
} }
#menu-ubertheme-base-menu .submenu-title{
#menu-ubertheme-base-menu .submenu-title {
color: #ffffff; color: #ffffff;
display: block; display: block;
font-size: 2.2rem; font-size: 2.2rem;
...@@ -46,7 +42,6 @@ ...@@ -46,7 +42,6 @@
margin-top: -2px; margin-top: -2px;
width: 137px; width: 137px;
} }
#menu-ubertheme-base-menu .action-close._close{
#menu-ubertheme-base-menu .action-close._close {
top: 0px; top: 0px;
} }
\ No newline at end of file
...@@ -8,9 +8,6 @@ ...@@ -8,9 +8,6 @@
</g> </g>
<g> <g>
<title>Logo</title> <title>Logo</title>
<text stroke="#000" <text stroke="#000" transform="matrix(3.772156299176288,0,0,3.772156299176288,-368.3187638529288,-238.00526829410703) " font-weight="bold" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="24" id="svg_1" y="84.833993" x="97.648033" stroke-width="0" fill="#fff">UBERTHEME</text>
transform="matrix(3.772156299176288,0,0,3.772156299176288,-368.3187638529288,-238.00526829410703) "
font-weight="bold" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif"
font-size="24" id="svg_1" y="84.833993" x="97.648033" stroke-width="0" fill="#fff">UBERTHEME</text>
</g> </g>
</svg> </svg>
\ No newline at end of file
...@@ -21,32 +21,26 @@ ...@@ -21,32 +21,26 @@
// The inner file should be wrapped (by `banner.start.js`) in a function that // The inner file should be wrapped (by `banner.start.js`) in a function that
// returns the AMD loader references. // returns the AMD loader references.
var S2 = var S2 =
(function () { (function () {
// Restore the Select2 AMD loader so it can be used // Restore the Select2 AMD loader so it can be used
// Needed mostly in the language files, where the loader is not inserted // Needed mostly in the language files, where the loader is not inserted
if (jQuery && jQuery.fn && jQuery.fn.select2 && jQuery.fn.select2.amd) { if (jQuery && jQuery.fn && jQuery.fn.select2 && jQuery.fn.select2.amd) {
var S2 = jQuery.fn.select2.amd; var S2 = jQuery.fn.select2.amd;
} }
var S2; var S2;(function () { if (!S2 || !S2.requirejs) {
(function () { if (!S2) { S2 = {}; } else { require = S2; }
if (!S2 || !S2.requirejs) { /**
if (!S2) {
S2 = {};
} else {
require = S2;
}
/**
* @license almond 0.3.1 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved. * @license almond 0.3.1 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license. * Available via the MIT or new BSD license.
* see: http://github.com/jrburke/almond for details * see: http://github.com/jrburke/almond for details
*/ */
//Going sloppy to avoid 'use strict' string cost, but strict practices should //Going sloppy to avoid 'use strict' string cost, but strict practices should
//be followed. //be followed.
/*jslint sloppy: true */ /*jslint sloppy: true */
/*global setTimeout: false */ /*global setTimeout: false */
var requirejs, require, define; var requirejs, require, define;
(function (undef) { (function (undef) {
var main, req, makeMap, handlers, var main, req, makeMap, handlers,
defined = {}, defined = {},
waiting = {}, waiting = {},
...@@ -402,8 +396,7 @@ ...@@ -402,8 +396,7 @@
} }
//Support require(['a']) //Support require(['a'])
callback = callback || function () { callback = callback || function () {};
};
//If relName is a function, it is an errback handler, //If relName is a function, it is an errback handler,
//so remove it. //so remove it.
...@@ -465,18 +458,15 @@ ...@@ -465,18 +458,15 @@
define.amd = { define.amd = {
jQuery: true jQuery: true
}; };
}()); }());
S2.requirejs = requirejs; S2.requirejs = requirejs;S2.require = require;S2.define = define;
S2.require = require; }
S2.define = define; }());
} S2.define("almond", function(){});
}());
S2.define("almond", function () {
});
/* global jQuery:false, $:false */ /* global jQuery:false, $:false */
S2.define('jquery', [], function () { S2.define('jquery',[],function () {
var _$ = jQuery || $; var _$ = jQuery || $;
if (_$ == null && console && console.error) { if (_$ == null && console && console.error) {
...@@ -488,17 +478,17 @@ ...@@ -488,17 +478,17 @@
} }
return _$; return _$;
}); });
S2.define('select2/utils', [ S2.define('select2/utils',[
'jquery' 'jquery'
], function ($) { ], function ($) {
var Utils = {}; var Utils = {};
Utils.Extend = function (ChildClass, SuperClass) { Utils.Extend = function (ChildClass, SuperClass) {
var __hasProp = {}.hasOwnProperty; var __hasProp = {}.hasOwnProperty;
function BaseConstructor() { function BaseConstructor () {
this.constructor = ChildClass; this.constructor = ChildClass;
} }
...@@ -515,7 +505,7 @@ ...@@ -515,7 +505,7 @@
return ChildClass; return ChildClass;
}; };
function getMethods(theClass) { function getMethods (theClass) {
var proto = theClass.prototype; var proto = theClass.prototype;
var methods = []; var methods = [];
...@@ -541,7 +531,7 @@ ...@@ -541,7 +531,7 @@
var decoratedMethods = getMethods(DecoratorClass); var decoratedMethods = getMethods(DecoratorClass);
var superMethods = getMethods(SuperClass); var superMethods = getMethods(SuperClass);
function DecoratedClass() { function DecoratedClass () {
var unshift = Array.prototype.unshift; var unshift = Array.prototype.unshift;
var argCount = DecoratorClass.prototype.constructor.length; var argCount = DecoratorClass.prototype.constructor.length;
...@@ -559,7 +549,7 @@ ...@@ -559,7 +549,7 @@
DecoratorClass.displayName = SuperClass.displayName; DecoratorClass.displayName = SuperClass.displayName;
function ctr() { function ctr () {
this.constructor = DecoratedClass; this.constructor = DecoratedClass;
} }
...@@ -574,8 +564,7 @@ ...@@ -574,8 +564,7 @@
var calledMethod = function (methodName) { var calledMethod = function (methodName) {
// Stub out the original method if it's not decorating an actual method // Stub out the original method if it's not decorating an actual method
var originalMethod = function () { var originalMethod = function () {};
};
if (methodName in DecoratedClass.prototype) { if (methodName in DecoratedClass.prototype) {
originalMethod = DecoratedClass.prototype[methodName]; originalMethod = DecoratedClass.prototype[methodName];
...@@ -766,13 +755,13 @@ ...@@ -766,13 +755,13 @@
}; };
return Utils; return Utils;
}); });
S2.define('select2/results', [ S2.define('select2/results',[
'jquery', 'jquery',
'./utils' './utils'
], function ($, Utils) { ], function ($, Utils) {
function Results($element, options, dataAdapter) { function Results ($element, options, dataAdapter) {
this.$element = $element; this.$element = $element;
this.data = dataAdapter; this.data = dataAdapter;
this.options = options; this.options = options;
...@@ -1290,9 +1279,11 @@ ...@@ -1290,9 +1279,11 @@
}; };
return Results; return Results;
}); });
S2.define('select2/keys',[
S2.define('select2/keys', [], function () { ], function () {
var KEYS = { var KEYS = {
BACKSPACE: 8, BACKSPACE: 8,
TAB: 9, TAB: 9,
...@@ -1314,14 +1305,14 @@ ...@@ -1314,14 +1305,14 @@
}; };
return KEYS; return KEYS;
}); });
S2.define('select2/selection/base', [ S2.define('select2/selection/base',[
'jquery', 'jquery',
'../utils', '../utils',
'../keys' '../keys'
], function ($, Utils, KEYS) { ], function ($, Utils, KEYS) {
function BaseSelection($element, options) { function BaseSelection ($element, options) {
this.$element = $element; this.$element = $element;
this.options = options; this.options = options;
...@@ -1473,15 +1464,15 @@ ...@@ -1473,15 +1464,15 @@
}; };
return BaseSelection; return BaseSelection;
}); });
S2.define('select2/selection/single', [ S2.define('select2/selection/single',[
'jquery', 'jquery',
'./base', './base',
'../utils', '../utils',
'../keys' '../keys'
], function ($, BaseSelection, Utils, KEYS) { ], function ($, BaseSelection, Utils, KEYS) {
function SingleSelection() { function SingleSelection () {
SingleSelection.__super__.constructor.apply(this, arguments); SingleSelection.__super__.constructor.apply(this, arguments);
} }
...@@ -1573,14 +1564,14 @@ ...@@ -1573,14 +1564,14 @@
}; };
return SingleSelection; return SingleSelection;
}); });
S2.define('select2/selection/multiple', [ S2.define('select2/selection/multiple',[
'jquery', 'jquery',
'./base', './base',
'../utils' '../utils'
], function ($, BaseSelection, Utils) { ], function ($, BaseSelection, Utils) {
function MultipleSelection($element, options) { function MultipleSelection ($element, options) {
MultipleSelection.__super__.constructor.apply(this, arguments); MultipleSelection.__super__.constructor.apply(this, arguments);
} }
...@@ -1683,12 +1674,12 @@ ...@@ -1683,12 +1674,12 @@
}; };
return MultipleSelection; return MultipleSelection;
}); });
S2.define('select2/selection/placeholder', [ S2.define('select2/selection/placeholder',[
'../utils' '../utils'
], function (Utils) { ], function (Utils) {
function Placeholder(decorated, $element, options) { function Placeholder (decorated, $element, options) {
this.placeholder = this.normalizePlaceholder(options.get('placeholder')); this.placeholder = this.normalizePlaceholder(options.get('placeholder'));
decorated.call(this, $element, options); decorated.call(this, $element, options);
...@@ -1733,14 +1724,13 @@ ...@@ -1733,14 +1724,13 @@
}; };
return Placeholder; return Placeholder;
}); });
S2.define('select2/selection/allowClear', [ S2.define('select2/selection/allowClear',[
'jquery', 'jquery',
'../keys' '../keys'
], function ($, KEYS) { ], function ($, KEYS) {
function AllowClear() { function AllowClear () { }
}
AllowClear.prototype.bind = function (decorated, container, $container) { AllowClear.prototype.bind = function (decorated, container, $container) {
var self = this; var self = this;
...@@ -1832,14 +1822,14 @@ ...@@ -1832,14 +1822,14 @@
}; };
return AllowClear; return AllowClear;
}); });
S2.define('select2/selection/search', [ S2.define('select2/selection/search',[
'jquery', 'jquery',
'../utils', '../utils',
'../keys' '../keys'
], function ($, Utils, KEYS) { ], function ($, Utils, KEYS) {
function Search(decorated, $element, options) { function Search (decorated, $element, options) {
decorated.call(this, $element, options); decorated.call(this, $element, options);
} }
...@@ -2055,13 +2045,12 @@ ...@@ -2055,13 +2045,12 @@
}; };
return Search; return Search;
}); });
S2.define('select2/selection/eventRelay', [ S2.define('select2/selection/eventRelay',[
'jquery' 'jquery'
], function ($) { ], function ($) {
function EventRelay() { function EventRelay () { }
}
EventRelay.prototype.bind = function (decorated, container, $container) { EventRelay.prototype.bind = function (decorated, container, $container) {
var self = this; var self = this;
...@@ -2102,13 +2091,13 @@ ...@@ -2102,13 +2091,13 @@
}; };
return EventRelay; return EventRelay;
}); });
S2.define('select2/translation', [ S2.define('select2/translation',[
'jquery', 'jquery',
'require' 'require'
], function ($, require) { ], function ($, require) {
function Translation(dict) { function Translation (dict) {
this.dict = dict || {}; this.dict = dict || {};
} }
...@@ -2139,9 +2128,11 @@ ...@@ -2139,9 +2128,11 @@
}; };
return Translation; return Translation;
}); });
S2.define('select2/diacritics',[
S2.define('select2/diacritics', [], function () { ], function () {
var diacritics = { var diacritics = {
'\u24B6': 'A', '\u24B6': 'A',
'\uFF21': 'A', '\uFF21': 'A',
...@@ -2985,12 +2976,12 @@ ...@@ -2985,12 +2976,12 @@
}; };
return diacritics; return diacritics;
}); });
S2.define('select2/data/base', [ S2.define('select2/data/base',[
'../utils' '../utils'
], function (Utils) { ], function (Utils) {
function BaseAdapter($element, options) { function BaseAdapter ($element, options) {
BaseAdapter.__super__.constructor.call(this); BaseAdapter.__super__.constructor.call(this);
} }
...@@ -3026,14 +3017,14 @@ ...@@ -3026,14 +3017,14 @@
}; };
return BaseAdapter; return BaseAdapter;
}); });
S2.define('select2/data/select', [ S2.define('select2/data/select',[
'./base', './base',
'../utils', '../utils',
'jquery' 'jquery'
], function (BaseAdapter, Utils, $) { ], function (BaseAdapter, Utils, $) {
function SelectAdapter($element, options) { function SelectAdapter ($element, options) {
this.$element = $element; this.$element = $element;
this.options = options; this.options = options;
...@@ -3312,14 +3303,14 @@ ...@@ -3312,14 +3303,14 @@
}; };
return SelectAdapter; return SelectAdapter;
}); });
S2.define('select2/data/array', [ S2.define('select2/data/array',[
'./select', './select',
'../utils', '../utils',
'jquery' 'jquery'
], function (SelectAdapter, Utils, $) { ], function (SelectAdapter, Utils, $) {
function ArrayAdapter($element, options) { function ArrayAdapter ($element, options) {
var data = options.get('data') || []; var data = options.get('data') || [];
ArrayAdapter.__super__.constructor.call(this, $element, options); ArrayAdapter.__super__.constructor.call(this, $element, options);
...@@ -3354,7 +3345,7 @@ ...@@ -3354,7 +3345,7 @@
var $options = []; var $options = [];
// Filter out all items except for the one passed in the argument // Filter out all items except for the one passed in the argument
function onlyItem(item) { function onlyItem (item) {
return function () { return function () {
return $(this).val() == item.id; return $(this).val() == item.id;
}; };
...@@ -3392,14 +3383,14 @@ ...@@ -3392,14 +3383,14 @@
}; };
return ArrayAdapter; return ArrayAdapter;
}); });
S2.define('select2/data/ajax', [ S2.define('select2/data/ajax',[
'./array', './array',
'../utils', '../utils',
'jquery' 'jquery'
], function (ArrayAdapter, Utils, $) { ], function (ArrayAdapter, Utils, $) {
function AjaxAdapter($element, options) { function AjaxAdapter ($element, options) {
this.ajaxOptions = this._applyDefaults(options.get('ajax')); this.ajaxOptions = this._applyDefaults(options.get('ajax'));
if (this.ajaxOptions.processResults != null) { if (this.ajaxOptions.processResults != null) {
...@@ -3460,7 +3451,7 @@ ...@@ -3460,7 +3451,7 @@
options.data = options.data.call(this.$element, params); options.data = options.data.call(this.$element, params);
} }
function request() { function request () {
var $request = options.transport(options, function (data) { var $request = options.transport(options, function (data) {
var results = self.processResults(data, params); var results = self.processResults(data, params);
...@@ -3502,12 +3493,12 @@ ...@@ -3502,12 +3493,12 @@
}; };
return AjaxAdapter; return AjaxAdapter;
}); });
S2.define('select2/data/tags', [ S2.define('select2/data/tags',[
'jquery' 'jquery'
], function ($) { ], function ($) {
function Tags(decorated, $element, options) { function Tags (decorated, $element, options) {
var tags = options.get('tags'); var tags = options.get('tags');
var createTag = options.get('createTag'); var createTag = options.get('createTag');
...@@ -3546,7 +3537,7 @@ ...@@ -3546,7 +3537,7 @@
return; return;
} }
function wrapper(obj, child) { function wrapper (obj, child) {
var data = obj.results; var data = obj.results;
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
...@@ -3628,12 +3619,12 @@ ...@@ -3628,12 +3619,12 @@
}; };
return Tags; return Tags;
}); });
S2.define('select2/data/tokenizer', [ S2.define('select2/data/tokenizer',[
'jquery' 'jquery'
], function ($) { ], function ($) {
function Tokenizer(decorated, $element, options) { function Tokenizer (decorated, $element, options) {
var tokenizer = options.get('tokenizer'); var tokenizer = options.get('tokenizer');
if (tokenizer !== undefined) { if (tokenizer !== undefined) {
...@@ -3653,7 +3644,7 @@ ...@@ -3653,7 +3644,7 @@
Tokenizer.prototype.query = function (decorated, params, callback) { Tokenizer.prototype.query = function (decorated, params, callback) {
var self = this; var self = this;
function createAndSelect(data) { function createAndSelect (data) {
// Normalize the data object so we can use it for checks // Normalize the data object so we can use it for checks
var item = self._normalizeItem(data); var item = self._normalizeItem(data);
...@@ -3676,7 +3667,7 @@ ...@@ -3676,7 +3667,7 @@
select(item); select(item);
} }
function select(data) { function select (data) {
self.trigger('select', { self.trigger('select', {
data: data data: data
}); });
...@@ -3745,10 +3736,12 @@ ...@@ -3745,10 +3736,12 @@
}; };
return Tokenizer; return Tokenizer;
}); });
S2.define('select2/data/minimumInputLength',[
S2.define('select2/data/minimumInputLength', [], function () { ], function () {
function MinimumInputLength(decorated, $e, options) { function MinimumInputLength (decorated, $e, options) {
this.minimumInputLength = options.get('minimumInputLength'); this.minimumInputLength = options.get('minimumInputLength');
decorated.call(this, $e, options); decorated.call(this, $e, options);
...@@ -3774,10 +3767,12 @@ ...@@ -3774,10 +3767,12 @@
}; };
return MinimumInputLength; return MinimumInputLength;
}); });
S2.define('select2/data/maximumInputLength', [], function () { S2.define('select2/data/maximumInputLength',[
function MaximumInputLength(decorated, $e, options) {
], function () {
function MaximumInputLength (decorated, $e, options) {
this.maximumInputLength = options.get('maximumInputLength'); this.maximumInputLength = options.get('maximumInputLength');
decorated.call(this, $e, options); decorated.call(this, $e, options);
...@@ -3804,10 +3799,12 @@ ...@@ -3804,10 +3799,12 @@
}; };
return MaximumInputLength; return MaximumInputLength;
}); });
S2.define('select2/data/maximumSelectionLength',[
S2.define('select2/data/maximumSelectionLength', [], function () { ], function (){
function MaximumSelectionLength(decorated, $e, options) { function MaximumSelectionLength (decorated, $e, options) {
this.maximumSelectionLength = options.get('maximumSelectionLength'); this.maximumSelectionLength = options.get('maximumSelectionLength');
decorated.call(this, $e, options); decorated.call(this, $e, options);
...@@ -3834,13 +3831,13 @@ ...@@ -3834,13 +3831,13 @@
}; };
return MaximumSelectionLength; return MaximumSelectionLength;
}); });
S2.define('select2/dropdown', [ S2.define('select2/dropdown',[
'jquery', 'jquery',
'./utils' './utils'
], function ($, Utils) { ], function ($, Utils) {
function Dropdown($element, options) { function Dropdown ($element, options) {
this.$element = $element; this.$element = $element;
this.options = options; this.options = options;
...@@ -3877,14 +3874,13 @@ ...@@ -3877,14 +3874,13 @@
}; };
return Dropdown; return Dropdown;
}); });
S2.define('select2/dropdown/search', [ S2.define('select2/dropdown/search',[
'jquery', 'jquery',
'../utils' '../utils'
], function ($, Utils) { ], function ($, Utils) {
function Search() { function Search () { }
}
Search.prototype.render = function (decorated) { Search.prototype.render = function (decorated) {
var $rendered = decorated.call(this); var $rendered = decorated.call(this);
...@@ -3980,10 +3976,12 @@ ...@@ -3980,10 +3976,12 @@
}; };
return Search; return Search;
}); });
S2.define('select2/dropdown/hidePlaceholder',[
S2.define('select2/dropdown/hidePlaceholder', [], function () { ], function () {
function HidePlaceholder(decorated, $element, options, dataAdapter) { function HidePlaceholder (decorated, $element, options, dataAdapter) {
this.placeholder = this.normalizePlaceholder(options.get('placeholder')); this.placeholder = this.normalizePlaceholder(options.get('placeholder'));
decorated.call(this, $element, options, dataAdapter); decorated.call(this, $element, options, dataAdapter);
...@@ -4021,12 +4019,12 @@ ...@@ -4021,12 +4019,12 @@
}; };
return HidePlaceholder; return HidePlaceholder;
}); });
S2.define('select2/dropdown/infiniteScroll', [ S2.define('select2/dropdown/infiniteScroll',[
'jquery' 'jquery'
], function ($) { ], function ($) {
function InfiniteScroll(decorated, $element, options, dataAdapter) { function InfiniteScroll (decorated, $element, options, dataAdapter) {
this.lastParams = {}; this.lastParams = {};
decorated.call(this, $element, options, dataAdapter); decorated.call(this, $element, options, dataAdapter);
...@@ -4111,13 +4109,13 @@ ...@@ -4111,13 +4109,13 @@
}; };
return InfiniteScroll; return InfiniteScroll;
}); });
S2.define('select2/dropdown/attachBody', [ S2.define('select2/dropdown/attachBody',[
'jquery', 'jquery',
'../utils' '../utils'
], function ($, Utils) { ], function ($, Utils) {
function AttachBody(decorated, $element, options) { function AttachBody (decorated, $element, options) {
this.$dropdownParent = options.get('dropdownParent') || $(document.body); this.$dropdownParent = options.get('dropdownParent') || $(document.body);
decorated.call(this, $element, options); decorated.call(this, $element, options);
...@@ -4334,10 +4332,12 @@ ...@@ -4334,10 +4332,12 @@
}; };
return AttachBody; return AttachBody;
}); });
S2.define('select2/dropdown/minimumResultsForSearch',[
S2.define('select2/dropdown/minimumResultsForSearch', [], function () { ], function () {
function countResults(data) { function countResults (data) {
var count = 0; var count = 0;
for (var d = 0; d < data.length; d++) { for (var d = 0; d < data.length; d++) {
...@@ -4353,7 +4353,7 @@ ...@@ -4353,7 +4353,7 @@
return count; return count;
} }
function MinimumResultsForSearch(decorated, $element, options, dataAdapter) { function MinimumResultsForSearch (decorated, $element, options, dataAdapter) {
this.minimumResultsForSearch = options.get('minimumResultsForSearch'); this.minimumResultsForSearch = options.get('minimumResultsForSearch');
if (this.minimumResultsForSearch < 0) { if (this.minimumResultsForSearch < 0) {
...@@ -4372,11 +4372,12 @@ ...@@ -4372,11 +4372,12 @@
}; };
return MinimumResultsForSearch; return MinimumResultsForSearch;
}); });
S2.define('select2/dropdown/selectOnClose', [], function () { S2.define('select2/dropdown/selectOnClose',[
function SelectOnClose() {
} ], function () {
function SelectOnClose () { }
SelectOnClose.prototype.bind = function (decorated, container, $container) { SelectOnClose.prototype.bind = function (decorated, container, $container) {
var self = this; var self = this;
...@@ -4422,11 +4423,12 @@ ...@@ -4422,11 +4423,12 @@
}; };
return SelectOnClose; return SelectOnClose;
}); });
S2.define('select2/dropdown/closeOnSelect', [], function () { S2.define('select2/dropdown/closeOnSelect',[
function CloseOnSelect() {
} ], function () {
function CloseOnSelect () { }
CloseOnSelect.prototype.bind = function (decorated, container, $container) { CloseOnSelect.prototype.bind = function (decorated, container, $container) {
var self = this; var self = this;
...@@ -4457,9 +4459,9 @@ ...@@ -4457,9 +4459,9 @@
}; };
return CloseOnSelect; return CloseOnSelect;
}); });
S2.define('select2/i18n/en', [], function () { S2.define('select2/i18n/en',[],function () {
// English // English
return { return {
errorLoading: function () { errorLoading: function () {
...@@ -4502,9 +4504,9 @@ ...@@ -4502,9 +4504,9 @@
return 'Searching…'; return 'Searching…';
} }
}; };
}); });
S2.define('select2/defaults', [ S2.define('select2/defaults',[
'jquery', 'jquery',
'require', 'require',
...@@ -4540,17 +4542,23 @@ ...@@ -4540,17 +4542,23 @@
'./dropdown/closeOnSelect', './dropdown/closeOnSelect',
'./i18n/en' './i18n/en'
], function ($, require, ], function ($, require,
ResultsList, ResultsList,
SingleSelection, MultipleSelection, Placeholder, AllowClear, SingleSelection, MultipleSelection, Placeholder, AllowClear,
SelectionSearch, EventRelay, SelectionSearch, EventRelay,
Utils, Translation, DIACRITICS, Utils, Translation, DIACRITICS,
SelectData, ArrayData, AjaxData, Tags, Tokenizer, SelectData, ArrayData, AjaxData, Tags, Tokenizer,
MinimumInputLength, MaximumInputLength, MaximumSelectionLength, MinimumInputLength, MaximumInputLength, MaximumSelectionLength,
Dropdown, DropdownSearch, HidePlaceholder, InfiniteScroll, Dropdown, DropdownSearch, HidePlaceholder, InfiniteScroll,
AttachBody, MinimumResultsForSearch, SelectOnClose, CloseOnSelect, AttachBody, MinimumResultsForSearch, SelectOnClose, CloseOnSelect,
EnglishTranslation) { EnglishTranslation) {
function Defaults() { function Defaults () {
this.reset(); this.reset();
} }
...@@ -4797,7 +4805,7 @@ ...@@ -4797,7 +4805,7 @@
}; };
Defaults.prototype.reset = function () { Defaults.prototype.reset = function () {
function stripDiacritics(text) { function stripDiacritics (text) {
// Used 'uni range + named function' from http://jsperf.com/diacritics/18 // Used 'uni range + named function' from http://jsperf.com/diacritics/18
function match(a) { function match(a) {
return DIACRITICS[a] || a; return DIACRITICS[a] || a;
...@@ -4806,7 +4814,7 @@ ...@@ -4806,7 +4814,7 @@
return text.replace(/[^\u0000-\u007E]/g, match); return text.replace(/[^\u0000-\u007E]/g, match);
} }
function matcher(params, data) { function matcher (params, data) {
// Always return the object if there is nothing to compare // Always return the object if there is nothing to compare
if ($.trim(params.term) === '') { if ($.trim(params.term) === '') {
return data; return data;
...@@ -4893,15 +4901,15 @@ ...@@ -4893,15 +4901,15 @@
var defaults = new Defaults(); var defaults = new Defaults();
return defaults; return defaults;
}); });
S2.define('select2/options', [ S2.define('select2/options',[
'require', 'require',
'jquery', 'jquery',
'./defaults', './defaults',
'./utils' './utils'
], function (require, $, Defaults, Utils) { ], function (require, $, Defaults, Utils) {
function Options(options, $element) { function Options (options, $element) {
this.options = options; this.options = options;
if ($element != null) { if ($element != null) {
...@@ -5016,14 +5024,14 @@ ...@@ -5016,14 +5024,14 @@
}; };
return Options; return Options;
}); });
S2.define('select2/core', [ S2.define('select2/core',[
'jquery', 'jquery',
'./options', './options',
'./utils', './utils',
'./keys' './keys'
], function ($, Options, Utils, KEYS) { ], function ($, Options, Utils, KEYS) {
var Select2 = function ($element, options) { var Select2 = function ($element, options) {
if ($element.data('select2') != null) { if ($element.data('select2') != null) {
$element.data('select2').destroy(); $element.data('select2').destroy();
...@@ -5161,7 +5169,7 @@ ...@@ -5161,7 +5169,7 @@
if (method == 'style') { if (method == 'style') {
var style = $element.attr('style'); var style = $element.attr('style');
if (typeof (style) !== 'string') { if (typeof(style) !== 'string') {
return null; return null;
} }
...@@ -5629,12 +5637,12 @@ ...@@ -5629,12 +5637,12 @@
}; };
return Select2; return Select2;
}); });
S2.define('select2/compat/utils', [ S2.define('select2/compat/utils',[
'jquery' 'jquery'
], function ($) { ], function ($) {
function syncCssClasses($dest, $src, adapter) { function syncCssClasses ($dest, $src, adapter) {
var classes, replacements = [], adapted; var classes, replacements = [], adapted;
classes = $.trim($dest.attr('class')); classes = $.trim($dest.attr('class'));
...@@ -5673,19 +5681,18 @@ ...@@ -5673,19 +5681,18 @@
return { return {
syncCssClasses: syncCssClasses syncCssClasses: syncCssClasses
}; };
}); });
S2.define('select2/compat/containerCss', [ S2.define('select2/compat/containerCss',[
'jquery', 'jquery',
'./utils' './utils'
], function ($, CompatUtils) { ], function ($, CompatUtils) {
// No-op CSS adapter that discards all classes by default // No-op CSS adapter that discards all classes by default
function _containerAdapter(clazz) { function _containerAdapter (clazz) {
return null; return null;
} }
function ContainerCSS() { function ContainerCSS () { }
}
ContainerCSS.prototype.render = function (decorated) { ContainerCSS.prototype.render = function (decorated) {
var $container = decorated.call(this); var $container = decorated.call(this);
...@@ -5731,19 +5738,18 @@ ...@@ -5731,19 +5738,18 @@
}; };
return ContainerCSS; return ContainerCSS;
}); });
S2.define('select2/compat/dropdownCss', [ S2.define('select2/compat/dropdownCss',[
'jquery', 'jquery',
'./utils' './utils'
], function ($, CompatUtils) { ], function ($, CompatUtils) {
// No-op CSS adapter that discards all classes by default // No-op CSS adapter that discards all classes by default
function _dropdownAdapter(clazz) { function _dropdownAdapter (clazz) {
return null; return null;
} }
function DropdownCSS() { function DropdownCSS () { }
}
DropdownCSS.prototype.render = function (decorated) { DropdownCSS.prototype.render = function (decorated) {
var $dropdown = decorated.call(this); var $dropdown = decorated.call(this);
...@@ -5789,12 +5795,12 @@ ...@@ -5789,12 +5795,12 @@
}; };
return DropdownCSS; return DropdownCSS;
}); });
S2.define('select2/compat/initSelection', [ S2.define('select2/compat/initSelection',[
'jquery' 'jquery'
], function ($) { ], function ($) {
function InitSelection(decorated, $element, options) { function InitSelection (decorated, $element, options) {
if (options.get('debug') && window.console && console.warn) { if (options.get('debug') && window.console && console.warn) {
console.warn( console.warn(
'Select2: The `initSelection` option has been deprecated in favor' + 'Select2: The `initSelection` option has been deprecated in favor' +
...@@ -5832,12 +5838,12 @@ ...@@ -5832,12 +5838,12 @@
}; };
return InitSelection; return InitSelection;
}); });
S2.define('select2/compat/inputData', [ S2.define('select2/compat/inputData',[
'jquery' 'jquery'
], function ($) { ], function ($) {
function InputData(decorated, $element, options) { function InputData (decorated, $element, options) {
this._currentData = []; this._currentData = [];
this._valueSeparator = options.get('valueSeparator') || ','; this._valueSeparator = options.get('valueSeparator') || ',';
...@@ -5855,7 +5861,7 @@ ...@@ -5855,7 +5861,7 @@
} }
InputData.prototype.current = function (_, callback) { InputData.prototype.current = function (_, callback) {
function getSelected(data, selectedIds) { function getSelected (data, selectedIds) {
var selected = []; var selected = [];
if (data.selected || $.inArray(data.id, selectedIds) !== -1) { if (data.selected || $.inArray(data.id, selectedIds) !== -1) {
...@@ -5960,13 +5966,13 @@ ...@@ -5960,13 +5966,13 @@
}; };
return InputData; return InputData;
}); });
S2.define('select2/compat/matcher', [ S2.define('select2/compat/matcher',[
'jquery' 'jquery'
], function ($) { ], function ($) {
function oldMatcher(matcher) { function oldMatcher (matcher) {
function wrappedMatcher(params, data) { function wrappedMatcher (params, data) {
var match = $.extend(true, {}, data); var match = $.extend(true, {}, data);
if (params.term == null || $.trim(params.term) === '') { if (params.term == null || $.trim(params.term) === '') {
...@@ -6003,10 +6009,12 @@ ...@@ -6003,10 +6009,12 @@
} }
return oldMatcher; return oldMatcher;
}); });
S2.define('select2/compat/query', [], function () { S2.define('select2/compat/query',[
function Query(decorated, $element, options) {
], function () {
function Query (decorated, $element, options) {
if (options.get('debug') && window.console && console.warn) { if (options.get('debug') && window.console && console.warn) {
console.warn( console.warn(
'Select2: The `query` option has been deprecated in favor of a ' + 'Select2: The `query` option has been deprecated in favor of a ' +
...@@ -6028,10 +6036,12 @@ ...@@ -6028,10 +6036,12 @@
}; };
return Query; return Query;
}); });
S2.define('select2/dropdown/attachContainer',[
S2.define('select2/dropdown/attachContainer', [], function () { ], function () {
function AttachContainer(decorated, $element, options) { function AttachContainer (decorated, $element, options) {
decorated.call(this, $element, options); decorated.call(this, $element, options);
} }
...@@ -6045,11 +6055,12 @@ ...@@ -6045,11 +6055,12 @@
}; };
return AttachContainer; return AttachContainer;
}); });
S2.define('select2/dropdown/stopPropagation', [], function () { S2.define('select2/dropdown/stopPropagation',[
function StopPropagation() {
} ], function () {
function StopPropagation () { }
StopPropagation.prototype.bind = function (decorated, container, $container) { StopPropagation.prototype.bind = function (decorated, container, $container) {
decorated.call(this, container, $container); decorated.call(this, container, $container);
...@@ -6083,11 +6094,12 @@ ...@@ -6083,11 +6094,12 @@
}; };
return StopPropagation; return StopPropagation;
}); });
S2.define('select2/selection/stopPropagation', [], function () { S2.define('select2/selection/stopPropagation',[
function StopPropagation() {
} ], function () {
function StopPropagation () { }
StopPropagation.prototype.bind = function (decorated, container, $container) { StopPropagation.prototype.bind = function (decorated, container, $container) {
decorated.call(this, container, $container); decorated.call(this, container, $container);
...@@ -6121,9 +6133,9 @@ ...@@ -6121,9 +6133,9 @@
}; };
return StopPropagation; return StopPropagation;
}); });
/*! /*!
* jQuery Mousewheel 3.1.13 * jQuery Mousewheel 3.1.13
* *
* Copyright jQuery Foundation and other contributors * Copyright jQuery Foundation and other contributors
...@@ -6131,10 +6143,10 @@ ...@@ -6131,10 +6143,10 @@
* http://jquery.org/license * http://jquery.org/license
*/ */
(function (factory) { (function (factory) {
if (typeof S2.define === 'function' && S2.define.amd) { if ( typeof S2.define === 'function' && S2.define.amd ) {
// AMD. Register as an anonymous module. // AMD. Register as an anonymous module.
S2.define('jquery-mousewheel', ['jquery'], factory); S2.define('jquery-mousewheel',['jquery'], factory);
} else if (typeof exports === 'object') { } else if (typeof exports === 'object') {
// Node/CommonJS style for Browserify // Node/CommonJS style for Browserify
module.exports = factory; module.exports = factory;
...@@ -6142,27 +6154,27 @@ ...@@ -6142,27 +6154,27 @@
// Browser globals // Browser globals
factory(jQuery); factory(jQuery);
} }
}(function ($) { }(function ($) {
var toFix = ['wheel', 'mousewheel', 'DOMMouseScroll', 'MozMousePixelScroll'], var toFix = ['wheel', 'mousewheel', 'DOMMouseScroll', 'MozMousePixelScroll'],
toBind = ('onwheel' in document || document.documentMode >= 9) ? toBind = ( 'onwheel' in document || document.documentMode >= 9 ) ?
['wheel'] : ['mousewheel', 'DomMouseScroll', 'MozMousePixelScroll'], ['wheel'] : ['mousewheel', 'DomMouseScroll', 'MozMousePixelScroll'],
slice = Array.prototype.slice, slice = Array.prototype.slice,
nullLowestDeltaTimeout, lowestDelta; nullLowestDeltaTimeout, lowestDelta;
if ($.event.fixHooks) { if ( $.event.fixHooks ) {
for (var i = toFix.length; i;) { for ( var i = toFix.length; i; ) {
$.event.fixHooks[toFix[--i]] = $.event.mouseHooks; $.event.fixHooks[ toFix[--i] ] = $.event.mouseHooks;
} }
} }
var special = $.event.special.mousewheel = { var special = $.event.special.mousewheel = {
version: '3.1.12', version: '3.1.12',
setup: function () { setup: function() {
if (this.addEventListener) { if ( this.addEventListener ) {
for (var i = toBind.length; i;) { for ( var i = toBind.length; i; ) {
this.addEventListener(toBind[--i], handler, false); this.addEventListener( toBind[--i], handler, false );
} }
} else { } else {
this.onmousewheel = handler; this.onmousewheel = handler;
...@@ -6172,10 +6184,10 @@ ...@@ -6172,10 +6184,10 @@
$.data(this, 'mousewheel-page-height', special.getPageHeight(this)); $.data(this, 'mousewheel-page-height', special.getPageHeight(this));
}, },
teardown: function () { teardown: function() {
if (this.removeEventListener) { if ( this.removeEventListener ) {
for (var i = toBind.length; i;) { for ( var i = toBind.length; i; ) {
this.removeEventListener(toBind[--i], handler, false); this.removeEventListener( toBind[--i], handler, false );
} }
} else { } else {
this.onmousewheel = null; this.onmousewheel = null;
...@@ -6185,7 +6197,7 @@ ...@@ -6185,7 +6197,7 @@
$.removeData(this, 'mousewheel-page-height'); $.removeData(this, 'mousewheel-page-height');
}, },
getLineHeight: function (elem) { getLineHeight: function(elem) {
var $elem = $(elem), var $elem = $(elem),
$parent = $elem['offsetParent' in $.fn ? 'offsetParent' : 'parent'](); $parent = $elem['offsetParent' in $.fn ? 'offsetParent' : 'parent']();
if (!$parent.length) { if (!$parent.length) {
...@@ -6194,7 +6206,7 @@ ...@@ -6194,7 +6206,7 @@
return parseInt($parent.css('fontSize'), 10) || parseInt($elem.css('fontSize'), 10) || 16; return parseInt($parent.css('fontSize'), 10) || parseInt($elem.css('fontSize'), 10) || 16;
}, },
getPageHeight: function (elem) { getPageHeight: function(elem) {
return $(elem).height(); return $(elem).height();
}, },
...@@ -6205,11 +6217,11 @@ ...@@ -6205,11 +6217,11 @@
}; };
$.fn.extend({ $.fn.extend({
mousewheel: function (fn) { mousewheel: function(fn) {
return fn ? this.bind('mousewheel', fn) : this.trigger('mousewheel'); return fn ? this.bind('mousewheel', fn) : this.trigger('mousewheel');
}, },
unmousewheel: function (fn) { unmousewheel: function(fn) {
return this.unbind('mousewheel', fn); return this.unbind('mousewheel', fn);
} }
}); });
...@@ -6228,21 +6240,13 @@ ...@@ -6228,21 +6240,13 @@
event.type = 'mousewheel'; event.type = 'mousewheel';
// Old school scrollwheel delta // Old school scrollwheel delta
if ('detail' in orgEvent) { if ( 'detail' in orgEvent ) { deltaY = orgEvent.detail * -1; }
deltaY = orgEvent.detail * -1; if ( 'wheelDelta' in orgEvent ) { deltaY = orgEvent.wheelDelta; }
} if ( 'wheelDeltaY' in orgEvent ) { deltaY = orgEvent.wheelDeltaY; }
if ('wheelDelta' in orgEvent) { if ( 'wheelDeltaX' in orgEvent ) { deltaX = orgEvent.wheelDeltaX * -1; }
deltaY = orgEvent.wheelDelta;
}
if ('wheelDeltaY' in orgEvent) {
deltaY = orgEvent.wheelDeltaY;
}
if ('wheelDeltaX' in orgEvent) {
deltaX = orgEvent.wheelDeltaX * -1;
}
// Firefox < 17 horizontal scrolling related to DOMMouseScroll event // Firefox < 17 horizontal scrolling related to DOMMouseScroll event
if ('axis' in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS) { if ( 'axis' in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
deltaX = deltaY * -1; deltaX = deltaY * -1;
deltaY = 0; deltaY = 0;
} }
...@@ -6251,33 +6255,29 @@ ...@@ -6251,33 +6255,29 @@
delta = deltaY === 0 ? deltaX : deltaY; delta = deltaY === 0 ? deltaX : deltaY;
// New school wheel delta (wheel event) // New school wheel delta (wheel event)
if ('deltaY' in orgEvent) { if ( 'deltaY' in orgEvent ) {
deltaY = orgEvent.deltaY * -1; deltaY = orgEvent.deltaY * -1;
delta = deltaY; delta = deltaY;
} }
if ('deltaX' in orgEvent) { if ( 'deltaX' in orgEvent ) {
deltaX = orgEvent.deltaX; deltaX = orgEvent.deltaX;
if (deltaY === 0) { if ( deltaY === 0 ) { delta = deltaX * -1; }
delta = deltaX * -1;
}
} }
// No change actually happened, no reason to go any further // No change actually happened, no reason to go any further
if (deltaY === 0 && deltaX === 0) { if ( deltaY === 0 && deltaX === 0 ) { return; }
return;
}
// Need to convert lines and pages to pixels if we aren't already in pixels // Need to convert lines and pages to pixels if we aren't already in pixels
// There are three delta modes: // There are three delta modes:
// * deltaMode 0 is by pixels, nothing to do // * deltaMode 0 is by pixels, nothing to do
// * deltaMode 1 is by lines // * deltaMode 1 is by lines
// * deltaMode 2 is by pages // * deltaMode 2 is by pages
if (orgEvent.deltaMode === 1) { if ( orgEvent.deltaMode === 1 ) {
var lineHeight = $.data(this, 'mousewheel-line-height'); var lineHeight = $.data(this, 'mousewheel-line-height');
delta *= lineHeight; delta *= lineHeight;
deltaY *= lineHeight; deltaY *= lineHeight;
deltaX *= lineHeight; deltaX *= lineHeight;
} else if (orgEvent.deltaMode === 2) { } else if ( orgEvent.deltaMode === 2 ) {
var pageHeight = $.data(this, 'mousewheel-page-height'); var pageHeight = $.data(this, 'mousewheel-page-height');
delta *= pageHeight; delta *= pageHeight;
deltaY *= pageHeight; deltaY *= pageHeight;
...@@ -6285,19 +6285,19 @@ ...@@ -6285,19 +6285,19 @@
} }
// Store lowest absolute delta to normalize the delta values // Store lowest absolute delta to normalize the delta values
absDelta = Math.max(Math.abs(deltaY), Math.abs(deltaX)); absDelta = Math.max( Math.abs(deltaY), Math.abs(deltaX) );
if (!lowestDelta || absDelta < lowestDelta) { if ( !lowestDelta || absDelta < lowestDelta ) {
lowestDelta = absDelta; lowestDelta = absDelta;
// Adjust older deltas if necessary // Adjust older deltas if necessary
if (shouldAdjustOldDeltas(orgEvent, absDelta)) { if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
lowestDelta /= 40; lowestDelta /= 40;
} }
} }
// Adjust older deltas if necessary // Adjust older deltas if necessary
if (shouldAdjustOldDeltas(orgEvent, absDelta)) { if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
// Divide all the things by 40! // Divide all the things by 40!
delta /= 40; delta /= 40;
deltaX /= 40; deltaX /= 40;
...@@ -6305,12 +6305,12 @@ ...@@ -6305,12 +6305,12 @@
} }
// Get a whole, normalized value for the deltas // Get a whole, normalized value for the deltas
delta = Math[delta >= 1 ? 'floor' : 'ceil'](delta / lowestDelta); delta = Math[ delta >= 1 ? 'floor' : 'ceil' ](delta / lowestDelta);
deltaX = Math[deltaX >= 1 ? 'floor' : 'ceil'](deltaX / lowestDelta); deltaX = Math[ deltaX >= 1 ? 'floor' : 'ceil' ](deltaX / lowestDelta);
deltaY = Math[deltaY >= 1 ? 'floor' : 'ceil'](deltaY / lowestDelta); deltaY = Math[ deltaY >= 1 ? 'floor' : 'ceil' ](deltaY / lowestDelta);
// Normalise offsetX and offsetY properties // Normalise offsetX and offsetY properties
if (special.settings.normalizeOffset && this.getBoundingClientRect) { if ( special.settings.normalizeOffset && this.getBoundingClientRect ) {
var boundingRect = this.getBoundingClientRect(); var boundingRect = this.getBoundingClientRect();
offsetX = event.clientX - boundingRect.left; offsetX = event.clientX - boundingRect.left;
offsetY = event.clientY - boundingRect.top; offsetY = event.clientY - boundingRect.top;
...@@ -6334,9 +6334,7 @@ ...@@ -6334,9 +6334,7 @@
// handle multiple device types that give different // handle multiple device types that give different
// a different lowestDelta // a different lowestDelta
// Ex: trackpad = 3 and mouse wheel = 120 // Ex: trackpad = 3 and mouse wheel = 120
if (nullLowestDeltaTimeout) { if (nullLowestDeltaTimeout) { clearTimeout(nullLowestDeltaTimeout); }
clearTimeout(nullLowestDeltaTimeout);
}
nullLowestDeltaTimeout = setTimeout(nullLowestDelta, 200); nullLowestDeltaTimeout = setTimeout(nullLowestDelta, 200);
return ($.event.dispatch || $.event.handle).apply(this, args); return ($.event.dispatch || $.event.handle).apply(this, args);
...@@ -6357,15 +6355,15 @@ ...@@ -6357,15 +6355,15 @@
return special.settings.adjustOldDeltas && orgEvent.type === 'mousewheel' && absDelta % 120 === 0; return special.settings.adjustOldDeltas && orgEvent.type === 'mousewheel' && absDelta % 120 === 0;
} }
})); }));
S2.define('jquery.select2', [ S2.define('jquery.select2',[
'jquery', 'jquery',
'jquery-mousewheel', 'jquery-mousewheel',
'./select2/core', './select2/core',
'./select2/defaults' './select2/defaults'
], function ($, _, Select2, Defaults) { ], function ($, _, Select2, Defaults) {
if ($.fn.select2 == null) { if ($.fn.select2 == null) {
// All methods that should return the element // All methods that should return the element
var thisMethods = ['open', 'close', 'destroy']; var thisMethods = ['open', 'close', 'destroy'];
...@@ -6415,14 +6413,14 @@ ...@@ -6415,14 +6413,14 @@
} }
return Select2; return Select2;
}); });
// Return the AMD loader configuration so it can be used outside of this file // Return the AMD loader configuration so it can be used outside of this file
return { return {
define: S2.define, define: S2.define,
require: S2.require require: S2.require
}; };
}()); }());
// Autoload the jQuery bindings // Autoload the jQuery bindings
// We know that all of the modules exist above this, so we're safe // We know that all of the modules exist above this, so we're safe
......
...@@ -18,7 +18,7 @@ define([ ...@@ -18,7 +18,7 @@ define([
/** /**
* Initialize widget * Initialize widget
*/ */
_create: function () { _create: function() {
var $self = this; var $self = this;
var $rowsContainer = $self.element.find(this.options.rowsContainer); var $rowsContainer = $self.element.find(this.options.rowsContainer);
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"> xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<head> <head>
<css src="Ubertheme_Base::css/font-awesome.min.css"/> <css rel="preload" src="Ubertheme_Base::css/font-awesome.min.css"/>
</head> </head>
<body> <body>
<referenceContainer name="after.body.start"> <referenceContainer name="after.body.start">
<block class="Magento\Backend\Block\Template" template="Ubertheme_Base::after_body_start.phtml"/> <block class="Magento\Backend\Block\Template" template="Ubertheme_Base::after_body_start.phtml" />
</referenceContainer> </referenceContainer>
<referenceContainer name="before.body.end"> <referenceContainer name="before.body.end">
<block class="Magento\Backend\Block\Template" template="Ubertheme_Base::before_body_end.phtml"/> <block class="Magento\Backend\Block\Template" template="Ubertheme_Base::before_body_end.phtml" />
</referenceContainer> </referenceContainer>
<referenceContainer name="root"> <referenceContainer name="root">
<block class="Ubertheme\Base\Block\Ajax\Compare" name="ub.ajax.compare" <block class="Ubertheme\Base\Block\Ajax\Compare" name="ub.ajax.compare"
......
<?php
?>
<!-- Some general js functions--> <!-- Some general js functions-->
<script type="text/javascript"> <script type="text/javascript">
require([ require([
...@@ -10,5 +12,5 @@ ...@@ -10,5 +12,5 @@
$('html').addClass(extraClass); $('html').addClass(extraClass);
}); });
</script> </script>
<!-- After body start content --> <!-- After body start content -->
<!-- <?php
/** /**
* Copyright © 2016 Ubertheme.com All rights reserved. * Copyright © 2016 Ubertheme.com All rights reserved.
*/ */
--> ?>
<?php /** @var \Ubertheme\Base\Block\Ajax\AddCart $block */ ?> <?php /** @var \Ubertheme\Base\Block\Ajax\AddCart $block */ ?>
...@@ -20,3 +20,4 @@ ...@@ -20,3 +20,4 @@
</script> </script>
<!-- <?php
/** /**
* Copyright © 2016 Ubertheme.com All rights reserved. * Copyright © 2016 Ubertheme.com All rights reserved.
*/ */
--> ?>
<?php <?php
/** @var \Ubertheme\Base\Block\Ajax\Compare $block */ /** @var \Ubertheme\Base\Block\Ajax\Compare $block */
...@@ -22,3 +22,4 @@ ...@@ -22,3 +22,4 @@
</script> </script>
<!-- <?php
/** /**
* Copyright © 2016 Ubertheme.com All rights reserved. * Copyright © 2016 Ubertheme.com All rights reserved.
*/ */
--> ?>
<?php <?php
/** @var \Ubertheme\Base\Block\Ajax\Wishlist $block */ /** @var \Ubertheme\Base\Block\Ajax\Wishlist $block */
...@@ -22,3 +22,4 @@ ...@@ -22,3 +22,4 @@
</script> </script>
<?php
?>
<!-- Before body end content --> <!-- Before body end content -->
<div id="ub-bg-overlay" class="ub-bg-overlay"></div> <div id="ub-bg-overlay" class="ub-bg-overlay"></div>
<!-- Start CountDown --> <!-- Start CountDown -->
<?php <?php
$id = rand() . time(); $id = rand().time();
$strEndDate = strtotime("2099-12-31 00:00:00"); $strEndDate = strtotime("2099-12-31 00:00:00");
$check = date('G:i:s', $strEndDate); $check = date('G:i:s', $strEndDate);
if ($check == "0:00:00") { if ($check == "0:00:00") {
...@@ -8,13 +8,15 @@ if ($check == "0:00:00") { ...@@ -8,13 +8,15 @@ if ($check == "0:00:00") {
} else { } else {
$endDate = date('m/d/Y G:i:s', $strEndDate); $endDate = date('m/d/Y G:i:s', $strEndDate);
} }
?> ?>
<div id="countdown-<?php echo $id; ?>" class="ub-countdown">
<div id="countdown-<?= $id; ?>" class="ub-countdown">
<ul> <ul>
<li class="days">%%D%% <span class="text"><?php echo __('Day'); ?></span></li> <li class="days">%%D%% <span class="text"><?= __('Day'); ?></span></li>
<li class="hours">%%H%% <span class="text"><?php echo __('Hours'); ?></span></li> <li class="hours">%%H%% <span class="text"><?= __('Hours'); ?></span></li>
<li class="minutes">%%M%% <span class="text"><?php echo __('Mins'); ?></span></li> <li class="minutes">%%M%% <span class="text"><?= __('Mins'); ?></span></li>
<li class="seconds">%%S%% <span class="text"><?php echo __('Secs'); ?></span></li> <li class="seconds">%%S%% <span class="text"><?= __('Secs'); ?></span></li>
</ul> </ul>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
......
video, iframe[data-src] { video, iframe[data-src] {
box-shadow: inset 0 0 0 1px #ccc; box-shadow: inset 0 0 0 1px #ccc;
} }
.container > p, .ui-content > p, #ajax > p { .container > p, .ui-content > p, #ajax > p {
text-align: center; text-align: center;
} }
.lazy-hidden { .lazy-hidden {
background: #eee url('loading.gif') no-repeat 50% 50%; background: #eee url('loading.gif') no-repeat 50% 50%;
} }
\ No newline at end of file
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
define([ define([
'jquery', 'jquery',
'mage/translate', 'mage/translate',
'jquery/ui', 'jquery-ui-modules/core',
'jquery-ui-modules/widget',
'Magento_Catalog/js/catalog-add-to-cart' 'Magento_Catalog/js/catalog-add-to-cart'
], function ($, $t) { ], function ($, $t) {
'use strict'; 'use strict';
...@@ -26,7 +27,7 @@ define([ ...@@ -26,7 +27,7 @@ define([
/** /**
* Initialize widget * Initialize widget
*/ */
_create: function () { _create: function() {
this.bindAjaxAddCart(); this.bindAjaxAddCart();
}, },
......
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
define([ define([
'jquery', 'jquery',
'mage/translate', 'mage/translate',
'jquery/ui' 'jquery-ui-modules/core',
'jquery-ui-modules/widget'
], function ($, $t) { ], function ($, $t) {
'use strict'; 'use strict';
...@@ -23,7 +24,7 @@ define([ ...@@ -23,7 +24,7 @@ define([
/** /**
* Initialize widget * Initialize widget
*/ */
_create: function () { _create: function() {
var self = this; var self = this;
if (self.options.ajaxCompareUrl.length) { if (self.options.ajaxCompareUrl.length) {
$('body').on('click', self.options.compareBtnSelector, function (e) { $('body').on('click', self.options.compareBtnSelector, function (e) {
......
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
define([ define([
'jquery', 'jquery',
'mage/translate', 'mage/translate',
'jquery/ui' 'jquery-ui-modules/core',
'jquery-ui-modules/widget'
], function ($, $t) { ], function ($, $t) {
'use strict'; 'use strict';
...@@ -26,13 +27,13 @@ define([ ...@@ -26,13 +27,13 @@ define([
/** /**
* Initialize widget * Initialize widget
*/ */
_create: function () { _create: function() {
var self = this; var self = this;
if (self.options.ajaxWishlistUrl.length) { if (self.options.ajaxWishlistUrl.length) {
$('body').on('click', self.options.wishlistBtnSelector, function (e) { $('body').on('click', self.options.wishlistBtnSelector, function (e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
if (self.options.customerId) { //has login if (self.options.customerId ) { //has login
var params = $(this).data('post').data; var params = $(this).data('post').data;
params['isAjaxWishlist'] = true; params['isAjaxWishlist'] = true;
params['form_key'] = $(self.options.formKeySelector).val(); params['form_key'] = $(self.options.formKeySelector).val();
......
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
define([ define([
'jquery', 'jquery',
'jquery/ui' 'jquery-ui-modules/core',
'jquery-ui-modules/widget'
], function ($) { ], function ($) {
'use strict'; 'use strict';
...@@ -26,7 +27,7 @@ define([ ...@@ -26,7 +27,7 @@ define([
/** /**
* Initialize widget * Initialize widget
*/ */
_create: function () { _create: function() {
var self = this; var self = this;
...@@ -61,7 +62,7 @@ define([ ...@@ -61,7 +62,7 @@ define([
return "<span class='number'>" + str + "</span>"; return "<span class='number'>" + str + "</span>";
} else if (self.options.displayStyle == 2) { } else if (self.options.displayStyle == 2) {
var number = str.split(""); var number = str.split("");
if (typeof (number[2]) == "undefined") { if (typeof(number[2]) == "undefined") {
return "<span class=\"number\"><span>" + number[0] + "</span><span>" + number[1] + "</span></span>"; return "<span class=\"number\"><span>" + number[0] + "</span><span>" + number[1] + "</span></span>";
} else { } else {
return "<span class=\"number\"><span>" + number[0] + "</span><span>" + number[1] + "</span><span>" + number[2] + "</span></span>"; return "<span class=\"number\"><span>" + number[0] + "</span><span>" + number[1] + "</span><span>" + number[2] + "</span></span>";
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
define([ define([
"jquery", "jquery",
"owlCarousel2" "owlCarousel2"
], function ($) { ], function($) {
'use strict'; 'use strict';
return function ($config) { return function ($config) {
...@@ -19,7 +19,7 @@ define([ ...@@ -19,7 +19,7 @@ define([
navText: ['&larr;', '&rarr;'], navText: ['&larr;', '&rarr;'],
responsiveClass: true, responsiveClass: true,
responsiveBaseElement: $element, responsiveBaseElement: $element,
responsive: { responsive:{
0: { 0: {
items: 1 items: 1
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment