Skip to content

Init slider after load all picture-blocks. #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
baymer wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Init slider after load all picture-blocks. #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b04b5cb
Init slider after load all picture-blocks.
Feb 3, 2015
f60caa9
Upgrade i-bem method toggleMod
Feb 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions blocks-common/i-bem/i-bem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,18 @@ this.BEM = $.inherit($.observable, /** @lends BEM.prototype */ {
* @param {String} modVal1 First modifier value
* @param {String} [modVal2] Second modifier value
* @param {Boolean} [condition] Condition
* @example
* // before: <div class='icon'>
* icon.toggleMod('size', 'big', 'small');
* // after: <div class='icon icon_size_big'>
* @example
* // before: <div class='icon'>
* icon.toggleMod('size', 'big', 'small', isNeedBig === false);
* // after: <div class='icon icon_size_small'>
* @example
* // before: <div class='icon icon_size_small'>
* icon.toggleMod('size', 'big', 'small');
* // after: <div class='icon icon_size_big'>
* @returns {BEM}
*/
toggleMod : function(elem, modName, modVal1, modVal2, condition) {
Expand All @@ -389,6 +401,7 @@ this.BEM = $.inherit($.observable, /** @lends BEM.prototype */ {
modName = elem;
elem = undefined;
}

if(typeof modVal2 == 'undefined') {
modVal2 = '';
} else if(typeof modVal2 == 'boolean') {
Expand All @@ -397,13 +410,15 @@ this.BEM = $.inherit($.observable, /** @lends BEM.prototype */ {
}

var modVal = this.getMod(elem, modName);
(modVal == modVal1 || modVal == modVal2) &&
this.setMod(
elem,
modName,
typeof condition === 'boolean'?
(condition? modVal1 : modVal2) :
this.hasMod(elem, modName, modVal1)? modVal2 : modVal1);

this.setMod(
elem,
modName,
// если есть condition, тогда не важно текущее значение
typeof condition === 'boolean' ? ( condition ? modVal1 : modVal2 )
// иначе, если текущее значение "modVal1", значит ставим значение "modVal2"
// и во всех остальных случаях "modVal1"
: ( modVal === modVal1 ) ? modVal2 : modVal1 );

return this;

Expand Down
7 changes: 6 additions & 1 deletion blocks-touch/b-slider/b-slider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,12 @@
_delayedInit: function() {

var slider = this,
images = slider.findBlocksInside('b-icon');
bIcons = slider.findBlocksInside('b-icon'),
icons = slider.findBlocksInside('icon'),
Copy link
Member

@Yeti-or Yeti-or Apr 6, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

а ничего что в bem-bl нет ни icon ни image ?

images = slider.findBlocksInside('image');

// объединяем все возможные блоки-картинки
images = images.concat(icons, bIcons);

// если внутри есть картинки (b-icon),
// то отложить инициализацию до момента их полной загрузки,
Expand Down