Sfoglia il codice sorgente

fixed ng transclude case

tags/0.1.10
Robin Thoni 8 anni fa
parent
commit
743881027e
4 ha cambiato i file con 10 aggiunte e 7 eliminazioni
  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 Vedi File

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

+ 1
- 1
dist/luticate-utils.min.js
File diff soppresso perché troppo grande
Vedi File


+ 2
- 2
src/lubasictable.js Vedi File

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

+ 2
- 2
src/luedittable.js Vedi File

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

Loading…
Annulla
Salva