Merge 2292d2f into 7667dcb

README.rst

@@ -86,6 +86,30 @@ Status of builds
 Changelog
 =========
 
+v1.2.1 - 2014-03-30
+-------------------
+
+* add selectivizr, a utility that emulates CSS3 pseudo-classes and attribute
+  selectors in Internet Explorer 6-8
+  [garbas]
+
+* all files in tests/ and js/ folder are now included in karma test runner
+  [garbas]
+
+* update node packages:
+    - coveralls: 2.8.0 -> 2.10.0
+    - grunt: 0.4.3 -> 0.4.4
+    - grunt-contrib-jshint: 0.8.0 -> 0.9.2
+    - grunt-contrib-less: 0.10.0 -> 0.11.0
+    - grunt-jscs-checker: 0.4.0 -> 0.4.1
+    - grunt-karma: 0.8.0 -> 0.8.2
+    - karma: 0.12.0 -> 0.12.1
+    - karma-coverage: 0.2.0 -> 0.2.1
+    - karma-mocha: 0.1.1 -> 0.1.3
+    - karma-sauce-launcher: 0.2.0 -> 0.2.4
+    - mocha: 1.17.1 -> 1.18.2
+
+
 v1.2.0 - 2014-03-25
 -------------------
 
@@ -104,6 +128,7 @@ v1.2.0 - 2014-03-25
 * make sure the router can find the pattern div
   [davisagli]
 
+
 v1.1.1 - 2014-03-12
 -------------------
 
@@ -113,6 +138,7 @@ v1.1.1 - 2014-03-12
 * fix grunthelper script
   [garbas]
 
+
 v1.1.0 - 2014-03-12
 -------------------
 
@@ -122,6 +148,7 @@ v1.1.0 - 2014-03-12
 * move grunt helper script to mockup-core (from mockup) repository
   [garbas]
 
+
 v1.0.1 - 2014-02-05
 -------------------
 
@@ -133,10 +160,12 @@ v1.0.1 - 2014-02-05
   and pattern via requirejs name registered in requirejs paths.
   [garbas]
 
+
 v1.0.0 - 2014-01-21
 -------------------
 
 * Initial release.
   [garbas]
 
+
 .. _Mockup: https://github.com/plone/mockup

bower.json

@@ -1,12 +1,13 @@
 {
   "name": "mockup-core",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Mockup Core",
   "dependencies": {
     "backbone": "1.1.2",
     "bootstrap": "3.1.1",
     "console-polyfill": "0.1.1",
     "es5-shim": "2.3.0",
+    "selectivizr": "1.0.2",
     "jquery": "1.8.3",
     "lodash": "2.4.1",
     "marked": "0.3.2",

bower.nix

@@ -54,4 +54,9 @@
     target = "1.1.2";
     outputHash = "1h5yy2lbwd8ik6cyi234hv4i0cy1dijlh6s65kqi0asq1qzi18bs";
   }
+  { name = "selectivizr";
+    version = "1.0.2";
+    target = "1.0.2";
+    outputHash = "0dzy131cg158c79jbgrrgksca068g7xddmpjsimpy0pm24zdas51";
+  }
 ]

default.nix

