Merge branch 'release-1.1.0'

.gitignore

@@ -1,2 +1,3 @@
 node_modules
-dist
+dist
+test/instrumented/

CHANGELOG.txt

@@ -0,0 +1,56 @@
+Bootstrap-editable change log
+=============================
+
+Version 1.1.0 Aug 26, 2012
+----------------------------
+Enh #23: Added event 'update' (@vitalets)
+Enh: When 'toggle' option defined, no 'editable' css set to element (@vitalets)
+Enh: Smart autotext option for select, loads text only if source defined as object (@vitalets)
+Enh #5: Replace jQuery-ui datepicker with bootstrap-datepicker (@vitalets)
+Enh #22: Select: convert 'source' from native array to object (@vitalets)
+Enh #21: Default value of 'enablefocus' set to false (@vitalets)
+Enh #20: More RESTful: when http status != 200 popover shows responseText (@vitalets)
+Bug #19: Zip opens incorrectly on Mac OS (@vitalets)
+
+
+Version 1.0.5 Aug 8, 2012
+----------------------------
+Bug #18: In submit method value should be set by getInputValue (@vitalets)
+Enh #17: Show response text in error when HTTP != 200 (@vitalets)
+Enh #16: SELECT: set link text according to value (@vitalets)
+Enh #15: Generate release notes (@vitalets)
+Enh #14: Disable focus management (@vitalets)
+Enh #13: Json in html data-* attributes (@vitalets)
+Bug #12: When text contains escaped html it is processed incorrectly (@vitalets)
+Enh #11: Add to dist all required libs (jquery, bootstrap, jquery-ui + theme) (@vitalets)
+Enh #10: SELECT: cache and share source data between selects (@vitalets)
+Enh #9: Pk function in element context (@vitalets)
+Enh #8: Method to customize text render (@vitalets)
+Enh #7: Add empty value to SELECT list (@vitalets)
+
+
+Version 1.0.4 Aug 2, 2012
+----------------------------
+Enh #1: Trigger popover by click on another element (@vitalets)
+Enh #6: Allow inline source for select (@fdev)
+
+
+Version 1.0.3 Jul 20, 2012
+----------------------------
+Enh #3: Tabbular input without mouse (@vitalets)
+Enh #4: Arrange build on Grunt.js (@vitalets)
+
+
+Version 1.0.2 Jul 19, 2012
+----------------------------
+Enh: Close all popovers when openning new one (@vitalets)      
+
+
+Version 1.0.1 Jul 18, 2012
+----------------------------
+Bug: Ajax not sent properly (@vitalets)
+
+
+Version 1.0.0 Jul 18, 2012
+----------------------------
+Initial release     

grunt.js

