github/melpa
1
0
Fork 0
mirror of https://github.com/correl/melpa.git synced 2024-12-23 03:00:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move to angularjs 1.2.0-rc2

Browse source
This commit is contained in:
Steve Purcell 2013-09-28 08:15:04 +01:00
parent c8874fc478
commit 9def9ba1f4
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
html/index.html
View file

@ -54,9 +54,10 @@
</div> </div>
<div view-or-error></div> <div view-or-error></div>
</main> </main>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.1.5/angular.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.0-rc.2/angular.min.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/moment.js/2.0.0/moment.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.0-rc.2/angular-route.min.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/lodash.js/1.3.1/lodash.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.0.0/moment.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/1.3.1/lodash.min.js"></script>
<script src="js/melpa.js"></script> <script src="js/melpa.js"></script>
<script src="http://platform.twitter.com/widgets.js" type="text/javascript" async="async"></script> <script src="http://platform.twitter.com/widgets.js" type="text/javascript" async="async"></script>
<script type="text/javascript"> <script type="text/javascript">

4
html/js/melpa.js
View file

@ -8,7 +8,7 @@
// TODO D3 visualisation for deps // TODO D3 visualisation for deps
// TODO Fix json encoding of versions // TODO Fix json encoding of versions
var app = angular.module('melpa', []); var app = angular.module('melpa', ["ngRoute"]);
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// SERVICES // SERVICES
@ -172,7 +172,7 @@
return { return {
template: '<div>' + template: '<div>' +
'<div class="alert alert-danger" ng-if="routeError"><strong>Error: </strong>{{routeError}}</div>' + '<div class="alert alert-danger" ng-if="routeError"><strong>Error: </strong>{{routeError}}</div>' +
'<div ng-if="!routeError" ng-view><ng-transclude></ng-transclude></div>'+'</div>', '<div ng-if="!routeError"><div ng-view><ng-transclude></ng-transclude></div></div>'+'</div>',
transclude: true, transclude: true,
link: function(scope) { link: function(scope) {
$rootScope.$on("$routeChangeError", function (event, current, previous, rejection) { $rootScope.$on("$routeChangeError", function (event, current, previous, rejection) {