Merge "Removal of jquery"

This commit is contained in:
Jenkins 2014-06-19 12:45:34 +00:00 committed by Gerrit Code Review
commit 15bdc59b8b
5 changed files with 18 additions and 9 deletions

View File

@ -2,7 +2,6 @@
"name": "storyboard-webclient", "name": "storyboard-webclient",
"version": "0.0.1", "version": "0.0.1",
"dependencies": { "dependencies": {
"jquery": "2.0.3",
"font-awesome": "4.0", "font-awesome": "4.0",
"angular": "1.2.13", "angular": "1.2.13",
"angular-resource": "1.2.13", "angular-resource": "1.2.13",

View File

@ -40,9 +40,8 @@ angular.module('sb.services')
return; return;
} }
} }
// If there is a <base> tag, then we can use that. // If there is a <base> tag, then we can use that.
if ($('base').length > 0) { if (document.getElementsByTagName('base').length > 0) {
$provide.constant(propertyName, ''); $provide.constant(propertyName, '');
return; return;
} }

View File

@ -32,10 +32,12 @@ angular.module('sb.util')
// Clone the created element and attach it to our DOM. // Clone the created element and attach it to our DOM.
var shadow = angular.element('<span></span>'); var shadow = angular.element('<span></span>');
shadow.attr('class', $element.attr('class')); shadow.attr('class', $element.attr('class'));
shadow.css('display', 'none') shadow.css({
.css('white-space', 'pre') display: 'none',
.css('width', 'auto') 'white-space': 'pre',
.css('visibility', 'hidden'); width: 'auto',
visibility: 'hidden'
});
// Sane attach/detach // Sane attach/detach
$document.find('body').append(shadow); $document.find('body').append(shadow);

View File

@ -14,4 +14,14 @@
* under the License. * under the License.
*/ */
angular.module('sb.util', ['ui.router', 'LocalStorageModule']); angular.module('sb.util', ['ui.router', 'LocalStorageModule'])
.run(function () {
'use strict';
angular.element.prototype.hide = function () {
this.addClass('ng-hide');
};
angular.element.prototype.show = function () {
this.removeClass('ng-hide');
};
});

View File

@ -28,7 +28,6 @@
<link rel="shortcut icon" href="favicon.ico"> <link rel="shortcut icon" href="favicon.ico">
<!-- build:js(bower_components) js/libs.js --> <!-- build:js(bower_components) js/libs.js -->
<script src="jquery/jquery.js"></script>
<script src="angular/angular.js"></script> <script src="angular/angular.js"></script>
<script src="angular-elastic/elastic.js"></script> <script src="angular-elastic/elastic.js"></script>
<script src="angular-bootstrap/ui-bootstrap-tpls.js"></script> <script src="angular-bootstrap/ui-bootstrap-tpls.js"></script>