Skip to content

Commit

Permalink
2.11.26
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitrii-fediuk committed Sep 7, 2017
1 parent 513920e commit ad353d9
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 21 deletions.
14 changes: 5 additions & 9 deletions Core/view/base/web/my/string.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,12 @@ define(['df-lodash', 'df-uniform', 'jquery'], function(_, uniform, $) {return {
* @returns {Number}
*/
hash: function(s) {
/** @type {Number} */
var result = 0;
if (s.length) {
/** @type {Number} */
var i;
/** @type {Number} */
var len;
/** @type {Number} */ var result = 0;
if (s) {
/** @type {Number} */ var i;
/** @type {Number} */ var len;
for (i = 0, len = s.length; i < len; i++) {
/** @type {Number} */
var chr = s.charCodeAt (i);
/** @type {Number} */ var chr = s.charCodeAt (i);
result = ((result << 5) - result) + chr;
result |= 0; // Convert to 32bit integer
}
Expand Down
8 changes: 3 additions & 5 deletions Framework/view/adminhtml/web/formElement/select2/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,11 @@ define(['df', 'jquery', 'Df_Core/Select2', 'domReady!'], function(df, $) {return
* внизу страницы.
*/
,dropdownCssClass: config.cssClass
// 2016-08-10
// Скрываем поле поиска: http://stackoverflow.com/a/17649822
// 2016-08-10 Скрываем поле поиска: http://stackoverflow.com/a/17649822
,minimumResultsForSearch: -1
});
if (config.value && config.value.length) {
// http://stackoverflow.com/a/30477163
$element.val(config.value).change();
if (config.value) {
$element.val(config.value).change(); // http://stackoverflow.com/a/30477163
}
// 2016-08-10
// http://stackoverflow.com/a/32692811
Expand Down
3 changes: 1 addition & 2 deletions Payment/view/frontend/web/mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,7 @@ return {
dfForm: function(selector) {
if (df.u(this._dfForm)) {
var result = $('form.' + this.domPrefix());
// 2016-08-17
// Если метод вызван до отрисовки шаблона формы, то форма будет отсутствовать.
// 2016-08-17 Если метод вызван до отрисовки шаблона формы, то форма будет отсутствовать.
if (result.length) {
this._dfForm = result;
}
Expand Down
5 changes: 1 addition & 4 deletions Ui/view/base/web/js/grid/columns/select.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,5 @@ return Column.extend ({
* @param {Object} record
* @returns {String}
*/
getLabel: function(record) {
var result = this._super(); /** @type {String} */
return result.length ? result : record[this.index];
}
getLabel: function(record) {return this._super() || record[this.index];}
});});
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mage2pro/core"
,"version": "2.11.25"
,"version": "2.11.26"
,"description": "Mage2.PRO core package."
,"type": "magento2-module"
,"homepage": "https://mage2.pro"
Expand Down

0 comments on commit ad353d9

Please sign in to comment.