Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<a name="1.2.1"></a>
# 1.2.1 (2016-09-28)
- add new setting **loadHtml2canvas**

<a name="1.2.0"></a>
# 1.2.0 (2016-06-28)

Expand All @@ -17,4 +21,4 @@
- **moved button html to property in settings.tpl**
- **added CSS file to main** CSS file now in bower main property.
- **published to npm** `npm install angular-send-feedback`.
- **ajaxURL optionally a function** ajaxURL property can be either a string or a function.
- **ajaxURL optionally a function** ajaxURL property can be either a string or a function.
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,12 @@ Sets border of the highlighted area.

`Default: 3`

### loadHtml2Canvas (Boolean)

By Setting this false the user will have to include html2canvas library your self, the setting html2canvasURL will be ignored

`Default: true`

### html2canvasURL (String)

The URL where the plugin can download html2canvas.js from.
Expand Down Expand Up @@ -218,4 +224,4 @@ Sets whether the user will be able to drag the feedback options modal or not

## //TODO List

* Pulling jQuery out into a more classical AngularJS Directive rather than just wrapping the jQuery plugin.
* Pulling jQuery out into a more classical AngularJS Directive rather than just wrapping the jQuery plugin.
31 changes: 16 additions & 15 deletions dist/angular-send-feedback.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/**
* Angular feedback directive similar to Google Feedback
* @version v1.2.0 - 2016-06-28 * @link https://github.com/jacobscarter/angular-feedback
* @author Jacob Carter <jacob@ieksolutions.com>
* @license MIT License, http://www.opensource.org/licenses/MIT
*/
angular.module('templates-angularsendfeedback', ['angularsendfeedback.html']);
angular.module("angularsendfeedback.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("angularsendfeedback.html",
"");
}]);
/**
* Angular feedback directive similar to Google Feedback
* @version v1.2.1 - 2016-12-01 * @link https://github.com/jacobscarter/angular-feedback
* @author Jacob Carter <jacob@ieksolutions.com>
* @license MIT License, http://www.opensource.org/licenses/MIT
*/
angular.module('templates-angularsendfeedback', ['angularsendfeedback.html']);

angular.module("angularsendfeedback.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("angularsendfeedback.html",
"");
}]);

angular.module('angular-send-feedback', ['templates-angularsendfeedback']);

angular.module('angular-send-feedback').directive('angularFeedback', [ function() {


Expand Down Expand Up @@ -48,6 +48,7 @@ angular.module('angular-send-feedback').directive('angularFeedback', [ function(
shadowBlur: 10,
lineJoin: 'bevel',
lineWidth: 3,
loadHtml2canvas: true,
html2canvasURL: 'html2canvas.js',
feedbackButton: '.feedback-btn',
showDescriptionModal: true,
Expand Down Expand Up @@ -77,7 +78,7 @@ angular.module('angular-send-feedback').directive('angularFeedback', [ function(
if(isFeedbackButtonNative) {
$(this).hide();
}
if (!_html2canvas) {
if(!settings.loadHtml2canvas) {
$.getScript(settings.html2canvasURL, function() {
_html2canvas = true;
});
Expand Down
Loading