Skip to content

Commit

Permalink
Merge branch 'RB_1.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
Frances Berriman committed Aug 27, 2009
2 parents 9b0afdd + c181095 commit 4dd93fd
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
12 changes: 12 additions & 0 deletions src/widgets/carousel/carousel.js
Expand Up @@ -34,6 +34,18 @@
@param {Number} [opts.animDuration=0.2] Duration of animation in seconds.
@param {Function} [opts.animTween=glow.tweens.easeBoth()] A Glow tween function to animate scrolling.
@param {Number|String} [opts.step=1] Number of items to scroll by. When the string 'page' is passed in the carousel will be set to scroll by the number of viewable items.
@param {Function} [opts.onAddItem] Event shortcut.
See documentation below
@param {Function} [opts.onRemoveItem] Event shortcut.
See documentation below
@param {Function} [opts.onScroll] Event shortcut.
See documentation below
@param {Function} [opts.onAddItem] Event shortcut.
See documentation below
@param {Function} [opts.onAfterScroll] Event shortcut.
See documentation below
@param {Function} [opts.onItemClick] Event shortcut.
See documentation below
@param {Boolean} [opts.vertical=false] Used to create a vertical oriented carousel
@param {Number} [opts.size] Number of items the carousel displays at any one time
By default, the carousel will fill all available horizontal (or vertical) space.
Expand Down
10 changes: 8 additions & 2 deletions src/widgets/editor/editor.js
Expand Up @@ -54,6 +54,8 @@
@_param {String} [opts.toolset="basic"]
@param {String} [opts.theme="light"] Visual Theme
Currently supported themes are "dark" and "light".
@param {Function} [opts.onCommit] Event shortcut.
See documentation below
@_property {glow.dom.NodeList} element
@_property {glow.dom.NodeList} textarea
@_property {glow.widgets.Editor.Toolbar} toolbar
Expand All @@ -80,11 +82,12 @@

opts = this._opts = glow.lang.apply(
{
toolset: "basic"
toolset: "basic",
onCommit: null
},
opts
);
// interpolate context
// interpolate context
this.element = glow.dom.create('<div class="glowCSSVERSION-editor"><p class="glowCSSVERSION-hidden">{ENTER_MESSAGE}, <a href="#endOfEditor' + endOfEditorCounter() + '" tabindex="0">{SKIP_LINK_TEXT}</a></p><div class="editor-' + (opts.theme || "light") + '"><div class="editor-state"></div></div><p id="endOfEditor' + endOfEditorCounter() + '" class="glowCSSVERSION-hidden endOfEditorCounter" tabindex="0">{LEAVE_MESSAGE}</p></div>', {interpolate : editorLocaleModule});
this.textarea = textarea;
this.toolbar = new glow.widgets.Editor.Toolbar(this);
Expand All @@ -102,6 +105,9 @@
place.apply(this);
bindEditor.apply(this, []);
}
if (opts.onCommit){
events.addListener(this, "commit", opts.onCommit);
}
}

////
Expand Down

0 comments on commit 4dd93fd

Please sign in to comment.