Merge pull request #17 from plone/tinymce-font-fix

tinymce icons/font packaging fixed
plone · Apr 19, 2014 · d234919 · d234919
2 parents d6941a8 + 8763412
commit d234919
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/README.rst b/README.rst
@@ -86,6 +86,13 @@ Status of builds
 Changelog
 =========
 
+v1.2.4 - 2014-04-19
+-------------------
+
+* tinymce icons/font packaging fixed
+  [garbas]
+
+
 v1.2.3 - 2014-03-31
 -------------------
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "mockup-core",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Mockup Core",
   "dependencies": {
     "backbone": "1.1.2",

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

diff --git a/js/grunt.js b/js/grunt.js
@@ -84,10 +84,13 @@
               expand: true, cwd: 'bower_components/bootstrap/dist/fonts/', src: 'glyphicons-halflings-regular.*', dest: bundleOptions.path,
               rename: function(dest, src) { return dest + name + '-bootstrap-' + src; }
             }, {
-              expand: true, cwd: 'lib/tinymce/skins/lightgray/fonts/', src: 'icomoon.*', dest: bundleOptions.path,
-              rename: function(dest, src) { return dest + name + '-tinymce-' + src; }
+              expand: true, cwd: 'lib/tinymce/skins/lightgray/fonts/', src: 'tinymce*', dest: bundleOptions.path,
+              rename: function(dest, src) { return dest + name + '-tinymce-font-' + src; }
+            }, {
+              expand: true, cwd: 'lib/tinymce/skins/lightgray/img/', src: '*', dest: bundleOptions.path,
+              rename: function(dest, src) { return dest + name + '-tinymce-img-' + src; }
             }, {
-              expand: true, cwd: 'lib/tinymce/skins/lightgray/img/', src: 'loader.gif', dest: bundleOptions.path,
+              expand: true, cwd: 'lib/tinymce/skins/lightgray/', src: 'content.min.css', dest: bundleOptions.path,
               rename: function(dest, src) { return dest + name + '-tinymce-' + src; }
             }, {
               expand: true, cwd: 'bower_components/jqtree/', src: 'jqtree-circle.png', dest: bundleOptions.path,
@@ -123,15 +126,25 @@
             pattern: 'url\\(\'select2',
             replacement: 'url(\'' + bundleOptions.url + '-select2-select2'
           };
-          this.gruntConfig.sed[name + '-tinymce-icomoon'] = {
+          this.gruntConfig.sed[name + '-tinymce-fonts'] = {
             path: bundleOptions.path + name + '.min.css',
-            pattern: 'url\\(\'fonts/icomoon',
-            replacement: 'url(\'' + bundleOptions.url + '-tinymce-icomoon'
+            pattern: 'url\\(\'fonts/tinymce',
+            replacement: 'url(\'' + bundleOptions.url + '-tinymce-font-tinymce'
           };
-          this.gruntConfig.sed[name + '-tinymce-loader'] = {
+          this.gruntConfig.sed[name + '-tinymce-img-loader'] = {
             path: bundleOptions.path + name + '.min.css',
             pattern: 'url\\(\'img/loader.gif',
-            replacement: 'url(\'' + bundleOptions.url + '-tinymce-loader.gif'
+            replacement: 'url(\'' + bundleOptions.url + '-tinymce-img-loader.gif'
+          };
+          this.gruntConfig.sed[name + '-tinymce-img-anchor'] = {
+            path: bundleOptions.path + name + '.min.css',
+            pattern: 'url\\(\'img/anchor.gif',
+            replacement: 'url(\'' + bundleOptions.url + '-tinymce-img-anchor.gif'
+          };
+          this.gruntConfig.sed[name + '-tinymce-img-object'] = {
+            path: bundleOptions.path + name + '.min.css',
+            pattern: 'url\\(\'img/object.gif',
+            replacement: 'url(\'' + bundleOptions.url + '-tinymce-img-object.gif'
           };
           this.gruntConfig.sed[name + '-jqtree-circle'] = {
             path: bundleOptions.path + name + '.min.css',

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mockup-core",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Plone CMS Mockup Core",
   "homepage": "http://plone.github.io/mockup",
   "devDependencies": {