Merge pull request #88 from TopCS/master

(feat): removed jQuery dependency. Compatibility IE9+.
esvit · Oct 16, 2013 · b569b3e · b569b3e
2 parents 178d6ac + 07afe32
commit b569b3e
Show file tree

Hide file tree

Showing 21 changed files with 29 additions and 46 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -0,0 +1,4 @@
+{
+  "directory": "bower_components",
+  "json": "bower.json"
+}
diff --git a/bower.json b/bower.json
@@ -10,8 +10,7 @@
     "src"
   ],
   "dependencies": {
-    "angular": ">=1.2.0-rc.2",
-    "jquery": ">=1.10.2"
+    "angular": ">=1.2.0-rc.2"
   },
   "devDependencies": {
     "angular-mocks": "1.2.0-rc.2"

diff --git a/examples/demo1.html b/examples/demo1.html
@@ -10,7 +10,6 @@
 
         <link rel="stylesheet" href="css/bootstrap.min.css">
         <link rel="stylesheet" href="css/bootstrap-theme.min.css">
-        <script src="js/jquery-1.9.1.min.js"></script>
         <script src="js/angular.min.js"></script>
         <script src="../ng-table.src.js"></script>
         <link rel="stylesheet" href="../ng-table.css">

diff --git a/examples/demo10.html b/examples/demo10.html
@@ -9,7 +9,6 @@
         <meta name="viewport" content="width=device-width">
 
         <link rel="stylesheet" href="css/bootstrap.min.css">
-        <script src="js/jquery-1.9.1.min.js"></script>
         <script src="js/angular.min.js"></script>
         <script src="../ng-table.js"></script>
         <link rel="stylesheet" href="../ng-table.css">

diff --git a/examples/demo11.html b/examples/demo11.html
@@ -10,7 +10,6 @@
 
         <link rel="stylesheet" href="css/bootstrap.min.css">
         <link rel="stylesheet" href="css/bootstrap-theme.min.css">
-        <script src="js/jquery-1.9.1.min.js"></script>
         <script src="js/angular.min.js"></script>
         <script src="../ng-table.src.js"></script>
         <link rel="stylesheet" href="../ng-table.css">

diff --git a/examples/demo12.html b/examples/demo12.html
@@ -10,7 +10,6 @@
 
     <link rel="stylesheet" href="css/bootstrap.min.css">
     <link rel="stylesheet" href="css/bootstrap-theme.min.css">
-    <script src="js/jquery-1.9.1.min.js"></script>
     <script src="js/angular.min.js"></script>
     <script src="../ng-table.src.js"></script>
     <link rel="stylesheet" href="../ng-table.css">

diff --git a/examples/demo13.html b/examples/demo13.html
@@ -10,7 +10,6 @@
 
         <link rel="stylesheet" href="css/bootstrap.min.css">
         <link rel="stylesheet" href="css/bootstrap-theme.min.css">
-        <script src="js/jquery-1.9.1.min.js"></script>
         <script src="js/angular.min.js"></script>
         <script src="../ng-table.src.js"></script>
         <link rel="stylesheet" href="../ng-table.css">

diff --git a/examples/demo2.html b/examples/demo2.html
@@ -10,7 +10,6 @@
 
         <link rel="stylesheet" href="css/bootstrap.min.css">
         <link rel="stylesheet" href="css/bootstrap-theme.min.css">
-        <script src="js/jquery-1.9.1.min.js"></script>
         <script src="js/angular.min.js"></script>
         <script src="../ng-table.js"></script>
         <link rel="stylesheet" href="../ng-table.css">

diff --git a/examples/demo3.html b/examples/demo3.html
@@ -10,9 +10,8 @@
 
         <link rel="stylesheet" href="css/bootstrap.min.css">
         <link rel="stylesheet" href="css/bootstrap-theme.min.css">
-        <script src="js/jquery-1.9.1.min.js"></script>
         <script src="js/angular.min.js"></script>
-        <script src="../ng-table.js"></script>
+        <script src="../ng-table.src.js"></script>
         <link rel="stylesheet" href="../ng-table.css">
     </head>
 <body ng-app="main">
@@ -81,4 +80,4 @@ <h1>Table with sorting</h1>
 
 
     </body>
-</html>
+</html>
diff --git a/examples/demo4.html b/examples/demo4.html
@@ -9,7 +9,6 @@
         <meta name="viewport" content="width=device-width">
 
         <link rel="stylesheet" href="css/bootstrap.min.css">
-        <script src="js/jquery-1.9.1.min.js"></script>
         <script src="js/angular.min.js"></script>
         <script src="../ng-table.js"></script>
         <link rel="stylesheet" href="../ng-table.css">

diff --git a/examples/demo5.html b/examples/demo5.html
@@ -10,7 +10,6 @@
 
         <link rel="stylesheet" href="css/bootstrap.min.css">
         <link rel="stylesheet" href="css/bootstrap-theme.min.css">
-        <script src="js/jquery-1.9.1.min.js"></script>
         <script src="js/angular.min.js"></script>
         <script src="../ng-table.js"></script>
         <link rel="stylesheet" href="../ng-table.css">

diff --git a/examples/demo6.html b/examples/demo6.html
@@ -9,7 +9,6 @@
         <meta name="viewport" content="width=device-width">
 
         <link rel="stylesheet" href="css/bootstrap.min.css">
-        <script src="js/jquery-1.9.1.min.js"></script>
         <script src="js/angular.min.js"></script>
         <script src="js/angular-resource.min.js"></script>
         <script src="js/angular-mocks.js"></script>

diff --git a/examples/demo7.html b/examples/demo7.html
@@ -9,7 +9,6 @@
         <meta name="viewport" content="width=device-width">
 
         <link rel="stylesheet" href="css/bootstrap.min.css">
-        <script src="js/jquery-1.9.1.min.js"></script>
         <script src="js/angular.min.js"></script>
         <script src="../ng-table.js"></script>
         <link rel="stylesheet" href="../ng-table.css">

diff --git a/examples/demo8.html b/examples/demo8.html
@@ -9,7 +9,6 @@
         <meta name="viewport" content="width=device-width">
 
         <link rel="stylesheet" href="css/bootstrap.min.css">
-        <script src="js/jquery-1.9.1.min.js"></script>
         <script src="js/angular.min.js"></script>
         <script src="../ng-table.js"></script>
         <link rel="stylesheet" href="../ng-table.css">

diff --git a/examples/demo9.html b/examples/demo9.html
@@ -9,7 +9,6 @@
         <meta name="viewport" content="width=device-width">
 
         <link rel="stylesheet" href="css/bootstrap.min.css">
-        <script src="js/jquery-1.9.1.min.js"></script>
         <script src="js/angular.min.js"></script>
         <script src="../ng-table.js"></script>
         <link rel="stylesheet" href="../ng-table.css">

diff --git a/karma.conf.js b/karma.conf.js
@@ -9,7 +9,6 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       // libraries
-      'bower_components/jquery/jquery.js',
       'bower_components/angular/angular.js',
       'bower_components/angular-mocks/angular-mocks.js',
 
@@ -36,4 +35,4 @@ module.exports = function(config) {
         dir : 'out/coverage'
     }
   });
