diff --git a/addon/components/crud-table.js b/addon/components/crud-table.js index 44dcc47..83059f6 100755 --- a/addon/components/crud-table.js +++ b/addon/components/crud-table.js @@ -8,7 +8,6 @@ var CustomField = Ember.Object.extend({ Type: null, listener: function () {}.observes('Value') }); - var recalculatePagination = function (that, meta) { var arr = []; var tpages = Math.ceil(meta.total / meta.showing); @@ -100,7 +99,7 @@ var metadata = function (records, that) { }; meta.from = (meta.current - 1) * meta.showing + 1; meta.to = meta.current * meta.showing; - meta.to = meta.to > meta.total ? meta.total:meta.to; + meta.to = meta.to > meta.total ? meta.total : meta.to; recalculatePagination(that, meta); }; @@ -110,12 +109,9 @@ var hidemodal = function () { var lastquery = { page: null }; -export default Ember.Component.extend({ - attributeBindings: ['style'], - style: function () { - return 'color: ' + this.get('name') + ';'; - }.property('name'), + +export default Ember.Component.extend({ stripped: false, hover: false, createRecord: 'create', @@ -231,9 +227,9 @@ export default Ember.Component.extend({ //this.get('delete')(); } }, + value: [], layout: layout, class: "", - value: [], fields: "id", init: function () { var that = this; @@ -249,6 +245,9 @@ export default Ember.Component.extend({ var deferred = Ember.RSVP.defer('crud-table#createRecord'); that.set('isLoading', true); this.sendAction('searchRecord', {}, deferred); + + $(this).addClass(this.get('class')); + deferred.promise.then(function (records) { that.page_size = records.get('content.length'); metadata(records, that); @@ -259,10 +258,6 @@ export default Ember.Component.extend({ alert(data.message); that.set('isLoading', false); }); - //regenerateView(that); - //Ember.addObserver('value',that,function(){ - // regenerateView(that); - //}); $("#CrudTableDeleteRecordModal").modal('hide'); $('#CrudTableDeleteRecordModal').on('hidden.bs.modal', function () { var deferred = Ember.RSVP.defer('crud-table#cancelRecord'); @@ -282,6 +277,6 @@ export default Ember.Component.extend({ }.on('didInsertElement'), teardown: function () { - //this._drop.destroy(); + }.on('willDestroyElement'), }); diff --git a/bower.json b/bower.json index 77d324e..5b1b9d4 100755 --- a/bower.json +++ b/bower.json @@ -1,6 +1,9 @@ { "name": "ember-cli-crudtable", "dependencies": { + "bootstrap": "~3.3.4" + }, + "devDependencies": { "jquery": "^1.11.1", "ember": "1.10.0", "ember-data": "1.0.0-beta.15", @@ -12,8 +15,5 @@ "ember-qunit": "0.2.8", "ember-qunit-notifications": "0.0.7", "qunit": "~1.17.1" - }, - "devDependencies": { - "bootstrap": "~3.3.4" } } diff --git a/index.js b/index.js index 5703710..cbdae3d 100755 --- a/index.js +++ b/index.js @@ -2,5 +2,8 @@ 'use strict'; module.exports = { - name: 'ember-cli-crudtable' + name: 'ember-cli-crudtable', + afterInstall: function () { + return this.addBowerPackageToProject('bootstrap'); // is a promise + } }; diff --git a/package.json b/package.json index f37fcbc..3a75548 100755 --- a/package.json +++ b/package.json @@ -1,47 +1,47 @@ { - "name": "ember-cli-crudtable", - "version": "0.3.26", - "description": "This addon allows you to easly create a CRUD Table, it will take you only 5s!.", - "directories": { - "doc": "doc", - "test": "tests" - }, - "scripts": { - "start": "ember server", - "build": "ember build", - "test": "ember test" - }, - "repository": "https://github.com/gerard2p/ember-cli-crudtable.git", - "engines": { - "node": ">= 0.12.0" - }, - "dependencies": { - "ember-cli-htmlbars": "0.7.4" - }, - "author": "Gerardo Pérez Pérez", - "license": "MPL2", - "devDependencies": { - "ember-data": "1.0.0-beta.15", - "broccoli-asset-rev": "^2.0.0", - "ember-cli": "0.2.1", - "ember-cli-app-version": "0.3.2", - "ember-cli-babel": "^4.0.0", - "ember-cli-content-security-policy": "0.3.0", - "ember-cli-dependency-checker": "0.0.8", - "ember-cli-ic-ajax": "0.1.1", - "ember-cli-inject-live-reload": "^1.3.0", - "ember-cli-qunit": "0.3.9", - "ember-cli-uglify": "1.0.1", - "ember-export-application-global": "^1.0.2" - }, - "keywords": [ + "name": "ember-cli-crudtable", + "version": "0.3.26", + "description": "This addon allows you to easly create a CRUD Table, it will take you only 5s!.", + "directories": { + "doc": "doc", + "test": "tests" + }, + "scripts": { + "start": "ember server", + "build": "ember build", + "test": "ember test" + }, + "repository": "https://github.com/gerard2p/ember-cli-crudtable.git", + "engines": { + "node": ">= 0.12.0" + }, + "dependencies": { + "ember-cli-htmlbars": "0.7.4" + }, + "author": "Gerardo Pérez Pérez", + "license": "MPL2", + "devDependencies": { + "ember-data": "1.0.0-beta.15", + "broccoli-asset-rev": "^2.0.0", + "ember-cli": "0.2.1", + "ember-cli-app-version": "0.3.2", + "ember-cli-babel": "^4.0.0", + "ember-cli-content-security-policy": "0.3.0", + "ember-cli-dependency-checker": "0.0.8", + "ember-cli-ic-ajax": "0.1.1", + "ember-cli-inject-live-reload": "^1.3.0", + "ember-cli-qunit": "0.3.9", + "ember-cli-uglify": "1.0.1", + "ember-export-application-global": "^1.0.2" + }, + "keywords": [ "ember-addon", "crudtable", "crud", "table", "ember-cli" ], - "ember-addon": { - "configPath": "tests/dummy/config" - } + "ember-addon": { + "configPath": "tests/dummy/config" + } }