smart_tag 0.4.2 → 0.5.4

data/lib/smart_tag/helper.rb

@@ -8,22 +8,20 @@ module SmartTag
     #   output << text_area_tag(name, content, input_html)
     # end
     
-    def smart_tag(name)
-      name
-      # input_html = (options.delete(:input_html) || {})
-      # hash = input_html.stringify_keys
-      # instance_tag = ActionView::Base::FormBuilder.new(name, method, self, options.delete(:object))
-      # instance_tag.send(:add_default_name_and_id, hash)      
-      # output_buffer = ActiveSupport::SafeBuffer.new
-      # output_buffer << instance_tag.to_text_area_tag(input_html)
-
+    def smart_tag(name, method, options = {})
+      input_html = (options.delete(:input_html) || {})
+      hash = input_html.stringify_keys
+      instance_tag = ActionView::Base::FormBuilder.new(name, method, self, options.delete(:object))
+      instance_tag.send(:add_default_name_and_id, hash)      
+      output_buffer = ActiveSupport::SafeBuffer.new
+      output_buffer << instance_tag.to_text_area_tag(input_html)
     end
      
   end
   
-  # module Builder
-  #   def smart_tag(method, options = {})
-  #     @template.send("smart_tag", @object_name, method, objectify_options(options))
-  #   end
-  # end
+  module Builder
+    def smart_tag(method, options = {})
+      @template.send("smart_tag", @object_name, method, objectify_options(options))
+    end
+  end
 end

data/lib/smart_tag/version.rb

@@ -1,3 +1,3 @@
 module SmartTag
-  VERSION = "0.4.2"
+  VERSION = "0.5.4"
 end

data/vendor/assets/javascripts/smart_tag/smart_tag.js

