Skip to content
This repository was archived by the owner on Aug 15, 2022. It is now read-only.

PR from Cebeci for sandbox deployment #9632

Merged
koding-bot merged 3 commits into from
Nov 18, 2016
Merged

PR from Cebeci for sandbox deployment #9632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2785b99
ShowSaveDialog: fix button naming
gokmen Nov 18, 2016
aa9fe37
Popover: wrap with custom div for styling since it's removed from Portal
gokmen Nov 18, 2016
db53a23
Merge pull request #9631 from gokmen/master
Nov 18, 2016
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
6 changes: 4 additions & 2 deletions client/app/lib/components/common/popover.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ module.exports = class Popover extends React.Component

render: ->

<Portal {...@props} className={kd.utils.curry 'Popover', @props.className}>
<div className="Popover-Wrapper" ref='Popover'>{@props.children}</div>
<Portal {...@props}>
<div className={kd.utils.curry 'Popover', @props.className}>
<div className="Popover-Wrapper" ref='Popover'>{@props.children}</div>
</div>
</Portal>
2 changes: 1 addition & 1 deletion client/app/lib/components/profile/profilefetchermixin.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ React = require 'app/react'
helper = require './helper'
fetchAccount = require 'app/util/fetchAccount'

module.exports =
module.exports = ProfileFetcherMixin =


getInitialState: ->
Expand Down
8 changes: 5 additions & 3 deletions client/app/lib/util/showSaveDialog.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ module.exports = (container, callback = kd.noop, options = {}) ->
container : container
height : 'auto'
buttons :
SAVE :
save :
title : 'SAVE'
style : 'GenericButton primary'
callback : -> callback input, finderController, dialog
CANCEL :
cancel :
title : 'CANCEL'
style : 'GenericButton cancel'
callback : ->
finderController.stopAllWatchers()
Expand All @@ -38,7 +40,7 @@ module.exports = (container, callback = kd.noop, options = {}) ->
label : label
defaultValue : options.inputDefaultValue or ''
keydown : (event) ->
dialog.buttons.Save.click() if event.which is 13
dialog.buttons.save.click() if event.which is 13

dialog.on 'KDObjectWillBeDestroyed', ->
container.ace?.focus()
Expand Down