diff --git a/components/active/init.js b/components/active/init.js index fbad7f3..31a4e7f 100755 --- a/components/active/init.js +++ b/components/active/init.js @@ -210,7 +210,13 @@ var active = { ////////////////////////////////////////////////////////////////// get_selected_text : function(){ - return editor.get_selected_text(active.get_id()); + var path = this.get_path(); + var id = this.get_id(); + if(path && id){ + return editor.get_selected_text(active.get_id()); + }else{ + message.error('No Open Files or Selected Text'); + } }, ////////////////////////////////////////////////////////////////// diff --git a/components/color_picker/dialog.php b/components/color_picker/dialog.php index 91df74e..b9a9647 100644 --- a/components/color_picker/dialog.php +++ b/components/color_picker/dialog.php @@ -17,7 +17,13 @@ $(function(){ selected = active.get_selected_text(); - sellength = selected.length; + + if(selected==null){ + selected = '#45818a'; + sellength = 7; + }else{ + sellength = selected.length; + } var colorRegEx = /^#?([a-f]|[A-F]|[0-9]){3}(([a-f]|[A-F]|[0-9]){3})?$/; seltest = colorRegEx.test(selected);