@@ -11,11 +11,11 @@ let
     generated = ./package.nix;
   };
 in rec {
-  tarball = pkgs.runCommand "mockup-core-1.2.0.tgz" { buildInputs = [ pkgs.nodejs ]; } ''
+  tarball = pkgs.runCommand "mockup-core-1.2.1.tgz" { buildInputs = [ pkgs.nodejs ]; } ''
     mv `HOME=$PWD npm pack ${mockup-core}` $out
   '';
   build = nodePackages.buildNodePackage {
-    name = "mockup-core-1.2.0";
+    name = "mockup-core-1.2.1";
     src = [ tarball ];
     buildInputs = [ ];
     deps = with nodePackages; [

js/grunt.js

@@ -41,7 +41,6 @@
           this.gruntConfig.uglify[name] = this.gruntConfig.uglify[name] || {};
           this.gruntConfig.uglify[name].files = this.gruntConfig.uglify[name].files || {};
           this.gruntConfig.uglify[name].files[bundleOptions.path + name + '.js'] = [
-            'node_modules/grunt-contrib-less/node_modules/less/dist/less-1.6.1.js',
             'bower_components/domready/ready.js',
             'node_modules/requirejs/require.js',
             'bower_components/jquery/jquery.js',
@@ -153,13 +152,15 @@
         * include initial framework (mocha and requirejs) with html5
         * shims/shams/polyfills
         */
+        'bower_components/selectivizr/selectivizr.js',
         'bower_components/es5-shim/es5-shim.js',
         'bower_components/es5-shim/es5-sham.js',
         'bower_components/console-polyfill/index.js',
         'node_modules/mocha/mocha.js',
         'node_modules/karma-mocha/lib/adapter.js',
         'node_modules/requirejs/require.js',
         'node_modules/karma-requirejs/lib/adapter.js',
+
         /*
         * include requirejs configuration
         */
@@ -197,19 +198,8 @@
       * tests/ folders.
       */
       this.files = this.files.concat([
-        {pattern: 'tests/example-resource*', included: false},
-        {pattern: 'tests/json/*.json', included: false},
-        {pattern: 'tests/fakeserver*', included: false},
-        {pattern: 'tests/*-test.js', included: false},
-        {pattern: 'tests/**/*-test.js', included: false},
-        {pattern: 'js/ui/**/*.js', included: false},
-        {pattern: 'js/ui/**/*.xml', included: false},
-        {pattern: 'js/patterns/structure/**/*.js', included: false},
-        {pattern: 'js/patterns/structure/**/*.xml', included: false},
-        {pattern: 'js/patterns/filemanager/**/*.xml', included: false},
-        {pattern: 'js/patterns/filemanager/**/*.js', included: false},
-        {pattern: 'js/patterns/tinymce/**/*.xml', included: false},
-        {pattern: 'js/patterns/tinymce/**/*.js', included: false},
+        {pattern: 'tests/**/*', included: false},
+        {pattern: 'js/**/*', included: false}
       ]);
 
 

package.json

@@ -1,35 +1,35 @@
 {
   "name": "mockup-core",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Plone CMS Mockup Core",
   "homepage": "http://plone.github.io/mockup",
   "devDependencies": {
     "bower": "~1.3.1",
-    "coveralls": "~2.8.0",
+    "coveralls": "~2.10.0",
     "extend": "~1.2.1",
-    "grunt": "~0.4.3",
+    "grunt": "~0.4.4",
     "grunt-cli": "~0.1.13",
     "grunt-contrib-copy": "~0.5.0",
-    "grunt-contrib-jshint": "~0.8.0",
-    "grunt-contrib-less": "~0.10.0",
+    "grunt-contrib-jshint": "~0.9.2",
+    "grunt-contrib-less": "~0.11.0",
     "grunt-contrib-requirejs": "~0.4.3",
     "grunt-contrib-uglify": "~0.4.0",
     "grunt-contrib-watch": "~0.6.1",
-    "grunt-jscs-checker": "~0.4.0",
-    "grunt-karma": "~0.8.0",
+    "grunt-jscs-checker": "~0.4.1",
+    "grunt-karma": "~0.8.2",
     "grunt-sed": "~0.1.1",
-    "karma": "~0.12.0",
+    "karma": "~0.12.1",
     "karma-chrome-launcher": "~0.1.2",
-    "karma-coverage": "~0.2.0",
+    "karma-coverage": "~0.2.1",
     "karma-junit-reporter": "~0.2.1",
-    "karma-mocha": "~0.1.1",
+    "karma-mocha": "~0.1.3",
     "karma-phantomjs-launcher": "~0.1.2",
     "karma-requirejs": "~0.2.1",
-    "karma-sauce-launcher": "~0.2.0",
+    "karma-sauce-launcher": "~0.2.4",
     "karma-script-launcher": "~0.1.0",
     "lcov-result-merger": "~0.0.2",
     "less": "~1.7.0",
-    "mocha": "~1.17.1",
+    "mocha": "~1.18.2",
     "requirejs": "~2.1.11"
   },
   "maintainers": [