Merge pull request #32 from washingtonstateuniversity/update-css-mirror

[PR] Update CodeMirror to 5.25.0

.gitignore

@@ -0,0 +1,3 @@
+composer.lock
+node_modules
+vendor

.travis.yml

@@ -0,0 +1,51 @@
+sudo: false
+language: php
+
+# Cache some data across builds for performance.
+cache:
+  apt: true
+  directories:
+    - node_modules
+
+# Set the default environment.
+env:
+  global:
+    - WP_TRAVISCI=travis:phpunit
+    - WP_VERSION=latest
+    - WP_MULTISITE=1
+
+notifications:
+  email:
+    on_success: never
+    on_failure: change
+  slack:
+    on_pull_requests: true
+    on_success: change
+    on_failure: always
+    on_start: never
+    on_cancel: always
+    rooms:
+      - wsu-ucomm:n2TLZRJd84rMOMbkKthSEMgS
+
+branches:
+  only:
+    - master
+
+matrix:
+  include:
+    - php: 7.0
+      env: WP_TRAVISCI=travis:grunt
+
+before_script:
+    - npm --version
+    - node --version
+    - nvm install stable
+    - npm install -g grunt-cli
+    - npm install
+    - npm prune
+    - npm --version
+    - node --version
+
+script:
+    - grunt --version
+    - grunt default

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.3.0 (April 17, 2017)
+
+* Update CodeMirror 5.25.0
+* Reorganize repository to make future library upgrades easier.
+
 ## 2.2.1 (October 27, 2016)
 
 * Add support for CodeMirror search, jump to line, etc...

Gruntfile.js

@@ -0,0 +1,40 @@
+module.exports = function( grunt ) {
+	grunt.initConfig( {
+		pkg: grunt.file.readJSON( "package.json" ),
+
+		concat: {
+			code_mirror: {
+				src: [
+					"src/js/codemirror.js",
+					"src/js/codemirror-css-mode.js"
+				],
+				dest: "src/js/codemirror-temp.js"
+			}
+		},
+
+		uglify: {
+			code_mirror: {
+				options: {
+					banner: '// CodeMirror 5.25.0 - MIT Licensed - https://github.com/codemirror/CodeMirror - Includes CSS module.'
+				},
+				src: "src/js/codemirror-temp.js",
+				dest: "js/codemirror.min.js"
+			}
+		},
+
+		clean: {
+			options: {
+				force: true
+			},
+			temp: [ "src/js/codemirror-temp.js" ]
+		}
+
+	} );
+
+	grunt.loadNpmTasks( "grunt-contrib-concat" );
+	grunt.loadNpmTasks( "grunt-contrib-clean" );
+	grunt.loadNpmTasks( "grunt-contrib-uglify" );
+
+	// Default task(s).
+	grunt.registerTask( "default", [ "concat", "uglify", "clean" ] );
+};

LICENSE

@@ -1,6 +1,6 @@
 WSU Custom CSS
 
-Copyright 2014 by Washington State University
+Copyright 2014-2017 by Washington State University
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -26,6 +26,12 @@ permission notices:
 
   Jetpack is released under the GPLv2+ license
 
+  CodeMirror - In-browser code editor
+
+  https://github.com/codemirror/CodeMirror
+
+  CodeMirror is copyright (C) 2017 by Marijn Haverbeke <[email protected]> and others
+
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
                     GNU GENERAL PUBLIC LICENSE
@@ -373,4 +379,4 @@ WRITTEN OFFER
 The source code for any program binaries or compressed scripts that are
 included with WSU Custom CSS can be freely obtained at the following URL:
 
-	https://github.com/washingtonstateuniversity/WSUWP-Plugin-Custom-CSS/pull/8
+	https://github.com/washingtonstateuniversity/WSUWP-Plugin-Custom-CSS/pull/8