Skip to content

Commit 566ae73

Browse files
bekoschrisirhc
authored andcommitted
demo(download): fix download process
Closes angular-ui#1572 Closes angular-ui#1576
1 parent 70b1a63 commit 566ae73

File tree

2 files changed

+16
-19
lines changed

2 files changed

+16
-19
lines changed

misc/demo/assets/app.js

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,6 @@ function MainCtrl($scope, $http, $document, $modal, orderByFilter) {
4141
templateUrl: 'downloadModal.html',
4242
controller: 'DownloadCtrl'
4343
});
44-
45-
modalInstance.result.then(function(options) {
46-
var downloadUrl = ['http://angular-ui.github.io/bootstrap/ui-bootstrap-'];
47-
if (options.tpls) {
48-
downloadUrl.push('tpls-');
49-
}
50-
downloadUrl.push(options.version);
51-
if (options.minified) {
52-
downloadUrl.push('.min');
53-
}
54-
downloadUrl.push('.js');
55-
56-
downloadFileFromUrl(downloadUrl.join(''));
57-
});
5844
};
5945
}
6046

@@ -87,8 +73,19 @@ var DownloadCtrl = function($scope, $modalInstance) {
8773
};
8874

8975
$scope.download = function (version) {
90-
$scope.options.version = version;
91-
$modalInstance.close($scope.options);
76+
var options = $scope.options;
77+
78+
var downloadUrl = ['ui-bootstrap-'];
79+
if (options.tpls) {
80+
downloadUrl.push('tpls-');
81+
}
82+
downloadUrl.push(version);
83+
if (options.minified) {
84+
downloadUrl.push('.min');
85+
}
86+
downloadUrl.push('.js');
87+
88+
return downloadUrl.join('');
9289
};
9390

9491
$scope.cancel = function () {

misc/demo/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,15 +250,15 @@ <h1><%= module.displayName %><small>
250250
<label class="col-sm-3 control-label"><strong>Bower</strong></label>
251251
<div class="col-sm-9">
252252
<small>If you are using Bower just run:</small>
253-
<pre>bower install angular-bootstrap</pre>
253+
<pre style="margin-bottom:0;">bower install angular-bootstrap</pre>
254254
<small class="help-block"><a href="http://bower.io/" target="_blank">Bower</a> is a package manager for the web.</small>
255255
</div>
256256
</div>
257257
</form>
258258
</div>
259259
<div class="modal-footer">
260-
<a class="btn btn-default" ng-click="cancel()">Cancel</a>
261-
<a class="btn btn-primary" ng-click="download('<%= pkg.version%>')"><i class="glyphicon glyphicon-download-alt"></i> Download <%= pkg.version %></a>
260+
<a class="btn btn-default" ng-click="cancel()">Close</a>
261+
<a class="btn btn-primary" ng-href="{{download('<%= pkg.version%>')}}" download><i class="glyphicon glyphicon-download-alt"></i> Download <%= pkg.version %></a>
262262
</div>
263263
</script>
264264
<script type="text/ng-template" id="buildModal.html">

0 commit comments

Comments
 (0)