diff --git a/angular-typeform.js b/angular-typeform.js index c9a6463..c142993 100644 --- a/angular-typeform.js +++ b/angular-typeform.js @@ -24,7 +24,7 @@ }); angular.module('angularTypeform') - .controller('ControllerEmbed', ['$scope', 'typeformConfig', '$timeout', function embedController($scope, typeformConfig, $timeout) { + .controller('ControllerEmbed', ['$scope', '$element', 'typeformConfig', '$timeout', function embedController($scope, $element, typeformConfig, $timeout) { if (!typeformConfig.accountId) { throw new EvalError('Account ID not set in config'); @@ -38,25 +38,30 @@ function initTypeformScript() { var qs, - js, - q, - s, - d = document, - gi = d.getElementById, - ce = d.createElement, - gt = d.getElementsByTagName, - id = 'typef_orm_widget', - b = 'https://s3-eu-west-1.amazonaws.com/share.typeform.com/'; + js, + q, + s, + d=document, + gi=d.getElementById, + ce=d.createElement, + gt=d.getElementsByTagName, + id="typef_orm_widget", + b="https://embed.typeform.com/"; if (!gi.call(d, id)) { - js = ce.call(d, 'script'); - js.id = id; - js.src = b + 'widget.js'; - q = gt.call(d, 'script')[0]; - q.parentNode.insertBefore(js, q) + js=ce.call(d,"script"); + js.id=id; + js.src=b+"embed.js"; + q=gt.call(d,"script")[0]; + q.parentNode.insertBefore(js,q); } else { + + var tfIdAndHidden = $scope.tfHidden ? $scope.tfId + '?' + $scope.tfHidden : $scope.tfId; + //For angular apps - new Typeform.Widget + // new Typeform.Widget + var typeFormUrl = 'https://' + $scope.accountId + '.typeform.com/to/' + tfIdAndHidden; + new window.typeformEmbed.makeWidget($element[0], typeFormUrl); } } @@ -72,15 +77,18 @@ replace: true, scope: { tfId: '@', + tfHidden: '@', tfText: '@', tfStyle: '@' }, - template: '
', + template: '', controller: 'ControllerEmbed', link: function (scope, element, attrs) { var defaultStyle = "height:100%; margin:0;"; scope.style= scope.tfStyle ? scope.tfStyle : defaultStyle; + + scope.tfIdAndHidden = scope.tfHidden ? scope.tfId + '?' + scope.tfHidden : scope.tfId; } }; }); diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..48e2925 --- /dev/null +++ b/bower.json @@ -0,0 +1,23 @@ +{ + "name": "angular-typeform", + "version": "0.0.2", + "description": "An angular 1.x directive for Typeform", + "main": "angular-typeform.js", + "authors": [ + "Adrian Latorre" + ], + "license": "MIT", + "keywords": [ + "angular", + "directive", + "typeform" + ], + "homepage": "https://github.com/willylatorre/angular-typeform", + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ] +}