@@ -4,6 +4,7 @@
     function Base(select) {
       var that = {};
       that.select = select;
+      that.is_start = false;
 
       that.inArray = function(array, value) {
         for (var i = array.length - 1; i >= 0; i--) {
@@ -94,6 +95,7 @@
 
       that.start = function() {
         that.createTags();
+        that.is_start = true;
       };
 
       return that;
@@ -102,6 +104,7 @@
     function SmartTag(select) {
 
       var that = Base(select);
+      that.is_add = that.select.attr('is_add') ? that.select.attr('is_add') : true;
 
       that.ajaxAddTag = function(add_tag) {
         var controller = that.select.attr('controller');
@@ -141,10 +144,15 @@
           var add_tag = ui.tagLabel;
           all_options = that.getOptions(that.select.children('option'));
 
+          that.ul.parents(".control-group").removeClass("error");
+
           if (that.inArray(all_options, add_tag)) {
             that.changeSelected(that.ul.tagit("assignedTags"), that.addSelected);   
+          } else if (true === that.is_add) {
+              that.ajaxAddTag(add_tag);
           } else {
-            that.ajaxAddTag(add_tag);
+            that.ul.tagit("removeTagByLabel", add_tag);
+            that.ul.parents(".control-group").addClass("error");
           }
         },
         afterTagRemoved: function(event, ui) {
@@ -184,11 +192,12 @@
             that.ul.parents(".control-group").addClass("error");
             that.ul.parents(".control-group").find('.help-inline').text("You should choice one career.");
           }
-          
 
           if(that.ul.tagit("assignedTags").length == 1){
             that.ul.find(".ui-autocomplete-input").attr('disabled', 'disabled');
-            that.select.focus();
+            if (true === that.is_start) {
+              that.select.focus();
+            }
           }
         },
         afterTagRemoved: function(event, ui) {

data/vendor/assets/javascripts/smart_tag/smart_tag.min.js

@@ -1,7 +1,7 @@
-(function(f){f(document).ready(function(){function k(e){var a={};a.select=e;a.inArray=function(a,c){for(var b=a.length-1;0<=b;b--)if(a[b]==c)return!0;return!1};a.clearText=function(a){return a.replace(/^\s+|\s+$/g,"")};a.getOptions=function(d){for(var c=[],b=d.length-1;0<=b;b--){var e=a.clearText(f(d[b]).text());a.inArray(c,e)||c.push(e)}return c};a.createTags=function(){for(var d=a.selected_options.length-1;0<=d;d--)a.ul.tagit("createTag",a.selected_options[d])};a.changeTags=function(){for(var d=
+(function(f){f(document).ready(function(){function k(e){var a={};a.select=e;a.is_start=!1;a.inArray=function(a,c){for(var b=a.length-1;0<=b;b--)if(a[b]==c)return!0;return!1};a.clearText=function(a){return a.replace(/^\s+|\s+$/g,"")};a.getOptions=function(d){for(var c=[],b=d.length-1;0<=b;b--){var e=a.clearText(f(d[b]).text());a.inArray(c,e)||c.push(e)}return c};a.createTags=function(){for(var d=a.selected_options.length-1;0<=d;d--)a.ul.tagit("createTag",a.selected_options[d])};a.changeTags=function(){for(var d=
 a.getOptions(a.select.children("option:selected")),c=a.ul.tagit("assignedTags"),b=c.length-1;0<=b;b--)a.inArray(d,c[b])||a.ul.tagit("removeTagByLabel",c[b]);for(b=d.length-1;0<=b;b--)a.inArray(c,d[b])||a.ul.tagit("createTag",d[b])};a.addSelected=function(d,c){a.inArray(d,a.clearText(c.text()))&&c.attr("selected",!0)};a.removeSelected=function(d,c){a.inArray(d,a.clearText(c.text()))||c.attr("selected",!1)};a.changeSelected=function(d,c){for(var b=a.select.children("option"),e=b.length-1;0<=e;e--)c(d,
-f(b[e]))};a.all_options=a.getOptions(e.children("option"));a.selected_options=a.getOptions(e.children("option:selected"));a.ul=f("<ul></ul>");e.before(a.ul);a.ul.css({"margin-left":"0px",width:"488px"});a.select.change(function(){a.changeTags()});a.start=function(){a.createTags()};return a}function l(e){var a=k(e);a.ajaxAddTag=function(d){var c=a.select.attr("controller");if(c){var b=a.select.attr("action")?a.select.attr("action"):"create",g=a.select.attr("param")?a.select.attr("param"):"title",b=
-"/"+(a.select.attr("controllers")?a.select.attr("controllers"):c+"s")+"/"+b,h={};h[c+"["+g+"]"]=d;f.ajax({url:b,dataType:"json",type:"POST",data:h,success:function(a){a?e.prepend('<option selected="selected" value="'+a.id+'">'+d+"</option>"):console.log("josn is null")}})}else console.log("select's controller param is null")};a.ul.tagit({allowSpaces:!0,availableTags:a.all_options,afterTagAdded:function(d,c){var b=c.tagLabel;all_options=a.getOptions(a.select.children("option"));a.inArray(all_options,
-b)?a.changeSelected(a.ul.tagit("assignedTags"),a.addSelected):a.ajaxAddTag(b)},afterTagRemoved:function(){a.changeSelected(a.ul.tagit("assignedTags"),a.removeSelected)}});return a}function m(e){var a=k(e);a.ul.tagit({allowSpaces:!0,availableTags:a.all_options,tagLimit:1,afterTagAdded:function(d,c){var b=c.tagLabel;all_options=a.getOptions(a.select.children("option"));a.inArray(all_options,b)?(a.changeSelected(a.ul.tagit("assignedTags"),a.addSelected),a.ul.parents(".control-group").removeClass("error"),
-a.ul.parents(".control-group").addClass("success"),a.ul.parents(".control-group").find(".help-inline").text("Success!")):(a.ul.tagit("removeAll"),a.ul.parents(".control-group").removeClass("success"),a.ul.parents(".control-group").addClass("error"),a.ul.parents(".control-group").find(".help-inline").text("You should choice one career."));1==a.ul.tagit("assignedTags").length&&(a.ul.find(".ui-autocomplete-input").attr("disabled","disabled"),a.select.focus())},afterTagRemoved:function(){a.changeSelected(a.ul.tagit("assignedTags"),
-a.removeSelected);1>a.ul.tagit("assignedTags").length&&a.ul.find(".ui-autocomplete-input").removeAttr("disabled")}});return a}for(var h=f(".smart_tag"),g=h.length-1;0<=g;g--){var j=l(f(h[g]));j.start()}h=f(".single_choice");for(g=h.length-1;0<=g;g--)j=m(f(h[g])),j.start()})})(window.jQuery);
+f(b[e]))};a.all_options=a.getOptions(e.children("option"));a.selected_options=a.getOptions(e.children("option:selected"));a.ul=f("<ul></ul>");e.before(a.ul);a.ul.css({"margin-left":"0px",width:"488px"});a.select.change(function(){a.changeTags()});a.start=function(){a.createTags();a.is_start=!0};return a}function l(e){var a=k(e);a.is_add=a.select.attr("is_add")?a.select.attr("is_add"):!0;a.ajaxAddTag=function(d){var c=a.select.attr("controller");if(c){var b=a.select.attr("action")?a.select.attr("action"):
+"create",g=a.select.attr("param")?a.select.attr("param"):"title",b="/"+(a.select.attr("controllers")?a.select.attr("controllers"):c+"s")+"/"+b,h={};h[c+"["+g+"]"]=d;f.ajax({url:b,dataType:"json",type:"POST",data:h,success:function(a){a?e.prepend('<option selected="selected" value="'+a.id+'">'+d+"</option>"):console.log("josn is null")}})}else console.log("select's controller param is null")};a.ul.tagit({allowSpaces:!0,availableTags:a.all_options,afterTagAdded:function(d,c){var b=c.tagLabel;all_options=
+a.getOptions(a.select.children("option"));a.ul.parents(".control-group").removeClass("error");a.inArray(all_options,b)?a.changeSelected(a.ul.tagit("assignedTags"),a.addSelected):!0===a.is_add?a.ajaxAddTag(b):(a.ul.tagit("removeTagByLabel",b),a.ul.parents(".control-group").addClass("error"))},afterTagRemoved:function(){a.changeSelected(a.ul.tagit("assignedTags"),a.removeSelected)}});return a}function m(e){var a=k(e);a.ul.tagit({allowSpaces:!0,availableTags:a.all_options,tagLimit:1,afterTagAdded:function(d,
+c){var b=c.tagLabel;all_options=a.getOptions(a.select.children("option"));a.inArray(all_options,b)?(a.changeSelected(a.ul.tagit("assignedTags"),a.addSelected),a.ul.parents(".control-group").removeClass("error"),a.ul.parents(".control-group").addClass("success"),a.ul.parents(".control-group").find(".help-inline").text("Success!")):(a.ul.tagit("removeAll"),a.ul.parents(".control-group").removeClass("success"),a.ul.parents(".control-group").addClass("error"),a.ul.parents(".control-group").find(".help-inline").text("You should choice one career."));
+1==a.ul.tagit("assignedTags").length&&(a.ul.find(".ui-autocomplete-input").attr("disabled","disabled"),!0===a.is_start&&a.select.focus())},afterTagRemoved:function(){a.changeSelected(a.ul.tagit("assignedTags"),a.removeSelected);1>a.ul.tagit("assignedTags").length&&a.ul.find(".ui-autocomplete-input").removeAttr("disabled")}});return a}for(var h=f(".smart_tag"),g=h.length-1;0<=g;g--){var j=l(f(h[g]));j.start()}h=f(".single_choice");for(g=h.length-1;0<=g;g--)j=m(f(h[g])),j.start()})})(window.jQuery);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_tag
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails