Skip to content

Commit

Permalink
beta2
Browse files Browse the repository at this point in the history
  • Loading branch information
Chen Asraf committed Mar 6, 2016
1 parent e02ad3a commit 66f8eda
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Changelog
## 1.2.0
- Add qtip2 dependency for bower
- Added `qtip-show-effect` and `qtip-persistent` (see readme for information)
- Added `qtip-show-effect`, `qtip-hide-effect` and `qtip-persistent` (see readme for information)

## 1.1.2
- Fixed a `qtip-options` bug (thanks to [@marcmascort](https://github.com/marcmascort))
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ qTip 2 directive for AngularJS.
| qtip-adjust-x | [optional] [int] [default=0] | Position the qTip more to the left or right, relatively, in pixels. Use a negative value to move it left. |
| qtip-adjust-y | [optional] [int] [default=0] | Position the qTip more to the top or bottom, relatively, in pixels. Use a negative value to move it up. |
| qtip-show-effect | [optional] [boolean] [default=true] | If `false`, will disable animating the showing effect of qTip (this is useful when the dynamic positioning shows a flicker and animates the qTip from the side of the element or screen before positioning it correctly). |
| qtip-hide-effect | [optional] [boolean] [default=true] | If `false`, will disable animating the hiding effect of qTip (this is useful when the dynamic positioning shows a flicker and animates the qTip from the side of the element or screen before positioning it correctly). |
| qtip-modal-style | [optional] [object] [default={}] | Set inline style for the qTip. This should be a JS object that contains the JS-esque style properties (such as `maxHeight: '100vh'`) |
| qtip-tip-style | [optional] [object] [default={}] | Set inline style for the qTip's tip. This should be a JS object that contains the JS-esque style properties (such as `maxHeight: '100vh'`), and may also contain tip specific implementations (such as `mimic`, and `corner`). |
| qtip-class | [optional] [string] [default=''] | Classes to use for the qTip, you can use these to style the qTip easier with CSS. |
Expand Down
4 changes: 3 additions & 1 deletion ng-qtip2.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ NgQtip2 = ($timeout, $compile, $http, $templateCache) ->
qtipModalStyle: '&?'
qtipTipStyle: '&?'
qtipShowEffect: '&?'
qtipHideEffect: '&?'
qtipPersistent: '&?'
qtip: '@'
qtipTitle: '@'
Expand Down Expand Up @@ -47,10 +48,11 @@ NgQtip2 = ($timeout, $compile, $http, $templateCache) ->
adjust:
x: if scope.qtipAdjustX? then parseInt(scope.qtipAdjustX) else 0
y: if scope.qtipAdjustY? then parseInt(scope.qtipAdjustY) else 0
effect: scope.qtipShowEffect?() ? yes
show:
effect: scope.qtipShowEffect?() ? yes
event: scope.qtipEvent ? 'mouseover'
hide:
effect: scope.qtipHideEffect?() ? yes
fixed: if scope.qtipFixed?() then str2bool scope.qtipFixed else yes
delay: scope.qtipDelay ? 100
event: scope.qtipEventOut ? 'mouseout'
Expand Down
20 changes: 11 additions & 9 deletions ng-qtip2.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 66f8eda

Please sign in to comment.