bug fix

shawjia · May 8, 2014 · ef71d3a · ef71d3a
1 parent b976e58
commit ef71d3a
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 18 deletions.
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -85,7 +85,25 @@ module.exports = (grunt) ->
         }, {
           src: 'lib/simditor-all.js',
           dest: 'site/assets/scripts/simditor-all.js'
+        }, {
+          src: 'lib/simditor-all.min.js',
+          dest: 'site/assets/scripts/simditor-all.min.js'
+        }]
+
+      styles:
+        files: [{
+          src: 'styles/simditor.css',
+          dest: 'site/assets/styles/simditor.css'
         }]
+      scripts:
+        files: [{
+          src: 'lib/simditor-all.js',
+          dest: 'site/assets/scripts/simditor-all.js'
+        }, {
+          src: 'lib/simditor-all.min.js',
+          dest: 'site/assets/scripts/simditor-all.min.js'
+        }]
+
       package:
         files: [{
           expand: true,
@@ -189,6 +207,6 @@ module.exports = (grunt) ->
   grunt.loadNpmTasks 'grunt-shell'
 
   grunt.registerTask 'default', ['site', 'express', 'watch']
-  grunt.registerTask 'site', ['sass', 'concat:simditor', 'coffee', 'concat:all', 'uglify:simditor', 'copy:site', 'shell']
-  grunt.registerTask 'package', ['clean:package', 'copy:package', 'compress']
+  grunt.registerTask 'site', ['sass', 'concat:simditor', 'coffee', 'concat:all', 'copy:site', 'shell']
+  grunt.registerTask 'package', ['uglify:simditor', 'clean:package', 'copy:package', 'compress']
 
diff --git a/lib/simditor-all.js b/lib/simditor-all.js
diff --git a/lib/simditor-all.min.js b/lib/simditor-all.min.js
diff --git a/lib/simditor.js b/lib/simditor.js
diff --git a/lib/simditor.min.js b/lib/simditor.min.js
diff --git a/site/assets/_sass/app.scss b/site/assets/_sass/app.scss
@@ -119,7 +119,6 @@ a {
 		display: block;
 		width: 133px;
 		height: 133px;
-		background: url(../images/fork.pn) no-repeat 0 0;
 		position: absolute;
 		top: 0;
 		right: 0;

diff --git a/site/assets/scripts/simditor-all.js b/site/assets/scripts/simditor-all.js
diff --git a/site/assets/scripts/simditor-all.min.js b/site/assets/scripts/simditor-all.min.js
diff --git a/site/assets/styles/app.css b/site/assets/styles/app.css
@@ -469,7 +469,6 @@ a:hover, a:active {
   display: block;
   width: 133px;
   height: 133px;
-  background: url(../images/fork.pn) no-repeat 0 0;
   position: absolute;
   top: 0;
   right: 0;

diff --git a/site/index.html b/site/index.html
@@ -16,6 +16,6 @@
 </textarea>
 </section>
 
-<script type="text/javascript" src="assets/scripts/simditor-all.min.js"></script>
+<script type="text/javascript" src="assets/scripts/simditor-all.js"></script>
 <script type="text/javascript" src="assets/scripts/page-demo.js"></script>
 
diff --git a/src/simditor.coffee b/src/simditor.coffee
@@ -954,7 +954,7 @@ class UndoManager extends Plugin
     state = @_stack[@_index]
     @editor.body.html state.html
     @caretPosition state.caret
-    @editor.find('.selected').removeClass('selected')
+    @editor.body.find('.selected').removeClass('selected')
     @editor.sync()
 
     @editor.trigger 'valuechanged', ['undo']
@@ -970,7 +970,7 @@ class UndoManager extends Plugin
     state = @_stack[@_index]
     @editor.body.html state.html
     @caretPosition state.caret
-    @editor.find('.selected').removeClass('selected')
+    @editor.body.find('.selected').removeClass('selected')
     @editor.sync()
 
     @editor.trigger 'valuechanged', ['undo']

diff --git a/src/undoManager.coffee b/src/undoManager.coffee
@@ -76,7 +76,7 @@ class UndoManager extends Plugin
     state = @_stack[@_index]
     @editor.body.html state.html
     @caretPosition state.caret
-    @editor.find('.selected').removeClass('selected')
+    @editor.body.find('.selected').removeClass('selected')
     @editor.sync()
 
     @editor.trigger 'valuechanged', ['undo']
@@ -92,7 +92,7 @@ class UndoManager extends Plugin
     state = @_stack[@_index]
     @editor.body.html state.html
     @caretPosition state.caret
-    @editor.find('.selected').removeClass('selected')
+    @editor.body.find('.selected').removeClass('selected')
     @editor.sync()
 
     @editor.trigger 'valuechanged', ['undo']