Skip to content

U
Ubertheme Base
Commit d3994dc5 by Krzysztof Kuźniar
Options

Update module v1.0.3

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