Skip to content
This repository has been archived by the owner on Sep 5, 2024. It is now read-only.

Commit

Permalink
Addressing various issues in docs and updating to master.
Browse files Browse the repository at this point in the history
  • Loading branch information
EisenbergEffect committed Sep 19, 2014
1 parent ee540f0 commit 4ed207c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/components/linearProgress/demo1/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div ng-app="app" ng-controller="AppCtrl">
<div ng-controller="AppCtrl">
<h2>Determinate</h2>
<material-linear-progress mode="determinate" value="{{determinateValue}}"></material-linear-progress>
<material-linear-progress mode="determinate" ng-value="determinateValue"></material-linear-progress>

<h2>Indeterminate</h2>
<material-linear-progress mode="indeterminate"></material-linear-progress>
Expand Down
6 changes: 3 additions & 3 deletions src/components/linearProgress/demo1/script.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
angular.module('app', ['ngMaterial'])
.controller('AppCtrl', function($scope, $interval) {
angular.module('linearProgressDemo1', ['ngMaterial'])
.controller('AppCtrl', ['$scope', '$interval', function($scope, $interval) {
$scope.mode = 'query';
$scope.determinateValue = 30;
$scope.determinateValue2 = 30;
Expand All @@ -16,4 +16,4 @@ angular.module('app', ['ngMaterial'])
$interval(function() {
$scope.mode = ($scope.mode == 'query' ? 'determinate' : 'query');
}, 7200, 0, true);
});
}]);
6 changes: 4 additions & 2 deletions src/components/linearProgress/linearProgress.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@ angular.module('material.components.linearProgress', [
* For operations where the user is asked to wait a moment while something finishes up, and it’s not necessary to expose what's happening behind the scenes and how long it will take, use an indeterminate indicator.
*
* @param {string} mode Select from one of four modes: determinate, indeterminate, buffer or query.
* @param {number=} value In determinate and buffer modes, this number represents the percentage of the primary progress bar.
* @param {number=} secondaryValue In the buffer mode, this number represents the precentage of the secondary progress bar.
* @param {number=} value In determinate and buffer modes, this number represents the percentage of the primary progress bar. Default: 0
* @param {number=} secondaryValue In the buffer mode, this number represents the precentage of the secondary progress bar. Default: 0
*
* @usage
* <hljs lang="html">
* <material-linear-progress mode="determinate" value="..."></material-linear-progress>
*
* <material-linear-progress mode="determinate" ng-value="..."></material-linear-progress>
*
* <material-linear-progress mode="indeterminate"></material-linear-progress>
*
* <material-linear-progress mode="buffer" value="..." secondaryValue="..."></material-linear-progress>
Expand Down

0 comments on commit 4ed207c

Please sign in to comment.