-};
+};
diff --git a/ng-table.js b/ng-table.js
diff --git a/ng-table.map b/ng-table.map
diff --git a/ng-table.src.js b/ng-table.src.js
@@ -493,7 +493,7 @@ app.directive('ngTable', ['$compile', '$q', '$parse',
             compile: function (element) {
                 var columns = [], i = 0;
 
-                angular.forEach(element.find('tr:not(.ng-table-group)').eq(0).find('td'), function (item) {
+                angular.forEach(angular.element(element[0].querySelector('tr:not(.ng-table-group)')).find('td'), function (item) {
                     var el = angular.element(item);
                     if (el.attr('ignore-cell') && 'true' === el.attr('ignore-cell')) {
                         return;
@@ -577,15 +577,11 @@ app.directive('ngTable', ['$compile', '$q', '$parse',
                             header: (attrs.templateHeader ? attrs.templateHeader : 'ng-table/header.html'),
                             pagination: (attrs.templatePagination ? attrs.templatePagination : 'ng-table/pager.html')
                         };
-                        var headerTemplate = angular.element('<thead ng-include="templates.header"></thead>');
-                        var paginationTemplate = angular.element('<div ng-include="templates.pagination"></div>');
+                        var headerTemplate = angular.element(document.createElement('thead')).attr('ng-include', 'templates.header');
+                        var paginationTemplate = angular.element(document.createElement('div')).attr('ng-include', 'templates.pagination');
                         element.find('thead').remove();
                         var tbody = element.find('tbody');
-                        if (tbody[0]) {
-                            angular.element(tbody[0]).before(headerTemplate);
-                        } else {
-                            element.prepend(headerTemplate);
-                        }
+                        element.prepend(headerTemplate);
                         $compile(headerTemplate)(scope);
                         $compile(paginationTemplate)(scope);
                         element.addClass('ng-table');
@@ -596,6 +592,7 @@ app.directive('ngTable', ['$compile', '$q', '$parse',
         }
     }
 ]);
+
 angular.module('ngTable').run(['$templateCache', function ($templateCache) {
 	$templateCache.put('ng-table/filters/select.html', '<select ng-options="data.id as data.title for data in column.data" ng-model="params.filter()[name]" ng-show="filter==\'select\'" class="filter filter-select form-control"> </select>');
 	$templateCache.put('ng-table/filters/text.html', '<input type="text" ng-model="params.filter()[name]" ng-if="filter==\'text\'" class="input-filter form-control"/>');

diff --git a/src/scripts/05-directive.js b/src/scripts/05-directive.js
@@ -26,7 +26,7 @@ app.directive('ngTable', ['$compile', '$q', '$parse',
             compile: function (element) {
                 var columns = [], i = 0;
 
-                angular.forEach(element.find('tr:not(.ng-table-group)').eq(0).find('td'), function (item) {
+                angular.forEach(angular.element(element[0].querySelector('tr:not(.ng-table-group)')).find('td'), function (item) {
                     var el = angular.element(item);
                     if (el.attr('ignore-cell') && 'true' === el.attr('ignore-cell')) {
                         return;
@@ -110,15 +110,11 @@ app.directive('ngTable', ['$compile', '$q', '$parse',
                             header: (attrs.templateHeader ? attrs.templateHeader : 'ng-table/header.html'),
                             pagination: (attrs.templatePagination ? attrs.templatePagination : 'ng-table/pager.html')
                         };
-                        var headerTemplate = angular.element('<thead ng-include="templates.header"></thead>');
-                        var paginationTemplate = angular.element('<div ng-include="templates.pagination"></div>');
+                        var headerTemplate = angular.element(document.createElement('thead')).attr('ng-include', 'templates.header');
+                        var paginationTemplate = angular.element(document.createElement('div')).attr('ng-include', 'templates.pagination');
                         element.find('thead').remove();
                         var tbody = element.find('tbody');
-                        if (tbody[0]) {
-                            angular.element(tbody[0]).before(headerTemplate);
-                        } else {
-                            element.prepend(headerTemplate);
-                        }
+                        element.prepend(headerTemplate);
                         $compile(headerTemplate)(scope);
                         $compile(paginationTemplate)(scope);
                         element.addClass('ng-table');
@@ -128,4 +124,4 @@ app.directive('ngTable', ['$compile', '$q', '$parse',
             }
         }
     }
-]);
+]);
diff --git a/test/tableSpec.js b/test/tableSpec.js
@@ -57,25 +57,26 @@ describe('ng-table', function () {
     }));
 
     it('should create table header', inject(function ($compile, $rootScope) {
-        var thead = elm.find('table thead');
+        var thead = elm.find('thead');
         expect(thead.length).toBe(1);
 
         var rows = thead.find('tr');
         expect(rows.length).toBe(2);
 
-        var titles = rows.eq(0).find('th');
+        var titles = angular.element(rows[0]).find('th');
 
         expect(titles.length).toBe(3);
-        expect($.trim(titles.eq(0).text())).toBe('Name of person');
-        expect($.trim(titles.eq(1).text())).toBe('Age');
-        expect($.trim(titles.eq(2).text())).toBe('Money');
+        expect(angular.element(titles[0]).text().trim()).toBe('Name of person');
+        expect(angular.element(titles[1]).text().trim()).toBe('Age');
+        expect(angular.element(titles[2]).text().trim()).toBe('Money');
 
-        var filters = rows.eq(1).find('th');
+        var filters = angular.element(rows[1]).find('th');
         expect(filters.length).toBe(3);
     }));
 
     it('should show scope data', inject(function ($compile, $rootScope, ngTableParams) {
-        var tbody = elm.find('table tbody');
+        debugger;
+        var tbody = elm.find('tbody');
         expect(tbody.length).toBe(1);
 
         var rows = tbody.find('tr');
@@ -109,4 +110,4 @@ describe('ng-table', function () {
         expect(rows.length).toBe(7);
     }));
 
-});
+});