You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ss...@apache.org on 2013/12/16 19:57:36 UTC
[10/10] git commit: Upgraded UI Bootstrap to 0.7.0, Angular to 1.2.3.
Upgraded UI Bootstrap to 0.7.0, Angular to 1.2.3.
* Re-implemented the dialog service since it was removed in 0.6.0.
Angular UI 0.5.0 fixed a major performance problem with the collapse
directive[1] that was polling the scrollHeight of its element and
forcing unnecessary layouts.
[1] https://github.com/angular-ui/bootstrap/commit/a72c635c7669933204c17bf85cfe3d4fc350c73a
Review: http://reviews.apache.org/r/16264
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9cbb81ba
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9cbb81ba
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9cbb81ba
Branch: refs/heads/master
Commit: 9cbb81ba4c17b4f6e88ef20d47c9158d0a5ea5c6
Parents: ba96856
Author: Ross Allen <ro...@gmail.com>
Authored: Fri Dec 6 13:33:35 2013 -0800
Committer: Ross Allen <ro...@gmail.com>
Committed: Fri Dec 13 15:45:52 2013 -0800
----------------------------------------------------------------------
src/Makefile.am | 10 +-
src/webui/master/static/index.html | 46 +-
src/webui/master/static/js/angular-1.0.7.js | 14847 ------------
src/webui/master/static/js/angular-1.0.7.min.js | 163 -
src/webui/master/static/js/angular-1.2.3.js | 20282 +++++++++++++++++
src/webui/master/static/js/angular-1.2.3.min.js | 201 +
.../master/static/js/angular-route-1.2.3.js | 891 +
.../master/static/js/angular-route-1.2.3.min.js | 14 +
src/webui/master/static/js/app.js | 6 +-
src/webui/master/static/js/controllers.js | 55 +-
src/webui/master/static/js/services.js | 37 +
.../master/static/js/ui-bootstrap-tpls-0.4.0.js | 3165 ---
.../static/js/ui-bootstrap-tpls-0.4.0.min.js | 2 -
.../master/static/js/ui-bootstrap-tpls-0.7.0.js | 3583 +++
.../static/js/ui-bootstrap-tpls-0.7.0.min.js | 2 +
15 files changed, 25081 insertions(+), 18223 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9cbb81ba/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 5f211a2..ddc43bd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -459,10 +459,12 @@ nobase_dist_pkgdata_DATA += \
# Need to distribute/install third-party javascript.
nobase_dist_pkgdata_DATA += \
- webui/master/static/js/angular-1.0.7.js \
- webui/master/static/js/angular-1.0.7.min.js \
- webui/master/static/js/ui-bootstrap-tpls-0.4.0.js \
- webui/master/static/js/ui-bootstrap-tpls-0.4.0.min.js \
+ webui/master/static/js/angular-1.2.3.js \
+ webui/master/static/js/angular-1.2.3.min.js \
+ webui/master/static/js/angular-route-1.2.3.js \
+ webui/master/static/js/angular-route-1.2.3.min.js \
+ webui/master/static/js/ui-bootstrap-tpls-0.7.0.js \
+ webui/master/static/js/ui-bootstrap-tpls-0.7.0.min.js \
webui/master/static/js/underscore-1.4.3.js \
webui/master/static/js/underscore-1.4.3.min.js \
webui/master/static/js/jquery-1.7.1.js \
http://git-wip-us.apache.org/repos/asf/mesos/blob/9cbb81ba/src/webui/master/static/index.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/index.html b/src/webui/master/static/index.html
index 929cb0e..1ac7c9d 100644
--- a/src/webui/master/static/index.html
+++ b/src/webui/master/static/index.html
@@ -70,28 +70,42 @@
<div ng-view></div>
</div>
+ </div>
- <div modal="errorModalOpen" style="display:none;">
- <div class="modal-header">
- <h3>Failed to connect to {{$location.host()}}:{{$location.port()}}!</h3>
- </div>
- <div class="modal-body">
- <p>
- Retrying in <b>{{retry / 1000}}</b> seconds...
- </p>
- </div>
- <div class="modal-footer">
- <button class="btn" ng-click="errorModalClose()">Try now</button>
- </div>
+ <script type="text/ng-template" id="template/dialog/masterGone.html">
+ <div class="modal-header">
+ <h3>Failed to connect to {{rootScope.$location.host()}}:{{rootScope.$location.port()}}!</h3>
</div>
- </div>
+ <div class="modal-body">
+ <p>
+ Retrying in <b>{{rootScope.retry / 1000}}</b> seconds...
+ </p>
+ </div>
+ <div class="modal-footer">
+ <button class="btn" ng-click="$close()">Try now</button>
+ </div>
+ </script>
+
+ <script type="text/ng-template" id="template/dialog/message.html">
+ <div class="modal-header">
+ <h3>{{ title }}</h3>
+ </div>
+ <div class="modal-body">
+ <p>{{ message }}</p>
+ </div>
+ <div class="modal-footer">
+ <a data-ng-repeat="btn in buttons" data-ng-click="$close(btn.result)" class="btn">
+ {{ btn.label }}
+ </a>
+ </div>
+ </script>
<script src="/static/js/jquery-1.7.1.min.js"></script>
<script src="/static/js/underscore-1.4.3.min.js"></script>
<script src="/static/js/zeroclipboard-1.1.7.js"></script>
- <script src="/static/js/angular-1.0.7.min.js"></script>
- <script src="/static/js/ui-bootstrap-tpls-0.4.0.min.js"></script>
-
+ <script src="/static/js/angular-1.2.3.min.js"></script>
+ <script src="/static/js/angular-route-1.2.3.min.js"></script>
+ <script src="/static/js/ui-bootstrap-tpls-0.7.0.min.js"></script>
<script src="/static/js/relative-date.js"></script>
<script src="/static/js/app.js"></script>