瀏覽代碼

fixed ng transclude case

tags/0.1.10
Robin Thoni 8 年之前
父節點
當前提交
743881027e
共有 4 個檔案被更改,包括 10 行新增7 行删除
  1. 5
    2
      bower.json
  2. 1
    1
      dist/luticate-utils.min.js
  3. 2
    2
      src/lubasictable.js
  4. 2
    2
      src/luedittable.js

+ 5
- 2
bower.json 查看文件

@@ -7,7 +7,7 @@
7 7
   "description": "Luticate front utils",
8 8
   "license": "MIT",
9 9
   "dependencies": {
10
-    "angular-dialog-service": "~5.2.8"
10
+    "angular-dialog-service": "5.2.11"
11 11
   },
12 12
   "ignore": [
13 13
     "**/.*",
@@ -15,5 +15,8 @@
15 15
     "bower_components",
16 16
     "test",
17 17
     "tests"
18
-  ]
18
+  ],
19
+  "resolutions": {
20
+    "angular": "^1.3"
21
+  }
19 22
 }

+ 1
- 1
dist/luticate-utils.min.js
文件差異過大導致無法顯示
查看文件


+ 2
- 2
src/lubasictable.js 查看文件

@@ -11,7 +11,7 @@ angular.module('luticateUtils')
11 11
                     options: '&'
12 12
                 },
13 13
                 transclude: {
14
-                    'lu-basic-table-filter': '?lu-basic-table-filter'
14
+                    'luBasicTableFilter': '?luBasicTableFilter'
15 15
                 },
16 16
                 templateUrl: "/luticate/lubasictable.html",
17 17
                 link: function ($scope, element, attrs) {
@@ -178,7 +178,7 @@ angular.module('luticateUtils').run(['$templateCache', function($templateCache)
178 178
 {
179 179
     $templateCache.put('/luticate/lubasictable.html',
180 180
 '<div lu-busy="tableOptions.luBusy">' +
181
-'    <div class="col-sm-9"><ng-transclude ng-transclude="lu-basic-table-filter"></ng-transclude></div>' +
181
+'    <div class="col-sm-9" ng-transclude="luBasicTableFilter"></div>' +
182 182
 '    <div class="col-sm-3" ng-show="tableOptions.canFilter()"><input placeholder="Filter" class="form-control" ng-model-options="{debounce: 500}" ' +
183 183
 '       ng-model="tableOptions.query" ng-change="loadPage(0)"/></div>' +
184 184
 '    <table class="col-sm-12 table table-hover">' +

+ 2
- 2
src/luedittable.js 查看文件

@@ -11,7 +11,7 @@ angular.module('luticateUtils')
11 11
                     options: '&'
12 12
                 },
13 13
                 transclude: {
14
-                    'lu-basic-table-filter': '?lu-basic-table-filter'
14
+                    'luBasicTableFilter': '?luBasicTableFilter'
15 15
                 },
16 16
                 templateUrl: "/luticate/lutable.html",
17 17
                 link: function ($scope, element, attrs) {
@@ -143,7 +143,7 @@ angular.module('luticateUtils')
143 143
 angular.module('luticateUtils').run(['$templateCache', function($templateCache)
144 144
 {
145 145
     $templateCache.put('/luticate/lutable.html',
146
-'<lu-basic-table options="tableOptions"><lu-basic-table-filter><ng-transclude ng-transclude="lu-basic-table-filter"></ng-transclude></lu-basic-table-filter></lu-basic-table>' +
146
+'<lu-basic-table options="tableOptions"><lu-basic-table-filter ng-transclude="luBasicTableFilter"></lu-basic-table-filter></lu-basic-table>' +
147 147
 '<div class="col-sm-12">' +
148 148
 '    <button class="btn btn-danger" type="button" ng-click="askDeleteItems()"' +
149 149
 '        ng-disabled="tableOptions.checkedItems.length == 0" ng-show="tableOptions.canDel()">' +

Loading…
取消
儲存