浏览代码

Merge pull request #281 from frapontillo/feature/removeWrappers

fix (wrapper): remove useless wrapper customization methods
Emanuele 11 年之前
父节点
当前提交
8b1ad5cafb
共有 3 个文件被更改,包括 13 次插入139 次删除
  1. 7 73
      dist/js/bootstrap-switch.js
  2. 0 0
      dist/js/bootstrap-switch.min.js
  3. 6 66
      src/coffee/bootstrap-switch.coffee

+ 7 - 73
dist/js/bootstrap-switch.js

@@ -43,7 +43,13 @@
           offColor: this.$element.data("off-color"),
           onText: this.$element.data("on-text"),
           offText: this.$element.data("off-text"),
-          labelText: this.$element.data("label-text")
+          labelText: this.$element.data("label-text"),
+          onModifierClass: "on",
+          offModifierClass: "off",
+          focusedModifierClass: "focused",
+          animateModifierClass: "animate",
+          disabledModifierClass: "disabled",
+          readonlyModifierClass: "readonly"
         });
         this.$wrapper = $("<div>", {
           "class": (function(_this) {
@@ -282,72 +288,6 @@
         return this.$element;
       };
 
-      BootstrapSwitch.prototype.onModifierClass = function(value) {
-        if (typeof value === "undefined") {
-          return this.options.onModifierClass;
-        }
-        if (this.$wrapper.hasClass("" + this.options.baseClass + "-" + this.options.onModifierClass)) {
-          this.$wrapper.removeClass("" + this.options.baseClass + "-" + this.options.onModifierClass).addClass("" + this.options.baseClass + "-" + value);
-        }
-        this.options.onModifierClass = value;
-        return this.$element;
-      };
-
-      BootstrapSwitch.prototype.offModifierClass = function(value) {
-        if (typeof value === "undefined") {
-          return this.options.offModifierClass;
-        }
-        if (this.$wrapper.hasClass("" + this.options.baseClass + "-" + this.options.offModifierClass)) {
-          this.$wrapper.removeClass("" + this.options.baseClass + "-" + this.options.offModifierClass).addClass("" + this.options.baseClass + "-" + value);
-        }
-        this.options.offModifierClass = value;
-        return this.$element;
-      };
-
-      BootstrapSwitch.prototype.focusedModifierClass = function(value) {
-        if (typeof value === "undefined") {
-          return this.options.focusedModifierClass;
-        }
-        if (this.$wrapper.hasClass("" + this.options.baseClass + "-" + this.options.focusedModifierClass)) {
-          this.$wrapper.removeClass("" + this.options.baseClass + "-" + this.options.focusedModifierClass).addClass("" + this.options.baseClass + "-" + value);
-        }
-        this.options.focusedModifierClass = value;
-        return this.$element;
-      };
-
-      BootstrapSwitch.prototype.animateModifierClass = function(value) {
-        if (typeof value === "undefined") {
-          return this.options.animateModifierClass;
-        }
-        if (this.$wrapper.hasClass("" + this.options.baseClass + "-" + this.options.animateModifierClass)) {
-          this.$wrapper.removeClass("" + this.options.baseClass + "-" + this.options.animateModifierClass).addClass("" + this.options.baseClass + "-" + value);
-        }
-        this.options.animateModifierClass = value;
-        return this.$element;
-      };
-
-      BootstrapSwitch.prototype.disabledModifierClass = function(value) {
-        if (typeof value === "undefined") {
-          return this.options.disabledModifierClass;
-        }
-        if (this.$wrapper.hasClass("" + this.options.baseClass + "-" + this.options.disabledModifierClass)) {
-          this.$wrapper.removeClass("" + this.options.baseClass + "-" + this.options.disabledModifierClass).addClass("" + this.options.baseClass + "-" + value);
-        }
-        this.options.disabledModifierClass = value;
-        return this.$element;
-      };
-
-      BootstrapSwitch.prototype.readonlyModifierClass = function(value) {
-        if (typeof value === "undefined") {
-          return this.options.readonlyModifierClass;
-        }
-        if (this.$wrapper.hasClass("" + this.options.baseClass + "-" + this.options.readonlyModifierClass)) {
-          this.$wrapper.removeClass("" + this.options.baseClass + "-" + this.options.readonlyModifierClass).addClass("" + this.options.baseClass + "-" + value);
-        }
-        this.options.readonlyModifierClass = value;
-        return this.$element;
-      };
-
       BootstrapSwitch.prototype.destroy = function() {
         var $form;
         $form = this.$element.closest("form");
@@ -553,12 +493,6 @@
       handleOffClass: "handle-off"
       labelClass: "label"
        */
-      onModifierClass: "on",
-      offModifierClass: "off",
-      focusedModifierClass: "focused",
-      animateModifierClass: "animate",
-      disabledModifierClass: "disabled",
-      readonlyModifierClass: "readonly",
       onInit: function() {},
       onSwitchChange: function() {}
     };

文件差异内容过多而无法显示
+ 0 - 0
dist/js/bootstrap-switch.min.js


+ 6 - 66
src/coffee/bootstrap-switch.coffee

@@ -17,6 +17,12 @@ do ($ = window.jQuery, window) ->
         onText: @$element.data "on-text"
         offText: @$element.data "off-text"
         labelText: @$element.data "label-text"
+        onModifierClass: "on"
+        offModifierClass: "off"
+        focusedModifierClass: "focused"
+        animateModifierClass: "animate"
+        disabledModifierClass: "disabled"
+        readonlyModifierClass: "readonly"
       @$wrapper = $ "<div>",
         class: do =>
           classes = ["#{@options.baseClass}"]
@@ -197,66 +203,6 @@ do ($ = window.jQuery, window) ->
       @options.wrapperClass = value
       @$element
 
-    onModifierClass: (value) ->
-      return @options.onModifierClass if typeof value is "undefined"
-
-      if @$wrapper.hasClass "#{@options.baseClass}-#{@options.onModifierClass}"
-        @$wrapper
-        .removeClass("#{@options.baseClass}-#{@options.onModifierClass}")
-        .addClass("#{@options.baseClass}-#{value}")
-      @options.onModifierClass = value
-      @$element
-
-    offModifierClass: (value) ->
-      return @options.offModifierClass if typeof value is "undefined"
-
-      if @$wrapper.hasClass "#{@options.baseClass}-#{@options.offModifierClass}"
-        @$wrapper
-        .removeClass("#{@options.baseClass}-#{@options.offModifierClass}")
-        .addClass("#{@options.baseClass}-#{value}")
-      @options.offModifierClass = value
-      @$element
-
-    focusedModifierClass: (value) ->
-      return @options.focusedModifierClass if typeof value is "undefined"
-
-      if @$wrapper.hasClass "#{@options.baseClass}-#{@options.focusedModifierClass}"
-        @$wrapper
-        .removeClass("#{@options.baseClass}-#{@options.focusedModifierClass}")
-        .addClass("#{@options.baseClass}-#{value}")
-      @options.focusedModifierClass = value
-      @$element
-
-    animateModifierClass: (value) ->
-      return @options.animateModifierClass if typeof value is "undefined"
-
-      if @$wrapper.hasClass "#{@options.baseClass}-#{@options.animateModifierClass}"
-        @$wrapper
-        .removeClass("#{@options.baseClass}-#{@options.animateModifierClass}")
-        .addClass("#{@options.baseClass}-#{value}")
-      @options.animateModifierClass = value
-      @$element
-
-    disabledModifierClass: (value) ->
-      return @options.disabledModifierClass if typeof value is "undefined"
-
-      if @$wrapper.hasClass "#{@options.baseClass}-#{@options.disabledModifierClass}"
-        @$wrapper
-        .removeClass("#{@options.baseClass}-#{@options.disabledModifierClass}")
-        .addClass("#{@options.baseClass}-#{value}")
-      @options.disabledModifierClass = value
-      @$element
-
-    readonlyModifierClass: (value) ->
-      return @options.readonlyModifierClass if typeof value is "undefined"
-
-      if @$wrapper.hasClass "#{@options.baseClass}-#{@options.readonlyModifierClass}"
-        @$wrapper
-        .removeClass("#{@options.baseClass}-#{@options.readonlyModifierClass}")
-        .addClass("#{@options.baseClass}-#{value}")
-      @options.readonlyModifierClass = value
-      @$element
-
     destroy: ->
       $form = @$element.closest "form"
 
@@ -417,12 +363,6 @@ do ($ = window.jQuery, window) ->
     handleOffClass: "handle-off"
     labelClass: "label"
     ###
-    onModifierClass: "on"
-    offModifierClass: "off"
-    focusedModifierClass: "focused"
-    animateModifierClass: "animate"
-    disabledModifierClass: "disabled"
-    readonlyModifierClass: "readonly"
     onInit: ->
     onSwitchChange: ->
 

部分文件因为文件数量过多而无法显示