@@ -1,114 +1,131 @@
-/*global module:false*/
-module.exports = function(grunt) {
-
-  grunt.loadNpmTasks('grunt-contrib');
-
-  grunt.loadTasks('tasks/');
-
-  // Project configuration.
-  grunt.initConfig({
-    pkg: '<json:package.json>',
-    dist: 'dist',
-    dist_source: '<%= dist %>/bootstrap-editable',
-    meta: {
-      banner: '/*! <%= pkg.title || pkg.name %> - v<%= pkg.version %> \n' +
-        '* <%= pkg.description %>\n' +
-        '* <%= pkg.homepage %>\n\n' +
-        '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
-        ' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */'
-    },
-    clean: ['<config:dist>'],
-    concat: {
-      dist_js: {
-        src: ['<banner:meta.banner>', '<file_strip_banner:src/js/<%= pkg.name %>.js>'],
-        dest: '<%= dist_source %>/js/<%= pkg.name %>.js'
-      },
-      dist_css: {
-        src: ['<banner:meta.banner>', '<file_strip_banner:src/css/<%= pkg.name %>.css>'],
-        dest: '<%= dist_source %>/css/<%= pkg.name %>.css'
-      }
-    },
-    changelog: {
-       user: 'vitalets',
-       repo: 'bootstrap-editable'
-    },
-    min: {
-      dist: {
-        src: ['<banner:meta.banner>', '<config:concat.dist_js.dest>'],
-        dest: '<%= dist_source %>/js/<%= pkg.name %>.min.js'
-      }
-    },
-    qunit: {
-      files: ['test/index.html']
-    },
-    lint: {
-     //TODO: lint tests files
-     //files: ['grunt.js', 'src/js/*.js', 'test/**/*.js']     
-      files: ['grunt.js', 'src/js/*.js']
-    },
-    watch: {
-      files: '<config:lint.files>',
-      tasks: 'lint qunit'
-    },
-    jshint: {
-      options: {
-        curly: true,
-        eqeqeq: true,
-        immed: true,
-        latedef: true,
-        newcap: true,
-        noarg: true,
-        sub: true,
-        undef: true,
-        boss: true,
-        eqnull: true,
-        browser: true,
-        evil: true  //allow eval
-      },
-      globals: {
-        jQuery: true
-      }
-    },
-    copy: {
-        dist: {
-            files: {
-                '<%= dist_source %>/img' : 'src/img/*',
-                '<%= dist_source %>': ['LICENSE-GPL', 'LICENSE-MIT', 'README.md', 'CHANGELOG']
-            },
-            options: {
-               flatten: true
-            }
-        },
-        libs: {
-            files: {
-                '<%= dist %>/libs': ['libs/bootstrap/**', 'libs/jquery/**', 'libs/jquery-ui/**']
-            },
-            options: {
-               basePath: 'libs', 
-               flatten: false
-            }
-        }        
-    },
-    compress: {
-        zip: {
-            options: {
-                mode: "zip",
-                //TODO: unfortunatly here <%= dist_source %> and <config:dist_source> does not work
-                basePath: "dist"
-               },
-            files: {
-                "<%= dist %>/bootstrap-editable-v<%= pkg.version %>.zip": "<%= dist %>/**"
-            }
-        }
-    },    
-    uglify: {}
-  });
-
-  // Default task.
-  grunt.registerTask('default', 'lint qunit');
-
-  // build
-  grunt.registerTask('build', 'clean lint qunit concat min copy compress');
-
- //to run particular task use ":", e.g. copy:libs 
-};
+/*global module:false*/
+module.exports = function(grunt) {
+
+  grunt.loadNpmTasks('grunt-contrib');
+
+  //grunt.loadTasks('tasks/');
+
+  // Project configuration.
+  grunt.initConfig({
+    pkg: '<json:package.json>',
+    dist: 'dist',
+    dist_source: '<%= dist %>/bootstrap-editable',
+    meta: {
+      banner: '/*! <%= pkg.title || pkg.name %> - v<%= pkg.version %> \n' +
+        '* <%= pkg.description %>\n' +
+        '* <%= pkg.homepage %>\n' +
+        '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
+        ' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */'
+    },
+    clean: ['<config:dist>'],
+    concat: {
+      dist_js: {
+        src: ['<banner:meta.banner>', '<file_strip_banner:src/js/bootstrap-editable.js>', '<file_strip_banner:src/js/bootstrap-datepicker.js>'],
+        dest: '<%= dist_source %>/js/<%= pkg.name %>.js'
+      },
+      dist_css: {
+        src: ['<banner:meta.banner>', '<file_strip_banner:src/css/bootstrap-editable.css>', '<file_strip_banner:src/css/datepicker.css>'],
+        dest: '<%= dist_source %>/css/<%= pkg.name %>.css'
+      }
+    },
+    /* disable that task as it's better to write changelog manualy
+    changelog: {
+       user: 'vitalets',
+       repo: 'bootstrap-editable',
+       dest: 'CHANGELOG.txt'
+    },
+    */
+    min: {
+      dist: {
+        src: ['<banner:meta.banner>', '<config:concat.dist_js.dest>'],
+        dest: '<%= dist_source %>/js/<%= pkg.name %>.min.js'
+      }
+    },
+    qunit: {
+      files: ['test/index.html']
+    },
+    lint: {
+     //TODO: lint tests files
+     //files: ['grunt.js', 'src/js/*.js', 'test/**/*.js']     
+//      files: ['grunt.js', 'src/js/*.js']
+      files: ['grunt.js', 'src/js/bootstrap-editable.js']
+    },
+    watch: {
+      files: '<config:lint.files>',
+      tasks: 'lint qunit'
+    },
+    jshint: {
+      options: {
+        curly: true,
+        eqeqeq: true,
+        immed: true,
+        latedef: true,
+        newcap: true,
+        noarg: true,
+        sub: true,
+        undef: true,
+        boss: true,
+        eqnull: true,
+        browser: true,
+        evil: false  //allow eval
+      },
+      globals: {
+        jQuery: true
+      }
+    },
+    copy: {
+        dist: {
+            files: {
+                '<%= dist_source %>/img' : 'src/img/*',
+                '<%= dist_source %>': ['LICENSE-GPL', 'LICENSE-MIT', 'README.md', 'CHANGELOG.txt']
+            },
+            options: {
+               flatten: true
+            }
+        },
+        libs: {
+            files: {
+                '<%= dist %>/libs': ['libs/bootstrap/**', 'libs/jquery/**']
+            },
+            options: {
+               basePath: 'libs', 
+               flatten: false
+            }
+        }        
+    },
+    //compress does not work properly for MAC OS (see https://github.com/vitalets/bootstrap-editable/issues/19)
+    //zip will be created manually
+    /*
+    compress: {
+        zip: {
+            options: {
+                mode: "zip",
+                //TODO: unfortunatly here <%= dist_source %> and <config:dist_source> does not work
+                basePath: "dist"
+               },
+            files: {
+                "<%= dist %>/bootstrap-editable-v<%= pkg.version %>.zip": ["<%= dist_source %>/ **", "<%= dist %>/libs/ **"]
+            }
+        },
+        tgz: {
+            options: {
+                mode: "tgz",
+                basePath: "dist"
+               },
+            files: {
+                "<%= dist %>/bootstrap-editable-v<%= pkg.version %>.tar.gz": ["<%= dist_source %>/ **", "<%= dist %>/libs/ **"]
+            }
+        }
+    },
+    */    
+    uglify: {}
+  });
+
+  // Default task.
+  grunt.registerTask('default', 'lint qunit');
+
+  // build
+  grunt.registerTask('build', 'clean lint qunit concat min copy');
+
+ //to run particular task use ":", e.g. copy:libs 
+};