Merge pull request #1 from TinderBox/dev

Test the merge of CatsGotMyTonge's fork of Ice (TinyMCE v4 changes) with the upstream master (NYTimes)

Gruntfile.js

@@ -55,6 +55,9 @@ module.exports = function(grunt) {
 
     uglify: {
       options: {
+        beautify : {
+            ascii_only : true
+          } ,
         preserveComments: false,
         banner: '//\n' +
           '// <%= pkg.name %> - v<%= pkg.version %>\n' +
@@ -64,7 +67,7 @@ module.exports = function(grunt) {
       },
       ice: {
         files: {
-          'dist/ice.min.js': ['lib/rangy/rangy-core.js', 'src/polyfills.js', 'src/ice.js', 'src/dom.js', 'src/bookmark.js', 'src/selection.js', 'src/icePlugin.js', 'src/icePluginManager.js', 'src/plugins/IceAddTitlePlugin/IceAddTitlePlugin.js', 'src/plugins/IceCopyPastePlugin/IceCopyPastePlugin.js', 'src/plugins/IceSmartQuotesPlugin/IceSmartQuotesPlugin.js', 'src/plugins/IceEmdashPlugin/IceEmdashPlugin.js']
+          'dist/ice.min.js': ['dist/ice.js']
         }
       },
       icemaster: {
@@ -76,17 +79,17 @@ module.exports = function(grunt) {
             '//\n'
         },
         files: {
-          'ice-master.min.js': ['lib/rangy/rangy-core.js', 'src/polyfills.js', 'src/ice.js', 'src/dom.js', 'src/bookmark.js', 'src/selection.js', 'src/icePlugin.js', 'src/icePluginManager.js', 'src/plugins/IceAddTitlePlugin/IceAddTitlePlugin.js', 'src/plugins/IceCopyPastePlugin/IceCopyPastePlugin.js', 'src/plugins/IceSmartQuotesPlugin/IceSmartQuotesPlugin.js', 'src/plugins/IceEmdashPlugin/IceEmdashPlugin.js']
+          'ice-master.min.js': ['dist/ice.js']
         }
       },
       tinyice: {
         files: {
-          'dist/ice_editor_plugin.js': 'lib/tinymce/jscripts/tiny_mce/plugins/ice/editor_plugin.js'
+          'dist/ice_editor_plugin.js': 'lib/tinymce/js/tinymce/plugins/ice/plugin.min.js'
         }
       },
       tinysr: {
         files: {
-          'dist/sr_editor_plugin.js': 'lib/tinymce/jscripts/tiny_mce/plugins/icesearchreplace/editor_plugin.js'
+          'dist/sr_editor_plugin.js': 'lib/tinymce/js/tinymce/plugins/icesearchreplace/plugin.min.js'
         }
       }
     },
@@ -125,7 +128,7 @@ module.exports = function(grunt) {
 
   grunt.registerTask('test', ['connect', 'qunit']);
 
-  grunt.registerTask('build', ['clean:build', 'uglify:ice', 'uglify:icemaster', 'concat', 'compress:gz', 'cp', 'compress:zip']);
+  grunt.registerTask('build', ['clean:build', 'concat', 'uglify:ice', 'uglify:icemaster', 'compress:gz', 'cp', 'compress:zip']);
 
   grunt.registerTask('cp', function() {
     cpTinyDir('ice');
@@ -136,7 +139,7 @@ module.exports = function(grunt) {
   });
 
   var cpTinyDir = function(dir) {
-    grunt.file.recurse('lib/tinymce/jscripts/tiny_mce/plugins/' + dir + '/', function(abspath, rootdir, subdir, filename) {
+    grunt.file.recurse('lib/tinymce/js/tinymce/plugins/' + dir + '/', function(abspath, rootdir, subdir, filename) {
       grunt.file.copy(rootdir + '/' + (subdir ? subdir + '/' : '') + filename,'dist/tinymce/plugins/' + dir + '/' + (subdir ? subdir + '/' : '') + '/' + filename);
     });
   };

README.md

@@ -1,14 +1,14 @@
 # ice.js
 
-Ice is a track changes implementation, built in javascript, for anything that is `contenteditable` on the web. Conceived by the CMS Group at The New York Times, ice has been piloting successfully for articles written in the newsroom.
+Ice is a track changes implementation, built in javascript, for anything that is `contenteditable` on the web. Conceived by the CMS Group at The New York Times, ice is powering the editor used for writing articles in the newsroom.
 
 ## Demo
 
-[Check it out!](http://NYTimes.github.com/ice/demo/)
+[Try it](http://NYTimes.github.com/ice/demo/)
 
 ## Download
 
-[v0.4.2](http://nytimes.github.com/ice/downloads/ice_0.4.2.zip)
+[v0.5.0](http://nytimes.github.com/ice/downloads/ice_0.5.0.zip)
 
 ## Features
 
@@ -111,17 +111,22 @@ Additional options:
 ```
 ***
 
-**_Wordpress initialization_**
+## Limitations/Dependencies
 
-     In testing - more to come soon.
+- ice needs to be initialized after the DOM ready event fires.
+- Wordpress support is limited. We need contribution from any willing WordPress developers.
+- Browser support is limited to Firefox (5+) and Webkit browsers, and minimal support for IE8+.
 
-***
+## Changelog
 
-## Limitations/Dependencies
+### Master
 
-- ice needs to be initialized after the DOM ready event fires.
-- ice was originally created for the simple markup behind nytimes.com articles (`p`, `a`, `em`, `strong`). As such, it requires that all text editing takes place in a common root block element, and that there are no other blocks found in the editor. Any type of inline elements are ok, inside of the common root blocks. 
-- Unfortunately, we haven't been able to test this across all browsers and versions. We know that it tests well in modern Firefox (5+) and Webkit browsers, and "seems to work" in IE7+. We intend to do more testing and get a better idea about what ice can support across browsers.
+- Fixes bug where Webkit browsers were throwing errors when the letter "v" was pressed. 
+
+### 0.5.0
+
+- Fixes cut, copy, paste for Firefox and Webkit browsers.
+- Fixes delete tracking in webkit browsers.
 
 ## License
 

demo/demo.css

@@ -145,4 +145,4 @@ a.mceButton16 img.mceIcon { width: 16px; height: 16px; padding: 2px;}
 
 .ins .del img {
     padding: 0px 3px;
-}
+}